Skip to contentSkip to conversation

socat: upgrade 1.7.3.4 ->1.7.4.0

PATCH In review Wang Mingyu 2 participants 2 messages Jan 12, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 socat: upgrade 1.7.3.4 ->1.7.4.0

Add 0001-Fix-bug-for-length-of-int64-and-uint64-in-arch32.patch to fix bug for length of int64 and uint64 in arch32.

---
 ...length-of-int64-and-uint64-in-arch32.patch | 40 +++++++++++++++++++
 .../{socat_1.7.3.4.bb => socat_1.7.4.0.bb}    |  7 ++--
 2 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-connectivity/socat/socat/0001-Fix-bug-for-length-of-int64-and-uint64-in-arch32.patch
 rename meta/recipes-connectivity/socat/{socat_1.7.3.4.bb => socat_1.7.4.0.bb} (86%)
meta/recipes-connectivity/socat/socat/0001-Fix-bug-for-length-of-int64-and-uint64-in-arch32.patch new file +40 -0
new file mode 100644
index 0000000000..5b7d3692d7
@@ -0,0 +1,40 @@
+From 5796ae42979a9fcee83d94bd79c7d9f78e95d90e Mon Sep 17 00:00:00 2001
+From: Wang Mingyu <[email protected]>
+Date: Fri, 8 Jan 2021 19:44:03 +0900
+Subject: [PATCH] Fix bug for length of int64 and uint64 in arch32.
+
+The length of int64 and uint64 is set incorrectly,
+error message "out of range" will be reported
+
+Upsteam-Status: Pending
+
+Signed-off-by: Wang Mingyu <[email protected]>
+---
+ compat.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/compat.h b/compat.h
+index 3bc010d..5a3ed08 100644
+--- a/compat.h
++++ b/compat.h
+@@ -134,6 +134,8 @@ typedef int sig_atomic_t;
+ #    define F_uint64_t "%u"
+ #  elif HAVE_BASIC_UINT64_T==6
+ #    define F_uint64_t "%lu"
++#  elif HAVE_BASIC_UINT64_T==8
++#    define F_uint64_t "%llu"
+ #  else
+ #    error "HAVE_BASIC_UINT64_T is out of range:" HAVE_BASIC_UINT64_T
+ #  endif
+@@ -176,6 +178,8 @@ typedef int sig_atomic_t;
+ #    define F_int64_t "%d"
+ #  elif HAVE_BASIC_INT64_T==5
+ #    define F_int64_t "%l"
++#  elif HAVE_BASIC_INT64_T==7
++#    define F_int64_t "%lld"
+ #  else
+ #    error "HAVE_BASIC_INT64_T is out of range:" HAVE_BASIC_INT64_T
+ #  endif
+-- 
+2.25.1
+
meta/recipes-connectivity/socat/socat_1.7.4.0.bb renamed from meta/recipes-connectivity/socat/socat_1.7.3.4.bb +4 -3
similarity index 86%
rename from meta/recipes-connectivity/socat/socat_1.7.3.4.bb
rename to meta/recipes-connectivity/socat/socat_1.7.4.0.bb
index f3f569d262..7ba900ad9d 100644
@@ -7,13 +7,14 @@ SECTION = "console/network"
 
 LICENSE = "GPL-2.0-with-OpenSSL-exception"
 LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
-                    file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f"
+                    file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86"
 
 SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \
+           file://0001-Fix-bug-for-length-of-int64-and-uint64-in-arch32.patch \
 "
 
-SRC_URI[md5sum] = "3cca4f8cd9d2d1caabd9cc099451bac9"
-SRC_URI[sha256sum] = "972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc"
+SRC_URI[md5sum] = "334c7f3ab56a254226055ccd0ada58ff"
+SRC_URI[sha256sum] = "c8273b30e933be0ad8d509ae75e19ecedf1a60081bb942ed36f2dd8950de3d58"
 
 inherit autotools
 
Signature · 1 line
2.25.1
#1 lore raw
Quoted 6 lines · Wang Mingyu

LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
- file://README;beginline=257;endline=287;md5=338c05eadd013872abb1d6e198e10a3f" + file://README;beginline=257;endline=287;md5=82520b052f322ac2b5b3dfdc7c7eea86"

This change needs to be explained. Say something like:

License-Update: copyright years updated

or similar in the commit message.

'devtool upgrade' will put the diff of the license snippet to the updated recipe by the way, which you can then edit out and summarize in the commit.

Alex

Alex