package/socat: bump to version 1.7.3.4

Drop patch #2. Upstream commit d8a5d49c2d8359 includes stddef.h in a
higher level header.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/socat/0002-compat-set-NETDB_INTERNAL.patch b/package/socat/0002-compat-set-NETDB_INTERNAL.patch
new file mode 100644 (file)
index 0000000..da31073
--- /dev/null
+++ b/package/socat/0002-compat-set-NETDB_INTERNAL.patch
@@ -0,0 +1,35 @@
+From e7804d1750652e39c7a5803d360b29b2637a695f Mon Sep 17 00:00:00 2001
+From: Romain Naour <romain.naour@gmail.com>
+Date: Sun, 28 Aug 2016 21:04:01 +0200
+Subject: [PATCH] compat: set NETDB_INTERNAL
+
+Musl doesn't provide NETDB_INTERNAL which is defined in resolv/netdb.h
+in Glibc [1].
+
+Set NETDB_INTERNAL to -1 locally if not already defined.
+Based on [2].
+
+[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/netdb.h;h=3aba530932c7a62a4f23e3193e9186da677f552b;hb=fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2#l74
+[2] http://git.alpinelinux.org/cgit/aports/tree/main/socat/netdb-internal.patch?id=5a45173b50892cb634197c30b3506ebff98d3b7d
+
+Signed-off-by: Romain Naour <romain.naour@gmail.com>
+---
+ compat.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/compat.h b/compat.h
+index 19a929f..4f5ee6d 100644
+--- a/compat.h
++++ b/compat.h
+@@ -666,6 +666,8 @@ typedef int sig_atomic_t;
+ 
+ #if !defined(NETDB_INTERNAL) && defined(h_NETDB_INTERNAL)
+ #  define NETDB_INTERNAL h_NETDB_INTERNAL
++#elif !defined(NETDB_INTERNAL)
++#  define NETDB_INTERNAL (-1)
+ #endif
+ 
+ #ifndef INET_ADDRSTRLEN
+-- 
+2.5.5
+

diff --git a/package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch b/package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch
deleted file mode 100644 (file)
index acae641..0000000
--- a/package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 99c55f2694fe8621ca2344eb002610dac7f9c969 Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 2 Feb 2016 09:34:24 -0300
-Subject: [PATCH] ptrdiff_t is defined in stddef.h
-
-Status: sent upstream via email.
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- nestlex.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/nestlex.c b/nestlex.c
-index f7950f0..f49482d 100644
---- a/nestlex.c
-+++ b/nestlex.c
-@@ -4,6 +4,8 @@
- 
- /* a function for lexical scanning of nested character patterns */
- 
-+#include <stddef.h>   /* ptrdiff_t */
-+
- #include "config.h"
- #include "mytypes.h"
- 
--- 
-2.4.10
-

diff --git a/package/socat/0003-compat-set-NETDB_INTERNAL.patch b/package/socat/0003-compat-set-NETDB_INTERNAL.patch
deleted file mode 100644 (file)
index da31073..0000000
--- a/package/socat/0003-compat-set-NETDB_INTERNAL.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e7804d1750652e39c7a5803d360b29b2637a695f Mon Sep 17 00:00:00 2001
-From: Romain Naour <romain.naour@gmail.com>
-Date: Sun, 28 Aug 2016 21:04:01 +0200
-Subject: [PATCH] compat: set NETDB_INTERNAL
-
-Musl doesn't provide NETDB_INTERNAL which is defined in resolv/netdb.h
-in Glibc [1].
-
-Set NETDB_INTERNAL to -1 locally if not already defined.
-Based on [2].
-
-[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/netdb.h;h=3aba530932c7a62a4f23e3193e9186da677f552b;hb=fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2#l74
-[2] http://git.alpinelinux.org/cgit/aports/tree/main/socat/netdb-internal.patch?id=5a45173b50892cb634197c30b3506ebff98d3b7d
-
-Signed-off-by: Romain Naour <romain.naour@gmail.com>
----
- compat.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/compat.h b/compat.h
-index 19a929f..4f5ee6d 100644
---- a/compat.h
-+++ b/compat.h
-@@ -666,6 +666,8 @@ typedef int sig_atomic_t;
- 
- #if !defined(NETDB_INTERNAL) && defined(h_NETDB_INTERNAL)
- #  define NETDB_INTERNAL h_NETDB_INTERNAL
-+#elif !defined(NETDB_INTERNAL)
-+#  define NETDB_INTERNAL (-1)
- #endif
- 
- #ifndef INET_ADDRSTRLEN
--- 
-2.5.5
-

diff --git a/package/socat/socat.hash b/package/socat/socat.hash
index 92d62ab7164243edeca0087aec9cf1661e2b9efb..e5b65925d191f3139d0aa54868a4c2a9d084b57f 100644 (file)
--- a/package/socat/socat.hash
+++ b/package/socat/socat.hash
@@ -1,7 +1,7 @@
 # From http://www.dest-unreach.org/socat/download.md5sum
-md5    b2a032a47b8b89a18485697fa975154f        socat-1.7.3.3.tar.bz2
+md5    3cca4f8cd9d2d1caabd9cc099451bac9        socat-1.7.3.4.tar.bz2
 # From http://www.dest-unreach.org/socat/download.sha256sum
-sha256 0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a        socat-1.7.3.3.tar.bz2
+sha256 972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc        socat-1.7.3.4.tar.bz2
 # Locally calculated
 sha256 4846488cea98a2905dc75b7aa5eea721568e372447efe06b85bd896ee8c54f10        README
 sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643        COPYING

diff --git a/package/socat/socat.mk b/package/socat/socat.mk
index 9e747e08fa62b0acd4bb433b7d3f6599409e6743..3807d45379fceb74163aa4c097934becc888fc87 100644 (file)
--- a/package/socat/socat.mk
+++ b/package/socat/socat.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SOCAT_VERSION = 1.7.3.3
+SOCAT_VERSION = 1.7.3.4
 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2
 SOCAT_SITE = http://www.dest-unreach.org/socat/download
 SOCAT_LICENSE = GPL-2.0 with OpenSSL exception