| 1 |
commit: 29236ea38eb60a6c3faa6c1422603d833e05385e |
| 2 |
Author: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 13 08:51:22 2016 +0000 |
| 4 |
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 13 09:24:35 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29236ea3 |
| 7 |
|
| 8 |
net-misc/tinc: pull upstream patches |
| 9 |
|
| 10 |
tinc upstream commits |
| 11 |
from: 0cf943753ab16704c818bebe74b4e7ea96399b05 |
| 12 |
to: 9cbd3c2b5b03c29c116a14f196db8a32c7135391 |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.2 |
| 15 |
|
| 16 |
net-misc/tinc/Manifest | 1 + |
| 17 |
net-misc/tinc/tinc-1.1_pre14-r1.ebuild | 95 ++++++++++++++++++++++++++++++++++ |
| 18 |
2 files changed, 96 insertions(+) |
| 19 |
|
| 20 |
diff --git a/net-misc/tinc/Manifest b/net-misc/tinc/Manifest |
| 21 |
index 893b77c..7e5870b 100644 |
| 22 |
--- a/net-misc/tinc/Manifest |
| 23 |
+++ b/net-misc/tinc/Manifest |
| 24 |
@@ -1,3 +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.1-upstream-patches-0.tar.xz 14936 SHA256 9a95897e50da8c213d80d024910bf8622c838ec2ef2fd23b48a7fc448ffa67e1 SHA512 c8a4ab62f9fbb6259af0fd621bfdcf6505f553478e70ef3aacf0c7c35c5070458246786f416ac8631d7f9e36ab764ea4250c6cb3e95aa8d1fee7e995d07a2d9d WHIRLPOOL e708ef24b532be48e2824cb18685aeb80c8e1053e44aaa3e82ce29ae6055abcc04fe1ebab0758d008ed5880f4d5b19e9b06b8eebfae9904cfa2b04dfee4a3d77 |
| 28 |
DIST tinc-1.1pre14.tar.gz 696109 SHA256 e349e78f0e0d10899b8ab51c285bdb96c5ee322e847dfcf6ac9e21036286221f SHA512 dfc54a91fd40826b108e9cbae43da42462eb51bb7ad16ac040cb1b262b5510eb6884b1f1dbe0541a3b1631213f70cc678593d1ba51ebdf150c3f6968030b9291 WHIRLPOOL 63c8229c667e461ad20c118d233a2abfe598cc95698b8c83e5f8b598657ca298ea0cdc20432ab2d084fd4a06129a5884e91eb445f4c7204be3798d1fb4dec2f8 |
| 29 |
|
| 30 |
diff --git a/net-misc/tinc/tinc-1.1_pre14-r1.ebuild b/net-misc/tinc/tinc-1.1_pre14-r1.ebuild |
| 31 |
new file mode 100644 |
| 32 |
index 00000000..0f904de |
| 33 |
--- /dev/null |
| 34 |
+++ b/net-misc/tinc/tinc-1.1_pre14-r1.ebuild |
| 35 |
@@ -0,0 +1,95 @@ |
| 36 |
+# Copyright 1999-2016 Gentoo Foundation |
| 37 |
+# Distributed under the terms of the GNU General Public License v2 |
| 38 |
+# $Id$ |
| 39 |
+ |
| 40 |
+EAPI="5" |
| 41 |
+ |
| 42 |
+MY_PV=${PV/_/} |
| 43 |
+MY_P=${PN}-${MY_PV} |
| 44 |
+ |
| 45 |
+PYTHON_COMPAT=( python2_7 ) |
| 46 |
+inherit eutils multilib python-any-r1 |
| 47 |
+ |
| 48 |
+DESCRIPTION="tinc is an easy to configure VPN implementation" |
| 49 |
+HOMEPAGE="http://www.tinc-vpn.org/" |
| 50 |
+ |
| 51 |
+UPSTREAM_VER=0 |
| 52 |
+ |
| 53 |
+[[ -n ${UPSTREAM_VER} ]] && \ |
| 54 |
+ UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz" |
| 55 |
+ |
| 56 |
+SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz |
| 57 |
+ ${UPSTREAM_PATCHSET_URI}" |
| 58 |
+ |
| 59 |
+LICENSE="GPL-2" |
| 60 |
+SLOT="0" |
| 61 |
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
| 62 |
+IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib" |
| 63 |
+ |
| 64 |
+DEPEND=" |
| 65 |
+ ssl? ( |
| 66 |
+ !libressl? ( dev-libs/openssl:0= ) |
| 67 |
+ libressl? ( dev-libs/libressl:0= ) |
| 68 |
+ ) |
| 69 |
+ lzo? ( dev-libs/lzo:2 ) |
| 70 |
+ ncurses? ( sys-libs/ncurses:= ) |
| 71 |
+ readline? ( sys-libs/readline:= ) |
| 72 |
+ upnp? ( net-libs/miniupnpc ) |
| 73 |
+ zlib? ( sys-libs/zlib )" |
| 74 |
+RDEPEND="${DEPEND} |
| 75 |
+ vde? ( net-misc/vde ) |
| 76 |
+ ${PYTHON_DEPS} |
| 77 |
+ gui? ( $(python_gen_any_dep ' |
| 78 |
+ dev-python/wxpython[${PYTHON_USEDEP}] |
| 79 |
+ ') )" |
| 80 |
+ |
| 81 |
+S="${WORKDIR}/${MY_P}" |
| 82 |
+ |
| 83 |
+src_prepare() { |
| 84 |
+ # Upstream's patchset |
| 85 |
+ if [[ -n ${UPSTREAM_VER} ]]; then |
| 86 |
+ einfo "Try to apply Tinc Upstream patch set" |
| 87 |
+ EPATCH_SUFFIX="patch" \ |
| 88 |
+ EPATCH_FORCE="yes" \ |
| 89 |
+ EPATCH_OPTS="-p1" \ |
| 90 |
+ epatch "${WORKDIR}"/patches-upstream |
| 91 |
+ fi |
| 92 |
+} |
| 93 |
+ |
| 94 |
+src_configure() { |
| 95 |
+ econf \ |
| 96 |
+ --enable-jumbograms \ |
| 97 |
+ --disable-silent-rules \ |
| 98 |
+ --enable-legacy-protocol \ |
| 99 |
+ --disable-tunemu \ |
| 100 |
+ --with-systemd=/usr/$(get_libdir)/systemd/system \ |
| 101 |
+ $(use_enable lzo) \ |
| 102 |
+ $(use_enable ncurses curses) \ |
| 103 |
+ $(use_enable readline) \ |
| 104 |
+ $(use_enable uml) \ |
| 105 |
+ $(use_enable vde) \ |
| 106 |
+ $(use_enable zlib) \ |
| 107 |
+ $(use_enable upnp miniupnpc) \ |
| 108 |
+ $(use_with ssl openssl) |
| 109 |
+ #--without-libgcrypt \ |
| 110 |
+} |
| 111 |
+ |
| 112 |
+src_install() { |
| 113 |
+ emake DESTDIR="${D}" install |
| 114 |
+ dodir /etc/tinc |
| 115 |
+ dodoc AUTHORS NEWS README THANKS |
| 116 |
+ doconfd "${FILESDIR}"/tinc.networks |
| 117 |
+ newconfd "${FILESDIR}"/tincd.conf tincd |
| 118 |
+ newinitd "${FILESDIR}"/tincd-r1 tincd |
| 119 |
+ |
| 120 |
+ if use gui; then |
| 121 |
+ python_fix_shebang "${ED}"/usr/bin/tinc-gui |
| 122 |
+ else |
| 123 |
+ rm -f "${ED}"/usr/bin/tinc-gui || die |
| 124 |
+ fi |
| 125 |
+} |
| 126 |
+ |
| 127 |
+pkg_postinst() { |
| 128 |
+ elog "This package requires the tun/tap kernel device." |
| 129 |
+ elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" |
| 130 |
+} |
Archives