From 2fe5661a32d6ec0ba1d6b37cc8ae67e3f81459ec Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 May 2023 17:37:01 +0100 Subject: gentoo auto-resync : 07:05:2023 - 17:37:01 --- net-ftp/pure-ftpd/Manifest | 3 +- .../files/pure-ftpd-1.0.51-sys-sendfile.patch | 37 +++++ net-ftp/pure-ftpd/pure-ftpd-1.0.51-r1.ebuild | 164 -------------------- net-ftp/pure-ftpd/pure-ftpd-1.0.51-r2.ebuild | 167 +++++++++++++++++++++ 4 files changed, 206 insertions(+), 165 deletions(-) create mode 100644 net-ftp/pure-ftpd/files/pure-ftpd-1.0.51-sys-sendfile.patch delete mode 100644 net-ftp/pure-ftpd/pure-ftpd-1.0.51-r1.ebuild create mode 100644 net-ftp/pure-ftpd/pure-ftpd-1.0.51-r2.ebuild (limited to 'net-ftp/pure-ftpd') diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest index b167ec286e1c..0fe8e6e94c0d 100644 --- a/net-ftp/pure-ftpd/Manifest +++ b/net-ftp/pure-ftpd/Manifest @@ -1,12 +1,13 @@ AUX pure-certd.initd 562 BLAKE2B 21431b74d2a745b13daa7772748b4484e18a640ffc07252ed60867b297a8f31267f583ceb408ee31c11bbc43de3fcda0b51e4324279b50c8a4a19ea6f1342945 SHA512 1a7a7dcba98e92e86ae3f35c33c5fe970c6530f1059692f32cdc851de1d8492720020b252e70c646eff6fdbbb32dfb99b1ae449acaea5fd0fe5541dc89891301 AUX pure-certd.script 675 BLAKE2B 937fb3eb12ade192cd758d47f17cec97fe2b2f12bfc34d6ff531c3e012d0a117f0501800f1d61fa22ce4824dc064efaa0937fa02c814949a9d380341f269dc05 SHA512 612616e2c3f9d5a0552ae4da3924ca86deb3ef747de48b55fc52b0edd5719116f0e3d9df60c61ae061023bf5981385f01f1dac284f8bdcd63234c3708ec3f0d0 AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad60f897b39ed111559877edb4cf22e607fcf15d6ed7eea6dbf7a03a430c9182d6405ced13cf9c6614d15a45e17a49 SHA512 c331837c4c8988e0623a6a4f4222263dd161a49a2748079d3c539db2025b7b048ca5976b4450dd32cab5755932c7e59f6976d9d3bda2e5e87f1869789f8e00ba +AUX pure-ftpd-1.0.51-sys-sendfile.patch 1324 BLAKE2B 05fd1d0091faf606bc469e68180856d125b892114c9be72ed15cdab403f74f82001125ad257820c7ed005ba8d7a7437381eaf8585a3d2d7f3d057129558bbb6d SHA512 cd53f9d9fc317ac5a77ceb5048fda80ca3183ec5614f8843a45b9dde21b3f7c0f9d0c1f5d9a830f7587fa25d59360fb76cd86f413dcb7a3c6df125c6271a70f3 AUX pure-ftpd.confd-r4 170 BLAKE2B d552480bea7503066ef3f0e90a082660a30f35cf809e26860ba9b49fcbb2fcdafdfe35041510fdd73f1b42cb35b7d90caa37ed9722de769750558818ebfbfe43 SHA512 6afde5a6e0f8e3a14bd23a6f861e18754980ab1b845defe06378493ed58e693628f4af71b591b3160037a0fdf6cc750c2a0d156a47c48a2a1d58c0032e389a1f AUX pure-ftpd.initd-r12 519 BLAKE2B 6271067b195de1b662ffe1577aaf3e6e2badd44494e17f27671f9f70e3f1bb955326af390b709a4ff9cefd2ba48e1ef77efaaac5595a5dccbbb75e9376db7153 SHA512 2189b8761aa51b68bd4b5b5c79e3f7220c9f96e5187bf17ed55a50a74ebe0989b3d5f2c9d8b3bdc89d184ce7f97d16e1c51e46b3d178feacc72864090717b8a1 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.51.tar.bz2 520648 BLAKE2B 0b82fee114986140eb74d2669b7d91582a48f1b366936895acda913afb7d3bca1578295a930f7857f8674e593bd1bf8094c36f2ae8db6cf1a62cacfd4234cf13 SHA512 3615ac1ec42813855f3328dde200f60025e1f2ca7d1e17ea042967fd4164079260d058f3e2586acd778334660f387a280b35850a9e2091dd913fb84ef929bdca -EBUILD pure-ftpd-1.0.51-r1.ebuild 4450 BLAKE2B a74926b5714227b97d6e7732985b5302e9f8d95f2ee5d722ad6c9b5aedd1a9d89b28405c9bd35e5dd460d328725cfd0f9187c09782fe77ad9314081dcf9429e9 SHA512 4130b154979dc8954da66d053bbd295e661684eac51b42aff1a5a36ab9c540e896f3a126eff63f95c8b3a595aa056edfbe893eb71f50caf2da9e3e5127e391da +EBUILD pure-ftpd-1.0.51-r2.ebuild 4498 BLAKE2B e7713607a9809b8cb1525db1a9cb9a92c8a7c5e20dbea96db8721ba2051ffca9353ab2e6d7a1751a7cb44d1b411e60996ac0c346bd4e2dc69114f5db9305f462 SHA512 c9556e6034e759681e4140a60155b736d5793c93c65b09971dda715a19f1ed53cfe4083916be627fa22955336d64ef206c7c35d29f6982a8c815ba18d7350b85 EBUILD pure-ftpd-9999.ebuild 4459 BLAKE2B c9b9a0eb103ba66c0c31e71ca61377829d40dfaef4f81528936b395b2a04d7ca39d4689e5d78dfe0432c376bb63269169cc8f9ddb1a9bdbaf07a1b1f6d222f8b SHA512 acb68506a8a4df2c33b75830fe0ff965892bbaf7b63dc0dc6f51ac0e10ec8f4a2865dd1c671e084de3ad7c06e6fced96b93036cc18c8ff4bb1ce03cff8e70bf0 MISC metadata.xml 1289 BLAKE2B bf0e11d7e99724a817cdd10c7d38898d60725e455b4cf438a5d0e63cdaddaa6f4f3b231eb51231ff55226850f084dde65d885785aae0f5b7e3ccede8df366952 SHA512 ab0cfea202b128a04fb269f9332e9a1267d7e5194b3f34e2d34aefca07323304cacf8cbd97cf4db2e990632c1be781f97334a220aa5cb9815f7ca7eef4ad0ac1 diff --git a/net-ftp/pure-ftpd/files/pure-ftpd-1.0.51-sys-sendfile.patch b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.51-sys-sendfile.patch new file mode 100644 index 000000000000..bc2973c1389c --- /dev/null +++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.51-sys-sendfile.patch @@ -0,0 +1,37 @@ +From 511315971f227ac2ce1481ff9e7350a607f78d23 Mon Sep 17 00:00:00 2001 +From: Sam James +Date: Sun, 23 Apr 2023 06:27:20 +0100 +Subject: [PATCH] configure.ac: Silence harmless + -Wimplicit-function-declaration warning in hpux sendfile check + +We're currently looking for build systems where -Wimplicit-function-declaration +is emitted by checks as it often implies a missing include, but in this case, +it's fine - HPUX doesn't have a sendfile header, so it's just noise (and it +won't be true on Linux anyway). + +But the check is run unconditionally and we already check if sendfile.h exists, +so include the header conditionally if it exists, as it's harmless and it avoids +it looking like there's a problem in pure-ftpd. + +Unfortunately, it's not so easy to silence the sendfilev check which has +a similar (but different) problem because it uses AC_CHECK_FUNCS. + +Bug: https://bugs.gentoo.org/900068 +--- + configure.ac | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 62768c8..0abb423 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -718,6 +718,9 @@ AC_MSG_CHECKING([if a hpuxish sendfile is available]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[ + #include + #include ++#ifdef HAVE_SYS_SENDFILE_H ++# include ++#endif + ]], [[ + do { + int fd = 0; diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r1.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r1.ebuild deleted file mode 100644 index 223cdb2a5ea7..000000000000 --- a/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r1.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="Fast, production-quality, standard-conformant FTP server" -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 ~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 )" - -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=[-bindist(-)] ) - sysquota? ( sys-fs/quota[-rpc] ) - xinetd? ( virtual/inetd ) -" - -RDEPEND=" - ${DEPEND} - net-ftp/ftpbase - selinux? ( sec-policy/selinux-ftp ) -" - -BDEPEND="sys-devel/autoconf-archive" - -PATCHES=( "${FILESDIR}/${PN}-1.0.28-pam.patch" ) - -src_prepare() { - default - - # Don't hardcode FORTIFY_SOURCE - sed -e '/-D_FORTIFY_SOURCE=2/d' -i configure || die - - [[ "${PV}" == 9999 ]] && eautoreconf -} - -src_configure() { - # 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 implicittls) - $(use_with ldap) - $(use_with mysql) - $(use_with pam) - $(use_with paranoidmsg) - $(use_with postgres pgsql) - $(use_with ssl tls) - $(use_with sysquota sysquotas) - $(use_with vchroot virtualchroot) - $(usex caps '' '--without-capabilities') - $(usex noiplog '--without-iplogging' '') - $(usex xinetd '' '--without-inetd') - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - 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 -e '/^# Bind/s@21@990@' -i "${ED}"/etc/pure-ftpd.conf || die - fi - - if use ssl ; then - newinitd "${FILESDIR}/pure-certd.initd" pure-certd - - exeinto /etc - newexe "${FILESDIR}/pure-certd.script" pure-certd.sh - fi - - if use ldap ; then - insinto /etc/openldap/schema - doins pureftpd.schema - insinto /etc/openldap - 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 - # This is a new installation - elog - 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 -} diff --git a/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r2.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r2.ebuild new file mode 100644 index 000000000000..78000f7885e9 --- /dev/null +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.51-r2.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic + +DESCRIPTION="Fast, production-quality, standard-conformant FTP server" +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 ~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 )" + +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=[-bindist(-)] ) + sysquota? ( sys-fs/quota[-rpc] ) + xinetd? ( virtual/inetd ) +" + +RDEPEND=" + ${DEPEND} + net-ftp/ftpbase + selinux? ( sec-policy/selinux-ftp ) +" + +BDEPEND="sys-devel/autoconf-archive" + +PATCHES=( + "${FILESDIR}/${PN}-1.0.28-pam.patch" + "${FILESDIR}/${PN}-1.0.51-sys-sendfile.patch" +) + +src_prepare() { + default + + # Don't hardcode FORTIFY_SOURCE + sed -e '/-D_FORTIFY_SOURCE=2/d' -i configure || die + + [[ "${PV}" == 9999 ]] && eautoreconf +} + +src_configure() { + # 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 implicittls) + $(use_with ldap) + $(use_with mysql) + $(use_with pam) + $(use_with paranoidmsg) + $(use_with postgres pgsql) + $(use_with ssl tls) + $(use_with sysquota sysquotas) + $(use_with vchroot virtualchroot) + $(usex caps '' '--without-capabilities') + $(usex noiplog '--without-iplogging' '') + $(usex xinetd '' '--without-inetd') + ) + + econf "${myeconfargs[@]}" +} + +src_install() { + default + + 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 -e '/^# Bind/s@21@990@' -i "${ED}"/etc/pure-ftpd.conf || die + fi + + if use ssl ; then + newinitd "${FILESDIR}/pure-certd.initd" pure-certd + + exeinto /etc + newexe "${FILESDIR}/pure-certd.script" pure-certd.sh + fi + + if use ldap ; then + insinto /etc/openldap/schema + doins pureftpd.schema + insinto /etc/openldap + 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 + # This is a new installation + elog + 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 +} -- cgit v1.2.3