diff options
author | 2015-07-25 08:46:47 +0000 | |
---|---|---|
committer | 2015-07-25 08:46:47 +0000 | |
commit | 979dcd41d779d3c062f68f88f6ba80e18f9711e6 (patch) | |
tree | 4b52ee0797ef90cebef90fa9f8269ad52c49ad1d /net-ftp | |
parent | Create stable candidate. (diff) | |
download | gentoo-2-979dcd41d779d3c062f68f88f6ba80e18f9711e6.tar.gz gentoo-2-979dcd41d779d3c062f68f88f6ba80e18f9711e6.tar.bz2 gentoo-2-979dcd41d779d3c062f68f88f6ba80e18f9711e6.zip |
Clean old vulnerabe versions (bug #546644).
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'net-ftp')
-rw-r--r-- | net-ftp/proftpd/ChangeLog | 10 | ||||
-rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch | 37 | ||||
-rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch | 44 | ||||
-rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch | 15 | ||||
-rw-r--r-- | net-ftp/proftpd/files/proftpd-1.3.5-netaddr-segv.patch | 21 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.3.4d.ebuild | 240 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.3.4e.ebuild | 242 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.3.5-r1.ebuild | 238 | ||||
-rw-r--r-- | net-ftp/proftpd/proftpd-1.3.5.ebuild | 238 |
9 files changed, 9 insertions, 1076 deletions
diff --git a/net-ftp/proftpd/ChangeLog b/net-ftp/proftpd/ChangeLog index 26016e39f97b..230c9256a999 100644 --- a/net-ftp/proftpd/ChangeLog +++ b/net-ftp/proftpd/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-ftp/proftpd # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.343 2015/07/24 10:29:56 zlogene Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.344 2015/07/25 08:46:47 slyfox Exp $ + + 25 Jul 2015; Sergei Trofimovich <slyfox@gentoo.org> + -files/proftpd-1.3.4d-memset-fix.patch, + -files/proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch, + -files/proftpd-1.3.4e-link-tests.patch, + -files/proftpd-1.3.5-netaddr-segv.patch, -proftpd-1.3.4d.ebuild, + -proftpd-1.3.4e.ebuild, -proftpd-1.3.5-r1.ebuild, -proftpd-1.3.5.ebuild: + Clean old vulnerabe versions (bug #546644). 24 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> proftpd-1.3.5a.ebuild: ia64 stable wrt bug #546644 diff --git a/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch b/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch deleted file mode 100644 index 9bec4d4d5804..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.4d-memset-fix.patch +++ /dev/null @@ -1,37 +0,0 @@ -From dfab55028b4282a8e8769e108518405a93cf3d87 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Thu, 12 Sep 2013 22:58:35 +0300 -Subject: [PATCH] contrib/mod_sftp_pam.c: fix size argument for memset -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Pass something string size related insteal of 'sizeof(void*)' -(which might overflow). - -Found by gcc 4.8: -> mod_sftp_pam.c:327:36: warning: argument to ‘sizeof’ in ‘memset’ -> call is the same expression as the destination; did you mean to -> provide an explicit length? [-Wsizeof-pointer-memaccess] - -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - contrib/mod_sftp_pam.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/contrib/mod_sftp_pam.c b/contrib/mod_sftp_pam.c -index 0a9de72..ba8f1c5 100644 ---- a/contrib/mod_sftp_pam.c -+++ b/contrib/mod_sftp_pam.c -@@ -324,7 +324,7 @@ static int sftppam_driver_open(sftp_kbdint_driver_t *driver, const char *user) { - exit(1); - } - -- memset(sftppam_user, '\0', sizeof(sftppam_user)); -+ memset(sftppam_user, '\0', sftppam_userlen); - sstrncpy(sftppam_user, user, sftppam_userlen); - - c = find_config(main_server->conf, CONF_PARAM, "SFTPPAMOptions", FALSE); --- -1.8.3.2 - diff --git a/net-ftp/proftpd/files/proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch b/net-ftp/proftpd/files/proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch deleted file mode 100644 index bc314b74e2cb..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.4d-sftp-kbdint-max-responses-bug3973.patch +++ /dev/null @@ -1,44 +0,0 @@ -Patch picked from upstream bugzilla: - -Upstream-bug: http://bugs.proftpd.org/show_bug.cgi?id=3973 -Gentoo-bug: https://bugs.gentoo.org/484614 -Index: contrib/mod_sftp/kbdint.c -=================================================================== -RCS file: /cvsroot/proftp/proftpd/contrib/mod_sftp/kbdint.c,v -retrieving revision 1.5 -diff -u -r1.5 kbdint.c ---- contrib/mod_sftp/kbdint.c 15 Feb 2012 23:50:51 -0000 1.5 -+++ contrib/mod_sftp/kbdint.c 12 Sep 2013 16:35:34 -0000 -@@ -31,6 +31,11 @@ - #include "utf8.h" - #include "kbdint.h" - -+/* The maximum number of keyboard-interactive responses we will handle -+ * from the client. -+ */ -+#define SSH2_AUTH_KBDINT_MAX_RESPONSES 500 -+ - struct kbdint_driver { - struct kbdint_driver *next, *prev; - -@@ -299,6 +304,20 @@ - - resp_count = sftp_msg_read_int(pkt->pool, &buf, &buflen); - -+ /* Impose an upper limit on the number of responses sent by the client, -+ * lest a malicious client attempt to trick us into allocating too -+ * much memory (Bug#3973). -+ */ -+ if (resp_count > SSH2_AUTH_KBDINT_MAX_RESPONSES) { -+ (void) pr_log_writefile(sftp_logfd, MOD_SFTP_VERSION, -+ "received response count (%lu) which exceeds max allowed response " -+ "count (%lu), rejecting", (unsigned long) resp_count, -+ (unsigned long) SSH2_AUTH_KBDINT_MAX_RESPONSES); -+ destroy_pool(pkt->pool); -+ errno = EPERM; -+ return -1; -+ } -+ - list = make_array(p, resp_count, sizeof(char *)); - for (i = 0; i < resp_count; i++) { - char *resp; diff --git a/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch b/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch deleted file mode 100644 index d19c98a41849..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.4e-link-tests.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/tests/api/stubs.c b/tests/api/stubs.c -index 9f49c9d..7f1e898 100644 ---- a/tests/api/stubs.c -+++ b/tests/api/stubs.c -@@ -46,6 +46,10 @@ char *pr_fs_encode_path(pool *p, const char *path) { - return (char *) path; - } - -+int pr_fs_get_usable_fd(int fd) { -+ return -1; -+} -+ - void pr_log_debug(int level, const char *fmt, ...) { - } - diff --git a/net-ftp/proftpd/files/proftpd-1.3.5-netaddr-segv.patch b/net-ftp/proftpd/files/proftpd-1.3.5-netaddr-segv.patch deleted file mode 100644 index 3efd6c0681fb..000000000000 --- a/net-ftp/proftpd/files/proftpd-1.3.5-netaddr-segv.patch +++ /dev/null @@ -1,21 +0,0 @@ -Skip addressless interfaces. - -Caught by api-tests as: -> 99%: Checks: 197, Failures: 0, Errors: 1 -> api/netaddr.c:146:E:base:netaddr_get_addr2_test:0: (after this point) Received signal 11 (Segmentation fault) -diff --git a/src/netaddr.c b/src/netaddr.c -index 2657ca7..0029c7e 100644 ---- a/src/netaddr.c -+++ b/src/netaddr.c -@@ -761,7 +761,10 @@ static pr_netaddr_t *get_addr_by_device(pool *p, const char *name, - int found_device = FALSE; - - for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { -- -+ if (ifa->ifa_addr == NULL) { -+ /* returns NULL for uninitialized 'tun0' for example. */ -+ continue; -+ } - /* We're only looking for addresses, not stats. */ - if (ifa->ifa_addr->sa_family != AF_INET - #ifdef PR_USE_IPV6 diff --git a/net-ftp/proftpd/proftpd-1.3.4d.ebuild b/net-ftp/proftpd/proftpd-1.3.4d.ebuild deleted file mode 100644 index 3ca99a6af36a..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.4d.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4d.ebuild,v 1.13 2014/12/28 16:21:57 titanofold Exp $ - -EAPI=5 -inherit eutils 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 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 memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius - ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd" -REQUIRED_USE="ban? ( ctrls ) - msg? ( ctrls ) - sftp? ( openssl ) - shaper? ( ctrls ) - ssl? ( openssl )" - -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 ) - openssl? ( dev-libs/openssl ) - pam? ( virtual/pam ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql ) - 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/_/}" - -__prepare_module() { - local mod_name=$1 - local mod_topdir=${WORKDIR}/${2:-${mod_name}} - - mv "${mod_topdir}/${mod_name}.c" contrib || die - mv "${mod_topdir}/${mod_name}.html" doc/contrib || die - rm -r "${mod_topdir}" || die -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-sftp-kbdint-max-responses-bug3973.patch - epatch "${FILESDIR}"/${P}-memset-fix.patch - - # Skip 'install-conf' / Support LINGUAS - sed -i -e "/install-all/s/ install-conf//" Makefile.in - sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in - - # Prepare external modules - use case && __prepare_module mod_case - if use clamav ; then - mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib - epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch - rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV} - fi - use msg && __prepare_module mod_msg - use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT} - - # Prepare external kerberos module - if use kerberos ; then - cd "${WORKDIR}"/mod_gss-${MOD_GSS} - - # Support app-crypt/heimdal / Gentoo Bug #284853 - sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in - - # 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\//" configure{,.in} - fi -} - -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 - cd "${WORKDIR}"/mod_diskuse - econf - mv mod_diskuse.{c,h} "${S}"/contrib - mv mod_diskuse.html "${S}"/doc/contrib - cd "${S}" - rm -r "${WORKDIR}"/mod_diskuse - m="${m}:mod_diskuse" - fi - use dynmasq && mym="${mym}:mod_dynmasq" - use exec && m="${m}:mod_exec" - use ifsession && m="${m}:mod_ifsession" - use ifversion && m="${m}:mod_ifversion" - if use kerberos ; then - cd "${WORKDIR}"/mod_gss-${MOD_GSS} - if has_version app-crypt/mit-krb5 ; then - econf --enable-mit - else - econf --enable-heimdal - fi - mv mod_{auth_gss,gss}.c "${S}"/contrib - mv mod_gss.h "${S}"/include - mv README.mod_{auth_gss,gss} "${S}" - mv mod_gss.html "${S}"/doc/contrib - mv rfc{1509,2228}.txt "${S}"/doc/rfc - cd "${S}" - rm -r "${WORKDIR}"/mod_gss-${MOD_GSS} - m="${m}:mod_gss:mod_auth_gss" - fi - use ldap && m="${m}:mod_ldap" - use msg && mym="${mym}: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" - 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 vroot && m="${m}:mod_vroot" - - [ -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 openssl) \ - $(use_enable pam auth-pam) \ - $(use_enable pcre) \ - $(use_enable test tests) \ - $(use_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} ] && rm -r "${ED}"/usr/share/locale - 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() { - if use tcpd ; then - ewarn - ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper" - ewarn "support has been replaced by mod_wrap2 which is more configurable and" - ewarn "portable. But you have to adjust your configuration before restaring" - ewarn "ProFTPD. On the following website you can find more information:" - ewarn " http://proftpd.org/docs/contrib/mod_wrap2.html" - ewarn - fi -} diff --git a/net-ftp/proftpd/proftpd-1.3.4e.ebuild b/net-ftp/proftpd/proftpd-1.3.4e.ebuild deleted file mode 100644 index 4fbd01b418e7..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.4e.ebuild +++ /dev/null @@ -1,242 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.4e.ebuild,v 1.4 2014/12/28 16:21:57 titanofold Exp $ - -EAPI=5 -inherit eutils 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 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 memcache msg mysql ncurses nls openssl pam +pcre postgres qos radius - ratio readme rewrite selinux sftp shaper sitemisc softquota sqlite ssl tcpd test trace vroot xinetd" -REQUIRED_USE="ban? ( ctrls ) - msg? ( ctrls ) - sftp? ( openssl ) - shaper? ( ctrls ) - ssl? ( openssl )" - -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 ) - openssl? ( dev-libs/openssl ) - pam? ( virtual/pam ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql ) - 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/_/}" - -__prepare_module() { - local mod_name=$1 - local mod_topdir=${WORKDIR}/${2:-${mod_name}} - - mv "${mod_topdir}/${mod_name}.c" contrib || die - mv "${mod_topdir}/${mod_name}.html" doc/contrib || die - rm -r "${mod_topdir}" || die -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-link-tests.patch - epatch "${FILESDIR}"/${PN}-1.3.4d-memset-fix.patch - - # Skip 'install-conf' / Support LINGUAS - sed -i -e "/install-all/s/ install-conf//" Makefile.in - sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in - - # Prepare external modules - use case && __prepare_module mod_case - if use clamav ; then - mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib - epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch - rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV} - fi - use msg && __prepare_module mod_msg - use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT} - - # Prepare external kerberos module - if use kerberos ; then - cd "${WORKDIR}"/mod_gss-${MOD_GSS} - - # Support app-crypt/heimdal / Gentoo Bug #284853 - sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in - - # 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\//" configure{,.in} - fi -} - -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 - cd "${WORKDIR}"/mod_diskuse - econf - mv mod_diskuse.{c,h} "${S}"/contrib - mv mod_diskuse.html "${S}"/doc/contrib - cd "${S}" - rm -r "${WORKDIR}"/mod_diskuse - m="${m}:mod_diskuse" - fi - use dynmasq && mym="${mym}:mod_dynmasq" - use exec && m="${m}:mod_exec" - use ifsession && m="${m}:mod_ifsession" - use ifversion && m="${m}:mod_ifversion" - if use kerberos ; then - cd "${WORKDIR}"/mod_gss-${MOD_GSS} - if has_version app-crypt/mit-krb5 ; then - econf --enable-mit - else - econf --enable-heimdal - fi - mv mod_{auth_gss,gss}.c "${S}"/contrib - mv mod_gss.h "${S}"/include - mv README.mod_{auth_gss,gss} "${S}" - mv mod_gss.html "${S}"/doc/contrib - mv rfc{1509,2228}.txt "${S}"/doc/rfc - cd "${S}" - rm -r "${WORKDIR}"/mod_gss-${MOD_GSS} - m="${m}:mod_gss:mod_auth_gss" - fi - use ldap && m="${m}:mod_ldap" - use msg && mym="${mym}: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" - 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 vroot && m="${m}:mod_vroot" - - [ -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 openssl) \ - $(use_enable pam auth-pam) \ - $(use_enable pcre) \ - $(use_enable test tests) \ - $(use_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} ] && 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() { - if use tcpd ; then - ewarn - ewarn "Important: Since ProFTPD 1.3.4rc2 the module mod_wrap for TCP Wrapper" - ewarn "support has been replaced by mod_wrap2 which is more configurable and" - ewarn "portable. But you have to adjust your configuration before restaring" - ewarn "ProFTPD. On the following website you can find more information:" - ewarn " http://proftpd.org/docs/contrib/mod_wrap2.html" - ewarn - fi -} diff --git a/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild deleted file mode 100644 index 65dc0c3b71ea..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.5-r1.ebuild,v 1.2 2014/12/28 16:21:57 titanofold Exp $ - -EAPI=5 -inherit eutils 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 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 openssl 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? ( openssl ) - shaper? ( ctrls ) - ssl? ( openssl )" - -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 ) - openssl? ( dev-libs/openssl ) - pam? ( virtual/pam ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql ) - 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/_/}" - -__prepare_module() { - local mod_name=$1 - local mod_topdir=${WORKDIR}/${2:-${mod_name}} - - mv "${mod_topdir}/${mod_name}.c" contrib || die - mv "${mod_topdir}/${mod_name}.html" doc/contrib || die - rm -r "${mod_topdir}" || die -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-netaddr-segv.patch - - # Skip 'install-conf' / Support LINGUAS - sed -i -e "/install-all/s/ install-conf//" Makefile.in - sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in - - # Prepare external modules - use case && __prepare_module mod_case - if use clamav ; then - mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib - epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch - rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV} - fi - use msg && __prepare_module mod_msg - use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT} - - # Prepare external kerberos module - if use kerberos ; then - cd "${WORKDIR}"/mod_gss-${MOD_GSS} - - # Support app-crypt/heimdal / Gentoo Bug #284853 - sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in - - # 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\//" configure{,.in} - fi -} - -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 - cd "${WORKDIR}"/mod_diskuse - econf - mv mod_diskuse.{c,h} "${S}"/contrib - mv mod_diskuse.html "${S}"/doc/contrib - cd "${S}" - rm -r "${WORKDIR}"/mod_diskuse - 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 - cd "${WORKDIR}"/mod_gss-${MOD_GSS} - if has_version app-crypt/mit-krb5 ; then - econf --enable-mit - else - econf --enable-heimdal - fi - mv mod_{auth_gss,gss}.c "${S}"/contrib - mv mod_gss.h "${S}"/include - mv README.mod_{auth_gss,gss} "${S}" - mv mod_gss.html "${S}"/doc/contrib - mv rfc{1509,2228}.txt "${S}"/doc/rfc - cd "${S}" - rm -r "${WORKDIR}"/mod_gss-${MOD_GSS} - 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 openssl) \ - $(use_enable pam auth-pam) \ - $(use_enable pcre) \ - $(use_enable test tests) \ - $(use_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} ]] && 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 -} diff --git a/net-ftp/proftpd/proftpd-1.3.5.ebuild b/net-ftp/proftpd/proftpd-1.3.5.ebuild deleted file mode 100644 index 4eaca8944ced..000000000000 --- a/net-ftp/proftpd/proftpd-1.3.5.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.5.ebuild,v 1.12 2015/03/11 09:16:03 slyfox Exp $ - -EAPI=5 -inherit eutils 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 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 openssl 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? ( openssl ) - shaper? ( ctrls ) - ssl? ( openssl )" - -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 ) - openssl? ( dev-libs/openssl ) - pam? ( virtual/pam ) - pcre? ( dev-libs/libpcre ) - postgres? ( dev-db/postgresql ) - 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/_/}" - -__prepare_module() { - local mod_name=$1 - local mod_topdir=${WORKDIR}/${2:-${mod_name}} - - mv "${mod_topdir}/${mod_name}.c" contrib || die - mv "${mod_topdir}/${mod_name}.html" doc/contrib || die - rm -r "${mod_topdir}" || die -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-netaddr-segv.patch - - # Skip 'install-conf' / Support LINGUAS - sed -i -e "/install-all/s/ install-conf//" Makefile.in - sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in - - # Prepare external modules - use case && __prepare_module mod_case - if use clamav ; then - mv "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib - epatch "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch - rm -r "${WORKDIR}"/mod_clamav-${MOD_CLAMAV} - fi - use msg && __prepare_module mod_msg - use vroot && __prepare_module mod_vroot ${PN}-mod_vroot-mod_vroot-${MOD_VROOT} - - # Prepare external kerberos module - if use kerberos ; then - cd "${WORKDIR}"/mod_gss-${MOD_GSS} - - # Support app-crypt/heimdal / Gentoo Bug #284853 - sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in - - # 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\//" configure{,.in} - fi -} - -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 - cd "${WORKDIR}"/mod_diskuse - econf - mv mod_diskuse.{c,h} "${S}"/contrib - mv mod_diskuse.html "${S}"/doc/contrib - cd "${S}" - rm -r "${WORKDIR}"/mod_diskuse - m="${m}:mod_diskuse" - fi - use dynmasq && mym="${mym}:mod_dynmasq" - use exec && m="${m}:mod_exec" - use ifsession && m="${m}:mod_ifsession" - use ifversion && m="${m}:mod_ifversion" - if use kerberos ; then - cd "${WORKDIR}"/mod_gss-${MOD_GSS} - if has_version app-crypt/mit-krb5 ; then - econf --enable-mit - else - econf --enable-heimdal - fi - mv mod_{auth_gss,gss}.c "${S}"/contrib - mv mod_gss.h "${S}"/include - mv README.mod_{auth_gss,gss} "${S}" - mv mod_gss.html "${S}"/doc/contrib - mv rfc{1509,2228}.txt "${S}"/doc/rfc - cd "${S}" - rm -r "${WORKDIR}"/mod_gss-${MOD_GSS} - m="${m}:mod_gss:mod_auth_gss" - fi - use ldap && m="${m}:mod_ldap" - use log_forensic && m="${m}:mod_log_forensic" - use msg && mym="${mym}: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 openssl) \ - $(use_enable pam auth-pam) \ - $(use_enable pcre) \ - $(use_enable test tests) \ - $(use_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} ]] && 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 -} |