diff options
| author |   Robin H. Johnson <robbat2@gentoo.org> | 2014-01-05 23:33:03 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2014-01-05 23:33:03 +0000 |
| commit | 3ec077cff12afce662d6f6856e940bd5739f746e (patch) | |
| tree | 6db08942d88099d60f9efc9e59f21582b4267169 /net-proxy/dante/files | |
| parent | EAPI bump (diff) | |
| download | gentoo-2-3ec077cff12afce662d6f6856e940bd5739f746e.tar.gz gentoo-2-3ec077cff12afce662d6f6856e940bd5739f746e.tar.bz2 gentoo-2-3ec077cff12afce662d6f6856e940bd5739f746e.zip | |
Version bump; also restores upnp and libdsocks support.
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'net-proxy/dante/files')
4 files changed, 81 insertions, 7 deletions
diff --git a/net-proxy/dante/files/dante-1.4.0-cflags.patch b/net-proxy/dante/files/dante-1.4.0-cflags.patch new file mode 100644 index 000000000000..eccb64a5d7d8 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.0-cflags.patch @@ -0,0 +1,32 @@ +The upstream code tries to remove -g from CFLAGS, but the logic also matches +the -g in the middle of flags, like: +-frecord-gcc-switches => -frecordcc-switches +-ggdb3 => ggdb3 +Both of which cause GCC to fail horribly! + +Fix the grep & sed to only match standalone instances. + +Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> + +diff -Nuar dante-1.4.0.orig/compiler.m4 dante-1.4.0/compiler.m4 +--- dante-1.4.0.orig/compiler.m4 2013-10-24 13:20:23.000000000 -0700 ++++ dante-1.4.0/compiler.m4 2014-01-05 15:18:03.544336373 -0800 +@@ -375,14 +375,14 @@ + gcc) + if test x"$aixldbug" != x; then + #disable debug info +- if echo $CFLAGS | grep -- "-g" >/dev/null; then +- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" ++ if echo $CFLAGS | grep -w -- "-g" >/dev/null; then ++ CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`" + fi + CFLAGS="$CFLAGS${CFLAGS:+ }-g0" + else + #use -ggdb also when not debugging +- if echo $CFLAGS | grep -- "-g" >/dev/null; then +- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" ++ if echo $CFLAGS | grep -w -- "-g" >/dev/null; then ++ CFLAGS="`echo $CFLAGS | sed -e 's/\<-g\>//g'`" + fi + CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb" + fi diff --git a/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch b/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch index 52af3d73ec97..02a0d916e563 100644 --- a/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch +++ b/net-proxy/dante/files/dante-1.4.0-osdep-format-macro.patch @@ -1,15 +1,15 @@ -diff -urN dante-1.4.0-pre1-orig/include/osdep.h dante-1.4.0-pre1/include/osdep.h ---- dante-1.4.0-pre1-orig/include/osdep.h 2013-03-05 16:05:17.097007863 -0800 -+++ dante-1.4.0-pre1/include/osdep.h 2013-03-05 16:05:39.259007921 -0800 -@@ -225,9 +225,9 @@ +diff -Nuar --exclude '*.orig' --exclude '*.rej' dante-1.4.0.orig/include/osdep.h dante-1.4.0/include/osdep.h +--- dante-1.4.0.orig/include/osdep.h 2013-10-27 08:24:41.000000000 -0700 ++++ dante-1.4.0/include/osdep.h 2014-01-05 15:06:45.346071952 -0800 +@@ -254,9 +254,9 @@ #endif /* HAVE_DECL_NONNULL */ #if HAVE_DECL_FORMAT --#define FORMAT(x) format(x) +-#define FORMAT(x, y, z) format(x, y, z) +#define FORMAT(...) format(__VA_ARGS__) #else --#define FORMAT(x) +-#define FORMAT(x, y, z) +#define FORMAT(...) #endif /* HAVE_DECL_FORMAT */ - #if HAVE_LINUX_BUGS + #if HAVE_DECL_BOUNDED diff --git a/net-proxy/dante/files/dante-1.4.0-socksify.patch b/net-proxy/dante/files/dante-1.4.0-socksify.patch new file mode 100644 index 000000000000..2063327b42c5 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.0-socksify.patch @@ -0,0 +1,27 @@ +diff -Nuar --exclude '*.orig' --exclude '*.rej' dante-1.4.0.orig/bin/socksify.in dante-1.4.0/bin/socksify.in +--- dante-1.4.0.orig/bin/socksify.in 2013-10-27 08:24:41.000000000 -0700 ++++ dante-1.4.0/bin/socksify.in 2014-01-05 15:04:32.495670262 -0800 +@@ -53,7 +53,7 @@ + exit 1 + fi + +-SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@" ++#SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@" + SOCKS_LIBDIR="${SOCKS_LIBDIR:-@LIBRARY_PREFIX@}" + + #platform that requires full path to libdsocks? +@@ -82,8 +82,12 @@ + @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}" + export @PRELOAD_VARIABLE@ + +-LD_LIBRARY_PATH="${SOCKS_LIBDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" +-export LD_LIBRARY_PATH ++# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where ++# LD_PRELOAD can contain a full path to the library. Setting the ++# following breaks socksify on Linux/Alpha at least with ++# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis) ++#LD_LIBRARY_PATH="${SOCKS_LIBDIR}${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH}" ++#export LD_LIBRARY_PATH + + #SunOS 64-bit library path + if test x"@ISA64DIR@" != x; then diff --git a/net-proxy/dante/files/dante-1.4.0_pre1-osdep-format-macro.patch b/net-proxy/dante/files/dante-1.4.0_pre1-osdep-format-macro.patch new file mode 100644 index 000000000000..52af3d73ec97 --- /dev/null +++ b/net-proxy/dante/files/dante-1.4.0_pre1-osdep-format-macro.patch @@ -0,0 +1,15 @@ +diff -urN dante-1.4.0-pre1-orig/include/osdep.h dante-1.4.0-pre1/include/osdep.h +--- dante-1.4.0-pre1-orig/include/osdep.h 2013-03-05 16:05:17.097007863 -0800 ++++ dante-1.4.0-pre1/include/osdep.h 2013-03-05 16:05:39.259007921 -0800 +@@ -225,9 +225,9 @@ + #endif /* HAVE_DECL_NONNULL */ + + #if HAVE_DECL_FORMAT +-#define FORMAT(x) format(x) ++#define FORMAT(...) format(__VA_ARGS__) + #else +-#define FORMAT(x) ++#define FORMAT(...) + #endif /* HAVE_DECL_FORMAT */ + + #if HAVE_LINUX_BUGS |