* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/
@ 2017-11-25 20:59 Sergei Trofimovich
0 siblings, 0 replies; 6+ messages in thread
From: Sergei Trofimovich @ 2017-11-25 20:59 UTC (permalink / raw
To: gentoo-commits
commit: b63d0db0bbcf3eebef952e56081e10f9043ed7ad
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 20:58:31 2017 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 20:59:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b63d0db0
net-ftp/vsftpd: fix clone usage, bug #630704
Rolf Eike Beer found and fixed the cause of
vsftpd being broken on sparc: clone syscall
needs special handling of sparc as argument
passing is special there.
Reported-by: Rolf Eike Beer
Fixed-by: Rolf Eike Beer
Closes: https://bugs.gentoo.org/630704
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-ftp/vsftpd/Manifest | 2 +-
net-ftp/vsftpd/files/vsftpd-3.0.3-sparc.patch | 16 +++
net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild | 137 ++++++++++++++++++++++++++
3 files changed, 154 insertions(+), 1 deletion(-)
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 3966c0534a1..ff1fc0d2dbc 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,3 +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
+DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.3-sparc.patch b/net-ftp/vsftpd/files/vsftpd-3.0.3-sparc.patch
new file mode 100644
index 00000000000..9bae9c0238f
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-3.0.3-sparc.patch
@@ -0,0 +1,16 @@
+Workaround clone syscall mishandling.
+
+https://bugs.gentoo.org/630704
+--- a/sysdeputil.c 2017-09-11 11:38:06.522229630 +0200
++++ b/sysdeputil.c 2017-09-11 11:38:10.422229500 +0200
+@@ -67,7 +67,9 @@
+ #if defined(__linux__)
+ #include <errno.h>
+ #include <syscall.h>
+- #define VSF_SYSDEP_HAVE_LINUX_CLONE
++ #ifndef __sparc__
++ #define VSF_SYSDEP_HAVE_LINUX_CLONE
++ #endif
+ #include <sched.h>
+ #ifndef CLONE_NEWPID
+ #define CLONE_NEWPID 0x20000000
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
new file mode 100644
index 00000000000..4da0f0e980e
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+ #Bug #630704
+ epatch "${FILESDIR}"/${PN}-3.0.3-sparc.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] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/
@ 2019-02-24 10:53 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2019-02-24 10:53 UTC (permalink / raw
To: gentoo-commits
commit: e45c6a269fc170ee2a45de9a65ff93504d4805e0
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 24 10:41:41 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Feb 24 10:53:10 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e45c6a26
net-ftp/vsftpd: Drop old
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
net-ftp/vsftpd/Manifest | 2 -
net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch | 13 ---
net-ftp/vsftpd/files/vsftpd-3.0.2-alpha.patch | 16 ---
net-ftp/vsftpd/vsftpd-2.3.5.ebuild | 114 ------------------
net-ftp/vsftpd/vsftpd-3.0.2-r1.ebuild | 121 -------------------
net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild | 131 ---------------------
net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild | 134 ----------------------
net-ftp/vsftpd/vsftpd-3.0.2-r4.ebuild | 134 ----------------------
net-ftp/vsftpd/vsftpd-3.0.2.ebuild | 117 -------------------
net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild | 134 ----------------------
net-ftp/vsftpd/vsftpd-3.0.3.ebuild | 131 ---------------------
11 files changed, 1047 deletions(-)
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 3862fccc6fd..672d3786dd4 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,3 +1 @@
-DIST vsftpd-2.3.5.tar.gz 187691 BLAKE2B 59b3be665cfb39d56d7458c60cb068fbceccf853f7587668e96f392dc7693a9d84bbeed467508d4a5a55f0d9f5c7cafefc3890eb9c3e2fd2959a00ea46129289 SHA512 7d58d601c4a14cf16c074f238d557fd28e080d7573a1257f742e43bf97cff455b6bf083d8e3594cc7f8865f9485b307b692e91c17426c7fed11af9e4b41a0643
-DIST vsftpd-3.0.2.tar.gz 192808 BLAKE2B fd1c5dd815d9df969f2d1aceb35b5c0340728c6f5f5ab3f73eea5dc62cde65cd0c5a598184c7f68d5fceeaadef9537708adc0ac97adc4c856662e0997d8a8ca2 SHA512 d5b978e07d8b0a623b79a531824666fb9b970ad5989a8c34c21b545b62ba07cde4bfe3d77b40a8b6e92d17890c37cae209231af8f106da3404f6548e217bd023
DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
diff --git a/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch b/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch
deleted file mode 100644
index 330026e47e9..00000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: vsftpd-2.3.2/Makefile
-===================================================================
---- vsftpd-2.3.2.orig/Makefile
-+++ vsftpd-2.3.2/Makefile
-@@ -21,7 +21,7 @@ OBJS = main.o utility.o prelogin.o ftpcm
- $(CC) -c $*.c $(CFLAGS) $(IFLAGS)
-
- vsftpd: $(OBJS)
-- $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
-+ $(CC) -o vsftpd $(LDFLAGS) $(OBJS) $(LINK) $(LIBS)
-
- install:
- if [ -x /usr/local/sbin ]; then \
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.2-alpha.patch b/net-ftp/vsftpd/files/vsftpd-3.0.2-alpha.patch
deleted file mode 100644
index 2445bb54467..00000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.2-alpha.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Author: Michael Cree <mcree@orcon.net.nz>
-Description: Fixing FTBFS on alpha (Closes: #656182).
-
-diff -Naurp vsftpd.orig/sysdeputil.c vsftpd/sysdeputil.c
---- vsftpd.orig/sysdeputil.c 2010-03-26 04:25:33.000000000 +0100
-+++ vsftpd/sysdeputil.c 2012-01-21 10:53:37.353802546 +0100
-@@ -81,6 +81,9 @@
- #include <linux/unistd.h>
- #include <errno.h>
- #include <syscall.h>
-+ #if defined(__alpha__)
-+ #define __NR_getpid __NR_getxpid
-+ #endif
- #endif
-
- #if defined(__linux__) && !defined(__ia64__) && !defined(__s390__)
diff --git a/net-ftp/vsftpd/vsftpd-2.3.5.ebuild b/net-ftp/vsftpd/vsftpd-2.3.5.ebuild
deleted file mode 100644
index 8b404d579df..00000000000
--- a/net-ftp/vsftpd/vsftpd-2.3.5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils 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="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() {
-
- # as-needed patch. Bug #335977
- epatch "${FILESDIR}/${PN}-2.3.2-as-needed.patch"
-
- # 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}/${P}-gentoo.patch"
-
- # Fix building without the libcap
- epatch "${FILESDIR}/${PN}-2.1.0-caps.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
-}
-
-src_compile() {
- emake \
- CFLAGS="${CFLAGS}" \
- CC="$(tc-getCC)"
-}
-
-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"
-}
-
-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 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"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2-r1.ebuild
deleted file mode 100644
index f362ee2595e..00000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}"/${P}-remove-legacy-cap.patch
-}
-
-src_compile() {
- CFLAGS="${CFLAGS}" \
- CC="$(tc-getCC)" \
- emake
-}
-
-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"
-}
-
-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 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"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild
deleted file mode 100644
index 787c26639af..00000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.2-r2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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}"/${P}-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"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild
deleted file mode 100644
index ea672ac8b5f..00000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.2-r3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
- # Increase AS_LIMIT. Bug #522412
- epatch "${FILESDIR}/${P}-aslim.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}"/${P}-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"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2-r4.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2-r4.ebuild
deleted file mode 100644
index 9f5b84c9683..00000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.2-r4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-
- # Increase AS_LIMIT. Bug #522412
- epatch "${FILESDIR}/${P}-aslim.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}"/${P}-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"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.2.ebuild
deleted file mode 100644
index 2e9ae68e650..00000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils 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
-}
-
-src_compile() {
- CFLAGS="${CFLAGS}" \
- CC="$(tc-getCC)" \
- emake
-}
-
-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"
-}
-
-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 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"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild
deleted file mode 100644
index a61b38e5a2c..00000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3.ebuild
deleted file mode 100644
index 48d8e8795fd..00000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/
@ 2020-02-07 18:00 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2020-02-07 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 08b7452ea7abf8bfc814520d9b93b39e3b8cdc39
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 7 17:59:06 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Fri Feb 7 17:59:06 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08b7452e
net-ftp/vsftpd: disable seccomp_sandbox by default
Closes: https://bugs.gentoo.org/443898
Package-Manager: Portage-2.3.86_p1, Repoman-2.3.20_p43
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../files/vsftpd-disable-seccomp-sandbox.patch | 15 ++++++++
...ftpd-3.0.3-r2.ebuild => vsftpd-3.0.3-r3.ebuild} | 45 ++++++++++++----------
2 files changed, 40 insertions(+), 20 deletions(-)
diff --git a/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch b/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
new file mode 100644
index 00000000000..10266e36a87
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
@@ -0,0 +1,15 @@
+Disable buggy seccomp sandbox code by default
+
+Bug: https://bugs.gentoo.org/443898
+
+--- a/tunables.c
++++ b/tunables.c
+@@ -226,7 +226,7 @@
+ tunable_isolate_network = 1;
+ tunable_ftp_enable = 1;
+ tunable_http_enable = 0;
+- tunable_seccomp_sandbox = 1;
++ tunable_seccomp_sandbox = 0;
+ tunable_allow_writeable_chroot = 0;
+
+ tunable_accept_timeout = 60;
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
similarity index 80%
rename from net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
rename to net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
index 737cd124f08..b5dea09d687 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r2.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -27,17 +27,31 @@ RDEPEND="${DEPEND}
xinetd? ( sys-apps/xinetd )"
src_prepare() {
- # kerberos patch. bug #335980
- epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch"
+ local PATCHES=(
+ # kerberos patch. bug #335980
+ "${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"
+ # Patch the source, config and the manpage to use /etc/vsftpd/
+ "${FILESDIR}/${PN}-2.3.5-gentoo.patch"
- # Fix building without the libcap
- epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
+ # Fix building without the libcap
+ "${FILESDIR}/${PN}-2.1.0-caps.patch"
- # Fix building on alpha. Bug #405829
- epatch "${FILESDIR}/${PN}-3.0.2-alpha.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
+ )
# Configure vsftpd build defaults
use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
@@ -47,22 +61,13 @@ src_prepare() {
# 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
+ 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
- #Bug #335977
- epatch "${FILESDIR}"/${PN}-3.0.0-Makefile.patch
-
- #Bug #450536
- epatch "${FILESDIR}"/${PN}-3.0.2-remove-legacy-cap.patch
-
- #Bug #630704
- epatch "${FILESDIR}"/${PN}-3.0.3-sparc.patch
-
- eapply_user
+ default
}
src_compile() {
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/
@ 2021-08-14 16:51 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2021-08-14 16:51 UTC (permalink / raw
To: gentoo-commits
commit: b1c1d98efcdae8929d86053db15b688dac4d5dde
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 14 14:40:48 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=b1c1d98e
net-ftp/vsftpd: drop vsftpd-3.0.5-fix-link-command.patch
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
.../files/vsftpd-3.0.5-fix-link-command.patch | 25 ----------------------
net-ftp/vsftpd/vsftpd-3.0.5.ebuild | 2 +-
2 files changed, 1 insertion(+), 26 deletions(-)
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch b/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch
deleted file mode 100644
index a4560a8ef6b..00000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.5-fix-link-command.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5c00346f72de5b966ebb0841c87a22c6b11c1b38 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Thu, 12 Aug 2021 16:51:55 -0400
-Subject: [PATCH] Fix link command
-
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index c63ed1b..c3454c3 100644
---- a/Makefile
-+++ b/Makefile
-@@ -26,7 +26,7 @@ OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
- $(CC) -c $*.c $(CFLAGS) $(IFLAGS)
-
- vsftpd: $(OBJS)
-- $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
-+ $(CC) -o vsftpd $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS)
-
- install:
- if [ -x /usr/local/sbin ]; then \
---
-2.32.0
-
diff --git a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
index e4ecfb256b8..b452dee49a0 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
@@ -31,7 +31,6 @@ src_prepare() {
"${FILESDIR}"/vsftpd-2.3.2-kerberos.patch
"${FILESDIR}"/vsftpd-3.0.2-alpha.patch
"${FILESDIR}"/vsftpd-3.0.3-sparc.patch
- "${FILESDIR}"/vsftpd-3.0.5-fix-link-command.patch
)
default
}
@@ -71,6 +70,7 @@ src_compile() {
CFLAGS="${CFLAGS}"
LDFLAGS="${LDFLAGS}"
LIBS="${libs[*]}"
+ LINK=
)
emake "${args[@]}"
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/
@ 2021-08-16 18:10 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2021-08-16 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 1a75a25262b20b9213dac8b2ebdd0c4938323b4b
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 16 18:09:43 2021 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Aug 16 18:09:43 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a75a252
net-ftp/vsftpd: fix seccomp failures
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch | 25 ++++++++++++++++++++++
...{vsftpd-3.0.5.ebuild => vsftpd-3.0.5-r1.ebuild} | 1 +
2 files changed, 26 insertions(+)
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch b/net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch
new file mode 100644
index 00000000000..cd23e6b35c6
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-3.0.5-seccomp.patch
@@ -0,0 +1,25 @@
+From 8a0ec911c17b64747b7cb2ff6e912c7cbb87d39f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 14 Aug 2021 09:31:04 -0400
+Subject: [PATCH] Fix seccomp failures in the postlogin broker
+
+---
+ seccompsandbox.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/seccompsandbox.c b/seccompsandbox.c
+index bcd96a0..5411d69 100644
+--- a/seccompsandbox.c
++++ b/seccompsandbox.c
+@@ -515,6 +515,8 @@ seccomp_sandbox_setup_postlogin_broker()
+ seccomp_sandbox_setup_base();
+ seccomp_sandbox_setup_data_connections();
+ allow_nr_1_arg_match(__NR_sendmsg, 3, 0);
++ allow_nr(__NR_alarm);
++ allow_nr(__NR_wait4);
+ }
+
+ void
+--
+2.32.0
+
diff --git a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
similarity index 98%
rename from net-ftp/vsftpd/vsftpd-3.0.5.ebuild
rename to net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
index b63d380bf32..707069d713d 100644
--- a/net-ftp/vsftpd/vsftpd-3.0.5.ebuild
+++ b/net-ftp/vsftpd/vsftpd-3.0.5-r1.ebuild
@@ -31,6 +31,7 @@ src_prepare() {
"${FILESDIR}"/vsftpd-2.3.2-kerberos.patch
"${FILESDIR}"/vsftpd-3.0.2-alpha.patch
"${FILESDIR}"/vsftpd-3.0.3-sparc.patch
+ "${FILESDIR}"/vsftpd-3.0.5-seccomp.patch
)
default
}
^ permalink raw reply related [flat|nested] 6+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/
@ 2022-04-16 3:31 Mike Gilbert
0 siblings, 0 replies; 6+ messages in thread
From: Mike Gilbert @ 2022-04-16 3:31 UTC (permalink / raw
To: gentoo-commits
commit: c4366c87fde09f81468bc51975a6261cdc26c9bb
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 03:29:31 2022 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 03:30:42 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4366c87
net-ftp/vsftpd: drop 3.0.3-r4, 3.0.4-r1
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
net-ftp/vsftpd/Manifest | 2 -
net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch | 15 --
.../vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch | 21 ---
net-ftp/vsftpd/files/vsftpd-2.3.5-gentoo.patch | 207 ---------------------
net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch | 34 ----
.../files/vsftpd-3.0.2-remove-legacy-cap.patch | 57 ------
.../vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch | 17 --
net-ftp/vsftpd/files/vsftpd-checkconfig.sh | 29 ---
.../files/vsftpd-disable-seccomp-sandbox.patch | 15 --
net-ftp/vsftpd/files/vsftpd.conf | 104 -----------
net-ftp/vsftpd/files/vsftpd.init | 50 -----
net-ftp/vsftpd/files/vsftpd.service | 11 --
net-ftp/vsftpd/files/vsftpd_at.service | 10 -
net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild | 146 ---------------
net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild | 152 ---------------
15 files changed, 870 deletions(-)
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 9ebd3e6c3fa8..ee4ec8971871 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,3 +1 @@
-DIST vsftpd-3.0.3.tar.gz 196649 BLAKE2B dbf96e788494c29d78ca49fad6a03641c9725f9a5b01a4059ad009870fdc28520cd467cd8288a8a9a520c411c495a42c3fff57ee1069efc65840adb245792dca SHA512 5a4410a88e72ecf6f60a60a89771bcec300c9f63c2ea83b219bdf65fd9749b9853f9579f7257205b55659aefcd5dab243eba878dbbd4f0ff8532dd6e60884df7
-DIST vsftpd-3.0.4.tar.gz 197637 BLAKE2B 3a2457bd74076de8ffba7ad2861009157c80dd9f38cdb63033804c72d7482666f7e1a400777e2cff4170f0999d79f9d384339ade3ad48f2a7567b2e684e48817 SHA512 a4c3b28ef7bd762dcfe53f5c9b68fc1bb371d2eb61dc88038959cc9f5efba8cc2c45a15956a7fddbac3b1ce03d8555df8fb7b86300e273a78e632f3dac15c2e3
DIST vsftpd-3.0.5.tar.gz 197778 BLAKE2B c197a070f7eef8c97ef0adc1ebb883520e7613d67ba0eabb1380b3adaae272f4ef79110e79ce4aad5ddebd6100fb059308d905203249c5445d3ea64c29dc5ec2 SHA512 9e9f9bde8c460fbc6b1d29ca531327fb2e40e336358f1cc19e1da205ef81b553719a148ad4613ceead25499d1ac3f03301a0ecd3776e5c228acccb7f9461a7ee
diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch
deleted file mode 100644
index bd29762e9f48..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur vsftpd-2.1.0.orig/sysdeputil.c vsftpd-2.1.0/sysdeputil.c
---- vsftpd-2.1.0.orig/sysdeputil.c 2009-02-23 18:23:26.000000000 +0100
-+++ vsftpd-2.1.0/sysdeputil.c 2009-02-23 18:23:51.000000000 +0100
-@@ -160,10 +160,8 @@
- #include <sys/capability.h>
-
- #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP)
--#include <linux/unistd.h>
- #include <linux/capability.h>
--#include <errno.h>
--#include <syscall.h>
-+#include <sys/syscall.h>
- int capset(cap_user_header_t header, const cap_user_data_t data)
- {
- return syscall(__NR_capset, header, data);
diff --git a/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch
deleted file mode 100644
index debcf06279e3..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur vsftpd-2.2.0.orig/vsf_findlibs.sh vsftpd-2.2.0/vsf_findlibs.sh
---- vsftpd-2.2.0.orig/vsf_findlibs.sh 2009-08-23 22:15:39.000000000 -0700
-+++ vsftpd-2.2.0/vsf_findlibs.sh 2009-08-23 22:16:31.000000000 -0700
-@@ -44,17 +44,6 @@
- # For older HP-UX...
- locate_library /usr/lib/libsec.sl && echo "-lsec";
-
--# Look for libcap (capabilities)
--if locate_library /lib/libcap.so.1; then
-- echo "/lib/libcap.so.1";
--elif locate_library /lib/libcap.so.2; then
-- echo "/lib/libcap.so.2";
--else
-- locate_library /usr/lib/libcap.so && echo "-lcap";
-- locate_library /lib/libcap.so && echo "-lcap";
-- locate_library /lib64/libcap.so && echo "-lcap";
--fi
--
- # Solaris needs this for nanosleep()..
- locate_library /lib/libposix4.so && echo "-lposix4";
- locate_library /usr/lib/libposix4.so && echo "-lposix4";
diff --git a/net-ftp/vsftpd/files/vsftpd-2.3.5-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.3.5-gentoo.patch
deleted file mode 100644
index 7f1af4beb8c7..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-2.3.5-gentoo.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-Index: vsftpd-2.3.5/defs.h
-===================================================================
---- vsftpd-2.3.5.orig/defs.h
-+++ vsftpd-2.3.5/defs.h
-@@ -1,7 +1,7 @@
- #ifndef VSF_DEFS_H
- #define VSF_DEFS_H
-
--#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf"
-+#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd/vsftpd.conf"
-
- #define VSFTP_COMMAND_FD 0
-
-Index: vsftpd-2.3.5/tunables.c
-===================================================================
---- vsftpd-2.3.5.orig/tunables.c
-+++ vsftpd-2.3.5/tunables.c
-@@ -250,7 +250,7 @@ tunables_load_defaults()
- /* -rw------- */
- tunable_chown_upload_mode = 0600;
-
-- install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
-+ install_str_setting("/usr/share/vsftpd/empty", &tunable_secure_chroot_dir);
- install_str_setting("ftp", &tunable_ftp_username);
- install_str_setting("root", &tunable_chown_username);
- install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
-@@ -258,11 +258,11 @@ tunables_load_defaults()
- install_str_setting(".message", &tunable_message_file);
- install_str_setting("nobody", &tunable_nopriv_user);
- install_str_setting(0, &tunable_ftpd_banner);
-- install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file);
-- install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file);
-+ install_str_setting("/etc/vsftpd/vsftpd.banned_emails", &tunable_banned_email_file);
-+ install_str_setting("/etc/vsftpd/vsftpd.chroot_list", &tunable_chroot_list_file);
- install_str_setting("ftp", &tunable_pam_service_name);
- install_str_setting("ftp", &tunable_guest_username);
-- install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file);
-+ install_str_setting("/etc/vsftpd/vsftpd.user_list", &tunable_userlist_file);
- install_str_setting(0, &tunable_anon_root);
- install_str_setting(0, &tunable_local_root);
- install_str_setting(0, &tunable_banner_file);
-@@ -275,7 +275,7 @@ tunables_load_defaults()
- install_str_setting(0, &tunable_hide_file);
- install_str_setting(0, &tunable_deny_file);
- install_str_setting(0, &tunable_user_sub_token);
-- install_str_setting("/etc/vsftpd.email_passwords",
-+ install_str_setting("/etc/vsftpd/vsftpd.email_passwords",
- &tunable_email_password_file);
- install_str_setting("/usr/share/ssl/certs/vsftpd.pem",
- &tunable_rsa_cert_file);
-Index: vsftpd-2.3.5/vsftpd.8
-===================================================================
---- vsftpd-2.3.5.orig/vsftpd.8
-+++ vsftpd-2.3.5/vsftpd.8
-@@ -21,7 +21,7 @@ itself will listen on the network. This
- recommended. It is activated by setting
- .Pa listen=YES
- in
--.Pa /etc/vsftpd.conf .
-+.Pa /etc/vsftpd/vsftpd.conf .
- Direct execution of the
- .Nm vsftpd
- binary will then launch the FTP service ready for immediate client connections.
-@@ -33,7 +33,7 @@ as root. Any command line option not sta
- as a config file that will be loaded. Note that config files are loaded in the
- strict order that they are encountered on the command line.
- If no config files are specified, the default configuration file of
--.Pa /etc/vsftpd.conf
-+.Pa /etc/vsftpd/vsftpd.conf
- will be loaded, after all other command line options are processed.
- .Pp
- Supported options are:
-@@ -47,14 +47,14 @@ their appearance on the command line, in
- config files.
- .El
- .Sh EXAMPLES
--vsftpd -olisten=NO /etc/vsftpd.conf -oftpd_banner=blah
-+vsftpd -olisten=NO /etc/vsftpd/vsftpd.conf -oftpd_banner=blah
- .Pp
- That example overrides vsftpd's built-in default for the "listen" option to be
--NO, but then loads /etc/vsftpd.conf which may override that setting. Finally,
-+NO, but then loads /etc/vsftpd/vsftpd.conf which may override that setting. Finally,
- the "ftpd_banner" setting is set to "blah", which overrides any default vsftpd
- setting and any identical setting that was in the config file.
- .Sh FILES
--.Pa /etc/vsftpd.conf
-+.Pa /etc/vsftpd/vsftpd.conf
- .Sh SEE ALSO
- .Xr vsftpd.conf 5
- .end
-Index: vsftpd-2.3.5/vsftpd.conf
-===================================================================
---- vsftpd-2.3.5.orig/vsftpd.conf
-+++ vsftpd-2.3.5/vsftpd.conf
-@@ -1,4 +1,4 @@
--# Example config file /etc/vsftpd.conf
-+# Example config file /etc/vsftpd/vsftpd.conf
- #
- # The default compiled in settings are fairly paranoid. This sample file
- # loosens things up a bit, to make the ftp daemon more usable.
-@@ -87,7 +87,7 @@ connect_from_port_20=YES
- # useful for combatting certain DoS attacks.
- #deny_email_enable=YES
- # (default follows)
--#banned_email_file=/etc/vsftpd.banned_emails
-+#banned_email_file=/etc/vsftpd/vsftpd.banned_emails
- #
- # You may specify an explicit list of local users to chroot() to their home
- # directory. If chroot_local_user is YES, then this list becomes a list of
-@@ -98,7 +98,7 @@ connect_from_port_20=YES
- #chroot_local_user=YES
- #chroot_list_enable=YES
- # (default follows)
--#chroot_list_file=/etc/vsftpd.chroot_list
-+#chroot_list_file=/etc/vsftpd/vsftpd.chroot_list
- #
- # You may activate the "-R" option to the builtin ls. This is disabled by
- # default to avoid remote users being able to cause excessive I/O on large
-Index: vsftpd-2.3.5/vsftpd.conf.5
-===================================================================
---- vsftpd-2.3.5.orig/vsftpd.conf.5
-+++ vsftpd-2.3.5/vsftpd.conf.5
-@@ -4,7 +4,7 @@ vsftpd.conf \- config file for vsftpd
- .SH DESCRIPTION
- vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
- default, vsftpd looks for this file at the location
--.BR /etc/vsftpd.conf .
-+.BR /etc/vsftpd/vsftpd.conf .
- However, you may override this by specifying a command line argument to
- vsftpd. The command line argument is the pathname of the configuration file
- for vsftpd. This behaviour is useful because you may wish to use an advanced
-@@ -138,7 +138,7 @@ chroot() jail in their home directory up
- different if chroot_local_user is set to YES. In this case, the list becomes
- a list of users which are NOT to be placed in a chroot() jail.
- By default, the file containing this list is
--/etc/vsftpd.chroot_list, but you may override this with the
-+/etc/vsftpd/vsftpd.chroot_list, but you may override this with the
- .BR chroot_list_file
- setting.
-
-@@ -177,7 +177,7 @@ Default: NO
- .B deny_email_enable
- If activated, you may provide a list of anonymous password e-mail responses
- which cause login to be denied. By default, the file containing this list is
--/etc/vsftpd.banned_emails, but you may override this with the
-+/etc/vsftpd/vsftpd.banned_emails, but you may override this with the
- .BR banned_email_file
- setting.
-
-@@ -433,7 +433,7 @@ anonymous logins are prevented unless th
- file specified by the
- .BR email_password_file
- setting. The file format is one password per line, no extra whitespace. The
--default filename is /etc/vsftpd.email_passwords.
-+default filename is /etc/vsftpd/vsftpd.email_passwords.
-
- Default: NO
- .TP
-@@ -764,7 +764,7 @@ passwords which are not permitted. This
- .BR deny_email_enable
- is enabled.
-
--Default: /etc/vsftpd.banned_emails
-+Default: /etc/vsftpd/vsftpd.banned_emails
- .TP
- .B banner_file
- This option is the name of a file containing text to display when someone
-@@ -803,7 +803,7 @@ is enabled. If the option
- is enabled, then the list file becomes a list of users to NOT place in a
- chroot() jail.
-
--Default: /etc/vsftpd.chroot_list
-+Default: /etc/vsftpd/vsftpd.chroot_list
- .TP
- .B cmds_allowed
- This options specifies a comma separated list of allowed FTP commands (post
-@@ -864,7 +864,7 @@ This option can be used to provide an al
- .BR secure_email_list_enable
- setting.
-
--Default: /etc/vsftpd.email_passwords
-+Default: /etc/vsftpd/vsftpd.email_passwords
- .TP
- .B ftp_username
- This is the name of the user we use for handling anonymous FTP. The home
-@@ -987,10 +987,10 @@ the manual page, on a per-user basis. Us
- with an example. If you set
- .BR user_config_dir
- to be
--.BR /etc/vsftpd_user_conf
-+.BR /etc/vsftpd/vsftpd_user_conf
- and then log on as the user "chris", then vsftpd will apply the settings in
- the file
--.BR /etc/vsftpd_user_conf/chris
-+.BR /etc/vsftpd/vsftpd_user_conf/chris
- for the duration of the session. The format of this file is as detailed in
- this manual page! PLEASE NOTE that not all settings are effective on a
- per-user basis. For example, many settings only prior to the user's session
-@@ -1026,7 +1026,7 @@ This option is the name of the file load
- .BR userlist_enable
- option is active.
-
--Default: /etc/vsftpd.user_list
-+Default: /etc/vsftpd/vsftpd.user_list
- .TP
- .B vsftpd_log_file
- This option is the name of the file to which we write the vsftpd style
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch b/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch
deleted file mode 100644
index 5df3b03f3fa9..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: vsftpd-3.0.0/Makefile
-===================================================================
---- vsftpd-3.0.0.orig/Makefile
-+++ vsftpd-3.0.0/Makefile
-@@ -1,16 +1,16 @@
- # Makefile for systems with GNU tools
--CC = gcc
-+CC ?= gcc
- INSTALL = install
- IFLAGS = -idirafter dummyinc
- #CFLAGS = -g
--CFLAGS = -O2 -fPIE -fstack-protector --param=ssp-buffer-size=4 \
-- -Wall -W -Wshadow -Werror -Wformat-security \
-+CFLAGS += -fPIE -fstack-protector --param=ssp-buffer-size=4 \
-+ -Wall -W -Wshadow -Wformat-security \
- -D_FORTIFY_SOURCE=2 \
- #-pedantic -Wconversion
-
- LIBS = `./vsf_findlibs.sh`
- LINK =
--LDFLAGS = -fPIE -pie -Wl,-z,relro -Wl,-z,now
-+LDFLAGS += -fPIE -pie -Wl,-z,relro -Wl,-z,now
-
- OBJS = main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
- tunables.o ftpdataio.o secbuf.o ls.o \
-@@ -26,7 +26,7 @@ OBJS = main.o utility.o prelogin.o ftpcm
- $(CC) -c $*.c $(CFLAGS) $(IFLAGS)
-
- vsftpd: $(OBJS)
-- $(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
-+ $(CC) -o vsftpd $(LDFLAGS) $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
-
- install:
- if [ -x /usr/local/sbin ]; then \
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch b/net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch
deleted file mode 100644
index 2401f37c7e88..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.2-remove-legacy-cap.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=450536
-Patch by: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
-
-Probe the preferred version
---- vsftpd-3.0.2/sysdeputil.c.org 2013-01-05 18:32:13.241288839 +0100
-+++ vsftpd-3.0.2/sysdeputil.c 2013-01-05 19:41:53.038148078 +0100
-@@ -561,11 +561,17 @@
- }
-
- #ifndef VSF_SYSDEP_HAVE_LIBCAP
-+static struct __user_cap_header_struct sys_cap_head;
- static int
- do_checkcap(void)
- {
-+ int retval;
-+
-+ /* Store preferred version in sys_cap_head */
-+ vsf_sysutil_memclr(&sys_cap_head, sizeof(sys_cap_head));
- /* EFAULT (EINVAL if page 0 mapped) vs. ENOSYS */
-- int retval = capset(0, 0);
-+ retval = capset(&sys_cap_head, 0);
-+
- if (!vsf_sysutil_retval_is_error(retval) ||
- vsf_sysutil_get_error() != kVSFSysUtilErrNOSYS)
- {
-@@ -579,17 +585,13 @@
- {
- /* n.b. yes I know I should be using libcap!! */
- int retval;
-- struct __user_cap_header_struct cap_head;
-- struct __user_cap_data_struct cap_data;
-+ struct __user_cap_data_struct cap_data[2];
- __u32 cap_mask = 0;
- if (!caps)
- {
- bug("asked to adopt no capabilities");
- }
-- vsf_sysutil_memclr(&cap_head, sizeof(cap_head));
- vsf_sysutil_memclr(&cap_data, sizeof(cap_data));
-- cap_head.version = _LINUX_CAPABILITY_VERSION;
-- cap_head.pid = 0;
- if (caps & kCapabilityCAP_CHOWN)
- {
- cap_mask |= (1 << CAP_CHOWN);
-@@ -598,9 +600,9 @@
- {
- cap_mask |= (1 << CAP_NET_BIND_SERVICE);
- }
-- cap_data.effective = cap_data.permitted = cap_mask;
-- cap_data.inheritable = 0;
-- retval = capset(&cap_head, &cap_data);
-+ cap_data[0].effective = cap_data[0].permitted = cap_mask;
-+ cap_data[0].inheritable = 0;
-+ retval = capset(&sys_cap_head, &cap_data[0]);
- if (retval != 0)
- {
- die("capset");
diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch
deleted file mode 100644
index 75e0e3e7cfd3..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-3.0.4-dont-link-caps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/vsf_findlibs.sh
-+++ b/vsf_findlibs.sh
-@@ -47,14 +47,6 @@
- # For older HP-UX...
- locate_library /usr/lib/libsec.sl && echo "-lsec";
-
--# Look for libcap (capabilities)
--# Note that link may fail with:
--# /usr/bin/ld: cannot find -lcap
--# If the libcap-devel package isn't installed.
--locate_library /usr/lib/libcap.so && echo "-lcap";
--locate_library /lib/libcap.so && echo "-lcap";
--locate_library /lib64/libcap.so && echo "-lcap";
--
- # Solaris needs this for nanosleep()..
- locate_library /lib/libposix4.so && echo "-lposix4";
- locate_library /usr/lib/libposix4.so && echo "-lposix4";
diff --git a/net-ftp/vsftpd/files/vsftpd-checkconfig.sh b/net-ftp/vsftpd/files/vsftpd-checkconfig.sh
deleted file mode 100644
index e1d1e5231b67..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-checkconfig.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-VSFTPD_CONF="${VSFTPD_CONF:-/etc/vsftpd/vsftpd.conf}"
-
-if [ ! -e ${VSFTPD_CONF} ] ; then
- echo "Please setup ${VSFTPD_CONF} before starting vsftpd" >&2
- echo "There are sample configurations in /usr/share/doc/vsftpd" >&2
- exit 1
-fi
-
-if egrep -iq "^ *background *= *yes" "${VSFTPD_CONF}" ; then
- echo "${VSFTPD_CONF} must not set background=YES" >&2
- exit 1
-fi
-
-has_ip=false has_ipv6=false ip_error=true
-egrep -iq "^ *listen *= *yes" "${VSFTPD_CONF}" && has_ip=true
-egrep -iq "^ *listen_ipv6 *= *yes" "${VSFTPD_CONF}" && has_ipv6=true
-if ${has_ip} && ! ${has_ipv6} ; then
- ip_error=false
-elif ! ${has_ip} && ${has_ipv6} ; then
- ip_error=false
-fi
-if ${ip_error} ; then
- echo "${VSFTPD_CONF} must contain listen=YES or listen_ipv6=YES" >&2
- echo "but not both" >&2
- exit 1
-fi
-
diff --git a/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch b/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
deleted file mode 100644
index 10266e36a87e..000000000000
--- a/net-ftp/vsftpd/files/vsftpd-disable-seccomp-sandbox.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Disable buggy seccomp sandbox code by default
-
-Bug: https://bugs.gentoo.org/443898
-
---- a/tunables.c
-+++ b/tunables.c
-@@ -226,7 +226,7 @@
- tunable_isolate_network = 1;
- tunable_ftp_enable = 1;
- tunable_http_enable = 0;
-- tunable_seccomp_sandbox = 1;
-+ tunable_seccomp_sandbox = 0;
- tunable_allow_writeable_chroot = 0;
-
- tunable_accept_timeout = 60;
diff --git a/net-ftp/vsftpd/files/vsftpd.conf b/net-ftp/vsftpd/files/vsftpd.conf
deleted file mode 100644
index 3f2658e772ab..000000000000
--- a/net-ftp/vsftpd/files/vsftpd.conf
+++ /dev/null
@@ -1,104 +0,0 @@
-#
-# Example vsftpd config file
-#
-# See man 5 vsftpd.conf for more information.
-#
-
-# Enable vsftpd to run as a standalone daemon
-# Comment these two out to run under inetd or xinetd
-background=YES
-listen=YES
-
-# Allow anonymous FTP?
-anonymous_enable=YES
-
-# Uncomment this to allow local users to log in.
-#local_enable=YES
-
-# Uncomment this to enable any form of FTP write command.
-#write_enable=YES
-
-# Default umask for local users is 077. You may wish to change this to 022,
-# if your users expect that (022 is used by most other ftpd's)
-#local_umask=022
-
-# Uncomment this to allow the anonymous FTP user to upload files. This only
-# has an effect if the above global write enable is activated. Also, you will
-# obviously need to create a directory writable by the FTP user.
-#anon_upload_enable=YES
-
-# Uncomment this if you want the anonymous FTP user to be able to create
-# new directories.
-#anon_mkdir_write_enable=YES
-
-# Activate directory messages - messages given to remote users when they
-# go into a certain directory.
-dirmessage_enable=YES
-
-# Make sure PORT transfer connections originate from port 20 (ftp-data).
-connect_from_port_20=YES
-
-# If you want, you can arrange for uploaded anonymous files to be owned by
-# a different user. Note! Using "root" for uploaded files is not
-# recommended!
-#chown_uploads=YES
-#chown_username=whoever
-
-# Activate logging of uploads/downloads.
-xferlog_enable=YES
-
-# If you want, you can have your log file in standard ftpd xferlog format
-#xferlog_std_format=YES
-
-# You may override where the log file goes if you like.
-xferlog_file=/var/log/vsftpd.log
-
-# You may change the default value for timing out an idle session.
-#idle_session_timeout=600
-
-# You may change the default value for timing out a data connection.
-#data_connection_timeout=120
-
-# It is recommended that you define on your system a unique user which the
-# ftp server can use as a totally isolated and unprivileged user.
-nopriv_user=nobody
-
-# Enable this and the server will recognise asynchronous ABOR requests. Not
-# recommended for security (the code is non-trivial). Not enabling it,
-# however, may confuse older FTP clients.
-#async_abor_enable=YES
-
-# By default the server will pretend to allow ASCII mode but in fact ignore
-# the request. Turn on the below options to have the server actually do ASCII
-# mangling on files when in ASCII mode.
-# Beware that turning on ascii_download_enable enables malicious remote parties
-# to consume your I/O resources, by issuing the command "SIZE /big/file" in
-# ASCII mode.
-# These ASCII options are split into upload and download because you may wish
-# to enable ASCII uploads (to prevent uploaded scripts etc. from breaking),
-# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be
-# on the client anyway..
-#ascii_upload_enable=YES
-#ascii_download_enable=YES
-
-# You may fully customise the login banner string:
-#ftpd_banner=Welcome to blah FTP service.
-
-# You may specify a file of disallowed anonymous e-mail addresses. Apparently
-# useful for combatting certain DoS attacks.
-#deny_email_enable=YES
-# (default follows)
-#banned_email_file=/etc/vsftpd/banned_emails
-
-# You may specify an explicit list of local users to chroot() to their home
-# directory. If chroot_local_user is YES, then this list becomes a list of
-# users to NOT chroot().
-#chroot_list_enable=YES
-# (default follows)
-#chroot_list_file=/etc/vsftpd/chroot_list
-
-# You may activate the "-R" option to the builtin ls. This is disabled by
-# default to avoid remote users being able to cause excessive I/O on large
-# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
-# the presence of the "-R" option, so there is a strong case for enabling it.
-#ls_recurse_enable=YES
diff --git a/net-ftp/vsftpd/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init
deleted file mode 100644
index d49dc001404e..000000000000
--- a/net-ftp/vsftpd/files/vsftpd.init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2
-
-VSFTPD_NAME=${SVCNAME##*.}
-if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then
- VSFTPD_PID="/var/run/vsftpd.${VSFTPD_NAME}.pid"
- VSFTPD_CONF_DEFAULT="/etc/vsftpd/${VSFTPD_NAME}.conf"
-else
- VSFTPD_PID="/var/run/vsftpd.pid"
- VSFTPD_CONF_DEFAULT="/etc/vsftpd/vsftpd.conf"
-fi
-VSFTPD_CONF=${VSFTPD_CONF:-${VSFTPD_CONF_DEFAULT}}
-VSFTPD_EXEC=${VSFTPD_EXEC:-/usr/sbin/vsftpd}
-
-depend() {
- need net
- use dns logger
-}
-
-checkconfig() {
- VSFTPD_CONF="${VSFTPD_CONF}" \
- /usr/libexec/vsftpd-checkconfig.sh || return 1
-}
-
-start() {
- checkconfig || return 1
- ebegin "Starting ${SVCNAME}"
- start-stop-daemon --start --exec ${VSFTPD_EXEC} \
- --background --make-pidfile --pidfile "${VSFTPD_PID}" \
- -- "${VSFTPD_CONF}"
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${SVCNAME}"
- local retval=0
- if [ -f ${VSFTPD_PID} ]; then
- start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1
- pkill --full ${VSFTPD_CONF}
- else
- ewarn "Couldn't find ${VSFTPD_PID} trying to stop using the config filename ${VSFTPD_CONF}"
- pgrep --full ${VSFTPD_CONF} > ${VSFTPD_PID}
- start-stop-daemon --stop --pidfile ${VSFTPD_PID} || retval=1
- pkill --full ${VSFTPD_CONF}
- fi
- eend ${retval}
-}
-
-# vim: ts=4
diff --git a/net-ftp/vsftpd/files/vsftpd.service b/net-ftp/vsftpd/files/vsftpd.service
deleted file mode 100644
index 1445f2769861..000000000000
--- a/net-ftp/vsftpd/files/vsftpd.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Vsftpd ftp daemon
-After=network.target
-
-[Service]
-Type=simple
-ExecStartPre=/usr/libexec/vsftpd-checkconfig.sh
-ExecStart=/usr/sbin/vsftpd /etc/vsftpd/vsftpd.conf
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-ftp/vsftpd/files/vsftpd_at.service b/net-ftp/vsftpd/files/vsftpd_at.service
deleted file mode 100644
index 5380b83ffcfe..000000000000
--- a/net-ftp/vsftpd/files/vsftpd_at.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Very Secure FTP Daemon
-
-[Service]
-Type=simple
-# Note: Do not use ExecStartPre=/usr/libexec/vsftpd-checkconfig.sh, as it
-# requires one of the listen options to be enabled.
-ExecStart=/usr/sbin/vsftpd /etc/vsftpd/vsftpd.conf -obackground=NO -olisten=NO -olisten_ipv6=NO
-StandardInput=socket
-SuccessExitStatus=2
diff --git a/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild b/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild
deleted file mode 100644
index e3ad887f7e16..000000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.3-r4.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-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 sparc x86"
-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}
- net-ftp/ftpbase
- selinux? ( sec-policy/selinux-ftp )
- xinetd? ( sys-apps/xinetd )"
-
-src_prepare() {
- local 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
- )
-
- # 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
- 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"
- if use pam; then
- LIBS+=" -lpam"
- else
- LIBS+=" -lcrypt"
- fi
- 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}
-
- 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/*
-
- insinto "/usr/share/doc/${PF}/examples"
- doins -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
- 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"
-}
diff --git a/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild b/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild
deleted file mode 100644
index d68b28925225..000000000000
--- a/net-ftp/vsftpd/vsftpd-3.0.4-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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 )
- !pam? ( virtual/libcrypt:= )
- 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}-3.0.4-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"
- if use pam; then
- LIBS+=" -lpam"
- else
- LIBS+=" -lcrypt"
- fi
- 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] 6+ messages in thread
end of thread, other threads:[~2022-04-16 3:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-25 20:59 [gentoo-commits] repo/gentoo:master commit in: net-ftp/vsftpd/, net-ftp/vsftpd/files/ Sergei Trofimovich
-- strict thread matches above, loose matches on Subject: below --
2019-02-24 10:53 Pacho Ramos
2020-02-07 18:00 Mike Gilbert
2021-08-14 16:51 Mike Gilbert
2021-08-16 18:10 Mike Gilbert
2022-04-16 3:31 Mike Gilbert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox