diff options
Diffstat (limited to 'net-ftp/proftpd')
| -rw-r--r-- | net-ftp/proftpd/Manifest | 2 | ||||
| -rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.6-sighup-crash.patch | 81 | ||||
| -rw-r--r-- | net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 267 |
3 files changed, 350 insertions, 0 deletions
diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index ca08351fc507..3181477510b2 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,3 +1,4 @@ +AUX proftpd-1.3.6-sighup-crash.patch 2145 BLAKE2B 60e24fe7f8ee4fdac4a95b73c5e6d76862d6163e6dfbc1a15970f18ab6a38e715bace0adad487606a29dc9de39bbb2987b3d4c5e0283d6468864f877c2030b6f SHA512 d16515e7bf14d1d3a147b93fea330b0342db3ad501f366dd4f1d872262829902cb3c197fe68b20b86048bc3bbe0e5c22470d6d81bf08c72c192a33770c3d499a AUX proftpd-1.3.6-use-trace.patch 477 BLAKE2B f69adc68327f467b44dd19d0da66388945c0d1c35ce734ab8fa5e618ca7dbf1164e785e37a6dcb0e9f8ab671ece0b4e711b6614947f39b55310ffd4522df5e07 SHA512 90164f799d1f6c3768a30161a40d5c369e576c3b1a875047ef65c1224d3e18cf1f4dd5145c5ff6f7aeda80135134df58a1d57046129b922514cb56d1de97f13e AUX proftpd-1.3.6_rc4-diskuse-refresh-api.patch 576 BLAKE2B ce4522896a81fed326ae234810491005c5165fa1bbcd0b64d785c6d070f2ac80c763e75f813655696a9405284cf27c82293026e2d8c68936d7794c20e886dacb SHA512 08a0674600944ff5d13033651a1dea1647c9d22f18efe6505e051b36566bf357bc41439d2dd7c2900e873ef8d600ba7f16332680dda1abb2529808fbe5a4e573 AUX proftpd-1.3.6_rc4-gss-refresh-api.patch 1868 BLAKE2B ff50d3834d6cc0970256dcada8a14db6681440494abc24ccbf53ea5baef2362a9174de3bf7e3e07d562f30a55492735137efa91a9dd09676dbb95e624f3ae77f SHA512 4cc235bdb60ea4c84794d4347826b040057067d8283dcfcb795d5d25a156de480df7d897078ab8ab4faf12d4fc9e714a55f723ce27c9397bc2223550597df674 @@ -19,5 +20,6 @@ DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a5239 EBUILD proftpd-1.3.5e.ebuild 7264 BLAKE2B 3e5e8dca76b1a6fcd8de4673fcb2af33454bcf2443626bbda699149251232579d24655d6bf89906feddabd502df682a2f01c19e9b0ba8d6e8f428aa3af154d4f SHA512 a0b0204493f6d10741830d9eef7c5b2349a27765ebc7c6ff3b6baa4879549c8c1d68e409b35af72b4271c2c70ef65639db9302f4d93965e4f02df9f0e908d512 EBUILD proftpd-1.3.6-r1.ebuild 8455 BLAKE2B 3152ba84ad6e73b57413a9ef9bef3f9557a9e63a3be9fdf1838ba65c8ec9be653dcba036af7c199832faa85bb6d4fcf92c48d88adf7e99214f51f51c0416afcd SHA512 6f658928141d2b08ccd93129a96a9c5bafe766a6706e7e47c6ecd2ddf64a3c373930c6db5dd9974bd2f19ea4a194da39ac939d016dab4aae0d9f8cb3a4b6a085 EBUILD proftpd-1.3.6-r2.ebuild 8533 BLAKE2B febfcd73184829ca04f0e8013ed4ad16ebbc3640a186a1432193bb991cae7f5723bfe1118ea558565ddb25e5c05e1b04d0e69392a912b2b790f6309226643c99 SHA512 ae98a188143fb35a8cfcfd85fccb6d57f28af3a5d4f978c74b08269d1e68d7e4ea738adc0793f7bb04a20791062d9e12e4ddd5db8269e9aa8299663b7eec7a00 +EBUILD proftpd-1.3.6-r3.ebuild 8582 BLAKE2B 0c92318c4ec71b1f560f6462b8f6bd91ff8bc26215776403cc06981b58fc1d4cfe10dd74fa50a4f8a8d24597c3de6e6c3377bcb8d90dc2d9faefe806567cf7a3 SHA512 e7f1acc0afcad69ad8e82e836f20be100919442d5d3d93ec74432e46723dae8499d495808d7139e19285e10c399f97b43a17815ed800bf9314ff68d3771db610 EBUILD proftpd-1.3.6.ebuild 8337 BLAKE2B e968ce2c91b562da83a80ddf50a6acebcf16b3d8cbcfbd7dd5d6b3a511de689cd9bf67086844fe5ba502bc491731b5565c792734ebc0cfd57415f53dfeefde81 SHA512 294b99f911ff074c6ba3cb0ce3c58a59aac53255c494bed4dd8f49f450a0eb14b0e7f50cd3521c5ebb79229af35f36a919f9a267aa9b7d4f2ef7e21f3999bf93 MISC metadata.xml 3028 BLAKE2B c9b780180099942fa3a023629ed5f5faaf9a84eeca9f95cc88665d310c67b7647c7917e5d1a0ab4e1ecfa85b993af260f32f604c30267083364ef6b7683933e5 SHA512 9558151e889dc4a1f90968565247446ad47fda8f3e048d67350ad8580067fd995f8a79cef3673c462f75ebdf6fa830672c3a078d7e26b493dced84bfda8520bf 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 000000000000..cca550405e11 --- /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 <tj@castaglia.org> +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(&facl_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(&facl_module, "core.postparse", facl_postparse_ev, NULL); ++ pr_event_register(&facl_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 000000000000..c1babbb4fdd5 --- /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 sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test 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? ( 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 ) + xinetd? ( virtual/inetd )" +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 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die + eapply "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch + fi + + if use diskuse; then + in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch + + # ./configure will modify files. Symlink them instead of copying + ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die + + cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die + cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die + fi + + if use msg; then + in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch + + cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die + cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die + fi + + if use vroot; then + in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch + + cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die + cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die + fi + + if use kerberos ; then + in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch + + # Support app-crypt/heimdal / Gentoo Bug #284853 + sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die + + # Remove obsolete DES / Gentoo Bug #324903 + # Replace 'rpm' lookups / Gentoo Bug #391021 + sed -i -e "/ac_gss_libs/s/ -ldes425//" \ + -e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \ + -e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.in} || die + + # ./configure will modify files. Symlink them instead of copying + ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die + ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die + ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die + + cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die + cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die + cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die + fi + + default +} + +src_configure() { + local c m + + use acl && m="${m}:mod_facl" + use ban && m="${m}:mod_ban" + use case && m="${m}:mod_case" + use clamav && m="${m}:mod_clamav" + use copy && m="${m}:mod_copy" + use ctrls && m="${m}:mod_ctrls_admin" + use deflate && m="${m}:mod_deflate" + if use diskuse ; then + in_dir mod_diskuse econf + m="${m}:mod_diskuse" + fi + use dynmasq && m="${m}:mod_dynmasq" + use exec && m="${m}:mod_exec" + use ifsession && m="${m}:mod_ifsession" + use ifversion && m="${m}:mod_ifversion" + if use kerberos ; then + in_dir mod_gss-${MOD_GSS} econf + m="${m}:mod_gss:mod_auth_gss" + fi + use ldap && m="${m}:mod_ldap" + use log_forensic && m="${m}:mod_log_forensic" + use msg && m="${m}:mod_msg" + if use mysql || use postgres || use sqlite ; then + m="${m}:mod_sql:mod_sql_passwd" + use mysql && m="${m}:mod_sql_mysql" + use postgres && m="${m}:mod_sql_postgres" + use sqlite && m="${m}:mod_sql_sqlite" + fi + use qos && m="${m}:mod_qos" + use radius && m="${m}:mod_radius" + use ratio && m="${m}:mod_ratio" + use readme && m="${m}:mod_readme" + use rewrite && m="${m}:mod_rewrite" + if use sftp ; then + m="${m}:mod_sftp" + use pam && m="${m}:mod_sftp_pam" + use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql" + fi + use shaper && m="${m}:mod_shaper" + use sitemisc && m="${m}:mod_site_misc" + use snmp && m="${m}:mod_snmp" + if use softquota ; then + m="${m}:mod_quotatab:mod_quotatab_file" + use ldap && m="${m}:mod_quotatab_ldap" + use radius && m="${m}:mod_quotatab_radius" + use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql" + fi + if use ssl ; then + m="${m}:mod_tls:mod_tls_shmcache" + use memcache && m="${m}:mod_tls_memcache" + fi + if use tcpd ; then + m="${m}:mod_wrap2:mod_wrap2_file" + use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql" + fi + use unique_id && m="${m}:mod_unique_id" + use vroot && m="${m}:mod_vroot" + + if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then + einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'" + m="${m}:${PROFTP_CUSTOM_MODULES}" + fi + + [[ -z ${m} ]] || c="${c} --with-modules=${m:1}" + + econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \ + $(use_enable acl facl) \ + $(use_enable authfile auth-file) \ + $(use_enable caps cap) \ + $(use_enable ctrls) \ + $(use_enable dso) \ + $(use_enable ident) \ + $(use_enable ipv6) \ + $(use_enable memcache) \ + $(use_enable ncurses) \ + $(use_enable nls) \ + $(use_enable ssl openssl) \ + $(use_enable pam auth-pam) \ + $(use_enable pcre) \ + $(use_enable sodium) \ + $(use_enable test tests) \ + --enable-trace \ + $(use_enable userland_GNU shadow) \ + $(use_enable userland_GNU autoshadow) \ + ${c:1} +} + +src_test() { + emake api-tests -C tests +} + +src_install() { + default + [[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale + rm -rf "${ED}"/var/run + + newinitd "${FILESDIR}"/proftpd.initd proftpd + insinto /etc/proftpd + doins "${FILESDIR}"/proftpd.conf.sample + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}"/proftpd.xinetd proftpd + fi + + dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES + if use doc ; then + dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html + docinto rfc + dodoc doc/rfc/*.txt + fi + + systemd_dounit "${FILESDIR}"/${PN}.service + systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf +} + +pkg_postinst() { + # Create /var/run files at package merge time: bug #650000 + tmpfiles_process ${PN}.conf +} |