From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0408B138334 for ; Fri, 6 Jul 2018 20:10:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 104D5E088F; Fri, 6 Jul 2018 20:10:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B8DEDE088F for ; Fri, 6 Jul 2018 20:10:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 81EB3335C7A for ; Fri, 6 Jul 2018 20:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C9C1E35A for ; Fri, 6 Jul 2018 20:10:46 +0000 (UTC) From: "Jonathan Vasquez" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Vasquez" Message-ID: <1530907841.70ffe53880c2d20ee5911a846e5a42df2d1ca070.fearedbliss@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/tinc/, net-vpn/tinc/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/tinc/Manifest net-vpn/tinc/files/tinc-1.1-fix-paths.patch net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch net-vpn/tinc/tinc-1.1_pre15.ebuild net-vpn/tinc/tinc-1.1_pre16.ebuild X-VCS-Directories: net-vpn/tinc/files/ net-vpn/tinc/ X-VCS-Committer: fearedbliss X-VCS-Committer-Name: Jonathan Vasquez X-VCS-Revision: 70ffe53880c2d20ee5911a846e5a42df2d1ca070 X-VCS-Branch: master Date: Fri, 6 Jul 2018 20:10:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 1c06b99d-7e95-4ba2-bc9a-8d726fa8eb00 X-Archives-Hash: c54ccf6a76b5b5ceffc5197df8e0eeee commit: 70ffe53880c2d20ee5911a846e5a42df2d1ca070 Author: Jonathan Vasquez gentoo org> AuthorDate: Fri Jul 6 20:10:12 2018 +0000 Commit: Jonathan Vasquez gentoo org> CommitDate: Fri Jul 6 20:10:41 2018 +0000 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.000000000 -0400 -+++ tinc-1.1pre14/src/names.c 2016-10-15 07:37:51.147064396 -0400 -@@ -86,36 +86,11 @@ - if(!pidfilename) - xasprintf(&pidfilename, "%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.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)) +- 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(&logfilename, "/var/log" SLASH "%s.log", identname); + } - if(!fallback) { -- if(!logfilename) +- if(!logfilename) { - xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname); +- } - -- if(!pidfilename) +- if(!pidfilename) { - xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); +- } - } else { -- if(!logfilename) +- if(!logfilename) { - xasprintf(&logfilename, "%s" SLASH "log", confbase); +- } - - if(!pidfilename) { -- if(daemon) +- 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) ++ 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 ea6d0816b40..359469d9dc7 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_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre16.ebuild similarity index 88% copy from net-vpn/tinc/tinc-1.1_pre15.ebuild copy to net-vpn/tinc/tinc-1.1_pre16.ebuild index ea6d0816b40..91923228701 100644 --- a/net-vpn/tinc/tinc-1.1_pre15.ebuild +++ b/net-vpn/tinc/tinc-1.1_pre16.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 "6d" configure.ac + sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac } src_configure() {