diff options
Diffstat (limited to 'net-ftp')
22 files changed, 179 insertions, 520 deletions
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz Binary files differindex 03aa72c2fcc9..5e20717a6206 100644 --- a/net-ftp/Manifest.gz +++ b/net-ftp/Manifest.gz diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest index f5a824bddff6..374f6742ce0e 100644 --- a/net-ftp/filezilla/Manifest +++ b/net-ftp/filezilla/Manifest @@ -4,6 +4,8 @@ AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005 AUX filezilla-3.52.2-slibtool.patch 723 BLAKE2B f051ae8d8b1d9c75bf4752d009a3b710b742accb50ec46ad6d1be0d7c5f88ab77996e47b55e3f87432a9d5aee2fef61e915ed36c09e988e01bbf68943a64144b SHA512 7a7f1adc4144c5535d60e6dd6f18aecc04c93ff2c98f52660fa576dcbce9ff7bb53175eef2fee7671c472181ea7f5c388ccc8697e70b8841759fdec06e62d1a1 DIST FileZilla_3.58.0_src.tar.bz2 4931087 BLAKE2B c0a9ed0d14a9cbc0d392f9680c4c6c60cb4157ec87be596aa8c7edb53dff23ed21ccb234b58a32b9929cb44f1624dfc8c0a3d09690be467bdeef6ebba802b354 SHA512 f613f210d9176be2dd41046ecdf4598604f8902829edfe5981564217561417ca35029618b0c50cdb6232220ec0440bd390f098b602c05845c846efe0689d9d54 DIST FileZilla_3.59.0_src.tar.bz2 4946231 BLAKE2B db8651490444aed547c7e26eaa8b13a1920ba4fcf6e0343ddbc021861db44f750aa4cf537c943d895110ee2b7b2a72f17f060198d3d16a0ceaf9642db87ce50d SHA512 063de23e7b529ee7422479ebb1af00ab86a82ee25cf0e7e1e06995bf897aeeb25aab161ab202de889ea750c796a0ac1317c5a08dcb89fa1f4cbdb79caa3cbfc7 +DIST FileZilla_3.60.1_src.tar.bz2 4954184 BLAKE2B 94a2d95729e2e540a3ff6ed1b9ed8fc5f4ccb96eb1e4edae655476b5d099c489ecb0ed58c26cab2df97518c9ab4f7058af1f4633fead924dcb400909e1913eeb SHA512 417b97afd8e9434c625392c4025ab7d977d58fad2dfe17c8ff856233c70b5d77df22c4e1b76120d9d5dba3bce1c61453808deb26314dbde7ec425d643c4f83d9 EBUILD filezilla-3.58.0.ebuild 1565 BLAKE2B bdf1629d582336fb0ae0067ca3eb7d93cba75ff30e2c4579875d02a782d57cecbb0ee72b4e1e7585e0248ac46662f86274ea40b704e2d75cb2399b256d42f650 SHA512 ecec5519f89c3b59fc7167313b1203a7cfc9382b4bdbe87c282670dfed2d8e7e7fa698c4844a6d6addfa3b1dee1ffa5c36203975a4e9c7b2de8d495e1e8c0cdb EBUILD filezilla-3.59.0.ebuild 1576 BLAKE2B 868071665c907abc7db4867107838a1b21f0f177ea279ee21a4c30375e936aa698fe4e3db47445d90ba16270ec3114d732902a3224b9100526a0d2e97e6cdc33 SHA512 2527e6952ebbdd80008f7e444f89d9a0cf850f66847f02d5399bc333ad447f3649f64b04bf594d4a4654307147c4f5d2febea3bbfc678e2ce422700f8a582431 -MISC metadata.xml 567 BLAKE2B 4dcbcf5d4032411a71789d653f7194ccd0f44610d24ea24cc0bfdbab63961776d31f606ac4f327e3e1b668ed40973c561532af2dc0c006493612e6eb7ddb2029 SHA512 9b255c02a0bc9fad8ff1c40f8fb263c94816f9bdcaa3d7ac4f5192c673ae6c4b9b82473ca0c1f80481b7f195a4a2c67ddbe190915ae3481fcdd6544029058997 +EBUILD filezilla-3.60.1.ebuild 1576 BLAKE2B 868071665c907abc7db4867107838a1b21f0f177ea279ee21a4c30375e936aa698fe4e3db47445d90ba16270ec3114d732902a3224b9100526a0d2e97e6cdc33 SHA512 2527e6952ebbdd80008f7e444f89d9a0cf850f66847f02d5399bc333ad447f3649f64b04bf594d4a4654307147c4f5d2febea3bbfc678e2ce422700f8a582431 +MISC metadata.xml 449 BLAKE2B 3a9fbf5c444404c3922fac61b0a36429acda9bd582d3b2049e9637088acf1a33af6c9a68052325969037951640ec3b9c8e2d357cbbd06a4655a504cb363e0c58 SHA512 f33dccada194313d97e91f514ca89685a2c643a0fb736e3a90065b246aced161fc45198aa05fea8fb96ff7827ddb8722344158e7d4c4b68c1bd008097fa99b7c diff --git a/net-ftp/filezilla/filezilla-3.60.1.ebuild b/net-ftp/filezilla/filezilla-3.60.1.ebuild new file mode 100644 index 000000000000..1a1a0c69c8f1 --- /dev/null +++ b/net-ftp/filezilla/filezilla-3.60.1.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +WX_GTK_VER="3.0-gtk3" + +inherit autotools wxwidgets xdg + +MY_PV="${PV/_/-}" +MY_P="FileZilla_${MY_PV}" + +DESCRIPTION="FTP client with lots of useful features and an intuitive interface" +HOMEPAGE="https://filezilla-project.org/" +SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.bz2" +S="${WORKDIR}/${PN}-${MY_PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" +IUSE="dbus nls test" +RESTRICT="!test? ( test )" + +# pugixml 1.7 minimal dependency is for c++11 proper configuration +RDEPEND=" + >=app-eselect/eselect-wxwidgets-0.7-r1 + >=dev-libs/nettle-3.1:= + >=dev-db/sqlite-3.7 + >=dev-libs/libfilezilla-0.37.1:= + >=dev-libs/pugixml-1.7 + >=net-libs/gnutls-3.5.7 + >=x11-libs/wxGTK-3.0.4:${WX_GTK_VER}[X] + x11-misc/xdg-utils + dbus? ( sys-apps/dbus )" +DEPEND="${RDEPEND} + test? ( >=dev-util/cppunit-1.13.0 )" +BDEPEND=" + virtual/pkgconfig + >=sys-devel/libtool-1.4 + nls? ( >=sys-devel/gettext-0.11 )" + +PATCHES=( + "${FILESDIR}"/${PN}-3.22.1-debug.patch + "${FILESDIR}"/${PN}-3.47.0-metainfo.patch + "${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch + "${FILESDIR}"/${PN}-3.52.2-slibtool.patch +) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + setup-wxwidgets + + local myeconfargs=( + --disable-autoupdatecheck + --with-pugixml=system + $(use_enable nls locales) + $(use_with dbus) + ) + econf "${myeconfargs[@]}" +} + +src_install() { + default + + # no static archives + find "${ED}" -name '*.la' -delete || die +} diff --git a/net-ftp/filezilla/metadata.xml b/net-ftp/filezilla/metadata.xml index 01dfad8c2758..81ee0feed534 100644 --- a/net-ftp/filezilla/metadata.xml +++ b/net-ftp/filezilla/metadata.xml @@ -6,10 +6,6 @@ <name>Bernard Cafarelli</name> </maintainer> <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> - <maintainer type="person"> <email>dlan@gentoo.org</email> <name>Yixun Lan</name> </maintainer> diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest index a9727eb1a897..91245836b3d9 100644 --- a/net-ftp/ftp/Manifest +++ b/net-ftp/ftp/Manifest @@ -1,5 +1,6 @@ +AUX ftp-0.17.34.0.2.5.1-musl-glob-brace.patch 350 BLAKE2B c061328876a4e47b10fbfd01da1703abf8bf710a3ceaebbbb86b44ed4b9c7d796809e63ede40f0d8218c57ff07b48164452450d8365a707f0d03317c42e04545 SHA512 e56bff74eff1f18519fd06e730ab15b4f155ce258ce0638e4275a03a2fc51234b198eec0fbe37ff56b2211a732040a93dbc4999a672d5a6c4f73912d8d82968a DIST netkit-ftp-0.17-patches-3.tar.bz2 4082 BLAKE2B d70c0340641647ab993a7b2aa1c49be2a1ff16e7b6b3038ebe9eff329bf4796cfa21d8c8d88f123c2f633cc1ba3b5ecdd4b1be78a7fda63b77ece077d643fca5 SHA512 083796f89c6d02f2b094616a6b7c9ef8ef7d0edbe337521cf311deb03f1af2000f12b85e3978a5eb1c56c64f2a2a105c0b7735fd6ea31d626d171a047cd858c3 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554 DIST netkit-ftp-ssl_0.17.34+0.2-5.1.debian.tar.xz 48976 BLAKE2B 30c867a3a8fabc55ba05603c54b5e4153d198e8e92d55353bf02cbf0494a41de1362c945aef013edfa3a6f0b1c78e5041ec7127db5eb99bac5351f57bb526c2d SHA512 6061b9b22fe8463a7d4542988685e108b282b6d2908d67cc70951fc23b1d842a70aee44af989d1e683e80c050ffe284fbfa776581e0120439bec98d479672718 -EBUILD ftp-0.17.34.0.2.5.1.ebuild 1507 BLAKE2B 11473a162ef03ae30414308b40edcc55e9a9e6aa5ed78c07caca0630f9e89f545a571c36b27a3f8f43962e720b7d7b7404e0283d7278c9e9bb2e0389eae4b77b SHA512 6656ced60a327119cdaf7c82558b9a892a0217e03ef4d50d609089cb46f69dfe8b5e8c0c1462b036d4807464fa6fd2557cce9e1fa269211812c9e14a59a2308f +EBUILD ftp-0.17.34.0.2.5.1.ebuild 1739 BLAKE2B 08051dc05b9b200c67149e85dc66803ab9973a265924dda8439be353f905068363f9af4060accc1bae6ec5bdf93809aff5fb689efb7c18be9047dde2c8d148b4 SHA512 3ba91f7394875c05a2b9a2ec6e4fd9054ea6e3b7a5430406dbac6ef3dd1d215d1b99530f1081bc33282642274a91cd44bec2d36590013c4b5048e8f8a0189a43 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch b/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch new file mode 100644 index 000000000000..386af410e913 --- /dev/null +++ b/net-ftp/ftp/files/ftp-0.17.34.0.2.5.1-musl-glob-brace.patch @@ -0,0 +1,14 @@ +https://bugs.gentoo.org/832430 + +See e.g. https://patchwork.kernel.org/project/selinux/patch/20180517051117.48454-5-jason@perfinion.com/ too. +--- a/ftp/cmds.h ++++ b/ftp/cmds.h +@@ -61,3 +61,7 @@ + void do_umask(int argc, char *argv[]); + void idle_cmd(int argc, char *argv[]); + void setpassive(void); ++ ++#ifndef GLOB_BRACE ++#define GLOB_BRACE 0 ++#endif + diff --git a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild index a25ce7b145e0..bbdb45b4f87b 100644 --- a/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild +++ b/net-ftp/ftp/ftp-0.17.34.0.2.5.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit flag-o-matic toolchain-funcs +inherit edo flag-o-matic toolchain-funcs PATCH_VER="3" MY_PN="netkit-ftp" @@ -11,11 +11,13 @@ MY_PV="$(ver_cut 1-2)" MY_P="netkit-${PN}-${MY_PV}" DEB_PN="${MY_PN}-ssl" DEB_PV="$(ver_cut 1-3)+$(ver_cut 4-5)-$(ver_cut 6-7)" + DESCRIPTION="Standard Linux FTP client" HOMEPAGE="http://www.hcs.harvard.edu/~dholland/computers/netkit.html" SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz mirror://debian/pool/main/n/${DEB_PN}/${DEB_PN}_${DEB_PV}.debian.tar.xz https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${MY_P}-patches-${PATCH_VER}.tar.bz2" +S="${WORKDIR}"/${MY_P} LICENSE="BSD" SLOT="0" @@ -24,22 +26,23 @@ IUSE="ipv6 readline ssl" RDEPEND=" >=sys-libs/ncurses-5.2:= - readline? ( sys-libs/readline:0= ) - ssl? ( dev-libs/openssl:0= ) + elibc_musl? ( sys-libs/obstack-standalone ) + readline? ( sys-libs/readline:= ) + ssl? ( dev-libs/openssl:= ) " DEPEND="${RDEPEND}" BDEPEND="sys-apps/grep" -S=${WORKDIR}/${MY_P} - src_prepare() { local p for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series || die); do - eapply "${WORKDIR}/debian/patches/${p}" + eapply "${WORKDIR}"/debian/patches/${p} done eapply "${WORKDIR}"/patch + eapply "${FILESDIR}"/${PN}-0.17.34.0.2.5.1-musl-glob-brace.patch + # Drop bashism from configure sed -i \ -e 's:echo -n:printf %s :' \ configure || die @@ -48,15 +51,20 @@ src_prepare() { } src_configure() { - append-lfs-flags #101038 + # bug #101038 + append-lfs-flags tc-export CC - # not an autoconf script - ./configure \ + + # Not an autoconf script + edo ./configure \ --prefix=/usr \ $(use_enable ipv6) \ $(use_enable readline) \ - $(use_enable ssl) \ - || die + $(use_enable ssl) + + if use elibc_musl ; then + sed -i -e '/^LIBS=/ s/$/ -lobstack/' MCONFIG || die + fi } src_install() { diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest index 57ddfed15d4a..9dc479493263 100644 --- a/net-ftp/lftp/Manifest +++ b/net-ftp/lftp/Manifest @@ -10,6 +10,6 @@ AUX lftp-4.8.2-libdir-zlib.patch 714 BLAKE2B a770bc7a3f974ece766883e644403691de8 AUX lftp-4.9.1-libdir-readline.patch 404 BLAKE2B 88746dbfd082202950e54270519fa25c8a2042d3479342443394918722a8f0b7b2cde1580c7ac07c0c3408f86c12a83fa1973391ef25a9b3f348b7ad1afa68ac SHA512 e6ab456b237613f31c3e7e450a5127b5fac74a9d24d4bd5ca95f9b28d6c810ad0253d71d710e1daf15c43d0b2d5d2ecdb2b1fb7bbdaa4c3bc0b610d6cc6caf3b AUX lftp-4.9.2-ac-270.patch 1298 BLAKE2B 3431c649aa1f772a94640c1d1508b584eff0892098400eea5390c754ece5f23a877aa2eccb814bf1ece93e329980a29190aa784f4cc2b41efccc58c2921409d8 SHA512 efabe7cd6b3467b9212d47669842bf3b1b981ad6c8615bdfda4122d1a217e10fc0fda167903172502a13c63341ddab8e5bba91e5f39721c6fd304e29e6647a08 DIST lftp-4.9.2.tar.xz 1654960 BLAKE2B 04f168576ae6e001e0ffffb2e93e36d5bffa5ed1e2e671edb6210a54aa0ecedc280885450dcee890d05b64464eb641e7e63c8d4dd170100317dec3fe734ec483 SHA512 cda8698e7e34d748715a6fe5dc06c758240302621c7957402f0cc67577acf1a96b436fda4282408dee8171dc84a31e0be432df99a30f0a10057a8e7ea9ec64ad -EBUILD lftp-4.9.2.ebuild 2584 BLAKE2B 92db441ae1e3c985db59568f2bedc3ea2f0b94b7acdf0ed4d7cb257eadc6ebf8dd185459e8c71f6ab6e6cf427a855700afecb26bd7abf1e7ee317eec2c4506ea SHA512 d32de85536f7f2a812c0148c9934408e4ec56b3d89b821bbd89c3830a2431a304acee57bc7f6e87d4c18f1c387bb9b96d23036b24c5940a404a68e1519aadc3c -EBUILD lftp-9999.ebuild 2372 BLAKE2B bba2c782aa65d11736ff859793425c38f4d3cc9c2130db3755e99a0e5af3f68ef9cc21076219913182d8c351c7807a79e6f94853e2671a6ad91a77bfac0e6989 SHA512 34c37decd8a2de8965ee521aacd34a505c9a36f5369f48a13f9980497e199e2ac331c98c590dc7b5cd63f3f97d774b97c8f069ccc4110535492b58fa7526ccd6 -MISC metadata.xml 481 BLAKE2B 7a61be735ad5538cf472fa7bdd22a17449c02584804d2711b626433945dc62db58746302cd0ae83ce35350627720e2bce8297757858deb2d66bb30f0c9981e33 SHA512 4977624bcad3dce392d8e42d28071918a50c1850c6ad139c56aaa59195869f517c1654dbd2c18a0ea6335a984299c2472b22f139fcd67808f55e92f0e6a5ecb0 +EBUILD lftp-4.9.2.ebuild 2586 BLAKE2B 8353ae30cb7195095bd8133c88bff2d83b9e773a38a5b9b255e0878a885982fa3a7d4c86f88a1ef68215521c815c66fbb0e16a016682cd2b1751099c0ee1960e SHA512 21959ae878c0eeaa003775a936262084e7ed1e18bffcc7227d3a9992b45dc9e6edaefd64875f1ec9e3cf129ed5fad643808cdc4c52e4345d230a0389262ff8a3 +EBUILD lftp-9999.ebuild 2374 BLAKE2B 2236a918cc97d22729e4af0417b6a99f89d7758e4750c27c24e6e03c62c524c1f8fcec3f65b7728090aad3a1d618920fa976001416ea59a8cbb01e32f1878adc SHA512 2e46ce89ff4969c8f3bfc8672dc1be0f652858b4ceb6c7853f65560a2195f00b387fc7825d3f78a77ba89f68ba30a44b328bfa1b780ba25144317045ca3bf093 +MISC metadata.xml 397 BLAKE2B 75e2003f40e99a675c527d46ffd647a9cf4fe4d3f14c209903e7800ccc33e4f894f7eb1540624c54355b7be01bfa7c0ac04b8bbe62423028b5f2f4c8365da0f6 SHA512 57e5ac7efbbf7e418d875f0219d5ae1fc8c54c3fc9dda43e806779a8b45cd21d7c8701b39aad957d28be7d77c21db571df7465a128b0eef658c2a91a747afd3c diff --git a/net-ftp/lftp/lftp-4.9.2.ebuild b/net-ftp/lftp/lftp-4.9.2.ebuild index 9f9b8e1d00ef..8e4953d3e242 100644 --- a/net-ftp/lftp/lftp-4.9.2.ebuild +++ b/net-ftp/lftp/lftp-4.9.2.ebuild @@ -76,7 +76,7 @@ src_configure() { $(use_enable nls) \ $(use_with idn libidn2) \ $(use_with socks5 socksdante "${EPREFIX}"/usr) \ - $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ + $(usex ssl "$(use_with !gnutls openssl "${EPREFIX}"/usr)" '--without-openssl') \ $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ --enable-packager-mode \ --sysconfdir="${EPREFIX}"/etc/${PN} \ diff --git a/net-ftp/lftp/lftp-9999.ebuild b/net-ftp/lftp/lftp-9999.ebuild index 000bb5b4c9a1..915bfc33d101 100644 --- a/net-ftp/lftp/lftp-9999.ebuild +++ b/net-ftp/lftp/lftp-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -74,7 +74,7 @@ src_configure() { $(use_enable nls) \ $(use_with idn libidn2) \ $(use_with socks5 socksdante "${EPREFIX}"/usr) \ - $(usex ssl "$(use_with !gnutls openssl ${EPREFIX}/usr)" '--without-openssl') \ + $(usex ssl "$(use_with !gnutls openssl "${EPREFIX}"/usr)" '--without-openssl') \ $(usex ssl "$(use_with gnutls)" '--without-gnutls') \ --enable-packager-mode \ --sysconfdir="${EPREFIX}"/etc/${PN} \ diff --git a/net-ftp/lftp/metadata.xml b/net-ftp/lftp/metadata.xml index d2885f3f4b54..d7c37f55b569 100644 --- a/net-ftp/lftp/metadata.xml +++ b/net-ftp/lftp/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> - </maintainer> + <!-- maintainer-needed --> <use> <flag name="convert-mozilla-cookies">Install the convert-mozilla-cookies script and its run-time dependencies</flag> <flag name="verify-file">Install the verify-file script and its run-time dependencies</flag> diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest index 4cf70a7469cc..06ca553b0aa6 100644 --- a/net-ftp/pure-ftpd/Manifest +++ b/net-ftp/pure-ftpd/Manifest @@ -1,21 +1,14 @@ AUX pure-certd.initd 562 BLAKE2B 21431b74d2a745b13daa7772748b4484e18a640ffc07252ed60867b297a8f31267f583ceb408ee31c11bbc43de3fcda0b51e4324279b50c8a4a19ea6f1342945 SHA512 1a7a7dcba98e92e86ae3f35c33c5fe970c6530f1059692f32cdc851de1d8492720020b252e70c646eff6fdbbb32dfb99b1ae449acaea5fd0fe5541dc89891301 AUX pure-certd.script 678 BLAKE2B 09a27afc2b1d885b051988d0d5af4ab3fe3ffff68a37a01071a7cfe5334d7f62b0510865381f5d226f12558a04214afdc3fc158e22cc7e2c940617997c9453cf SHA512 807598a1e7e2ad92e1b5e52b0f2321a45d032a74e806435fddbf4f6b99ca2663617ee6accbeeb187c17f8a35668d1b097b13a8930be24ddfd4fb5818e3b1523c AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba -AUX pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch 898 BLAKE2B ccccd0302184a768ac522197628b2021374579afcda595a70041dc14f3cab05317ac373a2fadf9d0565a95c0d730c87590c3dc13efa944e8d496264b3f0e4ab1 SHA512 7930dddc7e58bd00fdeb4cd0da49491d59907334f47f23d12433f71a9a2103a8b5cc503c5d4d461b110cdea61f2f6ef974bf123d96394334f668aacdb747f830 -AUX pure-ftpd-1.0.49-do-not-call-ar-directly.patch 609 BLAKE2B 5f3ac69ae824cd07a16629afdbed9d1d55718184fb0da09063ae5beacf189861263bb21bc4e3f6d9f853757169f8125221db4728002bbd2697992c8035201585 SHA512 91d15fbcf4d99100072bae5a7121122a0ae0e912a4df5a7d9645419506bdd7de70ce09d586b9a3ec83838fd98cddee6d744cda7b6383985f80278859ff5200e4 -AUX pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch 847 BLAKE2B f7e12194d219bb5a410a7b55743cdb2b8eb268a60aef8b8d9826e242264989a4502bb2378503c3a7ed8913fce4d95b681fcd185d184ef54e04dcda6b4853d99e SHA512 ff4aefeffd92f9e01e7c57779cc9ed59c0972a40a02431fa4e63696071ebbf28e4a0f83b6b6c878d4b62fed7efa05ff90e9d604e8c7e6a9358bc8853105731f1 -AUX pure-ftpd-1.0.49-quota_maxfile_size_check.patch 994 BLAKE2B 8a3a840af77642b1b00e7cc05dc095631400e4332a7f5ece140ea5034cd6cbf5f2d9509cfe1138dd4bc968dca60d848ef238a0bd0d7d0f44a978dde15cd9ad62 SHA512 7e5d79984355765dd1c167e23018cda5f17102424769a439a03e642ebc66838d2f9410af99151ce0d47056cbead6979df335a65e4468da5025b8555a84d4c798 -AUX pure-ftpd.conf_d-3 3728 BLAKE2B a9bfa8208bdf7fcb053cd48e17638f787388804c57788ac594fae096cc824e347979b251b2c8e9d753308bfb63a37111f9690aabe684dc3eb614f68949d3983b SHA512 a5cc8e59178a5d0f7b5909d09009ef6ace1f8e6874bd733e21bc30f4899447e70b020a0369077132751ceb28afa971588efedcce3dea83e9b043b1545caf3393 AUX pure-ftpd.confd-r4 170 BLAKE2B d552480bea7503066ef3f0e90a082660a30f35cf809e26860ba9b49fcbb2fcdafdfe35041510fdd73f1b42cb35b7d90caa37ed9722de769750558818ebfbfe43 SHA512 6afde5a6e0f8e3a14bd23a6f861e18754980ab1b845defe06378493ed58e693628f4af71b591b3160037a0fdf6cc750c2a0d156a47c48a2a1d58c0032e389a1f AUX pure-ftpd.initd-r12 519 BLAKE2B 6271067b195de1b662ffe1577aaf3e6e2badd44494e17f27671f9f70e3f1bb955326af390b709a4ff9cefd2ba48e1ef77efaaac5595a5dccbbb75e9376db7153 SHA512 2189b8761aa51b68bd4b5b5c79e3f7220c9f96e5187bf17ed55a50a74ebe0989b3d5f2c9d8b3bdc89d184ce7f97d16e1c51e46b3d178feacc72864090717b8a1 -AUX pure-ftpd.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d AUX pure-uploadscript.confd 368 BLAKE2B 675e5349b2f808dd2a3cbaf2536a0541f40d42d300b7411163bc8232470c6f63a1d92cef393271693a02bcb5129624d38de77a99ca030a77bab00cc1fbe797c4 SHA512 2632be874a5afb25b8c8c1acbdfef929542d80dc9a8f280b4a9b0b6878be63f901ccd2c29c2ae0f9f74f45e41df1b7e69d1cef6f77e93c9b235709a7094480af AUX pure-uploadscript.initd-r1 776 BLAKE2B 1e382300a92fabb5308aa2636de2f427418d8595859fa2d7e6ee0a62297a0a17386f2f4c55de03ad282ed0545cc97ea6c0df67fe5fe6af736789d01e18c69f97 SHA512 3bb735bf0dc12434bc283ea9948c5b7feeaf72a26382a65a3c8eaec87a13f82239699e4687e5b36be5478bcab801974633b17771d9a583b6be508503118899e4 -DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef DIST pure-ftpd-1.0.50.tar.bz2 520167 BLAKE2B 0c694ed48e896be13d907a71a24357f8676daf2c66bdaac41d31b162741164fe5ab1560499acc08b11e4fdb2a678c81c81c03e65a8181fcfd960ffbfe4b731d4 SHA512 8fbd24fb0450b9ed8e47335c97c3bc1cbcd0ee2ac7ebea95721b9dbddb7f61d8bedaa1710ba94213d96c79e12ec9b2b555ddb5f494c8961ca2339b176a52fe12 -EBUILD pure-ftpd-1.0.49-r6.ebuild 4399 BLAKE2B 11f875c1345ffde82632d1f7cb70c934f571a460bbe85583c381c1d9ee1cde305e9e413595afb034d34ad695e06bbccd2f695c560202f0a483524a149510737a SHA512 18f4236c55ff0d1f0fd059cf44bfa8fa8f1ddec4d225384bc66c21fefd17ee003e316f9a6f9cafcd6d658ad2ef66bd5d9858b8d05e629cc0071b7fc94453bd1c -EBUILD pure-ftpd-1.0.50-r1.ebuild 4113 BLAKE2B b60eaf0982ea54aae3b738100017901b264e063c22d4b905358b4710e12c54a0785d58a0f024d04157db9e78be2eaaa61cc7cacdae8a37d02c8acad910155306 SHA512 0b5fd18b202a61ce01d749c5190d4b66ca843e55964891af26a618ce3c3aba16189741de421abaff582ee8d7b4e9420591ab58e25937c0976e3c439f2e42910e -EBUILD pure-ftpd-1.0.50-r3.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7 +DIST pure-ftpd-1.0.51.tar.bz2 520648 BLAKE2B 0b82fee114986140eb74d2669b7d91582a48f1b366936895acda913afb7d3bca1578295a930f7857f8674e593bd1bf8094c36f2ae8db6cf1a62cacfd4234cf13 SHA512 3615ac1ec42813855f3328dde200f60025e1f2ca7d1e17ea042967fd4164079260d058f3e2586acd778334660f387a280b35850a9e2091dd913fb84ef929bdca +EBUILD pure-ftpd-1.0.50-r3.ebuild 4363 BLAKE2B 48e2aa70ff578e49bd35d21e4ff002a63399b9c18e1466946b171a1e5fce5f226ba1bdd42df6164ab04005ca685d9c90c902a59a00c7b356ee6a7aad292d5212 SHA512 f29ce9b3262c80f75b8ea722763def4e52441fb735d0ebc1a564b43f018b05e1203de04ec2b344cd7a7aff9ca34cceca2377ac3736c1ee127bd67962baf676b2 +EBUILD pure-ftpd-1.0.51.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7 EBUILD pure-ftpd-9999.ebuild 4369 BLAKE2B b44d87e95f8a73dfec5819b89fc69666809158a61fc4a3e5b31bec0abc299ab788735d3fa414a20f7835c15c610370eabebbd53cd2a56aed11089e8e4bb4b145 SHA512 f4ec59f90bce535f39d135cb07f3ecaa40c16c17d9bfb5b5bfbf25f244ce70445621e5b0a937363970875ba64ed5317242400e949b383476d48f72891f3569f7 -MISC metadata.xml 1177 BLAKE2B 7662da71f87d60d342e0a304c73c02f95a1006a0e6614c40ee3f3333a01430cb0a50ebd7e190569fcac25f9cefdd48fef68649c97006846977a2596333d78c34 SHA512 6c79218bba944381fbf0bfc86e27adde1e95e5e2ac5e7e2c5d637820f8fb4bb1bbd5e91a53f6fbc4ef641d03be6490e1d137895176576f7e2da798662590fb0a +MISC metadata.xml 1096 BLAKE2B ac7d4d0c29ffeb695f308248cd1d456853a757aa4e2eb8bce4109e387b6a35f546b0acd9d8be2fd717ed19d3f0af118f2da38385348191e791ad7c260fd74d71 SHA512 fc79dda7f16b2a8ec8aafd4fc95bf31ef91f7e8ce3b6da12bfca1aed0fbf4e0ff4bef71305e6c788a67c2c4ae090c99ad280314240fdb47d4ed08de30b6367f5 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch deleted file mode 100644 index 7e29934caf5d..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-diraliases_uninitialized_pointer.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8d0d42542e2cb7a56d645fbe4d0ef436e38bcefa Mon Sep 17 00:00:00 2001 -From: Frank Denis <github@pureftpd.org> -Date: Tue, 18 Feb 2020 18:36:58 +0100 -Subject: [PATCH] diraliases: always set the tail of the list to NULL - -Spotted and reported by Antonio Norales from GitHub Security Labs. -Thanks! ---- - src/diraliases.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/diraliases.c b/src/diraliases.c -index 4002a36..fb70273 100644 ---- a/src/diraliases.c -+++ b/src/diraliases.c -@@ -93,7 +93,6 @@ int init_aliases(void) - (tail->dir = strdup(dir)) == NULL) { - die_mem(); - } -- tail->next = NULL; - } else { - DirAlias *curr; - -@@ -105,6 +104,7 @@ int init_aliases(void) - tail->next = curr; - tail = curr; - } -+ tail->next = NULL; - } - fclose(fp); - aliases_up++; diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch deleted file mode 100644 index 0df21320957d..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-do-not-call-ar-directly.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/721242 -Backport of https://github.com/jedisct1/pure-ftpd/pull/148 - ---- a/configure.ac -+++ b/configure.ac -@@ -7,7 +7,7 @@ AC_INIT([pure-ftpd],[1.0.49], - [https://www.pureftpd.org]) - AC_CONFIG_SRCDIR(src/ftpd.c) - AC_CONFIG_HEADERS([config.h]) --AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar]) -+AM_INIT_AUTOMAKE([1.11.2 dist-bzip2 tar-ustar]) - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) - AM_MAINTAINER_MODE - AM_DEP_TRACK -@@ -17,6 +17,7 @@ AC_SUBST(VERSION) - - dnl Checks for programs. - LX_CFLAGS=${CFLAGS-NONE} -+AM_PROG_AR - AC_PROG_CC - AC_PROG_RANLIB - AC_USE_SYSTEM_EXTENSIONS - diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch deleted file mode 100644 index 4ed197e46d35..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-pure_strcmp_OOB_read.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 36c6d268cb190282a2c17106acfd31863121b58e Mon Sep 17 00:00:00 2001 -From: Frank Denis <github@pureftpd.org> -Date: Mon, 24 Feb 2020 15:19:43 +0100 -Subject: [PATCH] pure_strcmp(): len(s2) can be > len(s1) - -Reported by Antonio Morales from GitHub Security Labs, thanks! ---- - src/utils.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/utils.c b/src/utils.c -index f41492d..a7f0381 100644 ---- a/src/utils.c -+++ b/src/utils.c -@@ -45,5 +45,11 @@ int pure_memcmp(const void * const b1_, const void * const b2_, size_t len) - - int pure_strcmp(const char * const s1, const char * const s2) - { -- return pure_memcmp(s1, s2, strlen(s1) + 1U); -+ const size_t s1_len = strlen(s1); -+ const size_t s2_len = strlen(s2); -+ -+ if (s1_len != s2_len) { -+ return -1; -+ } -+ return pure_memcmp(s1, s2, s1_len); - } diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch deleted file mode 100644 index 8b1877366c20..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fb93975777a1cffba80544e08ca81606532395d6 Mon Sep 17 00:00:00 2001 -From: DroidTest <53651584+DroidTest@users.noreply.github.com> -Date: Thu, 29 Jul 2021 11:36:26 +0800 -Subject: [PATCH] fix the maxfile_size checking bug - -Fix the predicate that never evaluates true ---- - src/ftpd.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/ftpd.c b/src/ftpd.c -index d856839..61275de 100644 ---- a/src/ftpd.c -+++ b/src/ftpd.c -@@ -4247,8 +4247,8 @@ void dostor(char *name, const int append, const int autorename) - if (quota_update("a, 0LL, 0LL, &overflow) == 0 && - (overflow > 0 || quota.files >= user_quota_files || - quota.size > user_quota_size || -- (max_filesize >= (off_t) 0 && -- (max_filesize = user_quota_size - quota.size) < (off_t) 0))) { -+ ((max_filesize = user_quota_size - quota.size) < (off_t) 0 && -+ max_filesize >= (off_t) 0))) { - overflow = 1; - (void) close(f); - goto afterquota; diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3 b/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3 deleted file mode 100644 index 29b15a5a8928..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd.conf_d-3 +++ /dev/null @@ -1,90 +0,0 @@ -# Config file for /etc/init.d/pure-ftpd -##Comment variables out to disable its features, or change the values in it... ## - -## This variable must be uncommented in order for the server to start ## -#IS_CONFIGURED="yes" - -## FTP Server,Port (separated by comma) ## -## If you prefer host names over IP addresses, it's your choice: -## SERVER="-S ftp.rtchat.com,21" -## IPv6 addresses are supported. -## !!! WARNING !!! -## Using an invalid IP will result in the server not starting, -## but reporting a correct start! -## SERVER="-S 192.168.0.1,21" -## By default binds to all available IPs. -SERVER="-S 21" - -## Number of simultaneous connections in total, and per IP ## -MAX_CONN="-c 30" -MAX_CONN_IP="-C 10" - -## Don't allow uploads if the partition is more full then this var ## -DISK_FULL="-k 90%" - -## If your FTP server is behind a NAT box, uncomment this ## -#USE_NAT="-N" - -## Authentication mechanisms (others are 'pam', ...) ## -## Further infos can be found in the README file. -AUTH="-l unix" - -## Change the maximum idle time (in minutes) ## -## If this variable is not defined, it will default to 15 minutes. -#TIMEOUT="-I <timeout>'" - -## Facility used for syslog logging ## -## If this variable is not defined, it will default to the 'ftp' facility. -## Logging can be disabled with '-f none'. -#LOG="-f <facility>" - -## Charset conversion support *experimental* ## -## Only works if USE "charconv" is enabled (only Pure-FTPd >=1.0.21). -## Set the charset of the filesystem. -# CHARCONV="--fscharset <charset>" - -## If you want to process each file uploaded through Pure-FTPd, enter the name -## of the script that should process the files below. -## man pure-uploadscript to learn more about how to write this script. -# UPLOADSCRIPT="/path/to/uploadscript" - -## Misc. Others ## -MISC_OTHER="-A -x -j -R -Z" - -# -# Use these inside $MISC_OTHER -# More can be found on "http://download.pureftpd.org/pub/pure-ftpd/doc/README" -# -# -A [ chroot() everyone, but root ] -# -e [ Only allow anonymous users ] -# -E [ Only allow authenticated users. Anonymous logins are prohibited. ] -# -i [ Disallow upload for anonymous users, whatever directory perms are ] -# -j [ If the home directory of a user doesn't exist, auto-create it ] -# -M [ Allow anonymous users to create directories. ] -# -R [ Disallow users (even non-anonymous ones) usage of the CHMOD command ] -# -x [ In normal operation mode, authenticated users can read/write -# files beginning with a dot ('.'). Anonymous users can't, for security reasons -# (like changing banners or a forgotten .rhosts). When '-x' is used, authenticated -# users can download dot-files, but not overwrite/create them, even if they own -# them. ] -# -X [ This flag is identical to the previous one (writing -# dot-files is prohibited), but in addition, users can't even *read* files and -# directories beginning with a dot (like "cd .ssh"). ] -# -D [ List files beginning with a dot ('.') even when the client doesn't -# append the '-a' option to the list command. A workaround for badly -# configured FTP clients. ] -# -G [ Disallow renaming. ] -# -d [ Send various debugging messages to the syslog. ONLY for DEBUG ] -# -F <fortune file> [ Display a fortune cookie on login. Check the README file ] -# -H [ By default, fully-qualified host names are logged. The '-H' flag avoids host names resolution. ] - - -# Some filesystems don't like accesses being memory mapped. This happens for -# example with ftpwho on JFFS2 filesystems (bug #330563). If you happen to -# have such a filesystem on /var set TMPFS_MOUNT to "true". -TMPFS_MOUNT="false" - -# Special mount options (like nosuid or nodev) for the tmpfs mount can be added -# here. Several options must be separated by comma: "nodev,nosuid" -#TMPFS_OPTS="" - diff --git a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 b/net-ftp/pure-ftpd/files/pure-ftpd.rc11 deleted file mode 100644 index 35270ff33507..000000000000 --- a/net-ftp/pure-ftpd/files/pure-ftpd.rc11 +++ /dev/null @@ -1,75 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -ftpd_pidfile="/var/run/pure-ftpd.pid" -script_pidfile="/var/run/pure-uploadscript.pid" -ftpd_rundir="/var/lib/run/pure-ftpd" -daemon="/usr/sbin/pure-ftpd" -script_daemon="/usr/sbin/pure-uploadscript" - -depend() { - need localmount - use netmount -} - -start_pre() { - if [ -z "${IS_CONFIGURED}" ] ; then - eerror "You need to setup /etc/conf.d/pure-ftpd first!" - return 1 - fi -} - -start() { - UPSCRIPT="" - if [ -n "${UPLOADSCRIPT}" ] ; then - UPSCRIPT="--uploadscript" - fi - - FTPD_CONFIG="$SERVER $MAX_CONN $MAX_CONN_IP $DISK_FULL $USE_NAT $AUTH - $LOG $TIMEOUT $CHARCONV $MISC_OTHER $UPSCRIPT" - - WAIT="--wait 100" - - if ${TMPFS_MOUNT:-false} && grep -q tmpfs /proc/filesystems ; then - [ -n "${TMPFS_OPTS}" ] && MOUNT_OPTS="-o ${TMPFS_OPTS}" - einfo "Mounting tmpfs on ${ftpd_rundir}" - mount ${MOUNT_OPTS} -t tmpfs tmpfs ${ftpd_rundir} \ - || eerror "Unable to mount tmpfs" - fi - - ebegin "Starting Pure-FTPd" - start-stop-daemon --start --quiet --pidfile ${ftpd_pidfile} \ - --make-pidfile --background --exec /usr/sbin/pure-ftpd ${WAIT} \ - -- $(echo ${FTPD_CONFIG} | sed 's@\([[:space:]]\+\|^\)-B\([[:space:]]\+\|$\)@\1@g') - result=$? - if [ ${result} -ne 0 ] ; then - eend 1 "Could not launch Pure-FTPd" - else - eend $result - if [ -n "${UPLOADSCRIPT}" ] ; then - ebegin "Starting Pure-FTPd upload script" - start-stop-daemon --start --quiet --make-pidfile \ - --pidfile ${script_pidfile} \ - --exec ${script_daemon} --background ${WAIT} \ - -- -r $UPLOADSCRIPT - eend $? - fi - fi -} - -stop() { - if [ -n "${UPLOADSCRIPT}" ] ; then - ebegin "Stopping Pure-FTPd upload script" - start-stop-daemon --stop --retry 20 --quiet \ - --pidfile ${script_pidfile} - eend $? - fi - ebegin "Stopping Pure-FTPd" - start-stop-daemon --stop --retry 20 --quiet --pidfile ${ftpd_pidfile} - eend $? - - if ${TMPFS_MOUNT:-false} && mount | grep -q ${ftpd_rundir} ; then - umount ${ftpd_rundir} >/dev/null 2>&1 - fi -} diff --git a/net-ftp/pure-ftpd/metadata.xml b/net-ftp/pure-ftpd/metadata.xml index 3e2a5f6b142b..95bb40b57c16 100644 --- a/net-ftp/pure-ftpd/metadata.xml +++ b/net-ftp/pure-ftpd/metadata.xml @@ -1,10 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="person"> - <email>polynomial-c@gentoo.org</email> - <name>Lars Wendler</name> -</maintainer> +<!-- maintainer-needed --> <longdescription>Free (BSD), secure, production-quality and standard-conformant FTP server based upon Troll-FTPd. It doesn't provide useless bells and whistles, but focuses on efficiency and ease of use.</longdescription> <use> <flag name="anondel">Permit anonymous to delete files</flag> diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild deleted file mode 100644 index 784e79dcafc5..000000000000 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r6.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools flag-o-matic - -DESCRIPTION="Fast, production-quality, standard-conformant FTP server" -HOMEPAGE="http://www.pureftpd.org/" -if [[ "${PV}" == 9999 ]] ; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git" -else - SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 - http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86" -fi - -LICENSE="BSD GPL-2" -SLOT="0" - -IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd" - -REQUIRED_USE="implicittls? ( ssl )" - -BDEPEND="sys-devel/autoconf-archive" - -DEPEND="dev-libs/libsodium:= - virtual/libcrypt:= - caps? ( sys-libs/libcap ) - ldap? ( >=net-nds/openldap-2.0.25:= ) - mysql? ( || ( - dev-db/mariadb-connector-c - dev-db/mysql-connector-c - ) ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:= ) - ssl? ( - >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] - ) - sysquota? ( sys-fs/quota[-rpc] ) - xinetd? ( virtual/inetd )" - -RDEPEND="${DEPEND} - net-ftp/ftpbase - selinux? ( sec-policy/selinux-ftp )" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.28-pam.patch" - - # https://bugs.gentoo.org/711124 - "${FILESDIR}/${P}-diraliases_uninitialized_pointer.patch" - "${FILESDIR}/${P}-pure_strcmp_OOB_read.patch" - - # https://bugs.gentoo.org/721242 - "${FILESDIR}/${P}-do-not-call-ar-directly.patch" - - # https://bugs.gentoo.org/811786 - "${FILESDIR}/${P}-quota_maxfile_size_check.patch" -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - # adjust max user length to something more appropriate - # for virtual hosts. See bug #62472 for details. - sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \ - -i "${S}/src/ftpd.h" || die "sed failed" - - # Those features are only configurable like this, see bug #179375. - use anondel && append-cppflags -DANON_CAN_DELETE - use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS - use anonren && append-cppflags -DANON_CAN_RENAME - use anonres && append-cppflags -DANON_CAN_RESUME - use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS - - # Do not auto-use SSP -- let the user select this. - export ax_cv_check_cflags___fstack_protector_all=no - - local myeconfargs=( - --enable-largefile - # Required for correct pid file location. - # pure-ftpd appends "/run/pure-ftpd.pid" to the localstatedir - # path, and tries to write to that file even when being - # started in foreground. So we need to pin this to / - --localstatedir="${EPREFIX}"/ - --with-altlog - --with-cookie - --with-diraliases - --with-extauth - --with-ftpwho - --with-language=${PUREFTPD_LANG:=english} - --with-peruserlimits - --with-privsep - --with-puredb - --with-quotas - --with-ratios - --with-throttling - --with-uploadscript - --with-virtualhosts - $(use_with ldap) - $(use_with mysql) - $(use_with pam) - $(use_with paranoidmsg) - $(use_with postgres pgsql) - $(use_with ssl tls) - $(use_with implicittls) - $(use_with vchroot virtualchroot) - $(use_with sysquota sysquotas) - $(usex caps '' '--without-capabilities') - $(usex noiplog '--without-iplogging' '') - $(usex xinetd '' '--without-inetd') - ) - econf "${myeconfargs[@]}" -} - -src_install() { - local DOCS=( AUTHORS ChangeLog FAQ HISTORY README* NEWS ) - - default - - newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN} - newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN} - - if use implicittls ; then - sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \ - || die "Adjusting default server port for implicittls usage failed!" - fi - - keepdir /var/lib/run/${PN} - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/pure-ftpd.xinetd" ${PN} - fi - - if use ldap ; then - insinto /etc/openldap/schema - doins pureftpd.schema - insinto /etc/openldap - insopts -m 0600 - doins pureftpd-ldap.conf - fi -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - # This is a new installation - elog - elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!" - elog - ewarn "It's *really* important to read the README provided with Pure-FTPd!" - ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info" - ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info." - ewarn - fi -} diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild index 712fefda22b2..a01e48fe71f1 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r3.ebuild @@ -15,7 +15,7 @@ else ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 " - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" fi LICENSE="BSD GPL-2" diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild index e78b1e52dc2e..712fefda22b2 100644 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.50-r1.ebuild +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.51.ebuild @@ -6,66 +6,63 @@ EAPI=8 inherit flag-o-matic DESCRIPTION="Fast, production-quality, standard-conformant FTP server" -HOMEPAGE="http://www.pureftpd.org/" +HOMEPAGE="https://www.pureftpd.org/project/pure-ftpd/" if [[ "${PV}" == 9999 ]] ; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/jedisct1/pure-ftpd.git" else - SRC_URI="ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 - http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" + SRC_URI=" + ftp://ftp.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 + http://download.pureftpd.org/pub/${PN}/releases/${P}.tar.bz2 + " + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" fi LICENSE="BSD GPL-2" SLOT="0" - IUSE="anondel anonperm anonren anonres caps implicittls ldap mysql noiplog pam paranoidmsg postgres resolveids selinux ssl sysquota vchroot xinetd" - REQUIRED_USE="implicittls? ( ssl )" -BDEPEND="sys-devel/autoconf-archive" - -DEPEND="dev-libs/libsodium:= +DEPEND=" + dev-libs/libsodium:= virtual/libcrypt:= caps? ( sys-libs/libcap ) ldap? ( >=net-nds/openldap-2.0.25:= ) mysql? ( || ( - dev-db/mariadb-connector-c - dev-db/mysql-connector-c - ) ) + dev-db/mariadb-connector-c + dev-db/mysql-connector-c + ) + ) pam? ( sys-libs/pam ) postgres? ( dev-db/postgresql:= ) - ssl? ( - >=dev-libs/openssl-0.9.6g:0=[-bindist(-)] - ) + ssl? ( dev-libs/openssl:0=[-bindist(-)] ) sysquota? ( sys-fs/quota[-rpc] ) - xinetd? ( virtual/inetd )" + xinetd? ( virtual/inetd ) +" -RDEPEND="${DEPEND} +RDEPEND=" + ${DEPEND} net-ftp/ftpbase - selinux? ( sec-policy/selinux-ftp )" + selinux? ( sec-policy/selinux-ftp ) +" -PATCHES=( - "${FILESDIR}/${PN}-1.0.28-pam.patch" -) +BDEPEND="sys-devel/autoconf-archive" + +PATCHES=( "${FILESDIR}/${PN}-1.0.28-pam.patch" ) src_prepare() { default + [[ "${PV}" == 9999 ]] && eautoreconf } src_configure() { - # adjust max user length to something more appropriate - # for virtual hosts. See bug #62472 for details. - sed -e "s:# define MAX_USER_LENGTH 32U:# define MAX_USER_LENGTH 127U:" \ - -i "${S}/src/ftpd.h" || die "sed failed" - # Those features are only configurable like this, see bug #179375. - use anondel && append-cppflags -DANON_CAN_DELETE - use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS - use anonren && append-cppflags -DANON_CAN_RENAME - use anonres && append-cppflags -DANON_CAN_RESUME - use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS + use anondel && append-cppflags -DANON_CAN_DELETE + use anonperm && append-cppflags -DANON_CAN_CHANGE_PERMS + use anonren && append-cppflags -DANON_CAN_RENAME + use anonres && append-cppflags -DANON_CAN_RESUME + use resolveids && append-cppflags -DALWAYS_RESOLVE_IDS # Do not auto-use SSP -- let the user select this. export ax_cv_check_cflags___fstack_protector_all=no @@ -73,7 +70,7 @@ src_configure() { local myeconfargs=( --enable-largefile # Required for correct pid file location. - # pure-ftpd appends "/run/pure-ftpd.pid" to the localstatedir + # Pure-FTPd appends "/run/pure-ftpd.pid" to the localstatedir # path, and tries to write to that file even when being # started in foreground. So we need to pin this to / --localstatedir="${EPREFIX}"/ @@ -91,40 +88,41 @@ src_configure() { --with-throttling --with-uploadscript --with-virtualhosts + $(use_with implicittls) $(use_with ldap) $(use_with mysql) $(use_with pam) $(use_with paranoidmsg) $(use_with postgres pgsql) $(use_with ssl tls) - $(use_with implicittls) - $(use_with vchroot virtualchroot) $(use_with sysquota sysquotas) + $(use_with vchroot virtualchroot) $(usex caps '' '--without-capabilities') $(usex noiplog '--without-iplogging' '') $(usex xinetd '' '--without-inetd') ) + econf "${myeconfargs[@]}" } src_install() { - local DOCS=( AUTHORS ChangeLog FAQ HISTORY README* NEWS ) - default - newinitd "${FILESDIR}/pure-ftpd.rc11" ${PN} - newconfd "${FILESDIR}/pure-ftpd.conf_d-3" ${PN} + newinitd "${FILESDIR}/pure-ftpd.initd-r12" pure-ftpd + newconfd "${FILESDIR}/pure-ftpd.confd-r4" pure-ftpd + + newinitd "${FILESDIR}/pure-uploadscript.initd-r1" pure-uploadscript + newconfd "${FILESDIR}/pure-uploadscript.confd" pure-uploadscript if use implicittls ; then - sed -i '/^SERVER/s@21@990@' "${ED}"/etc/conf.d/${PN} \ - || die "Adjusting default server port for implicittls usage failed!" + sed -e '/^# Bind/s@21@990@' -i "${ED}"/etc/pure-ftpd.conf || die fi - keepdir /var/lib/run/${PN} + if use ssl ; then + newinitd "${FILESDIR}/pure-certd.initd" pure-certd - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/pure-ftpd.xinetd" ${PN} + exeinto /etc + newexe "${FILESDIR}/pure-certd.script" pure-certd.sh fi if use ldap ; then @@ -134,17 +132,30 @@ src_install() { insopts -m 0600 doins pureftpd-ldap.conf fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/pure-ftpd.xinetd" pure-ftpd + fi } pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then + if [[ -z "${REPLACING_VERSIONS}" ]] ; then # This is a new installation elog - elog "Before starting Pure-FTPd, you have to edit the /etc/conf.d/pure-ftpd file!" + elog "Before starting Pure-FTPd, you have to edit the /etc/pure-ftpd.conf file!" elog ewarn "It's *really* important to read the README provided with Pure-FTPd!" ewarn "Check out http://download.pureftpd.org/pub/pure-ftpd/doc/README for general info" ewarn "and http://download.pureftpd.org/pub/pure-ftpd/doc/README.TLS for SSL/TLS info." ewarn + else + for v in ${REPLACING_VERSIONS} ; do + if ver_test "${v}" -le "1.0.50" ; then + einfo "Configuration through /etc/conf.d/pure-ftpd is now deprecated!" + einfo "Please migrate your settings to the new configuration file." + einfo "Use /etc/pure-ftpd.conf to adjust your settings." + fi + done fi } |