diff options
| author | Pacho Ramos <pacho@gentoo.org> | 2016-10-24 14:53:41 +0200 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2016-10-24 15:04:49 +0200 |
| commit | e027c15375947136c0c6d1273b55b993a3d6d6fd (patch) | |
| tree | aa87c232f9476b0093b0df4fefd70fd6ced1d50f /net-proxy/dante/files | |
| parent | 00379ec116760089ae33535a250f5b4c1733332d (diff) | |
| download | gentoo-e027c15375947136c0c6d1273b55b993a3d6d6fd.tar.gz gentoo-e027c15375947136c0c6d1273b55b993a3d6d6fd.tar.xz | |
net-proxy/dante: Apply Debian patch to fix compilation on alpha and other arches (#517528 by Tobias Klausmann), apply opensuse patch to fix compilation with newer miniupnpc (#564680 by Rion), use proper configure option (#596198 by Xiami).
Package-Manager: portage-2.3.2
RepoMan-Options: --force
Diffstat (limited to 'net-proxy/dante/files')
| -rw-r--r-- | net-proxy/dante/files/dante-1.4.1-miniupnp14.patch | 14 | ||||
| -rw-r--r-- | net-proxy/dante/files/dante-1.4.1-sigpwr-siginfo.patch | 26 |
2 files changed, 40 insertions, 0 deletions
diff --git a/net-proxy/dante/files/dante-1.4.1-miniupnp14.patch b/net-proxy/dante/files/dante-1.4.1-miniupnp14.patch new file mode 100644 index 00000000000..1e952ad18b7 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.1-miniupnp14.patch @@ -0,0 +1,14 @@ +Index: dante-1.4.1/lib/upnp.c +=================================================================== +--- dante-1.4.1.orig/lib/upnp.c ++++ dante-1.4.1/lib/upnp.c +@@ -156,6 +156,9 @@ socks_initupnp(gw, emsg, emsglen) + 0 + #if HAVE_LIBMINIUPNP17 + ,0, ++#if MINIUPNPC_API_VERSION >= 14 /* adds ttl */ ++ 2, ++#endif + &rc + #endif /* HAVE_LIBMINIUPNP17 */ + ); diff --git a/net-proxy/dante/files/dante-1.4.1-sigpwr-siginfo.patch b/net-proxy/dante/files/dante-1.4.1-sigpwr-siginfo.patch new file mode 100644 index 00000000000..86d54d6a37c --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.1-sigpwr-siginfo.patch @@ -0,0 +1,26 @@ +Description: Make sure SIGPWR is not the same as SIGINFO + Avoid a duplicate case value in a switch statement on e.g. Alpha. +Forwarded: not-yet +Author: Peter Pentchev <roam@ringlet.net> +Last-Update: 2016-04-11 + +--- a/lib/tostring.c ++++ b/lib/tostring.c +@@ -1551,7 +1551,17 @@ + return "SIGPROF"; + #endif /* SIGPROF */ + ++#undef NEED_SIGPWR ++ + #ifdef SIGPWR ++#ifndef SIGINFO ++#define NEED_SIGPWR ++#elif SIGINFO != SIGPWR ++#define NEED_SIGPWR ++#endif ++#endif ++ ++#ifdef NEED_SIGPWR + case SIGPWR: + return "SIGPWR"; + #endif /* SIGPWR */ |