1 |
armin76 09/05/30 11:28:41 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: vsftpd-2.1.2.ebuild vsftpd-2.1.0-r1.ebuild |
5 |
Removed: vsftpd-2.0.6.ebuild vsftpd-2.1.0.ebuild |
6 |
Log: |
7 |
Version bump, fix xinetd example, bug #266881, force libcap-2, bug #266806, bug #268353 |
8 |
(Portage version: 2.1.6.11/cvs/Linux i686, RepoMan options: --force) |
9 |
|
10 |
Revision Changes Path |
11 |
1.116 net-ftp/vsftpd/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.116&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.116&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/ChangeLog?r1=1.115&r2=1.116 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v |
20 |
retrieving revision 1.115 |
21 |
retrieving revision 1.116 |
22 |
diff -u -r1.115 -r1.116 |
23 |
--- ChangeLog 25 Apr 2009 17:34:16 -0000 1.115 |
24 |
+++ ChangeLog 30 May 2009 11:28:41 -0000 1.116 |
25 |
@@ -1,6 +1,16 @@ |
26 |
# ChangeLog for net-ftp/vsftpd |
27 |
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.115 2009/04/25 17:34:16 armin76 Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.116 2009/05/30 11:28:41 armin76 Exp $ |
30 |
+ |
31 |
+*vsftpd-2.1.2 (30 May 2009) |
32 |
+*vsftpd-2.1.0-r1 (30 May 2009) |
33 |
+ |
34 |
+ 30 May 2009; Raúl Porcel <armin76@g.o> |
35 |
+ files/vsftpd-2.1.0-gentoo.patch, +files/vsftpd-2.1.2-dont-link-caps.patch, |
36 |
+ -vsftpd-2.0.6.ebuild, -vsftpd-2.1.0.ebuild, +vsftpd-2.1.0-r1.ebuild, |
37 |
+ +vsftpd-2.1.2.ebuild: |
38 |
+ Version bump, fix xinetd example, bug #266881, force libcap-2, bug #266806, |
39 |
+ bug #268353 |
40 |
|
41 |
25 Apr 2009; Raúl Porcel <armin76@g.o> vsftpd-2.1.0.ebuild: |
42 |
arm/ia64/s390/sh/sparc stable wrt #266664 |
43 |
|
44 |
|
45 |
|
46 |
1.1 net-ftp/vsftpd/vsftpd-2.1.2.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.2.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.2.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: vsftpd-2.1.2.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2009 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.2.ebuild,v 1.1 2009/05/30 11:28:41 armin76 Exp $ |
56 |
|
57 |
inherit eutils toolchain-funcs |
58 |
|
59 |
DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind" |
60 |
HOMEPAGE="http://vsftpd.beasts.org/" |
61 |
SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz" |
62 |
|
63 |
LICENSE="GPL-2" |
64 |
SLOT="0" |
65 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
66 |
IUSE="caps pam tcpd ssl selinux xinetd" |
67 |
|
68 |
DEPEND="caps? ( >=sys-libs/libcap-2 ) |
69 |
pam? ( virtual/pam ) |
70 |
tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
71 |
ssl? ( >=dev-libs/openssl-0.9.7d )" |
72 |
RDEPEND="${DEPEND} |
73 |
net-ftp/ftpbase |
74 |
selinux? ( sec-policy/selinux-ftpd ) |
75 |
xinetd? ( sys-apps/xinetd )" |
76 |
|
77 |
src_unpack() { |
78 |
unpack ${A} |
79 |
cd "${S}" |
80 |
|
81 |
# Patch the source, config and the manpage to use /etc/vsftpd/ |
82 |
epatch "${FILESDIR}/${PN}-2.1.0-gentoo.patch" |
83 |
|
84 |
# Fix building without the libcap |
85 |
epatch "${FILESDIR}/${PN}-2.1.0-caps.patch" |
86 |
|
87 |
# Configure vsftpd build defaults |
88 |
use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h |
89 |
use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h |
90 |
use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h |
91 |
|
92 |
# Ensure that we don't link against libcap unless asked |
93 |
if ! use caps ; then |
94 |
sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c |
95 |
epatch "${FILESDIR}"/${PN}-2.1.2-dont-link-caps.patch |
96 |
fi |
97 |
|
98 |
# Let portage control stripping |
99 |
sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile |
100 |
} |
101 |
|
102 |
src_compile() { |
103 |
emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die |
104 |
} |
105 |
|
106 |
src_install() { |
107 |
into /usr |
108 |
doman vsftpd.conf.5 vsftpd.8 |
109 |
dosbin vsftpd || die |
110 |
|
111 |
dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ |
112 |
README README.security REWARD SIZE \ |
113 |
SPEED TODO TUNING |
114 |
newdoc vsftpd.conf vsftpd.conf.example |
115 |
|
116 |
docinto security |
117 |
dodoc SECURITY/* |
118 |
|
119 |
insinto "/usr/share/doc/${PF}/examples" |
120 |
doins -r EXAMPLE/* |
121 |
|
122 |
insinto /etc/vsftpd |
123 |
newins vsftpd.conf vsftpd.conf.example |
124 |
|
125 |
insinto /etc/logrotate.d |
126 |
newins "${FILESDIR}/vsftpd.logrotate" vsftpd |
127 |
|
128 |
if use xinetd ; then |
129 |
insinto /etc/xinetd.d |
130 |
newins "${FILESDIR}/vsftpd.xinetd" vsftpd |
131 |
fi |
132 |
|
133 |
newinitd "${FILESDIR}/vsftpd.init" vsftpd |
134 |
|
135 |
keepdir /usr/share/vsftpd/empty |
136 |
} |
137 |
|
138 |
pkg_preinst() { |
139 |
# If we use xinetd, then we set listen=NO |
140 |
# so that our default config works under xinetd - fixes #78347 |
141 |
if use xinetd ; then |
142 |
sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example |
143 |
fi |
144 |
} |
145 |
|
146 |
pkg_postinst() { |
147 |
einfo "vsftpd init script can now be multiplexed." |
148 |
einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist." |
149 |
einfo "If you symlink the init script to another one, say vsftpd.foo" |
150 |
einfo "then that uses /etc/vsftpd/foo.conf instead." |
151 |
einfo |
152 |
einfo "Example:" |
153 |
einfo " cd /etc/init.d" |
154 |
einfo " ln -s vsftpd vsftpd.foo" |
155 |
einfo "You can now treat vsftpd.foo like any other service" |
156 |
} |
157 |
|
158 |
|
159 |
|
160 |
1.1 net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild |
161 |
|
162 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild?rev=1.1&view=markup |
163 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/vsftpd-2.1.0-r1.ebuild?rev=1.1&content-type=text/plain |
164 |
|
165 |
Index: vsftpd-2.1.0-r1.ebuild |
166 |
=================================================================== |
167 |
# Copyright 1999-2009 Gentoo Foundation |
168 |
# Distributed under the terms of the GNU General Public License v2 |
169 |
# $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 $ |
170 |
|
171 |
inherit eutils toolchain-funcs |
172 |
|
173 |
DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind" |
174 |
HOMEPAGE="http://vsftpd.beasts.org/" |
175 |
SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz" |
176 |
|
177 |
LICENSE="GPL-2" |
178 |
SLOT="0" |
179 |
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd" |
180 |
IUSE="caps pam tcpd ssl selinux xinetd" |
181 |
|
182 |
DEPEND="caps? ( >=sys-libs/libcap-2 ) |
183 |
pam? ( virtual/pam ) |
184 |
tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
185 |
ssl? ( >=dev-libs/openssl-0.9.7d )" |
186 |
RDEPEND="${DEPEND} |
187 |
net-ftp/ftpbase |
188 |
selinux? ( sec-policy/selinux-ftpd ) |
189 |
xinetd? ( sys-apps/xinetd )" |
190 |
|
191 |
src_unpack() { |
192 |
unpack ${A} |
193 |
cd "${S}" |
194 |
|
195 |
# Patch the source, config and the manpage to use /etc/vsftpd/ |
196 |
epatch "${FILESDIR}/${PN}-2.1.0-gentoo.patch" |
197 |
|
198 |
# Fix building without the libcap |
199 |
epatch "${FILESDIR}/${PN}-2.1.0-caps.patch" |
200 |
|
201 |
# Configure vsftpd build defaults |
202 |
use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h |
203 |
use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h |
204 |
use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h |
205 |
|
206 |
# Ensure that we don't link against libcap unless asked |
207 |
if ! use caps ; then |
208 |
sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c |
209 |
epatch "${FILESDIR}"/${PN}-2.1.0-dont-link-caps.patch |
210 |
fi |
211 |
|
212 |
# Let portage control stripping |
213 |
sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile |
214 |
} |
215 |
|
216 |
src_compile() { |
217 |
emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die |
218 |
} |
219 |
|
220 |
src_install() { |
221 |
into /usr |
222 |
doman vsftpd.conf.5 vsftpd.8 |
223 |
dosbin vsftpd || die |
224 |
|
225 |
dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ |
226 |
README README.security REWARD SIZE \ |
227 |
SPEED TODO TUNING |
228 |
newdoc vsftpd.conf vsftpd.conf.example |
229 |
|
230 |
docinto security |
231 |
dodoc SECURITY/* |
232 |
|
233 |
insinto "/usr/share/doc/${PF}/examples" |
234 |
doins -r EXAMPLE/* |
235 |
|
236 |
insinto /etc/vsftpd |
237 |
newins vsftpd.conf vsftpd.conf.example |
238 |
|
239 |
insinto /etc/logrotate.d |
240 |
newins "${FILESDIR}/vsftpd.logrotate" vsftpd |
241 |
|
242 |
if use xinetd ; then |
243 |
insinto /etc/xinetd.d |
244 |
newins "${FILESDIR}/vsftpd.xinetd" vsftpd |
245 |
fi |
246 |
|
247 |
newinitd "${FILESDIR}/vsftpd.init" vsftpd |
248 |
|
249 |
keepdir /usr/share/vsftpd/empty |
250 |
} |
251 |
|
252 |
pkg_preinst() { |
253 |
# If we use xinetd, then we set listen=NO |
254 |
# so that our default config works under xinetd - fixes #78347 |
255 |
if use xinetd ; then |
256 |
sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example |
257 |
fi |
258 |
} |
259 |
|
260 |
pkg_postinst() { |
261 |
einfo "vsftpd init script can now be multiplexed." |
262 |
einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist." |
263 |
einfo "If you symlink the init script to another one, say vsftpd.foo" |
264 |
einfo "then that uses /etc/vsftpd/foo.conf instead." |
265 |
einfo |
266 |
einfo "Example:" |
267 |
einfo " cd /etc/init.d" |
268 |
einfo " ln -s vsftpd vsftpd.foo" |
269 |
einfo "You can now treat vsftpd.foo like any other service" |
270 |
} |