[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 9b38a63644a6643c8356ab3720c391f47446dda7
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 20 15:10:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 20 15:18:39 2023 +
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  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 ..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: 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/, net-ftp/proftpd/

[Sam James]

commit: 61e89992642acf9366fdb35efb95ac3132515293
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  9 17:16:33 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  9 18:06:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e89992

net-ftp/proftpd: fix modern C issue in configure

Signed-off-by: Sam James  gentoo.org>

 .../files/proftpd-1.3.8a-configure-c99.patch   |  34 +++
 net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild   | 304 +
 2 files changed, 338 insertions(+)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.8a-configure-c99.patch 
b/net-ftp/proftpd/files/proftpd-1.3.8a-configure-c99.patch
new file mode 100644
index ..9364b23f0daa
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.8a-configure-c99.patch
@@ -0,0 +1,34 @@
+https://github.com/proftpd/proftpd/pull/1754
+
+From 020192499202f268e6d96339597921aec01ec737 Mon Sep 17 00:00:00 2001
+From: Florian Weimer 
+Date: Fri, 8 Dec 2023 19:58:51 +0100
+Subject: [PATCH] configure: Use char ** for the iconv input argument
+
+The standard iconv function uses char ** even for the input buffer.
+Using the incompatible const char ** type causes the check to fail if
+the compiler treats such type errors as errors, instead of merely
+warning about it.
+--- a/configure
 b/configure
+@@ -21475,7 +21475,7 @@ main ()
+ {
+ 
+ size_t res, in_len = 0, out_len = 0;
+-const char *in = NULL;
++char *in = NULL;
+ char *out = NULL;
+ res = iconv((iconv_t)-1, , _len, , _len);
+ 
+--- a/configure.in
 b/configure.in
+@@ -2100,7 +2100,7 @@ AC_TRY_LINK(
+   ],
+   [ 
+ size_t res, in_len = 0, out_len = 0;
+-const char *in = NULL;
++char *in = NULL;
+ char *out = NULL;
+ res = iconv((iconv_t)-1, , _len, , _len);
+   ],
+

diff --git a/net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild 
b/net-ftp/proftpd/proftpd-1.3.8a-r1.ebuild
new file mode 100644
index ..8e3630ce042f
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.8a-r1.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
+)
+

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: f635465c0b9703ea0d6f017cd40ae5ab34fd6692
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  9 00:44:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  9 00:49:52 2023 +
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  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 ..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? ( 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 6f02264ee93935653fd926bda80c5250af9f8cdf
Author: Sam James  gentoo  org>
AuthorDate: Wed Aug  2 21:05:36 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug  2 21:05:36 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 3f5fcadba7d991e71cfa8a960497a517435ef85b
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 15 06:08:13 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 15 06:08:13 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 77e1b24da973161ad8240975d0d5cf1f13d5170c
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul 15 03:08:09 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul 15 03:10:07 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Arthur Zamarin]

commit: a4c45f0dea9fad84e91e730b68174dce37d753b0
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jul 14 18:37:58 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jul 14 18:37:58 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Arthur Zamarin]

commit: c8b3991af801f52a73e2e49c81b2b383254f69c1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jul 14 17:07:37 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jul 14 17:07:37 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Arthur Zamarin]

commit: 0b35d15c02d25456e65d19281279e7cdece298b1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jul 14 15:07:25 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jul 14 15:07:25 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 47e7fae47a59bea9b1cd11a21396ca3295af80ac
Author: Sam James  gentoo  org>
AuthorDate: Sat Jun  3 01:57:02 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jun  3 01:57:02 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/, net-ftp/proftpd/

[Sam James]

commit: 278b1e2a39273b072681f15b75fa6e9ee17030ab
Author: Sam James  gentoo  org>
AuthorDate: Sun May  7 07:20:41 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  7 07:21:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278b1e2a

net-ftp/proftpd: fix configure w/ clang 16

Still seeing some suspicious ones so keeping it open for now.

Bug: https://bugs.gentoo.org/881709
Bug: https://bugs.gentoo.org/900066
Signed-off-by: Sam James  gentoo.org>

 .../files/proftpd-1.3.8-configure-clang16.patch| 255 +++
 net-ftp/proftpd/proftpd-1.3.8-r1.ebuild| 275 +
 2 files changed, 530 insertions(+)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.8-configure-clang16.patch 
b/net-ftp/proftpd/files/proftpd-1.3.8-configure-clang16.patch
new file mode 100644
index ..c44fd72262d2
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.8-configure-clang16.patch
@@ -0,0 +1,255 @@
+https://bugs.gentoo.org/881709 (and dupe https://bugs.gentoo.org/900066)
+https://github.com/proftpd/proftpd/pull/1667
+
+From 98e46de3093da71121362d5be4c445a3ef227010 Mon Sep 17 00:00:00 2001
+From: Arjun Shankar 
+Date: Fri, 5 May 2023 15:35:56 +0200
+Subject: [PATCH] configure: Remove several implicit function declarations
+
+During configure, some checks omit the corresponding include. A compiler
+defaulting to C99 mode could cause those checks to fail since C99 does
+not allow implicit function declarations. This commit fixes the same.
+The configure script is re-generated.
+
+Signed-off-by: Arjun Shankar 
+--- a/configure
 b/configure
+@@ -18305,6 +18305,20 @@ _ACEOF
+ fi
+ 
+ 
++for ac_header in stddef.h crypt.h netdb.h arpa/inet.h sys/socket.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" 
"$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
++  cat >>confdefs.h <<_ACEOF
++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++_ACEOF
++
++fi
++
++done
++
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for standalone crypt" >&5
+ $as_echo_n "checking for standalone crypt... " >&6; }
+ if ${pr_cv_lib_standalone_crypt+:} false; then :
+@@ -18313,10 +18327,19 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++  #if HAVE_STDDEF_H
++  # include 
++  #endif
++  #if HAVE_CRYPT_H
++  # include 
++  #endif
++
+ int
+ main ()
+ {
+-crypt();
++
++  crypt(NULL, NULL);
++
+   ;
+   return 0;
+ }
+@@ -18388,10 +18411,19 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++  #if HAVE_STDDEF_H
++  # include 
++  #endif
++  #if HAVE_NETDB_H
++  # include 
++  #endif
++
+ int
+ main ()
+ {
+-gethostbyname();
++
++  gethostbyname(NULL);
++
+   ;
+   return 0;
+ }
+@@ -18508,10 +18540,19 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++  #if HAVE_STDDEF_H
++  # include 
++  #endif
++  #if HAVE_ARPA_INET_H
++  # include 
++  #endif
++
+ int
+ main ()
+ {
+-inet_aton();
++
++  inet_aton(NULL, NULL);
++
+   ;
+   return 0;
+ }
+@@ -18584,10 +18625,16 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++  #if HAVE_NETDB_H
++  # include 
++  #endif
++
+ int
+ main ()
+ {
+-gethostent();
++
++  gethostent();
++
+   ;
+   return 0;
+ }
+@@ -18659,10 +18706,19 @@ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++  #if HAVE_STDDEF_H
++  # include 
++  #endif
++  #if HAVE_SYS_SOCKET_H
++  # include 
++  #endif
++
+ int
+ main ()
+ {
+-bind();
++
++  bind(0, NULL, 0);
++
+   ;
+   return 0;
+ }
+--- a/configure.in
 b/configure.in
