socat: update to 1.8.0.3

reverting because upstream fixed it:
2650de468665 ("socat: fix compile error when ccache is enabled")

Closes: https://github.com/openwrt/packages/issues/26585
Signed-off-by: Henning Schild <[email protected]>

diff --git a/net/socat/Makefile b/net/socat/Makefile
index 4afaf7e784229352019482185ee5d3bdfa146c44..57b3ce47a87da08dfa9008e754dad9d48cbb4689 100644 (file)
--- a/net/socat/Makefile
+++ b/net/socat/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=socat
-PKG_VERSION:=1.8.0.0
-PKG_RELEASE:=2
+PKG_VERSION:=1.8.0.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download
-PKG_HASH:=e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7
+PKG_HASH:=01eb017361d95bb3a6941e840b59e4463a3fabf92df4154ed02b16a2ed6a0095
 
 PKG_MAINTAINER:=Ted Hess <[email protected]>
 PKG_LICENSE:=GPL-2.0-or-later OpenSSL
@@ -58,9 +58,6 @@ CONFIGURE_ARGS += \
        --disable-readline \
        --enable-termios
 
-## procan.c fails to compile when ccache is enabled
-MAKE_FLAGS += CC="$(TARGET_CC_NOCACHE)"
-
 ifneq ($(CONFIG_SOCAT_SSL),y)
   CONFIGURE_ARGS+= --disable-openssl
 endif

diff --git a/net/socat/patches/200-openssl-deprecated.patch b/net/socat/patches/200-openssl-deprecated.patch
index a958284576ed04269e060005107a8180cf520527..414fb211fa77bb3d17389724fed3f64bea5e9390 100644 (file)
--- a/net/socat/patches/200-openssl-deprecated.patch
+++ b/net/socat/patches/200-openssl-deprecated.patch
@@ -1,7 +1,7 @@
 --- a/xio-openssl.c
 +++ b/xio-openssl.c
 @@ -8,6 +8,8 @@
- #if WITH_OPENSSL      /* make this address configure dependend */
+ #if WITH_OPENSSL      /* make this address configure dependent */
  #include <openssl/conf.h>
  #include <openssl/x509v3.h>
 +#include <openssl/dh.h>