1 |
commit: 4264995422023b157837a79aa72788001a516e02 |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 29 09:25:11 2016 +0000 |
4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 29 09:26:21 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42649954 |
7 |
|
8 |
net-misc/tinc: drop old |
9 |
|
10 |
Package-Manager: portage-2.3.2 |
11 |
|
12 |
net-misc/tinc/Manifest | 2 - |
13 |
net-misc/tinc/files/tinc-1.1_pre14-upnp.patch | 13 ---- |
14 |
net-misc/tinc/tinc-1.0.28.ebuild | 48 ------------- |
15 |
net-misc/tinc/tinc-1.1_pre14-r1.ebuild | 95 -------------------------- |
16 |
net-misc/tinc/tinc-1.1_pre14-r2.ebuild | 98 --------------------------- |
17 |
net-misc/tinc/tinc-1.1_pre14.ebuild | 81 ---------------------- |
18 |
6 files changed, 337 deletions(-) |
19 |
|
20 |
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest |
21 |
index 3df5f02..4a53598 100644 |
22 |
--- a/net-misc/tinc/Manifest |
23 |
+++ b/net-misc/tinc/Manifest |
24 |
@@ -1,6 +1,4 @@ |
25 |
-DIST tinc-1.0.28.tar.gz 488837 SHA256 0b502699360f09ce2128a39cf02abca07bfc699fc02ce829b3a90cf5e1e8b344 SHA512 b449f59e45b72a75271d54af1b9359f69040e81960533ca70d2a1f84b6bb913ffe1e6d11265eb1d11b5577855ed495898ef3c387d14268b159f352c8e754f5ec WHIRLPOOL 9558328fc01e9ef716330167c958bdfe45c12365dccdd3dc8c878a1dd122a0710d41e434a4ec0f5a54427b2b04fd7204f5225bef8c64ddd9fde7e6d800e7a996 |
26 |
DIST tinc-1.0.29.tar.gz 493335 SHA256 0357017c6ffbbe1b2088c28fa684d2b119afa1086f363c503d06e8f6faa72a78 SHA512 230f3ff4c86d9ebed6e350f3ec92e931d83f94e6b9c4821bec745dddc2d33997e776bf3cd2a8b9e261b2f0b2df2ed8b5406bfa40bae08696304f650de9f34ef3 WHIRLPOOL 9825337a4622bd9461c027767e701b3934ef422beb10a06b801e005549b7b2ff944d4609591667efc994d14b002db937658209a8eb9f363a868373ebfdd0603e |
27 |
DIST tinc-1.0.30.tar.gz 494699 SHA256 abc17e25afc1b9e74423c78fef586b11d503cbbbe5e4a2ed323870f4a82faa73 SHA512 2e98658eeb77ceaf2973f3b77cac0c31beecd1382dc6976461da55cf22e27469d30cf6b35d5b3ce489a1809f38e82635b24a86956d62ef34e28ec43b8d09d1e6 WHIRLPOOL bd37aa99b915e6075b0ec95589f11c3f63a6d6600b566c855735bda8312a0a7957224e4f11a6fb897308b540dd5a9ccd10a13d1d07d11a51200bbf833c823b5f |
28 |
-DIST tinc-1.1-upstream-patches-0.tar.xz 14936 SHA256 9a95897e50da8c213d80d024910bf8622c838ec2ef2fd23b48a7fc448ffa67e1 SHA512 c8a4ab62f9fbb6259af0fd621bfdcf6505f553478e70ef3aacf0c7c35c5070458246786f416ac8631d7f9e36ab764ea4250c6cb3e95aa8d1fee7e995d07a2d9d WHIRLPOOL e708ef24b532be48e2824cb18685aeb80c8e1053e44aaa3e82ce29ae6055abcc04fe1ebab0758d008ed5880f4d5b19e9b06b8eebfae9904cfa2b04dfee4a3d77 |
29 |
DIST tinc-1.1-upstream-patches-1.tar.xz 17316 SHA256 2358b51678381a76ccc283eb04f14ad1ec426bbf2703d73f566f94dc52d17a9c SHA512 db71787e2edbfa8ca6288818536a36ee8fa158b400639ca9650d2d17a66b3968ab36d088e6dcbbf9524f3322166254ad1aad87db78b00dc64e0dc2a49ea7b44f WHIRLPOOL ed28917111cd0553ef75048c2b48b0499559e5a6ace77f49efb7d6d15743ba0d426477eeed9364bea6fba6e434442cf17d71ffb224acdd7da3b49792ff59bc09 |
30 |
DIST tinc-1.1pre14.tar.gz 696109 SHA256 e349e78f0e0d10899b8ab51c285bdb96c5ee322e847dfcf6ac9e21036286221f SHA512 dfc54a91fd40826b108e9cbae43da42462eb51bb7ad16ac040cb1b262b5510eb6884b1f1dbe0541a3b1631213f70cc678593d1ba51ebdf150c3f6968030b9291 WHIRLPOOL 63c8229c667e461ad20c118d233a2abfe598cc95698b8c83e5f8b598657ca298ea0cdc20432ab2d084fd4a06129a5884e91eb445f4c7204be3798d1fb4dec2f8 |
31 |
|
32 |
diff --git a/net-misc/tinc/files/tinc-1.1_pre14-upnp.patch b/net-misc/tinc/files/tinc-1.1_pre14-upnp.patch |
33 |
deleted file mode 100644 |
34 |
index 1d037ef..00000000 |
35 |
--- a/net-misc/tinc/files/tinc-1.1_pre14-upnp.patch |
36 |
+++ /dev/null |
37 |
@@ -1,13 +0,0 @@ |
38 |
-diff --git a/src/upnp.c b/src/upnp.c |
39 |
-index abd2f92..3bfc770 100644 |
40 |
---- a/src/upnp.c |
41 |
-+++ b/src/upnp.c |
42 |
-@@ -57,7 +57,7 @@ static struct UPNPDev *upnp_discover(int delay, int *error) { |
43 |
- |
44 |
- #elif MINIUPNPC_API_VERSION <= 14 |
45 |
- |
46 |
-- return upnpDiscover(delay, NULL NULL, false, false, 2, error); |
47 |
-+ return upnpDiscover(delay, NULL, NULL, false, false, 2, error); |
48 |
- |
49 |
- #else |
50 |
- |
51 |
|
52 |
diff --git a/net-misc/tinc/tinc-1.0.28.ebuild b/net-misc/tinc/tinc-1.0.28.ebuild |
53 |
deleted file mode 100644 |
54 |
index 539bcf9..00000000 |
55 |
--- a/net-misc/tinc/tinc-1.0.28.ebuild |
56 |
+++ /dev/null |
57 |
@@ -1,48 +0,0 @@ |
58 |
-# Copyright 1999-2016 Gentoo Foundation |
59 |
-# Distributed under the terms of the GNU General Public License v2 |
60 |
-# $Id$ |
61 |
- |
62 |
-EAPI="5" |
63 |
-inherit systemd |
64 |
- |
65 |
-DESCRIPTION="tinc is an easy to configure VPN implementation" |
66 |
-HOMEPAGE="http://www.tinc-vpn.org/" |
67 |
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz" |
68 |
- |
69 |
-LICENSE="GPL-2" |
70 |
-SLOT="0" |
71 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
72 |
-IUSE="libressl +lzo uml vde +zlib" |
73 |
- |
74 |
-DEPEND=" |
75 |
- !libressl? ( dev-libs/openssl:0= ) |
76 |
- libressl? ( dev-libs/libressl:0= ) |
77 |
- lzo? ( dev-libs/lzo:2 ) |
78 |
- zlib? ( sys-libs/zlib )" |
79 |
-RDEPEND="${DEPEND} |
80 |
- vde? ( net-misc/vde )" |
81 |
- |
82 |
-src_configure() { |
83 |
- econf \ |
84 |
- --enable-jumbograms \ |
85 |
- --disable-tunemu \ |
86 |
- $(use_enable lzo) \ |
87 |
- $(use_enable uml) \ |
88 |
- $(use_enable vde) \ |
89 |
- $(use_enable zlib) |
90 |
-} |
91 |
- |
92 |
-src_install() { |
93 |
- emake DESTDIR="${D}" install |
94 |
- dodir /etc/tinc |
95 |
- dodoc AUTHORS NEWS README THANKS |
96 |
- doconfd "${FILESDIR}"/tinc.networks |
97 |
- newconfd "${FILESDIR}"/tincd.conf tincd |
98 |
- newinitd "${FILESDIR}"/tincd-r1 tincd |
99 |
- systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service" |
100 |
-} |
101 |
- |
102 |
-pkg_postinst() { |
103 |
- elog "This package requires the tun/tap kernel device." |
104 |
- elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" |
105 |
-} |
106 |
|
107 |
diff --git a/net-misc/tinc/tinc-1.1_pre14-r1.ebuild b/net-misc/tinc/tinc-1.1_pre14-r1.ebuild |
108 |
deleted file mode 100644 |
109 |
index 0f904de..00000000 |
110 |
--- a/net-misc/tinc/tinc-1.1_pre14-r1.ebuild |
111 |
+++ /dev/null |
112 |
@@ -1,95 +0,0 @@ |
113 |
-# Copyright 1999-2016 Gentoo Foundation |
114 |
-# Distributed under the terms of the GNU General Public License v2 |
115 |
-# $Id$ |
116 |
- |
117 |
-EAPI="5" |
118 |
- |
119 |
-MY_PV=${PV/_/} |
120 |
-MY_P=${PN}-${MY_PV} |
121 |
- |
122 |
-PYTHON_COMPAT=( python2_7 ) |
123 |
-inherit eutils multilib python-any-r1 |
124 |
- |
125 |
-DESCRIPTION="tinc is an easy to configure VPN implementation" |
126 |
-HOMEPAGE="http://www.tinc-vpn.org/" |
127 |
- |
128 |
-UPSTREAM_VER=0 |
129 |
- |
130 |
-[[ -n ${UPSTREAM_VER} ]] && \ |
131 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz" |
132 |
- |
133 |
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz |
134 |
- ${UPSTREAM_PATCHSET_URI}" |
135 |
- |
136 |
-LICENSE="GPL-2" |
137 |
-SLOT="0" |
138 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
139 |
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib" |
140 |
- |
141 |
-DEPEND=" |
142 |
- ssl? ( |
143 |
- !libressl? ( dev-libs/openssl:0= ) |
144 |
- libressl? ( dev-libs/libressl:0= ) |
145 |
- ) |
146 |
- lzo? ( dev-libs/lzo:2 ) |
147 |
- ncurses? ( sys-libs/ncurses:= ) |
148 |
- readline? ( sys-libs/readline:= ) |
149 |
- upnp? ( net-libs/miniupnpc ) |
150 |
- zlib? ( sys-libs/zlib )" |
151 |
-RDEPEND="${DEPEND} |
152 |
- vde? ( net-misc/vde ) |
153 |
- ${PYTHON_DEPS} |
154 |
- gui? ( $(python_gen_any_dep ' |
155 |
- dev-python/wxpython[${PYTHON_USEDEP}] |
156 |
- ') )" |
157 |
- |
158 |
-S="${WORKDIR}/${MY_P}" |
159 |
- |
160 |
-src_prepare() { |
161 |
- # Upstream's patchset |
162 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
163 |
- einfo "Try to apply Tinc Upstream patch set" |
164 |
- EPATCH_SUFFIX="patch" \ |
165 |
- EPATCH_FORCE="yes" \ |
166 |
- EPATCH_OPTS="-p1" \ |
167 |
- epatch "${WORKDIR}"/patches-upstream |
168 |
- fi |
169 |
-} |
170 |
- |
171 |
-src_configure() { |
172 |
- econf \ |
173 |
- --enable-jumbograms \ |
174 |
- --disable-silent-rules \ |
175 |
- --enable-legacy-protocol \ |
176 |
- --disable-tunemu \ |
177 |
- --with-systemd=/usr/$(get_libdir)/systemd/system \ |
178 |
- $(use_enable lzo) \ |
179 |
- $(use_enable ncurses curses) \ |
180 |
- $(use_enable readline) \ |
181 |
- $(use_enable uml) \ |
182 |
- $(use_enable vde) \ |
183 |
- $(use_enable zlib) \ |
184 |
- $(use_enable upnp miniupnpc) \ |
185 |
- $(use_with ssl openssl) |
186 |
- #--without-libgcrypt \ |
187 |
-} |
188 |
- |
189 |
-src_install() { |
190 |
- emake DESTDIR="${D}" install |
191 |
- dodir /etc/tinc |
192 |
- dodoc AUTHORS NEWS README THANKS |
193 |
- doconfd "${FILESDIR}"/tinc.networks |
194 |
- newconfd "${FILESDIR}"/tincd.conf tincd |
195 |
- newinitd "${FILESDIR}"/tincd-r1 tincd |
196 |
- |
197 |
- if use gui; then |
198 |
- python_fix_shebang "${ED}"/usr/bin/tinc-gui |
199 |
- else |
200 |
- rm -f "${ED}"/usr/bin/tinc-gui || die |
201 |
- fi |
202 |
-} |
203 |
- |
204 |
-pkg_postinst() { |
205 |
- elog "This package requires the tun/tap kernel device." |
206 |
- elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" |
207 |
-} |
208 |
|
209 |
diff --git a/net-misc/tinc/tinc-1.1_pre14-r2.ebuild b/net-misc/tinc/tinc-1.1_pre14-r2.ebuild |
210 |
deleted file mode 100644 |
211 |
index bca8d41..00000000 |
212 |
--- a/net-misc/tinc/tinc-1.1_pre14-r2.ebuild |
213 |
+++ /dev/null |
214 |
@@ -1,98 +0,0 @@ |
215 |
-# Copyright 1999-2016 Gentoo Foundation |
216 |
-# Distributed under the terms of the GNU General Public License v2 |
217 |
-# $Id$ |
218 |
- |
219 |
-EAPI="6" |
220 |
- |
221 |
-MY_PV=${PV/_/} |
222 |
-MY_P=${PN}-${MY_PV} |
223 |
- |
224 |
-PYTHON_COMPAT=( python2_7 ) |
225 |
-inherit eutils multilib python-any-r1 |
226 |
- |
227 |
-DESCRIPTION="tinc is an easy to configure VPN implementation" |
228 |
-HOMEPAGE="http://www.tinc-vpn.org/" |
229 |
- |
230 |
-UPSTREAM_VER=0 |
231 |
- |
232 |
-[[ -n ${UPSTREAM_VER} ]] && \ |
233 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz" |
234 |
- |
235 |
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz |
236 |
- ${UPSTREAM_PATCHSET_URI}" |
237 |
- |
238 |
-LICENSE="GPL-2" |
239 |
-SLOT="0" |
240 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
241 |
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib" |
242 |
- |
243 |
-DEPEND=" |
244 |
- ssl? ( |
245 |
- !libressl? ( dev-libs/openssl:0= ) |
246 |
- libressl? ( dev-libs/libressl:0= ) |
247 |
- ) |
248 |
- lzo? ( dev-libs/lzo:2 ) |
249 |
- ncurses? ( sys-libs/ncurses:= ) |
250 |
- readline? ( sys-libs/readline:= ) |
251 |
- upnp? ( net-libs/miniupnpc ) |
252 |
- zlib? ( sys-libs/zlib )" |
253 |
-RDEPEND="${DEPEND} |
254 |
- vde? ( net-misc/vde ) |
255 |
- ${PYTHON_DEPS} |
256 |
- gui? ( $(python_gen_any_dep ' |
257 |
- dev-python/wxpython[${PYTHON_USEDEP}] |
258 |
- ') )" |
259 |
- |
260 |
-S="${WORKDIR}/${MY_P}" |
261 |
- |
262 |
-src_prepare() { |
263 |
- # Upstream's patchset |
264 |
- if [[ -n ${UPSTREAM_VER} ]]; then |
265 |
- einfo "Try to apply Tinc Upstream patch set" |
266 |
- EPATCH_SUFFIX="patch" \ |
267 |
- EPATCH_FORCE="yes" \ |
268 |
- EPATCH_OPTS="-p1" \ |
269 |
- epatch "${WORKDIR}"/patches-upstream |
270 |
- fi |
271 |
- |
272 |
- eapply "${FILESDIR}"/tinc-1.1-fix-paths.patch #560528 |
273 |
- eapply_user |
274 |
-} |
275 |
- |
276 |
-src_configure() { |
277 |
- econf \ |
278 |
- --enable-jumbograms \ |
279 |
- --disable-silent-rules \ |
280 |
- --enable-legacy-protocol \ |
281 |
- --disable-tunemu \ |
282 |
- --with-systemd=/usr/$(get_libdir)/systemd/system \ |
283 |
- $(use_enable lzo) \ |
284 |
- $(use_enable ncurses curses) \ |
285 |
- $(use_enable readline) \ |
286 |
- $(use_enable uml) \ |
287 |
- $(use_enable vde) \ |
288 |
- $(use_enable zlib) \ |
289 |
- $(use_enable upnp miniupnpc) \ |
290 |
- $(use_with ssl openssl) |
291 |
- #--without-libgcrypt \ |
292 |
-} |
293 |
- |
294 |
-src_install() { |
295 |
- emake DESTDIR="${D}" install |
296 |
- dodir /etc/tinc |
297 |
- dodoc AUTHORS NEWS README THANKS |
298 |
- doconfd "${FILESDIR}"/tinc.networks |
299 |
- newconfd "${FILESDIR}"/tincd.conf tincd |
300 |
- newinitd "${FILESDIR}"/tincd-r2 tincd |
301 |
- |
302 |
- if use gui; then |
303 |
- python_fix_shebang "${ED}"/usr/bin/tinc-gui |
304 |
- else |
305 |
- rm -f "${ED}"/usr/bin/tinc-gui || die |
306 |
- fi |
307 |
-} |
308 |
- |
309 |
-pkg_postinst() { |
310 |
- elog "This package requires the tun/tap kernel device." |
311 |
- elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" |
312 |
-} |
313 |
|
314 |
diff --git a/net-misc/tinc/tinc-1.1_pre14.ebuild b/net-misc/tinc/tinc-1.1_pre14.ebuild |
315 |
deleted file mode 100644 |
316 |
index 3a9eb67..00000000 |
317 |
--- a/net-misc/tinc/tinc-1.1_pre14.ebuild |
318 |
+++ /dev/null |
319 |
@@ -1,81 +0,0 @@ |
320 |
-# Copyright 1999-2016 Gentoo Foundation |
321 |
-# Distributed under the terms of the GNU General Public License v2 |
322 |
-# $Id$ |
323 |
- |
324 |
-EAPI="5" |
325 |
- |
326 |
-MY_PV=${PV/_/} |
327 |
-MY_P=${PN}-${MY_PV} |
328 |
- |
329 |
-PYTHON_COMPAT=( python2_7 ) |
330 |
-inherit eutils multilib python-any-r1 |
331 |
- |
332 |
-DESCRIPTION="tinc is an easy to configure VPN implementation" |
333 |
-HOMEPAGE="http://www.tinc-vpn.org/" |
334 |
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz" |
335 |
- |
336 |
-LICENSE="GPL-2" |
337 |
-SLOT="0" |
338 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
339 |
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib" |
340 |
- |
341 |
-DEPEND=" |
342 |
- ssl? ( |
343 |
- !libressl? ( dev-libs/openssl:0= ) |
344 |
- libressl? ( dev-libs/libressl:0= ) |
345 |
- ) |
346 |
- lzo? ( dev-libs/lzo:2 ) |
347 |
- ncurses? ( sys-libs/ncurses:= ) |
348 |
- readline? ( sys-libs/readline:= ) |
349 |
- upnp? ( net-libs/miniupnpc ) |
350 |
- zlib? ( sys-libs/zlib )" |
351 |
-RDEPEND="${DEPEND} |
352 |
- vde? ( net-misc/vde ) |
353 |
- ${PYTHON_DEPS} |
354 |
- gui? ( $(python_gen_any_dep ' |
355 |
- dev-python/wxpython[${PYTHON_USEDEP}] |
356 |
- ') )" |
357 |
- |
358 |
-S="${WORKDIR}/${MY_P}" |
359 |
- |
360 |
-src_prepare() { |
361 |
- epatch "${FILESDIR}"/${P}-upnp.patch |
362 |
-} |
363 |
- |
364 |
-src_configure() { |
365 |
- econf \ |
366 |
- --enable-jumbograms \ |
367 |
- --disable-silent-rules \ |
368 |
- --enable-legacy-protocol \ |
369 |
- --disable-tunemu \ |
370 |
- --with-systemd=/usr/$(get_libdir)/systemd/system \ |
371 |
- $(use_enable lzo) \ |
372 |
- $(use_enable ncurses curses) \ |
373 |
- $(use_enable readline) \ |
374 |
- $(use_enable uml) \ |
375 |
- $(use_enable vde) \ |
376 |
- $(use_enable zlib) \ |
377 |
- $(use_enable upnp miniupnpc) \ |
378 |
- $(use_with ssl openssl) |
379 |
- #--without-libgcrypt \ |
380 |
-} |
381 |
- |
382 |
-src_install() { |
383 |
- emake DESTDIR="${D}" install |
384 |
- dodir /etc/tinc |
385 |
- dodoc AUTHORS NEWS README THANKS |
386 |
- doconfd "${FILESDIR}"/tinc.networks |
387 |
- newconfd "${FILESDIR}"/tincd.conf tincd |
388 |
- newinitd "${FILESDIR}"/tincd-r1 tincd |
389 |
- |
390 |
- if use gui; then |
391 |
- python_fix_shebang "${ED}"/usr/bin/tinc-gui |
392 |
- else |
393 |
- rm -f "${ED}"/usr/bin/tinc-gui || die |
394 |
- fi |
395 |
-} |
396 |
- |
397 |
-pkg_postinst() { |
398 |
- elog "This package requires the tun/tap kernel device." |
399 |
- elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" |
400 |
-} |