+@@ -1476,18 +1476,42 @@ AC_ARG_ENABLE(transfer-buffer-size,
+   ])
+ 
+ dnl Checks for libraries.  Yes, this is the hard way, but it's necessary.
++AC_CHECK_HEADERS(stddef.h crypt.h netdb.h arpa/inet.h sys/socket.h)
++
+ AC_CACHE_CHECK(for standalone crypt,pr_cv_lib_standalone_crypt,
+-  AC_TRY_LINK(,[crypt();],
+-  pr_cv_lib_standalone_crypt="yes", pr_cv_lib_standalone_crypt="no" ))
++  AC_TRY_LINK(
++[
++  #if HAVE_STDDEF_H
++  # include 
++  #endif
++  #if HAVE_CRYPT_H
++  # include 
++  #endif
++],
++[
++  crypt(NULL, NULL);
++],
++pr_cv_lib_standalone_crypt="yes", pr_cv_lib_standalone_crypt="no" ))
+ 
+ if test "$pr_cv_lib_standalone_crypt" = "no"; then
+   AC_CHECK_LIB(crypt, crypt)
+ fi
+ 
+ AC_CACHE_CHECK(for standalone gethostbyname,pr_cv_lib_standalone_gethost,
+-  AC_TRY_LINK(,[gethostbyname();],
+-  pr_cv_lib_standalone_gethost="yes",
+-  pr_cv_lib_standalone_gethost="no" ))
++  AC_TRY_LINK(
++[
++  #if HAVE_STDDEF_H
++  # include 
++  #endif
++  #if HAVE_NETDB_H
++  # include 
++  #endif
++],
++[
++  

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: d2f4f5f7bd6dc677c6e93a4fcd81c28878e176a1
Author: Sam James  gentoo  org>
AuthorDate: Sun May  7 07:16:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May  7 07:21:04 2023 +
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  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..
--- 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:=

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Arthur Zamarin]

commit: f14f0bfdb9cfd462f98eade1c4506e9e6f9a0635
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Feb 26 19:47:58 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Feb 26 19:47:58 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Arthur Zamarin]

commit: 0a65d14c98c58fbe1f133badd077aa53bccf871a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 24 18:11:34 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 24 18:11:34 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Arthur Zamarin]

commit: 7bee710aab052e9887d207b7bdd84289da2264dc
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 24 18:09:35 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 24 18:09:35 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Arthur Zamarin]

commit: 24334cc084cf191f97c0ac6e839ea2ecc360c0c1
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Feb 24 17:10:50 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Feb 24 17:10:50 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 181061ab2b5f7b538bb3dd17b327d2bc4b7acb5f
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 24 16:55:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 24 16:55:38 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: cb0b378d1f4552af409603d1ecdaad87ee2a3593
Author: Sam James  gentoo  org>
AuthorDate: Fri Feb 24 16:55:40 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Feb 24 16:55:40 2023 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/

[Sam James]

commit: 04b8bb73fe4ec83306a5aa6773ad6758422c1a18
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec  4 21:14:43 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec  4 21:14:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04b8bb73

net-ftp/proftpd: add 1.3.8

Closes: https://bugs.gentoo.org/843689
Signed-off-by: Sam James  gentoo.org>

 net-ftp/proftpd/Manifest   |   1 +
 net-ftp/proftpd/files/proftpd.initd-r1 |   2 +-
 net-ftp/proftpd/proftpd-1.3.8.ebuild   | 274 +
 3 files changed, 276 insertions(+), 1 deletion(-)

diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
index 3ec591664228..4561bc0e83b9 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.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

diff --git a/net-ftp/proftpd/files/proftpd.initd-r1 
b/net-ftp/proftpd/files/proftpd.initd-r1
index dcd262bfcbd4..0d59ec5762e8 100644
--- a/net-ftp/proftpd/files/proftpd.initd-r1
+++ b/net-ftp/proftpd/files/proftpd.initd-r1
@@ -15,7 +15,7 @@ check_configuration() {
eerror "file. In /etc/proftpd you can find a sample 
configuration."
return 1
fi
-   /usr/sbin/proftpd -t &>/dev/null
+   /usr/sbin/proftpd -t >/dev/null 2>&1
if [ $? -ne 0 ] ; then
eerror "The ProFTPD configuration file 
/etc/proftpd/proftpd.conf is invalid! You have to"
eerror "fix your configuration in order to run the ProFTPD 
server. For more information"

diff --git a/net-ftp/proftpd/proftpd-1.3.8.ebuild 
b/net-ftp/proftpd/proftpd-1.3.8.ebuild
new file mode 100644
index ..6671985169fb
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.8.ebuild
@@ -0,0 +1,274 @@
+# Copyright 1999-2022 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 )"
+
+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 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Piotr Karbowski]

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

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

Signed-off-by: Piotr Karbowski  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 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   slashbe...@gentoo.org
-   Piotr Karbowski
-   
+   
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.

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/

[Sam James]

commit: 43d6457f839fb1b1a3ef83c2c4214c3b9414613b
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Nov 21 18:17:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 23 01:42:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43d6457f

net-ftp/proftpd: remove unused patches

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28369
Signed-off-by: Sam James  gentoo.org>

 .../proftpd/files/proftpd-1.3.7a-no-ncurses.patch  | 269 -
 .../proftpd/files/proftpd-1.3.7a-slibtool.patch|  34 ---
 .../proftpd/files/proftpd-1.3.7a-tinfow-segv.patch | 197 ---
 3 files changed, 500 deletions(-)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch 
b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch
deleted file mode 100644
index be18a9954590..
--- a/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch
+++ /dev/null
@@ -1,269 +0,0 @@
-https://github.com/proftpd/proftpd/commit/8fc570bc13e771d3ecafe53ab94ada0be2b6646a
-https://bugs.gentoo.org/777531
-
-From 8fc570bc13e771d3ecafe53ab94ada0be2b6646a Mon Sep 17 00:00:00 2001
-From: TJ Saunders 
-Date: Tue, 23 Mar 2021 19:50:49 -0700
-Subject: [PATCH] Issue #1207: Properly honor the `--disable-curses`,
- `--disable-ncurses` configure options.
-

- configure| 156 +++
- configure.in |  39 +
- 2 files changed, 172 insertions(+), 23 deletions(-)
-
-diff --git a/configure b/configure
-index 86cf1360e..59df363fa 100755
 a/configure
