From 677277c442e4e383bdbb18527affaf75153336da Mon Sep 17 00:00:00 2001 From: Raúl Porcel Date: Sat, 30 May 2009 11:28:41 +0000 Subject: Version bump, fix xinetd example, bug #266881, force libcap-2, bug #266806, bug #268353 (Portage version: 2.1.6.11/cvs/Linux i686, RepoMan options: --force) --- net-ftp/vsftpd/ChangeLog | 12 ++- net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch | 11 --- .../vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch | 20 ++++ net-ftp/vsftpd/vsftpd-2.0.6.ebuild | 108 --------------------- net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild | 104 ++++++++++++++++++++ net-ftp/vsftpd/vsftpd-2.1.0.ebuild | 105 -------------------- net-ftp/vsftpd/vsftpd-2.1.2.ebuild | 104 ++++++++++++++++++++ 7 files changed, 239 insertions(+), 225 deletions(-) create mode 100644 net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch delete mode 100644 net-ftp/vsftpd/vsftpd-2.0.6.ebuild create mode 100644 net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild delete mode 100644 net-ftp/vsftpd/vsftpd-2.1.0.ebuild create mode 100644 net-ftp/vsftpd/vsftpd-2.1.2.ebuild (limited to 'net-ftp') diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index 9c6ad8cf5a3d..f9865fc593c6 100644 --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-ftp/vsftpd # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.115 2009/04/25 17:34:16 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.116 2009/05/30 11:28:41 armin76 Exp $ + +*vsftpd-2.1.2 (30 May 2009) +*vsftpd-2.1.0-r1 (30 May 2009) + + 30 May 2009; Raúl Porcel + files/vsftpd-2.1.0-gentoo.patch, +files/vsftpd-2.1.2-dont-link-caps.patch, + -vsftpd-2.0.6.ebuild, -vsftpd-2.1.0.ebuild, +vsftpd-2.1.0-r1.ebuild, + +vsftpd-2.1.2.ebuild: + Version bump, fix xinetd example, bug #266881, force libcap-2, bug #266806, + bug #268353 25 Apr 2009; Raúl Porcel vsftpd-2.1.0.ebuild: arm/ia64/s390/sh/sparc stable wrt #266664 diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch index f428fb41beca..b3589920721d 100644 --- a/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch +++ b/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch @@ -75,17 +75,6 @@ diff -ur vsftpd-2.1.0.orig/vsftpd.conf vsftpd-2.1.0/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. -@@ -8,6 +8,10 @@ - # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's - # capabilities. - # -+# Listen on IPv4. xinet users must set NO or comment out -+# otherwise it must be set YES -+listen=YES -+# - # Allow anonymous FTP? (Beware - allowed by default if you comment this out). - anonymous_enable=YES - # @@ -87,14 +91,14 @@ # useful for combatting certain DoS attacks. #deny_email_enable=YES diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch new file mode 100644 index 000000000000..d36fa37ffe40 --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-2.1.2-dont-link-caps.patch @@ -0,0 +1,20 @@ +diff -ur vsftpd-2.1.2.orig/vsf_findlibs.sh vsftpd-2.1.2/vsf_findlibs.sh +--- vsftpd-2.1.2.orig/vsf_findlibs.sh 2009-05-30 12:43:33.000000000 +0200 ++++ vsftpd-2.1.2/vsf_findlibs.sh 2009-05-30 12:44:41.000000000 +0200 +@@ -42,16 +42,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"; +-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/vsftpd-2.0.6.ebuild b/net-ftp/vsftpd/vsftpd-2.0.6.ebuild deleted file mode 100644 index 0614381d1eda..000000000000 --- a/net-ftp/vsftpd/vsftpd-2.0.6.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.6.ebuild,v 1.10 2008/11/06 02:31:10 vapier Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind" -HOMEPAGE="http://vsftpd.beasts.org/" -SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="caps logrotate pam tcpd ssl selinux xinetd" - -DEPEND="caps? ( sys-libs/libcap ) - pam? ( virtual/pam ) - tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) - ssl? ( >=dev-libs/openssl-0.9.7d )" -RDEPEND="${DEPEND} - net-ftp/ftpbase - logrotate? ( app-admin/logrotate ) - selinux? ( sec-policy/selinux-ftpd ) - xinetd? ( sys-apps/xinetd )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Patch the source, config and the manpage to use /etc/vsftpd/ - epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch" - - # Fix building without the libcap - epatch "${FILESDIR}/${PN}-2.0.6-caps.patch" - has_version "> 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 - sed -i '/libcap/ d' vsf_findlibs.sh - fi - - # Let portage control stripping - sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile -} - -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die -} - -src_install() { - into /usr - doman vsftpd.conf.5 vsftpd.8 - dosbin vsftpd || die - - dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ - README README.security REWARD SIZE \ - SPEED TODO TUNING - newdoc vsftpd.conf vsftpd.conf.example - - docinto security - dodoc SECURITY/* - - insinto "/usr/share/doc/${PF}/examples" - doins -r EXAMPLE/* - - insinto /etc/vsftpd - newins vsftpd.conf vsftpd.conf.example - - if use logrotate ; then - insinto /etc/logrotate.d - newins "${FILESDIR}/vsftpd.logrotate" vsftpd - fi - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/vsftpd.xinetd" vsftpd - fi - - newinitd "${FILESDIR}/vsftpd.init" vsftpd - - keepdir /usr/share/vsftpd/empty -} - -pkg_preinst() { - # If we use xinetd, then we comment out listen=YES - # so that our default config works under xinetd - fixes #78347 - if use xinetd ; then - sed -i '/\listen=YES/s/^/#/g' "${D}"/etc/vsftpd/vsftpd.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-2.1.0-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild new file mode 100644 index 000000000000..0967ad4d4367 --- /dev/null +++ b/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild,v 1.1 2009/05/30 11:28:41 armin76 Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind" +HOMEPAGE="http://vsftpd.beasts.org/" +SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm 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-ftpd ) + xinetd? ( sys-apps/xinetd )" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Patch the source, config and the manpage to use /etc/vsftpd/ + epatch "${FILESDIR}/${PN}-2.1.0-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 + epatch "${FILESDIR}"/${PN}-2.1.0-dont-link-caps.patch + fi + + # Let portage control stripping + sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile +} + +src_compile() { + emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die +} + +src_install() { + into /usr + doman vsftpd.conf.5 vsftpd.8 + dosbin vsftpd || die + + dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ + README README.security REWARD SIZE \ + SPEED TODO TUNING + newdoc vsftpd.conf vsftpd.conf.example + + docinto security + dodoc SECURITY/* + + insinto "/usr/share/doc/${PF}/examples" + doins -r EXAMPLE/* + + insinto /etc/vsftpd + newins vsftpd.conf vsftpd.conf.example + + insinto /etc/logrotate.d + newins "${FILESDIR}/vsftpd.logrotate" vsftpd + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/vsftpd.xinetd" vsftpd + fi + + newinitd "${FILESDIR}/vsftpd.init" vsftpd + + keepdir /usr/share/vsftpd/empty +} + +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/vsftpd/vsftpd.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-2.1.0.ebuild b/net-ftp/vsftpd/vsftpd-2.1.0.ebuild deleted file mode 100644 index dacaefe43329..000000000000 --- a/net-ftp/vsftpd/vsftpd-2.1.0.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.0.ebuild,v 1.5 2009/04/25 17:34:16 armin76 Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind" -HOMEPAGE="http://vsftpd.beasts.org/" -SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="caps pam tcpd ssl selinux xinetd" - -DEPEND="caps? ( sys-libs/libcap ) - 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-ftpd ) - xinetd? ( sys-apps/xinetd )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # Patch the source, config and the manpage to use /etc/vsftpd/ - epatch "${FILESDIR}/${PN}-2.1.0-gentoo.patch" - - # Fix building without the libcap - epatch "${FILESDIR}/${PN}-2.1.0-caps.patch" - has_version "> 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 - epatch "${FILESDIR}"/${PN}-2.1.0-dont-link-caps.patch - fi - - # Let portage control stripping - sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile -} - -src_compile() { - emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die -} - -src_install() { - into /usr - doman vsftpd.conf.5 vsftpd.8 - dosbin vsftpd || die - - dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ - README README.security REWARD SIZE \ - SPEED TODO TUNING - newdoc vsftpd.conf vsftpd.conf.example - - docinto security - dodoc SECURITY/* - - insinto "/usr/share/doc/${PF}/examples" - doins -r EXAMPLE/* - - insinto /etc/vsftpd - newins vsftpd.conf vsftpd.conf.example - - insinto /etc/logrotate.d - newins "${FILESDIR}/vsftpd.logrotate" vsftpd - - if use xinetd ; then - insinto /etc/xinetd.d - newins "${FILESDIR}/vsftpd.xinetd" vsftpd - fi - - newinitd "${FILESDIR}/vsftpd.init" vsftpd - - keepdir /usr/share/vsftpd/empty -} - -pkg_preinst() { - # If we use xinetd, then we comment out listen=YES - # so that our default config works under xinetd - fixes #78347 - if use xinetd ; then - sed -i '/\listen=YES/s/^/#/g' "${D}"/etc/vsftpd/vsftpd.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-2.1.2.ebuild b/net-ftp/vsftpd/vsftpd-2.1.2.ebuild new file mode 100644 index 000000000000..4f933f49e1f5 --- /dev/null +++ b/net-ftp/vsftpd/vsftpd-2.1.2.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.2.ebuild,v 1.1 2009/05/30 11:28:41 armin76 Exp $ + +inherit eutils toolchain-funcs + +DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind" +HOMEPAGE="http://vsftpd.beasts.org/" +SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~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-ftpd ) + xinetd? ( sys-apps/xinetd )" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Patch the source, config and the manpage to use /etc/vsftpd/ + epatch "${FILESDIR}/${PN}-2.1.0-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 + epatch "${FILESDIR}"/${PN}-2.1.2-dont-link-caps.patch + fi + + # Let portage control stripping + sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile +} + +src_compile() { + emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die +} + +src_install() { + into /usr + doman vsftpd.conf.5 vsftpd.8 + dosbin vsftpd || die + + dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ + README README.security REWARD SIZE \ + SPEED TODO TUNING + newdoc vsftpd.conf vsftpd.conf.example + + docinto security + dodoc SECURITY/* + + insinto "/usr/share/doc/${PF}/examples" + doins -r EXAMPLE/* + + insinto /etc/vsftpd + newins vsftpd.conf vsftpd.conf.example + + insinto /etc/logrotate.d + newins "${FILESDIR}/vsftpd.logrotate" vsftpd + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/vsftpd.xinetd" vsftpd + fi + + newinitd "${FILESDIR}/vsftpd.init" vsftpd + + keepdir /usr/share/vsftpd/empty +} + +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/vsftpd/vsftpd.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" +} -- cgit v1.2.3-65-gdbad