diff options
author | Markos Chandras <hwoarang@gentoo.org> | 2012-04-12 10:50:40 +0000 |
---|---|---|
committer | Markos Chandras <hwoarang@gentoo.org> | 2012-04-12 10:50:40 +0000 |
commit | 64194bbcdea8ec4c8ac8db71ff4127897c828328 (patch) | |
tree | ff45eb7d2cc8dfc76ded31a70285e2cd72db31cd /net-ftp/vsftpd | |
parent | Drop akonadi use flag from 4.8.x and merge build options with semantic-deskto... (diff) | |
download | gentoo-2-64194bbcdea8ec4c8ac8db71ff4127897c828328.tar.gz gentoo-2-64194bbcdea8ec4c8ac8db71ff4127897c828328.tar.bz2 gentoo-2-64194bbcdea8ec4c8ac8db71ff4127897c828328.zip |
Version bump thanks to Johan Bergstrom <bugs@bergstroem.nu>. Bug #411545
(Portage version: 2.1.10.49/cvs/Linux x86_64)
Diffstat (limited to 'net-ftp/vsftpd')
-rw-r--r-- | net-ftp/vsftpd/ChangeLog | 8 | ||||
-rw-r--r-- | net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch | 34 | ||||
-rw-r--r-- | net-ftp/vsftpd/vsftpd-3.0.0.ebuild | 112 |
3 files changed, 153 insertions, 1 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog index 34021a44e67a..a3494195ec5a 100644 --- a/net-ftp/vsftpd/ChangeLog +++ b/net-ftp/vsftpd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-ftp/vsftpd # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.146 2012/04/12 10:12:30 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.147 2012/04/12 10:50:40 hwoarang Exp $ + +*vsftpd-3.0.0 (12 Apr 2012) + + 12 Apr 2012; Markos Chandras <hwoarang@gentoo.org> + +files/vsftpd-3.0.0-Makefile.patch, +vsftpd-3.0.0.ebuild: + Version bump thanks to Johan Bergström <bugs@bergstroem.nu>. Bug #411545 12 Apr 2012; Markos Chandras <hwoarang@gentoo.org> vsftpd-2.3.4.ebuild, vsftpd-2.3.5.ebuild: diff --git a/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch b/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch new file mode 100644 index 000000000000..ab917209ea7b --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-3.0.0-Makefile.patch @@ -0,0 +1,34 @@ +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/vsftpd-3.0.0.ebuild b/net-ftp/vsftpd/vsftpd-3.0.0.ebuild new file mode 100644 index 000000000000..ef0741491225 --- /dev/null +++ b/net-ftp/vsftpd/vsftpd-3.0.0.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.0.ebuild,v 1.1 2012/04/12 10:50:40 hwoarang Exp $ + +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-ftpd ) + 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" + + # 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}"/${P}-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 +} + +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" +} |