-+++ b/configure
-@@ -22970,7 +22970,7 @@ $as_echo "#define SETGRENT_VOID 1" >>confdefs.h
- fi
- 
- 
--if test x"$ac_cv_header_curses_h" = xyes; then
-+if test x"$enable_curses" != xno ; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" 
>&5
- $as_echo_n "checking for initscr in -lcurses... " >&6; }
- if ${ac_cv_lib_curses_initscr+:} false; then :
-@@ -23013,12 +23013,154 @@ if test "x$ac_cv_lib_curses_initscr" = xyes; then :
- $as_echo "#define HAVE_LIBCURSES 1" >>confdefs.h
- 
- 
-+$as_echo "#define PR_USE_CURSES 1" >>confdefs.h
-+
-+
- fi
- 
-+
-+  if test x"$enable_nls" = xyes ; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in 
-ltinfow" >&5
-+$as_echo_n "checking for halfdelay in -ltinfow... " >&6; }
-+if ${ac_cv_lib_tinfow_halfdelay+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltinfow  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char halfdelay ();
-+int
-+main ()
-+{
-+return halfdelay ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_tinfow_halfdelay=yes
-+else
-+  ac_cv_lib_tinfow_halfdelay=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_halfdelay" 
>&5
-+$as_echo "$ac_cv_lib_tinfow_halfdelay" >&6; }
-+if test "x$ac_cv_lib_tinfow_halfdelay" = xyes; then :
-+   UTILS_LIBS="$UTILS_LIBS -ltinfow"
-+
-+$as_echo "#define HAVE_LIBTINFOW 1" >>confdefs.h
-+
-+
-+else
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in 
-ltinfo" >&5
-+$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
-+if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltinfo  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char halfdelay ();
-+int
-+main ()
-+{
-+return halfdelay ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_tinfo_halfdelay=yes
-+else
-+  ac_cv_lib_tinfo_halfdelay=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" 
>&5
-+$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; }
-+if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then :
-+   UTILS_LIBS="$UTILS_LIBS -ltinfo"
-+
-+$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h
-+
-+
-+fi
-+
-+
-+fi
-+
-+  else
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in 
-ltinfo" >&5
-+$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
-+if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
-+  $as_echo_n "(cached) " >&6
-+else

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Piotr Karbowski]

commit: 9c76e439f2bd106d14a0914360f7f7a3f6301235
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Sat Nov 19 15:47:30 2022 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Sat Nov 19 15:47:30 2022 +
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  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 
c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d736894b135a43c8b0ad4170c9215a87e93e56108de889a
-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..
--- 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? ( 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Andreas K. Hüttel]

commit: ca09e2c20cc8facee12e91e680aecb836a966d9f
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Tue May 10 22:55:06 2022 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Tue May 10 22:56:50 2022 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Yixun Lan]

commit: 15c41958f77a74309caffd07ef04c57e97cfb79e
Author: Yixun Lan  gentoo  org>
AuthorDate: Sat Apr 30 05:31:44 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Apr 30 05:32:20 2022 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

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

net-ftp/proftpd: update upstream metadata

Signed-off-by: Sam James  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.


gssmod
-   Castaglia/proftpd-mod_vroot
+   proftpd/proftpd

 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 83e290c67cd8714e0044fa17f79c8e70a393e284
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 23 15:21:10 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 23 15:21:10 2022 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Arthur Zamarin]

commit: 9a1a5d8b33db5cb68b74468b5c1b2bd4b74c195d
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 21 20:27:33 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 21 20:27:33 2022 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Arthur Zamarin]

commit: 564854978986c99c6a8af0a2e8aaae3695a0a830
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jan 21 20:10:53 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jan 21 20:10:53 2022 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 28578519a8414eee4cc8ab23a168054ec2696c8b
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 21 12:40:59 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 21 12:40:59 2022 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Jakov Smolić]

commit: 7baa4b497ad232e700bf4ac8a95a3316c2956abd
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 21 10:03:36 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 21 10:03:36 2022 +
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ć  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Jakov Smolić]

commit: 49089f36336bcd55927b6e2fc8437e251c1427cb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Fri Jan 21 10:03:16 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Fri Jan 21 10:03:16 2022 +
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ć  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[David Seifert]

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

net-ftp/proftpd: remove userland_GNU

Signed-off-by: David Seifert  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}
 }
 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: f971b34468de3f69ada30579159786a22813d741
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 27 04:11:27 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 27 04:11:27 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: c64093d4fe484190506f0e7ef60394ed3b065a32
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 24 04:51:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 04:51:14 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 7f0db9d5e9b89c78f535c9933fbe7941ccbe8e43
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 24 04:50:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 04:50:11 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 1526b889458774b94739d496522d4371dc92a66d
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 24 04:50:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 04:50:14 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 862e48d61ca8853db789c3e4d05820e76d57873a
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 24 02:27:20 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 02:27:20 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: b9480e19f0860033491648dff438a69e88cc0376
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 24 00:18:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 00:18:35 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Piotr Karbowski]

commit: 0431fec0fb98015025f8d95f21fdc8a28d100922
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Mon Oct 18 17:49:22 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Mon Oct 18 17:49:22 2021 +
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  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 
c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d736894b135a43c8b0ad4170c9215a87e93e56108de889a
+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 000..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 )

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Piotr Karbowski]

commit: d5ec9fab9f4157eb6d70de7ee004c67c8452a529
Author: Piotr Karbowski  gentoo  org>
AuthorDate: Mon Oct 18 17:48:05 2021 +
Commit: Piotr Karbowski  gentoo  org>
CommitDate: Mon Oct 18 17:48:05 2021 +
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  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 
c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d736894b135a43c8b0ad4170c9215a87e93e56108de889a
 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 000..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 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 809dd0751a9a47198bca89f53e383a67835112fe
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jul  4 15:22:28 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jul  4 15:24:00 2021 +
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  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 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
-   sly...@gentoo.org
-   Sergei Trofimovich
-   Mostly user.
-   

slashbe...@gentoo.org
Piotr Karbowski

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Piotr Karbowski]

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

net-ftp/proftpd: co-maintain

Signed-off-by: Piotr Karbowski  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 @@
Sergei Trofimovich
Mostly user.

+   
+   slashbe...@gentoo.org
+   Piotr Karbowski
+   
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.

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

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

net-ftp/proftpd: add missing libcrypt dependency

Signed-off-by: Sam James  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 )

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 6576e1bd005a37d682b306d16bb4b91c9728ac7e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jun 15 08:31:50 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jun 15 08:32:00 2021 +
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  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 
c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d736894b135a43c8b0ad4170c9215a87e93e56108de889a
+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 000..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 )
+   

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: a1ab8db85a0e1db820764d0517b71008cd35919f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jun 15 07:15:49 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jun 15 07:15:55 2021 +
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  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 
c25dbd3d5359a41d9f2bc81f130af5c9448000626b27e9e9228efcfdd4c01e109bb19bdb7de46d736894b135a43c8b0ad4170c9215a87e93e56108de889a
 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 000..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 )
+   

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 9968a490fd955032eb3d01617bfa2a224769cd17
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May  9 11:48:41 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May  9 11:53:19 2021 +
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  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..000
--- 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 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: de39265e2a626114ffd9afeade22fc42bd2718f7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat May  1 20:22:49 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat May  1 20:44:23 2021 +
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  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:= )

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/, net-ftp/proftpd/

[Sergei Trofimovich]

commit: 8af307971f9af69a21d9a423650a5db5b9857ed2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Apr 28 21:25:45 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Apr 28 21:25:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af30797

net-ftp/proftpd: backport upstream slibtool workaround

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/778332
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../proftpd/files/proftpd-1.3.7a-slibtool.patch| 34 ++
 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild   |  1 +
 2 files changed, 35 insertions(+)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch 
b/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch
new file mode 100644
index 000..35676777da0
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7a-slibtool.patch
@@ -0,0 +1,34 @@
+https://bugs.gentoo.org/778332
+https://github.com/proftpd/proftpd/commit/4ffe04158840130e023ed3d3e558b8d70e28e20e
+
+From 2a15ce409f70c67ba9b1e09de67c3fca0b38eff8 Mon Sep 17 00:00:00 2001
+From: orbea 
+Date: Sun, 21 Mar 2021 12:38:52 -0700
+Subject: [PATCH] build: Fix linking the static libsupp.a library.
+
+---
+ configure.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/configure.in
 b/configure.in
