Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/uftp/files/, net-misc/uftp/
Date: Fri, 07 Feb 2020 14:25:31
Message-Id: 1581085320.711e249f311623ca98ab30ac4294f80c8dc9533e.juippis@gentoo
1 commit: 711e249f311623ca98ab30ac4294f80c8dc9533e
2 Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
3 AuthorDate: Thu Feb 6 14:46:28 2020 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Fri Feb 7 14:22:00 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=711e249f
7
8 net-misc/uftp: remove old
9
10 Package-Manager: Portage-2.3.84, Repoman-2.3.20
11 Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/14581
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 net-misc/uftp/Manifest | 4 --
16 net-misc/uftp/files/uftp-3.7_makefile.patch | 79 ----------------------
17 ...4_makefile.patch => uftp-4.10.1_makefile.patch} | 0
18 net-misc/uftp/uftp-3.7.1.ebuild | 45 ------------
19 net-misc/uftp/uftp-4.10.1.ebuild | 6 +-
20 net-misc/uftp/uftp-4.9.4.ebuild | 52 --------------
21 net-misc/uftp/uftp-4.9.5.ebuild | 56 ---------------
22 net-misc/uftp/uftp-4.9.8.ebuild | 56 ---------------
23 8 files changed, 3 insertions(+), 295 deletions(-)
24
25 diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
26 index 64d63ab90af..9f1cf5a6aa9 100644
27 --- a/net-misc/uftp/Manifest
28 +++ b/net-misc/uftp/Manifest
29 @@ -1,5 +1 @@
30 -DIST uftp-3.7.1.tar 849920 BLAKE2B 32a2ccca01f4b8ee205301a2bb4ac30da4f17bf0d8a24f885ec40a430b2cc478efcd504ba118ef7f55c43ef53a6fb3e6caa2e2cebda93c254ab289a8683488a6 SHA512 93fefe1d4c5310bfa6470a78011e63aea8cc9cf59a73ea24920d3ad8c835476bbc410b3669ee79c847eba7d21d61f600e09529d5e6f2ed24076f663a34d99c15
31 DIST uftp-4.10.1.tar.gz 245625 BLAKE2B 23b01758fa5a0387471f8d95b24738d8157801822b8a07a59072eeab81277ceb5283463465ed522af6971d65141712ead3e2206caa286bedece9e0c34a149873 SHA512 9ef4594e0cde2f64970523661fcee07f34600bd4f2ab235c34bde9d20ef1b0312d5e430e1f52ab605c188c42aee4a0384ed02ae9f5e93b3edc062f848a8130bf
32 -DIST uftp-4.9.4.tar.gz 243819 BLAKE2B b7aa75f8db82480912dd4cf8199dce7e8170db837853f16a2d8e5a4b7cf190416b7a2a23e170a4837f59a7bba030b0434383bceae9b253eb1d2fc13f6fcd26e7 SHA512 f3c799265a55e0cb536f17be3a0ebfad5f81284255083ebe9a12fda4b5ce8407f05a710cb32a41f3dccbc0ac90367c44d4b67058bdbeaa4f2f8efe732463ebf0
33 -DIST uftp-4.9.5.tar.gz 243999 BLAKE2B 32f6e6fef062e3b0696db775f2e925fdd53f03d8e04181f65140372abc85674b90579ea4b0c48cf21378c97552d06374005e70b6f1e9af7c03b7478d0b86e26c SHA512 3a4809cc61555ee26de6c1e1ac8525c0345a3b9555cf0a2094ff06eb6f409d1b3ca16b94d7b953dba6d1ae1d8c69a646d575a6357cd178c374bef68888744086
34 -DIST uftp-4.9.8.tar.gz 244855 BLAKE2B bdb5b5caffbfbfaf8d7aa71e675a98240e64b27b6386088c9a096202f32e825a1cd9bed933b5242601c9ff7c5c2afb4c43190b2335a2a73c0dd0b51caf74a1cf SHA512 04875ddc59cdd9cfa88d642aeb9ea4418a99eca12057f54c949ec5aecee85a8a78803ebdeefe11a29a298a151bb5eb19d6c6c5656f26e17639a86308a2946ef5
35
36 diff --git a/net-misc/uftp/files/uftp-3.7_makefile.patch b/net-misc/uftp/files/uftp-3.7_makefile.patch
37 deleted file mode 100644
38 index 81afe8b9baa..00000000000
39 --- a/net-misc/uftp/files/uftp-3.7_makefile.patch
40 +++ /dev/null
41 @@ -1,79 +0,0 @@
42 -diff -Nuar uftp-3.7.orig//makefile uftp-3.7/makefile
43 ---- uftp-3.7.orig//makefile 2012-08-10 17:00:22.566403478 +0600
44 -+++ uftp-3.7/makefile 2012-08-10 17:04:47.523386683 +0600
45 -@@ -39,25 +39,26 @@
46 - endif
47 -
48 - # defaults
49 --CC = gcc
50 --OPTIONS=-g -Wall $(ENC_OPTS)
51 -+CC ?= gcc
52 -+OPTIONS=$(ENC_OPTS)
53 - LDLIBS=-lc -lm $(CRYPT_LIB)
54 --CFLAGS=
55 -+CFLAGS?=
56 -+LDFLAGS?=
57 -
58 - # FreeBSD
59 - ifeq ("FreeBSD", "$(UNAME_S)")
60 --OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
61 -+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
62 - endif
63 -
64 - # OSX, aka Darwin
65 - ifeq ("Darwin", "$(UNAME_S)")
66 --OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
67 -+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
68 - endif
69 -
70 - # Sun
71 - ifeq ("SunOS", "$(UNAME_S)")
72 --CC = cc
73 --OPTIONS=-g -DBSD_COMP $(ENC_OPTS)
74 -+CC ?= cc
75 -+OPTIONS=-DBSD_COMP $(ENC_OPTS)
76 - LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
77 - CFLAGS=`getconf LFS_CFLAGS`
78 - OPENSSL=/usr/sfw
79 -@@ -65,9 +66,9 @@
80 -
81 - # Linux
82 - ifeq ("Linux", "$(UNAME_S)")
83 --OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
84 -+OPTIONS=-DHAS_GETIFADDRS $(ENC_OPTS)
85 - LDLIBS=-lm $(CRYPT_LIB)
86 --CFLAGS=`getconf LFS_CFLAGS`
87 -+CFLAGS?=`getconf LFS_CFLAGS`
88 - endif
89 -
90 - ifdef OPENSSL
91 -@@ -82,7 +83,7 @@
92 - testclient_multi.o: testclient_multi.c uftp.h uftp_common.h encryption.h
93 -
94 - testclient_multi: testclient_multi.o encrypt_openssl.o uftp_common.o
95 -- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
96 -+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
97 -
98 - clean:
99 - rm -f testclient_multi uftp uftpd uftpproxyd uftp_keymgt *.o
100 -@@ -176,16 +177,16 @@
101 - endif
102 -
103 - uftp: $(UFTP_OBJS)
104 -- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
105 -+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
106 -
107 - uftpd: $(UFTPD_OBJS)
108 -- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
109 -+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
110 -
111 - uftpproxyd: $(UFTPPROXYD_OBJS)
112 -- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
113 -+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
114 -
115 - uftp_keymgt: $(UFTP_KEYMGT_OBJS)
116 -- $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS)
117 -+ $(CC) $(OPTIONS) $(LIB) -o $@ $^ $(LDLIBS) $(LDFLAGS)
118 -
119 - %.o: %.c
120 - $(CC) $(OPTIONS) $(INCLUDE) $(CFLAGS) -c $<
121
122 diff --git a/net-misc/uftp/files/uftp-4.9.4_makefile.patch b/net-misc/uftp/files/uftp-4.10.1_makefile.patch
123 similarity index 100%
124 rename from net-misc/uftp/files/uftp-4.9.4_makefile.patch
125 rename to net-misc/uftp/files/uftp-4.10.1_makefile.patch
126
127 diff --git a/net-misc/uftp/uftp-3.7.1.ebuild b/net-misc/uftp/uftp-3.7.1.ebuild
128 deleted file mode 100644
129 index 41aed30ba67..00000000000
130 --- a/net-misc/uftp/uftp-3.7.1.ebuild
131 +++ /dev/null
132 @@ -1,45 +0,0 @@
133 -# Copyright 1999-2017 Gentoo Foundation
134 -# Distributed under the terms of the GNU General Public License v2
135 -
136 -EAPI=6
137 -
138 -inherit toolchain-funcs
139 -
140 -DESCRIPTION="Encrypted UDP based FTP with multicast"
141 -HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
142 -SRC_URI="http://www.tcnj.edu/~bush/downloads/${P}.tar"
143 -
144 -LICENSE="GPL-3"
145 -SLOT="0"
146 -KEYWORDS="~amd64 ~x86"
147 -IUSE="+server ssl"
148 -
149 -DEPEND="ssl? ( dev-libs/openssl:0= )"
150 -RDEPEND="${DEPEND}"
151 -
152 -PATCHES=(
153 - "${FILESDIR}/${PN}-3.7_makefile.patch"
154 -)
155 -
156 -src_compile() {
157 - use ssl || local opt="NO_ENCRYPTION=1"
158 - emake CC=$(tc-getCC) $opt uftp uftp_keymgt
159 - use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
160 -}
161 -
162 -src_install() {
163 - dobin uftp uftp_keymgt
164 - dodoc ReadMe.txt
165 - doman uftp.1 uftp_keymgt.1
166 -
167 - if use server ; then
168 - dosbin uftpd uftpproxyd
169 - newinitd "${FILESDIR}/uftpd.init" uftpd
170 - newconfd "${FILESDIR}/uftpd.conf" uftpd
171 - newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
172 - newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
173 - doman uftpd.1 uftpproxyd.1
174 - insinto /etc/logrotate.d
175 - newins "${FILESDIR}/logrotate" uftpd
176 - fi
177 -}
178
179 diff --git a/net-misc/uftp/uftp-4.10.1.ebuild b/net-misc/uftp/uftp-4.10.1.ebuild
180 index db422b2917e..9fb44efca5f 100644
181 --- a/net-misc/uftp/uftp-4.10.1.ebuild
182 +++ b/net-misc/uftp/uftp-4.10.1.ebuild
183 @@ -22,7 +22,7 @@ RDEPEND="${DEPEND}"
184 RESTRICT=test
185
186 PATCHES=(
187 - "${FILESDIR}/${PN}-4.9.4_makefile.patch"
188 + "${FILESDIR}/${P}_makefile.patch"
189 "${FILESDIR}/${P}_gcc10.patch"
190 )
191
192 @@ -35,7 +35,7 @@ src_compile() {
193 src_install() {
194 dobin uftp uftp_keymgt
195 dodoc {Changes,protocol,ReadMe}.txt
196 - doman uftp.1 uftp_keymgt.1
197 + doman {uftp,uftp_keymgt}.1
198
199 if use server ; then
200 dosbin uftpd uftpproxyd
201 @@ -43,7 +43,7 @@ src_install() {
202 newconfd "${FILESDIR}/uftpd.conf" uftpd
203 newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
204 newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
205 - doman uftpd.1 uftpproxyd.1
206 + doman {uftpd,uftpproxyd}.1
207 insinto /etc/logrotate.d
208 newins "${FILESDIR}/logrotate" uftpd
209 fi
210
211 diff --git a/net-misc/uftp/uftp-4.9.4.ebuild b/net-misc/uftp/uftp-4.9.4.ebuild
212 deleted file mode 100644
213 index 74358db417d..00000000000
214 --- a/net-misc/uftp/uftp-4.9.4.ebuild
215 +++ /dev/null
216 @@ -1,52 +0,0 @@
217 -# Copyright 1999-2017 Gentoo Foundation
218 -# Distributed under the terms of the GNU General Public License v2
219 -
220 -EAPI=6
221 -
222 -inherit toolchain-funcs
223 -
224 -DESCRIPTION="Encrypted UDP based FTP with multicast"
225 -HOMEPAGE="http://uftp-multicast.sourceforge.net/"
226 -SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
227 -
228 -LICENSE="GPL-3"
229 -SLOT="0"
230 -KEYWORDS="~amd64 ~x86"
231 -IUSE="+server ssl"
232 -
233 -DEPEND="ssl? ( dev-libs/openssl:0= )"
234 -RDEPEND="${DEPEND}"
235 -
236 -PATCHES=(
237 - "${FILESDIR}/${P}_makefile.patch"
238 -)
239 -
240 -src_compile() {
241 - use ssl || local opt="NO_ENCRYPTION=1"
242 - emake CC=$(tc-getCC) $opt uftp uftp_keymgt
243 - use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
244 -}
245 -
246 -src_install() {
247 - dobin uftp uftp_keymgt
248 - dodoc {Changes,protocol,ReadMe}.txt
249 - doman uftp.1 uftp_keymgt.1
250 -
251 - if use server ; then
252 - dosbin uftpd uftpproxyd
253 - newinitd "${FILESDIR}/uftpd.init" uftpd
254 - newconfd "${FILESDIR}/uftpd.conf" uftpd
255 - newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
256 - newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
257 - doman uftpd.1 uftpproxyd.1
258 - insinto /etc/logrotate.d
259 - newins "${FILESDIR}/logrotate" uftpd
260 - fi
261 -}
262 -
263 -pkg_postinst() {
264 - if use server ; then
265 - ewarn "Please note, uftpd 4.x server is not backward compatible with"
266 - ewarn "uftp 3.x clients! Please upgrade clients before servers."
267 - fi
268 -}
269
270 diff --git a/net-misc/uftp/uftp-4.9.5.ebuild b/net-misc/uftp/uftp-4.9.5.ebuild
271 deleted file mode 100644
272 index a596a8380bb..00000000000
273 --- a/net-misc/uftp/uftp-4.9.5.ebuild
274 +++ /dev/null
275 @@ -1,56 +0,0 @@
276 -# Copyright 1999-2018 Gentoo Foundation
277 -# Distributed under the terms of the GNU General Public License v2
278 -
279 -EAPI=6
280 -
281 -inherit toolchain-funcs
282 -
283 -DESCRIPTION="Encrypted UDP based FTP with multicast"
284 -HOMEPAGE="http://uftp-multicast.sourceforge.net/"
285 -SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
286 -
287 -LICENSE="GPL-3"
288 -SLOT="0"
289 -KEYWORDS="~amd64 ~x86"
290 -IUSE="+server ssl"
291 -
292 -# openssl with EC required, see #644674
293 -DEPEND="ssl? ( dev-libs/openssl:0=[-bindist] )"
294 -RDEPEND="${DEPEND}"
295 -
296 -# Workaround, see #644670
297 -RESTRICT=test
298 -
299 -PATCHES=(
300 - "${FILESDIR}/${PN}-4.9.4_makefile.patch"
301 -)
302 -
303 -src_compile() {
304 - use ssl || local opt="NO_ENCRYPTION=1"
305 - emake CC=$(tc-getCC) $opt uftp uftp_keymgt
306 - use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
307 -}
308 -
309 -src_install() {
310 - dobin uftp uftp_keymgt
311 - dodoc {Changes,protocol,ReadMe}.txt
312 - doman uftp.1 uftp_keymgt.1
313 -
314 - if use server ; then
315 - dosbin uftpd uftpproxyd
316 - newinitd "${FILESDIR}/uftpd.init" uftpd
317 - newconfd "${FILESDIR}/uftpd.conf" uftpd
318 - newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
319 - newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
320 - doman uftpd.1 uftpproxyd.1
321 - insinto /etc/logrotate.d
322 - newins "${FILESDIR}/logrotate" uftpd
323 - fi
324 -}
325 -
326 -pkg_postinst() {
327 - if use server ; then
328 - ewarn "Please note, uftpd 4.x server is not backward compatible with"
329 - ewarn "uftp 3.x clients! Please upgrade clients before servers."
330 - fi
331 -}
332
333 diff --git a/net-misc/uftp/uftp-4.9.8.ebuild b/net-misc/uftp/uftp-4.9.8.ebuild
334 deleted file mode 100644
335 index 08943133b71..00000000000
336 --- a/net-misc/uftp/uftp-4.9.8.ebuild
337 +++ /dev/null
338 @@ -1,56 +0,0 @@
339 -# Copyright 1999-2018 Gentoo Authors
340 -# Distributed under the terms of the GNU General Public License v2
341 -
342 -EAPI=6
343 -
344 -inherit toolchain-funcs
345 -
346 -DESCRIPTION="Encrypted UDP based FTP with multicast"
347 -HOMEPAGE="http://uftp-multicast.sourceforge.net/"
348 -SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
349 -
350 -LICENSE="GPL-3"
351 -SLOT="0"
352 -KEYWORDS="~amd64 ~x86"
353 -IUSE="+server ssl"
354 -
355 -# openssl with EC required, see #644674
356 -DEPEND="ssl? ( dev-libs/openssl:0=[-bindist] )"
357 -RDEPEND="${DEPEND}"
358 -
359 -# Workaround, see #644670
360 -RESTRICT=test
361 -
362 -PATCHES=(
363 - "${FILESDIR}/${PN}-4.9.4_makefile.patch"
364 -)
365 -
366 -src_compile() {
367 - use ssl || local opt="NO_ENCRYPTION=1"
368 - emake CC=$(tc-getCC) $opt uftp uftp_keymgt
369 - use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
370 -}
371 -
372 -src_install() {
373 - dobin uftp uftp_keymgt
374 - dodoc {Changes,protocol,ReadMe}.txt
375 - doman uftp.1 uftp_keymgt.1
376 -
377 - if use server ; then
378 - dosbin uftpd uftpproxyd
379 - newinitd "${FILESDIR}/uftpd.init" uftpd
380 - newconfd "${FILESDIR}/uftpd.conf" uftpd
381 - newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
382 - newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
383 - doman uftpd.1 uftpproxyd.1
384 - insinto /etc/logrotate.d
385 - newins "${FILESDIR}/logrotate" uftpd
386 - fi
387 -}
388 -
389 -pkg_postinst() {
390 - if use server ; then
391 - ewarn "Please note, uftpd 4.x server is not backward compatible with"
392 - ewarn "uftp 3.x clients! Please upgrade clients before servers."
393 - fi
394 -}