diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group index 8a9f714..cbd3826 100644 --- a/groups/241.native_packages_inet.group +++ b/groups/241.native_packages_inet.group @@ -192,9 +192,9 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")"; : ${PKG_RSYNC_VERSION:=3.2.3}; : ${PKG_RSYNC_URL:=https://download.samba.org/pub/rsync/src/rsync-${PKG_RSYNC_VERSION}.tar.gz}; : ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA:="--with-included-zlib --disable-simd --disable-xxhash --disable-lz4 --disable-zstd"}; -: ${PKG_SOCAT_SHA256SUM:=ce3efc17e3e544876ebce7cd6c85b3c279fda057b2857fcaaf67b9ab8bdaf034}; -: ${PKG_SOCAT_VERSION:=1.7.3.2}; -: ${PKG_SOCAT_URL:=http://www.dest-unreach.org/socat/download/socat-1.7.3.2.tar.gz}; +: ${PKG_SOCAT_SHA256SUM:=d9ed2075abed7b3ec9730ed729b4c8e287c502181c806d4487020418a6e2fc36}; +: ${PKG_SOCAT_VERSION:=1.7.3.4}; +: ${PKG_SOCAT_URL:=http://www.dest-unreach.org/socat/download/socat-${PKG_SOCAT_VERSION}.tar.gz}; : ${PKG_THTTPD_SHA256SUM:=99c09f47da326b1e7b5295c45549d2b65534dce27c44812cf7eef1441681a397}; : ${PKG_THTTPD_VERSION:=2.29}; : ${PKG_THTTPD_URL:=https://acme.com/software/thttpd/thttpd-${PKG_THTTPD_VERSION}.tar.gz}; diff --git a/patches/socat-1.7.3.2.local.patch b/patches/socat-1.7.3.2.local.patch deleted file mode 100644 index d1ebc8e..0000000 --- a/patches/socat-1.7.3.2.local.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- socat-1.7.2.4.orig/compat.h -+++ socat-1.7.2.4/compat.h -@@ -656,6 +656,10 @@ - # define NETDB_INTERNAL h_NETDB_INTERNAL - #endif - -+#if !defined(NETDB_INTERNAL) -+# define NETDB_INTERNAL (-1) -+#endif -+ - #ifndef INET_ADDRSTRLEN - # define INET_ADDRSTRLEN sizeof(struct sockaddr_in) - #endif diff --git a/patches/socat-1.7.3.4.local.patch b/patches/socat-1.7.3.4.local.patch new file mode 100644 index 0000000..0bf5073 --- /dev/null +++ b/patches/socat-1.7.3.4.local.patch @@ -0,0 +1,13 @@ +--- socat-1.7.3.4/compat.h.orig 2019-04-04 09:59:55.000000000 +0100 ++++ socat-1.7.3.4/compat.h 2021-01-12 12:41:10.675182890 +0000 +@@ -695,6 +695,10 @@ + # define NETDB_INTERNAL h_NETDB_INTERNAL + #endif + ++#if !defined(NETDB_INTERNAL) ++# define NETDB_INTERNAL (-1) ++#endif ++ + #ifndef INET_ADDRSTRLEN + # define INET_ADDRSTRLEN sizeof(struct sockaddr_in) + #endif