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