commit:     f635465c0b9703ea0d6f017cd40ae5ab34fd6692
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  9 00:44:29 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct  9 00:49:52 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f635465c

net-ftp/proftpd: add 1.3.8a

Closes: https://bugs.gentoo.org/881709
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/Manifest              |   1 +
 net-ftp/proftpd/proftpd-1.3.8a.ebuild | 296 ++++++++++++++++++++++++++++++++++
 2 files changed, 297 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 9a1ad541c100..96625aaa00a3 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,7 @@
 DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B 
f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f
 SHA512 
44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B 
eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb
 SHA512 
f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
 DIST proftpd-1.3.8.tar.gz 19744412 BLAKE2B 
b694ef6a2cbc562e88593e28bdcbc03e7b27f35d9a96c0c337cbc2b8685089ffcc9fe23bb243eab63c2f63fd0d30896407fdb163af231509a217425cd5ebd352
 SHA512 
e7db8829b60dbe5526a5a6160b09dcbdbeeac8f05eaa64950f4d5a918e5bfaf36924059fadef7d8a095e779da2de9c86da4e71761c573803c79eab6c2429ef8b
+DIST proftpd-1.3.8a.tar.gz 19749900 BLAKE2B 
f76bad1f6a62f02535da0db8c5d4d86ce1489694d32ff12069fe708e28169b0ccb6c0f4b0310b88168bd73d459552077cf8d28e1aa585bbb590bd769a1de2bc9
 SHA512 
ebd40045af1232399ec4e6a0b0335cdf0e6609fb767c1bd5ff8bbebc4353c6d82fa2418d95b85f9d976f40f6b44962bb9ce6aaceca7d6b19a388d0d9ca172999
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B 
bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f
 SHA512 
c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc
 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 
38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120
 SHA512 
d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 
970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11
 SHA512 
38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012

diff --git a/net-ftp/proftpd/proftpd-1.3.8a.ebuild 
b/net-ftp/proftpd/proftpd-1.3.8a.ebuild
new file mode 100644
index 000000000000..67c11bb06704
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.8a.ebuild
@@ -0,0 +1,296 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib systemd tmpfiles toolchain-funcs
+
+MOD_CASE="0.7"
+MOD_CLAMAV="0.14rc2"
+MOD_DISKUSE="0.9"
+MOD_GSS="1.3.9"
+MOD_MSG="0.4.1"
+MOD_VROOT="0.9.4"
+
+DESCRIPTION="An advanced and very configurable FTP server"
+HOMEPAGE="
+       http://www.proftpd.org/
+       http://www.castaglia.org/proftpd/
+       https://github.com/jbenden/mod_clamav
+       http://gssmod.sourceforge.net/
+"
+SRC_URI="
+       ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
+       case? ( 
http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
+       clamav? ( 
https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> 
${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz )
+       diskuse? ( 
http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
+       kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
+       msg? ( 
http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
+       vroot? ( 
https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> 
mod_vroot-${MOD_VROOT}.tar.gz )
+"
+S="${WORKDIR}/${P/_/}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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:=
+       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
+       "${FILESDIR}"/${PN}-1.3.8-configure-clang16.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}"/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 -p0 
"${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.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{,.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 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=/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}
+}
+
+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
+}

Reply via email to