1 |
hwoarang 12/09/28 17:34:23 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: vsftpd-3.0.2.ebuild |
5 |
Log: |
6 |
Version bump. Thanks to Johan Bergström <bugs@××××××××××.nu>. Bug #436248 |
7 |
|
8 |
(Portage version: 2.1.11.23/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.156 net-ftp/vsftpd/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.156&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/ChangeLog?rev=1.156&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/ChangeLog?r1=1.155&r2=1.156 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v |
20 |
retrieving revision 1.155 |
21 |
retrieving revision 1.156 |
22 |
diff -u -r1.155 -r1.156 |
23 |
--- ChangeLog 28 May 2012 14:50:42 -0000 1.155 |
24 |
+++ ChangeLog 28 Sep 2012 17:34:23 -0000 1.156 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-ftp/vsftpd |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.155 2012/05/28 14:50:42 armin76 Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.156 2012/09/28 17:34:23 hwoarang Exp $ |
30 |
+ |
31 |
+*vsftpd-3.0.2 (28 Sep 2012) |
32 |
+ |
33 |
+ 28 Sep 2012; Markos Chandras <hwoarang@g.o> +vsftpd-3.0.2.ebuild: |
34 |
+ Version bump. Thanks to Johan Bergström <bugs@××××××××××.nu>. Bug #436248 |
35 |
|
36 |
28 May 2012; Raúl Porcel <armin76@g.o> vsftpd-2.3.5.ebuild: |
37 |
ia64/s390/sh/sparc stable wrt #411707 |
38 |
|
39 |
|
40 |
|
41 |
1.1 net-ftp/vsftpd/vsftpd-3.0.2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: vsftpd-3.0.2.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2012 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-3.0.2.ebuild,v 1.1 2012/09/28 17:34:23 hwoarang Exp $ |
51 |
|
52 |
EAPI="4" |
53 |
|
54 |
inherit eutils toolchain-funcs |
55 |
|
56 |
DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind" |
57 |
HOMEPAGE="http://vsftpd.beasts.org/" |
58 |
SRC_URI="http://security.appspot.com/downloads/${P}.tar.gz" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
63 |
IUSE="caps pam tcpd ssl selinux xinetd" |
64 |
|
65 |
DEPEND="caps? ( >=sys-libs/libcap-2 ) |
66 |
pam? ( virtual/pam ) |
67 |
tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) |
68 |
ssl? ( >=dev-libs/openssl-0.9.7d )" |
69 |
RDEPEND="${DEPEND} |
70 |
net-ftp/ftpbase |
71 |
selinux? ( sec-policy/selinux-ftp ) |
72 |
xinetd? ( sys-apps/xinetd )" |
73 |
|
74 |
src_prepare() { |
75 |
|
76 |
# kerberos patch. bug #335980 |
77 |
epatch "${FILESDIR}/${PN}-2.3.2-kerberos.patch" |
78 |
|
79 |
# Patch the source, config and the manpage to use /etc/vsftpd/ |
80 |
epatch "${FILESDIR}/${PN}-2.3.5-gentoo.patch" |
81 |
|
82 |
# Fix building without the libcap |
83 |
epatch "${FILESDIR}/${PN}-2.1.0-caps.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 || die |
93 |
epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch |
94 |
fi |
95 |
|
96 |
# Let portage control stripping |
97 |
sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile || die |
98 |
|
99 |
#Bug #335977 |
100 |
epatch "${FILESDIR}"/${PN}-3.0.0-Makefile.patch |
101 |
} |
102 |
|
103 |
src_compile() { |
104 |
CFLAGS="${CFLAGS}" \ |
105 |
CC="$(tc-getCC)" \ |
106 |
emake |
107 |
} |
108 |
|
109 |
src_install() { |
110 |
into /usr |
111 |
doman ${PN}.conf.5 ${PN}.8 |
112 |
dosbin ${PN} || die "disbin failed" |
113 |
|
114 |
dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ |
115 |
README README.security REWARD SIZE \ |
116 |
SPEED TODO TUNING || die "dodoc failed" |
117 |
newdoc ${PN}.conf ${PN}.conf.example |
118 |
|
119 |
docinto security |
120 |
dodoc SECURITY/* || die "dodoc failed" |
121 |
|
122 |
insinto "/usr/share/doc/${PF}/examples" |
123 |
doins -r EXAMPLE/* || die "doins faileD" |
124 |
|
125 |
insinto /etc/${PN} |
126 |
newins ${PN}.conf{,.example} |
127 |
|
128 |
insinto /etc/logrotate.d |
129 |
newins "${FILESDIR}/${PN}.logrotate" ${PN} |
130 |
|
131 |
if use xinetd ; then |
132 |
insinto /etc/xinetd.d |
133 |
newins "${FILESDIR}/${PN}.xinetd" ${PN} |
134 |
fi |
135 |
|
136 |
newinitd "${FILESDIR}/${PN}.init" ${PN} |
137 |
|
138 |
keepdir /usr/share/${PN}/empty |
139 |
} |
140 |
|
141 |
pkg_preinst() { |
142 |
# If we use xinetd, then we set listen=NO |
143 |
# so that our default config works under xinetd - fixes #78347 |
144 |
if use xinetd ; then |
145 |
sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/${PN}/${PN}.conf.example |
146 |
fi |
147 |
} |
148 |
|
149 |
pkg_postinst() { |
150 |
einfo "vsftpd init script can now be multiplexed." |
151 |
einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist." |
152 |
einfo "If you symlink the init script to another one, say vsftpd.foo" |
153 |
einfo "then that uses /etc/vsftpd/foo.conf instead." |
154 |
einfo |
155 |
einfo "Example:" |
156 |
einfo " cd /etc/init.d" |
157 |
einfo " ln -s vsftpd vsftpd.foo" |
158 |
einfo "You can now treat vsftpd.foo like any other service" |
159 |
} |