From 677b7ba5c317778df2ad7e70df94b9b7eec4adbc Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 10 Sep 2021 04:21:55 +0100 Subject: gentoo resync : 10.09.2021 --- net-ftp/Manifest.gz | Bin 3505 -> 3507 bytes net-ftp/pure-ftpd/Manifest | 2 + ...pure-ftpd-1.0.49-quota_maxfile_size_check.patch | 25 ++++ net-ftp/pure-ftpd/pure-ftpd-1.0.49-r5.ebuild | 160 +++++++++++++++++++++ 4 files changed, 187 insertions(+) create mode 100644 net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch create mode 100644 net-ftp/pure-ftpd/pure-ftpd-1.0.49-r5.ebuild (limited to 'net-ftp') diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz index e256ae6161e0..0000dba3f6d7 100644 Binary files a/net-ftp/Manifest.gz and b/net-ftp/Manifest.gz differ diff --git a/net-ftp/pure-ftpd/Manifest b/net-ftp/pure-ftpd/Manifest index 3a4432f9ee79..0df107cfaddf 100644 --- a/net-ftp/pure-ftpd/Manifest +++ b/net-ftp/pure-ftpd/Manifest @@ -2,10 +2,12 @@ AUX pure-ftpd-1.0.28-pam.patch 568 BLAKE2B cb7a9540e5646d7e9b734f893d4449e11cad6 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.rc11 2018 BLAKE2B 1783228b5179b6d11fd6b06bc722e15f6f81e6c8443dd516f8fe1b7c7132ef4f8b92a67083354a4f78d41cee4b4a33b39d1940748bcd1056d336b5744069aac8 SHA512 920bb0c20a3a0a053977e999cf26a23a835155eca9c0224577b13623e002a07f52c30439e54f66c42dd89566b66cc5b8341a3d2e78a9bdc038f2a096153daaba AUX pure-ftpd.xinetd 247 BLAKE2B aa2b0f8b4b6ff45e9b8dd632af5ff680ddd5abe51647dda91ca78bf3cb9ba9a090b20433f460213e95b8e57958d711f4bd7fa594b3d33fae818b853ec5aaee5d SHA512 e8ac0527daf1e182e7514d17f04bd20e789231e627cc7228ac23a241a4c420204a61ef9438c57e63f402eb3608ae0acc15a72fe484c99bb4e172bbd5ece2b72d DIST pure-ftpd-1.0.49.tar.bz2 487958 BLAKE2B bd5f10a49b533eb6c257032659e97aa7ae16ec9402704d8ee06c92938e217b748b390ccf0e31b3640f41cb7a93f85b29c8ddcdc296f214391b1d92da9d701a7c SHA512 b44896d6fe2cda9169b1db93c5260bb892af14a173f2d25e60dd6530afe85d8e9156985609e35da7e5550dc123afb42bc5012beb9fca9011054cf0ed8b2eddef EBUILD pure-ftpd-1.0.49-r4.ebuild 4305 BLAKE2B 9d8789fdc25ef75df2c424498fb4a91967d37322f4613bf78f48082bbb58d691641f34ca5e751d852ac8339e36dddb6d96435441ead33b14138612c30477d653 SHA512 5a396221a666abefdca147103171ffca208f564f330d23f696d0d8e7f373cc638893bd5914fcc34e458c9822135cae4ca4a3ab891a00903d12115835444c2553 +EBUILD pure-ftpd-1.0.49-r5.ebuild 4397 BLAKE2B f36c1a924aa02752a136c0a7d9be2ff1adc3ee8efe636b1573270aa6a18a0f6f6e0f9500eda2d8c6c6a692656bc800092d882af545c55c846d4666bcee400f29 SHA512 93c87092af3950c04120bb801c1bbb6e60d83ebda024f22ff74585988a950e7d19a57b45d84497bfbca9499351840b0643712e7f44379fb57708cdebf8695d66 EBUILD pure-ftpd-9999.ebuild 4100 BLAKE2B bfea3ea19aa899478581e2b024ee0e464d4732ab554f620f1a966d7afbe5bcc14df73e874c132434d9a69ff0cc5cfff8594aa66a7c16f28bd65d7a4426f0856d SHA512 8f10922e2fe91528a7736ad28bd6a9f1773f444fe024a98e989713bf3b4c5547b7fb307866155d051a1bd637b58c9eab47b9288a1aec2ca6b818b1eb77429b9e MISC metadata.xml 1176 BLAKE2B b11de08a23ff79546eaa18ea83dda697c855f2f4f636ef933737d31a11f225502121dd2138c9f015114484526378f2905892dcb709269c6df7fa78e3c0670957 SHA512 1e4c4bfc1adb2d9996e3bf9cdd2a4946b8314ffe2d1292d3313458d5cdf35824fe6e3af1ae9e66da824815dd16e3d0875daf55f613b3ac362bee0e48558d2161 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 new file mode 100644 index 000000000000..8b1877366c20 --- /dev/null +++ b/net-ftp/pure-ftpd/files/pure-ftpd-1.0.49-quota_maxfile_size_check.patch @@ -0,0 +1,25 @@ +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/pure-ftpd-1.0.49-r5.ebuild b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r5.ebuild new file mode 100644 index 000000000000..62d4cedc6909 --- /dev/null +++ b/net-ftp/pure-ftpd/pure-ftpd-1.0.49-r5.ebuild @@ -0,0 +1,160 @@ +# Copyright 1999-2021 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" +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 +} -- cgit v1.2.3