Thanks, applied as a302bf10321f2edf0ee59bc9b2e15074fce95932. Michael
[sent from post-receive hook] On Sun, 19 Oct 2025 14:05:20 +0200, Sven Püschel <[email protected]> wrote: > The patch is integrated in the new version. Also the ext2 config option > was moved to the more generic fs config option. > > The README mentions that the project also uses MIT for the install-sh > file. As the configure script mentions that the file is required, the > license has been added to the list. > > Signed-off-by: Sven Püschel <[email protected]> > Message-Id: <[email protected]> > Signed-off-by: Michael Olbrich <[email protected]> > > diff --git > a/patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch > b/patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch > deleted file mode 100644 > index 77cf6f2a54f1..000000000000 > --- a/patches/socat-1.7.3.2/0001-Makefile.in-fix-for-parallel-build.patch > +++ /dev/null > @@ -1,26 +0,0 @@ > -From: Markus Niebel <[email protected]> > -Date: Tue, 25 Aug 2015 17:48:55 +0200 > -Subject: [PATCH] Makefile.in: fix for parallel build > - > -Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue. > - > -original patch for OE-Core by: Robert Yang <liezhi.yang at windriver.com> > - > -Signed-off-by: Markus Niebel <[email protected]> > ---- > - Makefile.in | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/Makefile.in b/Makefile.in > -index f2a6edb87890..88b784b1592c 100644 > ---- a/Makefile.in > -+++ b/Makefile.in > -@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o > hostan.o error.o sycls.o sysut > - procan: $(PROCAN_OBJS) > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS) > - > --filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o > -+filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o > vsnprintf_r.o snprinterr.o > - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ filan_main.o filan.o fdname.o error.o > sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o $(CLIBS) > - > - libxio.a: $(XIOOBJS) $(UTLOBJS) > diff --git a/patches/socat-1.7.3.2/series b/patches/socat-1.7.3.2/series > deleted file mode 100644 > index c1c73553c0c6..000000000000 > --- a/patches/socat-1.7.3.2/series > +++ /dev/null > @@ -1,4 +0,0 @@ > -# generated by git-ptx-patches > -#tag:base --start-number 1 > -0001-Makefile.in-fix-for-parallel-build.patch > -# 61dca8976a5f7b756e48ea74ebd2750d - git-ptx-patches magic > diff --git a/rules/socat.make b/rules/socat.make > index 74eb6240c23a..cd98492e92bd 100644 > --- a/rules/socat.make > +++ b/rules/socat.make > @@ -12,8 +12,8 @@ PACKAGES-$(PTXCONF_SOCAT) += socat > # Paths and names > # > > -SOCAT_VERSION := 1.7.3.2 > -SOCAT_MD5 := aec3154f7854580cfab0c2d81e910519 > +SOCAT_VERSION := 1.8.0.3 > +SOCAT_MD5 := ffd9c84c8bce700eac26847c8a700a78 > SOCAT := socat-$(SOCAT_VERSION) > SOCAT_SUFFIX := tar.gz > SOCAT_URL := \ > @@ -21,7 +21,11 @@ SOCAT_URL := \ > > http://www.dest-unreach.org/socat/download/Archive/$(SOCAT).$(SOCAT_SUFFIX) > SOCAT_SOURCE := $(SRCDIR)/$(SOCAT).$(SOCAT_SUFFIX) > SOCAT_DIR := $(BUILDDIR)/$(SOCAT) > -SOCAT_LICENSE := GPL-2.0-only > +SOCAT_LICENSE := GPL-2.0-only AND MIT > +SOCAT_LICENSE_FILES := \ > + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ > + > file://README;startline=248;endline=281;md5=4e953b796133e1470eb57b3f59611720 \ > + > file://install-sh;startline=6;endline=16;md5=6c39b6a36ad775d09cc9ee0e33fe9e6c > > # > ---------------------------------------------------------------------------- > # Prepare > @@ -38,12 +42,15 @@ SOCAT_CONF_TOOL := autoconf > SOCAT_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-help \ > + --enable-largefile \ > + --enable-stats \ > --enable-stdio \ > --enable-fdnum \ > --enable-file \ > --enable-creat \ > --enable-gopen \ > --enable-pipe \ > + --enable-socketpair \ > --enable-termios \ > --enable-unix \ > --enable-abstract-unixsocket \ > @@ -54,23 +61,34 @@ SOCAT_CONF_OPT := \ > --enable-interface \ > --enable-tcp \ > --enable-udp \ > + --enable-udplite \ > --enable-sctp \ > + --enable-dccp \ > + --enable-vsock \ > + --enable-namespaces \ > --enable-listen \ > + --enable-posixmq \ > --enable-socks4 \ > --enable-socks4a \ > + --enable-socks5 \ > --enable-proxy \ > --enable-exec \ > --enable-system \ > + --enable-shell \ > --enable-pty \ > - --enable-ext2 \ > + --enable-fs \ > --disable-readline \ > --$(call ptx/endis, PTXCONF_SOCAT_OPENSSL)-openssl \ > + --enable-resolve \ > + --disable-res-deprecated \ > --disable-fips \ > --enable-tun \ > --enable-sycls \ > --enable-filan \ > --enable-retry \ > + --disable-devtests \ > --enable-msglevel=0 \ > + --enable-default-ipv=4 \ > --disable-libwrap > >
