[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: 04b8bb73fe4ec83306a5aa6773ad6758422c1a18 Author: Sam James gentoo org> AuthorDate: Sun Dec 4 21:14:43 2022 + Commit: Sam James gentoo org> CommitDate: Sun Dec 4 21:14:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b8bb73 net-ftp/proftpd: add 1.3.8 Closes: https://bugs.gentoo.org/843689 Signed-off-by: Sam James gentoo.org> net-ftp/proftpd/Manifest | 1 + net-ftp/proftpd/files/proftpd.initd-r1 | 2 +- net-ftp/proftpd/proftpd-1.3.8.ebuild | 274 + 3 files changed, 276 insertions(+), 1 deletion(-) diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 3ec591664228..4561bc0e83b9 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,5 +1,6 @@ DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f SHA512 44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce +DIST proftpd-1.3.8.tar.gz 19744412 BLAKE2B b694ef6a2cbc562e88593e28bdcbc03e7b27f35d9a96c0c337cbc2b8685089ffcc9fe23bb243eab63c2f63fd0d30896407fdb163af231509a217425cd5ebd352 SHA512 e7db8829b60dbe5526a5a6160b09dcbdbeeac8f05eaa64950f4d5a918e5bfaf36924059fadef7d8a095e779da2de9c86da4e71761c573803c79eab6c2429ef8b DIST proftpd-1.3.8rc2.tar.gz 20485204 BLAKE2B fc79d56dfe61e2b7b0b2a8da52237f402212389b424c92142e24d4caa8688598ca26d2e2956e1ce5fa9c5ac7467aa7f61ebecc6e4ffe73a74118ab242049b68f SHA512 0d98fb2a3044c4426aaf47f483e7af09c736d641ab7334e5f0f32088be1c904bc9ca00aae8977e496c951c63071deb20c282f53f43c1664bc4978a66215a774a DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975 diff --git a/net-ftp/proftpd/files/proftpd.initd-r1 b/net-ftp/proftpd/files/proftpd.initd-r1 index dcd262bfcbd4..0d59ec5762e8 100644 --- a/net-ftp/proftpd/files/proftpd.initd-r1 +++ b/net-ftp/proftpd/files/proftpd.initd-r1 @@ -15,7 +15,7 @@ check_configuration() { eerror "file. In /etc/proftpd you can find a sample configuration." return 1 fi - /usr/sbin/proftpd -t &>/dev/null + /usr/sbin/proftpd -t >/dev/null 2>&1 if [ $? -ne 0 ] ; then eerror "The ProFTPD configuration file /etc/proftpd/proftpd.conf is invalid! You have to" eerror "fix your configuration in order to run the ProFTPD server. For more information" diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild new file mode 100644 index ..6671985169fb --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.8.ebuild @@ -0,0 +1,274 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit multilib systemd tmpfiles toolchain-funcs + +MOD_CASE="0.7" +MOD_CLAMAV="0.14rc2" +MOD_DISKUSE="0.9" +MOD_GSS="1.3.9" +MOD_MSG="0.4.1" +MOD_VROOT="0.9.4" + +DESCRIPTION="An advanced and very configurable FTP server" +HOMEPAGE="http://www.proftpd.org/ + http://www.castaglia.org/proftpd/ + https://github.com/jbenden/mod_clamav + http://gssmod.sourceforge.net/; +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz + case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz ) + clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz ) + diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz ) + kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz ) + msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz ) + vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: 6ef32f28e35c0ab7cf58ad7d11a9530f6447aa7e Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Apr 17 20:30:43 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Apr 17 20:30:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef32f28 net-ftp/proftpd: backport USE=-ncurses fix Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/777531 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich gentoo.org> .../proftpd/files/proftpd-1.3.7a-no-ncurses.patch | 269 + net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild | 1 + 2 files changed, 270 insertions(+) diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch new file mode 100644 index 000..be18a995459 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch @@ -0,0 +1,269 @@ +https://github.com/proftpd/proftpd/commit/8fc570bc13e771d3ecafe53ab94ada0be2b6646a +https://bugs.gentoo.org/777531 + +From 8fc570bc13e771d3ecafe53ab94ada0be2b6646a Mon Sep 17 00:00:00 2001 +From: TJ Saunders +Date: Tue, 23 Mar 2021 19:50:49 -0700 +Subject: [PATCH] Issue #1207: Properly honor the `--disable-curses`, + `--disable-ncurses` configure options. + +--- + configure| 156 +++ + configure.in | 39 + + 2 files changed, 172 insertions(+), 23 deletions(-) + +diff --git a/configure b/configure +index 86cf1360e..59df363fa 100755 +--- a/configure b/configure +@@ -22970,7 +22970,7 @@ $as_echo "#define SETGRENT_VOID 1" >>confdefs.h + fi + + +-if test x"$ac_cv_header_curses_h" = xyes; then ++if test x"$enable_curses" != xno ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" >&5 + $as_echo_n "checking for initscr in -lcurses... " >&6; } + if ${ac_cv_lib_curses_initscr+:} false; then : +@@ -23013,12 +23013,154 @@ if test "x$ac_cv_lib_curses_initscr" = xyes; then : + $as_echo "#define HAVE_LIBCURSES 1" >>confdefs.h + + ++$as_echo "#define PR_USE_CURSES 1" >>confdefs.h ++ ++ + fi + ++ ++ if test x"$enable_nls" = xyes ; then ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfow" >&5 ++$as_echo_n "checking for halfdelay in -ltinfow... " >&6; } ++if ${ac_cv_lib_tinfow_halfdelay+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltinfow $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char halfdelay (); ++int ++main () ++{ ++return halfdelay (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_tinfow_halfdelay=yes ++else ++ ac_cv_lib_tinfow_halfdelay=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS + fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_halfdelay" >&5 ++$as_echo "$ac_cv_lib_tinfow_halfdelay" >&6; } ++if test "x$ac_cv_lib_tinfow_halfdelay" = xyes; then : ++ UTILS_LIBS="$UTILS_LIBS -ltinfow" ++ ++$as_echo "#define HAVE_LIBTINFOW 1" >>confdefs.h ++ ++ ++else ++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5 ++$as_echo_n "checking for halfdelay in -ltinfo... " >&6; } ++if ${ac_cv_lib_tinfo_halfdelay+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltinfo $LIBS" ++cat confdefs.h - <<_ACEOF >conftest.$ac_ext ++/* end confdefs.h. */ ++ ++/* Override any GCC internal prototype to avoid an error. ++ Use char because int might match the return type of a GCC ++ builtin and then its argument prototype would still apply. */ ++#ifdef __cplusplus ++extern "C" ++#endif ++char halfdelay (); ++int ++main () ++{ ++return halfdelay (); ++ ; ++ return 0; ++} ++_ACEOF ++if ac_fn_c_try_link "$LINENO"; then : ++ ac_cv_lib_tinfo_halfdelay=yes ++else ++ ac_cv_lib_tinfo_halfdelay=no ++fi ++rm -f core conftest.err conftest.$ac_objext \ ++conftest$ac_exeext conftest.$ac_ext ++LIBS=$ac_check_lib_save_LIBS ++fi ++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" >&5 ++$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; } ++if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then : ++ UTILS_LIBS="$UTILS_LIBS -ltinfo" ++ ++$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h ++ ++ ++fi ++ ++ ++fi ++ ++ else ++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" >&5 ++$as_echo_n "checking for halfdelay in -ltinfo... " >&6; } ++if ${ac_cv_lib_tinfo_halfdelay+:} false; then : ++ $as_echo_n "(cached) " >&6 ++else ++ ac_check_lib_save_LIBS=$LIBS ++LIBS="-ltinfo $LIBS"
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: 50c17a9aebd91f823703f4843b16129a0b2346ea Author: Sergei Trofimovich gentoo org> AuthorDate: Fri May 29 22:31:54 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri May 29 22:36:30 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c17a9a net-ftp/proftpd: move from /var/run to /run, bug #672292 While at it plumbed $CC handling. Reported-by: Louis Sautier Closes: https://bugs.gentoo.org/672292 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Sergei Trofimovich gentoo.org> net-ftp/proftpd/files/proftpd-tmpfiles.d.conf-r1 | 1 + net-ftp/proftpd/files/proftpd.initd-r1 | 51 + net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild | 276 +++ 3 files changed, 328 insertions(+) diff --git a/net-ftp/proftpd/files/proftpd-tmpfiles.d.conf-r1 b/net-ftp/proftpd/files/proftpd-tmpfiles.d.conf-r1 new file mode 100644 index 000..241dc7cb1bd --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-tmpfiles.d.conf-r1 @@ -0,0 +1 @@ +d /run/proftpd 0755 root root diff --git a/net-ftp/proftpd/files/proftpd.initd-r1 b/net-ftp/proftpd/files/proftpd.initd-r1 new file mode 100644 index 000..dcd262bfcbd --- /dev/null +++ b/net-ftp/proftpd/files/proftpd.initd-r1 @@ -0,0 +1,51 @@ +#!/sbin/openrc-run +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +extra_started_commands="reload" + +depend() { + need net + use logger dns mysql postgresql antivirus +} + +check_configuration() { + if [ ! -e /etc/proftpd/proftpd.conf ] ; then + eerror "To execute the ProFTPD server you need a /etc/proftpd/proftpd.conf configuration" + eerror "file. In /etc/proftpd you can find a sample configuration." + return 1 + fi + /usr/sbin/proftpd -t &>/dev/null + if [ $? -ne 0 ] ; then + eerror "The ProFTPD configuration file /etc/proftpd/proftpd.conf is invalid! You have to" + eerror "fix your configuration in order to run the ProFTPD server. For more information" + eerror "you may execute the ProFTPD configuration check '/usr/sbin/proftpd -t'." + return 2 + fi +} + +start() { + checkpath -d /run/proftpd + [ "${RC_CMD}" = "restart" ] || check_configuration || return 1 + ebegin "Starting ProFTPD" + start-stop-daemon --start --quiet \ + --exec /usr/sbin/proftpd \ + --pidfile /run/proftpd/proftpd.pid + eend $? +} + +stop() { + [ "${RC_CMD}" != "restart" ] || check_configuration || return 1 + ebegin "Stopping ProFTPD" + start-stop-daemon --stop --quiet --retry 20 \ + --pidfile /run/proftpd/proftpd.pid + eend $? +} + +reload() { + check_configuration || return 1 + ebegin "Reloading ProFTPD" + start-stop-daemon --quiet --signal HUP \ + --pidfile /run/proftpd/proftpd.pid + eend $? +} diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild new file mode 100644 index 000..af107f0bd6e --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit multilib systemd tmpfiles toolchain-funcs + +MOD_CASE="0.7" +MOD_CLAMAV="0.14rc2" +MOD_DISKUSE="0.9" +MOD_GSS="1.3.9" +MOD_MSG="0.4.1" +MOD_VROOT="0.9.4" + +DESCRIPTION="An advanced and very configurable FTP server" +HOMEPAGE="http://www.proftpd.org/ + http://www.castaglia.org/proftpd/ + https://github.com/jbenden/mod_clamav + http://gssmod.sourceforge.net/; +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz + case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz ) + clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz ) + diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz ) + kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz ) + msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz ) + vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 + kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius + ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot" +# TODO: geoip +REQUIRED_USE="ban? ( ctrls ) + msg? ( ctrls ) + sftp? ( ssl ) +
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: 8dadce6a213a385c9e347260745c52ca84b7580c Author: Sergei Trofimovich gentoo org> AuthorDate: Tue Oct 15 22:27:24 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Oct 15 22:27:59 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dadce6a net-ftp/proftpd: Fix test suite detection, bug #697782 Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/697782 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Sergei Trofimovich gentoo.org> .../files/proftpd-1.3.6a-fix-libcheck.patch| 28 ++ net-ftp/proftpd/proftpd-1.3.6a.ebuild | 1 + 2 files changed, 29 insertions(+) diff --git a/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch b/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch new file mode 100644 index 000..93752c43e92 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch @@ -0,0 +1,28 @@ +Fix test suite detection. + +https://github.com/proftpd/proftpd/pull/839 + +Reported-by: Toralf Förster +Bug: https://bugs.gentoo.org/697782 +--- a/configure.in b/configure.in +@@ -991,7 +991,7 @@ AC_ARG_ENABLE(tests, + [enable unit tests (default=no)]) + ], + [ +-if test "$enableval" != xno ; then ++if test x"$enableval" != xno ; then + AC_CHECK_HEADERS(check.h) + + AC_CHECK_LIB(check, tcase_create, +--- a/configure b/configure +@@ -20639,7 +20639,7 @@ ENABLE_TESTS="\"\"" + # Check whether --enable-tests was given. + if test "${enable_tests+set}" = set; then + enableval=$enable_tests; +-if test "$enableval" != xno ; then ++if test x"$enableval" != xno ; then + + for ac_header in check.h + do diff --git a/net-ftp/proftpd/proftpd-1.3.6a.ebuild b/net-ftp/proftpd/proftpd-1.3.6a.ebuild index cc22d06099a..adb025d7e1f 100644 --- a/net-ftp/proftpd/proftpd-1.3.6a.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.6a.ebuild @@ -71,6 +71,7 @@ S="${WORKDIR}/${P/_/}" PATCHES=( "${FILESDIR}"/${PN}-1.3.6-use-trace.patch "${FILESDIR}"/${PN}-1.3.6-mysql-8.patch + "${FILESDIR}"/${PN}-1.3.6a-fix-libcheck.patch ) RESTRICT=test # tests corrupt memory. need to be fixed upstream first
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: 7a15285681e428f4d4800705b1561db599c3cf79 Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Jul 24 06:40:13 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Jul 24 06:40:45 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a152856 net-ftp/proftpd: fix mod_copy RCE, bug #690528 Also known as CVE-2019-12815. Bug: https://bugs.gentoo.org/690528 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Sergei Trofimovich gentoo.org> net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch | 96 +++ net-ftp/proftpd/proftpd-1.3.6-r5.ebuild| 275 + 2 files changed, 371 insertions(+) diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch b/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch new file mode 100644 index 000..40d912eb2b5 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch @@ -0,0 +1,96 @@ +https://bugs.gentoo.org/690528 +CVE-2019-12815 + +From a73dbfe3b61459e7c2806d5162b12f0957990cb3 Mon Sep 17 00:00:00 2001 +From: TJ Saunders +Date: Wed, 17 Jul 2019 09:48:39 -0700 +Subject: [PATCH] Backport of fix for Bug#4372 to the 1.3.6 branch. + +--- + NEWS | 1 + + contrib/mod_copy.c | 36 +--- + 2 files changed, 34 insertions(+), 3 deletions(-) + +--- a/contrib/mod_copy.c b/contrib/mod_copy.c +@@ -1,7 +1,7 @@ + /* + * ProFTPD: mod_copy -- a module supporting copying of files on the server + * without transferring the data to the client and back +- * Copyright (c) 2009-2016 TJ Saunders ++ * Copyright (c) 2009-2019 TJ Saunders + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by +@@ -657,7 +657,7 @@ MODRET copy_copy(cmd_rec *cmd) { + MODRET copy_cpfr(cmd_rec *cmd) { + register unsigned int i; + int res; +- char *path = ""; ++ char *cmd_name, *path = ""; + unsigned char *authenticated = NULL; + + if (copy_engine == FALSE) { +@@ -705,6 +705,21 @@ MODRET copy_cpfr(cmd_rec *cmd) { + path = pstrcat(cmd->tmp_pool, path, *path ? " " : "", decoded_path, NULL); + } + ++ cmd_name = cmd->argv[0]; ++ pr_cmd_set_name(cmd, "SITE_CPFR"); ++ if (!dir_check(cmd->tmp_pool, cmd, G_READ, path, NULL)) { ++int xerrno = EPERM; ++ ++pr_cmd_set_name(cmd, cmd_name); ++pr_response_add_err(R_550, "%s: %s", (char *) cmd->argv[3], ++ strerror(xerrno)); ++ ++pr_cmd_set_errno(cmd, xerrno); ++errno = xerrno; ++return PR_ERROR(cmd); ++ } ++ pr_cmd_set_name(cmd, cmd_name); ++ + res = pr_filter_allow_path(CURRENT_CONF, path); + switch (res) { + case 0: +@@ -758,6 +773,7 @@ MODRET copy_cpfr(cmd_rec *cmd) { + MODRET copy_cpto(cmd_rec *cmd) { + register unsigned int i; + const char *from, *to = ""; ++ char *cmd_name; + unsigned char *authenticated = NULL; + + if (copy_engine == FALSE) { +@@ -816,6 +832,20 @@ MODRET copy_cpto(cmd_rec *cmd) { + + to = dir_canonical_vpath(cmd->tmp_pool, to); + ++ cmd_name = cmd->argv[0]; ++ pr_cmd_set_name(cmd, "SITE_CPTO"); ++ if (!dir_check(cmd->tmp_pool, cmd, G_WRITE, to, NULL)) { ++int xerrno = EPERM; ++ ++pr_cmd_set_name(cmd, cmd_name); ++pr_response_add_err(R_550, "%s: %s", to, strerror(xerrno)); ++ ++pr_cmd_set_errno(cmd, xerrno); ++errno = xerrno; ++return PR_ERROR(cmd); ++ } ++ pr_cmd_set_name(cmd, cmd_name); ++ + if (copy_paths(cmd->tmp_pool, from, to) < 0) { + int xerrno = errno; + const char *err_code = R_550; +@@ -940,7 +970,7 @@ static conftable copy_conftab[] = { + + static cmdtable copy_cmdtab[] = { + { CMD, C_SITE, G_WRITE,copy_copy, FALSE, FALSE, CL_MISC }, +- { CMD, C_SITE, G_DIRS, copy_cpfr, FALSE, FALSE, CL_MISC }, ++ { CMD, C_SITE, G_READ, copy_cpfr, FALSE, FALSE, CL_MISC }, + { CMD, C_SITE, G_WRITE,copy_cpto, FALSE, FALSE, CL_MISC }, + { POST_CMD, C_PASS, G_NONE, copy_post_pass, FALSE, FALSE }, + { LOG_CMD, C_SITE, G_NONE, copy_log_site, FALSE, FALSE }, +-- +2.22.0 + diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild new file mode 100644 index 000..1ae8f3c9735 --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit multilib systemd tmpfiles + +MOD_CASE="0.7" +MOD_CLAMAV="0.11rc" +MOD_DISKUSE="0.9" +MOD_GSS="1.3.6" +MOD_MSG="0.4.1" +MOD_VROOT="0.9.4" + +DESCRIPTION="An advanced and very configurable FTP server" +HOMEPAGE="http://www.proftpd.org/ + http://www.castaglia.org/proftpd/ + http://www.thrallingpenguin.com/resources/mod_clamav.htm + http://gssmod.sourceforge.net/; +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz +
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: b1c988107bbcf5b157450850bfeb54ba1ec6911d Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jun 15 07:52:45 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jun 15 09:08:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c98810 net-ftp/proftpd: add logrotate configuration, bug #345677 While at it: - updated to EAPI=7 - made USE=doc code unconditional to always install docs - made USE=xinetd unconditional to always install xinetd snippet Reported-by: Oleg Gawriloff Closes: https://bugs.gentoo.org/345677 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Sergei Trofimovich gentoo.org> net-ftp/proftpd/files/proftpd.logrotate | 11 ++ net-ftp/proftpd/proftpd-1.3.6-r4.ebuild | 274 2 files changed, 285 insertions(+) diff --git a/net-ftp/proftpd/files/proftpd.logrotate b/net-ftp/proftpd/files/proftpd.logrotate new file mode 100644 index 000..cabf5193d54 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd.logrotate @@ -0,0 +1,11 @@ +# Syslog-ng logrotate snippet for Gentoo Linux + +/var/log/proftpd/*.log /var/log/xferlog { +compress +missingok +notifempty +sharedscripts +postrotate +/etc/init.d/proftpd reload > /dev/null 2>&1 || true +endscript +} diff --git a/net-ftp/proftpd/proftpd-1.3.6-r4.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r4.ebuild new file mode 100644 index 000..489e76d5026 --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.6-r4.ebuild @@ -0,0 +1,274 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit multilib systemd tmpfiles + +MOD_CASE="0.7" +MOD_CLAMAV="0.11rc" +MOD_DISKUSE="0.9" +MOD_GSS="1.3.6" +MOD_MSG="0.4.1" +MOD_VROOT="0.9.4" + +DESCRIPTION="An advanced and very configurable FTP server" +HOMEPAGE="http://www.proftpd.org/ + http://www.castaglia.org/proftpd/ + http://www.thrallingpenguin.com/resources/mod_clamav.htm + http://gssmod.sourceforge.net/; +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz + case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz ) + clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz ) + diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz ) + kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz ) + msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz ) + vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 + kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius + ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique_id vroot" +# TODO: geoip +REQUIRED_USE="ban? ( ctrls ) + msg? ( ctrls ) + sftp? ( ssl ) + shaper? ( ctrls ) + + mysql? ( ssl ) + postgres? ( ssl ) + sqlite? ( ssl ) +" + +CDEPEND="acl? ( virtual/acl ) + caps? ( sys-libs/libcap ) + clamav? ( app-antivirus/clamav ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + memcache? ( >=dev-libs/libmemcached-0.41 ) + mysql? ( dev-db/mysql-connector-c:0= ) + nls? ( virtual/libiconv ) + ncurses? ( sys-libs/ncurses:0= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + pam? ( virtual/pam ) + pcre? ( dev-libs/libpcre ) + postgres? ( dev-db/postgresql:= ) + sodium? ( dev-libs/libsodium:0= ) + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND="${CDEPEND} + test? ( dev-libs/check )" +RDEPEND="${CDEPEND} + net-ftp/ftpbase + selinux? ( sec-policy/selinux-ftp )" + +S="${WORKDIR}/${P/_/}" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.6-use-trace.patch + "${FILESDIR}"/${PN}-1.3.6-sighup-crash.patch +) + +RESTRICT=test # tests corrupt memory. need to be fixed upstream first + +in_dir() { + pushd "${WORKDIR}/${1}" || die + shift + "$@" + popd +} + +src_prepare() { + # Skip 'install-conf' / Support LINGUAS + sed -i -e "/install-all/s/ install-conf//" Makefile.in || die + sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die + + # Prepare external modules + if use case; then + cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die + cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die + fi + + if use clamav ; then + cp -v
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: 66357ee093d02b0c26c12dcd37cf0a010ba92525 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Feb 22 21:00:11 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Feb 22 21:00:25 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66357ee0 net-ftp/proftpd: apply SIGHUP crash fix, bug #678490 It's a upstream fix picked as-is from 1.3.6 branch. Reported-by: Hanno Boeck Closes: https://bugs.gentoo.org/678490 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich gentoo.org> .../proftpd/files/proftpd-1.3.6-sighup-crash.patch | 81 +++ net-ftp/proftpd/proftpd-1.3.6-r3.ebuild| 267 + 2 files changed, 348 insertions(+) diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch b/net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch new file mode 100644 index 000..cca550405e1 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch @@ -0,0 +1,81 @@ +https://bugs.gentoo.org/678490 + +From 345aa19ee2a98a3612d9b64a49107461455031a0 Mon Sep 17 00:00:00 2001 +From: TJ Saunders +Date: Tue, 18 Jul 2017 23:00:22 -0700 +Subject: [PATCH] Bug#4310: Use of mod_facl as static module causes ProFTPD to + die on SIGHUP/restart. + +--- + modules/mod_facl.c | 35 +++ + 1 file changed, 31 insertions(+), 4 deletions(-) + +diff --git a/modules/mod_facl.c b/modules/mod_facl.c +index b3ac42b7b..258708cf5 100644 +--- a/modules/mod_facl.c b/modules/mod_facl.c +@@ -1260,16 +1260,34 @@ MODRET set_faclengine(cmd_rec *cmd) { + return PR_HANDLED(cmd); + } + ++/* Event listeners ++ */ ++ ++static void unmount_facl(void) { ++ pr_fs_t *fs; ++ ++ fs = pr_unmount_fs("/", "facl"); ++ if (fs != NULL) { ++destroy_pool(fs->fs_pool); ++fs->fs_pool = NULL; ++return; ++ } ++ ++ if (errno != ENOENT) { ++pr_log_debug(DEBUG0, MOD_FACL_VERSION ++ ": error unmounting 'facl' FS: %s", strerror(errno)); ++ } ++} ++ + #if defined(PR_SHARED_MODULE) && \ + defined(PR_USE_FACL) && \ + defined(HAVE_POSIX_ACL) + static void facl_mod_unload_ev(const void *event_data, void *user_data) { + if (strcmp("mod_facl.c", (const char *) event_data) == 0) { ++pr_fs_t *fs; ++ + pr_event_unregister(_module, NULL, NULL); +-if (pr_unregister_fs("/") < 0) { +- pr_log_debug(DEBUG0, MOD_FACL_VERSION +-": error unregistering 'facl' FS: %s", strerror(errno)); +-} ++unmount_facl(); + } + } + #endif /* !PR_SHARED_MODULE */ +@@ -1303,6 +1321,14 @@ static void facl_postparse_ev(const void *event_data, void *user_data) { + #endif /* PR_USE_FACL and HAVE_POSIX_ACL */ + } + ++static void facl_restart_ev(const void *event_data, void *user_data) { ++ if (facl_engine == FALSE) { ++return; ++ } ++ ++ unmount_facl(); ++} ++ + /* Initialization routines + */ + +@@ -1315,6 +1341,7 @@ static int facl_init(void) { + # endif /* !PR_SHARED_MODULE */ + #endif /* PR_USE_FACL and HAVE_POSIX_ACL */ + pr_event_register(_module, "core.postparse", facl_postparse_ev, NULL); ++ pr_event_register(_module, "core.restart", facl_restart_ev, NULL); + + return 0; + } +-- +2.20.1 + diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild new file mode 100644 index 000..c1babbb4fdd --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild @@ -0,0 +1,267 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit multilib systemd tmpfiles + +MOD_CASE="0.7" +MOD_CLAMAV="0.11rc" +MOD_DISKUSE="0.9" +MOD_GSS="1.3.6" +MOD_MSG="0.4.1" +MOD_VROOT="0.9.4" + +DESCRIPTION="An advanced and very configurable FTP server" +HOMEPAGE="http://www.proftpd.org/ + http://www.castaglia.org/proftpd/ + http://www.thrallingpenguin.com/resources/mod_clamav.htm + http://gssmod.sourceforge.net/; +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz + case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz ) + clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz ) + diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz ) + kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz ) + msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz ) + vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6 + kerberos ldap libressl log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius + ratio readme rewrite selinux
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: 941ea3724bb21d7c1d56e000876627343a6d0157 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Jul 15 09:42:57 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Jul 15 09:43:24 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=941ea372 net-ftp/proftpd: unconditionally enable USE=trace, disable broken tests, bug #624570 Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/624570 Package-Manager: Portage-2.3.6, Repoman-2.3.2 net-ftp/proftpd/files/proftpd-1.3.6-use-trace.patch | 18 ++ net-ftp/proftpd/proftpd-1.3.6.ebuild| 8 ++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-use-trace.patch b/net-ftp/proftpd/files/proftpd-1.3.6-use-trace.patch new file mode 100644 index 000..c7d91842563 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6-use-trace.patch @@ -0,0 +1,18 @@ +Make --disable-trace a build-time failure instead of link-time one. + +Reported-by: Toralf Förster +Bug: https://bugs.gentoo.org/624570 +diff --git a/include/trace.h b/include/trace.h +index f05dd0e..398e939 100644 +--- a/include/trace.h b/include/trace.h +@@ -29,2 +29,4 @@ + ++#ifdef PR_USE_TRACE ++ + #define PR_TRACE_DEFAULT_CHANNEL "DEFAULT" +@@ -64,2 +66,4 @@ int pr_trace_vmsg(const char *, int, const char *, va_list); + ++#endif /* PR_USE_TRACE */ ++ + #endif /* PR_TRACE_H */ diff --git a/net-ftp/proftpd/proftpd-1.3.6.ebuild b/net-ftp/proftpd/proftpd-1.3.6.ebuild index 2c767eb641b..fffba1c6c26 100644 --- a/net-ftp/proftpd/proftpd-1.3.6.ebuild +++ b/net-ftp/proftpd/proftpd-1.3.6.ebuild @@ -30,7 +30,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6 kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius - ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd" + ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test unique_id vroot xinetd" # TODO: geoip REQUIRED_USE="ban? ( ctrls ) msg? ( ctrls ) @@ -63,6 +63,10 @@ RDEPEND="${CDEPEND} S="${WORKDIR}/${P/_/}" +PATCHES=("${FILESDIR}"/${PN}-1.3.6-use-trace.patch) + +RESTRICT=test # tests corrupt memory. need to be fixed upstream first + in_dir() { pushd "${WORKDIR}/${1}" || die shift @@ -218,7 +222,7 @@ src_configure() { $(use_enable pam auth-pam) \ $(use_enable pcre) \ $(use_enable test tests) \ - $(use_enable trace) \ + --enable-trace \ $(use_enable userland_GNU shadow) \ $(use_enable userland_GNU autoshadow) \ ${c:1}
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: 4eecb6564211d3fcd2ad7063f53ac04c2da41bf3 Author: Sergei Trofimovich gentoo org> AuthorDate: Sat Apr 29 21:45:24 2017 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sat Apr 29 21:45:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4eecb656 net-ftp/proftpd: drop old Package-Manager: Portage-2.3.5, Repoman-2.3.2 net-ftp/proftpd/Manifest | 3 - .../proftpd/files/proftpd-1.3.5b-nowarn-abi.patch | 33 --- net-ftp/proftpd/proftpd-1.3.5b-r1.ebuild | 240 - net-ftp/proftpd/proftpd-1.3.5b.ebuild | 237 4 files changed, 513 deletions(-) diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 853ac27aa52..9e38c22d067 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,9 +1,6 @@ DIST mod_clamav-0.11rc.tar.gz 5115 SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a SHA512 6d33ee7b1c9c8e3fb0a0014dde90cfb1d37daa0f4914f147bb800a8318bcf0e03c7c6748d84cda36c5e5c7cd11ee8114bad9978362f581f367db54d3563f4636 WHIRLPOOL b15024d1011a83a10ce52fb676f1f2162d67750dc137600b624cd04ebd498bb3c9242e4889fd7b73c18224eb483286cb543fc627b27e6a8ff4c9bf35468218b9 -DIST mod_gss-1.3.3.tar.gz 115098 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e SHA512 61473f3102e2204a27d691907482a3e86108bb423be54ba47a79ef0d2a0313bcdc022529f8e620bd868453bee1b1169fce74cc454d835fdfd4be964e342bdedb WHIRLPOOL 90a15ca919326fa2b2e21fb2928e5ac39b912681bce015f3bff0b0b0c47241f41cc3c78789797ba2d8a61dafc24a9f1d18bf085808350301c228b6ed62721e80 DIST mod_gss-1.3.6.tar.gz 117294 SHA256 bd1cb3f8ba0668981beb54d8b4de10ab204199327a464debd9da19196bbb23c4 SHA512 a7e2f201bc7706f47f583317899bf4bc6a75d5e284b20a4cd9019020d3427334ada92fa3bbb4e153a2cd68e04f76185472b46ed3d3d168bf52a4c200e70ed8e4 WHIRLPOOL 96dce4cf8027961d0358a6f6f7ab33a606bfeb9bfe52702663e6c176e21d1ec357617e2d7f780247895f489700d129b03a62712ffc945c1104b53508ea1fca32 -DIST mod_vroot-0.9.3.tar.gz 28352 SHA256 f16c61ed7fe2d7231e1421f8f1a484f29972e0efe0e8e065ab373c388b0c073c SHA512 08a3e5df26bb4d5875b57af9e97e7e7cf27b2ad6983bfae0fac8a21f4a5be0a487cf0d9d03e9e1c08701eb3f22f2cb51a14c05fe1cba5f4085eb8a31d5142776 WHIRLPOOL be30931f117fc4f0b7de87579b483e41d86ad3ecd2999267a726664b32090cd32e6a7e748d66ddec525ee784ee2974212fd2455af313c13b67ab61625efa29d0 DIST mod_vroot-0.9.4.tar.gz 29461 SHA256 80c82c18639909a3b5219cbb76363584c0eb311535de38adb5d9040a9b12bde8 SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce WHIRLPOOL a3e086812e270d96dd659bbb1c3afb7e84adfe8db525adb08ecaabe02afb972032b413b8e16e2a26a8d99f2a599a3901010a6d1201c964164559aacf6105dc2a -DIST proftpd-1.3.5b.tar.gz 29992107 SHA256 afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8 SHA512 5bdb9718c85c26b92256d7b3791a6a5456bec3826801b7b68f4d493d202ac77179c8378ad06efc1a805efce639db266561d3beb4bc7af61ca1352fb4bdfd4e6a WHIRLPOOL bb1a9fef464d2070c7dc1204cf2a8682e4f2719d682b0b1e541fff11f5c8a4a9a133011a607831fd30548b201531c3534248ed0eb36d0b4708e7b5b75353fc6f DIST proftpd-1.3.5e.tar.gz 29968142 SHA256 8307dc0103a8e716b99745919be7f09b54708c57c7d5aa70262f7593dc56bc9d SHA512 54a9700af803297697e4b7f2d7dc82139785f9f2cbeb40b226f94ff3e8690f2e3672aa80373005dfec4b53f3dd9ca7b0a658ea39bda63e71292c810ba994eac7 WHIRLPOOL 3747ddb69936b1631b937bed9bc9865a75abcb1ec55ebf796c733f4cb1323b947c34142332d0d6c1f289b21174b83fe995e492ac77cb1d942aabd6467aaed143 DIST proftpd-1.3.6.tar.gz 20251898 SHA256 91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0 WHIRLPOOL 1b304015083a3e7a8aec15b306d802f6fe32cb0d8f0c5c260cfa0eb6e07d30ac2c5bb436d8cdaf1f379703fd73898a1d491a16d7c16150d87ca2349caff2f211 DIST proftpd-mod-case-0.7.tar.gz 13184 SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc WHIRLPOOL 27f49e9f34099c081add803aa679fd9abe7afa652dffe5d8e42889fef49aeaefd499e1009fc564d6c8f882b3c6dc31d4c6dd08cc06a42b770e7ef76a2ebfcf8a diff --git a/net-ftp/proftpd/files/proftpd-1.3.5b-nowarn-abi.patch b/net-ftp/proftpd/files/proftpd-1.3.5b-nowarn-abi.patch deleted file mode 100644 index 647f1fb988f..000 --- a/net-ftp/proftpd/files/proftpd-1.3.5b-nowarn-abi.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit 74cf2a6ed74471ff1d9088e8d9132fc9132861fb -Author: TJ Saunders-Date: Mon Apr 11 14:00:05 2016 -0700 - -Downgrade log messages about header/library version mismatches for SQLite, -libmemcached from WARN to INFO. - -diff --git a/contrib/mod_sql_sqlite.c b/contrib/mod_sql_sqlite.c -index cd6fb53..81ee4a4 100644
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: a2c956361dce86ec2c3fed71e0502d12a53b1cfd Author: Sergei Trofimovich gentoo org> AuthorDate: Thu Jun 30 20:20:04 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Thu Jun 30 20:20:04 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2c95636 net-ftp/proftpd: drop old vulnerable versions, bug #577046 Package-Manager: portage-2.3.0 net-ftp/proftpd/Manifest | 1 - .../files/proftpd-1.3.5a-unbound-sftp-p1.patch | 70 -- .../files/proftpd-1.3.5a-unbound-sftp-p2.patch | 61 -- net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild | 240 - 4 files changed, 372 deletions(-) diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 11fe9ba..008160e 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,7 +1,6 @@ DIST mod_clamav-0.11rc.tar.gz 5115 SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a SHA512 6d33ee7b1c9c8e3fb0a0014dde90cfb1d37daa0f4914f147bb800a8318bcf0e03c7c6748d84cda36c5e5c7cd11ee8114bad9978362f581f367db54d3563f4636 WHIRLPOOL b15024d1011a83a10ce52fb676f1f2162d67750dc137600b624cd04ebd498bb3c9242e4889fd7b73c18224eb483286cb543fc627b27e6a8ff4c9bf35468218b9 DIST mod_gss-1.3.3.tar.gz 115098 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e SHA512 61473f3102e2204a27d691907482a3e86108bb423be54ba47a79ef0d2a0313bcdc022529f8e620bd868453bee1b1169fce74cc454d835fdfd4be964e342bdedb WHIRLPOOL 90a15ca919326fa2b2e21fb2928e5ac39b912681bce015f3bff0b0b0c47241f41cc3c78789797ba2d8a61dafc24a9f1d18bf085808350301c228b6ed62721e80 DIST mod_vroot-0.9.3.tar.gz 28352 SHA256 f16c61ed7fe2d7231e1421f8f1a484f29972e0efe0e8e065ab373c388b0c073c SHA512 08a3e5df26bb4d5875b57af9e97e7e7cf27b2ad6983bfae0fac8a21f4a5be0a487cf0d9d03e9e1c08701eb3f22f2cb51a14c05fe1cba5f4085eb8a31d5142776 WHIRLPOOL be30931f117fc4f0b7de87579b483e41d86ad3ecd2999267a726664b32090cd32e6a7e748d66ddec525ee784ee2974212fd2455af313c13b67ab61625efa29d0 -DIST proftpd-1.3.5a.tar.gz 29988477 SHA256 a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696 SHA512 d64de12c100814c5c8a3916b3c9344f5a68c2b85902ffc8e5bb088d8975b5f13a7b9a29f82085b70dc93f4599c0e0f2645977d20998dda11981e66f534ea692c WHIRLPOOL 19b361b0481d5a2eab7fbe40de7bb8c9cd320a2ac04343d2fe858fdc9a62a747f89a5d4a619808bd252f6cfd9f15353df28405eb9bdc10c7c9f0162ab093bc1e DIST proftpd-1.3.5b.tar.gz 29992107 SHA256 afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8 SHA512 5bdb9718c85c26b92256d7b3791a6a5456bec3826801b7b68f4d493d202ac77179c8378ad06efc1a805efce639db266561d3beb4bc7af61ca1352fb4bdfd4e6a WHIRLPOOL bb1a9fef464d2070c7dc1204cf2a8682e4f2719d682b0b1e541fff11f5c8a4a9a133011a607831fd30548b201531c3534248ed0eb36d0b4708e7b5b75353fc6f DIST proftpd-mod-case-0.7.tar.gz 13184 SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc WHIRLPOOL 27f49e9f34099c081add803aa679fd9abe7afa652dffe5d8e42889fef49aeaefd499e1009fc564d6c8f882b3c6dc31d4c6dd08cc06a42b770e7ef76a2ebfcf8a DIST proftpd-mod-diskuse-0.9.tar.gz 18596 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975 WHIRLPOOL aabd1dc23d6c38d308e859ff778beffd0dabfe70d3530c093cf2f95e80b5e9c94b97b6b5ae5109d031f76ff94dffc3822a7aa60fa30df04523d37ebed99730d6 diff --git a/net-ftp/proftpd/files/proftpd-1.3.5a-unbound-sftp-p1.patch b/net-ftp/proftpd/files/proftpd-1.3.5a-unbound-sftp-p1.patch deleted file mode 100644 index 03dd1d8..000 --- a/net-ftp/proftpd/files/proftpd-1.3.5a-unbound-sftp-p1.patch +++ /dev/null @@ -1,70 +0,0 @@ -commit a24db7f9864240a4ebb236a6615ec649138fef0e -Author: TJ Saunders-Date: Sat Nov 28 17:08:03 2015 -0800 - -Bug#4210 - Avoid unbounded SFTP extension key/values. - -diff --git a/contrib/mod_sftp/fxp.c b/contrib/mod_sftp/fxp.c -index 5d9ae17..03c7eb5 100644 a/contrib/mod_sftp/fxp.c -+++ b/contrib/mod_sftp/fxp.c -@@ -241,6 +241,9 @@ struct fxp_extpair { - unsigned char *ext_data; - }; - -+/* Maximum length of SFTP extension name, AND of the extension value. */ -+#define SFTP_EXT_MAX_LEN 1024 -+ - static pool *fxp_pool = NULL; - static int fxp_use_gmt = TRUE; - -@@ -1240,6 +1243,14 @@ static struct fxp_extpair *fxp_msg_read_extpair(pool *p, unsigned char **buf, - SFTP_DISCONNECT_CONN(SFTP_SSH2_DISCONNECT_BY_APPLICATION, NULL); - } - -+ if (namelen > SFTP_EXT_MAX_LEN) { -+(void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION, -+ "received too-long SFTP extension name (%lu > max %lu), ignoring", -+ (unsigned long) namelen, (unsigned long) SFTP_EXT_MAX_LEN); -+errno = EINVAL; -+return NULL; -+ } -+ - name = palloc(p,
[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/
commit: 563929d695450a785859a044140a38ca869b97be Author: Sergei Trofimovich gentoo org> AuthorDate: Wed Apr 13 23:10:04 2016 + Commit: Sergei Trofimovich gentoo org> CommitDate: Wed Apr 13 23:10:04 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=563929d6 net-ftp/proftpd: downgrade sqlite and memcache version warnings, bug #555076 Reported-by: Matthew Schultz Bug: https://bugs.gentoo.org/555076 Package-Manager: portage-2.2.28 .../proftpd/files/proftpd-1.3.5b-nowarn-abi.patch | 33 +++ net-ftp/proftpd/proftpd-1.3.5b-r1.ebuild | 241 + 2 files changed, 274 insertions(+) diff --git a/net-ftp/proftpd/files/proftpd-1.3.5b-nowarn-abi.patch b/net-ftp/proftpd/files/proftpd-1.3.5b-nowarn-abi.patch new file mode 100644 index 000..647f1fb --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.5b-nowarn-abi.patch @@ -0,0 +1,33 @@ +commit 74cf2a6ed74471ff1d9088e8d9132fc9132861fb +Author: TJ Saunders+Date: Mon Apr 11 14:00:05 2016 -0700 + +Downgrade log messages about header/library version mismatches for SQLite, +libmemcached from WARN to INFO. + +diff --git a/contrib/mod_sql_sqlite.c b/contrib/mod_sql_sqlite.c +index cd6fb53..81ee4a4 100644 +--- a/contrib/mod_sql_sqlite.c b/contrib/mod_sql_sqlite.c +@@ -1059,7 +1058,7 @@ static int sql_sqlite_init(void) { +* For now, we only log if there is a difference. +*/ + if (strcmp(sqlite3_libversion(), SQLITE_VERSION) != 0) { +-pr_log_pri(PR_LOG_WARNING, MOD_SQL_SQLITE_VERSION ++pr_log_pri(PR_LOG_INFO, MOD_SQL_SQLITE_VERSION + ": compiled using SQLite version '%s' headers, but linked to " + "SQLite version '%s' library", SQLITE_VERSION, sqlite3_libversion()); + } +diff --git a/modules/mod_memcache.c b/modules/mod_memcache.c +index e88cba8..80ab0db 100644 +--- a/modules/mod_memcache.c b/modules/mod_memcache.c +@@ -364,7 +362,7 @@ static int mcache_init(void) { + + version = memcached_lib_version(); + if (strcmp(version, LIBMEMCACHED_VERSION_STRING) != 0) { +-pr_log_pri(PR_LOG_WARNING, MOD_MEMCACHE_VERSION ++pr_log_pri(PR_LOG_INFO, MOD_MEMCACHE_VERSION + ": compiled using libmemcached-%s headers, but linked to " + "libmemcached-%s library", LIBMEMCACHED_VERSION_STRING, version); + diff --git a/net-ftp/proftpd/proftpd-1.3.5b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.5b-r1.ebuild new file mode 100644 index 000..f0c256e --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.5b-r1.ebuild @@ -0,0 +1,241 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 +inherit multilib systemd + +MOD_CASE="0.7" +MOD_CLAMAV="0.11rc" +MOD_DISKUSE="0.9" +MOD_GSS="1.3.3" +MOD_MSG="0.4.1" +MOD_VROOT="0.9.3" + +DESCRIPTION="An advanced and very configurable FTP server" +HOMEPAGE="http://www.proftpd.org/ + http://www.castaglia.org/proftpd/ + http://www.thrallingpenguin.com/resources/mod_clamav.htm + http://gssmod.sourceforge.net/; +SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz + case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz ) + clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz ) + diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz ) + kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz ) + msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz ) + vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/mod_vroot-${MOD_VROOT}.tar.gz )" +LICENSE="GPL-2" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6 + kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR + linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius + ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd" +# TODO: geoip +REQUIRED_USE="ban? ( ctrls ) + msg? ( ctrls ) + sftp? ( ssl ) + shaper? ( ctrls )" + +CDEPEND="acl? ( virtual/acl ) + caps? ( sys-libs/libcap ) + clamav? ( app-antivirus/clamav ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + memcache? ( >=dev-libs/libmemcached-0.41 ) + mysql? ( virtual/mysql ) + nls? ( virtual/libiconv ) + ncurses? ( sys-libs/ncurses:0= ) + ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:= ) + ) + pam? ( virtual/pam ) + pcre? ( dev-libs/libpcre ) + postgres? ( dev-db/postgresql:= ) +