1 |
commit: 6f5a5037d151c93b9a7f36255d1d4917d7045dba |
2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 29 08:49:48 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=6f5a5037 |
7 |
|
8 |
net-misc/tinc: version bump |
9 |
|
10 |
bump 1.0.30, also update 1.1 upstream patch set |
11 |
|
12 |
Package-Manager: portage-2.3.2 |
13 |
|
14 |
net-misc/tinc/Manifest | 2 + |
15 |
net-misc/tinc/tinc-1.0.30.ebuild | 48 +++++++++++++++++ |
16 |
net-misc/tinc/tinc-1.1_pre14-r3.ebuild | 98 ++++++++++++++++++++++++++++++++++ |
17 |
3 files changed, 148 insertions(+) |
18 |
|
19 |
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest |
20 |
index 7e5870b..3df5f02 100644 |
21 |
--- a/net-misc/tinc/Manifest |
22 |
+++ b/net-misc/tinc/Manifest |
23 |
@@ -1,4 +1,6 @@ |
24 |
DIST tinc-1.0.28.tar.gz 488837 SHA256 0b502699360f09ce2128a39cf02abca07bfc699fc02ce829b3a90cf5e1e8b344 SHA512 b449f59e45b72a75271d54af1b9359f69040e81960533ca70d2a1f84b6bb913ffe1e6d11265eb1d11b5577855ed495898ef3c387d14268b159f352c8e754f5ec WHIRLPOOL 9558328fc01e9ef716330167c958bdfe45c12365dccdd3dc8c878a1dd122a0710d41e434a4ec0f5a54427b2b04fd7204f5225bef8c64ddd9fde7e6d800e7a996 |
25 |
DIST tinc-1.0.29.tar.gz 493335 SHA256 0357017c6ffbbe1b2088c28fa684d2b119afa1086f363c503d06e8f6faa72a78 SHA512 230f3ff4c86d9ebed6e350f3ec92e931d83f94e6b9c4821bec745dddc2d33997e776bf3cd2a8b9e261b2f0b2df2ed8b5406bfa40bae08696304f650de9f34ef3 WHIRLPOOL 9825337a4622bd9461c027767e701b3934ef422beb10a06b801e005549b7b2ff944d4609591667efc994d14b002db937658209a8eb9f363a868373ebfdd0603e |
26 |
+DIST tinc-1.0.30.tar.gz 494699 SHA256 abc17e25afc1b9e74423c78fef586b11d503cbbbe5e4a2ed323870f4a82faa73 SHA512 2e98658eeb77ceaf2973f3b77cac0c31beecd1382dc6976461da55cf22e27469d30cf6b35d5b3ce489a1809f38e82635b24a86956d62ef34e28ec43b8d09d1e6 WHIRLPOOL bd37aa99b915e6075b0ec95589f11c3f63a6d6600b566c855735bda8312a0a7957224e4f11a6fb897308b540dd5a9ccd10a13d1d07d11a51200bbf833c823b5f |
27 |
DIST tinc-1.1-upstream-patches-0.tar.xz 14936 SHA256 9a95897e50da8c213d80d024910bf8622c838ec2ef2fd23b48a7fc448ffa67e1 SHA512 c8a4ab62f9fbb6259af0fd621bfdcf6505f553478e70ef3aacf0c7c35c5070458246786f416ac8631d7f9e36ab764ea4250c6cb3e95aa8d1fee7e995d07a2d9d WHIRLPOOL e708ef24b532be48e2824cb18685aeb80c8e1053e44aaa3e82ce29ae6055abcc04fe1ebab0758d008ed5880f4d5b19e9b06b8eebfae9904cfa2b04dfee4a3d77 |
28 |
+DIST tinc-1.1-upstream-patches-1.tar.xz 17316 SHA256 2358b51678381a76ccc283eb04f14ad1ec426bbf2703d73f566f94dc52d17a9c SHA512 db71787e2edbfa8ca6288818536a36ee8fa158b400639ca9650d2d17a66b3968ab36d088e6dcbbf9524f3322166254ad1aad87db78b00dc64e0dc2a49ea7b44f WHIRLPOOL ed28917111cd0553ef75048c2b48b0499559e5a6ace77f49efb7d6d15743ba0d426477eeed9364bea6fba6e434442cf17d71ffb224acdd7da3b49792ff59bc09 |
29 |
DIST tinc-1.1pre14.tar.gz 696109 SHA256 e349e78f0e0d10899b8ab51c285bdb96c5ee322e847dfcf6ac9e21036286221f SHA512 dfc54a91fd40826b108e9cbae43da42462eb51bb7ad16ac040cb1b262b5510eb6884b1f1dbe0541a3b1631213f70cc678593d1ba51ebdf150c3f6968030b9291 WHIRLPOOL 63c8229c667e461ad20c118d233a2abfe598cc95698b8c83e5f8b598657ca298ea0cdc20432ab2d084fd4a06129a5884e91eb445f4c7204be3798d1fb4dec2f8 |
30 |
|
31 |
diff --git a/net-misc/tinc/tinc-1.0.30.ebuild b/net-misc/tinc/tinc-1.0.30.ebuild |
32 |
new file mode 100644 |
33 |
index 00000000..19f1e15 |
34 |
--- /dev/null |
35 |
+++ b/net-misc/tinc/tinc-1.0.30.ebuild |
36 |
@@ -0,0 +1,48 @@ |
37 |
+# Copyright 1999-2016 Gentoo Foundation |
38 |
+# Distributed under the terms of the GNU General Public License v2 |
39 |
+# $Id$ |
40 |
+ |
41 |
+EAPI="6" |
42 |
+inherit systemd |
43 |
+ |
44 |
+DESCRIPTION="tinc is an easy to configure VPN implementation" |
45 |
+HOMEPAGE="http://www.tinc-vpn.org/" |
46 |
+SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz" |
47 |
+ |
48 |
+LICENSE="GPL-2" |
49 |
+SLOT="0" |
50 |
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
51 |
+IUSE="libressl +lzo uml vde +zlib" |
52 |
+ |
53 |
+DEPEND=" |
54 |
+ !libressl? ( dev-libs/openssl:0= ) |
55 |
+ libressl? ( dev-libs/libressl:0= ) |
56 |
+ lzo? ( dev-libs/lzo:2 ) |
57 |
+ zlib? ( sys-libs/zlib )" |
58 |
+RDEPEND="${DEPEND} |
59 |
+ vde? ( net-misc/vde )" |
60 |
+ |
61 |
+src_configure() { |
62 |
+ econf \ |
63 |
+ --enable-jumbograms \ |
64 |
+ --disable-tunemu \ |
65 |
+ $(use_enable lzo) \ |
66 |
+ $(use_enable uml) \ |
67 |
+ $(use_enable vde) \ |
68 |
+ $(use_enable zlib) |
69 |
+} |
70 |
+ |
71 |
+src_install() { |
72 |
+ emake DESTDIR="${D}" install |
73 |
+ dodir /etc/tinc |
74 |
+ dodoc AUTHORS NEWS README THANKS |
75 |
+ doconfd "${FILESDIR}"/tinc.networks |
76 |
+ newconfd "${FILESDIR}"/tincd.conf tincd |
77 |
+ newinitd "${FILESDIR}"/tincd-r1 tincd |
78 |
+ systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service" |
79 |
+} |
80 |
+ |
81 |
+pkg_postinst() { |
82 |
+ elog "This package requires the tun/tap kernel device." |
83 |
+ elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" |
84 |
+} |
85 |
|
86 |
diff --git a/net-misc/tinc/tinc-1.1_pre14-r3.ebuild b/net-misc/tinc/tinc-1.1_pre14-r3.ebuild |
87 |
new file mode 100644 |
88 |
index 00000000..7a427e4 |
89 |
--- /dev/null |
90 |
+++ b/net-misc/tinc/tinc-1.1_pre14-r3.ebuild |
91 |
@@ -0,0 +1,98 @@ |
92 |
+# Copyright 1999-2016 Gentoo Foundation |
93 |
+# Distributed under the terms of the GNU General Public License v2 |
94 |
+# $Id$ |
95 |
+ |
96 |
+EAPI="6" |
97 |
+ |
98 |
+MY_PV=${PV/_/} |
99 |
+MY_P=${PN}-${MY_PV} |
100 |
+ |
101 |
+PYTHON_COMPAT=( python2_7 ) |
102 |
+inherit eutils multilib python-any-r1 |
103 |
+ |
104 |
+DESCRIPTION="tinc is an easy to configure VPN implementation" |
105 |
+HOMEPAGE="http://www.tinc-vpn.org/" |
106 |
+ |
107 |
+UPSTREAM_VER=1 |
108 |
+ |
109 |
+[[ -n ${UPSTREAM_VER} ]] && \ |
110 |
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz" |
111 |
+ |
112 |
+SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz |
113 |
+ ${UPSTREAM_PATCHSET_URI}" |
114 |
+ |
115 |
+LICENSE="GPL-2" |
116 |
+SLOT="0" |
117 |
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
118 |
+IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib" |
119 |
+ |
120 |
+DEPEND=" |
121 |
+ ssl? ( |
122 |
+ !libressl? ( dev-libs/openssl:0= ) |
123 |
+ libressl? ( dev-libs/libressl:0= ) |
124 |
+ ) |
125 |
+ lzo? ( dev-libs/lzo:2 ) |
126 |
+ ncurses? ( sys-libs/ncurses:= ) |
127 |
+ readline? ( sys-libs/readline:= ) |
128 |
+ upnp? ( net-libs/miniupnpc ) |
129 |
+ zlib? ( sys-libs/zlib )" |
130 |
+RDEPEND="${DEPEND} |
131 |
+ vde? ( net-misc/vde ) |
132 |
+ ${PYTHON_DEPS} |
133 |
+ gui? ( $(python_gen_any_dep ' |
134 |
+ dev-python/wxpython[${PYTHON_USEDEP}] |
135 |
+ ') )" |
136 |
+ |
137 |
+S="${WORKDIR}/${MY_P}" |
138 |
+ |
139 |
+src_prepare() { |
140 |
+ # Upstream's patchset |
141 |
+ if [[ -n ${UPSTREAM_VER} ]]; then |
142 |
+ einfo "Try to apply Tinc Upstream patch set" |
143 |
+ EPATCH_SUFFIX="patch" \ |
144 |
+ EPATCH_FORCE="yes" \ |
145 |
+ EPATCH_OPTS="-p1" \ |
146 |
+ epatch "${WORKDIR}"/patches-upstream |
147 |
+ fi |
148 |
+ |
149 |
+ eapply "${FILESDIR}"/tinc-1.1-fix-paths.patch #560528 |
150 |
+ eapply_user |
151 |
+} |
152 |
+ |
153 |
+src_configure() { |
154 |
+ econf \ |
155 |
+ --enable-jumbograms \ |
156 |
+ --disable-silent-rules \ |
157 |
+ --enable-legacy-protocol \ |
158 |
+ --disable-tunemu \ |
159 |
+ --with-systemd=/usr/$(get_libdir)/systemd/system \ |
160 |
+ $(use_enable lzo) \ |
161 |
+ $(use_enable ncurses curses) \ |
162 |
+ $(use_enable readline) \ |
163 |
+ $(use_enable uml) \ |
164 |
+ $(use_enable vde) \ |
165 |
+ $(use_enable zlib) \ |
166 |
+ $(use_enable upnp miniupnpc) \ |
167 |
+ $(use_with ssl openssl) |
168 |
+ #--without-libgcrypt \ |
169 |
+} |
170 |
+ |
171 |
+src_install() { |
172 |
+ emake DESTDIR="${D}" install |
173 |
+ dodir /etc/tinc |
174 |
+ dodoc AUTHORS NEWS README THANKS |
175 |
+ doconfd "${FILESDIR}"/tinc.networks |
176 |
+ newconfd "${FILESDIR}"/tincd.conf tincd |
177 |
+ newinitd "${FILESDIR}"/tincd-r2 tincd |
178 |
+ |
179 |
+ if use gui; then |
180 |
+ python_fix_shebang "${ED}"/usr/bin/tinc-gui |
181 |
+ else |
182 |
+ rm -f "${ED}"/usr/bin/tinc-gui || die |
183 |
+ fi |
184 |
+} |
185 |
+ |
186 |
+pkg_postinst() { |
187 |
+ elog "This package requires the tun/tap kernel device." |
188 |
+ elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" |
189 |
+} |