1 |
armin76 08/12/26 16:50:16 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: vsftpd-2.0.7-r1.ebuild |
5 |
Removed: vsftpd-2.0.7.ebuild vsftpd-2.0.5-r3.ebuild |
6 |
Log: |
7 |
Fix init script, bug 234278 |
8 |
(Portage version: 2.1.6.3/cvs/Linux 2.6.27-gentoo-r7 i686) |
9 |
|
10 |
Revision Changes Path |
11 |
1.102 net-ftp/vsftpd/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.102&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.102&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/ChangeLog?r1=1.101&r2=1.102 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v |
20 |
retrieving revision 1.101 |
21 |
retrieving revision 1.102 |
22 |
diff -u -r1.101 -r1.102 |
23 |
--- ChangeLog 21 Aug 2008 22:51:37 -0000 1.101 |
24 |
+++ ChangeLog 26 Dec 2008 16:50:16 -0000 1.102 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for net-ftp/vsftpd |
27 |
# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.101 2008/08/21 22:51:37 cardoe Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.102 2008/12/26 16:50:16 armin76 Exp $ |
30 |
+ |
31 |
+*vsftpd-2.0.7-r1 (26 Dec 2008) |
32 |
+ |
33 |
+ 26 Dec 2008; Raúl Porcel <armin76@g.o> files/vsftpd.init, |
34 |
+ -vsftpd-2.0.5-r3.ebuild, -vsftpd-2.0.7.ebuild, +vsftpd-2.0.7-r1.ebuild: |
35 |
+ Fix init script, bug 234278 |
36 |
|
37 |
21 Aug 2008; Doug Goldstein <cardoe@g.o> metadata.xml: |
38 |
add GLEP 56 USE flag desc from use.local.desc |
39 |
|
40 |
|
41 |
|
42 |
1.1 net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: vsftpd-2.0.7-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2008 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.0.7-r1.ebuild,v 1.1 2008/12/26 16:50:16 armin76 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 logrotate pam tcpd ssl selinux xinetd" |
63 |
|
64 |
DEPEND="caps? ( sys-libs/libcap ) |
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 |
logrotate? ( app-admin/logrotate ) |
71 |
selinux? ( sec-policy/selinux-ftpd ) |
72 |
xinetd? ( sys-apps/xinetd )" |
73 |
|
74 |
src_unpack() { |
75 |
unpack ${A} |
76 |
cd "${S}" |
77 |
|
78 |
# Patch the source, config and the manpage to use /etc/vsftpd/ |
79 |
epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch" |
80 |
|
81 |
# Fix building without the libcap |
82 |
epatch "${FILESDIR}/${PN}-2.0.6-caps.patch" |
83 |
has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch |
84 |
|
85 |
# Configure vsftpd build defaults |
86 |
use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h |
87 |
use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h |
88 |
use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h |
89 |
|
90 |
# Ensure that we don't link against libcap unless asked |
91 |
if ! use caps ; then |
92 |
sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c |
93 |
sed -i '/libcap/ d' vsf_findlibs.sh |
94 |
fi |
95 |
|
96 |
# Let portage control stripping |
97 |
sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile |
98 |
} |
99 |
|
100 |
src_compile() { |
101 |
emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die |
102 |
} |
103 |
|
104 |
src_install() { |
105 |
into /usr |
106 |
doman vsftpd.conf.5 vsftpd.8 |
107 |
dosbin vsftpd || die |
108 |
|
109 |
dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ |
110 |
README README.security REWARD SIZE \ |
111 |
SPEED TODO TUNING |
112 |
newdoc vsftpd.conf vsftpd.conf.example |
113 |
|
114 |
docinto security |
115 |
dodoc SECURITY/* |
116 |
|
117 |
insinto "/usr/share/doc/${PF}/examples" |
118 |
doins -r EXAMPLE/* |
119 |
|
120 |
insinto /etc/vsftpd |
121 |
newins vsftpd.conf vsftpd.conf.example |
122 |
|
123 |
if use logrotate ; then |
124 |
insinto /etc/logrotate.d |
125 |
newins "${FILESDIR}/vsftpd.logrotate" vsftpd |
126 |
fi |
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 comment out listen=YES |
140 |
# so that our default config works under xinetd - fixes #78347 |
141 |
if use xinetd ; then |
142 |
sed -i '/\listen=YES/s/^/#/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 |
} |