Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-ftp/proftpd/
Date: Mon, 10 Apr 2017 07:46:08
Message-Id: 1491810290.5e24bb9a2aebbd80dcad676ef95814a6820e0d52.slyfox@gentoo
1 commit: 5e24bb9a2aebbd80dcad676ef95814a6820e0d52
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Mon Apr 10 07:44:50 2017 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Apr 10 07:44:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e24bb9a
7
8 net-ftp/proftpd: drop old
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 net-ftp/proftpd/Manifest | 1 -
13 net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild | 256 -------------------------------
14 2 files changed, 257 deletions(-)
15
16 diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
17 index 61a1214ce87..674a587976a 100644
18 --- a/net-ftp/proftpd/Manifest
19 +++ b/net-ftp/proftpd/Manifest
20 @@ -7,7 +7,6 @@ DIST proftpd-1.3.5b.tar.gz 29992107 SHA256 afc1789f2478acf88dfdc7d70da90a4fa2786
21 DIST proftpd-1.3.5d.tar.gz 29966560 SHA256 f4e2997be7f22a5b31d7ac72497ed4f4471d24d32385978350410713e76129ac SHA512 3297ddd1f11d46123bbe46488d75fa7a6dcdf2c2d6e7e880a78a427f9f1e9901878dab179e41092e0b9864a615d8ba0b0bf444d4f829870e993e3169c7141c37 WHIRLPOOL d20c43368ad9d3e79e4e7a7590a808974ad4059592f183a325aa05650ee4c4d874b6fe2723c289678df84eb5be4d4888b6a523abd1e0c6a8817333daa12af463
22 DIST proftpd-1.3.5e.tar.gz 29968142 SHA256 8307dc0103a8e716b99745919be7f09b54708c57c7d5aa70262f7593dc56bc9d SHA512 54a9700af803297697e4b7f2d7dc82139785f9f2cbeb40b226f94ff3e8690f2e3672aa80373005dfec4b53f3dd9ca7b0a658ea39bda63e71292c810ba994eac7 WHIRLPOOL 3747ddb69936b1631b937bed9bc9865a75abcb1ec55ebf796c733f4cb1323b947c34142332d0d6c1f289b21174b83fe995e492ac77cb1d942aabd6467aaed143
23 DIST proftpd-1.3.6.tar.gz 20251898 SHA256 91ef74b143495d5ff97c4d4770c6804072a8c8eb1ad1ecc8cc541b40e152ecaf SHA512 2a3ca76a0c35ba31e9d79f7f652f4f35768262f5039c5dc04ef83ac9218f624645ac6cee445af4ec6a8c59a9bdad1e7b48e0e90cd13934cbe7c3e77a2f6013c0 WHIRLPOOL 1b304015083a3e7a8aec15b306d802f6fe32cb0d8f0c5c260cfa0eb6e07d30ac2c5bb436d8cdaf1f379703fd73898a1d491a16d7c16150d87ca2349caff2f211
24 -DIST proftpd-1.3.6rc4.tar.gz 20164575 SHA256 868893e71c4ee8d5855520bda56b6a85ff0c5d786d8b965a28d52d740ba5da52 SHA512 16f7483fcc5b7969e468d48ee65845bf0c14353658fca55752b68137c0d0dc7f2c2dd0e9ef8e360793f232b85af0094e4c83d96a14a16061b68dfc7cee3b691c WHIRLPOOL e44e17001a8f53ad8ea7abd692dfa39913450a79a318db4a22dad8493576eef72601e82e7ce3027f0d58d3b56cd38ce95807bf3b47fb924cd869cb6804500595
25 DIST proftpd-mod-case-0.7.tar.gz 13184 SHA256 c3f65588250fea7771439933fa754927794f664e99b8d20f99b1e400fea62111 SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc WHIRLPOOL 27f49e9f34099c081add803aa679fd9abe7afa652dffe5d8e42889fef49aeaefd499e1009fc564d6c8f882b3c6dc31d4c6dd08cc06a42b770e7ef76a2ebfcf8a
26 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 SHA256 424f3fd49237245ec176d27ade0965fe21a0db1d645979d5ae3e55497e3da036 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975 WHIRLPOOL aabd1dc23d6c38d308e859ff778beffd0dabfe70d3530c093cf2f95e80b5e9c94b97b6b5ae5109d031f76ff94dffc3822a7aa60fa30df04523d37ebed99730d6
27 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 SHA256 255b79d31dc509ffad5d0fbcd469f833a8481e880aa962910c2bc8aa608ca6da SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012 WHIRLPOOL ff907e26a354f53231fed94515eb60050dec77118be6f49147e0eb8b79e50c9d73354618bca19d98d32a3fb79d7ba87507cc6c8b269f259c5fcf23d44ad3a906
28
29 diff --git a/net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild b/net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild
30 deleted file mode 100644
31 index 9adafec9c77..00000000000
32 --- a/net-ftp/proftpd/proftpd-1.3.6_rc4.ebuild
33 +++ /dev/null
34 @@ -1,256 +0,0 @@
35 -# Copyright 1999-2017 Gentoo Foundation
36 -# Distributed under the terms of the GNU General Public License v2
37 -
38 -EAPI=6
39 -inherit multilib systemd
40 -
41 -MOD_CASE="0.7"
42 -MOD_CLAMAV="0.11rc"
43 -MOD_DISKUSE="0.9"
44 -MOD_GSS="1.3.6"
45 -MOD_MSG="0.4.1"
46 -MOD_VROOT="0.9.4"
47 -
48 -DESCRIPTION="An advanced and very configurable FTP server"
49 -HOMEPAGE="http://www.proftpd.org/
50 - http://www.castaglia.org/proftpd/
51 - http://www.thrallingpenguin.com/resources/mod_clamav.htm
52 - http://gssmod.sourceforge.net/"
53 -SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
54 - case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
55 - clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-${MOD_CLAMAV}.tar.gz )
56 - diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
57 - kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
58 - msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
59 - vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )"
60 -LICENSE="GPL-2"
61 -
62 -SLOT="0"
63 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
64 -IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse doc dso dynmasq exec ifsession ifversion ident ipv6
65 - kerberos ldap libressl linguas_bg_BG linguas_en_US linguas_fr_FR linguas_it_IT linguas_ja_JP linguas_ko_KR
66 - linguas_ru_RU linguas_zh_CN linguas_zh_TW log_forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
67 - ratio readme rewrite selinux sftp shaper sitemisc snmp softquota sqlite ssl tcpd test trace unique_id vroot xinetd"
68 -# TODO: geoip
69 -REQUIRED_USE="ban? ( ctrls )
70 - msg? ( ctrls )
71 - sftp? ( ssl )
72 - shaper? ( ctrls )"
73 -
74 -CDEPEND="acl? ( virtual/acl )
75 - caps? ( sys-libs/libcap )
76 - clamav? ( app-antivirus/clamav )
77 - kerberos? ( virtual/krb5 )
78 - ldap? ( net-nds/openldap )
79 - memcache? ( >=dev-libs/libmemcached-0.41 )
80 - mysql? ( virtual/mysql )
81 - nls? ( virtual/libiconv )
82 - ncurses? ( sys-libs/ncurses:0= )
83 - ssl? (
84 - !libressl? ( dev-libs/openssl:0= )
85 - libressl? ( dev-libs/libressl:= )
86 - )
87 - pam? ( virtual/pam )
88 - pcre? ( dev-libs/libpcre )
89 - postgres? ( dev-db/postgresql:= )
90 - sqlite? ( dev-db/sqlite:3 )
91 - xinetd? ( virtual/inetd )"
92 -DEPEND="${CDEPEND}
93 - test? ( dev-libs/check )"
94 -RDEPEND="${CDEPEND}
95 - net-ftp/ftpbase
96 - selinux? ( sec-policy/selinux-ftp )"
97 -
98 -S="${WORKDIR}/${P/_/}"
99 -
100 -PATCHES=("${FILESDIR}"/${PN}-1.3.6_rc4-open-tests.patch)
101 -
102 -in_dir() {
103 - pushd "${WORKDIR}/${1}" || die
104 - shift
105 - "$@"
106 - popd
107 -}
108 -
109 -src_prepare() {
110 - # Skip 'install-conf' / Support LINGUAS
111 - sed -i -e "/install-all/s/ install-conf//" Makefile.in || die
112 - sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die
113 -
114 - # Prepare external modules
115 - if use case; then
116 - cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die
117 - cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die
118 - fi
119 -
120 - if use clamav ; then
121 - cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
122 - eapply "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/${PN}.patch
123 - fi
124 -
125 - if use diskuse; then
126 - in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
127 -
128 - # ./configure will modify files. Symlink them instead of copying
129 - ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
130 -
131 - cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
132 - cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
133 - fi
134 -
135 - if use msg; then
136 - in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch
137 -
138 - cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die
139 - cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die
140 - fi
141 -
142 - if use vroot; then
143 - in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch
144 -
145 - cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die
146 - cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die
147 - fi
148 -
149 - if use kerberos ; then
150 - in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
151 -
152 - # Support app-crypt/heimdal / Gentoo Bug #284853
153 - sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
154 -
155 - # Remove obsolete DES / Gentoo Bug #324903
156 - # Replace 'rpm' lookups / Gentoo Bug #391021
157 - sed -i -e "/ac_gss_libs/s/ -ldes425//" \
158 - -e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
159 - -e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.in} || die
160 -
161 - # ./configure will modify files. Symlink them instead of copying
162 - ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die
163 - ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die
164 - ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die
165 -
166 - cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die
167 - cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die
168 - cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die
169 - fi
170 -
171 - default
172 -}
173 -
174 -src_configure() {
175 - local c m
176 -
177 - use acl && m="${m}:mod_facl"
178 - use ban && m="${m}:mod_ban"
179 - use case && m="${m}:mod_case"
180 - use clamav && m="${m}:mod_clamav"
181 - use copy && m="${m}:mod_copy"
182 - use ctrls && m="${m}:mod_ctrls_admin"
183 - use deflate && m="${m}:mod_deflate"
184 - if use diskuse ; then
185 - in_dir mod_diskuse econf
186 - m="${m}:mod_diskuse"
187 - fi
188 - use dynmasq && m="${m}:mod_dynmasq"
189 - use exec && m="${m}:mod_exec"
190 - use ifsession && m="${m}:mod_ifsession"
191 - use ifversion && m="${m}:mod_ifversion"
192 - if use kerberos ; then
193 - in_dir mod_gss-${MOD_GSS} econf
194 - m="${m}:mod_gss:mod_auth_gss"
195 - fi
196 - use ldap && m="${m}:mod_ldap"
197 - use log_forensic && m="${m}:mod_log_forensic"
198 - use msg && m="${m}:mod_msg"
199 - if use mysql || use postgres || use sqlite ; then
200 - m="${m}:mod_sql:mod_sql_passwd"
201 - use mysql && m="${m}:mod_sql_mysql"
202 - use postgres && m="${m}:mod_sql_postgres"
203 - use sqlite && m="${m}:mod_sql_sqlite"
204 - fi
205 - use qos && m="${m}:mod_qos"
206 - use radius && m="${m}:mod_radius"
207 - use ratio && m="${m}:mod_ratio"
208 - use readme && m="${m}:mod_readme"
209 - use rewrite && m="${m}:mod_rewrite"
210 - if use sftp ; then
211 - m="${m}:mod_sftp"
212 - use pam && m="${m}:mod_sftp_pam"
213 - use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
214 - fi
215 - use shaper && m="${m}:mod_shaper"
216 - use sitemisc && m="${m}:mod_site_misc"
217 - use snmp && m="${m}:mod_snmp"
218 - if use softquota ; then
219 - m="${m}:mod_quotatab:mod_quotatab_file"
220 - use ldap && m="${m}:mod_quotatab_ldap"
221 - use radius && m="${m}:mod_quotatab_radius"
222 - use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
223 - fi
224 - if use ssl ; then
225 - m="${m}:mod_tls:mod_tls_shmcache"
226 - use memcache && m="${m}:mod_tls_memcache"
227 - fi
228 - if use tcpd ; then
229 - m="${m}:mod_wrap2:mod_wrap2_file"
230 - use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
231 - fi
232 - use unique_id && m="${m}:mod_unique_id"
233 - use vroot && m="${m}:mod_vroot"
234 -
235 - if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
236 - einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
237 - m="${m}:${PROFTP_CUSTOM_MODULES}"
238 - fi
239 -
240 - [[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
241 -
242 - econf --localstatedir=/var/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
243 - $(use_enable acl facl) \
244 - $(use_enable authfile auth-file) \
245 - $(use_enable caps cap) \
246 - $(use_enable ctrls) \
247 - $(use_enable dso) \
248 - $(use_enable ident) \
249 - $(use_enable ipv6) \
250 - $(use_enable memcache) \
251 - $(use_enable ncurses) \
252 - $(use_enable nls) \
253 - $(use_enable ssl openssl) \
254 - $(use_enable pam auth-pam) \
255 - $(use_enable pcre) \
256 - $(use_enable test tests) \
257 - $(use_enable trace) \
258 - $(use_enable userland_GNU shadow) \
259 - $(use_enable userland_GNU autoshadow) \
260 - ${c:1}
261 -}
262 -
263 -src_test() {
264 - emake api-tests -C tests
265 -}
266 -
267 -src_install() {
268 - default
269 - [[ -z ${LINGUAS} ]] && rm -r "${ED}"/usr/share/locale
270 - rm -rf "${ED}"/var/run
271 -
272 - newinitd "${FILESDIR}"/proftpd.initd proftpd
273 - insinto /etc/proftpd
274 - doins "${FILESDIR}"/proftpd.conf.sample
275 -
276 - if use xinetd ; then
277 - insinto /etc/xinetd.d
278 - newins "${FILESDIR}"/proftpd.xinetd proftpd
279 - fi
280 -
281 - dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
282 - if use doc ; then
283 - dohtml doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
284 - docinto rfc
285 - dodoc doc/rfc/*.txt
286 - fi
287 -
288 - systemd_dounit "${FILESDIR}"/${PN}.service
289 - systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf ${PN}.conf
290 -}