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, 07 Sep 2020 20:47:00
Message-Id: 1599511612.6e34b2123f7d2fa2d3c09c422e0ccae037b58353.slyfox@gentoo
1 commit: 6e34b2123f7d2fa2d3c09c422e0ccae037b58353
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 7 20:45:21 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 7 20:46:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e34b212
7
8 net-ftp/proftpd: drop old
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 net-ftp/proftpd/Manifest | 1 -
14 net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild | 277 ----------------------------
15 2 files changed, 278 deletions(-)
16
17 diff --git a/net-ftp/proftpd/Manifest b/net-ftp/proftpd/Manifest
18 index c5e3f3f4303..9c964150214 100644
19 --- a/net-ftp/proftpd/Manifest
20 +++ b/net-ftp/proftpd/Manifest
21 @@ -1,7 +1,6 @@
22 DIST mod_gss-1.3.9.tar.gz 117158 BLAKE2B f957fa465f9a9b06ceb9c190ab60c7f67fdeeef79dce7f51bcfed8dc726cb01a231232c65821ca3a240b77a5019fa22f31b45496c128a06627bd24dc960b566f SHA512 44615983b0f67939b110e54c4a83b3056263bad72ba78de1b16f9f8590f5504c60e679f55484708d49e694c528d4715d9abd0cb75cfe439982ea9e02e0c18891
23 DIST mod_vroot-0.9.4.tar.gz 29461 BLAKE2B eb4d3f6425ab0a1a61ca607e4655b5f8ff6ea342ca49d49598e7a4c5596382aa2c1d4e8228a1cdcfff324feb92dac80fcc58e35bbb77155069749afdd7cc41fb SHA512 f5de392c9fe39f0a03b0783a7092bbfe17ea6db991f4b4e4a2d8f092f073d27ef2c64dd6484d5665b5abc808c0caba016d4fc3fab3da3810f5ebe5249bb4cbce
24 DIST proftpd-1.3.7a.tar.gz 20414571 BLAKE2B 829f3ff79cf74bc9cacfc611877cd1373daefb022b10eb427be56325d455dc7ba2f87a7dbefed06dca0c4cf06597043aac9141e4156e775a4f343bbb07a29375 SHA512 abb53c494677001b6d8d5a15af4ae47e2527025c952667b8c42e144452266d2b7f89b57e68c96177e6054733eb5e5d04cc1c0cf61ff7c3697910e0a525a9de87
25 -DIST proftpd-1.3.7rc4.tar.gz 20407496 BLAKE2B fd98b2ca3f4b6448b8739ff39db72d06f508e2507c156043a022ef5275d21775bdecc50c4434173f40fe1e40f439aebc58c9efaa6a5e6946dd15d5b52a36bda0 SHA512 8a782c27fae757b940396a9dd74a7336cac982f0fb3b28afd6a0b3837c8e93fc74c329ac520dd69f051740303ab776da2d9368d0b46814d264cad5ac0ac7003b
26 DIST proftpd-mod-case-0.7.tar.gz 13184 BLAKE2B bf2118d9b8ed97a5b192b92b515d17ac7a0d75e154288e5afb3a1c3d686e635093df9501cc1c9b077f87c14326e31e8b9f751803dfca1eae9643f12333eb633f SHA512 c08d13ef82fec36ae75aa3213dd02e0ce4045904849f422e152f039a9da66a45e4423751074b8bcf8ce347a40ce0e7bde798a85cbadc962fd872aeaa898261fc
27 DIST proftpd-mod-diskuse-0.9.tar.gz 18596 BLAKE2B 38c704c8607f0f93b080e77fe793cfe0125c88acc6f818ecb059c6c21a983e040ff5f2c1b91e34ef4ba2666a808d896018c364d1f12ea38f0c477e79bdaa2120 SHA512 d41976bf2810e4b783e775e8c767ca2030c3b5df116219fd31cbbac7feaf9922c315bf4ea092881b0d6cf43f2f4c5dbcae61be3c3a833058d12f962a3024b975
28 DIST proftpd-mod-msg-0.4.1.tar.gz 8082 BLAKE2B 970b46b19d25bac22ecb01495270a523997a0b7d5b53b9470b4744b919adcf03d5bcee2df85ba88c4a4c20a9fc30dc01459ffb58c5dae8e78a52a7379bf36f11 SHA512 38ea63b1d355e1e10a6a4477596bf3fa28529a871c9fb8dbf093b5317f0743ef9cb59b986d0b8c1c7ed932dad5d5d571883d596fad2d3b793431824db4487012
29
30 diff --git a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild b/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
31 deleted file mode 100644
32 index 805cd6c69ab..00000000000
33 --- a/net-ftp/proftpd/proftpd-1.3.7_rc4-r1.ebuild
34 +++ /dev/null
35 @@ -1,277 +0,0 @@
36 -# Copyright 1999-2020 Gentoo Authors
37 -# Distributed under the terms of the GNU General Public License v2
38 -
39 -EAPI=7
40 -inherit multilib systemd tmpfiles toolchain-funcs
41 -
42 -MOD_CASE="0.7"
43 -MOD_CLAMAV="0.14rc2"
44 -MOD_DISKUSE="0.9"
45 -MOD_GSS="1.3.9"
46 -MOD_MSG="0.4.1"
47 -MOD_VROOT="0.9.4"
48 -
49 -DESCRIPTION="An advanced and very configurable FTP server"
50 -HOMEPAGE="http://www.proftpd.org/
51 - http://www.castaglia.org/proftpd/
52 - https://github.com/jbenden/mod_clamav
53 - http://gssmod.sourceforge.net/"
54 -SRC_URI="ftp://ftp.proftpd.org/distrib/source/${P/_/}.tar.gz
55 - case? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-case-${MOD_CASE}.tar.gz )
56 - clamav? ( https://github.com/jbenden/mod_clamav/archive/v${MOD_CLAMAV}.tar.gz -> ${PN}-mod_clamav-${MOD_CLAMAV}.tar.gz )
57 - diskuse? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-diskuse-${MOD_DISKUSE}.tar.gz )
58 - kerberos? ( mirror://sourceforge/gssmod/mod_gss-${MOD_GSS}.tar.gz )
59 - msg? ( http://www.castaglia.org/${PN}/modules/${PN}-mod-msg-${MOD_MSG}.tar.gz )
60 - vroot? ( https://github.com/Castaglia/${PN}-mod_vroot/archive/v${MOD_VROOT}.tar.gz -> mod_vroot-${MOD_VROOT}.tar.gz )"
61 -LICENSE="GPL-2"
62 -
63 -SLOT="0"
64 -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
65 -IUSE="acl authfile ban +caps case clamav copy ctrls deflate diskuse dso dynmasq exec ifsession ifversion ident ipv6
66 - kerberos ldap libressl log-forensic memcache msg mysql ncurses nls pam +pcre postgres qos radius
67 - ratio readme rewrite selinux sftp shaper sitemisc snmp sodium softquota sqlite ssl tcpd test unique-id vroot"
68 -# TODO: geoip
69 -REQUIRED_USE="ban? ( ctrls )
70 - msg? ( ctrls )
71 - sftp? ( ssl )
72 - shaper? ( ctrls )
73 -
74 - mysql? ( ssl )
75 - postgres? ( ssl )
76 - sqlite? ( ssl )
77 -"
78 -
79 -CDEPEND="acl? ( virtual/acl )
80 - caps? ( sys-libs/libcap )
81 - clamav? ( app-antivirus/clamav )
82 - kerberos? ( virtual/krb5 )
83 - ldap? ( net-nds/openldap )
84 - memcache? ( >=dev-libs/libmemcached-0.41 )
85 - mysql? ( dev-db/mysql-connector-c:0= )
86 - nls? ( virtual/libiconv )
87 - ncurses? ( sys-libs/ncurses:0= )
88 - ssl? (
89 - !libressl? ( dev-libs/openssl:0= )
90 - libressl? ( dev-libs/libressl:= )
91 - )
92 - pam? ( sys-libs/pam )
93 - pcre? ( dev-libs/libpcre )
94 - postgres? ( dev-db/postgresql:= )
95 - sodium? ( dev-libs/libsodium:0= )
96 - sqlite? ( dev-db/sqlite:3 )
97 -"
98 -DEPEND="${CDEPEND}
99 - test? ( dev-libs/check )"
100 -RDEPEND="${CDEPEND}
101 - net-ftp/ftpbase
102 - selinux? ( sec-policy/selinux-ftp )"
103 -
104 -S="${WORKDIR}/${P/_/}"
105 -
106 -PATCHES=(
107 - "${FILESDIR}"/${PN}-1.3.6-use-trace.patch
108 - "${FILESDIR}"/${PN}-1.3.7_rc4-ldap_mod-SEGV.patch
109 - "${FILESDIR}"/${PN}-1.3.7_rc4-str-sentinel.patch
110 -)
111 -
112 -RESTRICT=test # Some tests are ran in chroot. Confuse sandbox.
113 -
114 -in_dir() {
115 - pushd "${WORKDIR}/${1}" || die
116 - shift
117 - "$@"
118 - popd
119 -}
120 -
121 -src_prepare() {
122 - # Skip 'install-conf' / Support LINGUAS
123 - sed -i -e "/install-all/s/ install-conf//" Makefile.in || die
124 - sed -i -e "s/^LANGS=.*$/LANGS=${LINGUAS}/" locale/Makefile.in || die
125 -
126 - # Prepare external modules
127 - if use case; then
128 - cp -v "${WORKDIR}"/mod_case/mod_case.c contrib || die
129 - cp -v "${WORKDIR}"/mod_case/mod_case.html doc/contrib || die
130 - fi
131 -
132 - if use clamav ; then
133 - cp -v "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/mod_clamav.{c,h} contrib || die
134 - eapply -p0 "${WORKDIR}"/mod_clamav-${MOD_CLAMAV}/001-add-mod_clamav-to-tests.patch
135 - fi
136 -
137 - if use diskuse; then
138 - in_dir mod_diskuse eapply "${FILESDIR}"/${PN}-1.3.6_rc4-diskuse-refresh-api.patch
139 -
140 - # ./configure will modify files. Symlink them instead of copying
141 - ln -sv "${WORKDIR}"/mod_diskuse/mod_diskuse.h "${S}"/contrib || die
142 -
143 - cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.c "${S}"/contrib || die
144 - cp -v "${WORKDIR}"/mod_diskuse/mod_diskuse.html "${S}"/doc/contrib || die
145 - fi
146 -
147 - if use msg; then
148 - in_dir mod_msg eapply "${FILESDIR}"/${PN}-1.3.6_rc4-msg-refresh-api.patch
149 -
150 - cp -v "${WORKDIR}"/mod_msg/mod_msg.c contrib || die
151 - cp -v "${WORKDIR}"/mod_msg/mod_msg.html doc/contrib || die
152 - fi
153 -
154 - if use vroot; then
155 - in_dir ${PN}-mod_vroot-${MOD_VROOT} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-vroot-refresh-api.patch
156 -
157 - cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.c contrib || die
158 - cp -v "${WORKDIR}"/${PN}-mod_vroot-${MOD_VROOT}/mod_vroot.html doc/contrib || die
159 - fi
160 -
161 - if use kerberos ; then
162 - # in_dir mod_gss-${MOD_GSS} eapply "${FILESDIR}"/${PN}-1.3.6_rc4-gss-refresh-api.patch
163 -
164 - # Support app-crypt/heimdal / Gentoo Bug #284853
165 - sed -i -e "s/krb5_principal2principalname/_\0/" "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c.in || die
166 -
167 - # Remove obsolete DES / Gentoo Bug #324903
168 - # Replace 'rpm' lookups / Gentoo Bug #391021
169 - sed -i -e "/ac_gss_libs/s/ -ldes425//" \
170 - -e "s/ac_libdir=\`rpm -q -l.*$/ac_libdir=\/usr\/$(get_libdir)\//" \
171 - -e "s/ac_includedir=\`rpm -q -l.*$/ac_includedir=\/usr\/include\//" "${WORKDIR}"/mod_gss-${MOD_GSS}/configure{,.ac} || die
172 -
173 - # ./configure will modify files. Symlink them instead of copying
174 - ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_auth_gss.c "${S}"/contrib || die
175 - ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.c "${S}"/contrib || die
176 - ln -sv "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.h "${S}"/include || die
177 -
178 - cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/README.mod_{auth_gss,gss} "${S}" || die
179 - cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/mod_gss.html "${S}"/doc/contrib || die
180 - cp -v "${WORKDIR}"/mod_gss-${MOD_GSS}/rfc{1509,2228}.txt "${S}"/doc/rfc || die
181 - fi
182 -
183 - default
184 -
185 - tc-export CC
186 -}
187 -
188 -src_configure() {
189 - local c m
190 -
191 - use acl && m="${m}:mod_facl"
192 - use ban && m="${m}:mod_ban"
193 - use case && m="${m}:mod_case"
194 - use clamav && m="${m}:mod_clamav"
195 - use copy && m="${m}:mod_copy"
196 - use ctrls && m="${m}:mod_ctrls_admin"
197 - use deflate && m="${m}:mod_deflate"
198 - if use diskuse ; then
199 - in_dir mod_diskuse econf
200 - m="${m}:mod_diskuse"
201 - fi
202 - use dynmasq && m="${m}:mod_dynmasq"
203 - use exec && m="${m}:mod_exec"
204 - use ifsession && m="${m}:mod_ifsession"
205 - use ifversion && m="${m}:mod_ifversion"
206 - if use kerberos ; then
207 - in_dir mod_gss-${MOD_GSS} econf
208 - m="${m}:mod_gss:mod_auth_gss"
209 - fi
210 - use ldap && m="${m}:mod_ldap"
211 - use log-forensic && m="${m}:mod_log_forensic"
212 - use msg && m="${m}:mod_msg"
213 - if use mysql || use postgres || use sqlite ; then
214 - m="${m}:mod_sql:mod_sql_passwd"
215 - use mysql && m="${m}:mod_sql_mysql"
216 - use postgres && m="${m}:mod_sql_postgres"
217 - use sqlite && m="${m}:mod_sql_sqlite"
218 - fi
219 - use qos && m="${m}:mod_qos"
220 - use radius && m="${m}:mod_radius"
221 - use ratio && m="${m}:mod_ratio"
222 - use readme && m="${m}:mod_readme"
223 - use rewrite && m="${m}:mod_rewrite"
224 - if use sftp ; then
225 - m="${m}:mod_sftp"
226 - use pam && m="${m}:mod_sftp_pam"
227 - use mysql || use postgres || use sqlite && m="${m}:mod_sftp_sql"
228 - fi
229 - use shaper && m="${m}:mod_shaper"
230 - use sitemisc && m="${m}:mod_site_misc"
231 - use snmp && m="${m}:mod_snmp"
232 - if use softquota ; then
233 - m="${m}:mod_quotatab:mod_quotatab_file"
234 - use ldap && m="${m}:mod_quotatab_ldap"
235 - use radius && m="${m}:mod_quotatab_radius"
236 - use mysql || use postgres || use sqlite && m="${m}:mod_quotatab_sql"
237 - fi
238 - if use ssl ; then
239 - m="${m}:mod_tls:mod_tls_shmcache"
240 - use memcache && m="${m}:mod_tls_memcache"
241 - fi
242 - if use tcpd ; then
243 - m="${m}:mod_wrap2:mod_wrap2_file"
244 - use mysql || use postgres || use sqlite && m="${m}:mod_wrap2_sql"
245 - fi
246 - use unique-id && m="${m}:mod_unique_id"
247 - use vroot && m="${m}:mod_vroot"
248 -
249 - if [[ -n ${PROFTP_CUSTOM_MODULES} ]]; then
250 - einfo "Adding user-specified extra modules: '${PROFTP_CUSTOM_MODULES}'"
251 - m="${m}:${PROFTP_CUSTOM_MODULES}"
252 - fi
253 -
254 - [[ -z ${m} ]] || c="${c} --with-modules=${m:1}"
255 -
256 - econf --localstatedir=/run/proftpd --sysconfdir=/etc/proftpd --disable-strip \
257 - $(use_enable acl facl) \
258 - $(use_enable authfile auth-file) \
259 - $(use_enable caps cap) \
260 - $(use_enable ctrls) \
261 - $(use_enable dso) \
262 - $(use_enable ident) \
263 - $(use_enable ipv6) \
264 - $(use_enable memcache) \
265 - $(use_enable ncurses) \
266 - $(use_enable nls) \
267 - $(use_enable ssl openssl) \
268 - $(use_enable pam auth-pam) \
269 - $(use_enable pcre) \
270 - $(use_enable sodium) \
271 - $(use_enable test tests) \
272 - --enable-trace \
273 - $(use_enable userland_GNU shadow) \
274 - $(use_enable userland_GNU autoshadow) \
275 - ${c:1}
276 -}
277 -
278 -src_test() {
279 - emake api-tests -C tests
280 -}
281 -
282 -src_install() {
283 - default
284 - [[ -z ${LINGUAS-set} ]] && rm -r "${ED}"/usr/share/locale
285 - rm -rf "${ED}"/run "${ED}"/var/run
286 -
287 - newinitd "${FILESDIR}"/proftpd.initd-r1 proftpd
288 - insinto /etc/proftpd
289 - doins "${FILESDIR}"/proftpd.conf.sample
290 -
291 - insinto /etc/xinetd.d
292 - newins "${FILESDIR}"/proftpd.xinetd proftpd
293 -
294 - insinto /etc/logrotate.d
295 - newins "${FILESDIR}"/${PN}.logrotate ${PN}
296 -
297 - dodoc ChangeLog CREDITS INSTALL NEWS README* RELEASE_NOTES
298 -
299 - docinto html
300 - dodoc doc/*.html doc/contrib/*.html doc/howto/*.html doc/modules/*.html
301 -
302 - docinto rfc
303 - dodoc doc/rfc/*.txt
304 -
305 - systemd_dounit "${FILESDIR}"/${PN}.service
306 - systemd_newtmpfilesd "${FILESDIR}"/${PN}-tmpfiles.d.conf-r1 ${PN}.conf
307 -}
308 -
309 -pkg_postinst() {
310 - # Create /var/run files at package merge time: bug #650000
311 - tmpfiles_process ${PN}.conf
312 -}