[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/
commit: be0c91f71dcc1617f9f71e3a008d6e09aa7f496f
Author: Anthony G. Basile gentoo org>
AuthorDate: Wed Sep 5 01:55:39 2018 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Wed Sep 5 01:55:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be0c91f7
net-vpn/tinc: drop older 1.1 version
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-vpn/tinc/Manifest | 1 -
net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch | 44 -
net-vpn/tinc/tinc-1.1_pre15.ebuild| 103 --
3 files changed, 148 deletions(-)
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index 959505f8846..a6f95f0a401 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,4 +1,3 @@
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
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
deleted file mode 100644
index 519677dd503..000
--- a/net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c
tinc-1.1pre14.orig/src/names.c 2016-04-17 12:08:41.0 -0400
-+++ tinc-1.1pre14/src/names.c 2016-10-15 07:37:51.147064396 -0400
-@@ -86,36 +86,11 @@
- if(!pidfilename)
- xasprintf(, "%s" SLASH "pid", confbase);
- #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(, "/var/log" SLASH "%s.log", identname);
-
-- if(!fallback) {
-- if(!logfilename)
-- xasprintf(, LOCALSTATEDIR SLASH "log" SLASH
"%s.log", identname);
--
-- if(!pidfilename)
-- xasprintf(, LOCALSTATEDIR SLASH "run" SLASH
"%s.pid", identname);
-- } else {
-- if(!logfilename)
-- xasprintf(, "%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(, "%s" SLASH "pid", confbase);
-- }
-- }
-+ if(!pidfilename)
-+ xasprintf(, "/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
deleted file mode 100644
index 359469d9dc7..000
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# 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"
[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/
commit: d7eef58d8c3ba44604691f721bb1e25428b86ff7
Author: Anthony G. Basile gentoo org>
AuthorDate: Wed Sep 5 02:02:21 2018 +
Commit: Anthony G. Basile gentoo org>
CommitDate: Wed Sep 5 02:02:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7eef58d
net-vpn/tinc: drop gui, bug #665208
Thanks Charlie Gehlin gehlin.com>
Package-Manager: Portage-2.3.40, Repoman-2.3.9
...1_pre16-fix-paths.patch => tinc-1.1_pre16-r1-fix-paths.patch} | 0
net-vpn/tinc/metadata.xml| 1 -
net-vpn/tinc/{tinc-1.1_pre16.ebuild => tinc-1.1_pre16-r1.ebuild} | 9 +
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
b/net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch
similarity index 100%
rename from net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
rename to net-vpn/tinc/files/tinc-1.1_pre16-r1-fix-paths.patch
diff --git a/net-vpn/tinc/metadata.xml b/net-vpn/tinc/metadata.xml
index 02dd537c6e6..f6ec81bf4f8 100644
--- a/net-vpn/tinc/metadata.xml
+++ b/net-vpn/tinc/metadata.xml
@@ -14,7 +14,6 @@
- Add GUI support, using
dev-python/wxpython
Enable support for User Mode Linux
Sockets
Enable Virtual Distributed Ethernet (VDE)
based networking
diff --git a/net-vpn/tinc/tinc-1.1_pre16.ebuild
b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
similarity index 90%
rename from net-vpn/tinc/tinc-1.1_pre16.ebuild
rename to net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
index 91923228701..f252a1217c3 100644
--- a/net-vpn/tinc/tinc-1.1_pre16.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
@@ -24,12 +24,11 @@ SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
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"
+IUSE="+lzo +ncurses 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= )
@@ -89,12 +88,6 @@ src_install() {
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() {
[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/
commit: 70ffe53880c2d20ee5911a846e5a42df2d1ca070
Author: Jonathan Vasquez gentoo org>
AuthorDate: Fri Jul 6 20:10:12 2018 +
Commit: Jonathan Vasquez gentoo org>
CommitDate: Fri Jul 6 20:10:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ffe538
net-vpn/tinc: version bump to 1.1_pre16 and minor improvements.
Package-Manager: Portage-2.3.41, Repoman-2.3.9
net-vpn/tinc/Manifest | 1 +
...-paths.patch => tinc-1.1_pre15-fix-paths.patch} | 0
...-paths.patch => tinc-1.1_pre16-fix-paths.patch} | 47 +-
net-vpn/tinc/tinc-1.1_pre15.ebuild | 8 +++-
...tinc-1.1_pre15.ebuild => tinc-1.1_pre16.ebuild} | 8 +++-
5 files changed, 44 insertions(+), 20 deletions(-)
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index ca1d7e95537..959505f8846 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,3 +1,4 @@
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
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
similarity index 100%
copy from net-vpn/tinc/files/tinc-1.1-fix-paths.patch
copy to net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch
diff --git a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch
b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
similarity index 56%
rename from net-vpn/tinc/files/tinc-1.1-fix-paths.patch
rename to net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
index 519677dd503..30cafee8787 100644
--- a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch
+++ b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch
@@ -1,44 +1,55 @@
-diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c
tinc-1.1pre14.orig/src/names.c 2016-04-17 12:08:41.0 -0400
-+++ tinc-1.1pre14/src/names.c 2016-10-15 07:37:51.147064396 -0400
-@@ -86,36 +86,11 @@
- if(!pidfilename)
- xasprintf(, "%s" SLASH "pid", confbase);
+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.0 -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))
+- 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);
+- 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))
+- snprintf(fname, sizeof(fname), "%s" SLASH "pid",
confbase);
+-
+- if(!access(fname, R_OK)) {
- fallback = true;
+- }
- }
-- }
-+ if(!logfilename)
++ if(!logfilename) {
+ xasprintf(, "/var/log" SLASH "%s.log", identname);
+ }
- if(!fallback) {
-- if(!logfilename)
+- if(!logfilename) {
- xasprintf(, LOCALSTATEDIR SLASH "log" SLASH
"%s.log", identname);
+- }
-
-- if(!pidfilename)
+- if(!pidfilename) {
- xasprintf(, LOCALSTATEDIR SLASH "run" SLASH
"%s.pid", identname);
+- }
- } else {
-- if(!logfilename)
+- if(!logfilename) {
- xasprintf(, "%s" SLASH "log",
[gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/
commit: c81097a84e82a2b394a71e761e289775d599c603
Author: Jeroen Roovers gentoo org>
AuthorDate: Sun Feb 25 20:57:48 2018 +
Commit: Jeroen Roovers gentoo org>
CommitDate: Sun Feb 25 20:58:45 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81097a8
net-vpn/tinc: Fix compiling against sys-libs/ncurses[tinfo] (bug #621868).
Package-Manager: Portage-2.3.24, Repoman-2.3.6
net-vpn/tinc/files/tinc-1.1-tinfo.patch | 10 ++
net-vpn/tinc/tinc-1.1_pre15.ebuild | 8 +---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/net-vpn/tinc/files/tinc-1.1-tinfo.patch
b/net-vpn/tinc/files/tinc-1.1-tinfo.patch
new file mode 100644
index 000..5a9ec01473d
--- /dev/null
+++ b/net-vpn/tinc/files/tinc-1.1-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/m4/curses.m4
b/m4/curses.m4
+@@ -39,6 +39,7 @@
+ )]
+ )
+ ])
++ AC_SEARCH_LIBS(stdscr, tinfo)
+
+ AC_SUBST(CURSES_LIBS)
+ ])
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild
b/net-vpn/tinc/tinc-1.1_pre15.ebuild
index a1b29bd7546..57d5cee1828 100644
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild
+++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -8,7 +8,7 @@ MY_P=${PN}-${MY_PV}
PYTHON_COMPAT=( python2_7 )
-inherit eutils multilib python-single-r1 systemd
+inherit autotools multilib python-single-r1 systemd
DESCRIPTION="tinc is an easy to configure VPN implementation"
HOMEPAGE="http://www.tinc-vpn.org/;
@@ -41,7 +41,6 @@ DEPEND="
zlib? ( sys-libs/zlib )"
RDEPEND="${DEPEND}
vde? ( net-misc/vde )"
-
S="${WORKDIR}/${MY_P}"
src_prepare() {
@@ -55,7 +54,10 @@ src_prepare() {
fi
eapply "${FILESDIR}"/tinc-1.1-fix-paths.patch #560528
+ eapply "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
eapply_user
+
+ eautoreconf
}
src_configure() {
