commit: 4d757e0f788ee948f9ddc225bd3afed05e55ce6c Author: NHOrus <jy6x2b32pie9 <AT> yahoo <DOT> com> AuthorDate: Mon Apr 14 22:14:00 2025 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Apr 15 16:20:02 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d757e0f
net-ftp/proftpd: fix compilation errors with GCC-15 with more USE flags errors were happening with USE=kerberos,diskuse,clamav Closes: https://bugs.gentoo.org/953814 Closes: https://bugs.gentoo.org/953866 Closes: https://bugs.gentoo.org/953810 Closes: https://bugs.gentoo.org/953871 Signed-off-by: NHOrus <jy6x2b32pie9 <AT> yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/41596 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-ftp/proftpd/Manifest | 1 + .../files/proftpd-1.3.9-clamav-debool.patch | 82 ++++++ .../files/proftpd-1.3.9-clamav-refresh-api.patch | 24 ++ .../files/proftpd-1.3.9-gss-refresh-api.patch | 87 ++++++ net-ftp/proftpd/proftpd-1.3.9-r1.ebuild | 301 +++++++++++++++++++++ 5 files changed, 495 insertions(+) diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest index 13de3c206e12..e26fcb5447eb 100644 --- a/net-ftp/proftpd/Manifest +++ b/net-ftp/proftpd/Manifest @@ -1,4 +1,5 @@ DIST mod_case-0.9.1.tar.gz 22280 BLAKE2B f5cecaa81659eb37dbc378f3e9ad3a82cb927af3b9b5cb12d7c1949de167ab8699fab40436a9c53a9048d23e37e8d9cae3cc3fbc8e0160fde747ec03f8de8add SHA512 010fea310f320f7d3c117cb48cecdfc97764d0e4f0a0b487ea2441ca5d966b45fb5627f1349e9a237366342a6d15da4de490a023465f61a21d9a8abe6c7489dd +DIST mod_diskuse-0.9.1.tar.gz 72314 BLAKE2B e80d196cd1d7ca2defed7baf9bc2d31ac85b2181ac7824aef690384ee8cd8ce4f256e44e27a0aa931b8ca0b94dc2076543e9d9ca909a807300ea74f3c05b63dd SHA512 6f662e0b2f5f43cd0d5ff77f00427c8c32475fe834a614154e135181f9b8efc46e76d77e7ed0e9d0d5197a445ee89576a6b97aa3fd76180ff394aa6168ffa1a5 DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f SHA512 44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891 DIST mod_msg-0.5.1.tar.gz 9689 BLAKE2B fc0cbcfa341c6339be4b064db9ea8860da91c22eeee91c77fd03581e49ebbce3fcd3a27a17da85d782286c6d329e12e7237ee7cbfb70ecc1d4d32bb21f0f74e2 SHA512 729261b151a98bc971c825e88131026725aa4f4fc161adc162af8c4c3c8a457bd981308aea20fe6a1b8711b26c63a17b8d40434ef00bc45504a7c9c2a9cbe4bf DIST mod_vroot-0.9.12.tar.gz 112717 BLAKE2B 60a59539ff9db190432a807f88236e37ab42aea0510903586ff19a00ba9d2e118b58460bdef271f6de8f2b022411484d5fe6610d66552948a9ff459ddda45343 SHA512 a84c14b9d05c4890abe50c86f832c91fa4d0971bc2b1866a3a34d73ff85acd1e902fc0cae739e22ea46e530c73230fb005ea9edeb68fd6cfb963e0c5ca9655ec diff --git a/net-ftp/proftpd/files/proftpd-1.3.9-clamav-debool.patch b/net-ftp/proftpd/files/proftpd-1.3.9-clamav-debool.patch new file mode 100644 index 000000000000..3753d3ee937d --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.9-clamav-debool.patch @@ -0,0 +1,82 @@ +https://bugs.gentoo.org/953810 +https://github.com/jbenden/mod_clamav/pull/24/commits +From ea822d6aa428b47aa9681d60af8d3c3d9eae0600 Mon Sep 17 00:00:00 2001 +From: TJ Saunders <[email protected]> +Date: Sat, 12 Apr 2025 09:02:45 -0700 +Subject: [PATCH] Issue #23: Fix compilation with newer GCC versions, which +complain of variables named `bool`. + +--- + mod_clamav.c | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) + +diff --git a/mod_clamav.c b/mod_clamav.c +index e25e99d..3be0ca6 100644 +--- a/mod_clamav.c ++++ b/mod_clamav.c +@@ -667,18 +667,18 @@ static unsigned long parse_nbytes(char *nbytes_str, char *units_str) { + * Configuration setter: ClamAV + */ + MODRET set_clamav(cmd_rec *cmd) { +- int bool = -1; ++ int engine = -1; + config_rec *c = NULL; + + CHECK_ARGS(cmd, 1); + CHECK_CONF(cmd, CONF_ROOT|CONF_LIMIT|CONF_VIRTUAL|CONF_GLOBAL|CONF_DIR); + +- if ((bool = get_boolean(cmd,1)) == -1) ++ if ((engine = get_boolean(cmd,1)) == -1) + CONF_ERROR(cmd, "expected Boolean parameter"); + + c = add_config_param(cmd->argv[0], 1, NULL); + c->argv[0] = pcalloc(c->pool, sizeof(unsigned char)); +- *((unsigned char *) c->argv[0]) = bool; ++ *((unsigned char *) c->argv[0]) = engine; + c->flags |= CF_MERGEDOWN; + + return PR_HANDLED(cmd); +@@ -688,18 +688,18 @@ MODRET set_clamav(cmd_rec *cmd) { + * Configuration setter: ClamStream + */ + MODRET set_clamstream(cmd_rec *cmd) { +- int bool = -1; ++ int use_stream = -1; + config_rec *c = NULL; + + CHECK_ARGS(cmd, 1); + CHECK_CONF(cmd, CONF_ROOT|CONF_LIMIT|CONF_VIRTUAL|CONF_GLOBAL|CONF_DIR); + +- if ((bool = get_boolean(cmd,1)) == -1) ++ if ((use_stream = get_boolean(cmd,1)) == -1) + CONF_ERROR(cmd, "expected Boolean parameter"); + + c = add_config_param(cmd->argv[0], 1, NULL); + c->argv[0] = pcalloc(c->pool, sizeof(unsigned char)); +- *((unsigned char *) c->argv[0]) = bool; ++ *((unsigned char *) c->argv[0]) = use_stream; + c->flags |= CF_MERGEDOWN; + + return PR_HANDLED(cmd); +@@ -709,18 +709,18 @@ MODRET set_clamstream(cmd_rec *cmd) { + * Configuration setter: ClamFailsafe + */ + MODRET set_clamfailsafe(cmd_rec *cmd) { +- int bool = -1; ++ int use_failsafe = -1; + config_rec *c = NULL; + + CHECK_ARGS(cmd, 1); + CHECK_CONF(cmd, CONF_ROOT|CONF_LIMIT|CONF_VIRTUAL|CONF_GLOBAL|CONF_DIR); + +- if ((bool = get_boolean(cmd, 1)) == -1) ++ if ((use_failsafe = get_boolean(cmd, 1)) == -1) + CONF_ERROR(cmd, "expected Boolean parameter"); + + c = add_config_param(cmd->argv[0], 1, NULL); + c->argv[0] = pcalloc(c->pool, sizeof(unsigned char)); +- *((unsigned char *) c->argv[0]) = bool; ++ *((unsigned char *) c->argv[0]) = use_failsafe; + c->flags |= CF_MERGEDOWN; + + return PR_HANDLED(cmd); diff --git a/net-ftp/proftpd/files/proftpd-1.3.9-clamav-refresh-api.patch b/net-ftp/proftpd/files/proftpd-1.3.9-clamav-refresh-api.patch new file mode 100644 index 000000000000..f21cf4d49244 --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.9-clamav-refresh-api.patch @@ -0,0 +1,24 @@ +https://github.com/jbenden/mod_clamav/commit/509be57280634453be338b52d1bd0af212356587 +From 509be57280634453be338b52d1bd0af212356587 Mon Sep 17 00:00:00 2001 +From: offsides <[email protected]> +Date: Tue, 2 Jan 2024 17:21:37 -0500 +Subject: [PATCH] Update mod_clamav.c (#19) + +end_login is no longer defined in compat.h as of 1.3.9rc2, so the call needs to be replaced with pr_session_end +--- + mod_clamav.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/mod_clamav.c b/mod_clamav.c +index dcc4929..d39e347 100644 +--- a/mod_clamav.c ++++ b/mod_clamav.c +@@ -239,7 +239,7 @@ static int clamavd_scan_stream(int sockd, const char *abs_filename, + buf = malloc(bufsz); + if (!buf) { + pr_log_pri(PR_LOG_CRIT, "Out of memory!"); +- end_login(1); ++ pr_session_end(1); + } + + /* send file contents using protocol defined by Clamd */ diff --git a/net-ftp/proftpd/files/proftpd-1.3.9-gss-refresh-api.patch b/net-ftp/proftpd/files/proftpd-1.3.9-gss-refresh-api.patch new file mode 100644 index 000000000000..ac05bb5bc8fb --- /dev/null +++ b/net-ftp/proftpd/files/proftpd-1.3.9-gss-refresh-api.patch @@ -0,0 +1,87 @@ +Fixes for old API, rename of bool for C23 +https://bugs.gentoo.org/953866 +--- a/mod_gss.c.in ++++ b/mod_gss.c.in +@@ -1412,7 +1412,7 @@ + } + /* If session.user is set, we had a valid login reinforce USER,PASS,ACCT*/ + if (session.user) { +- end_login(0); ++ pr_session_end(0);; + } + + /* Convert the parameter to upper case */ +@@ -2126,18 +2126,18 @@ + + /* usage: GSSEngine on|off */ + MODRET set_gssengine(cmd_rec *cmd) { +- int bool = -1; ++ int Bool = -1; + config_rec *c = NULL; + + CHECK_ARGS(cmd, 1); + CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL); + +- if ((bool = get_boolean(cmd, 1)) == -1) ++ if ((Bool = get_boolean(cmd, 1)) == -1) + CONF_ERROR(cmd, "expected Boolean parameter"); + + c = add_config_param(cmd->argv[0], 1, NULL); + c->argv[0] = pcalloc(c->pool, sizeof(unsigned char)); +- *((unsigned char *) c->argv[0]) = bool; ++ *((unsigned char *) c->argv[0]) = Bool; + + return PR_HANDLED(cmd); + } +@@ -2217,14 +2217,14 @@ + + /* usage: GSSRequired on|off|both|ctrl|control|data */ + MODRET set_gssrequired(cmd_rec *cmd) { +- int bool = -1; ++ int Bool = -1; + unsigned char on_ctrl = FALSE, on_data = FALSE; + config_rec *c = NULL; + + CHECK_ARGS(cmd, 1); + CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL); + +- if ((bool = get_boolean(cmd, 1)) == -1) { ++ if ((Bool = get_boolean(cmd, 1)) == -1) { + + if (!strcmp(cmd->argv[1], "control") || !strcmp(cmd->argv[1], "ctrl")) + on_ctrl = TRUE; +@@ -2240,7 +2240,7 @@ + CONF_ERROR(cmd, "bad parameter"); + + } else { +- if (bool == TRUE) { ++ if (Bool == TRUE) { + on_ctrl = TRUE; + on_data = TRUE; + } +@@ -2259,14 +2259,14 @@ + + /* usage: GSSInet6 on|off|yes|no*/ + MODRET set_gss_af_inet6(cmd_rec *cmd) { +- int bool = -1; ++ int Bool = -1; + unsigned char on_inet6 = FALSE; + config_rec *c = NULL; + + CHECK_ARGS(cmd, 1); + CHECK_CONF(cmd, CONF_ROOT|CONF_VIRTUAL|CONF_GLOBAL); + +- if ((bool = get_boolean(cmd, 1)) == -1) { ++ if ((Bool = get_boolean(cmd, 1)) == -1) { + + if (!strcmp(cmd->argv[1], "on") || !strcmp(cmd->argv[1], "yes")) + on_inet6 = TRUE; +@@ -2278,7 +2278,7 @@ + CONF_ERROR(cmd, "bad parameter"); + + } else { +- if (bool == TRUE) ++ if (Bool == TRUE) + on_inet6 = TRUE; + } + diff --git a/net-ftp/proftpd/proftpd-1.3.9-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.9-r1.ebuild new file mode 100644 index 000000000000..c5a5a02337cc --- /dev/null +++ b/net-ftp/proftpd/proftpd-1.3.9-r1.ebuild @@ -0,0 +1,301 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit systemd tmpfiles toolchain-funcs + +MOD_CASE="0.9.1" +MOD_CLAMAV="0.14rc2" +MOD_DISKUSE="0.9.1" +MOD_GSS="1.3.9" +MOD_MSG="0.5.1" +MOD_VROOT="0.9.12" + +DESCRIPTION="An advanced and very configurable FTP server" +HOMEPAGE=" + http://www.proftpd.org/ + http://www.castaglia.org/proftpd/ + https://github.com/jbenden/mod_clamav + https://gssmod.sourceforge.net/ +" +SRC_URI=" + ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz + case? ( https://github.com/Castaglia/${PN}-mod_case/archive/v${MOD_CASE}.tar.gz -> 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? ( https://github.com/Castaglia/${PN}-mod_diskuse/archive/v${MOD_DISKUSE}.tar.gz -> mod_diskuse-${MOD_DISKUSE}.tar.gz ) + kerberos? ( https://downloads.sourceforge.net/gssmod/mod_gss-${MOD_GSS}.tar.gz ) + msg? ( https://github.com/Castaglia/${PN}-mod_msg/archive/v${MOD_MSG}.tar.gz -> 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 ) +" +S="${WORKDIR}/${P/_/}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6 + kerberos ldap 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" +# Some tests are ran in chroot. Confuses sandbox. +RESTRICT="test" +# TODO: geoip +REQUIRED_USE=" + ban? ( ctrls ) + msg? ( ctrls ) + sftp? ( ssl ) + shaper? ( ctrls ) + + mysql? ( ssl ) + postgres? ( ssl ) + sqlite? ( ssl ) +" + +COMMON_DEPEND=" + virtual/libcrypt:= + net-dns/libidn:0= + 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? ( dev-libs/openssl:0= ) + pam? ( sys-libs/pam ) + pcre? ( dev-libs/libpcre ) + postgres? ( dev-db/postgresql:= ) + sodium? ( dev-libs/libsodium:0= ) + sqlite? ( dev-db/sqlite:3 ) +" +DEPEND=" + ${COMMON_DEPEND} + test? ( dev-libs/check ) +" +RDEPEND=" + ${COMMON_DEPEND} + net-ftp/ftpbase + selinux? ( sec-policy/selinux-ftp ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-1.3.6-use-trace.patch +) + +QA_CONFIG_IMPL_DECL_SKIP=( + # AIX only + authenticate + loginfailed + loginsuccess + + # Deprecated/removed functions, not actually checking for this anyway + SSLeay_add_all_algorithms + # Test isn't actually checking for BIO_f_zlib + BIO_f_zlib +) + +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}"/${PN}-mod_case-${MOD_CASE}/mod_case.c contrib || die + cp -v "${WORKDIR}"/${PN}-mod_case-${MOD_CASE}/mod_case.html doc/contrib || die + fi + + if use clamav ; then + in_dir mod_clamav-${MOD_CLAMAV} eapply "${FILESDIR}"/"${PN}"-1.3.9-clamav-refresh-api.patch + in_dir mod_clamav-${MOD_CLAMAV} eapply "${FILESDIR}"/"${PN}"-1.3.9-clamav-debool.patch + cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die + eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch + fi + + if use diskuse; then + in_dir ${PN}-mod_diskuse-${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}"/${PN}-mod_diskuse-${MOD_DISKUSE}/mod_diskuse.h "${S}"/contrib || die + + cp -v "${WORKDIR}"/${PN}-mod_diskuse-${MOD_DISKUSE}/mod_diskuse.c "${S}"/contrib || die + cp -v "${WORKDIR}"/${PN}-mod_diskuse-${MOD_DISKUSE}/mod_diskuse.html "${S}"/doc/contrib || die + fi + + if use msg; then + cp -v "${WORKDIR}"/${PN}-mod_msg-${MOD_MSG}/mod_msg.c contrib || die + cp -v "${WORKDIR}"/${PN}-mod_msg-${MOD_MSG}/mod_msg.html doc/contrib || die + fi + + if use vroot; then + cp -rv "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT} contrib/mod_vroot || die + fi + + if use kerberos ; then + # in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch + in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.9-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{,.ac} || 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 + + tc-export CC +} + +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 ${PN}-mod_diskuse-${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}" + + local myeconfargs=( + --cache-file="${S}"/config.cache + --localstatedir=/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 + --enable-shadow + --enable-autoshadow + ${c:1} + ) + + econf "${myeconfargs[@]}" +} + +src_test() { + emake api-tests -C tests +} + +src_install() { + default + [[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale + rm -rf "${ED}"/run "${ED}"/var/run + + newinitd "${FILESDIR}"/proftpd.initd-r1 proftpd + insinto /etc/proftpd + doins "${FILESDIR}"/proftpd.conf.sample + + insinto /etc/xinetd.d + newins "${FILESDIR}"/proftpd.xinetd proftpd + + insinto /etc/logrotate.d + newins "${FILESDIR}"/${PN}.logrotate ${PN} + + dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES + + docinto html + dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html + + docinto rfc + dodoc doc/rfc/*.txt + + systemd_dounit "${FILESDIR}"/${PN}.service + newtmpfiles "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf +} + +pkg_postinst() { + # Create /var/run files at package merge time: bug #650000 + tmpfiles_process ${PN}.conf +}
