| 1 |
commit: a1826e2fff99aacd11084256ddf9d82edfc5a8a4 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jun 28 23:25:17 2021 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jun 28 23:25:17 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1826e2f |
| 7 |
|
| 8 |
net-vpn/tinc: remove 1.0.35, bump to 1.1_pre18 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
| 11 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
| 12 |
|
| 13 |
net-vpn/tinc/Manifest | 5 +- |
| 14 |
net-vpn/tinc/tinc-1.0.35-r2.ebuild | 53 ---------------------- |
| 15 |
...c-1.1_pre17-r1.ebuild => tinc-1.1_pre18.ebuild} | 13 +----- |
| 16 |
3 files changed, 2 insertions(+), 69 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest |
| 19 |
index b72f05dadb4..00ec92b71c0 100644 |
| 20 |
--- a/net-vpn/tinc/Manifest |
| 21 |
+++ b/net-vpn/tinc/Manifest |
| 22 |
@@ -1,5 +1,2 @@ |
| 23 |
-DIST tinc-1.0.35-upstream-patches-1.tar.xz 6028 BLAKE2B d236125211efda0c8b5aa4e93a278fec17d57ecb257ea057ca67f2a465d1da7d069f6d3a97220dc1e40123266bc2fc68685d2ea2e143033a12199278b073c31b SHA512 8ae2b96d5f296bc5d0d21fa814832ccafdb5595b06d60d72a090eadb4aade9e386990801b5e1a8cca722f88881aa2d21e70f9154570feede6a9771a0eaec83ab |
| 24 |
-DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3 SHA512 037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32 |
| 25 |
DIST tinc-1.0.36.tar.gz 500320 BLAKE2B 6f799ab04f9553fa389baf9d60121540b1fc7d5b5c2b62b2ebe0bf7478f5f69e8638a9c1b15f8ab84268d813ac1b1978c73b12a478b682cd808747fd2eed951c SHA512 23af9162f7ae700bad01e1f59f23f32d1b183b185ec35f4a69a987c52c53cfebfa9e852203b399f035988078e9131e5d59b018554a52a30044f34df6e64b5289 |
| 26 |
-DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f SHA512 351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8 |
| 27 |
-DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4 SHA512 b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30 |
| 28 |
+DIST tinc-1.1pre18.tar.gz 732111 BLAKE2B b236a8a0b7f8b755d71f2e2564af6bd13f5d87aec512b7db388ac1e23110cfdac80d8b642644a4b35fa81d37765e9ced65cc535d48e34b79190c2eddb107a9e2 SHA512 d8b03c78fd579df58d4c8a03f5d2241d2c95edb660ce9aa34441f6e75df09e3fff7524215c7c4b3622311e80f5bb452a6ac1205f3fd13424d56135f70b973183 |
| 29 |
|
| 30 |
diff --git a/net-vpn/tinc/tinc-1.0.35-r2.ebuild b/net-vpn/tinc/tinc-1.0.35-r2.ebuild |
| 31 |
deleted file mode 100644 |
| 32 |
index be4c667f269..00000000000 |
| 33 |
--- a/net-vpn/tinc/tinc-1.0.35-r2.ebuild |
| 34 |
+++ /dev/null |
| 35 |
@@ -1,53 +0,0 @@ |
| 36 |
-# Copyright 1999-2021 Gentoo Authors |
| 37 |
-# Distributed under the terms of the GNU General Public License v2 |
| 38 |
- |
| 39 |
-EAPI=7 |
| 40 |
-inherit systemd |
| 41 |
- |
| 42 |
-DESCRIPTION="tinc is an easy to configure VPN implementation" |
| 43 |
-HOMEPAGE="http://www.tinc-vpn.org/" |
| 44 |
- |
| 45 |
-UPSTREAM_VER=1 |
| 46 |
- |
| 47 |
-[[ -n ${UPSTREAM_VER} ]] && \ |
| 48 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz" |
| 49 |
- |
| 50 |
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz |
| 51 |
- ${UPSTREAM_PATCHSET_URI}" |
| 52 |
- |
| 53 |
-LICENSE="GPL-2" |
| 54 |
-SLOT="0" |
| 55 |
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" |
| 56 |
-IUSE="+lzo uml vde +zlib" |
| 57 |
- |
| 58 |
-DEPEND=" |
| 59 |
- dev-libs/openssl:0= |
| 60 |
- lzo? ( dev-libs/lzo:2 ) |
| 61 |
- zlib? ( sys-libs/zlib )" |
| 62 |
-RDEPEND="${DEPEND} |
| 63 |
- vde? ( net-misc/vde )" |
| 64 |
- |
| 65 |
-# Upstream's patchset |
| 66 |
-if [[ -n ${UPSTREAM_VER} ]]; then |
| 67 |
- PATCHES=( "${WORKDIR}"/patches-upstream ) |
| 68 |
-fi |
| 69 |
- |
| 70 |
-src_configure() { |
| 71 |
- econf \ |
| 72 |
- --enable-jumbograms \ |
| 73 |
- --disable-tunemu \ |
| 74 |
- $(use_enable lzo) \ |
| 75 |
- $(use_enable uml) \ |
| 76 |
- $(use_enable vde) \ |
| 77 |
- $(use_enable zlib) |
| 78 |
-} |
| 79 |
- |
| 80 |
-src_install() { |
| 81 |
- emake DESTDIR="${D}" install |
| 82 |
- dodir /etc/tinc |
| 83 |
- dodoc AUTHORS NEWS README THANKS |
| 84 |
- doconfd "${FILESDIR}"/tinc.networks |
| 85 |
- newconfd "${FILESDIR}"/tincd.conf tincd |
| 86 |
- newinitd "${FILESDIR}"/tincd-r1 tincd |
| 87 |
- systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service" |
| 88 |
-} |
| 89 |
|
| 90 |
diff --git a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild b/net-vpn/tinc/tinc-1.1_pre18.ebuild |
| 91 |
similarity index 84% |
| 92 |
rename from net-vpn/tinc/tinc-1.1_pre17-r1.ebuild |
| 93 |
rename to net-vpn/tinc/tinc-1.1_pre18.ebuild |
| 94 |
index 3d984145f79..6ffcb15a205 100644 |
| 95 |
--- a/net-vpn/tinc/tinc-1.1_pre17-r1.ebuild |
| 96 |
+++ b/net-vpn/tinc/tinc-1.1_pre18.ebuild |
| 97 |
@@ -11,13 +11,7 @@ inherit autotools systemd |
| 98 |
DESCRIPTION="tinc is an easy to configure VPN implementation" |
| 99 |
HOMEPAGE="http://www.tinc-vpn.org/" |
| 100 |
|
| 101 |
-UPSTREAM_VER=2 |
| 102 |
- |
| 103 |
-[[ -n ${UPSTREAM_VER} ]] && \ |
| 104 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz" |
| 105 |
- |
| 106 |
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz |
| 107 |
- ${UPSTREAM_PATCHSET_URI}" |
| 108 |
+SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz" |
| 109 |
|
| 110 |
LICENSE="GPL-2" |
| 111 |
SLOT="0" |
| 112 |
@@ -37,11 +31,6 @@ RDEPEND="${DEPEND} |
| 113 |
vde? ( net-misc/vde )" |
| 114 |
S="${WORKDIR}/${MY_P}" |
| 115 |
|
| 116 |
-# Upstream's patchset |
| 117 |
-if [[ -n ${UPSTREAM_VER} ]]; then |
| 118 |
- PATCHES=( "${WORKDIR}"/patches-upstream ) |
| 119 |
-fi |
| 120 |
- |
| 121 |
PATCHES+=( |
| 122 |
"${FILESDIR}"/tinc-1.1_pre16-r1-fix-paths.patch #560528 |
| 123 |
"${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 |
Archives