public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2018-09-15 19:40 Mikle Kolyada
  0 siblings, 0 replies; 30+ messages in thread
From: Mikle Kolyada @ 2018-09-15 19:40 UTC (permalink / raw
  To: gentoo-commits

commit:     823d5029bc535c5f41382ae8afb9b452852da756
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 15 19:36:45 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Sep 15 19:39:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=823d5029

net-ftp/vsftpd: mark stable wrt bug #659326

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 87e6ab6d710..b821c334513 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2022-08-25 18:17 Arthur Zamarin
  0 siblings, 0 replies; 30+ messages in thread
From: Arthur Zamarin @ 2022-08-25 18:17 UTC (permalink / raw
  To: gentoo-commits

commit:     67a66bf850775f52d519da9324daebedb42a5838
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 25 18:17:35 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Thu Aug 25 18:17:35 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a66bf8

net-ftp/vsftpd: Keyword 3.0.5-r1 arm64, #866539

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

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

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 2c78311a5560..ec384ca35cfe 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="


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

commit:     0e4ff310b102831c896b4b5855c793c59b5764ff
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  2 08:03:34 2022 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Wed Feb  2 08:03:34 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4ff310

net-ftp/vsftpd: sparc stable wrt bug #828484

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

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

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 81abc20bff0d..2c78311a5560 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="


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

commit:     e95125101bc362a0f7faf33799f27a87b7b63874
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  2 00:07:40 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb  2 00:07:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9512510

net-ftp/vsftpd: Stabilize 3.0.5-r1 x86, #828484

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

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

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 42443b775d2e..81abc20bff0d 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2022-02-01  5:57 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2022-02-01  5:57 UTC (permalink / raw
  To: gentoo-commits

commit:     08b1b357c6a1ce2c92eefeb5aef5435acef3681e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 05:57:16 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 05:57:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08b1b357

net-ftp/vsftpd: Stabilize 3.0.5-r1 arm, #828484

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

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

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 16e87aa4b058..42443b775d2e 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2022-02-01  5:19 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2022-02-01  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     55b53f233c57b66a0a7a85d11740059fbe4bf762
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 05:18:59 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 05:18:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b53f23

net-ftp/vsftpd: Stabilize 3.0.5-r1 ppc64, #828484

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

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

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 917794413ef3..cf5e2b4d13d6 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2022-02-01  5:19 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2022-02-01  5:19 UTC (permalink / raw
  To: gentoo-commits

commit:     cdd2389c64c70dc2eb7a4cce07c6406924b9dd15
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 05:19:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 05:19:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdd2389c

net-ftp/vsftpd: Stabilize 3.0.5-r1 ppc, #828484

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

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

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index cf5e2b4d13d6..16e87aa4b058 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2022-02-01  5:17 Sam James
  0 siblings, 0 replies; 30+ messages in thread
From: Sam James @ 2022-02-01  5:17 UTC (permalink / raw
  To: gentoo-commits

commit:     de0e31c77c3aa5e8653378a5637d89fc4544dcab
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  1 05:17:39 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb  1 05:17:39 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0e31c7

net-ftp/vsftpd: Stabilize 3.0.5-r1 amd64, #828484

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

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

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 7b213e6d4c26..917794413ef3 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2022-01-15  9:51 Yixun Lan
  0 siblings, 0 replies; 30+ messages in thread
From: Yixun Lan @ 2022-01-15  9:51 UTC (permalink / raw
  To: gentoo-commits

commit:     5976d9310d265538921dfda584370202cc747886
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 15 09:47:11 2022 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 09:51:24 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5976d931

net-ftp/vsftpd: keyword ~riscv

thanks sjj991212 for testing
Closes: https://bugs.gentoo.org/831172
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>

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

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 213664f00f1c..7b213e6d4c26 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="pam ssl tcpd"
 
 DEPEND="


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2022-01-03 23:26 David Seifert
  0 siblings, 0 replies; 30+ messages in thread
From: David Seifert @ 2022-01-03 23:26 UTC (permalink / raw
  To: gentoo-commits

commit:     eac5cd9417922b3da8091a271f9370d5f127dec8
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  3 23:26:15 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Jan  3 23:26:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eac5cd94

net-ftp/vsftpd: remove implicit elibc_* flags

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

 net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index 707069d713d6..213664f00f1c 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="elibc_musl pam ssl tcpd"
+IUSE="pam ssl tcpd"
 
 DEPEND="
 	>=sys-libs/libcap-2


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2021-08-14 16:51 Mike Gilbert
  0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2021-08-14 16:51 UTC (permalink / raw
  To: gentoo-commits

commit:     13c65659bbc9bc59314e972b69578014711663c3
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 16:51:09 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 16:51:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c65659

net-ftp/vsftpd: fix build on musl

Closes: https://bugs.gentoo.org/713952
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-ftp/vsftpd/vsftpd-3.0.5.ebuild | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
index b452dee49a0..b63d380bf32 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://security.appspot.com/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="pam ssl tcpd"
+IUSE="elibc_musl pam ssl tcpd"
 
 DEPEND="
 	>=sys-libs/libcap-2
@@ -36,11 +36,11 @@ src_prepare() {
 }
 
 define() {
-	sed -i -e "/#undef $1/c#define $1" "${S}"/builddefs.h || die
+	sed -i -e "/#undef $2/c#define $2${3:+ }$3" "$1" || die
 }
 
 undef() {
-	sed -i -e "/#define $1/c#undef $1" "${S}"/builddefs.h || die
+	sed -i -e "/#define $2/c#undef $2" "$1" || die
 }
 
 src_configure() {
@@ -49,19 +49,25 @@ src_configure() {
 	if use pam; then
 		libs+=( -lpam )
 	else
-		undef VSF_BUILD_PAM
+		undef builddefs.h VSF_BUILD_PAM
 		libs+=( -lcrypt )
 	fi
 
 	if use ssl; then
-		define VSF_BUILD_SSL
+		define builddefs.h VSF_BUILD_SSL
 		libs+=( -lcrypto -lssl )
 	fi
 
 	if use tcpd; then
-		define VSF_BUILD_TCPWRAPPERS
+		define builddefs.h VSF_BUILD_TCPWRAPPERS
 		libs+=( -lwrap )
 	fi
+
+	if use elibc_musl; then
+		# musl does not support utmp/wtmp
+		# https://bugs.gentoo.org/713952
+		undef sysdeputil.c VSF_SYSDEP_HAVE_UTMPX
+	fi
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2021-08-14  2:47 Mike Gilbert
  0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2021-08-14  2:47 UTC (permalink / raw
  To: gentoo-commits

commit:     7123e409ac015189a9e5c173f542180926a0e428
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 02:45:42 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Aug 14 02:46:48 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7123e409

net-ftp/vsftpd: drop pkg-config use

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-ftp/vsftpd/vsftpd-3.0.5.ebuild | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
index c417498f044..e4ecfb256b8 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
@@ -14,10 +14,6 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="pam ssl tcpd"
 
-BDEPEND="
-	virtual/pkgconfig
-"
-
 DEPEND="
 	>=sys-libs/libcap-2
 	pam? ( sys-libs/pam )
@@ -49,13 +45,7 @@ undef() {
 }
 
 src_configure() {
-	cflags=()
-	libs=()
-
-	local PKG_CONFIG=$(tc-getPKG_CONFIG)
-
-	cflags+=( $(${PKG_CONFIG} --cflags libcap) ) || die
-	libs+=( $(${PKG_CONFIG} --libs libcap) ) || die
+	libs=( -lcap )
 
 	if use pam; then
 		libs+=( -lpam )
@@ -66,8 +56,7 @@ src_configure() {
 
 	if use ssl; then
 		define VSF_BUILD_SSL
-		cflags+=( $(${PKG_CONFIG} --cflags libcrypto libssl) ) || die
-		libs+=( $(${PKG_CONFIG} --libs libcrypto libssl) ) || die
+		libs+=( -lcrypto -lssl )
 	fi
 
 	if use tcpd; then
@@ -79,8 +68,8 @@ src_configure() {
 src_compile() {
 	local args=(
 		CC="$(tc-getCC)"
-		CFLAGS="${CFLAGS} ${cflags[*]}"
-		LDFLAGS="${CFLAGS} ${LDFLAGS}"
+		CFLAGS="${CFLAGS}"
+		LDFLAGS="${LDFLAGS}"
 		LIBS="${libs[*]}"
 	)
 	emake "${args[@]}"


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2021-07-27 18:14 Mike Gilbert
  0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2021-07-27 18:14 UTC (permalink / raw
  To: gentoo-commits

commit:     99b67bf04c64f5f09b9b6a32b61de2323249041f
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 27 18:09:14 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jul 27 18:09:14 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b67bf0

net-ftp/vsftpd: depend on virtual/libcrypt when pam is disabled

Closes: https://bugs.gentoo.org/794952
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 net-ftp/vsftpd/{vsftpd-3.0.3-r3.ebuild => vsftpd-3.0.3-r4.ebuild} | 7 ++++++-
 net-ftp/vsftpd/{vsftpd-3.0.4.ebuild => vsftpd-3.0.4-r1.ebuild}    | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild
similarity index 97%
rename from net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
rename to net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild
index bba34a41dd4..e3ad887f7e1 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild
@@ -16,6 +16,7 @@ IUSE="caps pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )
 	pam? ( sys-libs/pam )
+	!pam? ( virtual/libcrypt:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? (
 		dev-libs/openssl:0=
@@ -73,7 +74,11 @@ src_compile() {
 	# Override LIBS variable. Bug #508192
 	LIBS=
 	use caps && LIBS+=" -lcap"
-	use pam && LIBS+=" -lpam"
+	if use pam; then
+		LIBS+=" -lpam"
+	else
+		LIBS+=" -lcrypt"
+	fi
 	use tcpd && LIBS+=" -lwrap"
 	use ssl && LIBS+=" -lssl -lcrypto"
 

diff --git a/net-ftp/vsftpd/vsftpd-3.0.4.ebuild b/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild
similarity index 97%
rename from net-ftp/vsftpd/vsftpd-3.0.4.ebuild
rename to net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild
index e7be1199478..d68b2892522 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.4.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild
@@ -16,6 +16,7 @@ IUSE="caps pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )
 	pam? ( sys-libs/pam )
+	!pam? ( virtual/libcrypt:= )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}
@@ -79,7 +80,11 @@ src_compile() {
 	# Override LIBS variable. Bug #508192
 	LIBS=
 	use caps && LIBS+=" -lcap"
-	use pam && LIBS+=" -lpam"
+	if use pam; then
+		LIBS+=" -lpam"
+	else
+		LIBS+=" -lcrypt"
+	fi
 	use tcpd && LIBS+=" -lwrap"
 	use ssl && LIBS+=" -lssl -lcrypto"
 


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2021-07-23 17:36 Mike Gilbert
  0 siblings, 0 replies; 30+ messages in thread
From: Mike Gilbert @ 2021-07-23 17:36 UTC (permalink / raw
  To: gentoo-commits

commit:     8876ec41ad3c1c77d4087d8967123f168b161234
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 23 17:35:40 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Jul 23 17:36:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8876ec41

net-ftp/vsftpd: add myself as a maintainer

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

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

diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 7a38bb90096..70159fd6e1e 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>floppym@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>


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

commit:     fd084561a392cdbfe60d4240abf7069b9c8d78bd
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jun  8 09:15:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  8 09:15:46 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd084561

net-ftp/vsftpd: add 3.0.4

Restores seccomp filtering as changes were made upstream.

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

 net-ftp/vsftpd/Manifest            |   1 +
 net-ftp/vsftpd/vsftpd-3.0.4.ebuild | 147 +++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+)

diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 672d3786dd4..93494676a05 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1 +1,2 @@
 DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
+DIST vsftpd-3.0.4.tar.gz 197637 BLAKE2B 3a2457bd74076de8ffba7ad2861009157c80dd9f38cdb63033804c72d7482666f7e1a400777e2cff4170f0999d79f9d384339ade3ad48f2a7567b2e684e48817 SHA512 a4c3b28ef7bd762dcfe53f5c9b68fc1bb371d2eb61dc88038959cc9f5efba8cc2c45a15956a7fddbac3b1ce03d8555df8fb7b86300e273a78e632f3dac15c2e3

diff --git a/net-ftp/vsftpd/vsftpd-3.0.4.ebuild b/net-ftp/vsftpd/vsftpd-3.0.4.ebuild
new file mode 100644
index 00000000000..5803985cfa0
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-3.0.4.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+HOMEPAGE="http://vsftpd.beasts.org/"
+SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="caps pam tcpd ssl selinux xinetd"
+
+DEPEND="caps? ( >=sys-libs/libcap-2 )
+	pam? ( sys-libs/pam )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )
+	xinetd? ( sys-apps/xinetd )"
+
+PATCHES=(
+	# kerberos patch. bug #335980
+	"${FILESDIR}/${PN}-2.3.2-kerberos.patch"
+
+	# Patch the source, config and the manpage to use /etc/vsftpd/
+	"${FILESDIR}/${PN}-2.3.5-gentoo.patch"
+
+	# Fix building without the libcap
+	"${FILESDIR}/${PN}-2.1.0-caps.patch"
+
+	# Fix building on alpha. Bug #405829
+	"${FILESDIR}/${PN}-3.0.2-alpha.patch"
+
+	# Bug #335977
+	"${FILESDIR}"/${PN}-3.0.0-Makefile.patch
+
+	# Bug #450536
+	"${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
+
+	# Bug #630704
+	"${FILESDIR}"/${PN}-3.0.3-sparc.patch
+
+	# https://bugs.gentoo.org/443898
+	#"${FILESDIR}"/vsftpd-disable-seccomp-sandbox.patch
+)
+
+src_prepare() {
+	# Configure vsftpd build defaults
+	if use tcpd ; then
+		echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h || die
+	fi
+
+	if use ssl ; then
+		echo "#define VSF_BUILD_SSL" >> builddefs.h || die
+	fi
+
+	if ! use pam; then
+		echo "#undef VSF_BUILD_PAM" >> builddefs.h || die
+	fi
+
+	# Ensure that we don't link against libcap unless asked
+	if ! use caps ; then
+		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
+		eapply "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
+	fi
+
+	# Let portage control stripping
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
+
+	default
+}
+
+src_compile() {
+	# Override LIBS variable. Bug #508192
+	LIBS=
+	use caps && LIBS+=" -lcap"
+	use pam && LIBS+=" -lpam"
+	use tcpd && LIBS+=" -lwrap"
+	use ssl && LIBS+=" -lssl -lcrypto"
+
+	tc-export CC
+
+	CFLAGS="${CFLAGS}" emake LIBS="${LIBS}"
+}
+
+src_install() {
+	into /usr
+	doman ${PN}.conf.5 ${PN}.8
+	dosbin ${PN}
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		README README.security REWARD SIZE \
+		SPEED TODO TUNING
+	newdoc ${PN}.conf ${PN}.conf.example
+
+	docinto security
+	dodoc SECURITY/*
+
+	docinto examples
+	dodoc -r EXAMPLE/*
+
+	insinto /etc/${PN}
+	newins ${PN}.conf{,.example}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}.logrotate ${PN}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/${PN}.xinetd ${PN}
+	fi
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+	keepdir /usr/share/${PN}/empty
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}"/vsftpd-checkconfig.sh
+	systemd_dounit "${FILESDIR}"/${PN}.service
+	systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service"
+	systemd_dounit "${FILESDIR}"/${PN}.socket
+}
+
+pkg_preinst() {
+	# If we use xinetd, then we set listen=NO
+	# so that our default config works under xinetd - fixes #78347
+	if use xinetd ; then
+		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/${PN}/${PN}.conf.example || die
+	fi
+}
+
+pkg_postinst() {
+	einfo "vsftpd openRC init script can now be multiplexed."
+	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
+	einfo "If you symlink the init script to another one, say vsftpd.foo"
+	einfo "then that uses /etc/vsftpd/foo.conf instead."
+	einfo
+	einfo "Example:"
+	einfo "   cd /etc/init.d"
+	einfo "   ln -s vsftpd vsftpd.foo"
+	einfo "You can now treat vsftpd.foo like any other service"
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2021-05-02 14:40 Mikle Kolyada
  0 siblings, 0 replies; 30+ messages in thread
From: Mikle Kolyada @ 2021-05-02 14:40 UTC (permalink / raw
  To: gentoo-commits

commit:     2547059787c02a32d0dfc726a753f4090c2f71bc
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun May  2 14:39:38 2021 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun May  2 14:40:03 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25470597

net-ftp/vsftpd: remove libressl support

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

 net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
index 1152c63c901..bba34a41dd4 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
@@ -12,14 +12,13 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="caps libressl pam tcpd ssl selinux xinetd"
+IUSE="caps pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )
 	pam? ( sys-libs/pam )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
+		dev-libs/openssl:0=
 	)"
 RDEPEND="${DEPEND}
 	net-ftp/ftpbase


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

commit:     da35bb968c9f07e44f85a9dadf702b58ab23532d
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 12 21:02:12 2019 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Oct 12 21:02:12 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da35bb96

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

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

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 57dea9d2a5b..6559c994610 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -15,7 +15,7 @@ KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )
-	pam? ( virtual/pam )
+	pam? ( sys-libs/pam )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 	ssl? (
 		!libressl? ( dev-libs/openssl:0= )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2018-07-23 19:00 Sergei Trofimovich
  0 siblings, 0 replies; 30+ messages in thread
From: Sergei Trofimovich @ 2018-07-23 19:00 UTC (permalink / raw
  To: gentoo-commits

commit:     2ed420412f6fdbb84aab16a42f93585807791aaf
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 23 18:56:37 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Jul 23 18:56:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ed42041

net-ftp/vsftpd: stable 3.0.3-r2 for hppa, bug #659326

Bug: https://bugs.gentoo.org/659326
Package-Manager: Portage-2.3.43, Repoman-2.3.10
RepoMan-Options: --include-arches="hppa"

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 77dcac101d5..87e6ab6d710 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2018-07-22 16:13 Mikle Kolyada
  0 siblings, 0 replies; 30+ messages in thread
From: Mikle Kolyada @ 2018-07-22 16:13 UTC (permalink / raw
  To: gentoo-commits

commit:     002263f90072e7de60ff472a1d0413a4ecdeec33
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 22 16:12:47 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Jul 22 16:12:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=002263f9

net-ftp/vsftpd: arm stable wrt bug #659326

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 058433db1b6..77dcac101d5 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2018-07-09 14:35 Mikle Kolyada
  0 siblings, 0 replies; 30+ messages in thread
From: Mikle Kolyada @ 2018-07-09 14:35 UTC (permalink / raw
  To: gentoo-commits

commit:     c03ab173693f7dc390fbfac77dd3a7807d6e912f
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  9 14:35:18 2018 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 14:35:37 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c03ab173

net-ftp/vsftpd: amd64 stable wrt bug #659326

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 682c7ee1a2f..058433db1b6 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


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

commit:     f46cd452863ed8156885e13c353d798c315f542c
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul  2 00:35:59 2018 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jul  2 00:35:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f46cd452

net-ftp/vsftpd: x86 stable (bug #659326)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index c96301e6b88..682c7ee1a2f 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2018-07-01  9:24 Sergei Trofimovich
  0 siblings, 0 replies; 30+ messages in thread
From: Sergei Trofimovich @ 2018-07-01  9:24 UTC (permalink / raw
  To: gentoo-commits

commit:     4e573506c049669df719d2f32e51177e4074c02a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  1 09:17:59 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 09:17:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e573506

net-ftp/vsftpd: stable 3.0.3-r2 for ppc, bug #659326

Bug: https://bugs.gentoo.org/659326
Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc"

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index aa18accf392..c96301e6b88 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2018-07-01  8:51 Sergei Trofimovich
  0 siblings, 0 replies; 30+ messages in thread
From: Sergei Trofimovich @ 2018-07-01  8:51 UTC (permalink / raw
  To: gentoo-commits

commit:     37e6b92c69f9f6ea21b34d79bafcfa6bedef5b46
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Jul  1 07:56:35 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Jul  1 08:51:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37e6b92c

net-ftp/vsftpd: stable 3.0.3-r2 for sparc

Bug: https://bugs.gentoo.org/659326
Package-Manager: Portage-2.3.40, Repoman-2.3.9
RepoMan-Options: --include-arches="sparc"

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 444ed513753..aa18accf392 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ppc64 ~s390 ~sh sparc ~x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


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

commit:     481e3b4b02610de1753d9daa067652c39c3a7acf
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 30 18:04:20 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jun 30 19:02:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=481e3b4b

net-ftp/vsftpd: stable 3.0.3-r2 for ppc64, bug #659326

Bug: https://bugs.gentoo.org/659326
Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --include-arches="ppc64"

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index fc06abe64a0..444ed513753 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2018-06-29  6:52 Sergei Trofimovich
  0 siblings, 0 replies; 30+ messages in thread
From: Sergei Trofimovich @ 2018-06-29  6:52 UTC (permalink / raw
  To: gentoo-commits

commit:     a94f779ddccb01045aeab543f69051f454feb47a
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 29 06:51:04 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 06:51:41 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a94f779d

net-ftp/vsftpd: stable 3.0.3-r2 for ia64, bug #659326

Bug: https://bugs.gentoo.org/659326
Package-Manager: Portage-2.3.41, Repoman-2.3.9
RepoMan-Options: --include-arches="ia64"

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 18202372a0f..fc06abe64a0 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2018-06-27 17:23 Tobias Klausmann
  0 siblings, 0 replies; 30+ messages in thread
From: Tobias Klausmann @ 2018-06-27 17:23 UTC (permalink / raw
  To: gentoo-commits

commit:     1bc188242f32646097b839f6b2b0296ecd870125
Author:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 10:13:21 2018 +0000
Commit:     Tobias Klausmann <klausman <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 17:23:12 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bc18824

net-ftp/vsftpd-3.0.3-r2: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/659326

 net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
index 4da0f0e980e..18202372a0f 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="caps libressl pam tcpd ssl selinux xinetd"
 
 DEPEND="caps? ( >=sys-libs/libcap-2 )


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2016-11-03 16:19 Göktürk Yüksek
  0 siblings, 0 replies; 30+ messages in thread
From: Göktürk Yüksek @ 2016-11-03 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     6bd1e09e143c048cbe3e0cc03530dbf626c7b500
Author:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 16:03:59 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 16:16:57 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bd1e09e

net-ftp/vsftpd: remove proxied maintainer per his request

Package-Manager: portage-2.2.28

 net-ftp/vsftpd/metadata.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index 881cfb2..6b6ef60 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -5,15 +5,6 @@
 		<email>hwoarang@gentoo.org</email>
 		<name>Markos Chandras</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>bugs@bergstroem.nu</email>
-		<name>Johan Bergström</name>
-		<description>Proxy Maintainer. CC him on bugs</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription lang="en">
 		Very Secure FTP Daemon written with speed, size and security
 		in mind


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2016-08-23 15:47 Anthony G. Basile
  0 siblings, 0 replies; 30+ messages in thread
From: Anthony G. Basile @ 2016-08-23 15:47 UTC (permalink / raw
  To: gentoo-commits

commit:     a3ce118ec13660049ca3b69322bd2b22ba0bfc07
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 23 15:42:07 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Aug 23 15:42:07 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3ce118e

net-ftp/vsftpd: bump to EAPI=6 and add libressl support

Package-Manager: portage-2.2.28

 net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild | 135 ++++++++++++++++++++++++++++++++++
 1 file changed, 135 insertions(+)

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild
new file mode 100644
index 0000000..2c890e0
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="6"
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+HOMEPAGE="http://vsftpd.beasts.org/"
+SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps libressl pam tcpd ssl selinux xinetd"
+
+DEPEND="caps? ( >=sys-libs/libcap-2 )
+	pam? ( virtual/pam )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
+RDEPEND="${DEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )
+	xinetd? ( sys-apps/xinetd )"
+
+src_prepare() {
+	# kerberos patch. bug #335980
+	epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch"
+
+	# Patch the source, config and the manpage to use /etc/vsftpd/
+	epatch "${FILESDIR}/${PN}-2.3.5-gentoo.patch"
+
+	# Fix building without the libcap
+	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
+
+	# Fix building on alpha. Bug #405829
+	epatch "${FILESDIR}/${PN}-3.0.2-alpha.patch"
+
+	# Configure vsftpd build defaults
+	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
+	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
+	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
+
+	# Ensure that we don't link against libcap unless asked
+	if ! use caps ; then
+		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
+		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
+	fi
+
+	# Let portage control stripping
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
+
+	#Bug #335977
+	epatch "${FILESDIR}"/${PN}-3.0.0-Makefile.patch
+
+	#Bug #450536
+	epatch "${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
+
+	eapply_user
+}
+
+src_compile() {
+	# Override LIBS variable. Bug #508192
+	LIBS=
+	use caps && LIBS+=" -lcap"
+	use pam && LIBS+=" -lpam"
+	use tcpd && LIBS+=" -lwrap"
+	use ssl && LIBS+=" -lssl -lcrypto"
+
+	CFLAGS="${CFLAGS}" \
+	CC="$(tc-getCC)" \
+	emake LIBS="${LIBS}"
+}
+
+src_install() {
+	into /usr
+	doman ${PN}.conf.5 ${PN}.8
+	dosbin ${PN} || die "disbin failed"
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		README README.security REWARD SIZE \
+		SPEED TODO TUNING || die "dodoc failed"
+	newdoc ${PN}.conf ${PN}.conf.example
+
+	docinto security
+	dodoc SECURITY/* || die "dodoc failed"
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/* || die "doins faileD"
+
+	insinto /etc/${PN}
+	newins ${PN}.conf{,.example}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd" ${PN}
+	fi
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	keepdir /usr/share/${PN}/empty
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vsftpd-checkconfig.sh"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
+	systemd_dounit "${FILESDIR}/${PN}.socket"
+}
+
+pkg_preinst() {
+	# If we use xinetd, then we set listen=NO
+	# so that our default config works under xinetd - fixes #78347
+	if use xinetd ; then
+		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/${PN}/${PN}.conf.example
+	fi
+}
+
+pkg_postinst() {
+	einfo "vsftpd openRC init script can now be multiplexed."
+	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
+	einfo "If you symlink the init script to another one, say vsftpd.foo"
+	einfo "then that uses /etc/vsftpd/foo.conf instead."
+	einfo
+	einfo "Example:"
+	einfo "   cd /etc/init.d"
+	einfo "   ln -s vsftpd vsftpd.foo"
+	einfo "You can now treat vsftpd.foo like any other service"
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2016-08-07  6:52 Pacho Ramos
  0 siblings, 0 replies; 30+ messages in thread
From: Pacho Ramos @ 2016-08-07  6:52 UTC (permalink / raw
  To: gentoo-commits

commit:     18ddedacaa94f064af721932ade71343120b0061
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Aug  7 06:42:04 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Aug  7 06:42:04 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18ddedac

net-ftp/vsftpd: Cleanup per bug #269977

Package-Manager: portage-2.3.0

 net-ftp/vsftpd/metadata.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
index df9322c..881cfb2 100644
--- a/net-ftp/vsftpd/metadata.xml
+++ b/net-ftp/vsftpd/metadata.xml
@@ -6,10 +6,6 @@
 		<name>Markos Chandras</name>
 	</maintainer>
 	<maintainer type="person">
-		<email>wired@gentoo.org</email>
-		<name>Alex Alexander</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>bugs@bergstroem.nu</email>
 		<name>Johan Bergström</name>
 		<description>Proxy Maintainer. CC him on bugs</description>


^ permalink raw reply related	[flat|nested] 30+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/
@ 2015-08-29 10:21 Markos Chandras
  0 siblings, 0 replies; 30+ messages in thread
From: Markos Chandras @ 2015-08-29 10:21 UTC (permalink / raw
  To: gentoo-commits

commit:     d568abee9884d4593c73b69426178bca194456bc
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 29 10:20:45 2015 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 10:20:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d568abee

net-ftp/vsftpd: Version bump

Package-Manager: portage-2.2.20.1

 net-ftp/vsftpd/Manifest            |   1 +
 net-ftp/vsftpd/vsftpd-3.0.3.ebuild | 132 +++++++++++++++++++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index a455d55..3966c05 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,2 +1,3 @@
 DIST vsftpd-2.3.5.tar.gz 187691 SHA256 d87ee2987df8f03e1dbe294905f7907b2798deb89c67ca965f6e2f60879e54f1 SHA512 7d58d601c4a14cf16c074f238d557fd28e080d7573a1257f742e43bf97cff455b6bf083d8e3594cc7f8865f9485b307b692e91c17426c7fed11af9e4b41a0643 WHIRLPOOL 2dba4ae125bbd66522f58ce4ffc9d5be8ea2a84876fe6751593b82aa2c3e5fe1e1ed076c1c09268054f7ea6831683a2be0dd4e269e321d572d859d0ae2535406
 DIST vsftpd-3.0.2.tar.gz 192808 SHA256 be46f0e2c5528fe021fafc8dab1ecfea0c1f183063a06977f8537fcd0b195e56 SHA512 d5b978e07d8b0a623b79a531824666fb9b970ad5989a8c34c21b545b62ba07cde4bfe3d77b40a8b6e92d17890c37cae209231af8f106da3404f6548e217bd023 WHIRLPOOL 7a74ab478880d021f7a82ffc6ec3989617003234e30d97063760bc06baeee2ab207861b440896b926b95eed7b3d902ab96c05c1bbd23d494d9ff168f98d3404a
+DIST vsftpd-3.0.3.tar.gz 196649 SHA256 9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7 SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7 WHIRLPOOL 014b13a1031d89a12412fb1abc808c8d62f474b84e9d1699ec789e99c9b9ec7f4538e7504caa810c6b77dcccea8fc0e32e9bb3ac5ffc8e2e9a29f67b69ddc3cb

diff --git a/net-ftp/vsftpd/vsftpd-3.0.3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3.ebuild
new file mode 100644
index 0000000..916b4ac
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-3.0.3.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils systemd toolchain-funcs
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+HOMEPAGE="http://vsftpd.beasts.org/"
+SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps pam tcpd ssl selinux xinetd"
+
+DEPEND="caps? ( >=sys-libs/libcap-2 )
+	pam? ( virtual/pam )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+	ssl? ( >=dev-libs/openssl-0.9.7d )"
+RDEPEND="${DEPEND}
+	net-ftp/ftpbase
+	selinux? ( sec-policy/selinux-ftp )
+	xinetd? ( sys-apps/xinetd )"
+
+src_prepare() {
+	# kerberos patch. bug #335980
+	epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch"
+
+	# Patch the source, config and the manpage to use /etc/vsftpd/
+	epatch "${FILESDIR}/${PN}-2.3.5-gentoo.patch"
+
+	# Fix building without the libcap
+	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
+
+	# Fix building on alpha. Bug #405829
+	epatch "${FILESDIR}/${PN}-3.0.2-alpha.patch"
+
+	# Configure vsftpd build defaults
+	use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
+	use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
+	use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
+
+	# Ensure that we don't link against libcap unless asked
+	if ! use caps ; then
+		sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c || die
+		epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
+	fi
+
+	# Let portage control stripping
+	sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die
+
+	#Bug #335977
+	epatch "${FILESDIR}"/${PN}-3.0.0-Makefile.patch
+
+	#Bug #450536
+	epatch "${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
+
+	epatch_user
+}
+
+src_compile() {
+	# Override LIBS variable. Bug #508192
+	LIBS=
+	use caps && LIBS+=" -lcap"
+	use pam && LIBS+=" -lpam"
+	use tcpd && LIBS+=" -lwrap"
+	use ssl && LIBS+=" -lssl -lcrypto"
+
+	CFLAGS="${CFLAGS}" \
+	CC="$(tc-getCC)" \
+	emake LIBS="${LIBS}"
+}
+
+src_install() {
+	into /usr
+	doman ${PN}.conf.5 ${PN}.8
+	dosbin ${PN} || die "disbin failed"
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+		README README.security REWARD SIZE \
+		SPEED TODO TUNING || die "dodoc failed"
+	newdoc ${PN}.conf ${PN}.conf.example
+
+	docinto security
+	dodoc SECURITY/* || die "dodoc failed"
+
+	insinto "/usr/share/doc/${PF}/examples"
+	doins -r EXAMPLE/* || die "doins faileD"
+
+	insinto /etc/${PN}
+	newins ${PN}.conf{,.example}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}/${PN}.xinetd" ${PN}
+	fi
+
+	newinitd "${FILESDIR}/${PN}.init" ${PN}
+
+	keepdir /usr/share/${PN}/empty
+
+	exeinto /usr/libexec
+	doexe "${FILESDIR}/vsftpd-checkconfig.sh"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
+	systemd_dounit "${FILESDIR}/${PN}.socket"
+}
+
+pkg_preinst() {
+	# If we use xinetd, then we set listen=NO
+	# so that our default config works under xinetd - fixes #78347
+	if use xinetd ; then
+		sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/${PN}/${PN}.conf.example
+	fi
+}
+
+pkg_postinst() {
+	einfo "vsftpd openRC init script can now be multiplexed."
+	einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
+	einfo "If you symlink the init script to another one, say vsftpd.foo"
+	einfo "then that uses /etc/vsftpd/foo.conf instead."
+	einfo
+	einfo "Example:"
+	einfo "   cd /etc/init.d"
+	einfo "   ln -s vsftpd vsftpd.foo"
+	einfo "You can now treat vsftpd.foo like any other service"
+}


^ permalink raw reply related	[flat|nested] 30+ messages in thread

end of thread, other threads:[~2022-08-25 18:18 UTC | newest]

Thread overview: 30+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-15 19:40 [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/ Mikle Kolyada
  -- strict thread matches above, loose matches on Subject: below --
2022-08-25 18:17 Arthur Zamarin
2022-02-02  8:03 Agostino Sarubbo
2022-02-02  0:08 Sam James
2022-02-01  5:57 Sam James
2022-02-01  5:19 Sam James
2022-02-01  5:19 Sam James
2022-02-01  5:17 Sam James
2022-01-15  9:51 Yixun Lan
2022-01-03 23:26 David Seifert
2021-08-14 16:51 Mike Gilbert
2021-08-14  2:47 Mike Gilbert
2021-07-27 18:14 Mike Gilbert
2021-07-23 17:36 Mike Gilbert
2021-06-08  9:15 Sam James
2021-05-02 14:40 Mikle Kolyada
2019-10-12 21:02 Mikle Kolyada
2018-07-23 19:00 Sergei Trofimovich
2018-07-22 16:13 Mikle Kolyada
2018-07-09 14:35 Mikle Kolyada
2018-07-02  0:49 Thomas Deutschmann
2018-07-01  9:24 Sergei Trofimovich
2018-07-01  8:51 Sergei Trofimovich
2018-06-30 19:03 Sergei Trofimovich
2018-06-29  6:52 Sergei Trofimovich
2018-06-27 17:23 Tobias Klausmann
2016-11-03 16:19 Göktürk Yüksek
2016-08-23 15:47 Anthony G. Basile
2016-08-07  6:52 Pacho Ramos
2015-08-29 10:21 Markos Chandras

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox