gentoo resync : 07.07.2018

5 files changed, 170 insertions, 3 deletions

diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 903276798ead..d9d465cdad10 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,5 +1,6 @@
-AUX tinc-1.1-fix-paths.patch 1469 BLAKE2B de939576010a60fa74e1bb5880a7eef2e0c77c7c853d3640d0b779642f0a2dbc83c927e8f9b75183a08cc72345c583139b28d0b3d345f5737be033b7eabea0b8 SHA512 55bd0e61a1d10a89d879d5113082f0cdb5ff6bf1d1fb3f618c459eb2658836bf602f72fe27ac03ec78746e300a3a5178db053eef6f08d3cb34b11410dbeb05de
 AUX tinc-1.1-tinfo.patch 143 BLAKE2B a78500b9b020c6cd3f667f59459dd9b146baf7cdee90b96b2ed1ef62e4d9d55d8a8752f4a0544452e604d2a6962d29faf93fa6285475c9b39d72e95e94da2549 SHA512 d18d194b63dc71b8e45a0899ca325e722b4228b22370426265eaa669fb421a9b05fa87e42dbc23ce524ae61e62a99ca949e3f4d96be1f60fa0f77a8e8cb54419
+AUX tinc-1.1_pre15-fix-paths.patch 1469 BLAKE2B de939576010a60fa74e1bb5880a7eef2e0c77c7c853d3640d0b779642f0a2dbc83c927e8f9b75183a08cc72345c583139b28d0b3d345f5737be033b7eabea0b8 SHA512 55bd0e61a1d10a89d879d5113082f0cdb5ff6bf1d1fb3f618c459eb2658836bf602f72fe27ac03ec78746e300a3a5178db053eef6f08d3cb34b11410dbeb05de
+AUX tinc-1.1_pre16-fix-paths.patch 1461 BLAKE2B 4891e18e3c72cb97c553b67b066f432f50cbe8dd227df7ed5b1a3e2c68e5f43e51879ca6ed1d78e66a873becad983ba9daca33d211c8cf203a1ed51e1ae8938a SHA512 cbb43bde1b177fb3c05490e33ca764265c4e02952bc51c1ff1f644106c9e80c9c1323092965af1001a511b2a887da8443251b3a6e2ce2d8f8b2cbc493ce4564a
 AUX tinc.networks 387 BLAKE2B c3057322b46ee0186db4f2e9cadb8e60a318f5731e77a19e8c31e757c47c88afb8db6848f739511146bd0dc85ffdecea80c5be09890bcc3060a9b9ace9ecf855 SHA512 f7cb459c170898e51176bd92c642335386db90b7bca2abb3f6eb2514546efbd74e5fd2c8845060111dd48a0dd2cc1890717a03315c9b86185047c259cdc27135
 AUX tincd-r1 1842 BLAKE2B 889c9f73f3960c913fffaff4a5d49d67c6123ace1c10321815d56c8dd55e29d3916f8de0befdcef4ff7862b5f741406918bba2203c8b2e13548f874edad5c821 SHA512 1308d097487ef0f1fb1763ca99565edc1026c11159775a5d0c1e41905d8332b7df734460ccea5750a7b6dd5897ecffbe8e95cb721d94ffe5b7855ec4293dc360
 AUX tincd-r2 1830 BLAKE2B 3da729c7bc43c5bef471f0d5798c7e96a114f9cfd79ccb9e5e4383a37e6fb91a3465b6c9ec5125d6b9f775112563f29da1e6b8cb49c89b7e805f7b2e00a08de4 SHA512 59811c3e5241d08ebdfbd539556b7cee0dfaab89727ad503512c98f1a696fae143ecdf2682a652c5d71d077ed254ffe2e1c442b1c305c7e7ea94d9af9a1d385e
@@ -8,7 +9,9 @@ AUX tincd_at.service 197 BLAKE2B f568007b8872e105eb001333d24d7446ff8fb1995edaf77
 DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da SHA512 f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804
 DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd SHA512 b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725
 DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e SHA512 29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17
+DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b SHA512 b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43
 EBUILD tinc-1.0.33.ebuild 1212 BLAKE2B 2edd76506532bde8a4fbeb8ed7e7eb9b6d689eaf97ce0d87e6d6011f5cb3eef79f2b85985fbaf21accbfb97cd918cedc6e3c8254d839572dd567b607c31e530d SHA512 9bb8c6d89dd3b0ecc0d9ab597ebdf1d02b952604426b89701ff0681395a20344b6d12a5b6fb30d47ca0fddb1a8263f7346bfa8d24c3bc62c32575a35f8b5ea3c
 EBUILD tinc-1.0.34.ebuild 1212 BLAKE2B b1561117d04453a25dba0f834a30e7ca816fb439cecb5bed8879a73d980290e10ead3b77d2cd0332a16af4b3e0bb5ad9c8db71ce6f45af224f92d954eadb3a6e SHA512 d58d37be4d1c8852299bd9c72f152c2e156ff6838e04b4fb3d21bd7dbf218f53f37acf4edac292b1ba10fb7dfab295ee3d546e774866fd4cb0a82551c077f9e4
-EBUILD tinc-1.1_pre15.ebuild 2330 BLAKE2B 677427570cdf3eba07d8c12af052576e4275d5995387828dced0520eca51bab34c432b8822dacd7b82f473e80b2c4b576b76038e834ce0344ecbf0043e05047c SHA512 b0a73cd46da15d49c40dbc76c12348b3577d6f1ed17182ba57bd390a0b01eda2e878443c9061fbb6b4f5b81a775120c5024e8ae34eed70a6a0008aeb9bbe274b
+EBUILD tinc-1.1_pre15.ebuild 2581 BLAKE2B d649fb34bf348eb2cd00c4bf9a5cccf0934bf942be39be27f394839445fb5943bfac3760ec1ea5ed296cb50906132ba78f8abf8ff522e57a84c7002549127add SHA512 f23aebfd1703bc7461e82edfa5f6be09e9e2ff1ddb14b187747d20d6d28954d58a7afa3fef25c0a33c068ff0615f4f617841e4544345c719f0e86e17f42c19af
+EBUILD tinc-1.1_pre16.ebuild 2581 BLAKE2B d0831c71756c93b56a2c2c702e1f82a9667dd7cec24432af10975e40df78ac88eaa9756e4acb8d14d9a341c93311df67fd31a3fb93b7346537d8e5fc1f2fdd47 SHA512 cc5db0007bea5002e3f0371581e68f4718b9375d611a99c8c3355d0ee632f9a864f54ba0444f270819c1115b2d988e64da2abc1b755a92115e8b60c10c7b9be2
 MISC metadata.xml 803 BLAKE2B 6cbe55ecefa33a96893318ec94f64e8b768bcdb52cec36ca8a57c80cd1dfb06543bd3dcf9686e79c71f984502da3dba0f492d43f253d37e9cc6107e6e5206e41 SHA512 23ccfff115ec3553356db3b2a16f436cee60f5471e4a240d032cf48d89a73ef350545bc91b3976b188ad3658ff83d0037ccc00a5f3f5864e2704d4616e1095ac
diff --git a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
index 519677dd5034..519677dd5034 100644
--- a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch
+++ b/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
diff --git a/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
new file mode 100644
index 000000000000..30cafee87878
--- /dev/null
+++ b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
@@ -0,0 +1,55 @@
+diff -Naur tinc-1.1pre16.orig/src/names.c tinc-1.1pre16/src/names.c
+--- tinc-1.1pre16.ori/src/names.c	2018-04-02 10:41:12.000000000 -0400
++++ tinc-1.1pre16/src/names.c	2018-07-06 15:11:35.970680875 -0400
+@@ -103,47 +103,13 @@
+ 	}
+ 
+ #else
+-	bool fallback = false;
+-
+-	if(daemon) {
+-		if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) {
+-			fallback = true;
+-		}
+-	} else {
+-		char fname[PATH_MAX];
+-		snprintf(fname, sizeof(fname), LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+-
+-		if(access(fname, R_OK)) {
+-			snprintf(fname, sizeof(fname), "%s" SLASH "pid", confbase);
+-
+-			if(!access(fname, R_OK)) {
+-				fallback = true;
+-			}
+-		}
++	if(!logfilename) {
++		xasprintf(&logfilename, "/var/log" SLASH "%s.log", identname);
+ 	}
+ 
+-	if(!fallback) {
+-		if(!logfilename) {
+-			xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
+-		}
+-
+-		if(!pidfilename) {
+-			xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
+-		}
+-	} else {
+-		if(!logfilename) {
+-			xasprintf(&logfilename, "%s" SLASH "log", confbase);
+-		}
+-
+-		if(!pidfilename) {
+-			if(daemon) {
+-				logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase);
+-			}
+-
+-			xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
+-		}
++	if(!pidfilename) {
++		xasprintf(&pidfilename, "/run" SLASH "%s.pid", identname);
+ 	}
+-
+ #endif
+ 
+ 	if(!unixsocketname) {
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild
index ea6d0816b40c..359469d9dc7a 100644
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild
@@ -49,13 +49,19 @@ if [[ -n ${UPSTREAM_VER} ]]; then
 fi
 
 PATCHES+=(
-	"${FILESDIR}"/${PN}-1.1-fix-paths.patch #560528
+	"${FILESDIR}"/${PF}-fix-paths.patch #560528
 	"${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
 )
 
 src_prepare() {
 	default
 	eautoreconf
+
+	# Fix the static (failing UNKNOWN) version in the autoconf
+	# NOTE: When updating the ebuild, make sure to check that this
+	# line number hasn't changed in the upstream sources.
+	sed -i "4d" configure.ac
+	sed -i "4iAC_INIT([tinc], ${PVR})" configure.ac
 }
 
 src_configure() {
diff --git a/net-vpn/tinc/tinc-1.1_pre16.ebuild b/net-vpn/tinc/tinc-1.1_pre16.ebuild
new file mode 100644
index 000000000000..919232287018
--- /dev/null
+++ b/net-vpn/tinc/tinc-1.1_pre16.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PV=${PV/_/}
+MY_P=${PN}-${MY_PV}
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools python-single-r1 systemd
+
+DESCRIPTION="tinc is an easy to configure VPN implementation"
+HOMEPAGE="http://www.tinc-vpn.org/"
+
+# UPSTREAM_VER=1
+
+[[ -n ${UPSTREAM_VER} ]] && \
+	UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz"
+
+SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
+	${UPSTREAM_PATCHSET_URI}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+lzo +ncurses gui libressl +readline +ssl uml vde upnp +zlib"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="
+	${PYTHON_DEPS}
+	gui? ( dev-python/wxpython:3.0[${PYTHON_USEDEP}] )
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+	lzo? ( dev-libs/lzo:2 )
+	ncurses? ( sys-libs/ncurses:= )
+	readline? ( sys-libs/readline:= )
+	upnp? ( net-libs/miniupnpc )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}
+	vde? ( net-misc/vde )"
+S="${WORKDIR}/${MY_P}"
+
+# Upstream's patchset
+if [[ -n ${UPSTREAM_VER} ]]; then
+	PATCHES=( "${WORKDIR}"/patches-upstream )
+fi
+
+PATCHES+=(
+	"${FILESDIR}"/${PF}-fix-paths.patch #560528
+	"${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
+)
+
+src_prepare() {
+	default
+	eautoreconf
+
+	# Fix the static (failing UNKNOWN) version in the autoconf
+	# NOTE: When updating the ebuild, make sure to check that this
+	# line number hasn't changed in the upstream sources.
+	sed -i "6d" configure.ac
+	sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac
+}
+
+src_configure() {
+	econf \
+		--enable-jumbograms \
+		--disable-silent-rules \
+		--enable-legacy-protocol \
+		--disable-tunemu  \
+		--with-systemd="$(systemd_get_systemunitdir)" \
+		$(use_enable lzo) \
+		$(use_enable ncurses curses) \
+		$(use_enable readline) \
+		$(use_enable uml) \
+		$(use_enable vde) \
+		$(use_enable zlib) \
+		$(use_enable upnp miniupnpc) \
+		$(use_with ssl openssl)
+		#--without-libgcrypt \
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodir /etc/tinc
+	dodoc AUTHORS NEWS README THANKS
+	doconfd "${FILESDIR}"/tinc.networks
+	newconfd "${FILESDIR}"/tincd.conf tincd
+	newinitd "${FILESDIR}"/tincd-r2 tincd
+
+	if use gui; then
+		python_fix_shebang "${ED}"/usr/bin/tinc-gui
+	else
+		rm -f "${ED}"/usr/bin/tinc-gui || die
+	fi
+}
+
+pkg_postinst() {
+	elog "This package requires the tun/tap kernel device."
+	elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
+}