Gentoo Archives: gentoo-commits

From: "Victor Ostorga (vostorga)" <vostorga@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-ftp/vsftpd: ChangeLog vsftpd-2.2.0.ebuild
Date: Sun, 23 Aug 2009 16:11:15
Message-Id: E1MfFf0-0000iz-39@stork.gentoo.org
1 vostorga 09/08/23 16:11:14
2
3 Modified: ChangeLog
4 Added: vsftpd-2.2.0.ebuild
5 Log:
6 Version bump to 2.2.0
7 (Portage version: 2.1.6.13/cvs/Linux i686)
8
9 Revision Changes Path
10 1.117 net-ftp/vsftpd/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.117&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.117&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/ChangeLog?r1=1.116&r2=1.117
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v
19 retrieving revision 1.116
20 retrieving revision 1.117
21 diff -u -r1.116 -r1.117
22 --- ChangeLog 30 May 2009 11:28:41 -0000 1.116
23 +++ ChangeLog 23 Aug 2009 16:11:13 -0000 1.117
24 @@ -1,6 +1,12 @@
25 # ChangeLog for net-ftp/vsftpd
26 -# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.116 2009/05/30 11:28:41 armin76 Exp $
28 +# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.117 2009/08/23 16:11:13 vostorga Exp $
30 +
31 +*vsftpd-2.2.0 (23 Aug 2009)
32 +
33 + 23 Aug 2009; VĂ­ctor Ostorga <vostorga@g.o> +vsftpd-2.2.0.ebuild,
34 + +files/vsftpd-2.2.0-gentoo.patch:
35 + Version bump to 2.2.0
36
37 *vsftpd-2.1.2 (30 May 2009)
38 *vsftpd-2.1.0-r1 (30 May 2009)
39
40
41
42 1.1 net-ftp/vsftpd/vsftpd-2.2.0.ebuild
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/vsftpd-2.2.0.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/vsftpd-2.2.0.ebuild?rev=1.1&content-type=text/plain
46
47 Index: vsftpd-2.2.0.ebuild
48 ===================================================================
49 # Copyright 1999-2009 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.2.0.ebuild,v 1.1 2009/08/23 16:11:13 vostorga Exp $
52
53 inherit eutils toolchain-funcs
54
55 DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
56 HOMEPAGE="http://vsftpd.beasts.org/"
57 SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
58
59 LICENSE="GPL-2"
60 SLOT="0"
61 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
62 IUSE="caps pam tcpd ssl selinux xinetd"
63
64 DEPEND="caps? ( >=sys-libs/libcap-2 )
65 pam? ( virtual/pam )
66 tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
67 ssl? ( >=dev-libs/openssl-0.9.7d )"
68 RDEPEND="${DEPEND}
69 net-ftp/ftpbase
70 selinux? ( sec-policy/selinux-ftpd )
71 xinetd? ( sys-apps/xinetd )"
72
73 src_unpack() {
74 unpack ${A}
75 cd "${S}"
76
77 # Patch the source, config and the manpage to use /etc/vsftpd/
78 epatch "${FILESDIR}/${P}-gentoo.patch"
79
80 # Fix building without the libcap
81 epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
82
83 # Configure vsftpd build defaults
84 use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
85 use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
86 use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
87
88 # Ensure that we don't link against libcap unless asked
89 if ! use caps ; then
90 sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
91 epatch "${FILESDIR}"/${PN}-2.1.2-dont-link-caps.patch
92 fi
93
94 # Let portage control stripping
95 sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
96 }
97
98 src_compile() {
99 emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
100 }
101
102 src_install() {
103 into /usr
104 doman vsftpd.conf.5 vsftpd.8
105 dosbin vsftpd || die
106
107 dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
108 README README.security REWARD SIZE \
109 SPEED TODO TUNING
110 newdoc vsftpd.conf vsftpd.conf.example
111
112 docinto security
113 dodoc SECURITY/*
114
115 insinto "/usr/share/doc/${PF}/examples"
116 doins -r EXAMPLE/*
117
118 insinto /etc/vsftpd
119 newins vsftpd.conf vsftpd.conf.example
120
121 insinto /etc/logrotate.d
122 newins "${FILESDIR}/vsftpd.logrotate" vsftpd
123
124 if use xinetd ; then
125 insinto /etc/xinetd.d
126 newins "${FILESDIR}/vsftpd.xinetd" vsftpd
127 fi
128
129 newinitd "${FILESDIR}/vsftpd.init" vsftpd
130
131 keepdir /usr/share/vsftpd/empty
132 }
133
134 pkg_preinst() {
135 # If we use xinetd, then we set listen=NO
136 # so that our default config works under xinetd - fixes #78347
137 if use xinetd ; then
138 sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
139 fi
140 }
141
142 pkg_postinst() {
143 einfo "vsftpd init script can now be multiplexed."
144 einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
145 einfo "If you symlink the init script to another one, say vsftpd.foo"
146 einfo "then that uses /etc/vsftpd/foo.conf instead."
147 einfo
148 einfo "Example:"
149 einfo " cd /etc/init.d"
150 einfo " ln -s vsftpd vsftpd.foo"
151 einfo "You can now treat vsftpd.foo like any other service"
152 }