1 |
voyageur 11/04/04 20:39:41 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: proftpd-1.3.3e.ebuild |
5 |
Removed: proftpd-1.3.3c.ebuild proftpd-1.3.3d.ebuild |
6 |
Log: |
7 |
Drop vulnerable versions, version bump for security bug #361963 |
8 |
|
9 |
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.266 net-ftp/proftpd/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.266&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/ChangeLog?rev=1.266&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/ChangeLog?r1=1.265&r2=1.266 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v |
21 |
retrieving revision 1.265 |
22 |
retrieving revision 1.266 |
23 |
diff -u -r1.265 -r1.266 |
24 |
--- ChangeLog 26 Feb 2011 17:49:20 -0000 1.265 |
25 |
+++ ChangeLog 4 Apr 2011 20:39:41 -0000 1.266 |
26 |
@@ -1,6 +1,15 @@ |
27 |
# ChangeLog for net-ftp/proftpd |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.265 2011/02/26 17:49:20 armin76 Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/ChangeLog,v 1.266 2011/04/04 20:39:41 voyageur Exp $ |
31 |
+ |
32 |
+*proftpd-1.3.3e (04 Apr 2011) |
33 |
+ |
34 |
+ 04 Apr 2011; Bernard Cafarelli <voyageur@g.o> -proftpd-1.3.3c.ebuild, |
35 |
+ -proftpd-1.3.3d.ebuild, +proftpd-1.3.3e.ebuild: |
36 |
+ Remove vulnerable versions, proxy commit for 1.3.3e: |
37 |
+ * Bump mod_vroot to 0.9.2. |
38 |
+ * Fix QA warnings which were reported in Gentoo Bug #354080 c5. |
39 |
+ * mod_ban requires ctrls support. Fixes Gentoo Bug #355013. |
40 |
|
41 |
26 Feb 2011; Raúl Porcel <armin76@g.o> proftpd-1.3.3d-r1.ebuild: |
42 |
alpha stable wrt #354080 |
43 |
|
44 |
|
45 |
|
46 |
1.1 net-ftp/proftpd/proftpd-1.3.3e.ebuild |
47 |
|
48 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3e.ebuild?rev=1.1&view=markup |
49 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3e.ebuild?rev=1.1&content-type=text/plain |
50 |
|
51 |
Index: proftpd-1.3.3e.ebuild |
52 |
=================================================================== |
53 |
# Copyright 1999-2011 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
# $Header: /var/cvsroot/gentoo-x86/net-ftp/proftpd/proftpd-1.3.3e.ebuild,v 1.1 2011/04/04 20:39:41 voyageur Exp $ |
56 |
|
57 |
EAPI="2" |
58 |
inherit eutils autotools |
59 |
|
60 |
CASE_VER="0.4" |
61 |
CLAMAV_VER="0.11rc" |
62 |
DEFLATE_VER="0.5.4" |
63 |
GSS_VER="1.3.3" |
64 |
VROOT_VER="0.9.2" |
65 |
|
66 |
DESCRIPTION="An advanced and very configurable FTP server." |
67 |
HOMEPAGE="http://www.proftpd.org/ |
68 |
http://www.castaglia.org/proftpd/ |
69 |
http://www.thrallingpenguin.com/resources/mod_clamav.htm |
70 |
http://gssmod.sourceforge.net/" |
71 |
SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.bz2 |
72 |
case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${CASE_VER}.tar.gz ) |
73 |
clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${CLAMAV_VER}.tar.gz ) |
74 |
deflate? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-deflate-${DEFLATE_VER}.tar.gz ) |
75 |
kerberos? ( mirror://sourceforge/gssmod/mod_gss-${GSS_VER}.tar.gz ) |
76 |
vroot? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-vroot-${VROOT_VER}.tar.gz )" |
77 |
LICENSE="GPL-2" |
78 |
|
79 |
SLOT="0" |
80 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
81 |
IUSE="acl authfile ban +caps case clamav +ctrls deflate doc exec hardened ifsession ident ipv6 kerberos ldap mysql ncurses nls pam postgres radius ratio readme rewrite selinux sftp shaper sitemisc softquota ssl tcpd trace vroot xinetd" |
82 |
|
83 |
DEPEND="acl? ( sys-apps/acl sys-apps/attr ) |
84 |
caps? ( sys-libs/libcap ) |
85 |
clamav? ( app-antivirus/clamav ) |
86 |
kerberos? ( virtual/krb5 ) |
87 |
ldap? ( net-nds/openldap ) |
88 |
mysql? ( virtual/mysql ) |
89 |
ncurses? ( sys-libs/ncurses ) |
90 |
pam? ( virtual/pam ) |
91 |
postgres? ( dev-db/postgresql-base ) |
92 |
sftp? ( dev-libs/openssl ) |
93 |
ssl? ( dev-libs/openssl ) |
94 |
tcpd? ( sys-apps/tcp-wrappers ) |
95 |
xinetd? ( virtual/inetd )" |
96 |
RDEPEND="${DEPEND} |
97 |
net-ftp/ftpbase |
98 |
selinux? ( sec-policy/selinux-ftpd )" |
99 |
|
100 |
S="${WORKDIR}/${P/_/}" |
101 |
|
102 |
__prepare_module() { |
103 |
mv "${WORKDIR}"/$1/$1.c contrib |
104 |
mv "${WORKDIR}"/$1/$1.html doc/contrib |
105 |
rm -rf "${WORKDIR}"/$1 |
106 |
} |
107 |
|
108 |
pkg_setup() { |
109 |
if [ -f "${ROOT}"/var/run/proftpd.pid ] ; then |
110 |
eerror "Your ProFTPD server is running. In order to install this update" |
111 |
eerror "you have to stop the running server. If you are using ProFTPD in" |
112 |
eerror "the standalone mode you can stop the server by executing:" |
113 |
eerror " /etc/init.d/proftpd stop" |
114 |
eerror "If you are sure that ProFTPD is not running anymore you have to" |
115 |
eerror "delete the /var/run/proftpd.pid file." |
116 |
die "This update requires to stop the ProFTPD server!" |
117 |
fi |
118 |
} |
119 |
|
120 |
src_prepare() { |
121 |
use case && __prepare_module mod_case |
122 |
if use clamav ; then |
123 |
mv "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/mod_clamav.{c,h} contrib |
124 |
epatch "${WORKDIR}"/mod_clamav-${CLAMAV_VER}/${PN}.patch |
125 |
rm -rf "${WORKDIR}"/mod_clamav-${CLAMAV_VER} |
126 |
fi |
127 |
use deflate && __prepare_module mod_deflate |
128 |
use vroot && __prepare_module mod_vroot |
129 |
|
130 |
# Fix MySQL includes |
131 |
sed -i -e "s/<mysql.h>/<mysql\/mysql.h>/g" contrib/mod_sql_mysql.c |
132 |
|
133 |
# Manipulate build system |
134 |
sed -i -e "s/utils install-conf install/utils install/g" Makefile.in |
135 |
sed -i -e "s/ @INSTALL_STRIP@//g" Make.rules.in |
136 |
|
137 |
# Support new versions of mit-krb5 (Gentoo Bugs #284853, #324903) |
138 |
if use kerberos ; then |
139 |
cd "${WORKDIR}"/mod_gss-${GSS_VER} |
140 |
sed -i -e "s/krb5_principal2principalname/_\0/" mod_auth_gss.c.in |
141 |
sed -i -e "/ac_gss_libs/s/\-ldes425\ //" configure.in |
142 |
eautoreconf |
143 |
fi |
144 |
} |
145 |
|
146 |
src_configure() { |
147 |
local myc myl mym |
148 |
|
149 |
use acl && mym="${mym}:mod_facl" |
150 |
use ban && mym="${mym}:mod_ban" |
151 |
use case && mym="${mym}:mod_case" |
152 |
use clamav && mym="${mym}:mod_clamav" |
153 |
if use ctrls || use ban || use shaper ; then |
154 |
myc="${myc} --enable-ctrls" |
155 |
mym="${mym}:mod_ctrls_admin" |
156 |
fi |
157 |
use deflate && mym="${mym}:mod_deflate" |
158 |
use exec && mym="${mym}:mod_exec" |
159 |
if use kerberos ; then |
160 |
cd "${WORKDIR}"/mod_gss-${GSS_VER} |
161 |
if has_version app-crypt/mit-krb5 ; then |
162 |
econf --enable-mit |
163 |
else |
164 |
econf --enable-heimdal |
165 |
fi |
166 |
mv mod_{auth_gss,gss}.c "${S}"/contrib |
167 |
mv mod_gss.h "${S}"/include |
168 |
mv README.mod_{auth_gss,gss} "${S}" |
169 |
mv mod_gss.html "${S}"/doc/contrib |
170 |
mv rfc{1509,2228}.txt "${S}"/doc/rfc |
171 |
cd "${S}" |
172 |
rm -rf "${WORKDIR}"/mod_gss-${GSS_VER} |
173 |
mym="${mym}:mod_gss:mod_auth_gss" |
174 |
fi |
175 |
if use ldap ; then |
176 |
myl="${myl} -lresolv" |
177 |
mym="${mym}:mod_ldap" |
178 |
fi |
179 |
if use mysql || use postgres ; then |
180 |
mym="${mym}:mod_sql:mod_sql_passwd" |
181 |
if use mysql ; then |
182 |
myc="${myc} --with-includes=/usr/include/mysql" |
183 |
mym="${mym}:mod_sql_mysql" |
184 |
fi |
185 |
if use postgres ; then |
186 |
myc="${myc} --with-includes=/usr/include/postgresql" |
187 |
mym="${mym}:mod_sql_postgres" |
188 |
fi |
189 |
fi |
190 |
if use sftp || use ssl ; then |
191 |
CFLAGS="${CFLAGS} -DHAVE_OPENSSL" |
192 |
myc="${myc} --enable-openssl --with-includes=/usr/include/openssl" |
193 |
myl="${myl} -lcrypto" |
194 |
fi |
195 |
use radius && mym="${mym}:mod_radius" |
196 |
use ratio && mym="${mym}:mod_ratio" |
197 |
use readme && mym="${mym}:mod_readme" |
198 |
use rewrite && mym="${mym}:mod_rewrite" |
199 |
if use sftp ; then |
200 |
mym="${mym}:mod_sftp" |
201 |
use pam && mym="${mym}:mod_sftp_pam" |
202 |
if use mysql || use postgres ; then |
203 |
mym="${mym}:mod_sftp_sql" |
204 |
fi |
205 |
fi |
206 |
use shaper && mym="${mym}:mod_shaper" |
207 |
use sitemisc && mym="${mym}:mod_site_misc" |
208 |
if use softquota ; then |
209 |
mym="${mym}:mod_quotatab:mod_quotatab_file" |
210 |
use ldap && mym="${mym}:mod_quotatab_ldap" |
211 |
use radius && mym="${mym}:mod_quotatab_radius" |
212 |
if use mysql || use postgres ; then |
213 |
mym="${mym}:mod_quotatab_sql" |
214 |
fi |
215 |
fi |
216 |
use ssl && mym="${mym}:mod_tls:mod_tls_shmcache" |
217 |
use tcpd && mym="${mym}:mod_wrap" |
218 |
use vroot && mym="${mym}:mod_vroot" |
219 |
# mod_ifsession needs to be the last module in the mym list. |
220 |
use ifsession && mym="${mym}:mod_ifsession" |
221 |
|
222 |
[ -z ${mym} ] || myc="${myc} --with-modules=${mym:1}" |
223 |
LIBS="${myl:1}" econf --sbindir=/usr/sbin --localstatedir=/var/run/proftpd \ |
224 |
--sysconfdir=/etc/proftpd --enable-shadow --enable-autoshadow ${myc:1} \ |
225 |
$(use_enable acl facl) \ |
226 |
$(use_enable authfile auth-file) \ |
227 |
$(use_enable caps cap) \ |
228 |
$(use_enable ident) \ |
229 |
$(use_enable ipv6) \ |
230 |
$(use_enable ncurses) \ |
231 |
$(use_enable nls) \ |
232 |
$(use_enable trace) \ |
233 |
$(use_enable pam auth-pam) |
234 |
} |
235 |
|
236 |
src_install() { |
237 |
emake DESTDIR="${D}" install |
238 |
|
239 |
insinto /etc/proftpd |
240 |
doins "${FILESDIR}"/proftpd.conf.sample |
241 |
keepdir /var/run/proftpd |
242 |
newinitd "${FILESDIR}"/proftpd.initd proftpd |
243 |
if use xinetd ; then |
244 |
insinto /etc/xinetd.d |
245 |
newins "${FILESDIR}"/proftpd.xinetd proftpd |
246 |
fi |
247 |
|
248 |
dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES |
249 |
if use doc ; then |
250 |
dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html |
251 |
docinto rfc |
252 |
dodoc doc/rfc/*.txt |
253 |
fi |
254 |
} |
255 |
|
256 |
pkg_postinst() { |
257 |
if use mysql && use postgres ; then |
258 |
elog |
259 |
elog "ProFTPD has been built with the MySQL and PostgreSQL modules." |
260 |
elog "You can use the 'SQLBackend' directive to specify the used SQL" |
261 |
elog "backend. Without this directive the default backend is MySQL." |
262 |
elog |
263 |
fi |
264 |
if use exec ; then |
265 |
ewarn |
266 |
ewarn "ProFTPD has been built with the mod_exec module. This module" |
267 |
ewarn "can be a security risk for your server as it executes external" |
268 |
ewarn "programs. Vulnerables in these external programs may disclose" |
269 |
ewarn "information or even compromise your server." |
270 |
ewarn "You have been warned! Use this module at your own risk!" |
271 |
ewarn |
272 |
fi |
273 |
} |