mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

socat: upgrade 1.7.4.3 -> 1.7.4.4

Browse Source 
0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
removed since it's included in 1.7.4.4

(From OE-Core rev: c00e9d66f0b8449ff1bf24546f232345eb6feebd)

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
2022-11-03 13:32:51 +08:00
committed by Richard Purdie
parent 3883526667
commit 1d4fdea68a
2 changed files with 2 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-connectivity/socat/socat/0001-configure.ac-check-getprotobynumber_r-with-AC_TRY_LI.patch
View File

@@ -1,35 +0,0 @@
From d67d6b4f981db9612d808bd723176a1d2996d53a Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex@linutronix.de>
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 <alex@linutronix.de>
---
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 <stddef.h>
+[AC_TRY_LINK([#include <stddef.h>
#include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024,NULL);],
[sc_cv_getprotobynumber_r=1; tmp_bynum_variant=Linux],
- [AC_TRY_COMPILE([#include <stddef.h>
+ [AC_TRY_LINK([#include <stddef.h>
#include <netdb.h>],[getprotobynumber_r(1,NULL,NULL,1024);],
[sc_cv_getprotobynumber_r=2; tmp_bynum_variant=Solaris],
- [AC_TRY_COMPILE([#include <stddef.h>
+ [AC_TRY_LINK([#include <stddef.h>
#include <netdb.h>],[getprotobynumber_r(1,NULL,NULL);],
[sc_cv_getprotobynumber_r=3; tmp_bynum_variant=AIX],

6
meta/recipes-connectivity/socat/socat_1.7.4.3.bb → meta/recipes-connectivity/socat/socat_1.7.4.4.bb
View File

@@ -9,11 +9,9 @@ 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 = "http://www.dest-unreach.org/socat/download/socat-${PV}.tar.bz2"
SRC_URI[sha256sum] = "d47318104415077635119dfee44bcfb41de3497374a9a001b1aff6e2f0858007"
SRC_URI[sha256sum] = "fbd42bd2f0e54a3af6d01bdf15385384ab82dbc0e4f1a5e153b3e0be1b6380ac"
inherit autotools