From 2c51c702a3036f641d34d00123d359fc34e96cf7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 19 Jan 2022 11:40:52 +0100 Subject: socat: upgrade 1.7.4.2 -> 1.7.4.3 Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...c-check-getprotobynumber_r-with-AC_TRY_LI.patch | 35 ++++++++++++++ meta/recipes-connectivity/socat/socat_1.7.4.2.bb | 52 --------------------- meta/recipes-connectivity/socat/socat_1.7.4.3.bb | 53 ++++++++++++++++++++++ 3 files changed, 88 insertions(+), 52 deletions(-) create mode 100644 meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch delete mode 100644 meta/recipes-connectivity/socat/socat_1.7.4.2.bb create mode 100644 meta/recipes-connectivity/socat/socat_1.7.4.3.bb (limited to 'meta/recipes-connectivity/socat') diff --git a/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch b/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch new file mode 100644 index 0000000000..fbfb0816dd --- /dev/null +++ b/meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch @@ -0,0 +1,35 @@ +From d67d6b4f981db9612d808bd723176a1d2996d53a Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 17 Jan 2022 13:21:32 +0100 +Subject: [PATCH] configure.ac: check getprotobynumber_r with AC_TRY_LINK + +AC_TRY_COMPILE won't error out if the function is altogether absent +(e.g. on linux musl C library), the test needs to link all the way. + +Upstream-Status: Submitted [via email to socat@dest-unreach.org] +Signed-off-by: Alexander Kanavin +--- + configure.ac | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d4acc9e..973a7f2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -137,13 +137,13 @@ AC_MSG_RESULT($sc_cv_have_prototype_hstrerror) + # getprotobynumber_r() is not standardized + AC_MSG_CHECKING(for getprotobynumber_r() variant) + AC_CACHE_VAL(sc_cv_getprotobynumber_r, +-[AC_TRY_COMPILE([#include ++[AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024,NULL);], + [sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL,1024);], + [sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris], +- [AC_TRY_COMPILE([#include ++ [AC_TRY_LINK([#include + #include ],[getprotobynumber_r(1,NULL,NULL);], + [sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX], + diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.2.bb b/meta/recipes-connectivity/socat/socat_1.7.4.2.bb deleted file mode 100644 index 0edde6a2e4..0000000000 --- a/meta/recipes-connectivity/socat/socat_1.7.4.2.bb +++ /dev/null @@ -1,52 +0,0 @@ -SUMMARY = "Multipurpose relay for bidirectional data transfer" -DESCRIPTION = "Socat is a relay for bidirectional data \ -transfer between two independent data channels." -HOMEPAGE = "http://www.dest-unreach.org/socat/" - -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" - -SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ -" - -SRC_URI[sha256sum] = "6690a9f9990457b505097a272bbf2cbf4cc35576176f76646e3524b0e91c1763" - -inherit autotools - -EXTRA_AUTORECONF += "--exclude=autoheader" - -EXTRA_OECONF += "ac_cv_have_z_modifier=yes \ - ac_cv_header_bsd_libutil_h=no \ - sc_cv_termios_ispeed=no \ - ${TERMBITS_SHIFTS} \ -" - -TERMBITS_SHIFTS ?= "sc_cv_sys_crdly_shift=9 \ - sc_cv_sys_tabdly_shift=11 \ - sc_cv_sys_csize_shift=4" - -TERMBITS_SHIFTS:powerpc = "sc_cv_sys_crdly_shift=12 \ - sc_cv_sys_tabdly_shift=10 \ - sc_cv_sys_csize_shift=8" - -TERMBITS_SHIFTS:powerpc64 = "sc_cv_sys_crdly_shift=12 \ - sc_cv_sys_tabdly_shift=10 \ - sc_cv_sys_csize_shift=8" - -PACKAGECONFIG:class-target ??= "tcp-wrappers readline openssl" -PACKAGECONFIG ??= "readline openssl" -PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" -PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" -PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" - -CFLAGS += "-fcommon" - -do_install:prepend () { - mkdir -p ${D}${bindir} - install -d ${D}${bindir} ${D}${mandir}/man1 -} - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-connectivity/socat/socat_1.7.4.3.bb b/meta/recipes-connectivity/socat/socat_1.7.4.3.bb new file mode 100644 index 0000000000..a4a0a8933e --- /dev/null +++ b/meta/recipes-connectivity/socat/socat_1.7.4.3.bb @@ -0,0 +1,53 @@ +SUMMARY = "Multipurpose relay for bidirectional data transfer" +DESCRIPTION = "Socat is a relay for bidirectional data \ +transfer between two independent data channels." +HOMEPAGE = "http://www.dest-unreach.org/socat/" + +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" + +SRC_URI = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2 \ + file://0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch \ + " + +SRC_URI[sha256sum] = "d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007" + +inherit autotools + +EXTRA_AUTORECONF += "--exclude=autoheader" + +EXTRA_OECONF += "ac_cv_have_z_modifier=yes \ + ac_cv_header_bsd_libutil_h=no \ + sc_cv_termios_ispeed=no \ + ${TERMBITS_SHIFTS} \ +" + +TERMBITS_SHIFTS ?= "sc_cv_sys_crdly_shift=9 \ + sc_cv_sys_tabdly_shift=11 \ + sc_cv_sys_csize_shift=4" + +TERMBITS_SHIFTS:powerpc = "sc_cv_sys_crdly_shift=12 \ + sc_cv_sys_tabdly_shift=10 \ + sc_cv_sys_csize_shift=8" + +TERMBITS_SHIFTS:powerpc64 = "sc_cv_sys_crdly_shift=12 \ + sc_cv_sys_tabdly_shift=10 \ + sc_cv_sys_csize_shift=8" + +PACKAGECONFIG:class-target ??= "tcp-wrappers readline openssl" +PACKAGECONFIG ??= "readline openssl" +PACKAGECONFIG[tcp-wrappers] = "--enable-libwrap,--disable-libwrap,tcp-wrappers" +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" +PACKAGECONFIG[openssl] = "--enable-openssl,--disable-openssl,openssl" + +CFLAGS += "-fcommon" + +do_install:prepend () { + mkdir -p ${D}${bindir} + install -d ${D}${bindir} ${D}${mandir}/man1 +} + +BBCLASSEXTEND = "native nativesdk" -- cgit 1.2.3-korg