socat: update to 1.8.0.3

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

Closes: https://github.com/openwrt/packages/issues/26585
Signed-off-by: Henning Schild <henning@hennsch.de>
This commit is contained in:
Henning Schild
2025-05-25 12:01:42 +02:00
committed by Hannu Nyman
parent 6eb5981060
commit 535ce8ea3f
2 changed files with 4 additions and 7 deletions

View File

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

View File

@@ -1,7 +1,7 @@
--- a/xio-openssl.c --- a/xio-openssl.c
+++ b/xio-openssl.c +++ b/xio-openssl.c
@@ -8,6 +8,8 @@ @@ -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/conf.h>
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
+#include <openssl/dh.h> +#include <openssl/dh.h>