| 1 |
commit: ff70a3b83fccfb0e67894cbe0699ace1b8f76f36 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jan 26 17:24:59 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jan 26 22:36:56 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff70a3b8 |
| 7 |
|
| 8 |
net-proxy/dante: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/3666 |
| 11 |
|
| 12 |
net-proxy/dante/files/dante-1.3.0-socksify.patch | 26 -------------- |
| 13 |
net-proxy/dante/files/dante-1.3.1-flags.patch | 43 ------------------------ |
| 14 |
2 files changed, 69 deletions(-) |
| 15 |
|
| 16 |
diff --git a/net-proxy/dante/files/dante-1.3.0-socksify.patch b/net-proxy/dante/files/dante-1.3.0-socksify.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 45fd0fd..00000000 |
| 19 |
--- a/net-proxy/dante/files/dante-1.3.0-socksify.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,26 +0,0 @@ |
| 22 |
---- dante-1.3.0/bin/socksify.in.orig |
| 23 |
-+++ dante-1.3.0/bin/socksify.in |
| 24 |
-@@ -53,8 +53,6 @@ |
| 25 |
- exit 1 |
| 26 |
- fi |
| 27 |
- |
| 28 |
--SOCKSIFY_PRELOAD_LIBS="@SOCKSIFY_PRELOAD_LIBS@" |
| 29 |
-- |
| 30 |
- SOCKS_LIBDIR="${SOCKS_LIBDIR:-@LIBRARY_PREFIX@}" |
| 31 |
- |
| 32 |
- if test x`uname` = xDarwin; then |
| 33 |
-@@ -80,8 +78,12 @@ |
| 34 |
- @PRELOAD_VARIABLE@="${LIBRARY}${SOCKSIFY_PRELOAD_LIBS:+${PRELOAD_SEPERATOR}}${SOCKSIFY_PRELOAD_LIBS}${PRELOAD_POSTFIX:+${PRELOAD_SEPERATOR}}${PRELOAD_POSTFIX}" |
| 35 |
- export @PRELOAD_VARIABLE@ |
| 36 |
- |
| 37 |
--LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${SOCKS_LIBDIR}" |
| 38 |
--export LD_LIBRARY_PATH |
| 39 |
-+# There is no reason to set LD_LIBRARY_PATH, at least on Linux, where |
| 40 |
-+# LD_PRELOAD can contain a full path to the library. Setting the |
| 41 |
-+# following breaks socksify on Linux/Alpha at least with |
| 42 |
-+# binutils-2.14.90.0.7-r3 (08 Dec 2003 agriffis) |
| 43 |
-+#LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}${LIBDIR}" |
| 44 |
-+#export LD_LIBRARY_PATH |
| 45 |
- |
| 46 |
- if test x"@ISA64DIR@" != x; then |
| 47 |
- SOCKS_LIB64DIR="${LIB64DIR:-${SOCKS_LIBDIR}/@ISA64DIR@}" |
| 48 |
|
| 49 |
diff --git a/net-proxy/dante/files/dante-1.3.1-flags.patch b/net-proxy/dante/files/dante-1.3.1-flags.patch |
| 50 |
deleted file mode 100644 |
| 51 |
index fb8c211..00000000 |
| 52 |
--- a/net-proxy/dante/files/dante-1.3.1-flags.patch |
| 53 |
+++ /dev/null |
| 54 |
@@ -1,43 +0,0 @@ |
| 55 |
-Respect CFLAGS (bug #377353) -JeR |
| 56 |
- |
| 57 |
- |
| 58 |
---- a/configure.ac |
| 59 |
-+++ b/configure.ac |
| 60 |
-@@ -199,18 +199,6 @@ |
| 61 |
- #XXX make sure compiling with compiler options works |
| 62 |
- esac |
| 63 |
- |
| 64 |
--AC_MSG_CHECKING([for support for -pipe compiler flag]) |
| 65 |
--oCFLAGS=$CFLAGS |
| 66 |
--CFLAGS="$CFLAGS -pipe" |
| 67 |
--AC_TRY_RUN([ |
| 68 |
--int main() |
| 69 |
--{ |
| 70 |
-- return 0; |
| 71 |
--}], [AC_MSG_RESULT([yes]) |
| 72 |
-- comp_flags="${comp_flags} -pipe"], |
| 73 |
-- AC_MSG_RESULT([no])) |
| 74 |
--CFLAGS="$oCFLAGS" |
| 75 |
-- |
| 76 |
- AC_MSG_CHECKING([for support for -Wbounded compiler flag]) |
| 77 |
- oCFLAGS=$CFLAGS |
| 78 |
- CFLAGS="$CFLAGS -Wbounded" |
| 79 |
-@@ -233,18 +221,11 @@ |
| 80 |
- fi]) |
| 81 |
- |
| 82 |
- if test x$debug_enabled = xt; then |
| 83 |
-- #no optimization wanted |
| 84 |
-- if test $ac_cv_prog_cc_g = yes; then |
| 85 |
-- CFLAGS="$CFLAGS -g" |
| 86 |
-- fi |
| 87 |
- CPPFLAGS="$CPPFLAGS${CPPFLAGS:+ }-DDEBUG=1" |
| 88 |
- AC_MSG_RESULT([yes]) |
| 89 |
- else |
| 90 |
- AC_MSG_RESULT([no]) |
| 91 |
-- #autoconf_compflags is set to "-g -O2" with GCC |
| 92 |
-- #override CFLAGS when running configure to avoid this |
| 93 |
- CPPFLAGS="$CPPFLAGS${CPPFLAGS:+ }-DDEBUG=0" |
| 94 |
-- CFLAGS="$CFLAGS $autoconf_compflags" |
| 95 |
- fi |
| 96 |
- |
| 97 |
- #-Wall ? |
Archives