From: Henning Schild Date: Sun, 25 May 2025 10:01:42 +0000 (+0200) Subject: socat: update to 1.8.0.3 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=535ce8ea3fce2e637eda131916177fc4615b9247;p=feed%2Fpackages.git 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 --- diff --git a/net/socat/Makefile b/net/socat/Makefile index 4afaf7e784..57b3ce47a8 100644 --- 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 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 a958284576..414fb211fa 100644 --- 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 #include +#include