summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2019-05-07 16:11:43 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-08 22:56:45 +0100
commit0a0ffb2ca8655bf0b1bd39ae8b141a548465e63c (patch)
treea6f109a36d0e6e0a7f6c224bcab95e1e2bf9e5c7
parent0a219f449a3afe298f6f1bbf06c0cac18e008026 (diff)
downloadpoky-0a0ffb2ca8655bf0b1bd39ae8b141a548465e63c.tar.gz
socat: upgrade 1.7.3.2 -> 1.7.3.3
Remove patches for issues fixed upstream. (From OE-Core rev: e697fe9c109234f914976ccec78a0776aa59d08d) Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch52
-rw-r--r--meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch35
-rw-r--r--meta/recipes-connectivity/socat/socat_1.7.3.3.bb (renamed from meta/recipes-connectivity/socat/socat_1.7.3.2.bb)6
3 files changed, 2 insertions, 91 deletions
diff --git a/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch b/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
deleted file mode 100644
index c0e27f3d78..0000000000
--- a/meta/recipes-connectivity/socat/socat/0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From fb10ab134d630705cae0c7be42437cc289af7d32 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 15 Mar 2016 21:36:02 +0000
4Subject: [PATCH] Use __c_ispeed and __c_ospeed on musl
5
6Original intention of these asserts is to find if termios structure
7is mapped correctly to locally define union, the get* APIs for
8baudrate would not do the right thing since they do not return the
9value from c_ospeed/c_ispeed but the value which is stored in iflag
10for baudrate.
11
12So we check if we are on Linux but not using glibc then we use
13__c_ispeed and __c_ospeed as defined in musl, however these are
14internal elements of structs it should not have been used this
15way.
16
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18
19---
20Upstream-Status: Pending
21
22 xioinitialize.c | 7 +++++++
23 1 file changed, 7 insertions(+)
24
25diff --git a/xioinitialize.c b/xioinitialize.c
26index 9f50155..8fb2e4c 100644
27--- a/xioinitialize.c
28+++ b/xioinitialize.c
29@@ -65,6 +65,12 @@ int xioinitialize(void) {
30 #if HAVE_TERMIOS_ISPEED && (ISPEED_OFFSET != -1) && (OSPEED_OFFSET != -1)
31 #if defined(ISPEED_OFFSET) && (ISPEED_OFFSET != -1)
32 #if defined(OSPEED_OFFSET) && (OSPEED_OFFSET != -1)
33+#if defined(__linux__) && !defined(__GLIBC__)
34+ tdata.termarg.__c_ispeed = 0x56789abc;
35+ tdata.termarg.__c_ospeed = 0x6789abcd;
36+ assert(tdata.termarg.__c_ispeed == tdata.speeds[ISPEED_OFFSET]);
37+ assert(tdata.termarg.__c_ospeed == tdata.speeds[OSPEED_OFFSET]);
38+#else
39 tdata.termarg.c_ispeed = 0x56789abc;
40 tdata.termarg.c_ospeed = 0x6789abcd;
41 assert(tdata.termarg.c_ispeed == tdata.speeds[ISPEED_OFFSET]);
42@@ -72,6 +78,7 @@ int xioinitialize(void) {
43 #endif
44 #endif
45 #endif
46+#endif
47 }
48 #endif
49
50--
512.8.0
52
diff --git a/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch b/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
deleted file mode 100644
index aa4db65a79..0000000000
--- a/meta/recipes-connectivity/socat/socat/Makefile.in-fix-for-parallel-build.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From c6f0080b55679b6e8b5d332d6e05fdcbda1e4064 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 4 May 2015 00:58:47 -0700
4Subject: [PATCH] Makefile.in: fix for parallel build
5
6Fixed:
7vsnprintf_r.o: file not recognized: File truncated
8collect2: error: ld returned 3 exit status
9Makefile:122: recipe for target 'filan' failed
10
11Let filan depend on vsnprintf_r.o and snprinterr.o to fix the issue.
12
13Upstream-Status: Pending
14
15Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
16---
17 Makefile.in | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/Makefile.in b/Makefile.in
21index f2a6edb..88b784b 100644
22--- a/Makefile.in
23+++ b/Makefile.in
24@@ -118,7 +118,7 @@ PROCAN_OBJS=procan_main.o procan.o procan-cdefs.o hostan.o error.o sycls.o sysut
25 procan: $(PROCAN_OBJS)
26 $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(PROCAN_OBJS) $(CLIBS)
27
28-filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o
29+filan: filan_main.o filan.o fdname.o error.o sycls.o sysutils.o utils.o vsnprintf_r.o snprinterr.o
30 $(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)
31
32 libxio.a: $(XIOOBJS) $(UTLOBJS)
33--
341.7.9.5
35
diff --git a/meta/recipes-connectivity/socat/socat_1.7.3.2.bb b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
index b2d6b1dea4..7a889a3801 100644
--- a/meta/recipes-connectivity/socat/socat_1.7.3.2.bb
+++ b/meta/recipes-connectivity/socat/socat_1.7.3.3.bb
@@ -12,13 +12,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f" 12 file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f"
13 13
14SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ 14SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
15 file://Makefile.in-fix-for-parallel-build.patch \
16 file://0001-define-NETDB_INTERNAL-to-1-if-not-available.patch \ 15 file://0001-define-NETDB_INTERNAL-to-1-if-not-available.patch \
17 file://0001-Access-c_ispeed-and-c_ospeed-via-APIs.patch \
18" 16"
19 17
20SRC_URI[md5sum] = "607a24c15bd2cb54e9328bfbbd3a1ae9" 18SRC_URI[md5sum] = "b2a032a47b8b89a18485697fa975154f"
21SRC_URI[sha256sum] = "e3561f808739383eb10fada1e5d4f26883f0311b34fd0af7837d0c95ef379251" 19SRC_URI[sha256sum] = "0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a"
22 20
23inherit autotools 21inherit autotools
24 22