summaryrefslogtreecommitdiffstats
path: root/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-12-17 09:29:54 +0000
committerJohn Crispin <john@openwrt.org>2015-12-17 09:29:54 +0000
commita418d03d6d3c9ec8028c72b08f46c0a89c16e5f1 (patch)
treed8bb41baa80a79726946452335a1c24cb0dd40a7 /package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
parent68ff0d3d788eeb1880c997a8a9053bb6fdc37755 (diff)
downloadmaster-31e0f0ae-a418d03d6d3c9ec8028c72b08f46c0a89c16e5f1.tar.gz
master-31e0f0ae-a418d03d6d3c9ec8028c72b08f46c0a89c16e5f1.tar.bz2
master-31e0f0ae-a418d03d6d3c9ec8028c72b08f46c0a89c16e5f1.zip
dante: update to 1.4.1
- 1.4.x has IPv6 support - set C std explicitly due to gcc 5 changes/old code style of dante - disable pam via configure vars since detection of without pam option is broken (-lpam gets linked in if available) - remove and refresh patches only compile tested Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de> SVN-Revision: 47926
Diffstat (limited to 'package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch')
-rw-r--r--package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch18
1 files changed, 9 insertions, 9 deletions
diff --git a/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch b/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
index 7281ba6059..594a6f900b 100644
--- a/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
+++ b/package/network/utils/dante/patches/200-fix-RTLD_NEXT.patch
@@ -1,8 +1,8 @@
--- a/lib/address.c
+++ b/lib/address.c
-@@ -45,11 +45,12 @@
+@@ -48,11 +48,12 @@
- #include "interposition.h"
+ #include "upnp.h"
-#ifndef __USE_GNU
-#define __USE_GNU /* XXX for RTLD_NEXT on Linux */
@@ -14,13 +14,13 @@
+#endif
+
static const char rcsid[] =
- "$Id: address.c,v 1.177.2.2 2010/05/24 16:38:36 karls Exp $";
+ "$Id: address.c,v 1.288.4.4 2014/08/15 18:16:40 karls Exp $";
--- a/dlib/interposition.c
+++ b/dlib/interposition.c
-@@ -66,11 +66,12 @@ sendto(HAVE_PROT_SENDTO_1, HAVE_PROT_SEN
- HAVE_PROT_SENDTO_4, HAVE_PROT_SENDTO_5, HAVE_PROT_SENDTO_6);
- #endif
+@@ -93,11 +93,12 @@ write$NOCANCEL(HAVE_PROT_WRITE_1, HAVE_P
+
+ #endif /* HAVE_DARWIN */
-#ifndef __USE_GNU
-#define __USE_GNU /* XXX for RTLD_NEXT on Linux */
@@ -31,6 +31,6 @@
+#define RTLD_NEXT ((void *) -1l)
+#endif
+
- #undef accept
- #undef bind
- #undef bindresvport
+ #ifdef __COVERITY__
+ /*
+ * Coverity naturally has no idea what the function sys_foo calls does,