diff options
| author |   Jonathan Vasquez <fearedbliss@gentoo.org> | 2018-07-06 16:10:12 -0400 |
|---|---|---|
| committer | Jonathan Vasquez <fearedbliss@gentoo.org> | 2018-07-06 16:10:41 -0400 |
| commit | 70ffe53880c2d20ee5911a846e5a42df2d1ca070 (patch) | |
| tree | ee134752dd95a7064921e6c5435d45e854b0b85a /net-vpn/tinc/files | |
| parent | dev-lang/python: bump to 3.7.0 (diff) | |
| download | gentoo-70ffe53880c2d20ee5911a846e5a42df2d1ca070.tar.gz gentoo-70ffe53880c2d20ee5911a846e5a42df2d1ca070.tar.bz2 gentoo-70ffe53880c2d20ee5911a846e5a42df2d1ca070.zip | |
net-vpn/tinc: version bump to 1.1_pre16 and minor improvements.
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Diffstat (limited to 'net-vpn/tinc/files')
| -rw-r--r-- | net-vpn/tinc/files/tinc-1.1_pre15-fix-paths.patch (renamed from net-vpn/tinc/files/tinc-1.1-fix-paths.patch) | 0 | ||||
| -rw-r--r-- | net-vpn/tinc/files/tinc-1.1_pre16-fix-paths.patch | 55 |
2 files changed, 55 insertions, 0 deletions
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) { |