commit: fba48bedb74f80376bb3a6761a052244350f4fd8 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sun Mar 26 21:29:22 2017 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun Mar 26 21:29:33 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fba48bed
net-ftp/proftpd: bump up to 1.3.6_rc4 In https://bugs.gentoo.org/612664 Yuri Mamaev reports a crash in mod_sftp. There was a few fixes upstream since. Package-Manager: Portage-2.3.5, Repoman-2.3.2 net-ftp/proftpd/Manifest | 1 + .../proftpd-1.3.6_rc4-diskuse-refresh-api.patch | 17 ++ .../files/proftpd-1.3.6_rc4-gss-refresh-api.patch | 60 +++++ .../files/proftpd-1.3.6_rc4-msg-refresh-api.patch | 29 +++ .../files/proftpd-1.3.6_rc4-open-tests.patch | 24 ++ .../proftpd-1.3.6_rc4-vroot-refresh-api.patch | 23 ++ net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild | 256 +++++++++++++++++++++ 7 files changed, 410 insertions(+) diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 60dbe847afd..5f1425799a4 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -5,6 +5,7 @@ DIST mod_vroot-0.9.3.tar.gz 28352 SHA256 f16c61ed7fe2d7231e1421f8f1a484f29972e0e 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.5d.tar.gz 29966560 SHA256 f4e2997be7f22a5b31d7ac72497ed4f4471d24d32385978350410713e76129ac SHA512 3297ddd1f11d46123bbe46488d75fa7a6dcdf2c2d6e7e880a78a427f9f1e9901878dab179e41092e0b9864a615d8ba0b0bf444d4f829870e993e3169c7141c37 WHIRLPOOL d20c43368ad9d3e79e4e7a7590a808974ad4059592f183a325aa05650ee4c4d874b6fe2723c289678df84eb5be4d4888b6a523abd1e0c6a8817333daa12af463 +DIST proftpd-1.3.6rc4.tar.gz 20164575 SHA256 868893e71c4ee8d5855520bda56b6a85ff0c5d786d8b965a28d52d740ba5da52 SHA512 16f7483fcc5b7969e468d48ee65845bf0c14353658fca55752b68137c0d0dc7f2c2dd0e9ef8e360793f232b85af0094e4c83d96a14a16061b68dfc7cee3b691c WHIRLPOOL e44e17001a8f53ad8ea7abd692dfa39913450a79a318db4a22dad8493576eef72601e82e7ce3027f0d58d3b56cd38ce95807bf3b47fb924cd869cb6804500595 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 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 SHA256 255b79d31dc509ffad5d0fbcd469f833a8481e880aa962910c2bc8aa608ca6da SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012 WHIRLPOOL ff907e26a354f53231fed94515eb60050dec77118be6f49147e0eb8b79e50c9d73354618bca19d98d32a3fb79d7ba87507cc6c8b269f259c5fcf23d44ad3a906 diff --git a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-diskuse-refresh-api.patch b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-diskuse-refresh-api.patch new file mode 100644 index 00000000000..34f1d95ebee --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-diskuse-refresh-api.patch @@ -0,0 +1,17 @@ +diff --git a/mod_diskuse.c b/mod_diskuse.c +index 0e0a0d0..7eb5edf 100644 +--- a/mod_diskuse.c ++++ b/mod_diskuse.c +@@ -53,6 +53,12 @@ + + #define MOD_DISKUSE_VERSION "mod_diskuse/0.9" + ++#define pr_parse_expression pr_expr_create ++#define pr_class_or_expression pr_expr_eval_class_or ++#define pr_group_and_expression pr_expr_eval_group_and ++#define pr_group_or_expression pr_expr_eval_group_or ++#define pr_user_or_expression pr_expr_eval_user_or ++ + static unsigned char have_max_diskuse = FALSE; + static double min_diskfree = 0.0; + static double current_diskfree = 0.0; diff --git a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-gss-refresh-api.patch b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-gss-refresh-api.patch new file mode 100644 index 00000000000..43cc659e47d --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-gss-refresh-api.patch @@ -0,0 +1,60 @@ +diff --git a/mod_auth_gss.c.in b/mod_auth_gss.c.in +index 6228b4d..3569ebb 100644 +--- a/mod_auth_gss.c.in ++++ b/mod_auth_gss.c.in +@@ -38,6 +38,10 @@ + */ + + #include "mod_gss.h" ++ ++#define DECLINED PR_DECLINED ++#define ERROR_INT PR_ERROR_INT ++ + extern unsigned char gss_engine; + extern unsigned long gss_flags; + extern int gss_logfd; +diff --git a/mod_gss.c.in b/mod_gss.c.in +index 9d2d4c8..83a4019 100644 +--- a/mod_gss.c.in ++++ b/mod_gss.c.in +@@ -57,6 +57,13 @@ + + #include "mod_gss.h" + ++#define LOG_SYMLINK PR_LOG_SYMLINK ++#define LOG_WRITEABLE_DIR PR_LOG_WRITABLE_DIR ++#define HANDLED PR_HANDLED ++#define ERROR PR_ERROR ++#define DECLINED PR_DECLINED ++#define ERROR_INT PR_ERROR_INT ++ + module gss_module; + + /* Module variables maybe used externaly */ +@@ -1395,7 +1402,7 @@ MODRET gss_auth(cmd_rec *cmd) { + + /* Convert the parameter to upper case */ + for (i = 0; i < strlen(cmd->argv[1]); i++) +- (cmd->argv[1])[i] = toupper((cmd->argv[1])[i]); ++ ((char*)cmd->argv[1])[i] = toupper(((char*)cmd->argv[1])[i]); + + if (!strcmp(cmd->argv[1], "GSSAPI")) { + pr_response_send(R_334, "Using authentication type %s; ADAT must follow", cmd->argv[1]); +@@ -2014,7 +2021,7 @@ MODRET gss_prot(cmd_rec *cmd) { + + /* Convert the parameter to upper case */ + for (i = 0; i < strlen(cmd->argv[1]); i++) +- (cmd->argv[1])[i] = toupper((cmd->argv[1])[i]); ++ ((char*)cmd->argv[1])[i] = toupper(((char*)cmd->argv[1])[i]); + + /* Only PROT S , PROT C or PROT P is valid with respect to GSS. */ + if (!strcmp(cmd->argv[1], "C")) { +@@ -2098,7 +2105,7 @@ MODRET set_gsskeytab(cmd_rec *cmd) { + if (!file_exists(cmd->argv[1])) + CONF_ERROR(cmd, "file does not exist"); + +- if (*cmd->argv[1] != '/') ++ if (((char*)(*cmd->argv))[1] != '/') + CONF_ERROR(cmd, "parameter must be an absolute path"); + + add_config_param_str(cmd->argv[0], 1, cmd->argv[1]); diff --git a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch new file mode 100644 index 00000000000..2e90be254cb --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-msg-refresh-api.patch @@ -0,0 +1,29 @@ +diff --git a/mod_msg.c b/mod_msg.c +index 70bce69..4ce6bd7 100644 +--- a/mod_msg.c ++++ b/mod_msg.c +@@ -52,10 +52,14 @@ extern pid_t mpid; + + module msg_module; + +-#ifndef USE_CTRLS ++#ifndef PR_USE_CTRLS + # error "mod_msg requires Controls support (--enable-ctrls)" + #endif /* USE_CTRLS */ + ++#define pr_scoreboard_read_entry pr_scoreboard_entry_read ++#define DECLINED PR_DECLINED ++#define HANDLED PR_HANDLED ++ + static ctrls_acttab_t msg_acttab[]; + + static int msg_engine = FALSE; +@@ -709,7 +713,7 @@ static int msg_handle_msg(pr_ctrls_t *ctrl, int reqargc, char **reqargv) { + if (msg_send_msg(score->sce_pid, msgstr) < 0) { + msg_errno = errno; + (void) pr_log_writefile(msg_logfd, MOD_MSG_VERSION, +- "error sending message to all (pid %u): %s", reqargv[1], ++ "error sending message to all (pid %u): %s", + score->sce_pid, strerror(errno)); + + } else diff --git a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-open-tests.patch b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-open-tests.patch new file mode 100644 index 00000000000..f65a2cc3fbb --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-open-tests.patch @@ -0,0 +1,24 @@ +gcc-6.3 + glibc-2.25 now can detect 2-argument open that is supposed to created new files. +diff --git a/tests/api/fsio.c b/tests/api/fsio.c +index 2041f43..18d173b 100644 +--- a/tests/api/fsio.c ++++ b/tests/api/fsio.c +@@ -1058,3 +1058,3 @@ START_TEST (fsio_sys_access_file_test) { + /* Make the file to check; we want it to have perms 664.*/ +- fd = open(fsio_test_path, O_CREAT|O_EXCL|O_WRONLY); ++ fd = open(fsio_test_path, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR | S_IWUSR); + fail_if(fd < 0, "Unable to create file '%s': %s", fsio_test_path, +diff --git a/tests/api/scoreboard.c b/tests/api/scoreboard.c +index f0ffdbc..f26d833 100644 +--- a/tests/api/scoreboard.c ++++ b/tests/api/scoreboard.c +@@ -267,3 +267,3 @@ START_TEST (scoreboard_lock_test) { + +- fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR); ++ fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR, S_IRUSR | S_IWUSR); + fail_unless(fd >= 0, "Failed to open '%s': %s", test_file2, strerror(errno)); +@@ -911,3 +911,3 @@ START_TEST (scoreboard_entry_lock_test) { + +- fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR); ++ fd = open(test_file2, O_CREAT|O_EXCL|O_RDWR, S_IRUSR | S_IWUSR); + fail_unless(fd >= 0, "Failed to open '%s': %s", test_file2, strerror(errno)); diff --git a/net-ftp/proftpd/files/proftpd-1.3.6_rc4-vroot-refresh-api.patch b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-vroot-refresh-api.patch new file mode 100644 index 00000000000..59b96ce9002 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.6_rc4-vroot-refresh-api.patch @@ -0,0 +1,23 @@ +diff --git a/mod_vroot.c b/mod_vroot.c +index b0ce59a..db0df35 100644 +--- a/mod_vroot.c ++++ b/mod_vroot.c +@@ -1515,7 +1515,7 @@ MODRET set_vrootserverroot(cmd_rec *cmd) { + */ + + pathlen = strlen(cmd->argv[1]); +- if (cmd->argv[1][pathlen - 1] != '/') { ++ if (((char*)cmd->argv[1])[pathlen - 1] != '/') { + c->argv[0] = pstrcat(c->pool, cmd->argv[1], "/", NULL); + + } else { +@@ -1648,7 +1648,9 @@ MODRET vroot_pre_pass(cmd_rec *cmd) { + fs->rename = vroot_rename; + fs->unlink = vroot_unlink; + fs->open = vroot_open; ++#if ! PROFTPD_VERSION_NUMBER >= 0x0001030604 + fs->creat = vroot_creat; ++#endif /* before ProFTPD 1.3.6_rc4 */ + fs->link = vroot_link; + fs->readlink = vroot_readlink; + fs->symlink = vroot_symlink; diff --git a/net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild b/net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild new file mode 100644 index 00000000000..9adafec9c77 --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild @@ -0,0 +1,256 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit multilib systemd + +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 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:= ) + 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_rc4-open-tests.patch) + +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 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 +}