+@@ -88,7 +88,7 @@ if test $ac_cv_prog_gcc = no -a "$OSTYPE" = "-DHPUX10"; then
+   CFLAGS="$CFLAGS -Ae"
+ fi
+ 
+-LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS"
++LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS"
+ 
+ # AIX has issues with the -rdynamic linker flag.  How many different AIX
+ # versions should we support here?
+--- a/configure
 b/configure
+@@ -14932,7 +14944,7 @@ if test $ac_cv_c_compiler_gnu = no -a "$OSTYPE" = 
"-DHPUX10"; then
+   CFLAGS="$CFLAGS -Ae"
+ fi
+ 
+-LDFLAGS="-L\$(top_srcdir)/lib -L\$(top_builddir)/lib $LDFLAGS"
++LDFLAGS="-Wl,-L\$(top_srcdir)/lib,-L\$(top_builddir)/lib $LDFLAGS"
+ 
+ # AIX has issues with the -rdynamic linker flag.  How many different AIX
+ # versions should we support here?

diff --git a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild 
b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
index 249498784d2..7bef13f65e4 100644
--- a/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild
@@ -72,6 +72,7 @@ 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.

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 382be4d5c129805bfc4bb04862031a2c56644071
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:15:50 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:15:50 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: a31457f285d82aa633d2804cddd41fffa99afa8b
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:14:21 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:14:21 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 9cf45371cf926f0ecc408a74254afd800bc7c35e
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:12:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:12:49 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: f26aaa395ac5f82e55f4489dc7abfe3a95eec1b2
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:10:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:10:48 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 61b7858c76cfbcd7008170738822d6e57c1c47f5
Author: Sam James  gentoo  org>
AuthorDate: Sun Apr 25 05:09:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 25 05:09:35 2021 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/

[Sergei Trofimovich]

commit: 6ef32f28e35c0ab7cf58ad7d11a9530f6447aa7e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Apr 17 20:30:43 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Apr 17 20:30:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ef32f28

net-ftp/proftpd: backport USE=-ncurses fix

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/777531
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../proftpd/files/proftpd-1.3.7a-no-ncurses.patch  | 269 +
 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild   |   1 +
 2 files changed, 270 insertions(+)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch 
b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch
new file mode 100644
index 000..be18a995459
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7a-no-ncurses.patch
@@ -0,0 +1,269 @@
+https://github.com/proftpd/proftpd/commit/8fc570bc13e771d3ecafe53ab94ada0be2b6646a
+https://bugs.gentoo.org/777531
+
+From 8fc570bc13e771d3ecafe53ab94ada0be2b6646a Mon Sep 17 00:00:00 2001
+From: TJ Saunders 
+Date: Tue, 23 Mar 2021 19:50:49 -0700
+Subject: [PATCH] Issue #1207: Properly honor the `--disable-curses`,
+ `--disable-ncurses` configure options.
+
+---
+ configure| 156 +++
+ configure.in |  39 +
+ 2 files changed, 172 insertions(+), 23 deletions(-)
+
+diff --git a/configure b/configure
+index 86cf1360e..59df363fa 100755
+--- a/configure
 b/configure
+@@ -22970,7 +22970,7 @@ $as_echo "#define SETGRENT_VOID 1" >>confdefs.h
+ fi
+ 
+ 
+-if test x"$ac_cv_header_curses_h" = xyes; then
++if test x"$enable_curses" != xno ; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for initscr in -lcurses" 
>&5
+ $as_echo_n "checking for initscr in -lcurses... " >&6; }
+ if ${ac_cv_lib_curses_initscr+:} false; then :
+@@ -23013,12 +23013,154 @@ if test "x$ac_cv_lib_curses_initscr" = xyes; then :
+ $as_echo "#define HAVE_LIBCURSES 1" >>confdefs.h
+ 
+ 
++$as_echo "#define PR_USE_CURSES 1" >>confdefs.h
++
++
+ fi
+ 
++
++  if test x"$enable_nls" = xyes ; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in 
-ltinfow" >&5
++$as_echo_n "checking for halfdelay in -ltinfow... " >&6; }
++if ${ac_cv_lib_tinfow_halfdelay+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfow  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char halfdelay ();
++int
++main ()
++{
++return halfdelay ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_tinfow_halfdelay=yes
++else
++  ac_cv_lib_tinfow_halfdelay=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_halfdelay" 
>&5
++$as_echo "$ac_cv_lib_tinfow_halfdelay" >&6; }
++if test "x$ac_cv_lib_tinfow_halfdelay" = xyes; then :
++   UTILS_LIBS="$UTILS_LIBS -ltinfow"
++
++$as_echo "#define HAVE_LIBTINFOW 1" >>confdefs.h
++
++
++else
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in 
-ltinfo" >&5
++$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
++if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfo  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char halfdelay ();
++int
++main ()
++{
++return halfdelay ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_tinfo_halfdelay=yes
++else
++  ac_cv_lib_tinfo_halfdelay=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" 
>&5
++$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; }
++if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then :
++   UTILS_LIBS="$UTILS_LIBS -ltinfo"
++
++$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h
++
++
++fi
++
++
++fi
++
++  else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in 
-ltinfo" >&5
++$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
++if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfo  $LIBS"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/, net-ftp/proftpd/

[Sergei Trofimovich]

commit: 610d1127a422e8efb8869e9bcb83982ce04d3a2d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Mar 21 09:41:34 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Mar 21 09:45:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=610d1127

net-ftp/proftpd: fix tinfo/tinfow mix crash

Picked upstream commit as is.

Reported-by: Sam James
Closes: https://bugs.gentoo.org/777432
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../proftpd/files/proftpd-1.3.7a-tinfow-segv.patch | 197 +++
 net-ftp/proftpd/proftpd-1.3.7a-r1.ebuild   | 276 +
 2 files changed, 473 insertions(+)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch 
b/net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch
new file mode 100644
index 000..b904c5dbe5a
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7a-tinfow-segv.patch
@@ -0,0 +1,197 @@
+https://github.com/proftpd/proftpd/commit/ff413723328da726d1042c7d2067d088765eca57
+https://bugs.gentoo.org/777432
+
+From ff413723328da726d1042c7d2067d088765eca57 Mon Sep 17 00:00:00 2001
+From: TJ Saunders 
+Date: Sun, 14 Mar 2021 10:08:02 -0700
+Subject: [PATCH] Issue #1174: Check for the libtinfow library when ncursesw is
+ being used.
+
+On some systems, such as Gentoo, linking against libtinfo with libncursesw,
+rather than libtinfow, leads to segfaults.
+---
+ config.h.in  |  3 ++
+ configure| 98 +---
+ configure.in | 24 +
+ 3 files changed, 114 insertions(+), 11 deletions(-)
+
+diff --git a/config.h.in b/config.h.in
+index 1ba33caf9..775b7a294 100644
+--- a/config.h.in
 b/config.h.in
+@@ -966,6 +966,9 @@
+ /* Define if you have the libtinfo library (-ltinfo).  */
+ #undef HAVE_LIBTINFO
+ 
++/* Define if you have the libtinfow library (-ltinfow).  */
++#undef HAVE_LIBTINFOW
++
+ /* Define if you have the addrinfo struct.  */
+ #undef HAVE_STRUCT_ADDRINFO
+ 
+diff --git a/configure b/configure
+index 64080483f..86cf1360e 100755
+--- a/configure
 b/configure
+@@ -23169,18 +23169,106 @@ $as_echo "#define PR_USE_CURSES 1" >>confdefs.h
+ fi
+ 
+ if test x"$enable_ncurses" != xno ; then
++
+   if test x"$pr_have_ncursesw" = xyes ; then
+ 
+ $as_echo "#define PR_USE_NCURSESW 1" >>confdefs.h
+ 
+-  else
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in 
-ltinfow" >&5
++$as_echo_n "checking for halfdelay in -ltinfow... " >&6; }
++if ${ac_cv_lib_tinfow_halfdelay+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfow  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+-$as_echo "#define PR_USE_NCURSES 1" >>confdefs.h
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char halfdelay ();
++int
++main ()
++{
++return halfdelay ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_tinfow_halfdelay=yes
++else
++  ac_cv_lib_tinfow_halfdelay=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfow_halfdelay" 
>&5
++$as_echo "$ac_cv_lib_tinfow_halfdelay" >&6; }
++if test "x$ac_cv_lib_tinfow_halfdelay" = xyes; then :
++   UTILS_LIBS="$UTILS_LIBS -ltinfow"
+ 
+-  fi
++$as_echo "#define HAVE_LIBTINFOW 1" >>confdefs.h
++
++
++else
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in 
-ltinfo" >&5
++$as_echo_n "checking for halfdelay in -ltinfo... " >&6; }
++if ${ac_cv_lib_tinfo_halfdelay+:} false; then :
++  $as_echo_n "(cached) " >&6
++else
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ltinfo  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char halfdelay ();
++int
++main ()
++{
++return halfdelay ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_tinfo_halfdelay=yes
++else
++  ac_cv_lib_tinfo_halfdelay=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinfo_halfdelay" 
>&5
++$as_echo "$ac_cv_lib_tinfo_halfdelay" >&6; }
++if test "x$ac_cv_lib_tinfo_halfdelay" = xyes; then :
++   UTILS_LIBS="$UTILS_LIBS -ltinfo"
++
++$as_echo "#define HAVE_LIBTINFO 1" >>confdefs.h
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for halfdelay in -ltinfo" 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[David Seifert]

