mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-04 22:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

socat: 1.7.4.4 -> 1.8.0.0

Browse Source 
1. No chagne on license [1], original md5 is not right because
   beginline=241 does not match

2. Fix two compile and one install failures

[1] https://repo.or.cz/socat.git/blobdiff/c9ff62744f4140418f4edce7e395d1a30e9161b1..2da070164d454971d5c970b5278e645051f0d0f7:/README

(From OE-Core rev: a8cb052a78d0422acb52c402a3836f4ee174ee66)

Signed-off-by: Hongxu Jia <hongxu.jia@eng.windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongxu Jia
2023-12-06 00:48:35 -08:00
committed by Richard Purdie
parent 36b66553a7
commit 5b153cc115
2 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
meta/recipes-connectivity/socat/files/0001-fix-compile-procan.c-failed.patch Normal file
View File

@@ -0,0 +1,62 @@
From 4f887cc665c9a48b83e20ef4abe57afa7e365e0e Mon Sep 17 00:00:00 2001
From: Hongxu Jia <hongxu.jia@eng.windriver.com>
Date: Tue, 5 Dec 2023 23:02:22 -0800
Subject: [PATCH v2] fix compile procan.c failed
1. Compile socat failed if out of tree build (build dir != source dir)
...
gcc -c -D CC="gcc" -o procan.o procan.c
cc1: fatal error: procan.c: No such file or directory
...
Explicitly add $srcdir to makefile rule
2. Compile socat failed if multiple words in $(CC), such as CC="gcc -m64"
...
from ../socat-1.8.0.0/procan.c:10:
../socat-1.8.0.0/sysincludes.h:18:10: fatal error: inttypes.h: No such file or directory
18 | #include <inttypes.h> /* uint16_t */
...
In commit [Procan: print umask, CC, and couple more new infos][1],
it defeines marcro CC in C source, the space in CC will break
C source compile. Use first word of $(CC) to defeine marco CC
[1] https://repo.or.cz/socat.git/commit/cd5673dbd0786c94e0b3ace7e35fab14c01e3185
Upstream-Status: Submitted [socat@dest-unreach.org]
Signed-off-by: Hongxu Jia <hongxu.jia@eng.windriver.com>
---
Makefile.in | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index c01b1a4..48dad69 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -109,8 +109,8 @@ depend: $(CFILES) $(HFILES)
socat: socat.o libxio.a
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ socat.o libxio.a $(CLIBS)
-procan.o: procan.c
- $(CC) $(CFLAGS) -c -D CC=\"$(CC)\" -o $@ procan.c
+procan.o: $(srcdir)/procan.c
+ $(CC) $(CFLAGS) -c -D CC=\"$(firstword $(CC))\" -o $@ $(srcdir)/procan.c
PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
procan: $(PROCAN_OBJS)
@@ -132,9 +132,9 @@ install: progs $(srcdir)/doc/socat.1
mkdir -p $(DESTDIR)$(BINDEST)
$(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST)/socat1
ln -sf socat1 $(DESTDIR)$(BINDEST)/socat
- $(INSTALL) -m 755 socat-chain.sh $(DESTDIR)$(BINDEST)
- $(INSTALL) -m 755 socat-mux.sh $(DESTDIR)$(BINDEST)
- $(INSTALL) -m 755 socat-broker.sh $(DESTDIR)$(BINDEST)
+ $(INSTALL) -m 755 $(srcdir)/socat-chain.sh $(DESTDIR)$(BINDEST)
+ $(INSTALL) -m 755 $(srcdir)/socat-mux.sh $(DESTDIR)$(BINDEST)
+ $(INSTALL) -m 755 $(srcdir)/socat-broker.sh $(DESTDIR)$(BINDEST)
$(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST)
$(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST)
mkdir -p $(DESTDIR)$(MANDEST)/man1
--
2.42.0

8
meta/recipes-connectivity/socat/socat_1.7.4.4.bb → meta/recipes-connectivity/socat/socat_1.8.0.0.bb
View File

@@ -7,11 +7,13 @@ SECTION = "console/network"
LICENSE = "GPL-2.0-with-OpenSSL-exception"
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86"
file://README;beginline=241;endline=271;md5=338c05eadd013872abb1d6e198e10a3f"
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2"
SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
file://0001-fix-compile-procan.c-failed.patch \
"
SRC_URI[sha256sum] = "fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac"
SRC_URI[sha256sum] = "e1de683dd22ee0e3a6c6bbff269abe18ab0c9d7eb650204f125155b9005faca7"
inherit autotools