| 1 |
commit: 70ffe53880c2d20ee5911a846e5a42df2d1ca070 |
| 2 |
Author: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 6 20:10:12 2018 +0000 |
| 4 |
Commit: Jonathan Vasquez <fearedbliss <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 6 20:10:41 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ffe538 |
| 7 |
|
| 8 |
net-vpn/tinc: version bump to 1.1_pre16 and minor improvements. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.41, Repoman-2.3.9 |
| 11 |
|
| 12 |
net-vpn/tinc/Manifest | 1 + |
| 13 |
...-paths.patch => tinc-1.1_pre15-fix-paths.patch} | 0 |
| 14 |
...-paths.patch => tinc-1.1_pre16-fix-paths.patch} | 47 +++++++++++++--------- |
| 15 |
net-vpn/tinc/tinc-1.1_pre15.ebuild | 8 +++- |
| 16 |
...tinc-1.1_pre15.ebuild => tinc-1.1_pre16.ebuild} | 8 +++- |
| 17 |
5 files changed, 44 insertions(+), 20 deletions(-) |
| 18 |
|
| 19 |
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest |
| 20 |
index ca1d7e95537..959505f8846 100644 |
| 21 |
--- a/net-vpn/tinc/Manifest |
| 22 |
+++ b/net-vpn/tinc/Manifest |
| 23 |
@@ -1,3 +1,4 @@ |
| 24 |
DIST tinc-1.0.33.tar.gz 486374 BLAKE2B 542e9c95aa3dea941315c5a3293c06137be7131bbb4a3ba5d788e7c250327d0b01530db5b3371aee85b1e85a104b9997e9f09a6b33051090da087595e1bcb9da SHA512 f17c7682e177d85a049891255fc590069c7901307951ee93364a7a754f1a7c5ca4b6a6f7ddcb4c9ad150f0155ff7db7112990a3fc3a6496b48bdbfd3b1ae8804 |
| 25 |
DIST tinc-1.0.34.tar.gz 484174 BLAKE2B 8ba80983cb1293b03b814f305bd733a2208562b8450a539c0f80c25596c0e05fb7ebc8edf8e6617b9e18d8b96bb49a82098f902e692ce4b85c7c47b1072be2dd SHA512 b711a2c532f8efc94c77e9bbe5213ae284d2a3cb598d2760df700448e495a02ac56baa0393bbc6fbc735bf97a26ca5a79133c92952d98a9086a9ffd273eef725 |
| 26 |
DIST tinc-1.1pre15.tar.gz 704145 BLAKE2B e97f044066a3c399b4089ed73e77a78904837031cbf04445390a3132a5cd8cf3e9390c1908b1804364616d16fffdedbae6b88f8a42da7471a42e4c8eea614d0e SHA512 29b109c84a89204a9fe298e3cfb092169a7c3cbb62e0cabdb7fe8eaa01b03343b7d48bf028525754af1a340781de209e0b9412669c256a30e7226a8a21412c17 |
| 27 |
+DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b SHA512 b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43 |
| 28 |
|
| 29 |
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 |
| 30 |
similarity index 100% |
| 31 |
copy from net-vpn/tinc/files/tinc-1.1-fix-paths.patch |
| 32 |
copy to net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch |
| 33 |
|
| 34 |
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 |
| 35 |
similarity index 56% |
| 36 |
rename from net-vpn/tinc/files/tinc-1.1-fix-paths.patch |
| 37 |
rename to net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch |
| 38 |
index 519677dd503..30cafee8787 100644 |
| 39 |
--- a/net-vpn/tinc/files/tinc-1.1-fix-paths.patch |
| 40 |
+++ b/net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch |
| 41 |
@@ -1,44 +1,55 @@ |
| 42 |
-diff -Naur tinc-1.1pre14.orig/src/names.c tinc-1.1pre14/src/names.c |
| 43 |
---- tinc-1.1pre14.orig/src/names.c 2016-04-17 12:08:41.000000000 -0400 |
| 44 |
-+++ tinc-1.1pre14/src/names.c 2016-10-15 07:37:51.147064396 -0400 |
| 45 |
-@@ -86,36 +86,11 @@ |
| 46 |
- if(!pidfilename) |
| 47 |
- xasprintf(&pidfilename, "%s" SLASH "pid", confbase); |
| 48 |
+diff -Naur tinc-1.1pre16.orig/src/names.c tinc-1.1pre16/src/names.c |
| 49 |
+--- tinc-1.1pre16.ori/src/names.c 2018-04-02 10:41:12.000000000 -0400 |
| 50 |
++++ tinc-1.1pre16/src/names.c 2018-07-06 15:11:35.970680875 -0400 |
| 51 |
+@@ -103,47 +103,13 @@ |
| 52 |
+ } |
| 53 |
+ |
| 54 |
#else |
| 55 |
- bool fallback = false; |
| 56 |
+- |
| 57 |
- if(daemon) { |
| 58 |
-- if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) |
| 59 |
+- if(access(LOCALSTATEDIR, R_OK | W_OK | X_OK)) { |
| 60 |
- fallback = true; |
| 61 |
+- } |
| 62 |
- } else { |
| 63 |
- char fname[PATH_MAX]; |
| 64 |
-- snprintf(fname, sizeof fname, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); |
| 65 |
+- snprintf(fname, sizeof(fname), LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); |
| 66 |
+- |
| 67 |
- if(access(fname, R_OK)) { |
| 68 |
-- snprintf(fname, sizeof fname, "%s" SLASH "pid", confbase); |
| 69 |
-- if(!access(fname, R_OK)) |
| 70 |
+- snprintf(fname, sizeof(fname), "%s" SLASH "pid", confbase); |
| 71 |
+- |
| 72 |
+- if(!access(fname, R_OK)) { |
| 73 |
- fallback = true; |
| 74 |
+- } |
| 75 |
- } |
| 76 |
-- } |
| 77 |
-+ if(!logfilename) |
| 78 |
++ if(!logfilename) { |
| 79 |
+ xasprintf(&logfilename, "/var/log" SLASH "%s.log", identname); |
| 80 |
+ } |
| 81 |
|
| 82 |
- if(!fallback) { |
| 83 |
-- if(!logfilename) |
| 84 |
+- if(!logfilename) { |
| 85 |
- xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname); |
| 86 |
+- } |
| 87 |
- |
| 88 |
-- if(!pidfilename) |
| 89 |
+- if(!pidfilename) { |
| 90 |
- xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname); |
| 91 |
+- } |
| 92 |
- } else { |
| 93 |
-- if(!logfilename) |
| 94 |
+- if(!logfilename) { |
| 95 |
- xasprintf(&logfilename, "%s" SLASH "log", confbase); |
| 96 |
+- } |
| 97 |
- |
| 98 |
- if(!pidfilename) { |
| 99 |
-- if(daemon) |
| 100 |
+- if(daemon) { |
| 101 |
- logger(DEBUG_ALWAYS, LOG_WARNING, "Could not access " LOCALSTATEDIR SLASH " (%s), storing pid and socket files in %s" SLASH, strerror(errno), confbase); |
| 102 |
+- } |
| 103 |
+- |
| 104 |
- xasprintf(&pidfilename, "%s" SLASH "pid", confbase); |
| 105 |
- } |
| 106 |
-- } |
| 107 |
-+ if(!pidfilename) |
| 108 |
++ if(!pidfilename) { |
| 109 |
+ xasprintf(&pidfilename, "/run" SLASH "%s.pid", identname); |
| 110 |
+ } |
| 111 |
+- |
| 112 |
#endif |
| 113 |
|
| 114 |
if(!unixsocketname) { |
| 115 |
|
| 116 |
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 117 |
index ea6d0816b40..359469d9dc7 100644 |
| 118 |
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 119 |
+++ b/net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 120 |
@@ -49,13 +49,19 @@ if [[ -n ${UPSTREAM_VER} ]]; then |
| 121 |
fi |
| 122 |
|
| 123 |
PATCHES+=( |
| 124 |
- "${FILESDIR}"/${PN}-1.1-fix-paths.patch #560528 |
| 125 |
+ "${FILESDIR}"/${PF}-fix-paths.patch #560528 |
| 126 |
"${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 |
| 127 |
) |
| 128 |
|
| 129 |
src_prepare() { |
| 130 |
default |
| 131 |
eautoreconf |
| 132 |
+ |
| 133 |
+ # Fix the static (failing UNKNOWN) version in the autoconf |
| 134 |
+ # NOTE: When updating the ebuild, make sure to check that this |
| 135 |
+ # line number hasn't changed in the upstream sources. |
| 136 |
+ sed -i "4d" configure.ac |
| 137 |
+ sed -i "4iAC_INIT([tinc], ${PVR})" configure.ac |
| 138 |
} |
| 139 |
|
| 140 |
src_configure() { |
| 141 |
|
| 142 |
diff --git a/net-vpn/tinc/tinc-1.1_pre15.ebuild b/net-vpn/tinc/tinc-1.1_pre16.ebuild |
| 143 |
similarity index 88% |
| 144 |
copy from net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 145 |
copy to net-vpn/tinc/tinc-1.1_pre16.ebuild |
| 146 |
index ea6d0816b40..91923228701 100644 |
| 147 |
--- a/net-vpn/tinc/tinc-1.1_pre15.ebuild |
| 148 |
+++ b/net-vpn/tinc/tinc-1.1_pre16.ebuild |
| 149 |
@@ -49,13 +49,19 @@ if [[ -n ${UPSTREAM_VER} ]]; then |
| 150 |
fi |
| 151 |
|
| 152 |
PATCHES+=( |
| 153 |
- "${FILESDIR}"/${PN}-1.1-fix-paths.patch #560528 |
| 154 |
+ "${FILESDIR}"/${PF}-fix-paths.patch #560528 |
| 155 |
"${FILESDIR}"/${PN}-1.1-tinfo.patch #621868 |
| 156 |
) |
| 157 |
|
| 158 |
src_prepare() { |
| 159 |
default |
| 160 |
eautoreconf |
| 161 |
+ |
| 162 |
+ # Fix the static (failing UNKNOWN) version in the autoconf |
| 163 |
+ # NOTE: When updating the ebuild, make sure to check that this |
| 164 |
+ # line number hasn't changed in the upstream sources. |
| 165 |
+ sed -i "6d" configure.ac |
| 166 |
+ sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac |
| 167 |
} |
| 168 |
|
| 169 |
src_configure() { |
Archives