commit: c4fb816eb24c8ede92902cdee0d7e20bc246d847
Author: Theo Anderson  posteo  de>
AuthorDate: Sun Mar  7 11:57:08 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Mar  7 11:57:08 2021 +
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  posteo.de>
Signed-off-by: David Seifert  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() {

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/

[Sergei Trofimovich]

commit: 9fc8c26fc287389eebef240d4c3418ea67821dc8
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Sep 16 17:19:48 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Sep 17 06:58:46 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc8c26f

net-ftp/proftpd: remove unused patches

Package-Manager: Portage-3.0.6, Repoman-3.0.1
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17568
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch| 38 ---
 .../files/proftpd-1.3.7_rc4-str-sentinel.patch | 43 --
 2 files changed, 81 deletions(-)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch 
b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch
deleted file mode 100644
index 2f50a28b87f..000
--- a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://github.com/proftpd/proftpd/issues/1027
-https://bugs.gentoo.org/726460
-
-From 6ac1c727ddfd70080b38097e5484390ec84ef9be Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich 
-Date: Sun, 31 May 2020 17:55:08 +0100
-Subject: [PATCH 1/2] contrib/mod_ldap.c: fix SIGSEGV in mod_ldap:ldap_mod_init
- ()
-
-The crash happens due to missing sentinel value in `pstrcat()`
-
-```c
-   feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "",
- api_info.ldapai_extensions[i]);
-```
-
-The change is to add sentinel to `pstrcat()` call.
-
-Bug: https://github.com/proftpd/proftpd/issues/1027
-Signed-off-by: Sergei Trofimovich 

- contrib/mod_ldap.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 a/contrib/mod_ldap.c
-+++ b/contrib/mod_ldap.c
-@@ -3218,7 +3218,7 @@ static int ldap_mod_init(void) {
- 
- for (i = 0; api_info.ldapai_extensions[i]; i++) {
-   feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "",
--api_info.ldapai_extensions[i]);
-+api_info.ldapai_extensions[i], NULL);
-   ldap_memfree(api_info.ldapai_extensions[i]);
- }
- 
--- 
-2.26.2
-

diff --git a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch 
b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch
deleted file mode 100644
index cf1e4e91d41..000
--- a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://github.com/proftpd/proftpd/issues/1027
-https://bugs.gentoo.org/726460
-
-From c5f98b6e047e0e5ca841372d78d06c05fe8770c6 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich 
-Date: Sun, 31 May 2020 18:03:29 +0100
-Subject: [PATCH 2/2] include/str.h: add __attribute__((sentinel)) to variadic
- concats
-
-`pstrcat()` needs to always have literal trailing `NULL`.
-
-Bug: https://github.com/proftpd/proftpd/issues/1027
-Signed-off-by: Sergei Trofimovich 

- include/str.h | 14 --
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
 a/include/str.h
-+++ b/include/str.h
-@@ -39,8 +39,18 @@ const char *quote_dir(pool *p, char *dir);
- char *sstrcat(char *, const char *, size_t);
- const char *sreplace(pool *, const char *, ...);
- 
--char *pdircat(pool *, ...);
--char *pstrcat(pool *, ...);
-+char *pdircat(pool *, ...)
-+#ifdef __GNUC__
-+  __attribute__ ((sentinel));
-+#else
-+  ;
-+#endif
-+char *pstrcat(pool *, ...)
-+#ifdef __GNUC__
-+  __attribute__ ((sentinel));
-+#else
-+  ;
-+#endif
- char *pstrdup(pool *, const char *);
- char *pstrndup(pool *, const char *, size_t);
- 
--- 
-2.26.2
-

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 6e34b2123f7d2fa2d3c09c422e0ccae037b58353
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Sep  7 20:45:21 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Sep  7 20:46:52 2020 +
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  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..000
--- 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 )
-   

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 3ba4406de690fee52d68b828dd8900034cfee21d
Author: Sam James  gentoo  org>
AuthorDate: Tue Sep  1 20:13:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep  1 20:13:26 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: a5b23055b3691fe54add0016229e97823f7aa827
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 31 01:22:09 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 31 01:22:09 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Thomas Deutschmann]

commit: 3a7a0aaa922e8157b0e34b6ef58ef2e6cf717107
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sat Aug 29 17:50:34 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Aug 29 17:56:53 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 89f008cf3709af2ce6ecbea7c53ef041285b164c
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Aug 24 15:32:56 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Aug 24 17:33:00 2020 +
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  sf-mail.de>
Signed-off-by: Sergei Trofimovich  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/

[Sergei Trofimovich]

commit: 34117b5bad608bd2630011008d281b9a5f4ae3f9
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Jul 27 12:07:17 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul 27 18:17:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34117b5b

net-ftp/proftpd: remove unused patch

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16854
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch | 21 -
 1 file changed, 21 deletions(-)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch 
