public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-11-27 13:40 Mikle Kolyada
  0 siblings, 0 replies; 168+ messages in thread
From: Mikle Kolyada @ 2019-11-27 13:40 UTC (permalink / raw
  To: gentoo-commits

commit:     4736112001e625f17e24b70803dfffaed9a9e207
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 27 13:39:41 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Wed Nov 27 13:39:41 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47361120

net-ftp/proftpd: arm stable wrt bug #699520

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index f0f14731a89..72cb29f0cd9 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2024-11-10  0:54 Andreas K. Hüttel
  0 siblings, 0 replies; 168+ messages in thread
From: Andreas K. Hüttel @ 2024-11-10  0:54 UTC (permalink / raw
  To: gentoo-commits

commit:     7bf318930d169ea6fd1003aa298c87f26d520861
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 10 00:53:16 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 10 00:54:02 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bf31893

net-ftp/proftpd: add missing dependency libidn

Closes: https://bugs.gentoo.org/923096
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 net-ftp/proftpd/{proftpd-1.3.8b.ebuild => proftpd-1.3.8b-r1.ebuild} | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-ftp/proftpd/proftpd-1.3.8b.ebuild b/net-ftp/proftpd/proftpd-1.3.8b-r1.ebuild
similarity index 99%
rename from net-ftp/proftpd/proftpd-1.3.8b.ebuild
rename to net-ftp/proftpd/proftpd-1.3.8b-r1.ebuild
index d565346c9494..2ea4aa21e722 100644
--- a/net-ftp/proftpd/proftpd-1.3.8b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8b-r1.ebuild
@@ -52,6 +52,7 @@ REQUIRED_USE="
 
 COMMON_DEPEND="
 	virtual/libcrypt:=
+	net-dns/libidn:0=
 	acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2024-08-15  8:17 Hans de Graaff
  0 siblings, 0 replies; 168+ messages in thread
From: Hans de Graaff @ 2024-08-15  8:17 UTC (permalink / raw
  To: gentoo-commits

commit:     1e6f9b09158fc94649052a6c93e250348bf63624
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 08:15:49 2024 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 08:16:40 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e6f9b09

net-ftp/proftpd: drop 1.3.8-r1

Bug: https://bugs.gentoo.org/920385
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 net-ftp/proftpd/Manifest                |   1 -
 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 275 --------------------------------
 2 files changed, 276 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 231262447d33..3f16d81f037c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,5 @@
 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.8b.tar.gz 19752808 BLAKE2B 3e8fdf5e0a27dd2284514a446496715e90c15d7be17824cceb4159e930d64705680320b33769f68ab6f3ce152322363aca6301190eea234de0bf4bb0cc6557e1 SHA512 291a91f220d711fefdbff18ef4e056080ad99c94dc4c71d0651f725932e1f2d9438fb75fbc2017e0f30a9a18a354b2d515788fbd538a80414f8c2d4eaaace396
 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

diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
deleted file mode 100644
index 7d368bf6c71e..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2024 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? ( https://downloads.sourceforge.net/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 ~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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-CDEPEND="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="${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}"/${P}-configure-clang16.patch
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2024-06-24  2:54 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2024-06-24  2:54 UTC (permalink / raw
  To: gentoo-commits

commit:     9d28cd9dd9987b3f5570dc3ad5d5aa11e658d6b2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 02:54:33 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 02:54:33 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d28cd9d

net-ftp/proftpd: Stabilize 1.3.8b sparc, #934755

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8b.ebuild b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
index 74658bbd63df..62e189bef4f0 100644
--- a/net-ftp/proftpd/proftpd-1.3.8b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2024-06-23 16:01 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2024-06-23 16:01 UTC (permalink / raw
  To: gentoo-commits

commit:     9c68ec9fe369ffb586ae8dae2b16874347d7b039
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 16:00:19 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 16:00:19 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c68ec9f

net-ftp/proftpd: Stabilize 1.3.8b x86, #934755

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8b.ebuild b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
index b14ed6322a05..74658bbd63df 100644
--- a/net-ftp/proftpd/proftpd-1.3.8b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2024-06-23 16:01 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2024-06-23 16:01 UTC (permalink / raw
  To: gentoo-commits

commit:     243f817b10893fd2e06fca96881354dd0ea290b7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 16:00:17 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 16:00:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=243f817b

net-ftp/proftpd: Stabilize 1.3.8b amd64, #934755

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8b.ebuild b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
index 92720aca3349..b14ed6322a05 100644
--- a/net-ftp/proftpd/proftpd-1.3.8b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2024-06-23  6:03 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2024-06-23  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     df67d6d56232ce2a4757c86719f5808b5234bb3f
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 06:03:15 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 06:03:15 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df67d6d5

net-ftp/proftpd: Stabilize 1.3.8b ppc64, #934755

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8b.ebuild b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
index bbb68edfae9e..42502f98f84a 100644
--- a/net-ftp/proftpd/proftpd-1.3.8b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2024-06-23  6:03 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2024-06-23  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     ce525a4815fa66c8c964f12e4977a0da5b9e837c
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 06:03:17 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 06:03:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce525a48

net-ftp/proftpd: Stabilize 1.3.8b ppc, #934755

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8b.ebuild b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
index c1ab37c3628a..92720aca3349 100644
--- a/net-ftp/proftpd/proftpd-1.3.8b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2024-06-23  6:03 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2024-06-23  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     f260f1d08dd3686fbf6e10f889a4dfdbf3b7d208
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 06:03:16 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 06:03:16 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f260f1d0

net-ftp/proftpd: Stabilize 1.3.8b arm, #934755

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8b.ebuild b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
index 42502f98f84a..c1ab37c3628a 100644
--- a/net-ftp/proftpd/proftpd-1.3.8b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
@@ -32,7 +32,7 @@ S="${WORKDIR}/${P/_/}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2024-06-23  3:54 Hans de Graaff
  0 siblings, 0 replies; 168+ messages in thread
From: Hans de Graaff @ 2024-06-23  3:54 UTC (permalink / raw
  To: gentoo-commits

commit:     217e2896515fb2ba96c307c5416f0e37135ad93a
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 23 03:52:49 2024 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jun 23 03:52:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=217e2896

net-ftp/proftpd: drop 1.3.8, 1.3.8a, 1.3.8a-r1

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 net-ftp/proftpd/Manifest                 |   1 -
 net-ftp/proftpd/proftpd-1.3.8.ebuild     | 274 ----------------------------
 net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild | 304 -------------------------------
 net-ftp/proftpd/proftpd-1.3.8a.ebuild    | 296 ------------------------------
 4 files changed, 875 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 1b2267d5e802..231262447d33 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,7 +1,6 @@
 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-1.3.8b.tar.gz 19752808 BLAKE2B 3e8fdf5e0a27dd2284514a446496715e90c15d7be17824cceb4159e930d64705680320b33769f68ab6f3ce152322363aca6301190eea234de0bf4bb0cc6557e1 SHA512 291a91f220d711fefdbff18ef4e056080ad99c94dc4c71d0651f725932e1f2d9438fb75fbc2017e0f30a9a18a354b2d515788fbd538a80414f8c2d4eaaace396
 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

diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild
deleted file mode 100644
index fb978973f74b..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.8.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2024 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? ( https://downloads.sourceforge.net/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 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-CDEPEND="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="${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
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild
deleted file mode 100644
index bbb68edfae9e..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2024 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? ( https://downloads.sourceforge.net/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
-	"${FILESDIR}"/${PN}-1.3.8a-configure-c99.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}"
-
-	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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.8a.ebuild b/net-ftp/proftpd/proftpd-1.3.8a.ebuild
deleted file mode 100644
index e7516214ecfb..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.8a.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2024 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? ( https://downloads.sourceforge.net/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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-12-20 15:19 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2023-12-20 15:19 UTC (permalink / raw
  To: gentoo-commits

commit:     9b38a63644a6643c8356ab3720c391f47446dda7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 15:10:20 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 15:18:39 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b38a636

net-ftp/proftpd: add 1.3.8b

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

 net-ftp/proftpd/Manifest              |   1 +
 net-ftp/proftpd/proftpd-1.3.8b.ebuild | 304 ++++++++++++++++++++++++++++++++++
 2 files changed, 305 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 96625aaa00a3..1b2267d5e802 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -2,6 +2,7 @@ DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef
 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-1.3.8b.tar.gz 19752808 BLAKE2B 3e8fdf5e0a27dd2284514a446496715e90c15d7be17824cceb4159e930d64705680320b33769f68ab6f3ce152322363aca6301190eea234de0bf4bb0cc6557e1 SHA512 291a91f220d711fefdbff18ef4e056080ad99c94dc4c71d0651f725932e1f2d9438fb75fbc2017e0f30a9a18a354b2d515788fbd538a80414f8c2d4eaaace396
 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.8b.ebuild b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
new file mode 100644
index 000000000000..8e3630ce042f
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.8b.ebuild
@@ -0,0 +1,304 @@
+# 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
+	"${FILESDIR}"/${PN}-1.3.8a-configure-c99.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}"
+
+	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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-10-09  0:50 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2023-10-09  0:50 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-08-02 21:06 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2023-08-02 21:06 UTC (permalink / raw
  To: gentoo-commits

commit:     6f02264ee93935653fd926bda80c5250af9f8cdf
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  2 21:05:36 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug  2 21:05:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f02264e

net-ftp/proftpd: Stabilize 1.3.8-r1 ppc, #910351

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
index 8aff4c81106b..f734da9f80ed 100644
--- a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-07-15  6:08 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2023-07-15  6:08 UTC (permalink / raw
  To: gentoo-commits

commit:     3f5fcadba7d991e71cfa8a960497a517435ef85b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 06:08:13 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 06:08:13 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f5fcadb

net-ftp/proftpd: Stabilize 1.3.8-r1 arm, #910351

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
index 507f44891cfd..8aff4c81106b 100644
--- a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-07-15  3:10 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2023-07-15  3:10 UTC (permalink / raw
  To: gentoo-commits

commit:     77e1b24da973161ad8240975d0d5cf1f13d5170c
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 03:08:09 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 03:10:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=77e1b24d

net-ftp/proftpd: Stabilize 1.3.8-r1 ppc64, #910351

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
index c9e92c82862d..507f44891cfd 100644
--- a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-07-14 18:38 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2023-07-14 18:38 UTC (permalink / raw
  To: gentoo-commits

commit:     a4c45f0dea9fad84e91e730b68174dce37d753b0
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 18:37:58 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 18:37:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4c45f0d

net-ftp/proftpd: Stabilize 1.3.8-r1 sparc, #910351

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
index 4ec0607a5c2e..c9e92c82862d 100644
--- a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-07-14 17:07 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2023-07-14 17:07 UTC (permalink / raw
  To: gentoo-commits

commit:     c8b3991af801f52a73e2e49c81b2b383254f69c1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 17:07:37 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 17:07:37 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8b3991a

net-ftp/proftpd: Stabilize 1.3.8-r1 x86, #910351

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
index f3a2cd0155e4..4ec0607a5c2e 100644
--- a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-07-14 15:07 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2023-07-14 15:07 UTC (permalink / raw
  To: gentoo-commits

commit:     0b35d15c02d25456e65d19281279e7cdece298b1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 14 15:07:25 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 14 15:07:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b35d15c

net-ftp/proftpd: Stabilize 1.3.8-r1 amd64, #910351

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
index 796466a954e3..f3a2cd0155e4 100644
--- a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-06-03  1:57 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2023-06-03  1:57 UTC (permalink / raw
  To: gentoo-commits

commit:     47e7fae47a59bea9b1cd11a21396ca3295af80ac
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jun  3 01:57:02 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun  3 01:57:02 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47e7fae4

net-ftp/proftpd: Keyword 1.3.8-r1 arm64, #907700

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
index 67887804453b..796466a954e3 100644
--- a/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-05-07  7:21 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2023-05-07  7:21 UTC (permalink / raw
  To: gentoo-commits

commit:     d2f4f5f7bd6dc677c6e93a4fcd81c28878e176a1
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May  7 07:16:11 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May  7 07:21:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2f4f5f7

net-ftp/proftpd: drop 1.3.8_rc2-r2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/Manifest                    |   1 -
 net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild | 274 ----------------------------
 2 files changed, 275 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 4561bc0e83b9..9a1ad541c100 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,7 +1,6 @@
 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.8rc2.tar.gz 20485204 BLAKE2B fc79d56dfe61e2b7b0b2a8da52237f402212389b424c92142e24d4caa8688598ca26d2e2956e1ce5fa9c5ac7467aa7f61ebecc6e4ffe73a74118ab242049b68f SHA512 0d98fb2a3044c4426aaf47f483e7af09c736d641ab7334e5f0f32088be1c904bc9ca00aae8977e496c951c63071deb20c282f53f43c1664bc4978a66215a774a
 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.8_rc2-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
deleted file mode 100644
index 2f368e288ee7..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-CDEPEND="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="${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
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-02-26 19:48 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2023-02-26 19:48 UTC (permalink / raw
  To: gentoo-commits

commit:     f14f0bfdb9cfd462f98eade1c4506e9e6f9a0635
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 26 19:47:58 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 19:47:58 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f14f0bfd

net-ftp/proftpd: Stabilize 1.3.8 sparc, #896304

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild
index 5ddf7ae6c2c7..744810870263 100644
--- a/net-ftp/proftpd/proftpd-1.3.8.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-02-24 18:11 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2023-02-24 18:11 UTC (permalink / raw
  To: gentoo-commits

commit:     0a65d14c98c58fbe1f133badd077aa53bccf871a
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 18:11:34 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 18:11:34 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a65d14c

net-ftp/proftpd: Stabilize 1.3.8 amd64, #896304

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild
index 83bf1a2d11a8..5ddf7ae6c2c7 100644
--- a/net-ftp/proftpd/proftpd-1.3.8.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-02-24 18:09 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2023-02-24 18:09 UTC (permalink / raw
  To: gentoo-commits

commit:     7bee710aab052e9887d207b7bdd84289da2264dc
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 18:09:35 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 18:09:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bee710a

net-ftp/proftpd: Stabilize 1.3.8 x86, #896304

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild
index 7228ffc7a484..83bf1a2d11a8 100644
--- a/net-ftp/proftpd/proftpd-1.3.8.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-02-24 17:11 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2023-02-24 17:11 UTC (permalink / raw
  To: gentoo-commits

commit:     24334cc084cf191f97c0ac6e839ea2ecc360c0c1
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 17:10:50 2023 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 17:10:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24334cc0

net-ftp/proftpd: Stabilize 1.3.8 ppc, #896304

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild
index afea37113b24..7228ffc7a484 100644
--- a/net-ftp/proftpd/proftpd-1.3.8.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-02-24 16:56 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2023-02-24 16:56 UTC (permalink / raw
  To: gentoo-commits

commit:     181061ab2b5f7b538bb3dd17b327d2bc4b7acb5f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 16:55:38 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 16:55:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=181061ab

net-ftp/proftpd: Stabilize 1.3.8 arm, #896304

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild
index 6671985169fb..33244fa730cc 100644
--- a/net-ftp/proftpd/proftpd-1.3.8.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2023-02-24 16:56 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2023-02-24 16:56 UTC (permalink / raw
  To: gentoo-commits

commit:     cb0b378d1f4552af409603d1ecdaad87ee2a3593
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 16:55:40 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 16:55:40 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0b378d

net-ftp/proftpd: Stabilize 1.3.8 ppc64, #896304

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild b/net-ftp/proftpd/proftpd-1.3.8.ebuild
index 33244fa730cc..afea37113b24 100644
--- a/net-ftp/proftpd/proftpd-1.3.8.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-11-26 21:04 Piotr Karbowski
  0 siblings, 0 replies; 168+ messages in thread
From: Piotr Karbowski @ 2022-11-26 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     2c66d8abac262e010b35d450c3cf7ec31e6867d0
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 21:04:00 2022 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 21:04:00 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c66d8ab

net-ftp/proftpd: drop into maintainer-needed.

Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 net-ftp/proftpd/metadata.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 21976ea2f9ed..94be327d0641 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slashbeast@gentoo.org</email>
-		<name>Piotr Karbowski</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>ProFTPD grew out of the desire to have a secure and 
 configurable FTP server, and out of a significant admiration of the Apache web 
 server.</longdescription>


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-11-19 15:48 Piotr Karbowski
  0 siblings, 0 replies; 168+ messages in thread
From: Piotr Karbowski @ 2022-11-19 15:48 UTC (permalink / raw
  To: gentoo-commits

commit:     9c76e439f2bd106d14a0914360f7f7a3f6301235
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 19 15:47:30 2022 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sat Nov 19 15:47:30 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c76e439

net-ftp/proftpd: drop old

Bug: https://bugs.gentoo.org/811495
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 net-ftp/proftpd/Manifest                    |   4 -
 net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild    | 277 ----------------------------
 net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild    | 275 ---------------------------
 net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild    | 275 ---------------------------
 net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild | 274 ---------------------------
 5 files changed, 1105 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 5a406ad79090..3ec591664228 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,9 +1,5 @@
 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.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
-DIST proftpd-1.3.7b.tar.gz 20422741 BLAKE2B 9234d395348778c208307928ae7d673078edf01d9d4e46501b2f46dc051bb0debb1cae0d81ac1564b4e6828a07dae6bdd1b5e708449bb2e21acf6ee1aedfb1f2 SHA512 c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d7368911114b135a43c8b0ad4170c9215a87e93e56108de889a
-DIST proftpd-1.3.7c.tar.gz 20428648 BLAKE2B c8c02774be97e05ed6952c6765d908dd27e64891e709ccb5c737501da3d4857dc151c19a9b428b490b7963f3c3ad5d206a6e5ac6408bfafd333a373ec54fcef2 SHA512 f9268e521e68cebaf1947cbfe1cc57f282ea09d59410c1722cd9a68c99d643b90b837c1fa840fdb894597c7429b0eb62bc4ac324915ffac04366daa2f104e88d
-DIST proftpd-1.3.8rc1.tar.gz 20469318 BLAKE2B 5385c013ecc123802163cd632eb1c87b0feb9bfac278f9d419ff4fc76380f415bee1726e6ac37929aff804bf4bdf0f9b525a250b9ac8e8679f772672c78a639a SHA512 9c0fda5c870a7e84227d5ee6e1b331e0150c4cad297d6bd640e9ccfa838bd98e8620e542c40fc80d0f1c5f82ed3e2e2b5af7d3a7c371d96fb4e37d5472e24032
 DIST proftpd-1.3.8rc2.tar.gz 20485204 BLAKE2B fc79d56dfe61e2b7b0b2a8da52237f402212389b424c92142e24d4caa8688598ca26d2e2956e1ce5fa9c5ac7467aa7f61ebecc6e4ffe73a74118ab242049b68f SHA512 0d98fb2a3044c4426aaf47f483e7af09c736d641ab7334e5f0f32088be1c904bc9ca00aae8977e496c951c63071deb20c282f53f43c1664bc4978a66215a774a
 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

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild
deleted file mode 100644
index cc90efaadad2..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-CDEPEND="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="${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}"/${P}-tinfow-segv.patch
-	"${FILESDIR}"/${P}-no-ncurses.patch
-	"${FILESDIR}"/${P}-slibtool.patch
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild
deleted file mode 100644
index 1ef44adafcf2..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-CDEPEND="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="${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.7a-slibtool.patch
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild
deleted file mode 100644
index 77dd4ba321ed..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-CDEPEND="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="${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.7a-slibtool.patch
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild
deleted file mode 100644
index b55c7ab226b8..000000000000
--- a/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-CDEPEND="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="${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
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-05-10 22:57 Andreas K. Hüttel
  0 siblings, 0 replies; 168+ messages in thread
From: Andreas K. Hüttel @ 2022-05-10 22:57 UTC (permalink / raw
  To: gentoo-commits

commit:     ca09e2c20cc8facee12e91e680aecb836a966d9f
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue May 10 22:55:06 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue May 10 22:56:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca09e2c2

net-ftp/proftpd: Drop ~mips

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild    | 2 +-
 net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild    | 2 +-
 net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild    | 2 +-
 net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild | 2 +-
 net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild
index c3f063f49b27..cc90efaadad2 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 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"

diff --git a/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild
index 85ccd857198b..1ef44adafcf2 100644
--- a/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7b-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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"

diff --git a/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild
index ad2ce6dcf9d1..77dd4ba321ed 100644
--- a/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7c-r1.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 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"

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild
index 58c91dffc600..b55c7ab226b8 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc1-r3.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~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"

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
index fdbaed7feefe..2f368e288ee7 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-04-30  5:32 Yixun Lan
  0 siblings, 0 replies; 168+ messages in thread
From: Yixun Lan @ 2022-04-30  5:32 UTC (permalink / raw
  To: gentoo-commits

commit:     15c41958f77a74309caffd07ef04c57e97cfb79e
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 05:31:44 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 05:32:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15c41958

net-ftp/proftpd: keyword ~riscv for 1.3.8_rc2-r2, #841242

Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
index b21589b1457e..fdbaed7feefe 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-04-11 19:24 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2022-04-11 19:24 UTC (permalink / raw
  To: gentoo-commits

commit:     5c47e43829e96f9d83685a31210fbfa60359ee67
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 10 23:18:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 19:24:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c47e438

net-ftp/proftpd: update upstream metadata

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 8b0715aefd77..21976ea2f9ed 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -39,6 +39,6 @@ server.</longdescription>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">gssmod</remote-id>
-		<remote-id type="github">Castaglia/proftpd-mod_vroot</remote-id>
+		<remote-id type="github">proftpd/proftpd</remote-id>
 	</upstream>
 </pkgmetadata>


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-01-23 15:21 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2022-01-23 15:21 UTC (permalink / raw
  To: gentoo-commits

commit:     83e290c67cd8714e0044fa17f79c8e70a393e284
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 15:21:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 15:21:10 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83e290c6

net-ftp/proftpd: Stabilize 1.3.8_rc2 sparc, #831645

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
index 6ce929f51afc..1dfcd3c17181 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-01-21 20:27 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2022-01-21 20:27 UTC (permalink / raw
  To: gentoo-commits

commit:     9a1a5d8b33db5cb68b74468b5c1b2bd4b74c195d
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 20:27:33 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 20:27:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a1a5d8b

net-ftp/proftpd: Stabilize 1.3.8_rc2 ppc, #831645

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
index cb7916e87ca2..6ce929f51afc 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-01-21 20:11 Arthur Zamarin
  0 siblings, 0 replies; 168+ messages in thread
From: Arthur Zamarin @ 2022-01-21 20:11 UTC (permalink / raw
  To: gentoo-commits

commit:     564854978986c99c6a8af0a2e8aaae3695a0a830
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 20:10:53 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 20:10:53 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56485497

net-ftp/proftpd: Stabilize 1.3.8_rc2 ppc64, #831645

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
index a2115eb8eb98..cb7916e87ca2 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ppc64 ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-01-21 12:42 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2022-01-21 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     28578519a8414eee4cc8ab23a168054ec2696c8b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 12:40:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 12:40:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28578519

net-ftp/proftpd: Stabilize 1.3.8_rc2 arm, #831645

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
index 6574a2e3ba61..a2115eb8eb98 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-01-21 10:03 Jakov Smolić
  0 siblings, 0 replies; 168+ messages in thread
From: Jakov Smolić @ 2022-01-21 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     7baa4b497ad232e700bf4ac8a95a3316c2956abd
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 10:03:36 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 10:03:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7baa4b49

net-ftp/proftpd: Stabilize 1.3.8_rc2 x86, #831645

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
index 825cfab45e03..6574a2e3ba61 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-01-21 10:03 Jakov Smolić
  0 siblings, 0 replies; 168+ messages in thread
From: Jakov Smolić @ 2022-01-21 10:03 UTC (permalink / raw
  To: gentoo-commits

commit:     49089f36336bcd55927b6e2fc8437e251c1427cb
Author:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 21 10:03:16 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Jan 21 10:03:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49089f36

net-ftp/proftpd: Stabilize 1.3.8_rc2 amd64, #831645

Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
index 24743199c475..825cfab45e03 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2022-01-06  9:07 David Seifert
  0 siblings, 0 replies; 168+ messages in thread
From: David Seifert @ 2022-01-06  9:07 UTC (permalink / raw
  To: gentoo-commits

commit:     f5d1a6208a28b515e6d46eb3be471a2b650b440d
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  6 09:07:03 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Jan  6 09:07:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5d1a620

net-ftp/proftpd: remove userland_GNU

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a-r2.ebuild    | 6 +++---
 net-ftp/proftpd/proftpd-1.3.7b-r1.ebuild    | 6 +++---
 net-ftp/proftpd/proftpd-1.3.7c.ebuild       | 6 +++---
 net-ftp/proftpd/proftpd-1.3.8_rc1-r1.ebuild | 6 +++---
 net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild    | 6 +++---
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r2.ebuild
index ab94f1827e3a..df1dad4e4a74 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -235,8 +235,8 @@ src_configure() {
 		$(use_enable sodium) \
 		$(use_enable test tests) \
 		--enable-trace \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
+		--enable-shadow \
+		--enable-autoshadow \
 		${c:1}
 }
 

diff --git a/net-ftp/proftpd/proftpd-1.3.7b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7b-r1.ebuild
index 3bb9b6ecaeac..a60f286ffbbe 100644
--- a/net-ftp/proftpd/proftpd-1.3.7b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -233,8 +233,8 @@ src_configure() {
 		$(use_enable sodium) \
 		$(use_enable test tests) \
 		--enable-trace \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
+		--enable-shadow \
+		--enable-autoshadow \
 		${c:1}
 }
 

diff --git a/net-ftp/proftpd/proftpd-1.3.7c.ebuild b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
index 00490f0b5ea5..e1eab3fccc3b 100644
--- a/net-ftp/proftpd/proftpd-1.3.7c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -233,8 +233,8 @@ src_configure() {
 		$(use_enable sodium) \
 		$(use_enable test tests) \
 		--enable-trace \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
+		--enable-shadow \
+		--enable-autoshadow \
 		${c:1}
 }
 

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc1-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc1-r1.ebuild
index f44c0ca053cc..24743199c475 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc1-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -232,8 +232,8 @@ src_configure() {
 		$(use_enable sodium) \
 		$(use_enable test tests) \
 		--enable-trace \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
+		--enable-shadow \
+		--enable-autoshadow \
 		${c:1}
 }
 

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
index f44c0ca053cc..24743199c475 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -232,8 +232,8 @@ src_configure() {
 		$(use_enable sodium) \
 		$(use_enable test tests) \
 		--enable-trace \
-		$(use_enable userland_GNU shadow) \
-		$(use_enable userland_GNU autoshadow) \
+		--enable-shadow \
+		--enable-autoshadow \
 		${c:1}
 }
 


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-10-27  4:13 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-10-27  4:13 UTC (permalink / raw
  To: gentoo-commits

commit:     f971b34468de3f69ada30579159786a22813d741
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 27 04:11:27 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 27 04:11:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f971b344

net-ftp/proftpd: Stabilize 1.3.7c arm, #819894

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7c.ebuild b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
index 53a27a97204..00490f0b5ea 100644
--- a/net-ftp/proftpd/proftpd-1.3.7c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-10-24  4:51 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-10-24  4:51 UTC (permalink / raw
  To: gentoo-commits

commit:     c64093d4fe484190506f0e7ef60394ed3b065a32
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 24 04:51:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 04:51:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c64093d4

net-ftp/proftpd: Stabilize 1.3.7c x86, #819894

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7c.ebuild b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
index a838c620c17..53a27a97204 100644
--- a/net-ftp/proftpd/proftpd-1.3.7c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-10-24  4:50 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-10-24  4:50 UTC (permalink / raw
  To: gentoo-commits

commit:     1526b889458774b94739d496522d4371dc92a66d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 24 04:50:14 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 04:50:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1526b889

net-ftp/proftpd: Stabilize 1.3.7c ppc64, #819894

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7c.ebuild b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
index 2899bc67432..a838c620c17 100644
--- a/net-ftp/proftpd/proftpd-1.3.7c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-10-24  4:50 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-10-24  4:50 UTC (permalink / raw
  To: gentoo-commits

commit:     7f0db9d5e9b89c78f535c9933fbe7941ccbe8e43
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 24 04:50:11 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 04:50:11 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f0db9d5

net-ftp/proftpd: Stabilize 1.3.7c ppc, #819894

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7c.ebuild b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
index c4eb028f613..2899bc67432 100644
--- a/net-ftp/proftpd/proftpd-1.3.7c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-10-24  2:27 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-10-24  2:27 UTC (permalink / raw
  To: gentoo-commits

commit:     862e48d61ca8853db789c3e4d05820e76d57873a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 24 02:27:20 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 02:27:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862e48d6

net-ftp/proftpd: Stabilize 1.3.7c amd64, #819894

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7c.ebuild b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
index f6554c2a6cd..c4eb028f613 100644
--- a/net-ftp/proftpd/proftpd-1.3.7c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-10-24  0:19 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-10-24  0:19 UTC (permalink / raw
  To: gentoo-commits

commit:     b9480e19f0860033491648dff438a69e88cc0376
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 24 00:18:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 24 00:18:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9480e19

net-ftp/proftpd: Stabilize 1.3.7c sparc, #819894

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7c.ebuild b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
index 3bb9b6ecaea..f6554c2a6cd 100644
--- a/net-ftp/proftpd/proftpd-1.3.7c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-10-18 17:51 Piotr Karbowski
  0 siblings, 0 replies; 168+ messages in thread
From: Piotr Karbowski @ 2021-10-18 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     d5ec9fab9f4157eb6d70de7ee004c67c8452a529
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 18 17:48:05 2021 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Mon Oct 18 17:48:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ec9fab

net-ftp/proftpd: 1.3.8 rc2 version bump.

Bug: https://bugs.gentoo.org/811495
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 net-ftp/proftpd/Manifest                 |   1 +
 net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild | 274 +++++++++++++++++++++++++++++++
 2 files changed, 275 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 93ac10cea27..d4501e1bd7a 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -3,6 +3,7 @@ DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea3
 DIST proftpd-1.3.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
 DIST proftpd-1.3.7b.tar.gz 20422741 BLAKE2B 9234d395348778c208307928ae7d673078edf01d9d4e46501b2f46dc051bb0debb1cae0d81ac1564b4e6828a07dae6bdd1b5e708449bb2e21acf6ee1aedfb1f2 SHA512 c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d7368911114b135a43c8b0ad4170c9215a87e93e56108de889a
 DIST proftpd-1.3.8rc1.tar.gz 20469318 BLAKE2B 5385c013ecc123802163cd632eb1c87b0feb9bfac278f9d419ff4fc76380f415bee1726e6ac37929aff804bf4bdf0f9b525a250b9ac8e8679f772672c78a639a SHA512 9c0fda5c870a7e84227d5ee6e1b331e0150c4cad297d6bd640e9ccfa838bd98e8620e542c40fc80d0f1c5f82ed3e2e2b5af7d3a7c371d96fb4e37d5472e24032
+DIST proftpd-1.3.8rc2.tar.gz 20485204 BLAKE2B fc79d56dfe61e2b7b0b2a8da52237f402212389b424c92142e24d4caa8688598ca26d2e2956e1ce5fa9c5ac7467aa7f61ebecc6e4ffe73a74118ab242049b68f SHA512 0d98fb2a3044c4426aaf47f483e7af09c736d641ab7334e5f0f32088be1c904bc9ca00aae8977e496c951c63071deb20c282f53f43c1664bc4978a66215a774a
 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.8_rc2.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
new file mode 100644
index 00000000000..f44c0ca053c
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc2.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+CDEPEND="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="${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
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+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 \
+		$(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}"/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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-10-18 17:51 Piotr Karbowski
  0 siblings, 0 replies; 168+ messages in thread
From: Piotr Karbowski @ 2021-10-18 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     0431fec0fb98015025f8d95f21fdc8a28d100922
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 18 17:49:22 2021 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Mon Oct 18 17:49:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0431fec0

net-ftp/proftpd: 1.3.7c version bump

Bug: https://bugs.gentoo.org/811495
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 net-ftp/proftpd/Manifest              |   1 +
 net-ftp/proftpd/proftpd-1.3.7c.ebuild | 275 ++++++++++++++++++++++++++++++++++
 2 files changed, 276 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index d4501e1bd7a..5a406ad7909 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -2,6 +2,7 @@ DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
 DIST proftpd-1.3.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
 DIST proftpd-1.3.7b.tar.gz 20422741 BLAKE2B 9234d395348778c208307928ae7d673078edf01d9d4e46501b2f46dc051bb0debb1cae0d81ac1564b4e6828a07dae6bdd1b5e708449bb2e21acf6ee1aedfb1f2 SHA512 c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d7368911114b135a43c8b0ad4170c9215a87e93e56108de889a
+DIST proftpd-1.3.7c.tar.gz 20428648 BLAKE2B c8c02774be97e05ed6952c6765d908dd27e64891e709ccb5c737501da3d4857dc151c19a9b428b490b7963f3c3ad5d206a6e5ac6408bfafd333a373ec54fcef2 SHA512 f9268e521e68cebaf1947cbfe1cc57f282ea09d59410c1722cd9a68c99d643b90b837c1fa840fdb894597c7429b0eb62bc4ac324915ffac04366daa2f104e88d
 DIST proftpd-1.3.8rc1.tar.gz 20469318 BLAKE2B 5385c013ecc123802163cd632eb1c87b0feb9bfac278f9d419ff4fc76380f415bee1726e6ac37929aff804bf4bdf0f9b525a250b9ac8e8679f772672c78a639a SHA512 9c0fda5c870a7e84227d5ee6e1b331e0150c4cad297d6bd640e9ccfa838bd98e8620e542c40fc80d0f1c5f82ed3e2e2b5af7d3a7c371d96fb4e37d5472e24032
 DIST proftpd-1.3.8rc2.tar.gz 20485204 BLAKE2B fc79d56dfe61e2b7b0b2a8da52237f402212389b424c92142e24d4caa8688598ca26d2e2956e1ce5fa9c5ac7467aa7f61ebecc6e4ffe73a74118ab242049b68f SHA512 0d98fb2a3044c4426aaf47f483e7af09c736d641ab7334e5f0f32088be1c904bc9ca00aae8977e496c951c63071deb20c282f53f43c1664bc4978a66215a774a
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc

diff --git a/net-ftp/proftpd/proftpd-1.3.7c.ebuild b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
new file mode 100644
index 00000000000..3bb9b6ecaea
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7c.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+CDEPEND="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="${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.7a-slibtool.patch
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+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 \
+		$(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}"/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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-07-04 15:24 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2021-07-04 15:24 UTC (permalink / raw
  To: gentoo-commits

commit:     809dd0751a9a47198bca89f53e383a67835112fe
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  4 15:22:28 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul  4 15:24:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=809dd075

net-ftp/proftpd: drop myself from maintainers

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/metadata.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 66897bdb64f..594db71a3ac 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-		<description>Mostly user.</description>
-	</maintainer>
 	<maintainer type="person">
 		<email>slashbeast@gentoo.org</email>
 		<name>Piotr Karbowski</name>


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-07-03 20:12 Piotr Karbowski
  0 siblings, 0 replies; 168+ messages in thread
From: Piotr Karbowski @ 2021-07-03 20:12 UTC (permalink / raw
  To: gentoo-commits

commit:     5541ecd7182341d51dfe7bf131c38021e071e4a8
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  3 20:10:20 2021 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sat Jul  3 20:10:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5541ecd7

net-ftp/proftpd: co-maintain

Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 net-ftp/proftpd/metadata.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 572ef17d299..66897bdb64f 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -6,6 +6,10 @@
 		<name>Sergei Trofimovich</name>
 		<description>Mostly user.</description>
 	</maintainer>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
 	<longdescription>ProFTPD grew out of the desire to have a secure and 
 configurable FTP server, and out of a significant admiration of the Apache web 
 server.</longdescription>


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-06-30 18:40 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-06-30 18:40 UTC (permalink / raw
  To: gentoo-commits

commit:     f855feca8a2e94bc96c14291e171363c9f682593
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 30 18:39:45 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 30 18:39:45 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f855feca

net-ftp/proftpd: add missing libcrypt dependency

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../proftpd/{proftpd-1.3.7a-r1.ebuild => proftpd-1.3.7a-r2.ebuild}  | 6 ++++--
 net-ftp/proftpd/{proftpd-1.3.7b.ebuild => proftpd-1.3.7b-r1.ebuild} | 6 ++++--
 .../{proftpd-1.3.8_rc1.ebuild => proftpd-1.3.8_rc1-r1.ebuild}       | 6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r2.ebuild
similarity index 99%
rename from net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
rename to net-ftp/proftpd/proftpd-1.3.7a-r2.ebuild
index 6af77bfacde..ab94f1827e3 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit multilib systemd tmpfiles toolchain-funcs
 
 MOD_CASE="0.7"
@@ -23,8 +24,8 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.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"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
@@ -41,7 +42,8 @@ REQUIRED_USE="ban? ( ctrls )
 	sqlite? ( ssl )
 "
 
-CDEPEND="acl? ( virtual/acl )
+CDEPEND="virtual/libcrypt:=
+	acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
 	kerberos? ( virtual/krb5 )

diff --git a/net-ftp/proftpd/proftpd-1.3.7b.ebuild b/net-ftp/proftpd/proftpd-1.3.7b-r1.ebuild
similarity index 99%
rename from net-ftp/proftpd/proftpd-1.3.7b.ebuild
rename to net-ftp/proftpd/proftpd-1.3.7b-r1.ebuild
index 14f41fdcfdd..3bb9b6ecaea 100644
--- a/net-ftp/proftpd/proftpd-1.3.7b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7b-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit multilib systemd tmpfiles toolchain-funcs
 
 MOD_CASE="0.7"
@@ -23,8 +24,8 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.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"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
@@ -41,7 +42,8 @@ REQUIRED_USE="ban? ( ctrls )
 	sqlite? ( ssl )
 "
 
-CDEPEND="acl? ( virtual/acl )
+CDEPEND="virtual/libcrypt:=
+	acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
 	kerberos? ( virtual/krb5 )

diff --git a/net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc1-r1.ebuild
similarity index 99%
rename from net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild
rename to net-ftp/proftpd/proftpd-1.3.8_rc1-r1.ebuild
index 51a27cb1b32..f44c0ca053c 100644
--- a/net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc1-r1.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit multilib systemd tmpfiles toolchain-funcs
 
 MOD_CASE="0.7"
@@ -23,8 +24,8 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.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"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
@@ -41,7 +42,8 @@ REQUIRED_USE="ban? ( ctrls )
 	sqlite? ( ssl )
 "
 
-CDEPEND="acl? ( virtual/acl )
+CDEPEND="virtual/libcrypt:=
+	acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
 	clamav? ( app-antivirus/clamav )
 	kerberos? ( virtual/krb5 )


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-06-15  8:32 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2021-06-15  8:32 UTC (permalink / raw
  To: gentoo-commits

commit:     6576e1bd005a37d682b306d16bb4b91c9728ac7e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 08:31:50 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 08:32:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6576e1bd

net-ftp/proftpd: bump up to 1.3.8_rc1

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest                 |   1 +
 net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild | 272 +++++++++++++++++++++++++++++++
 2 files changed, 273 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 179fffe5777..93ac10cea27 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -2,6 +2,7 @@ DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
 DIST proftpd-1.3.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
 DIST proftpd-1.3.7b.tar.gz 20422741 BLAKE2B 9234d395348778c208307928ae7d673078edf01d9d4e46501b2f46dc051bb0debb1cae0d81ac1564b4e6828a07dae6bdd1b5e708449bb2e21acf6ee1aedfb1f2 SHA512 c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d7368911114b135a43c8b0ad4170c9215a87e93e56108de889a
+DIST proftpd-1.3.8rc1.tar.gz 20469318 BLAKE2B 5385c013ecc123802163cd632eb1c87b0feb9bfac278f9d419ff4fc76380f415bee1726e6ac37929aff804bf4bdf0f9b525a250b9ac8e8679f772672c78a639a SHA512 9c0fda5c870a7e84227d5ee6e1b331e0150c4cad297d6bd640e9ccfa838bd98e8620e542c40fc80d0f1c5f82ed3e2e2b5af7d3a7c371d96fb4e37d5472e24032
 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.8_rc1.ebuild b/net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild
new file mode 100644
index 00000000000..51a27cb1b32
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.8_rc1.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+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? ( 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="${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
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+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 \
+		$(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}"/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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-06-15  7:15 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2021-06-15  7:15 UTC (permalink / raw
  To: gentoo-commits

commit:     a1ab8db85a0e1db820764d0517b71008cd35919f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 07:15:49 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 07:15:55 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ab8db8

net-ftp/proftpd: bump up to 1.3.7b

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest              |   1 +
 net-ftp/proftpd/proftpd-1.3.7b.ebuild | 273 ++++++++++++++++++++++++++++++++++
 2 files changed, 274 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 9c964150214..179fffe5777 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.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
+DIST proftpd-1.3.7b.tar.gz 20422741 BLAKE2B 9234d395348778c208307928ae7d673078edf01d9d4e46501b2f46dc051bb0debb1cae0d81ac1564b4e6828a07dae6bdd1b5e708449bb2e21acf6ee1aedfb1f2 SHA512 c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d7368911114b135a43c8b0ad4170c9215a87e93e56108de889a
 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.7b.ebuild b/net-ftp/proftpd/proftpd-1.3.7b.ebuild
new file mode 100644
index 00000000000..14f41fdcfdd
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7b.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+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? ( 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="${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.7a-slibtool.patch
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+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 \
+		$(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}"/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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-05-09 11:53 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2021-05-09 11:53 UTC (permalink / raw
  To: gentoo-commits

commit:     9968a490fd955032eb3d01617bfa2a224769cd17
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May  9 11:48:41 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May  9 11:53:19 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9968a490

net-ftp/proftpd: drop old

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a.ebuild | 272 ----------------------------------
 1 file changed, 272 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
deleted file mode 100644
index c9477255fb6..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( 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="${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
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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 \
-		$(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}"/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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-05-01 20:44 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2021-05-01 20:44 UTC (permalink / raw
  To: gentoo-commits

commit:     de39265e2a626114ffd9afeade22fc42bd2718f7
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat May  1 20:22:49 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat May  1 20:44:23 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de39265e

net-ftp/proftpd: drop deleted dev-libs/libressl

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild | 7 ++-----
 net-ftp/proftpd/proftpd-1.3.7a.ebuild    | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index 7bef13f65e4..6af77bfacde 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	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"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
@@ -50,10 +50,7 @@ CDEPEND="acl? ( virtual/acl )
 	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:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	pam? ( sys-libs/pam )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:= )

diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
index d7a64183012..c9477255fb6 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -28,7 +28,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
-	kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
+	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"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
@@ -50,10 +50,7 @@ CDEPEND="acl? ( virtual/acl )
 	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:= )
-	)
+	ssl? ( dev-libs/openssl:0= )
 	pam? ( sys-libs/pam )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:= )


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-04-25  5:16 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-04-25  5:16 UTC (permalink / raw
  To: gentoo-commits

commit:     382be4d5c129805bfc4bb04862031a2c56644071
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 05:15:50 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 05:15:50 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382be4d5

net-ftp/proftpd: Stabilize 1.3.7a-r1 sparc, #785385

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index 30d396593cd..249498784d2 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-04-25  5:14 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-04-25  5:14 UTC (permalink / raw
  To: gentoo-commits

commit:     a31457f285d82aa633d2804cddd41fffa99afa8b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 05:14:21 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 05:14:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a31457f2

net-ftp/proftpd: Stabilize 1.3.7a-r1 arm, #785385

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index a8f861439ad..30d396593cd 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-04-25  5:14 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-04-25  5:14 UTC (permalink / raw
  To: gentoo-commits

commit:     9cf45371cf926f0ecc408a74254afd800bc7c35e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 05:12:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 05:12:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cf45371

net-ftp/proftpd: Stabilize 1.3.7a-r1 ppc64, #785385

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index b3f09d86674..a8f861439ad 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-04-25  5:11 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-04-25  5:11 UTC (permalink / raw
  To: gentoo-commits

commit:     f26aaa395ac5f82e55f4489dc7abfe3a95eec1b2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 05:10:48 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 05:10:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f26aaa39

net-ftp/proftpd: Stabilize 1.3.7a-r1 x86, #785385

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index d7c2982eb01..34f1bb019c3 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-04-25  5:09 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2021-04-25  5:09 UTC (permalink / raw
  To: gentoo-commits

commit:     61b7858c76cfbcd7008170738822d6e57c1c47f5
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 25 05:09:35 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Apr 25 05:09:35 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61b7858c

net-ftp/proftpd: Stabilize 1.3.7a-r1 amd64, #785385

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index 7ee4c7d7326..d7c2982eb01 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2021-03-07 11:58 David Seifert
  0 siblings, 0 replies; 168+ messages in thread
From: David Seifert @ 2021-03-07 11:58 UTC (permalink / raw
  To: gentoo-commits

commit:     c4fb816eb24c8ede92902cdee0d7e20bc246d847
Author:     Theo Anderson <telans <AT> posteo <DOT> de>
AuthorDate: Sun Mar  7 11:57:08 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Mar  7 11:57:08 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4fb816e

net-ftp/proftpd: migrate to tmpfiles.eclass

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans <AT> posteo.de>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
index 926aa7970ca..d7a64183012 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -266,7 +266,7 @@ src_install() {
 	dodoc doc/rfc/*.txt
 
 	systemd_dounit       "${FILESDIR}"/${PN}.service
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
+	newtmpfiles "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
 }
 
 pkg_postinst() {


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-09-07 20:46 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-09-07 20:46 UTC (permalink / raw
  To: gentoo-commits

commit:     6e34b2123f7d2fa2d3c09c422e0ccae037b58353
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Sep  7 20:45:21 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Sep  7 20:46:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e34b212

net-ftp/proftpd: drop old

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest                    |   1 -
 net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild | 277 ----------------------------
 2 files changed, 278 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index c5e3f3f4303..9c964150214 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,7 +1,6 @@
 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.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
-DIST proftpd-1.3.7rc4.tar.gz 20407496 BLAKE2B fd98b2ca3f4b6448b8739ff39db72d06f508e2507c156043a022ef5275d21775bdecc50c4434173f40fe1e40f439aebc58c9efaa6a5e6946dd15d5b52a36bda0 SHA512 8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b
 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.7_rc4-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
deleted file mode 100644
index 805cd6c69ab..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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.7_rc4-ldap_mod-SEGV.patch
-	"${FILESDIR}"/${PN}-1.3.7_rc4-str-sentinel.patch
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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 \
-		$(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}"/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
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
-}
-
-pkg_postinst() {
-	# Create /var/run files at package merge time: bug #650000
-	tmpfiles_process ${PN}.conf
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-09-01 20:13 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2020-09-01 20:13 UTC (permalink / raw
  To: gentoo-commits

commit:     3ba4406de690fee52d68b828dd8900034cfee21d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep  1 20:13:26 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep  1 20:13:26 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba4406d

net-ftp/proftpd: Stabilize 1.3.7a amd64, #738674

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
index 83b34afc302..ec1525dece5 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-08-31  1:22 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2020-08-31  1:22 UTC (permalink / raw
  To: gentoo-commits

commit:     a5b23055b3691fe54add0016229e97823f7aa827
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 31 01:22:09 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug 31 01:22:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5b23055

net-ftp/proftpd: Stabilize 1.3.7a arm, #738674

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
index 0c385c2727e..83b34afc302 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-08-29 17:57 Thomas Deutschmann
  0 siblings, 0 replies; 168+ messages in thread
From: Thomas Deutschmann @ 2020-08-29 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     3a7a0aaa922e8157b0e34b6ef58ef2e6cf717107
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 17:50:34 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 17:56:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7a0aaa

net-ftp/proftpd: x86 stable (bug #738674)

Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
index e2817799bf9..0c385c2727e 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-08-24 17:33 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-08-24 17:33 UTC (permalink / raw
  To: gentoo-commits

commit:     89f008cf3709af2ce6ecbea7c53ef041285b164c
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon Aug 24 15:32:56 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Aug 24 17:33:00 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f008cf

net-ftp/proftpd: stable 1.3.7a for sparc, bug #738674

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7a.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
index d5a2fd81ae5..e2817799bf9 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-07-25  9:18 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-07-25  9:18 UTC (permalink / raw
  To: gentoo-commits

commit:     c1d503aae98aec52229ef9356a8d9c9cd596c7d0
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 09:16:21 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 09:18:15 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d503aa

net-ftp/proftpd: drop old

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest                 |   1 -
 net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild | 274 -------------------------------
 2 files changed, 275 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 416d491d59a..c5e3f3f4303 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,7 +1,6 @@
 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.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
-DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
 DIST proftpd-1.3.7rc4.tar.gz 20407496 BLAKE2B fd98b2ca3f4b6448b8739ff39db72d06f508e2507c156043a022ef5275d21775bdecc50c4434173f40fe1e40f439aebc58c9efaa6a5e6946dd15d5b52a36bda0 SHA512 8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b
 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

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
deleted file mode 100644
index 2bbf557ee9b..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib systemd tmpfiles
-
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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.6c-gcc-10.patch
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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
-}
-
-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
-
-	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
-	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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-07-21 18:17 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-07-21 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     931ba0027e9147bb1c40346d49718518195a105b
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 18:15:05 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 18:17:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=931ba002

net-ftp/proftpd: bump up to 1.3.7a

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest              |   1 +
 net-ftp/proftpd/proftpd-1.3.7a.ebuild | 275 ++++++++++++++++++++++++++++++++++
 2 files changed, 276 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 18227fcf06f..cba1df95a08 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.7.tar.gz 20414318 BLAKE2B ec9f01887db141ca0112eea3cc4bc809f81d74783962bab0c850a213ce5cc93816aa8e0999fcc4c0a2cdbb5c00d4754a1e7be61ee3dbbcf16be77c7e024692ad SHA512 db17d0f03d22de5379109a25d2ca5d35ec2129c70f8352cef698a65c3ad9e9fde1600821162e94fc07c7b70bc21803d3ed2f86e33c15c795d7e3084d71c56498
+DIST proftpd-1.3.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
 DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
 DIST proftpd-1.3.7rc4.tar.gz 20407496 BLAKE2B fd98b2ca3f4b6448b8739ff39db72d06f508e2507c156043a022ef5275d21775bdecc50c4434173f40fe1e40f439aebc58c9efaa6a5e6946dd15d5b52a36bda0 SHA512 8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc

diff --git a/net-ftp/proftpd/proftpd-1.3.7a.ebuild b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
new file mode 100644
index 00000000000..d5a2fd81ae5
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7a.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+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? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+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
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+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 \
+		$(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}"/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
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
+}
+
+pkg_postinst() {
+	# Create /var/run files at package merge time: bug #650000
+	tmpfiles_process ${PN}.conf
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-07-21 18:17 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-07-21 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     45ede61f0633d467b0db2af5b224a52f8320cdcb
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 18:15:37 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 18:17:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45ede61f

net-ftp/proftpd: drop old

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest             |   1 -
 net-ftp/proftpd/proftpd-1.3.7.ebuild | 275 -----------------------------------
 2 files changed, 276 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index cba1df95a08..416d491d59a 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,5 @@
 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.7.tar.gz 20414318 BLAKE2B ec9f01887db141ca0112eea3cc4bc809f81d74783962bab0c850a213ce5cc93816aa8e0999fcc4c0a2cdbb5c00d4754a1e7be61ee3dbbcf16be77c7e024692ad SHA512 db17d0f03d22de5379109a25d2ca5d35ec2129c70f8352cef698a65c3ad9e9fde1600821162e94fc07c7b70bc21803d3ed2f86e33c15c795d7e3084d71c56498
 DIST proftpd-1.3.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
 DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
 DIST proftpd-1.3.7rc4.tar.gz 20407496 BLAKE2B fd98b2ca3f4b6448b8739ff39db72d06f508e2507c156043a022ef5275d21775bdecc50c4434173f40fe1e40f439aebc58c9efaa6a5e6946dd15d5b52a36bda0 SHA512 8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b

diff --git a/net-ftp/proftpd/proftpd-1.3.7.ebuild b/net-ftp/proftpd/proftpd-1.3.7.ebuild
deleted file mode 100644
index d5a2fd81ae5..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.7.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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 \
-		$(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}"/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
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
-}
-
-pkg_postinst() {
-	# Create /var/run files at package merge time: bug #650000
-	tmpfiles_process ${PN}.conf
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-07-21  7:16 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-07-21  7:16 UTC (permalink / raw
  To: gentoo-commits

commit:     f696442ef121d976168fed565b7e76cb4c6ab5a6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 21 07:16:01 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul 21 07:16:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f696442e

net-ftp/proftpd: bump up to 1.3.7

Bug: https://bugs.gentoo.org/733376
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest             |   1 +
 net-ftp/proftpd/proftpd-1.3.7.ebuild | 275 +++++++++++++++++++++++++++++++++++
 2 files changed, 276 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 8dd5a535369..18227fcf06f 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,5 +1,6 @@
 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.7.tar.gz 20414318 BLAKE2B ec9f01887db141ca0112eea3cc4bc809f81d74783962bab0c850a213ce5cc93816aa8e0999fcc4c0a2cdbb5c00d4754a1e7be61ee3dbbcf16be77c7e024692ad SHA512 db17d0f03d22de5379109a25d2ca5d35ec2129c70f8352cef698a65c3ad9e9fde1600821162e94fc07c7b70bc21803d3ed2f86e33c15c795d7e3084d71c56498
 DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
 DIST proftpd-1.3.7rc4.tar.gz 20407496 BLAKE2B fd98b2ca3f4b6448b8739ff39db72d06f508e2507c156043a022ef5275d21775bdecc50c4434173f40fe1e40f439aebc58c9efaa6a5e6946dd15d5b52a36bda0 SHA512 8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc

diff --git a/net-ftp/proftpd/proftpd-1.3.7.ebuild b/net-ftp/proftpd/proftpd-1.3.7.ebuild
new file mode 100644
index 00000000000..d5a2fd81ae5
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+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? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+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
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+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 \
+		$(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}"/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
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
+}
+
+pkg_postinst() {
+	# Create /var/run files at package merge time: bug #650000
+	tmpfiles_process ${PN}.conf
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-07-08 19:46 Sam James
  0 siblings, 0 replies; 168+ messages in thread
From: Sam James @ 2020-07-08 19:46 UTC (permalink / raw
  To: gentoo-commits

commit:     6c40023fa8ab67c4e8dbf977f52c9de33fb726f2
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  8 19:46:18 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul  8 19:46:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c40023f

net-ftp/proftpd: arm stable (bug #730898)

Package-Manager: Portage-2.3.103, Repoman-2.3.22
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
index a10e5b78210..9ba7f45fe51 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-07-07  6:58 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-07-07  6:58 UTC (permalink / raw
  To: gentoo-commits

commit:     1270cab8b4925e3e2450ddabc11c0bf3745c3be6
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Jul  7 05:21:36 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Jul  7 06:57:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1270cab8

net-ftp/proftpd: stable 1.3.7_rc4-r1 for sparc, bug #730898

Package-Manager: Portage-2.3.99, Repoman-2.3.23
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
index 957e5ff810e..a10e5b78210 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-07-06  7:22 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-07-06  7:22 UTC (permalink / raw
  To: gentoo-commits

commit:     79a24702a9b7b8bb7064e0ffea5ded0c0899834d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  6 07:16:19 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul  6 07:16:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79a24702

net-ftp/proftpd: stable 1.3.7_rc4-r1 for ppc64

stable wrt bug #730898

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
index ef5124b5f00..957e5ff810e 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-07-06  7:02 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-07-06  7:02 UTC (permalink / raw
  To: gentoo-commits

commit:     88c0f40485cacc357530217cdf58fb9457d1fdad
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  6 06:58:28 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul  6 07:02:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88c0f404

net-ftp/proftpd: stable 1.3.7_rc4-r1 for ppc

stable wrt bug #730898

Package-Manager: Portage-2.3.103, Repoman-2.3.23
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
index 9f1b1ca53ed..ef5124b5f00 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-06-20 19:49 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-06-20 19:49 UTC (permalink / raw
  To: gentoo-commits

commit:     e257b4fa876f22572f7078f9b2d413fb95844f36
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 20 19:40:25 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 20 19:49:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e257b4fa

net-ftp/proftpd: drop old

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild | 276 ----------------------------
 1 file changed, 276 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild
deleted file mode 100644
index af107f0bd6e..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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.6c-gcc-10.patch
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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 \
-		$(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}"/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
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
-}
-
-pkg_postinst() {
-	# Create /var/run files at package merge time: bug #650000
-	tmpfiles_process ${PN}.conf
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-05-31 17:18 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-05-31 17:18 UTC (permalink / raw
  To: gentoo-commits

commit:     59a0aa9bb1a306346250c4b30fbe937f197218bc
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 17:16:18 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 31 17:17:40 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59a0aa9b

net-ftp/proftpd: drop old

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild | 275 -------------------------------
 1 file changed, 275 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild
deleted file mode 100644
index d5a2fd81ae5..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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
-)
-
-RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
-
-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 \
-		$(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}"/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
-	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
-}
-
-pkg_postinst() {
-	# Create /var/run files at package merge time: bug #650000
-	tmpfiles_process ${PN}.conf
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-05-31 11:36 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-05-31 11:36 UTC (permalink / raw
  To: gentoo-commits

commit:     b849e9cfe9ff234a0dc8d161620be7a1b0704953
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 11:36:20 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 31 11:36:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b849e9cf

net-ftp/proftpd: bump up to 1.3.7_rc4

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest                 |   1 +
 net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild | 275 +++++++++++++++++++++++++++++++
 2 files changed, 276 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 65fc2ef0b60..8dd5a535369 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.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
+DIST proftpd-1.3.7rc4.tar.gz 20407496 BLAKE2B fd98b2ca3f4b6448b8739ff39db72d06f508e2507c156043a022ef5275d21775bdecc50c4434173f40fe1e40f439aebc58c9efaa6a5e6946dd15d5b52a36bda0 SHA512 8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b
 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.7_rc4.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild
new file mode 100644
index 00000000000..d5a2fd81ae5
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc4.ebuild
@@ -0,0 +1,275 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+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? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+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
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+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 \
+		$(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}"/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
+	systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
+}
+
+pkg_postinst() {
+	# Create /var/run files at package merge time: bug #650000
+	tmpfiles_process ${PN}.conf
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-05-02 17:51 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-05-02 17:51 UTC (permalink / raw
  To: gentoo-commits

commit:     b4f3dedaefc532b12e9cf81f43a54ef3cc4b3c71
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat May  2 17:38:29 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat May  2 17:51:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4f3deda

net-ftp/proftpd: drop old

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest              |   1 -
 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 275 ----------------------------------
 2 files changed, 276 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 8a2422689b9..65fc2ef0b60 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,5 @@
 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.6c.tar.gz 20271908 BLAKE2B 64f0aa70df844a376d333804100e18a28af6ab2b17a3d6f250817141db3952835740c15dcd68f71498b076238a668bdaf9672b4fd7d6fe61f8632d813e221573 SHA512 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15
 DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
 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

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
deleted file mode 100644
index c89615285d0..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib systemd tmpfiles
-
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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.6a-fix-libcheck.patch
-	"${FILESDIR}"/${PN}-1.3.6c-gcc-10.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 -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
-}
-
-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
-
-	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
-	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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-04-13 14:53 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-04-13 14:53 UTC (permalink / raw
  To: gentoo-commits

commit:     c5ec17f53a62dd28aff24f66eeb95e3d67a5a0df
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 14:53:09 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 14:53:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5ec17f5

net-ftp/proftpd: x86 stable wrt bug #717240

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
index e818f82c5c1..2bbf557ee9b 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-04-13 10:19 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-04-13 10:19 UTC (permalink / raw
  To: gentoo-commits

commit:     97661710d0bff13843107bebfe0ca6c2d55a97b0
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 10:18:59 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 10:18:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97661710

net-ftp/proftpd: ppc64 stable wrt bug #717240

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
index bf33ff34bf5..e818f82c5c1 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-04-13 10:17 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-04-13 10:17 UTC (permalink / raw
  To: gentoo-commits

commit:     9d1a63c3f5d626853913557f27afdd7e7d8e22bf
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 10:17:36 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 10:17:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d1a63c3

net-ftp/proftpd: ppc stable wrt bug #717240

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
index 50be278bb00..bf33ff34bf5 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-04-13 10:16 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-04-13 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     de4694847762ed055a973d7f835049eefd066ea5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 10:16:18 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 10:16:18 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de469484

net-ftp/proftpd: arm stable wrt bug #717240

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
index 5cc5ed6b16e..50be278bb00 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-04-13 10:14 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-04-13 10:14 UTC (permalink / raw
  To: gentoo-commits

commit:     7be4dbc4e74ce2b6683630ce0eb3d4b6b7e10a68
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 10:14:34 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 10:14:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be4dbc4

net-ftp/proftpd: amd64 stable wrt bug #717240

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
index 358dca89489..5cc5ed6b16e 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-04-13  9:57 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-04-13  9:57 UTC (permalink / raw
  To: gentoo-commits

commit:     a553687531b852d314d8ef76a7d9b90344d86dad
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 13 09:56:58 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 13 09:56:58 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5536875

net-ftp/proftpd: sparc stable wrt bug #717240

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
index 40523c9d693..358dca89489 100644
--- a/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-31 18:02 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-03-31 18:02 UTC (permalink / raw
  To: gentoo-commits

commit:     89d50aff244ae40d8ff5ecef9ebb8988af3c68c4
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Mar 31 16:48:36 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Mar 31 18:01:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89d50aff

net-ftp/proftpd: drop to ~hppa

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index ee796087785..4da29f36911 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-18 21:31 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-03-18 21:31 UTC (permalink / raw
  To: gentoo-commits

commit:     195ad646be2d92d29e5dbd218a7918d633b12b29
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 21:30:45 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 21:30:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=195ad646

net-ftp/proftpd: drop <net-ftp/proftpd-1.3.6c, bug #710730

Bug: https://bugs.gentoo.org/710730
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest                 |   1 -
 net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild | 275 -------------------------------
 2 files changed, 276 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 9b4db517227..8a2422689b9 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,6 +1,5 @@
 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.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671
 DIST proftpd-1.3.6c.tar.gz 20271908 BLAKE2B 64f0aa70df844a376d333804100e18a28af6ab2b17a3d6f250817141db3952835740c15dcd68f71498b076238a668bdaf9672b4fd7d6fe61f8632d813e221573 SHA512 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15
 DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc

diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
deleted file mode 100644
index 154eef3fbc4..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib systemd tmpfiles
-
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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.6a-fix-libcheck.patch
-	"${FILESDIR}"/${PN}-1.3.6b-tls-crl-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 -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
-}
-
-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
-
-	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
-	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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-18 17:58 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-03-18 17:58 UTC (permalink / raw
  To: gentoo-commits

commit:     aa92ebd5dc499492d95f343a7f1a49526898ed9f
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Mar 18 16:58:20 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 17:58:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa92ebd5

net-ftp/proftpd: stable 1.3.6c for hppa, bug #710730

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index 4da29f36911..ee796087785 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-18 15:22 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-03-18 15:22 UTC (permalink / raw
  To: gentoo-commits

commit:     95b8db9a12ef56c76312ead8cebac2e4612a782c
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 15:22:04 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 15:22:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b8db9a

net-ftp/proftpd: x86 stable wrt bug #710730

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index 98295082378..4da29f36911 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-18 11:13 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-03-18 11:13 UTC (permalink / raw
  To: gentoo-commits

commit:     5345d0f6e1d3b3ad15884a66c175ac0497837919
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 11:13:24 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 11:13:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5345d0f6

net-ftp/proftpd: ppc64 stable wrt bug #710730

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index 1854012be05..98295082378 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-18 11:11 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-03-18 11:11 UTC (permalink / raw
  To: gentoo-commits

commit:     bc6c6bbb5d86e95584f7751c55a79022c89fdd1f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 11:10:57 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 11:10:57 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6c6bbb

net-ftp/proftpd: ppc stable wrt bug #710730

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index ddf54f386b9..1854012be05 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-18  9:56 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-03-18  9:56 UTC (permalink / raw
  To: gentoo-commits

commit:     8c2f45001b198e91a9515eb77f999f6e167eaebe
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 09:55:38 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 09:55:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c2f4500

net-ftp/proftpd: ia64 stable wrt bug #710730

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index 33522d79cf8..ddf54f386b9 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-18  9:46 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-03-18  9:46 UTC (permalink / raw
  To: gentoo-commits

commit:     d0c89975e7e7199d58abe4a954bb35be1a0d6eef
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 18 09:45:36 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Mar 18 09:45:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0c89975

net-ftp/proftpd: arm stable wrt bug #710730

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index 565991108c7..33522d79cf8 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-17 18:44 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-03-17 18:44 UTC (permalink / raw
  To: gentoo-commits

commit:     c9ed9538fd67ac9681d81f823e7d9811dbf458a7
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 18:43:58 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 18:44:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9ed9538

net-ftp/proftpd: amd64 stable wrt bug #710730

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index be7285db3fd..565991108c7 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-16 18:25 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-03-16 18:25 UTC (permalink / raw
  To: gentoo-commits

commit:     50fa9b20c56aa59ef36601f7daa696a341c1f347
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon Mar 16 17:05:40 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar 16 18:25:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50fa9b20

net-ftp/proftpd: stable 1.3.6c for sparc, bug #710730

Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index d2441f41e29..be7285db3fd 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-03-05 23:56 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-03-05 23:56 UTC (permalink / raw
  To: gentoo-commits

commit:     47f2f61b980efab9ea9412db2aa484e51f0c5b2e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Mar  5 23:39:19 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Mar  5 23:39:19 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f2f61b

net-ftp/proftpd: bump up to proftpd-1.3.7rc3

Pull in release candidate to better handle tlc-1.3.

Closes: https://bugs.gentoo.org/690526
Package-Manager: Portage-2.3.92, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest                 |   1 +
 net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild | 274 +++++++++++++++++++++++++++++++
 2 files changed, 275 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 1099fc7d2e3..9b4db517227 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -2,6 +2,7 @@ DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
 DIST proftpd-1.3.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671
 DIST proftpd-1.3.6c.tar.gz 20271908 BLAKE2B 64f0aa70df844a376d333804100e18a28af6ab2b17a3d6f250817141db3952835740c15dcd68f71498b076238a668bdaf9672b4fd7d6fe61f8632d813e221573 SHA512 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15
+DIST proftpd-1.3.7rc3.tar.gz 20359920 BLAKE2B 96d2e26c815cd2c461580a2af642ac332bd848418d3d829f2795c610eead00a290a9633088809a5cd56899e3510dc3e608f1688052e1ca5121c78fcc80017523 SHA512 cab3ffee0ce6b921596cafc5fd2e0059c59a03f790791973b502e6384d45f0880b94e0d0961c3b230541a1785e9b0afa3d80276c82f4720696a46ea6594d744f
 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.7_rc3.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
new file mode 100644
index 00000000000..40523c9d693
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd tmpfiles
+
+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 )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+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? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+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.6c-gcc-10.patch
+)
+
+RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
+
+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
+}
+
+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
+
+	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
+	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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-25  8:40 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-02-25  8:40 UTC (permalink / raw
  To: gentoo-commits

commit:     bfa4622ef7d68e3fb14fc62e84d9ad549338373d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 25 08:39:33 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 08:39:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfa4622e

net-ftp/proftpd: bump up to 1.3.6c, bug #710730

Bug: https://bugs.gentoo.org/710730
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest              |   1 +
 net-ftp/proftpd/proftpd-1.3.6c.ebuild | 274 ++++++++++++++++++++++++++++++++++
 2 files changed, 275 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 45bd57bbebd..1099fc7d2e3 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.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671
+DIST proftpd-1.3.6c.tar.gz 20271908 BLAKE2B 64f0aa70df844a376d333804100e18a28af6ab2b17a3d6f250817141db3952835740c15dcd68f71498b076238a668bdaf9672b4fd7d6fe61f8632d813e221573 SHA512 9b10e603b26d527b594682a4905e70dc0a8361372ed80a8e2617167305047bf94ea16b441f9d5782ae04dd50768d32e12f9cb68708c1f80dcd219b09e0d4fd15
 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.6c.ebuild b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
new file mode 100644
index 00000000000..5c8f9eb610d
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd tmpfiles
+
+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 )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+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? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+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.6a-fix-libcheck.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 -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
+}
+
+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
+
+	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
+	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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-12 20:32 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-02-12 20:32 UTC (permalink / raw
  To: gentoo-commits

commit:     6d2c4b042dcad5191ae02f4e178702be41f8c420
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 20:31:44 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 20:32:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d2c4b04

net-ftp/proftpd: drop old

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest                |   3 -
 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 276 -------------------------------
 net-ftp/proftpd/proftpd-1.3.6-r6.ebuild | 277 --------------------------------
 net-ftp/proftpd/proftpd-1.3.6b.ebuild   | 274 -------------------------------
 4 files changed, 830 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index e14deae14ef..45bd57bbebd 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,8 +1,5 @@
-DIST mod_clamav-0.11rc.tar.gz 5115 BLAKE2B 1ae03873e263552d9d5b49eb8a3f348eeee165d52c055b5420b6a152c3ca204532436cdaa74d474187c49bb3e647e2e86086a9c59acf7f99108bbbe185e44511 SHA512 6d33ee7b1c9c8e3fb0a0014dde90cfb1d37daa0f4914f147bb800a8318bcf0e03c7c6748d84cda36c5e5c7cd11ee8114bad9978362f581f367db54d3563f4636
-DIST mod_gss-1.3.6.tar.gz 117294 BLAKE2B ceaf088e15bbb308d9eff3c139de2e14e5525c6300f4feef957da8eb7e23946735c9c5491db33433162b3c1a14e190f53a00b131fc25f31e803212601f166ad9 SHA512 a7e2f201bc7706f47f583317899bf4bc6a75d5e284b20a4cd9019020d3427334ada92fa3bbb4e153a2cd68e04f76185472b46ed3d3d168bf52a4c200e70ed8e4
 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.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbcb3833552ac52e821fb6e901b3996770a31a4059f2c8512ebfc53672dba69491db69cf484133ea28becb82639d8e SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0
 DIST proftpd-1.3.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671
 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

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
deleted file mode 100644
index ee852b1a261..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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
-	"${FILESDIR}"/${PN}-1.3.6-mod_copy.patch
-	"${FILESDIR}"/${PN}-1.3.6-mysql-8.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
-
-	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
-	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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild
deleted file mode 100644
index 050cf75b3bb..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild
+++ /dev/null
@@ -1,277 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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
-	"${FILESDIR}"/${PN}-1.3.6-mod_copy.patch
-	"${FILESDIR}"/${PN}-1.3.6-mysql-8.patch
-	"${FILESDIR}"/${PN}-1.3.6-EINTR-like-EAGAIN.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
-
-	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
-	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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
deleted file mode 100644
index 72cb29f0cd9..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib systemd tmpfiles
-
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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.6a-fix-libcheck.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 -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
-}
-
-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
-
-	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
-	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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-12 19:57 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2020-02-12 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     27c34c4a336e214fc7a202a36ef98f741ef066c2
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Feb 12 19:50:57 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 19:57:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c34c4a

net-ftp/proftpd: stable 1.3.6b-r1 for hppa, bug #708904

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index 78fa89395bc..154eef3fbc4 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-11 11:30 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-02-11 11:30 UTC (permalink / raw
  To: gentoo-commits

commit:     dff6322d5a7d81ea72f4241d55cb1ed2ca6e1a57
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 11:29:02 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 11:29:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dff6322d

net-ftp/proftpd: ppc stable wrt bug #708904

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index 6e5f7cfc039..78fa89395bc 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-11 11:09 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-02-11 11:09 UTC (permalink / raw
  To: gentoo-commits

commit:     873b2389dba9b93c5f4c5c32f076c88ec35cf32e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 11:07:34 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 11:07:34 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=873b2389

net-ftp/proftpd: amd64 stable wrt bug #708904

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index 0e79322dd32..6e5f7cfc039 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-11 10:58 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-02-11 10:58 UTC (permalink / raw
  To: gentoo-commits

commit:     df57a7554bb1c60dba2c185b615e9f81066e7f7a
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 10:57:53 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 10:57:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df57a755

net-ftp/proftpd: ppc64 stable wrt bug #708904

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index 71c37829155..0e79322dd32 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-11 10:55 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-02-11 10:55 UTC (permalink / raw
  To: gentoo-commits

commit:     8ebae3a34ae27ae6616b2b542d9b93586c17ab67
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 10:55:31 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 10:55:31 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebae3a3

net-ftp/proftpd: ia64 stable wrt bug #708904

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index d63df03169e..71c37829155 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-11  9:52 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-02-11  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     0508b55e9d621daab8c25a27ead0b8c44e062f3d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 09:50:37 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 09:50:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0508b55e

net-ftp/proftpd: x86 stable wrt bug #708904

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index 0126ed5603e..d63df03169e 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-11  9:43 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-02-11  9:43 UTC (permalink / raw
  To: gentoo-commits

commit:     2bc99501b058034fe1a2ff048d4b011c60e49cc3
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 11 09:42:46 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Feb 11 09:42:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bc99501

net-ftp/proftpd: sparc stable wrt bug #708904

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index 27c9846e806..0126ed5603e 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2020-02-10 18:10 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2020-02-10 18:10 UTC (permalink / raw
  To: gentoo-commits

commit:     2566c0a48d176576665b60eeadfdc91c0b9535f9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 10 18:10:11 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 10 18:10:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2566c0a4

net-ftp/proftpd: arm stable wrt bug #708904

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
index a7cb7a64d24..27c9846e806 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-11-14 11:55 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2019-11-14 11:55 UTC (permalink / raw
  To: gentoo-commits

commit:     1e0bf145f7e8574173496ec575328463a9c618e8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 11:54:49 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 11:54:49 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0bf145

net-ftp/proftpd: ia64 stable wrt bug #699520

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index 8771eab930b..f0f14731a89 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-11-13  7:39 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2019-11-13  7:39 UTC (permalink / raw
  To: gentoo-commits

commit:     bd5d330cabfa62e5342f3ec0a828f514e248d137
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 13 07:38:08 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Nov 13 07:38:08 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd5d330c

net-ftp/proftpd: ppc stable wrt bug #699520

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index 874e09ec634..8771eab930b 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-11-12 15:08 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2019-11-12 15:08 UTC (permalink / raw
  To: gentoo-commits

commit:     2bf44800e46a479ab3e5af8fc9c5b201ce23c3d8
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 15:07:53 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 15:08:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bf44800

net-ftp/proftpd: ppc64 stable wrt bug #699520

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index 9201d8e4a9d..874e09ec634 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-11-12 10:45 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2019-11-12 10:45 UTC (permalink / raw
  To: gentoo-commits

commit:     b6e2bb868d5526aff68073fab74d4952e4fd60e5
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 10:44:07 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 10:44:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6e2bb86

net-ftp/proftpd: amd64 stable wrt bug #699520

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index 80d545cfceb..9201d8e4a9d 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-11-12 10:05 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2019-11-12 10:05 UTC (permalink / raw
  To: gentoo-commits

commit:     1b65eaad44c0d2ace651087ea0b234d2a5ae9961
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 12 10:03:24 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 10:03:24 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b65eaad

net-ftp/proftpd: x86 stable wrt bug #699520

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index 684f0cb88c2..80d545cfceb 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-11-12  7:25 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-11-12  7:25 UTC (permalink / raw
  To: gentoo-commits

commit:     ed77fc1a6c257bb8ac7f80b2245b7bb1fe8e19dd
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Nov 12 06:22:11 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 07:24:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed77fc1a

net-ftp/proftpd: stable 1.3.6b for hppa, bug #699520

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index e8c605dc56e..684f0cb88c2 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-11-09 14:29 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-11-09 14:29 UTC (permalink / raw
  To: gentoo-commits

commit:     d8ef6f281cb0ed122a5a57eb9257b337cdeb2ce0
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Nov  9 14:22:31 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 14:29:07 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ef6f28

net-ftp/proftpd: stable 1.3.6b for sparc, bug #699520

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
index 2d371bcb83b..e8c605dc56e 100644
--- a/net-ftp/proftpd/proftpd-1.3.6b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-10-20  9:09 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-10-20  9:09 UTC (permalink / raw
  To: gentoo-commits

commit:     b1f044f45c3ae08d95a793d7149e24d1f8248c13
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 09:09:16 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 09:09:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f044f4

net-ftp/proftpd: drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest              |   1 -
 net-ftp/proftpd/proftpd-1.3.6a.ebuild | 275 ----------------------------------
 2 files changed, 276 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 2a6e88d764c..e14deae14ef 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -3,7 +3,6 @@ DIST mod_gss-1.3.6.tar.gz 117294 BLAKE2B ceaf088e15bbb308d9eff3c139de2e14e5525c6
 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.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbcb3833552ac52e821fb6e901b3996770a31a4059f2c8512ebfc53672dba69491db69cf484133ea28becb82639d8e SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0
-DIST proftpd-1.3.6a.tar.gz 20260723 BLAKE2B 4493dcd45be0ef97d154e01124a52e23c84780722823613c88ea5520e997e49dcbe9b694cbb6987d77f798d4d2ae32ff2c6769b5511ebf608af4320853bf9cfa SHA512 0db9cfbe635bbb1915c81a0c50ed158fae89b11cfd09b29119a08af4827d21b57b51c20a0959af09f0cc90ef0334667134ce737e42739c722c1bf80d7cb2f814
 DIST proftpd-1.3.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671
 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

diff --git a/net-ftp/proftpd/proftpd-1.3.6a.ebuild b/net-ftp/proftpd/proftpd-1.3.6a.ebuild
deleted file mode 100644
index adb025d7e1f..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6a.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit multilib systemd tmpfiles
-
-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 )"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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? ( sys-libs/pam )
-	pcre? ( dev-libs/libpcre )
-	postgres? ( dev-db/postgresql:= )
-	sodium? ( dev-libs/libsodium:0= )
-	sqlite? ( dev-db/sqlite:3 )
-"
-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-mysql-8.patch
-	"${FILESDIR}"/${PN}-1.3.6a-fix-libcheck.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 -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
-}
-
-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
-
-	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
-	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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-10-20  9:09 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-10-20  9:09 UTC (permalink / raw
  To: gentoo-commits

commit:     61f377f4ef12071c17589b520f7f740f5cc07fe7
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 20 09:08:58 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Oct 20 09:09:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f377f4

net-ftp/proftpd: bump up to 1.3.6b

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest              |   1 +
 net-ftp/proftpd/proftpd-1.3.6b.ebuild | 274 ++++++++++++++++++++++++++++++++++
 2 files changed, 275 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index aed033a23c4..2a6e88d764c 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -4,6 +4,7 @@ DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
 DIST proftpd-1.3.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbcb3833552ac52e821fb6e901b3996770a31a4059f2c8512ebfc53672dba69491db69cf484133ea28becb82639d8e SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0
 DIST proftpd-1.3.6a.tar.gz 20260723 BLAKE2B 4493dcd45be0ef97d154e01124a52e23c84780722823613c88ea5520e997e49dcbe9b694cbb6987d77f798d4d2ae32ff2c6769b5511ebf608af4320853bf9cfa SHA512 0db9cfbe635bbb1915c81a0c50ed158fae89b11cfd09b29119a08af4827d21b57b51c20a0959af09f0cc90ef0334667134ce737e42739c722c1bf80d7cb2f814
+DIST proftpd-1.3.6b.tar.gz 20260731 BLAKE2B 03ef212bcb1bcc53dd6d1dc4472c5565682b1c6b99af737f4ad09c280f1038f0658a8cc9609634e9b4a2a1cb56f76d83278056af0a9d136b957f853615e46cac SHA512 51511f05f481a038fa3826bdf1bdb866423d9f8df48071a8a263347a1ed096a553e66daefcc95dfdfcde503e664ed4140cdbb2a4f95ade8b7aadf2007aa3a671
 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.6b.ebuild b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
new file mode 100644
index 00000000000..2d371bcb83b
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.6b.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd tmpfiles
+
+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 )"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+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? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+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.6a-fix-libcheck.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 -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
+}
+
+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
+
+	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
+	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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-10-15 18:18 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-10-15 18:18 UTC (permalink / raw
  To: gentoo-commits

commit:     1b65413481d1d76664958a67822f859de68b0e82
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 18:18:37 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 18:18:37 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b654134

net-ftp/proftpd: make DISTDIR filename less specific

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest              | 2 +-
 net-ftp/proftpd/proftpd-1.3.6a.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 36c1f807f52..aed033a23c4 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -3,8 +3,8 @@ DIST mod_gss-1.3.6.tar.gz 117294 BLAKE2B ceaf088e15bbb308d9eff3c139de2e14e5525c6
 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.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbcb3833552ac52e821fb6e901b3996770a31a4059f2c8512ebfc53672dba69491db69cf484133ea28becb82639d8e SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0
-DIST proftpd-1.3.6a-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
 DIST proftpd-1.3.6a.tar.gz 20260723 BLAKE2B 4493dcd45be0ef97d154e01124a52e23c84780722823613c88ea5520e997e49dcbe9b694cbb6987d77f798d4d2ae32ff2c6769b5511ebf608af4320853bf9cfa SHA512 0db9cfbe635bbb1915c81a0c50ed158fae89b11cfd09b29119a08af4827d21b57b51c20a0959af09f0cc90ef0334667134ce737e42739c722c1bf80d7cb2f814
 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
+DIST proftpd-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772

diff --git a/net-ftp/proftpd/proftpd-1.3.6a.ebuild b/net-ftp/proftpd/proftpd-1.3.6a.ebuild
index 87dff98d637..cc22d06099a 100644
--- a/net-ftp/proftpd/proftpd-1.3.6a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6a.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.proftpd.org/
 	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 -> ${P}-mod_clamav-${MOD_CLAMAV}.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 )


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-10-15  8:18 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-10-15  8:18 UTC (permalink / raw
  To: gentoo-commits

commit:     10eaf30ad3b6a860a008d004e248508995e5b7ea
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 15 08:17:54 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Oct 15 08:18:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10eaf30a

net-ftp/proftpd: bump up to 1.3.6a

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest              |   3 +
 net-ftp/proftpd/proftpd-1.3.6a.ebuild | 274 ++++++++++++++++++++++++++++++++++
 2 files changed, 277 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 9eceb24239b..36c1f807f52 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,7 +1,10 @@
 DIST mod_clamav-0.11rc.tar.gz 5115 BLAKE2B 1ae03873e263552d9d5b49eb8a3f348eeee165d52c055b5420b6a152c3ca204532436cdaa74d474187c49bb3e647e2e86086a9c59acf7f99108bbbe185e44511 SHA512 6d33ee7b1c9c8e3fb0a0014dde90cfb1d37daa0f4914f147bb800a8318bcf0e03c7c6748d84cda36c5e5c7cd11ee8114bad9978362f581f367db54d3563f4636
 DIST mod_gss-1.3.6.tar.gz 117294 BLAKE2B ceaf088e15bbb308d9eff3c139de2e14e5525c6300f4feef957da8eb7e23946735c9c5491db33433162b3c1a14e190f53a00b131fc25f31e803212601f166ad9 SHA512 a7e2f201bc7706f47f583317899bf4bc6a75d5e284b20a4cd9019020d3427334ada92fa3bbb4e153a2cd68e04f76185472b46ed3d3d168bf52a4c200e70ed8e4
+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.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbcb3833552ac52e821fb6e901b3996770a31a4059f2c8512ebfc53672dba69491db69cf484133ea28becb82639d8e SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0
+DIST proftpd-1.3.6a-mod_clamav-0.14rc2.tar.gz 19710 BLAKE2B 3435e198cf029337904d4666910414124a3b7e1529d4b12f7acd8a9be563009fff4d9a30eb132a2d7361d2c830e5601c4a00a8814282585b6915e991cc29bc13 SHA512 b8e56880fadf36513215fa4c20be6db7cdf1274337072a9b29c3c3477b3de4743ebcdb1179572ec4cb1501fac0064330c855b1f818bf0cc52f0e91170f059772
+DIST proftpd-1.3.6a.tar.gz 20260723 BLAKE2B 4493dcd45be0ef97d154e01124a52e23c84780722823613c88ea5520e997e49dcbe9b694cbb6987d77f798d4d2ae32ff2c6769b5511ebf608af4320853bf9cfa SHA512 0db9cfbe635bbb1915c81a0c50ed158fae89b11cfd09b29119a08af4827d21b57b51c20a0959af09f0cc90ef0334667134ce737e42739c722c1bf80d7cb2f814
 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.6a.ebuild b/net-ftp/proftpd/proftpd-1.3.6a.ebuild
new file mode 100644
index 00000000000..87dff98d637
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.6a.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib systemd tmpfiles
+
+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 -> ${P}-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"
+IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"
+# TODO: geoip
+REQUIRED_USE="ban? ( ctrls )
+	msg? ( ctrls )
+	sftp? ( ssl )
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
+
+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? ( sys-libs/pam )
+	pcre? ( dev-libs/libpcre )
+	postgres? ( dev-db/postgresql:= )
+	sodium? ( dev-libs/libsodium:0= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+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-mysql-8.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 -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
+}
+
+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
+
+	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
+	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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-10-12 19:28 Mikle Kolyada
  0 siblings, 0 replies; 168+ messages in thread
From: Mikle Kolyada @ 2019-10-12 19:28 UTC (permalink / raw
  To: gentoo-commits

commit:     d9a907934ecabc0bdb7c92cf1440dd40982c3560
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 19:28:23 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 19:28:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9a90793

net-ftp/proftpd: migrate to sys-libs/pam

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 2 +-
 net-ftp/proftpd/proftpd-1.3.6-r6.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 097a848e1b5..738991828ea 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -54,7 +54,7 @@ CDEPEND="acl? ( virtual/acl )
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:= )
 	sodium? ( dev-libs/libsodium:0= )

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild
index 07b05939377..050cf75b3bb 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r6.ebuild
@@ -54,7 +54,7 @@ CDEPEND="acl? ( virtual/acl )
 		!libressl? ( dev-libs/openssl:0= )
 		libressl? ( dev-libs/libressl:= )
 	)
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	pcre? ( dev-libs/libpcre )
 	postgres? ( dev-db/postgresql:= )
 	sodium? ( dev-libs/libsodium:0= )


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-09-20 22:39 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-09-20 22:39 UTC (permalink / raw
  To: gentoo-commits

commit:     c4747bb45781f7cd1eb8021589dee6440fe3dd6c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 20 22:38:40 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Sep 20 22:39:03 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4747bb4

net-ftp/proftpd: change 'log_forensic'/'unique_id' to dashed variants

Reported-by: Michał Górny
Closes: https://bugs.gentoo.org/695100
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/metadata.xml            | 4 ++--
 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 99ccdb6d8f8..572ef17d299 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -23,7 +23,7 @@ server.</longdescription>
 		<flag name="ident">Enable support for the mod_ident module</flag>
 		<flag name="ifsession">Enable support for the ifsession module</flag>
 		<flag name="ifversion">Enable support for the mod_ifversion module</flag>
-		<flag name="log_forensic">Enable support for the mod_log_forensic module, log only suspicious actions.</flag>
+		<flag name="log-forensic">Enable support for the mod_log_forensic module, log only suspicious actions.</flag>
 		<flag name="memcache">Enable support for the mod_memcache module, for using memcached servers</flag>
 		<flag name="msg">Enable support for the mod_msg module, allows system users to send messages to connected clients via the ftpdctl program.</flag>
 		<flag name="qos">Enable support for the mod_qos module</flag>
@@ -35,7 +35,7 @@ server.</longdescription>
 		<flag name="sitemisc">Enable support for the sitemisc module</flag>
 		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for password encryption an key exchange</flag>
 		<flag name="softquota">Enable support for the quotatab module</flag>
-		<flag name="unique_id">Enable support for the mod_unique_id module, every connection gets unique ID.</flag>
+		<flag name="unique-id">Enable support for the mod_unique_id module, every connection gets unique ID.</flag>
 		<flag name="vroot">Enable support for the virtual root module</flag>
 	</use>
 	<upstream>

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 9fef53a6a6c..679d8c8859e 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -28,8 +28,8 @@ 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 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"
+	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"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
 	msg? ( ctrls )
@@ -172,7 +172,7 @@ src_configure() {
 		m="${m}:mod_gss:mod_auth_gss"
 	fi
 	use ldap && m="${m}:mod_ldap"
-	use log_forensic && m="${m}:mod_log_forensic"
+	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"
@@ -207,7 +207,7 @@ src_configure() {
 		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 unique-id && m="${m}:mod_unique_id"
 	use vroot && m="${m}:mod_vroot"
 
 	if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-08-15 18:44 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-08-15 18:44 UTC (permalink / raw
  To: gentoo-commits

commit:     f3a7f7abcd42b96eb6ffeccdf180049f1e4e0a6f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 15 18:43:24 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Aug 15 18:44:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a7f7ab

net-ftp/proftpd: drop old

Bug: https://bugs.gentoo.org/690528
Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 272 -------------------------------
 net-ftp/proftpd/proftpd-1.3.6-r4.ebuild | 274 --------------------------------
 2 files changed, 546 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
deleted file mode 100644
index c5b9e539a75..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# 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 )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r4.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r4.ebuild
deleted file mode 100644
index 489e76d5026..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6-r4.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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 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"
-# TODO: geoip
-REQUIRED_USE="ban? ( ctrls )
-	msg? ( ctrls )
-	sftp? ( ssl )
-	shaper? ( ctrls )
-
-	mysql? ( ssl )
-	postgres? ( ssl )
-	sqlite? ( ssl )
-"
-
-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 )
-"
-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
-
-	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
-	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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-07-28 20:21 Mikle Kolyada
  0 siblings, 0 replies; 168+ messages in thread
From: Mikle Kolyada @ 2019-07-28 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     3a5169288aebac3c56cde5889109b59f061291a7
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 20:21:30 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 20:21:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a516928

net-ftp/proftpd: alpha stable wrt bug #690528

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="alpha"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 54ee9456ea5..c3a8e165e6f 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-07-28 20:21 Mikle Kolyada
  0 siblings, 0 replies; 168+ messages in thread
From: Mikle Kolyada @ 2019-07-28 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     3e279b2611b2f947e98af66f35d781847915ffdb
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 28 20:21:09 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jul 28 20:21:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e279b26

net-ftp/proftpd: arm stable wrt bug #690528

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 36c38f712eb..54ee9456ea5 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-07-26 21:32 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-07-26 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     8121a502a82219641c2830fe05b17e95b58c2b94
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 21:31:21 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 21:31:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8121a502

net-ftp/proftpd: stable 1.3.6-r5 for ia64, bug #690528

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index ab02d5e2e56..36c38f712eb 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-07-26 17:55 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-07-26 17:55 UTC (permalink / raw
  To: gentoo-commits

commit:     240391785dc1db951a61896edb3d4fa6fd54bfdb
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Jul 26 14:09:15 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 17:55:10 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24039178

net-ftp/proftpd: stable 1.3.6-r5 for hppa/sparc, bug #690528

Package-Manager: Portage-2.3.66, Repoman-2.3.16
RepoMan-Options: --include-arches="hppa sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 98078ff1083..ab02d5e2e56 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-07-26  9:52 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2019-07-26  9:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3e7a8fbd4265f3bcffe3c953bcfbc94600f0c603
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 09:52:15 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 09:52:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e7a8fbd

net-ftp/proftpd: ppc stable wrt bug #690528

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc"

 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 9ffff05a454..98078ff1083 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-07-26  9:16 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2019-07-26  9:16 UTC (permalink / raw
  To: gentoo-commits

commit:     8ebebe4a47c3c377b0615f8ccbb75699d6fee10f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 26 09:16:43 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Jul 26 09:16:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ebebe4a

net-ftp/proftpd: ppc64 stable wrt bug #690528

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="ppc64"

 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 0d6a1388eec..9ffff05a454 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-07-25 13:06 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2019-07-25 13:06 UTC (permalink / raw
  To: gentoo-commits

commit:     fe3db61d025148ced820d11a77e1611db3d8bae2
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 13:05:50 2019 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 13:05:50 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe3db61d

net-ftp/proftpd: amd64 stable wrt bug #690528

Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 1bf3bf9b000..0d6a1388eec 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-07-24 20:49 Thomas Deutschmann
  0 siblings, 0 replies; 168+ messages in thread
From: Thomas Deutschmann @ 2019-07-24 20:49 UTC (permalink / raw
  To: gentoo-commits

commit:     746599b5add79788859eaa9cb457cf8a637c2ad0
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 20:29:20 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 20:48:33 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746599b5

net-ftp/proftpd: x86 stable (bug #690528)

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
index 1ae8f3c9735..1bf3bf9b000 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r5.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse 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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-07-24  6:45 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-07-24  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     2a554f40ac988864aca192af0e92d6c34c567332
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 06:44:35 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 06:45:14 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a554f40

net-ftp/proftpd: drop old

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/Manifest                |   1 -
 net-ftp/proftpd/metadata.xml            |   1 -
 net-ftp/proftpd/proftpd-1.3.5e.ebuild   | 233 ----------------------------
 net-ftp/proftpd/proftpd-1.3.6-r1.ebuild | 262 -------------------------------
 net-ftp/proftpd/proftpd-1.3.6-r2.ebuild | 264 --------------------------------
 net-ftp/proftpd/proftpd-1.3.6.ebuild    | 257 -------------------------------
 6 files changed, 1018 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 340b056f957..9eceb24239b 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,7 +1,6 @@
 DIST mod_clamav-0.11rc.tar.gz 5115 BLAKE2B 1ae03873e263552d9d5b49eb8a3f348eeee165d52c055b5420b6a152c3ca204532436cdaa74d474187c49bb3e647e2e86086a9c59acf7f99108bbbe185e44511 SHA512 6d33ee7b1c9c8e3fb0a0014dde90cfb1d37daa0f4914f147bb800a8318bcf0e03c7c6748d84cda36c5e5c7cd11ee8114bad9978362f581f367db54d3563f4636
 DIST mod_gss-1.3.6.tar.gz 117294 BLAKE2B ceaf088e15bbb308d9eff3c139de2e14e5525c6300f4feef957da8eb7e23946735c9c5491db33433162b3c1a14e190f53a00b131fc25f31e803212601f166ad9 SHA512 a7e2f201bc7706f47f583317899bf4bc6a75d5e284b20a4cd9019020d3427334ada92fa3bbb4e153a2cd68e04f76185472b46ed3d3d168bf52a4c200e70ed8e4
 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
-DIST proftpd-1.3.5e.tar.gz 29968142 BLAKE2B 34545cc38ba9bb7b430ef2ae8ac9367995934c247ffd00f6bccdb9b962ce753359020b8dfe3683e6d381e90cbedd66b7c6c8f6dbbf2aa085fd03c2ae3f18c395 SHA512 54a9700af803297697e4b7f2d7dc82139785f9f2cbeb40b226f94ff3e8690f2e3672aa80373005dfec4b53f3dd9ca7b0a658ea39bda63e71292c810ba994eac7
 DIST proftpd-1.3.6.tar.gz 20251898 BLAKE2B b68bd8bfb6cc970974b7a67cf13d1a543ffbcb3833552ac52e821fb6e901b3996770a31a4059f2c8512ebfc53672dba69491db69cf484133ea28becb82639d8e SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0
 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

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index d63407ebc65..99ccdb6d8f8 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -35,7 +35,6 @@ server.</longdescription>
 		<flag name="sitemisc">Enable support for the sitemisc module</flag>
 		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for password encryption an key exchange</flag>
 		<flag name="softquota">Enable support for the quotatab module</flag>
-		<flag name="trace">Build with trace support. Should not be enabled on production servers</flag>
 		<flag name="unique_id">Enable support for the mod_unique_id module, every connection gets unique ID.</flag>
 		<flag name="vroot">Enable support for the virtual root module</flag>
 	</use>

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
deleted file mode 100644
index 6978a2d8258..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2018 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 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/_/}"
-
-__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() {
-	# 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
-		eapply "${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}
-
-	# 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
-	eapply_user
-}
-
-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}
-		econf
-		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 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-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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r1.ebuild
deleted file mode 100644
index be9d9c3b6df..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6-r1.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 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? ( 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-use-trace.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 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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
deleted file mode 100644
index 3286db7e107..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# 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)
-
-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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.6.ebuild b/net-ftp/proftpd/proftpd-1.3.6.ebuild
deleted file mode 100644
index 9acb7fd2075..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6.ebuild
+++ /dev/null
@@ -1,257 +0,0 @@
-# Copyright 1999-2018 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 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 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-use-trace.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 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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-05-24 20:18 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-05-24 20:18 UTC (permalink / raw
  To: gentoo-commits

commit:     b749562307a34f433006e7981d653f96187b73e8
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 20:14:23 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May 24 20:14:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7495623

net-ftp/proftpd: stable 1.3.6-r3 for ia64, bug #682050

Package-Manager: Portage-2.3.66, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index dded6dd0bac..ad08d0f0cb6 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-05-24 20:10 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-05-24 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     970715f94f9ab4aba8abde60b560b0545be347a2
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri May 24 18:16:28 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May 24 20:10:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=970715f9

net-ftp/proftpd: stable 1.3.6-r3 for sparc, bug #682050

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index 07aed344cc8..dded6dd0bac 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-05-23 21:38 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-05-23 21:38 UTC (permalink / raw
  To: gentoo-commits

commit:     0ea3c30e366804459326c2e45e04a33ce875b1ed
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 21:38:14 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu May 23 21:38:27 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea3c30e

net-ftp/proftpd: require USE=ssl for sq modules, bug #682462

Rolf Eike Beer reports build failure on USE=-ssl setup:
    mod_sql_passwd.c:47:3: error:
       #error "OpenSSL support required (--enable-openssl)"

Reported-by: Rolf Eike Beer
Closes: https://bugs.gentoo.org/682462
Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index da2fff59e8b..07aed344cc8 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -34,7 +34,12 @@ IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynm
 REQUIRED_USE="ban? ( ctrls )
 	msg? ( ctrls )
 	sftp? ( ssl )
-	shaper? ( ctrls )"
+	shaper? ( ctrls )
+
+	mysql? ( ssl )
+	postgres? ( ssl )
+	sqlite? ( ssl )
+"
 
 CDEPEND="acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-04-20 17:57 Mikle Kolyada
  0 siblings, 0 replies; 168+ messages in thread
From: Mikle Kolyada @ 2019-04-20 17:57 UTC (permalink / raw
  To: gentoo-commits

commit:     2973bc934a4c699dd3c185488c36a0f053d9bd89
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 17:53:52 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 17:57:38 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2973bc93

net-ftp/proftpd: alpha stable wrt bug #682050

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index deef5638393..da2fff59e8b 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-04-14 16:18 Mikle Kolyada
  0 siblings, 0 replies; 168+ messages in thread
From: Mikle Kolyada @ 2019-04-14 16:18 UTC (permalink / raw
  To: gentoo-commits

commit:     d72fe6d6abe75a0fd62cdb16093ae37d2744a975
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 16:17:04 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 16:18:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d72fe6d6

net-ftp/proftpd: arm stable wrt bug #682050

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="arm"

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index d58eba277fd..deef5638393 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-04-07 21:34 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-04-07 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     ee64bd0ebbb668d9ab5dba7ece03a5d8c118e650
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 21:30:31 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 21:34:02 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee64bd0e

net-ftp/proftpd: stable 1.3.6-r3 for ppc64, bug #682050

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index 1fa8978b89f..d58eba277fd 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-04-07 21:16 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-04-07 21:16 UTC (permalink / raw
  To: gentoo-commits

commit:     00677c460b278c6c42362f45899dd0d6f5f725a3
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  7 21:10:30 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Apr  7 21:10:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00677c46

net-ftp/proftpd: stable 1.3.6-r3 for ppc, bug #682050

Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index 5020b56e4da..1fa8978b89f 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-04-02  9:36 Mikle Kolyada
  0 siblings, 0 replies; 168+ messages in thread
From: Mikle Kolyada @ 2019-04-02  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     434b721b55207da4fe9ea8ac439b08acac01ae7a
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 09:35:55 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 09:35:55 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=434b721b

net-ftp/proftpd: amd64 stable wrt bug #682050

Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index c17eab516d1..5020b56e4da 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-04-02  1:37 Thomas Deutschmann
  0 siblings, 0 replies; 168+ messages in thread
From: Thomas Deutschmann @ 2019-04-02  1:37 UTC (permalink / raw
  To: gentoo-commits

commit:     c9d1895b314ee76d6e9f2ae43904c4bb333dd5ee
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  2 01:27:28 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr  2 01:27:28 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9d1895b

net-ftp/proftpd: x86 stable (bug #682050)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.6-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
index c1babbb4fdd..c17eab516d1 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r3.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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"


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2019-02-07 21:02 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2019-02-07 21:02 UTC (permalink / raw
  To: gentoo-commits

commit:     4dffec372d26d2a4f2dd4c674db18b1c9a7dc375
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  7 21:02:35 2019 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb  7 21:02:35 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dffec37

net-ftp/proftpd: expose USE=sodium

To avoid automagic dependency on dev-libs/libsodium
we now explicitly pass --disable-sodium.

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-ftp/proftpd/metadata.xml            | 1 +
 net-ftp/proftpd/proftpd-1.3.6-r2.ebuild | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 7434ca7e638..d63407ebc65 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -33,6 +33,7 @@ server.</longdescription>
 		<flag name="shaper">Enable support for the mod_shaper module</flag>
 		<flag name="sftp">Enable support for the mod_sftp module and optionally mod_sftp_sql and mod_sftp_pam if matching USE flags are enabled</flag>
 		<flag name="sitemisc">Enable support for the sitemisc module</flag>
+		<flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for password encryption an key exchange</flag>
 		<flag name="softquota">Enable support for the quotatab module</flag>
 		<flag name="trace">Build with trace support. Should not be enabled on production servers</flag>
 		<flag name="unique_id">Enable support for the mod_unique_id module, every connection gets unique ID.</flag>

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
index 6585ad48c89..3286db7e107 100644
--- a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ 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 softquota sqlite ssl tcpd test unique_id vroot xinetd"
+	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 )
@@ -52,6 +52,7 @@ CDEPEND="acl? ( virtual/acl )
 	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}
@@ -220,6 +221,7 @@ src_configure() {
 		$(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) \


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2018-09-16 22:56 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2018-09-16 22:56 UTC (permalink / raw
  To: gentoo-commits

commit:     54e54be511c68c0aa97f2a2a50c8d30af3f9715d
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 22:56:21 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 22:56:32 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54e54be5

net-ftp/proftpd: move off virtual/mysql, bug #665974

Move off virtual/mysql to dev-db/mysql-connector-c
as a library provider (with proper subslot).

Reported-by: Brian Evans
Closes: https://bugs.gentoo.org/665974
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-ftp/proftpd/proftpd-1.3.6-r2.ebuild | 262 ++++++++++++++++++++++++++++++++
 1 file changed, 262 insertions(+)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
new file mode 100644
index 00000000000..6585ad48c89
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.6-r2.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 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:= )
+	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)
+
+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 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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2018-03-10 12:10 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2018-03-10 12:10 UTC (permalink / raw
  To: gentoo-commits

commit:     69971e78ba3a2a72dd54ae8a0eb91f723b5998b0
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 12:09:41 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 12:10:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69971e78

net-ftp/proftpd: create /var/run/proftpd at package install time, bug #650000

The directory is supposed to be created by tmpfiles.d entry:
    $ cat /usr/lib/tmpfiles.d/proftpd.conf
    d /var/run/proftpd 0755 root root

The problem here is that systemd (or openrc) is not being triggered right
after package is installed.

Reported-by:  tazinblack
Closes: https://bugs.gentoo.org/650000
Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-ftp/proftpd/proftpd-1.3.6-r1.ebuild | 262 ++++++++++++++++++++++++++++++++
 1 file changed, 262 insertions(+)

diff --git a/net-ftp/proftpd/proftpd-1.3.6-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.6-r1.ebuild
new file mode 100644
index 00000000000..be9d9c3b6df
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.6-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 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? ( 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-use-trace.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 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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2018-01-05 22:02 Ulrich Müller
  0 siblings, 0 replies; 168+ messages in thread
From: Ulrich Müller @ 2018-01-05 22:02 UTC (permalink / raw
  To: gentoo-commits

commit:     a5240a93fb985c1fa274b92943bca6d0d761ed3c
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 21:13:26 2018 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 22:00:44 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5240a93

net-ftp/proftpd: Remove linguas_* from IUSE.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-ftp/proftpd/metadata.xml          | 5 -----
 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 7 +++----
 net-ftp/proftpd/proftpd-1.3.6.ebuild  | 7 +++----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 4331411c0cb..7434ca7e638 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -23,11 +23,6 @@ server.</longdescription>
 		<flag name="ident">Enable support for the mod_ident module</flag>
 		<flag name="ifsession">Enable support for the ifsession module</flag>
 		<flag name="ifversion">Enable support for the mod_ifversion module</flag>
-		<flag name="linguas_bg_BG">Language support for bg_BG</flag>
-		<flag name="linguas_fr_FR">Language support for fr_FR</flag>
-		<flag name="linguas_it_IT">Language support for it_IT</flag>
-		<flag name="linguas_ja_JP">Language support for ja_JP</flag>
-		<flag name="linguas_ru_RU">Language support for ru_RU</flag>
 		<flag name="log_forensic">Enable support for the mod_log_forensic module, log only suspicious actions.</flag>
 		<flag name="memcache">Enable support for the mod_memcache module, for using memcached servers</flag>
 		<flag name="msg">Enable support for the mod_msg module, allows system users to send messages to connected clients via the ftpdctl program.</flag>

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index ef4a85a80e1..6978a2d8258 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,8 +28,7 @@ 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
+	kerberos ldap libressl 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 )
@@ -210,7 +209,7 @@ src_test() {
 
 src_install() {
 	default
-	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
+	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
 	rm -rf "${ED}"/var/run
 
 	newinitd "${FILESDIR}"/proftpd.initd proftpd

diff --git a/net-ftp/proftpd/proftpd-1.3.6.ebuild b/net-ftp/proftpd/proftpd-1.3.6.ebuild
index fffba1c6c26..9acb7fd2075 100644
--- a/net-ftp/proftpd/proftpd-1.3.6.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,8 +28,7 @@ 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
+	kerberos ldap libressl 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 unique_id vroot xinetd"
 # TODO: geoip
 REQUIRED_USE="ban? ( ctrls )
@@ -234,7 +233,7 @@ src_test() {
 
 src_install() {
 	default
-	[[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
+	[[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
 	rm -rf "${ED}"/var/run
 
 	newinitd "${FILESDIR}"/proftpd.initd proftpd


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-29 21:45 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2017-04-29 21:45 UTC (permalink / raw
  To: gentoo-commits

commit:     c1f44532a5bffa23d82f1001e15b13e602bd299e
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 21:44:09 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 21:45:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f44532

net-ftp/proftpd: ia64 stable, bug #614714

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index 895795d2a42..ef4a85a80e1 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-27 11:23 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2017-04-27 11:23 UTC (permalink / raw
  To: gentoo-commits

commit:     152540e80ebafb1757c819027b883fc3c0587a33
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 27 11:21:18 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 11:21:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=152540e8

net-ftp/proftpd: sparc stable wrt bug #614714

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index 372654d9c57..895795d2a42 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-22  7:33 Tobias Klausmann
  0 siblings, 0 replies; 168+ messages in thread
From: Tobias Klausmann @ 2017-04-22  7:33 UTC (permalink / raw
  To: gentoo-commits

commit:     f911c1b943502157a87ae27b1569f46319e825c5
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 21 11:51:41 2017 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Sat Apr 22 07:29:22 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f911c1b9

net-ftp/proftpd-1.3.5e-r0: add alpha keyword

Gentoo-Bug: 614714

 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index eac21dfc108..372654d9c57 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-18  6:45 Michael Weber
  0 siblings, 0 replies; 168+ messages in thread
From: Michael Weber @ 2017-04-18  6:45 UTC (permalink / raw
  To: gentoo-commits

commit:     bbcbc805e6e65a4e17cde1af3f4b4306f446594b
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 18 06:44:12 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 06:44:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbcbc805

net-ftp/proftpd: ppc stable (bug 614714).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index 7c42cd9e88d..eac21dfc108 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-17 23:42 Michael Weber
  0 siblings, 0 replies; 168+ messages in thread
From: Michael Weber @ 2017-04-17 23:42 UTC (permalink / raw
  To: gentoo-commits

commit:     fdc7fe6180c59ccfd54e60f4f178a4dae4525c56
Author:     Michael Weber <xmw <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 23:39:58 2017 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 23:39:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fdc7fe61

net-ftp/proftpd: arm/ppc64 stable (bug 614714).

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index 6a444ac1e40..7c42cd9e88d 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-17  8:02 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2017-04-17  8:02 UTC (permalink / raw
  To: gentoo-commits

commit:     34ca3754598ecb716843b53993085a34fc9d5eb6
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 08:00:14 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 08:02:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34ca3754

net-ftp/proftpd: x86 stable wrt bug #614714

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index 05d9f511100..6a444ac1e40 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-17  7:36 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2017-04-17  7:36 UTC (permalink / raw
  To: gentoo-commits

commit:     d45ce4229a7ac8913e2c959c0d5f50e8dc5aff4d
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 17 07:36:36 2017 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Apr 17 07:36:36 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45ce422

net-ftp/proftpd: amd64 stable wrt bug #614714

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index d114fa6caa1..05d9f511100 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-15  9:54 Jeroen Roovers
  0 siblings, 0 replies; 168+ messages in thread
From: Jeroen Roovers @ 2017-04-15  9:54 UTC (permalink / raw
  To: gentoo-commits

commit:     89f15de119a2c8730d4aa8910f251eceee57001c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 09:53:52 2017 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 09:54:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f15de1

net-ftp/proftpd: Stable for HPPA (bug #614714).

Package-Manager: Portage-2.3.5, Repoman-2.3.2
RepoMan-Options: --ignore-arches

 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
index 5416099a4f9..d114fa6caa1 100644
--- a/net-ftp/proftpd/proftpd-1.3.5e.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -26,7 +26,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-10  7:46 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2017-04-10  7:46 UTC (permalink / raw
  To: gentoo-commits

commit:     3e06b831037753f343442c645c66d2ab29a41d75
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 07:44:01 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 07:44:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e06b831

net-ftp/proftpd: bump up to 1.3.5e, 1.3.6, bug #614714

From http://proftpd.org/docs/RELEASE_NOTES-1.3.5e:

  1.3.5e
  ---------
    + Fixed SFTP issue with umac-64 <AT> openssh.com digest/MAC.
    + Fixed regression with mod_sftp rekeying.
    + Backported fix for "AllowChrootSymlinks off" checking each component
      for symlinks (CVE-2017-7418).

  1.3.6
  ---------
    + Support for using Redis for caching, logging; see the doc/howto/Redis.html
      documentation.
    + Fixed mod_sql_postgres SSL support (Issue #415).
    + Support building against LibreSSL instead of OpenSSL (Issue #361).
    + Better support on AIX for login restraictions (Bug #4285).
    + TimeoutLogin (and other timeouts) were not working properly for SFTP
      connections (Bug#4299).
    + Handling of the SIGILL and SIGINT signals, by the daemon process, now causes
      the child processes to be terminated as well (Issue #461).
    + RPM .spec file naming changed to conform to Fedora guidelines.
    + Fix for "AllowChrootSymlinks off" checking each component for symlinks
      (CVE-2017-7418).

Bug: https://bugs.gentoo.org/614714
Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-ftp/proftpd/Manifest              |   2 +
 net-ftp/proftpd/proftpd-1.3.5e.ebuild | 234 +++++++++++++++++++++++++++++++
 net-ftp/proftpd/proftpd-1.3.6.ebuild  | 254 ++++++++++++++++++++++++++++++++++
 3 files changed, 490 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 5f1425799a4..61a1214ce87 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -5,6 +5,8 @@ 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.5e.tar.gz 29968142 SHA256 8307dc0103a8e716b99745919be7f09b54708c57c7d5aa70262f7593dc56bc9d SHA512 54a9700af803297697e4b7f2d7dc82139785f9f2cbeb40b226f94ff3e8690f2e3672aa80373005dfec4b53f3dd9ca7b0a658ea39bda63e71292c810ba994eac7 WHIRLPOOL 3747ddb69936b1631b937bed9bc9865a75abcb1ec55ebf796c733f4cb1323b947c34142332d0d6c1f289b21174b83fe995e492ac77cb1d942aabd6467aaed143
+DIST proftpd-1.3.6.tar.gz 20251898 SHA256 91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0 WHIRLPOOL 1b304015083a3e7a8aec15b306d802f6fe32cb0d8f0c5c260cfa0eb6e07d30ac2c5bb436d8cdaf1f379703fd73898a1d491a16d7c16150d87ca2349caff2f211
 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

diff --git a/net-ftp/proftpd/proftpd-1.3.5e.ebuild b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
new file mode 100644
index 00000000000..5416099a4f9
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.5e.ebuild
@@ -0,0 +1,234 @@
+# 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/_/}"
+
+__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() {
+	# 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
+		eapply "${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}
+
+	# 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
+	eapply_user
+}
+
+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}
+		econf
+		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 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
+}

diff --git a/net-ftp/proftpd/proftpd-1.3.6.ebuild b/net-ftp/proftpd/proftpd-1.3.6.ebuild
new file mode 100644
index 00000000000..2c767eb641b
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.6.ebuild
@@ -0,0 +1,254 @@
+# 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/_/}"
+
+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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-10  7:46 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2017-04-10  7:46 UTC (permalink / raw
  To: gentoo-commits

commit:     e8fa1ad78920a7e0ace8110772c97db2d3e78adb
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 07:45:25 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 07:45:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8fa1ad7

net-ftp/proftpd: drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-ftp/proftpd/Manifest              |   1 -
 net-ftp/proftpd/proftpd-1.3.5d.ebuild | 234 ----------------------------------
 2 files changed, 235 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 674a587976a..853ac27aa52 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -4,7 +4,6 @@ DIST mod_gss-1.3.6.tar.gz 117294 SHA256 bd1cb3f8ba0668981beb54d8b4de10ab20419932
 DIST mod_vroot-0.9.3.tar.gz 28352 SHA256 f16c61ed7fe2d7231e1421f8f1a484f29972e0efe0e8e065ab373c388b0c073c SHA512 08a3e5df26bb4d5875b57af9e97e7e7cf27b2ad6983bfae0fac8a21f4a5be0a487cf0d9d03e9e1c08701eb3f22f2cb51a14c05fe1cba5f4085eb8a31d5142776 WHIRLPOOL be30931f117fc4f0b7de87579b483e41d86ad3ecd2999267a726664b32090cd32e6a7e748d66ddec525ee784ee2974212fd2455af313c13b67ab61625efa29d0
 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.5e.tar.gz 29968142 SHA256 8307dc0103a8e716b99745919be7f09b54708c57c7d5aa70262f7593dc56bc9d SHA512 54a9700af803297697e4b7f2d7dc82139785f9f2cbeb40b226f94ff3e8690f2e3672aa80373005dfec4b53f3dd9ca7b0a658ea39bda63e71292c810ba994eac7 WHIRLPOOL 3747ddb69936b1631b937bed9bc9865a75abcb1ec55ebf796c733f4cb1323b947c34142332d0d6c1f289b21174b83fe995e492ac77cb1d942aabd6467aaed143
 DIST proftpd-1.3.6.tar.gz 20251898 SHA256 91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0 WHIRLPOOL 1b304015083a3e7a8aec15b306d802f6fe32cb0d8f0c5c260cfa0eb6e07d30ac2c5bb436d8cdaf1f379703fd73898a1d491a16d7c16150d87ca2349caff2f211
 DIST proftpd-mod-case-0.7.tar.gz 13184 SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc WHIRLPOOL 27f49e9f34099c081add803aa679fd9abe7afa652dffe5d8e42889fef49aeaefd499e1009fc564d6c8f882b3c6dc31d4c6dd08cc06a42b770e7ef76a2ebfcf8a

diff --git a/net-ftp/proftpd/proftpd-1.3.5d.ebuild b/net-ftp/proftpd/proftpd-1.3.5d.ebuild
deleted file mode 100644
index 5416099a4f9..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.5d.ebuild
+++ /dev/null
@@ -1,234 +0,0 @@
-# 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/_/}"
-
-__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() {
-	# 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
-		eapply "${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}
-
-	# 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
-	eapply_user
-}
-
-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}
-		econf
-		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 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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-04-10  7:46 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2017-04-10  7:46 UTC (permalink / raw
  To: gentoo-commits

commit:     5e24bb9a2aebbd80dcad676ef95814a6820e0d52
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 10 07:44:50 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Apr 10 07:44:50 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e24bb9a

net-ftp/proftpd: drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-ftp/proftpd/Manifest                 |   1 -
 net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild | 256 -------------------------------
 2 files changed, 257 deletions(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 61a1214ce87..674a587976a 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -7,7 +7,6 @@ DIST proftpd-1.3.5b.tar.gz 29992107 SHA256 afc1789f2478acf88dfdc7d70da90a4fa2786
 DIST proftpd-1.3.5d.tar.gz 29966560 SHA256 f4e2997be7f22a5b31d7ac72497ed4f4471d24d32385978350410713e76129ac SHA512 3297ddd1f11d46123bbe46488d75fa7a6dcdf2c2d6e7e880a78a427f9f1e9901878dab179e41092e0b9864a615d8ba0b0bf444d4f829870e993e3169c7141c37 WHIRLPOOL d20c43368ad9d3e79e4e7a7590a808974ad4059592f183a325aa05650ee4c4d874b6fe2723c289678df84eb5be4d4888b6a523abd1e0c6a8817333daa12af463
 DIST proftpd-1.3.5e.tar.gz 29968142 SHA256 8307dc0103a8e716b99745919be7f09b54708c57c7d5aa70262f7593dc56bc9d SHA512 54a9700af803297697e4b7f2d7dc82139785f9f2cbeb40b226f94ff3e8690f2e3672aa80373005dfec4b53f3dd9ca7b0a658ea39bda63e71292c810ba994eac7 WHIRLPOOL 3747ddb69936b1631b937bed9bc9865a75abcb1ec55ebf796c733f4cb1323b947c34142332d0d6c1f289b21174b83fe995e492ac77cb1d942aabd6467aaed143
 DIST proftpd-1.3.6.tar.gz 20251898 SHA256 91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0 WHIRLPOOL 1b304015083a3e7a8aec15b306d802f6fe32cb0d8f0c5c260cfa0eb6e07d30ac2c5bb436d8cdaf1f379703fd73898a1d491a16d7c16150d87ca2349caff2f211
-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/proftpd-1.3.6_rc4.ebuild b/net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild
deleted file mode 100644
index 9adafec9c77..00000000000
--- a/net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2017-01-16 14:12 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2017-01-16 14:12 UTC (permalink / raw
  To: gentoo-commits

commit:     20edf96b185c1761da7151cfb8657cc1c9b40259
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 16 14:10:57 2017 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jan 16 14:10:57 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20edf96b

net-ftp/proftpd: bump up to 1.3.5d

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 net-ftp/proftpd/Manifest              |   3 +
 net-ftp/proftpd/proftpd-1.3.5d.ebuild | 235 ++++++++++++++++++++++++++++++++++
 2 files changed, 238 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 008160e..60dbe84 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -1,7 +1,10 @@
 DIST mod_clamav-0.11rc.tar.gz 5115 SHA256 87630eb1866066d6320ee711897d8998b8f4915c0498b2e78cc0464abd34855a SHA512 6d33ee7b1c9c8e3fb0a0014dde90cfb1d37daa0f4914f147bb800a8318bcf0e03c7c6748d84cda36c5e5c7cd11ee8114bad9978362f581f367db54d3563f4636 WHIRLPOOL b15024d1011a83a10ce52fb676f1f2162d67750dc137600b624cd04ebd498bb3c9242e4889fd7b73c18224eb483286cb543fc627b27e6a8ff4c9bf35468218b9
 DIST mod_gss-1.3.3.tar.gz 115098 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e SHA512 61473f3102e2204a27d691907482a3e86108bb423be54ba47a79ef0d2a0313bcdc022529f8e620bd868453bee1b1169fce74cc454d835fdfd4be964e342bdedb WHIRLPOOL 90a15ca919326fa2b2e21fb2928e5ac39b912681bce015f3bff0b0b0c47241f41cc3c78789797ba2d8a61dafc24a9f1d18bf085808350301c228b6ed62721e80
+DIST mod_gss-1.3.6.tar.gz 117294 SHA256 bd1cb3f8ba0668981beb54d8b4de10ab204199327a464debd9da19196bbb23c4 SHA512 a7e2f201bc7706f47f583317899bf4bc6a75d5e284b20a4cd9019020d3427334ada92fa3bbb4e153a2cd68e04f76185472b46ed3d3d168bf52a4c200e70ed8e4 WHIRLPOOL 96dce4cf8027961d0358a6f6f7ab33a606bfeb9bfe52702663e6c176e21d1ec357617e2d7f780247895f489700d129b03a62712ffc945c1104b53508ea1fca32
 DIST mod_vroot-0.9.3.tar.gz 28352 SHA256 f16c61ed7fe2d7231e1421f8f1a484f29972e0efe0e8e065ab373c388b0c073c SHA512 08a3e5df26bb4d5875b57af9e97e7e7cf27b2ad6983bfae0fac8a21f4a5be0a487cf0d9d03e9e1c08701eb3f22f2cb51a14c05fe1cba5f4085eb8a31d5142776 WHIRLPOOL be30931f117fc4f0b7de87579b483e41d86ad3ecd2999267a726664b32090cd32e6a7e748d66ddec525ee784ee2974212fd2455af313c13b67ab61625efa29d0
+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-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/proftpd-1.3.5d.ebuild b/net-ftp/proftpd/proftpd-1.3.5d.ebuild
new file mode 100644
index 00000000..931fe5c
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.5d.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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/_/}"
+
+__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() {
+	# 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
+		eapply "${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}
+
+	# 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
+	eapply_user
+}
+
+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}
+		econf
+		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 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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-06-30 20:21 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2016-06-30 20:21 UTC (permalink / raw
  To: gentoo-commits

commit:     3e12147aca5649ab352d1bc6fc6819de335e4459
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 30 20:18:24 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Jun 30 20:18:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e12147a

net-ftp/proftpd: ia64, sparc stable, bug #577046

Package-Manager: portage-2.3.0

 net-ftp/proftpd/proftpd-1.3.5b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5b.ebuild b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
index e5cdf5b..f0f94c1 100644
--- a/net-ftp/proftpd/proftpd-1.3.5b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-05-20 13:29 Tobias Klausmann
  0 siblings, 0 replies; 168+ messages in thread
From: Tobias Klausmann @ 2016-05-20 13:29 UTC (permalink / raw
  To: gentoo-commits

commit:     fe818ffa2a13872220ae7af49db35d4980e24a91
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 13:29:20 2016 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Fri May 20 13:29:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe818ffa

net-ftp/proftpd-1.3.5b-r0: add alpha keyword

Gentoo-Bug: 577046

Package-Manager: portage-2.3.0_rc1

 net-ftp/proftpd/proftpd-1.3.5b.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5b.ebuild b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
index 2b4cf7a..e5cdf5b 100644
--- a/net-ftp/proftpd/proftpd-1.3.5b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-04-11  8:36 Bernard Cafarelli
  0 siblings, 0 replies; 168+ messages in thread
From: Bernard Cafarelli @ 2016-04-11  8:36 UTC (permalink / raw
  To: gentoo-commits

commit:     5e1dedc67fb17566f00bdc7a3441131ee4f6218e
Author:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 11 08:36:14 2016 +0000
Commit:     Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Mon Apr 11 08:36:14 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e1dedc6

net-ftp/proftpd: remove proxy maintainer

Package-Manager: portage-2.2.28

 net-ftp/proftpd/metadata.xml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index cc06ea4..4331411 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -2,23 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>bernd@lommerzheim.com</email>
-		<name>Bernd Lommerzheim</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>voyageur@gentoo.org</email>
-		<name>Bernard Cafarelli</name>
-		<description>Proxy maintainer</description>
-	</maintainer>
-	<maintainer type="person">
 		<email>slyfox@gentoo.org</email>
 		<name>Sergei Trofimovich</name>
 		<description>Mostly user.</description>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>ProFTPD grew out of the desire to have a secure and 
 configurable FTP server, and out of a significant admiration of the Apache web 
 server.</longdescription>


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-03-30 18:31 Markus Meier
  0 siblings, 0 replies; 168+ messages in thread
From: Markus Meier @ 2016-03-30 18:31 UTC (permalink / raw
  To: gentoo-commits

commit:     c1566deb1f095a9283a38ef8a54d8c41037e1f0e
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 18:31:38 2016 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 18:31:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1566deb

net-ftp/proftpd: arm stable, bug #577046

Package-Manager: portage-2.2.28
RepoMan-Options: --include-arches="arm"

 net-ftp/proftpd/proftpd-1.3.5b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5b.ebuild b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
index 32c3da0..2b4cf7a 100644
--- a/net-ftp/proftpd/proftpd-1.3.5b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-03-27 10:16 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2016-03-27 10:16 UTC (permalink / raw
  To: gentoo-commits

commit:     086059dd30f3bd1529e2bc339b35b86265cfaba9
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 10:15:43 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 10:15:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=086059dd

net-ftp/proftpd: ppc stable wrt bug #577046

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.5b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5b.ebuild b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
index 4c7c2e5..32c3da0 100644
--- a/net-ftp/proftpd/proftpd-1.3.5b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-03-26  9:06 Jeroen Roovers
  0 siblings, 0 replies; 168+ messages in thread
From: Jeroen Roovers @ 2016-03-26  9:06 UTC (permalink / raw
  To: gentoo-commits

commit:     93396e271b0290027c116d164d820dc45c85b3ac
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 09:05:24 2016 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 09:05:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93396e27

net-ftp/proftpd: Stable for HPPA PPC64 (bug #577046).

Package-Manager: portage-2.2.28
RepoMan-Options: --ignore-arches

 net-ftp/proftpd/proftpd-1.3.5b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5b.ebuild b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
index af7dd3d..4c7c2e5 100644
--- a/net-ftp/proftpd/proftpd-1.3.5b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-03-24  8:57 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2016-03-24  8:57 UTC (permalink / raw
  To: gentoo-commits

commit:     a1101d22e8c46fa60aa38cf940ac97948069a041
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 08:57:49 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 08:57:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1101d22

net-ftp/proftpd: x86 stable wrt bug #577046

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.5b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5b.ebuild b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
index 3dc8201..af7dd3d 100644
--- a/net-ftp/proftpd/proftpd-1.3.5b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-03-24  8:56 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2016-03-24  8:56 UTC (permalink / raw
  To: gentoo-commits

commit:     bdc18624dd5ba44c70e3ba7be7033f84535492f3
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 08:56:44 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 08:56:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdc18624

net-ftp/proftpd: amd64 stable wrt bug #577046

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.5b.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5b.ebuild b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
index 313faba..3dc8201 100644
--- a/net-ftp/proftpd/proftpd-1.3.5b.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-03-11 21:14 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2016-03-11 21:14 UTC (permalink / raw
  To: gentoo-commits

commit:     6870b2269b486c6456bc3402fc4e23d4d31ee6c7
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 21:14:46 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 21:14:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6870b226

net-ftp/proftpd: bump up to 1.3.5b, bug #577046 (CVE-2016-3125)

proftpd Ignored configured Diffie Hellman parameters and uses risky 1024 bit.

Reported-by: Hanno Boeck
Bug: http://bugs.proftpd.org/show_bug.cgi?id=4230
Bug: https://bugs.gentoo.org/577046

Package-Manager: portage-2.2.28

 net-ftp/proftpd/Manifest              |   1 +
 net-ftp/proftpd/proftpd-1.3.5b.ebuild | 238 ++++++++++++++++++++++++++++++++++
 2 files changed, 239 insertions(+)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index eabba73..11fe9ba 100644
--- a/net-ftp/proftpd/Manifest
+++ b/net-ftp/proftpd/Manifest
@@ -2,6 +2,7 @@ DIST mod_clamav-0.11rc.tar.gz 5115 SHA256 87630eb1866066d6320ee711897d8998b8f491
 DIST mod_gss-1.3.3.tar.gz 115098 SHA256 24702cf0333720730cc269eb30529061365b1384fdce274bc3d46ccfc300934e SHA512 61473f3102e2204a27d691907482a3e86108bb423be54ba47a79ef0d2a0313bcdc022529f8e620bd868453bee1b1169fce74cc454d835fdfd4be964e342bdedb WHIRLPOOL 90a15ca919326fa2b2e21fb2928e5ac39b912681bce015f3bff0b0b0c47241f41cc3c78789797ba2d8a61dafc24a9f1d18bf085808350301c228b6ed62721e80
 DIST mod_vroot-0.9.3.tar.gz 28352 SHA256 f16c61ed7fe2d7231e1421f8f1a484f29972e0efe0e8e065ab373c388b0c073c SHA512 08a3e5df26bb4d5875b57af9e97e7e7cf27b2ad6983bfae0fac8a21f4a5be0a487cf0d9d03e9e1c08701eb3f22f2cb51a14c05fe1cba5f4085eb8a31d5142776 WHIRLPOOL be30931f117fc4f0b7de87579b483e41d86ad3ecd2999267a726664b32090cd32e6a7e748d66ddec525ee784ee2974212fd2455af313c13b67ab61625efa29d0
 DIST proftpd-1.3.5a.tar.gz 29988477 SHA256 a1f48df8539c414ec56e0cea63dcf4b8e16e606c05f10156f030a4a67fae5696 SHA512 d64de12c100814c5c8a3916b3c9344f5a68c2b85902ffc8e5bb088d8975b5f13a7b9a29f82085b70dc93f4599c0e0f2645977d20998dda11981e66f534ea692c WHIRLPOOL 19b361b0481d5a2eab7fbe40de7bb8c9cd320a2ac04343d2fe858fdc9a62a747f89a5d4a619808bd252f6cfd9f15353df28405eb9bdc10c7c9f0162ab093bc1e
+DIST proftpd-1.3.5b.tar.gz 29992107 SHA256 afc1789f2478acf88dfdc7d70da90a4fa2786d628218e9574273295d044b4fc8 SHA512 5bdb9718c85c26b92256d7b3791a6a5456bec3826801b7b68f4d493d202ac77179c8378ad06efc1a805efce639db266561d3beb4bc7af61ca1352fb4bdfd4e6a WHIRLPOOL bb1a9fef464d2070c7dc1204cf2a8682e4f2719d682b0b1e541fff11f5c8a4a9a133011a607831fd30548b201531c3534248ed0eb36d0b4708e7b5b75353fc6f
 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/proftpd-1.3.5b.ebuild b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
new file mode 100644
index 0000000..313faba
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.5b.ebuild
@@ -0,0 +1,238 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 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/_/}"
+
+__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() {
+	# 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 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
+}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-01-16 22:10 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2016-01-16 22:10 UTC (permalink / raw
  To: gentoo-commits

commit:     74586a24b5ed75931733b07d3b9d3aecedb6efb6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 22:10:30 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 22:10:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74586a24

net-ftp/proftpd: drop old vulnerable versions, bug #567252

Package-Manager: portage-2.2.26

 net-ftp/proftpd/metadata.xml             |   1 -
 net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild | 238 -------------------------------
 net-ftp/proftpd/proftpd-1.3.5a.ebuild    | 236 ------------------------------
 3 files changed, 475 deletions(-)

diff --git a/net-ftp/proftpd/metadata.xml b/net-ftp/proftpd/metadata.xml
index 6ab2093..9692495 100644
--- a/net-ftp/proftpd/metadata.xml
+++ b/net-ftp/proftpd/metadata.xml
@@ -42,7 +42,6 @@ server.</longdescription>
 		<flag name="log_forensic">Enable support for the mod_log_forensic module, log only suspicious actions.</flag>
 		<flag name="memcache">Enable support for the mod_memcache module, for using memcached servers</flag>
 		<flag name="msg">Enable support for the mod_msg module, allows system users to send messages to connected clients via the ftpdctl program.</flag>
-		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> support</flag>
 		<flag name="qos">Enable support for the mod_qos module</flag>
 		<flag name="ratio">Enable support for the mod_ratio module</flag>
 		<flag name="readme">Enable support for the mod_readme module</flag>

diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild
deleted file mode 100644
index 313faba..0000000
--- a/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 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/_/}"
-
-__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() {
-	# 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 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
-}

diff --git a/net-ftp/proftpd/proftpd-1.3.5a.ebuild b/net-ftp/proftpd/proftpd-1.3.5a.ebuild
deleted file mode 100644
index 0585b99..0000000
--- a/net-ftp/proftpd/proftpd-1.3.5a.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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:0= )
-	openssl? ( dev-libs/openssl:0= )
-	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() {
-	# 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
-}


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2016-01-09  7:10 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2016-01-09  7:10 UTC (permalink / raw
  To: gentoo-commits

commit:     4e3f3624f32c73d14f5c9b2defac87ce29791e2f
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  9 07:09:40 2016 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Sat Jan  9 07:09:40 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e3f3624

net-ftp/proftpd: sparc stable wrt bug #567252

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
index 4ec3651..653eff0 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2015-12-25 18:19 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2015-12-25 18:19 UTC (permalink / raw
  To: gentoo-commits

commit:     2e3bd4b21eff3dca9bcaee5ea2d72470678c4656
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 25 18:17:13 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri Dec 25 18:17:13 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e3bd4b2

net-ftp/proftpd: x86 stable wrt bug #567252

Package-Manager: portage-2.2.24
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
index b57c95f..4ec3651 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2015-12-09  5:46 Markus Meier
  0 siblings, 0 replies; 168+ messages in thread
From: Markus Meier @ 2015-12-09  5:46 UTC (permalink / raw
  To: gentoo-commits

commit:     7552f43f95dd1b0cfd5ffd3e9aad7f3058c8ae9e
Author:     Markus Meier <maekke <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 05:46:24 2015 +0000
Commit:     Markus Meier <maekke <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 05:46:24 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7552f43f

net-ftp/proftpd: arm stable, bug #567252

Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="arm"

 net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
index 47ffd91..b57c95f 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2015-12-07 11:40 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2015-12-07 11:40 UTC (permalink / raw
  To: gentoo-commits

commit:     d7fd8aa5f70c626cf78e7485f3091db1d94e610e
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 11:38:27 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 11:40:14 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7fd8aa5

net-ftp/proftpd: ppc stable wrt bug #567252

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
index af96e90..47ffd91 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2015-12-04  6:40 Jeroen Roovers
  0 siblings, 0 replies; 168+ messages in thread
From: Jeroen Roovers @ 2015-12-04  6:40 UTC (permalink / raw
  To: gentoo-commits

commit:     8821e4cbab2a04b25bd493beffcd0f18eb8fe00c
Author:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 06:40:09 2015 +0000
Commit:     Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 06:40:09 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8821e4cb

net-ftp/proftpd: Stable for HPPA PPC64 (bug #567252).

Package-Manager: portage-2.2.26
RepoMan-Options: --ignore-arches

 net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
index f31b2c6..af96e90 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2015-12-03 10:07 Agostino Sarubbo
  0 siblings, 0 replies; 168+ messages in thread
From: Agostino Sarubbo @ 2015-12-03 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     e052410c105ced37f5e8fa08fce34a17b891e776
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  3 10:06:49 2015 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 10:06:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e052410c

net-ftp/proftpd: amd64 stable wrt bug #567252

Package-Manager: portage-2.2.20.1
RepoMan-Options: --include-arches="amd64"

 net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
index 18d7c8e..f31b2c6 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r2.ebuild
@@ -27,7 +27,7 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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


^ permalink raw reply related	[flat|nested] 168+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
@ 2015-11-10 22:22 Sergei Trofimovich
  0 siblings, 0 replies; 168+ messages in thread
From: Sergei Trofimovich @ 2015-11-10 22:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1357442a0e83b714c19ba720915ebd78ed1d27a4
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 10 22:20:47 2015 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 22:21:35 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1357442a

net-ftp/proftpd: add libressl support, bug #565372 by Marek Behun

Reported-by: Marek Behun
Bug: https://bugs.gentoo.org/565372

Package-Manager: portage-2.2.24

 ...roftpd-1.3.5a.ebuild => proftpd-1.3.5a-r1.ebuild} | 20 +++++++++++---------
 net-ftp/proftpd/proftpd-1.3.5a.ebuild                |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/net-ftp/proftpd/proftpd-1.3.5a.ebuild b/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild
similarity index 94%
copy from net-ftp/proftpd/proftpd-1.3.5a.ebuild
copy to net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild
index 21963cf..313faba 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a-r1.ebuild
@@ -27,17 +27,16 @@ SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+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
+	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? ( openssl )
-	shaper? ( ctrls )
-	ssl? ( openssl )"
+	sftp? ( ssl )
+	shaper? ( ctrls )"
 
 CDEPEND="acl? ( virtual/acl )
 	caps? ( sys-libs/libcap )
@@ -47,8 +46,11 @@ CDEPEND="acl? ( virtual/acl )
 	memcache? ( >=dev-libs/libmemcached-0.41 )
 	mysql? ( virtual/mysql )
 	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
-	openssl? ( dev-libs/openssl:0= )
+	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:= )
@@ -196,7 +198,7 @@ src_configure() {
 		$(use_enable memcache) \
 		$(use_enable ncurses) \
 		$(use_enable nls) \
-		$(use_enable openssl) \
+		$(use_enable ssl openssl) \
 		$(use_enable pam auth-pam) \
 		$(use_enable pcre) \
 		$(use_enable test tests) \

diff --git a/net-ftp/proftpd/proftpd-1.3.5a.ebuild b/net-ftp/proftpd/proftpd-1.3.5a.ebuild
index 21963cf..0585b99 100644
--- a/net-ftp/proftpd/proftpd-1.3.5a.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.5a.ebuild
@@ -47,7 +47,7 @@ CDEPEND="acl? ( virtual/acl )
 	memcache? ( >=dev-libs/libmemcached-0.41 )
 	mysql? ( virtual/mysql )
 	nls? ( virtual/libiconv )
-	ncurses? ( sys-libs/ncurses )
+	ncurses? ( sys-libs/ncurses:0= )
 	openssl? ( dev-libs/openssl:0= )
 	pam? ( virtual/pam )
 	pcre? ( dev-libs/libpcre )


^ permalink raw reply related	[flat|nested] 168+ messages in thread

end of thread, other threads:[~2024-11-10  0:54 UTC | newest]

Thread overview: 168+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-27 13:40 [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/ Mikle Kolyada
  -- strict thread matches above, loose matches on Subject: below --
2024-11-10  0:54 Andreas K. Hüttel
2024-08-15  8:17 Hans de Graaff
2024-06-24  2:54 Sam James
2024-06-23 16:01 Sam James
2024-06-23 16:01 Sam James
2024-06-23  6:03 Arthur Zamarin
2024-06-23  6:03 Arthur Zamarin
2024-06-23  6:03 Arthur Zamarin
2024-06-23  3:54 Hans de Graaff
2023-12-20 15:19 Sam James
2023-10-09  0:50 Sam James
2023-08-02 21:06 Sam James
2023-07-15  6:08 Sam James
2023-07-15  3:10 Sam James
2023-07-14 18:38 Arthur Zamarin
2023-07-14 17:07 Arthur Zamarin
2023-07-14 15:07 Arthur Zamarin
2023-06-03  1:57 Sam James
2023-05-07  7:21 Sam James
2023-02-26 19:48 Arthur Zamarin
2023-02-24 18:11 Arthur Zamarin
2023-02-24 18:09 Arthur Zamarin
2023-02-24 17:11 Arthur Zamarin
2023-02-24 16:56 Sam James
2023-02-24 16:56 Sam James
2022-11-26 21:04 Piotr Karbowski
2022-11-19 15:48 Piotr Karbowski
2022-05-10 22:57 Andreas K. Hüttel
2022-04-30  5:32 Yixun Lan
2022-04-11 19:24 Sam James
2022-01-23 15:21 Sam James
2022-01-21 20:27 Arthur Zamarin
2022-01-21 20:11 Arthur Zamarin
2022-01-21 12:42 Sam James
2022-01-21 10:03 Jakov Smolić
2022-01-21 10:03 Jakov Smolić
2022-01-06  9:07 David Seifert
2021-10-27  4:13 Sam James
2021-10-24  4:51 Sam James
2021-10-24  4:50 Sam James
2021-10-24  4:50 Sam James
2021-10-24  2:27 Sam James
2021-10-24  0:19 Sam James
2021-10-18 17:51 Piotr Karbowski
2021-10-18 17:51 Piotr Karbowski
2021-07-04 15:24 Sergei Trofimovich
2021-07-03 20:12 Piotr Karbowski
2021-06-30 18:40 Sam James
2021-06-15  8:32 Sergei Trofimovich
2021-06-15  7:15 Sergei Trofimovich
2021-05-09 11:53 Sergei Trofimovich
2021-05-01 20:44 Sergei Trofimovich
2021-04-25  5:16 Sam James
2021-04-25  5:14 Sam James
2021-04-25  5:14 Sam James
2021-04-25  5:11 Sam James
2021-04-25  5:09 Sam James
2021-03-07 11:58 David Seifert
2020-09-07 20:46 Sergei Trofimovich
2020-09-01 20:13 Sam James
2020-08-31  1:22 Sam James
2020-08-29 17:57 Thomas Deutschmann
2020-08-24 17:33 Sergei Trofimovich
2020-07-25  9:18 Sergei Trofimovich
2020-07-21 18:17 Sergei Trofimovich
2020-07-21 18:17 Sergei Trofimovich
2020-07-21  7:16 Sergei Trofimovich
2020-07-08 19:46 Sam James
2020-07-07  6:58 Sergei Trofimovich
2020-07-06  7:22 Sergei Trofimovich
2020-07-06  7:02 Sergei Trofimovich
2020-06-20 19:49 Sergei Trofimovich
2020-05-31 17:18 Sergei Trofimovich
2020-05-31 11:36 Sergei Trofimovich
2020-05-02 17:51 Sergei Trofimovich
2020-04-13 14:53 Agostino Sarubbo
2020-04-13 10:19 Agostino Sarubbo
2020-04-13 10:17 Agostino Sarubbo
2020-04-13 10:16 Agostino Sarubbo
2020-04-13 10:14 Agostino Sarubbo
2020-04-13  9:57 Agostino Sarubbo
2020-03-31 18:02 Sergei Trofimovich
2020-03-18 21:31 Sergei Trofimovich
2020-03-18 17:58 Sergei Trofimovich
2020-03-18 15:22 Agostino Sarubbo
2020-03-18 11:13 Agostino Sarubbo
2020-03-18 11:11 Agostino Sarubbo
2020-03-18  9:56 Agostino Sarubbo
2020-03-18  9:46 Agostino Sarubbo
2020-03-17 18:44 Agostino Sarubbo
2020-03-16 18:25 Sergei Trofimovich
2020-03-05 23:56 Sergei Trofimovich
2020-02-25  8:40 Sergei Trofimovich
2020-02-12 20:32 Sergei Trofimovich
2020-02-12 19:57 Sergei Trofimovich
2020-02-11 11:30 Agostino Sarubbo
2020-02-11 11:09 Agostino Sarubbo
2020-02-11 10:58 Agostino Sarubbo
2020-02-11 10:55 Agostino Sarubbo
2020-02-11  9:52 Agostino Sarubbo
2020-02-11  9:43 Agostino Sarubbo
2020-02-10 18:10 Agostino Sarubbo
2019-11-14 11:55 Agostino Sarubbo
2019-11-13  7:39 Agostino Sarubbo
2019-11-12 15:08 Agostino Sarubbo
2019-11-12 10:45 Agostino Sarubbo
2019-11-12 10:05 Agostino Sarubbo
2019-11-12  7:25 Sergei Trofimovich
2019-11-09 14:29 Sergei Trofimovich
2019-10-20  9:09 Sergei Trofimovich
2019-10-20  9:09 Sergei Trofimovich
2019-10-15 18:18 Sergei Trofimovich
2019-10-15  8:18 Sergei Trofimovich
2019-10-12 19:28 Mikle Kolyada
2019-09-20 22:39 Sergei Trofimovich
2019-08-15 18:44 Sergei Trofimovich
2019-07-28 20:21 Mikle Kolyada
2019-07-28 20:21 Mikle Kolyada
2019-07-26 21:32 Sergei Trofimovich
2019-07-26 17:55 Sergei Trofimovich
2019-07-26  9:52 Agostino Sarubbo
2019-07-26  9:16 Agostino Sarubbo
2019-07-25 13:06 Agostino Sarubbo
2019-07-24 20:49 Thomas Deutschmann
2019-07-24  6:45 Sergei Trofimovich
2019-05-24 20:18 Sergei Trofimovich
2019-05-24 20:10 Sergei Trofimovich
2019-05-23 21:38 Sergei Trofimovich
2019-04-20 17:57 Mikle Kolyada
2019-04-14 16:18 Mikle Kolyada
2019-04-07 21:34 Sergei Trofimovich
2019-04-07 21:16 Sergei Trofimovich
2019-04-02  9:36 Mikle Kolyada
2019-04-02  1:37 Thomas Deutschmann
2019-02-07 21:02 Sergei Trofimovich
2018-09-16 22:56 Sergei Trofimovich
2018-03-10 12:10 Sergei Trofimovich
2018-01-05 22:02 Ulrich Müller
2017-04-29 21:45 Sergei Trofimovich
2017-04-27 11:23 Agostino Sarubbo
2017-04-22  7:33 Tobias Klausmann
2017-04-18  6:45 Michael Weber
2017-04-17 23:42 Michael Weber
2017-04-17  8:02 Agostino Sarubbo
2017-04-17  7:36 Agostino Sarubbo
2017-04-15  9:54 Jeroen Roovers
2017-04-10  7:46 Sergei Trofimovich
2017-04-10  7:46 Sergei Trofimovich
2017-04-10  7:46 Sergei Trofimovich
2017-01-16 14:12 Sergei Trofimovich
2016-06-30 20:21 Sergei Trofimovich
2016-05-20 13:29 Tobias Klausmann
2016-04-11  8:36 Bernard Cafarelli
2016-03-30 18:31 Markus Meier
2016-03-27 10:16 Agostino Sarubbo
2016-03-26  9:06 Jeroen Roovers
2016-03-24  8:57 Agostino Sarubbo
2016-03-24  8:56 Agostino Sarubbo
2016-03-11 21:14 Sergei Trofimovich
2016-01-16 22:10 Sergei Trofimovich
2016-01-09  7:10 Agostino Sarubbo
2015-12-25 18:19 Agostino Sarubbo
2015-12-09  5:46 Markus Meier
2015-12-07 11:40 Agostino Sarubbo
2015-12-04  6:40 Jeroen Roovers
2015-12-03 10:07 Agostino Sarubbo
2015-11-10 22:22 Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox