| 1 |
commit: be0c91f71dcc1617f9f71e3a008d6e09aa7f496f |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 5 01:55:39 2018 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 5 01:55:39 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0c91f7 |
| 7 |
|
| 8 |
net-vpn/tinc: drop older 1.1 version |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.40, Repoman-2.3.9 |
| 11 |
|
| 12 |
net-vpn/tinc/Manifest | 1 - |
| 13 |
net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch | 44 --------- |
| 14 |
net-vpn/tinc/tinc-1.1_pre15.ebuild | 103 ---------------------- |
| 15 |
3 files changed, 148 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest |
| 18 |
index 959505f8846..a6f95f0a401 100644 |
| 19 |
--- a/net-vpn/tinc/Manifest |
| 20 |
+++ b/net-vpn/tinc/Manifest |
| 21 |
@@ -1,4 +1,3 @@ |
| 22 |
DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da SHA512 f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804 |
| 23 |
DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd SHA512 b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725 |
| 24 |
-DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e SHA512 29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17 |
| 25 |
DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b SHA512 b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43 |
| 26 |
|
| 27 |
diff --git a/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch |
| 28 |
deleted file mode 100644 |
| 29 |
index 519677dd503..00000000000 |
| 30 |
--- a/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch |
| 31 |
+++ /dev/null |
| 32 |
@@ -1,44 +0,0 @@ |
| 33 |
-diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c |
| 34 |
---- tinc-1.1pre14.orig/src/names.c 2016-04-17 12:08:41.000000000 -0400 |
| 35 |
-+++ tinc-1.1pre14/src/names.c 2016-10-15 07:37:51.147064396 -0400 |
| 36 |
-@@ -86,36 +86,11 @@ |
| 37 |
- if(!pidfilename) |
| 38 |
- xasprintf(&pidfilename, "%s" SLASH "pid", confbase); |
| 39 |
- #else |
| 40 |
-- bool fallback = false; |
| 41 |
-- if(daemon) { |
| 42 |
-- if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) |
| 43 |
-- fallback = true; |
| 44 |
-- } else { |
| 45 |
-- char fname[PATH_MAX]; |
| 46 |
-- snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); |
| 47 |
-- if(access(fname, R_OK)) { |
| 48 |
-- snprintf(fname, sizeof fname, "%s" SLASH "pid", confbase); |
| 49 |
-- if(!access(fname, R_OK)) |
| 50 |
-- fallback = true; |
| 51 |
-- } |
| 52 |
-- } |
| 53 |
-+ if(!logfilename) |
| 54 |
-+ xasprintf(&logfilename, "/var/log" SLASH "%s.log", identname); |
| 55 |
- |
| 56 |
-- if(!fallback) { |
| 57 |
-- if(!logfilename) |
| 58 |
-- xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname); |
| 59 |
-- |
| 60 |
-- if(!pidfilename) |
| 61 |
-- xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); |
| 62 |
-- } else { |
| 63 |
-- if(!logfilename) |
| 64 |
-- xasprintf(&logfilename, "%s" SLASH "log", confbase); |
| 65 |
-- |
| 66 |
-- if(!pidfilename) { |
| 67 |
-- if(daemon) |
| 68 |
-- logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase); |
| 69 |
-- xasprintf(&pidfilename, "%s" SLASH "pid", confbase); |
| 70 |
-- } |
| 71 |
-- } |
| 72 |
-+ if(!pidfilename) |
| 73 |
-+ xasprintf(&pidfilename, "/run" SLASH "%s.pid", identname); |
| 74 |
- #endif |
| 75 |
- |
| 76 |
- if(!unixsocketname) { |
| 77 |
|
| 78 |
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 79 |
deleted file mode 100644 |
| 80 |
index 359469d9dc7..00000000000 |
| 81 |
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 82 |
+++ /dev/null |
| 83 |
@@ -1,103 +0,0 @@ |
| 84 |
-# Copyright 1999-2018 Gentoo Foundation |
| 85 |
-# Distributed under the terms of the GNU General Public License v2 |
| 86 |
- |
| 87 |
-EAPI=6 |
| 88 |
- |
| 89 |
-MY_PV=${PV/_/} |
| 90 |
-MY_P=${PN}-${MY_PV} |
| 91 |
- |
| 92 |
-PYTHON_COMPAT=( python2_7 ) |
| 93 |
- |
| 94 |
-inherit autotools python-single-r1 systemd |
| 95 |
- |
| 96 |
-DESCRIPTION="tinc is an easy to configure VPN implementation" |
| 97 |
-HOMEPAGE="http://www.tinc-vpn.org/" |
| 98 |
- |
| 99 |
-# UPSTREAM_VER=1 |
| 100 |
- |
| 101 |
-[[ -n ${UPSTREAM_VER} ]] && \ |
| 102 |
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz" |
| 103 |
- |
| 104 |
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz |
| 105 |
- ${UPSTREAM_PATCHSET_URI}" |
| 106 |
- |
| 107 |
-LICENSE="GPL-2" |
| 108 |
-SLOT="0" |
| 109 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
| 110 |
-IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib" |
| 111 |
-REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 112 |
- |
| 113 |
-DEPEND=" |
| 114 |
- ${PYTHON_DEPS} |
| 115 |
- gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] ) |
| 116 |
- ssl? ( |
| 117 |
- !libressl? ( dev-libs/openssl:0= ) |
| 118 |
- libressl? ( dev-libs/libressl:0= ) |
| 119 |
- ) |
| 120 |
- lzo? ( dev-libs/lzo:2 ) |
| 121 |
- ncurses? ( sys-libs/ncurses:= ) |
| 122 |
- readline? ( sys-libs/readline:= ) |
| 123 |
- upnp? ( net-libs/miniupnpc ) |
| 124 |
- zlib? ( sys-libs/zlib )" |
| 125 |
-RDEPEND="${DEPEND} |
| 126 |
- vde? ( net-misc/vde )" |
| 127 |
-S="${WORKDIR}/${MY_P}" |
| 128 |
- |
| 129 |
-# Upstream's patchset |
| 130 |
-if [[ -n ${UPSTREAM_VER} ]]; then |
| 131 |
- PATCHES=( "${WORKDIR}"/patches-upstream ) |
| 132 |
-fi |
| 133 |
- |
| 134 |
-PATCHES+=( |
| 135 |
- "${FILESDIR}"/${PF}-fix-paths.patch #560528 |
| 136 |
- "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 |
| 137 |
-) |
| 138 |
- |
| 139 |
-src_prepare() { |
| 140 |
- default |
| 141 |
- eautoreconf |
| 142 |
- |
| 143 |
- # Fix the static (failing UNKNOWN) version in the autoconf |
| 144 |
- # NOTE: When updating the ebuild, make sure to check that this |
| 145 |
- # line number hasn't changed in the upstream sources. |
| 146 |
- sed -i "4d" configure.ac |
| 147 |
- sed -i "4iAC_INIT([tinc], ${PVR})" configure.ac |
| 148 |
-} |
| 149 |
- |
| 150 |
-src_configure() { |
| 151 |
- econf \ |
| 152 |
- --enable-jumbograms \ |
| 153 |
- --disable-silent-rules \ |
| 154 |
- --enable-legacy-protocol \ |
| 155 |
- --disable-tunemu \ |
| 156 |
- --with-systemd="$(systemd_get_systemunitdir)" \ |
| 157 |
- $(use_enable lzo) \ |
| 158 |
- $(use_enable ncurses curses) \ |
| 159 |
- $(use_enable readline) \ |
| 160 |
- $(use_enable uml) \ |
| 161 |
- $(use_enable vde) \ |
| 162 |
- $(use_enable zlib) \ |
| 163 |
- $(use_enable upnp miniupnpc) \ |
| 164 |
- $(use_with ssl openssl) |
| 165 |
- #--without-libgcrypt \ |
| 166 |
-} |
| 167 |
- |
| 168 |
-src_install() { |
| 169 |
- emake DESTDIR="${D}" install |
| 170 |
- dodir /etc/tinc |
| 171 |
- dodoc AUTHORS NEWS README THANKS |
| 172 |
- doconfd "${FILESDIR}"/tinc.networks |
| 173 |
- newconfd "${FILESDIR}"/tincd.conf tincd |
| 174 |
- newinitd "${FILESDIR}"/tincd-r2 tincd |
| 175 |
- |
| 176 |
- if use gui; then |
| 177 |
- python_fix_shebang "${ED}"/usr/bin/tinc-gui |
| 178 |
- else |
| 179 |
- rm -f "${ED}"/usr/bin/tinc-gui || die |
| 180 |
- fi |
| 181 |
-} |
| 182 |
- |
| 183 |
-pkg_postinst() { |
| 184 |
- elog "This package requires the tun/tap kernel device." |
| 185 |
- elog "Look at http://www.tinc-vpn.org/ for how to configure tinc" |
| 186 |
-} |
Archives