b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch
deleted file mode 100644
index c3ee704c085..000
--- a/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch
+++ /dev/null
@@ -1,21 +0,0 @@
 a/contrib/mod_quotatab.c
-+++ b/contrib/mod_quotatab.c
-@@ -50,6 +50,7 @@ typedef struct regtab_obj {
- module quotatab_module;
- 
- /* Quota objects for the current session */
-+quota_deltas_t quotatab_deltas;
- static quota_table_t *limit_tab = NULL;
- static quota_limit_t sess_limit;
- 
 a/contrib/mod_quotatab.h
-+++ b/contrib/mod_quotatab.h
-@@ -188,7 +188,7 @@ typedef struct table_obj {
- #define QUOTATAB_TALLY_SRC  0x0002
- 
- /* Quota objects for the current session. */
--quota_deltas_t quotatab_deltas;
-+extern quota_deltas_t quotatab_deltas;
- 
- /* Function prototypes necessary for quotatab sub-modules */
- int quotatab_log(const char *, ...)

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: c1d503aae98aec52229ef9356a8d9c9cd596c7d0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul 25 09:16:21 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 25 09:18:15 2020 +
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  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..000
--- 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? ( 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 931ba0027e9147bb1c40346d49718518195a105b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jul 21 18:15:05 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul 21 18:17:49 2020 +
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  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 000..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 )
+   

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 45ede61f0633d467b0db2af5b224a52f8320cdcb
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jul 21 18:15:37 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul 21 18:17:50 2020 +
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  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..000
--- 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 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: f696442ef121d976168fed565b7e76cb4c6ab5a6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jul 21 07:16:01 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul 21 07:16:18 2020 +
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  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 000..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? ( 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sam James]

commit: 6c40023fa8ab67c4e8dbf977f52c9de33fb726f2
Author: Sam James  gentoo  org>
AuthorDate: Wed Jul  8 19:46:18 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jul  8 19:46:46 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 1270cab8b4925e3e2450ddabc11c0bf3745c3be6
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Jul  7 05:21:36 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul  7 06:57:53 2020 +
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  sf-mail.de>
Signed-off-by: Sergei Trofimovich  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 79a24702a9b7b8bb7064e0ffea5ded0c0899834d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jul  6 07:16:19 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul  6 07:16:19 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 88c0f40485cacc357530217cdf58fb9457d1fdad
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jul  6 06:58:28 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jul  6 07:02:30 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: e257b4fa876f22572f7078f9b2d413fb95844f36
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jun 20 19:40:25 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jun 20 19:49:02 2020 +
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  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..000
--- 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
-
-   

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/

[Aaron Bauman]

commit: fd862667ade70bddaf4dff9cd313a990f47d4bba
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jun 17 14:16:49 2020 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Jun 17 17:49:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd862667

net-ftp/proftpd: remove unused patch

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16296
Signed-off-by: Aaron Bauman  gentoo.org>

 .../files/proftpd-1.3.6a-fix-libcheck.patch| 28 --
 1 file changed, 28 deletions(-)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch 
b/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch
deleted file mode 100644
index 93752c43e92..000
--- a/net-ftp/proftpd/files/proftpd-1.3.6a-fix-libcheck.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Fix test suite detection.
-
-https://github.com/proftpd/proftpd/pull/839
-
-Reported-by: Toralf Förster
-Bug: https://bugs.gentoo.org/697782
 a/configure.in
-+++ b/configure.in
-@@ -991,7 +991,7 @@ AC_ARG_ENABLE(tests,
- [enable unit tests (default=no)])
-   ],
-   [
--if test "$enableval" != xno ; then
-+if test x"$enableval" != xno ; then
-   AC_CHECK_HEADERS(check.h)
- 
-   AC_CHECK_LIB(check, tcase_create,
 a/configure
-+++ b/configure
-@@ -20639,7 +20639,7 @@ ENABLE_TESTS="\"\""
- # Check whether --enable-tests was given.
- if test "${enable_tests+set}" = set; then
-   enableval=$enable_tests;
--if test "$enableval" != xno ; then
-+if test x"$enableval" != xno ; then
- 
- for ac_header in check.h
- do

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/, net-ftp/proftpd/

[Sergei Trofimovich]

commit: f676fd7463f36c8a9860677295731fc2f3e93460
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 31 17:15:07 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 31 17:17:40 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f676fd74

net-ftp/proftpd: fix mod_ldap SIGSEGV

Closes: https://bugs.gentoo.org/726460
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch|  38 +++
 .../files/proftpd-1.3.7_rc4-str-sentinel.patch |  43 
 net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild| 277 +
 3 files changed, 358 insertions(+)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch 
b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch
new file mode 100644
index 000..2f50a28b87f
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-ldap_mod-SEGV.patch
@@ -0,0 +1,38 @@
+https://github.com/proftpd/proftpd/issues/1027
+https://bugs.gentoo.org/726460
+
+From 6ac1c727ddfd70080b38097e5484390ec84ef9be Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich 
+Date: Sun, 31 May 2020 17:55:08 +0100
+Subject: [PATCH 1/2] contrib/mod_ldap.c: fix SIGSEGV in mod_ldap:ldap_mod_init
+ ()
+
+The crash happens due to missing sentinel value in `pstrcat()`
+
+```c
+   feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "",
+ api_info.ldapai_extensions[i]);
+```
+
+The change is to add sentinel to `pstrcat()` call.
+
+Bug: https://github.com/proftpd/proftpd/issues/1027
+Signed-off-by: Sergei Trofimovich 
+---
+ contrib/mod_ldap.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/contrib/mod_ldap.c
 b/contrib/mod_ldap.c
+@@ -3218,7 +3218,7 @@ static int ldap_mod_init(void) {
+ 
+ for (i = 0; api_info.ldapai_extensions[i]; i++) {
+   feats = pstrcat(tmp_pool, feats, i != 0 ? ", " : "",
+-api_info.ldapai_extensions[i]);
++api_info.ldapai_extensions[i], NULL);
+   ldap_memfree(api_info.ldapai_extensions[i]);
+ }
+ 
+-- 
+2.26.2
+

diff --git a/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch 
b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch
new file mode 100644
index 000..cf1e4e91d41
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.7_rc4-str-sentinel.patch
@@ -0,0 +1,43 @@
+https://github.com/proftpd/proftpd/issues/1027
+https://bugs.gentoo.org/726460
+
+From c5f98b6e047e0e5ca841372d78d06c05fe8770c6 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich 
+Date: Sun, 31 May 2020 18:03:29 +0100
+Subject: [PATCH 2/2] include/str.h: add __attribute__((sentinel)) to variadic
+ concats
+
+`pstrcat()` needs to always have literal trailing `NULL`.
+
+Bug: https://github.com/proftpd/proftpd/issues/1027
+Signed-off-by: Sergei Trofimovich 
+---
+ include/str.h | 14 --
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+--- a/include/str.h
 b/include/str.h
+@@ -39,8 +39,18 @@ const char *quote_dir(pool *p, char *dir);
+ char *sstrcat(char *, const char *, size_t);
+ const char *sreplace(pool *, const char *, ...);
+ 
+-char *pdircat(pool *, ...);
+-char *pstrcat(pool *, ...);
++char *pdircat(pool *, ...)
++#ifdef __GNUC__
++  __attribute__ ((sentinel));
++#else
++  ;
++#endif
++char *pstrcat(pool *, ...)
++#ifdef __GNUC__
++  __attribute__ ((sentinel));
++#else
++  ;
++#endif
+ char *pstrdup(pool *, const char *);
+ char *pstrndup(pool *, const char *, size_t);
+ 
+-- 
+2.26.2
+

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild 
b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
new file mode 100644
index 000..9f1b1ca53ed
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
@@ -0,0 +1,277 @@
+# 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 )"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 59a0aa9bb1a306346250c4b30fbe937f197218bc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 31 17:16:18 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 31 17:17:40 2020 +
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  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..000
--- 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 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: b849e9cfe9ff234a0dc8d161620be7a1b0704953
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May 31 11:36:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 31 11:36:29 2020 +
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  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 000..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 )
+   

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/, net-ftp/proftpd/files/

[Sergei Trofimovich]

commit: 50c17a9aebd91f823703f4843b16129a0b2346ea
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri May 29 22:31:54 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri May 29 22:36:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50c17a9a

net-ftp/proftpd: move from /var/run to /run, bug #672292

While at it plumbed $CC handling.

Reported-by: Louis Sautier
Closes: https://bugs.gentoo.org/672292
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-ftp/proftpd/files/proftpd-tmpfiles.d.conf-r1 |   1 +
 net-ftp/proftpd/files/proftpd.initd-r1   |  51 +
 net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild  | 276 +++
 3 files changed, 328 insertions(+)

diff --git a/net-ftp/proftpd/files/proftpd-tmpfiles.d.conf-r1 
b/net-ftp/proftpd/files/proftpd-tmpfiles.d.conf-r1
new file mode 100644
index 000..241dc7cb1bd
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-tmpfiles.d.conf-r1
@@ -0,0 +1 @@
+d /run/proftpd 0755 root root

diff --git a/net-ftp/proftpd/files/proftpd.initd-r1 
b/net-ftp/proftpd/files/proftpd.initd-r1
new file mode 100644
index 000..dcd262bfcbd
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd.initd-r1
@@ -0,0 +1,51 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+extra_started_commands="reload"
+
+depend() {
+   need net
+   use logger dns mysql postgresql antivirus
+}
+
+check_configuration() {
+   if [ ! -e /etc/proftpd/proftpd.conf ] ; then
+   eerror "To execute the ProFTPD server you need a 
/etc/proftpd/proftpd.conf configuration"
+   eerror "file. In /etc/proftpd you can find a sample 
configuration."
+   return 1
+   fi
+   /usr/sbin/proftpd -t &>/dev/null
+   if [ $? -ne 0 ] ; then
+   eerror "The ProFTPD configuration file 
/etc/proftpd/proftpd.conf is invalid! You have to"
+   eerror "fix your configuration in order to run the ProFTPD 
server. For more information"
+   eerror "you may execute the ProFTPD configuration check 
'/usr/sbin/proftpd -t'."
+   return 2
+   fi
+}
+
+start() {
+   checkpath -d /run/proftpd
+   [ "${RC_CMD}" = "restart" ] || check_configuration || return 1
+   ebegin "Starting ProFTPD"
+   start-stop-daemon --start --quiet \
+   --exec /usr/sbin/proftpd \
+   --pidfile /run/proftpd/proftpd.pid
+   eend $?
+}
+
+stop() {
+   [ "${RC_CMD}" != "restart" ] || check_configuration || return 1
+   ebegin "Stopping ProFTPD"
+   start-stop-daemon --stop --quiet --retry 20 \
+   --pidfile /run/proftpd/proftpd.pid
+   eend $?
+}
+
+reload() {
+   check_configuration || return 1
+   ebegin "Reloading ProFTPD"
+   start-stop-daemon --quiet --signal HUP \
+   --pidfile /run/proftpd/proftpd.pid
+   eend $?
+}

diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild 
b/net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild
new file mode 100644
index 000..af107f0bd6e
--- /dev/null
+++ b/net-ftp/proftpd/proftpd-1.3.7_rc3-r1.ebuild
@@ -0,0 +1,276 @@
+# 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 )
+  

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: b4f3dedaefc532b12e9cf81f43a54ef3cc4b3c71
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat May  2 17:38:29 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat May  2 17:51:22 2020 +
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  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..000
--- 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 )
-   

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/

[Sergei Trofimovich]

commit: fb7a94f47941261c9b69aca5759478060cf704b8
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sat Apr 18 16:56:52 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Apr 18 21:31:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb7a94f4

net-ftp/proftpd: remove unused patches

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 .../files/proftpd-1.3.6-EINTR-like-EAGAIN.patch| 54 
 net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch | 96 --
 net-ftp/proftpd/files/proftpd-1.3.6-mysql-8.patch  | 24 --
 .../proftpd/files/proftpd-1.3.6-sighup-crash.patch | 81 --
 .../files/proftpd-1.3.6b-tls-crl-crash.patch   | 40 -
 5 files changed, 295 deletions(-)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch 
b/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch
deleted file mode 100644
index 43608d96492..000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-EINTR-like-EAGAIN.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-https://bugs.gentoo.org/695972
-https://github.com/proftpd/proftpd/commit/f09f0c661621eb22cb1ce579194478007ba62866
-
-From f09f0c661621eb22cb1ce579194478007ba62866 Mon Sep 17 00:00:00 2001
-From: Justin Maggard 
-Date: Tue, 10 Oct 2017 18:20:06 -0700
-Subject: [PATCH] Bug #4319: Treat EINTR like EAGAIN
-
-This bug described a situation where an ongoing transfer would be
-prematurely aborted when one of our timers fired.  The timer could have
-fired for an unrelated reason, but if we were in the process of reading
-or writing with pr_netio_read() or pr_netio_write(), those calls would
-be interrupted with errno set to EINTR, and an error would be returned.
-Then pr_data_xfer() would abort the transfer.
-
-EAGAIN was already being handled properly, and we can just use the same
-treatment for EINTR so that we only respond to the timers we should
-actually care about.

- src/data.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
 a/src/data.c
-+++ b/src/data.c
-@@ -1143,7 +1143,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
- while (len < 0) {
-   int xerrno = errno;
-  
--  if (xerrno == EAGAIN) {
-+  if (xerrno == EAGAIN || xerrno == EINTR) {
- /* Since our socket is in non-blocking mode, read(2) can return
-  * EAGAIN if there is no data yet for us.  Handle this by
-  * delaying temporarily, then trying again.
-@@ -1265,7 +1265,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
-   while (len < 0) {
- int xerrno = errno;
- 
--if (xerrno == EAGAIN) {
-+if (xerrno == EAGAIN || xerrno == EINTR) {
-   /* Since our socket is in non-blocking mode, read(2) can return
-* EAGAIN if there is no data yet for us.  Handle this by
-* delaying temporarily, then trying again.
-@@ -1362,7 +1362,7 @@ int pr_data_xfer(char *cl_buf, size_t cl_size) {
-   while (bwrote < 0) {
- int xerrno = errno;
- 
--if (xerrno == EAGAIN) {
-+if (xerrno == EAGAIN || xerrno == EINTR) {
-   /* Since our socket is in non-blocking mode, write(2) can return
-* EAGAIN if there is not enough from for our data yet.  Handle
-* this by delaying temporarily, then trying again.
--- 
-2.23.0
-

diff --git a/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch 
b/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch
deleted file mode 100644
index 40d912eb2b5..000
--- a/net-ftp/proftpd/files/proftpd-1.3.6-mod_copy.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-https://bugs.gentoo.org/690528
-CVE-2019-12815
-
-From a73dbfe3b61459e7c2806d5162b12f0957990cb3 Mon Sep 17 00:00:00 2001
-From: TJ Saunders 
-Date: Wed, 17 Jul 2019 09:48:39 -0700
-Subject: [PATCH] Backport of fix for Bug#4372 to the 1.3.6 branch.
-

- NEWS   |  1 +
- contrib/mod_copy.c | 36 +---
- 2 files changed, 34 insertions(+), 3 deletions(-)
-
 a/contrib/mod_copy.c
-+++ b/contrib/mod_copy.c
-@@ -1,7 +1,7 @@
- /*
-  * ProFTPD: mod_copy -- a module supporting copying of files on the server
-  *  without transferring the data to the client and back
-- * Copyright (c) 2009-2016 TJ Saunders
-+ * Copyright (c) 2009-2019 TJ Saunders
-  *
-  * This program is free software; you can redistribute it and/or modify
-  * it under the terms of the GNU General Public License as published by
-@@ -657,7 +657,7 @@ MODRET copy_copy(cmd_rec *cmd) {
- MODRET copy_cpfr(cmd_rec *cmd) {
-   register unsigned int i;
-   int res;
--  char *path = "";
-+  char *cmd_name, *path = "";
-   unsigned char *authenticated = NULL;
- 
-   if (copy_engine == FALSE) {
-@@ -705,6 +705,21 @@ MODRET copy_cpfr(cmd_rec *cmd) {
- path = pstrcat(cmd->tmp_pool, path, *path ? " " : "", decoded_path, 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: c5ec17f53a62dd28aff24f66eeb95e3d67a5a0df
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 13 14:53:09 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 13 14:53:09 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: 97661710d0bff13843107bebfe0ca6c2d55a97b0
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 13 10:18:59 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 13 10:18:59 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: 9d1a63c3f5d626853913557f27afdd7e7d8e22bf
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 13 10:17:36 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 13 10:17:36 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: de4694847762ed055a973d7f835049eefd066ea5
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 13 10:16:18 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 13 10:16:18 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: 7be4dbc4e74ce2b6683630ce0eb3d4b6b7e10a68
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 13 10:14:34 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 13 10:14:34 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: a553687531b852d314d8ef76a7d9b90344d86dad
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Apr 13 09:56:58 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Apr 13 09:56:58 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 89d50aff244ae40d8ff5ecef9ebb8988af3c68c4
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Mar 31 16:48:36 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Mar 31 18:01:22 2020 +
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  sf-mail.de>
Signed-off-by: Sergei Trofimovich  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

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

net-ftp/proftpd: drop https://bugs.gentoo.org/710730
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Sergei Trofimovich  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..000
--- 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= )
-   

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: aa92ebd5dc499492d95f343a7f1a49526898ed9f
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Mar 18 16:58:20 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Mar 18 17:58:12 2020 +
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  sf-mail.de>
Signed-off-by: Sergei Trofimovich  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: 95b8db9a12ef56c76312ead8cebac2e4612a782c
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar 18 15:22:04 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar 18 15:22:04 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: 5345d0f6e1d3b3ad15884a66c175ac0497837919
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar 18 11:13:24 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar 18 11:13:24 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: bc6c6bbb5d86e95584f7751c55a79022c89fdd1f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar 18 11:10:57 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar 18 11:10:57 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: 8c2f45001b198e91a9515eb77f999f6e167eaebe
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar 18 09:55:38 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar 18 09:55:38 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: d0c89975e7e7199d58abe4a954bb35be1a0d6eef
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Mar 18 09:45:36 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Mar 18 09:45:36 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Agostino Sarubbo]

commit: c9ed9538fd67ac9681d81f823e7d9811dbf458a7
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Mar 17 18:43:58 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Mar 17 18:44:22 2020 +
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  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 50fa9b20c56aa59ef36601f7daa696a341c1f347
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Mar 16 17:05:40 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 16 18:25:14 2020 +
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  sf-mail.de>
Signed-off-by: Sergei Trofimovich  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"

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 47f2f61b980efab9ea9412db2aa484e51f0c5b2e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Mar  5 23:39:19 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Mar  5 23:39:19 2020 +
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  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 000..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 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/files/, net-ftp/proftpd/

[Sergei Trofimovich]

commit: 3153e9afab90ac5741c621bad7e6c39c72764181
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar  2 23:40:18 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar  2 23:40:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3153e9af

net-ftp/proftpd: tweak for gcc-10

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch | 21 +
 net-ftp/proftpd/proftpd-1.3.6c.ebuild |  1 +
 2 files changed, 22 insertions(+)

diff --git a/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch 
b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch
new file mode 100644
index 000..c3ee704c085
--- /dev/null
+++ b/net-ftp/proftpd/files/proftpd-1.3.6c-gcc-10.patch
@@ -0,0 +1,21 @@
+--- a/contrib/mod_quotatab.c
 b/contrib/mod_quotatab.c
+@@ -50,6 +50,7 @@ typedef struct regtab_obj {
+ module quotatab_module;
+ 
+ /* Quota objects for the current session */
++quota_deltas_t quotatab_deltas;
+ static quota_table_t *limit_tab = NULL;
+ static quota_limit_t sess_limit;
+ 
+--- a/contrib/mod_quotatab.h
 b/contrib/mod_quotatab.h
+@@ -188,7 +188,7 @@ typedef struct table_obj {
+ #define QUOTATAB_TALLY_SRC  0x0002
+ 
+ /* Quota objects for the current session. */
+-quota_deltas_t quotatab_deltas;
++extern quota_deltas_t quotatab_deltas;
+ 
+ /* Function prototypes necessary for quotatab sub-modules */
+ int quotatab_log(const char *, ...)

diff --git a/net-ftp/proftpd/proftpd-1.3.6c.ebuild 
b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
index 5c8f9eb610d..d2441f41e29 100644
--- a/net-ftp/proftpd/proftpd-1.3.6c.ebuild
+++ b/net-ftp/proftpd/proftpd-1.3.6c.ebuild
@@ -71,6 +71,7 @@ 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

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: bfa4622ef7d68e3fb14fc62e84d9ad549338373d
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Feb 25 08:39:33 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb 25 08:39:51 2020 +
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  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 000..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? ( 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 6d2c4b042dcad5191ae02f4e178702be41f8c420
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Feb 12 20:31:44 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Feb 12 20:32:51 2020 +
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  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 
1ae03873e263552d9d5b49eb8a3f348165d52c055b5420b6a152c3ca204532436cdaa74d474187c49bb3e647e2e86086a9c59acf7f99108bbbe185e44511
 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..000
--- 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 

[gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/

[Sergei Trofimovich]

commit: 27c34c4a336e214fc7a202a36ef98f741ef066c2
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Feb 12 19:50:57 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Feb 12 19:57:29 2020 +
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  sf-mail.de>
Signed-off-by: Sergei Trofimovich  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"