summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex@linutronix.de>2021-09-08 20:01:18 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-11 18:41:37 +0100
commit2d4bdfdff6ac31afee1cb33c84470b11e689fc3c (patch)
treeb32e6f5faa69b2715709dffab9ad22b342adba89
parent8bd18c0960b3f14796da70ecd62cda1f6b899dca (diff)
downloadpoky-2d4bdfdff6ac31afee1cb33c84470b11e689fc3c.tar.gz
inetutils: update 2.1 -> 2.2
(From OE-Core rev: c5095396909e6b1450ba2020472b5eb7d14a4751) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch12
-rw-r--r--meta/recipes-connectivity/inetutils/inetutils_2.2.bb (renamed from meta/recipes-connectivity/inetutils/inetutils_2.1.bb)2
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch b/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
index 7d5c087c9d..2343c03cb4 100644
--- a/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
+++ b/meta/recipes-connectivity/inetutils/inetutils/inetutils-only-check-pam_appl.h-when-pam-enabled.patch
@@ -1,4 +1,4 @@
1From 684e45b34a33186bb17bcee0b01814c549a60bf6 Mon Sep 17 00:00:00 2001 1From cc66e842e037fba9f06761f942abe5c4856492b8 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com> 2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 6 Mar 2019 09:36:11 -0500 3Date: Wed, 6 Mar 2019 09:36:11 -0500
4Subject: [PATCH] inetutils: Import version 1.9.4 4Subject: [PATCH] inetutils: Import version 1.9.4
@@ -15,10 +15,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com>
15 1 file changed, 14 insertions(+), 1 deletion(-) 15 1 file changed, 14 insertions(+), 1 deletion(-)
16 16
17diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
18index 86136fb..b220319 100644 18index 5e16c3a..18510a8 100644
19--- a/configure.ac 19--- a/configure.ac
20+++ b/configure.ac 20+++ b/configure.ac
21@@ -183,6 +183,19 @@ AC_SUBST(LIBUTIL) 21@@ -182,6 +182,19 @@ AC_SUBST(LIBUTIL)
22 22
23 # See if we have libpam.a. Investigate PAM versus Linux-PAM. 23 # See if we have libpam.a. Investigate PAM versus Linux-PAM.
24 if test "$with_pam" = yes ; then 24 if test "$with_pam" = yes ; then
@@ -38,12 +38,12 @@ index 86136fb..b220319 100644
38 AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl) 38 AC_CHECK_LIB(dl, dlopen, LIBDL=-ldl)
39 AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam) 39 AC_CHECK_LIB(pam, pam_authenticate, LIBPAM=-lpam)
40 if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then 40 if test "$ac_cv_lib_pam_pam_authenticate" = yes ; then
41@@ -620,7 +633,7 @@ AC_HEADER_DIRENT 41@@ -617,7 +630,7 @@ AC_HEADER_DIRENT
42 AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h errno.h fcntl.h features.h \ 42 AC_CHECK_HEADERS([arpa/nameser.h arpa/tftp.h fcntl.h features.h \
43 glob.h memory.h netinet/ether.h netinet/in_systm.h \ 43 glob.h memory.h netinet/ether.h netinet/in_systm.h \
44 netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \ 44 netinet/ip.h netinet/ip_icmp.h netinet/ip_var.h \
45- security/pam_appl.h shadow.h \ 45- security/pam_appl.h shadow.h \
46+ shadow.h \ 46+ shadow.h \
47 stdarg.h stdlib.h string.h stropts.h sys/tty.h \ 47 stropts.h sys/tty.h \
48 sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \ 48 sys/utsname.h sys/ptyvar.h sys/msgbuf.h sys/filio.h \
49 sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \ 49 sys/ioctl_compat.h sys/cdefs.h sys/stream.h sys/mkdev.h \
diff --git a/meta/recipes-connectivity/inetutils/inetutils_2.1.bb b/meta/recipes-connectivity/inetutils/inetutils_2.2.bb
index 45b88b1d7f..eaed3eabbd 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_2.1.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_2.2.bb
@@ -10,7 +10,7 @@ LICENSE = "GPLv3"
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7" 11LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7"
12 12
13SRC_URI[sha256sum] = "01b9a4bc73a47e63f6e8a07b76122d9ad2a2e46ebf14870e9c91d660b5647a22" 13SRC_URI[sha256sum] = "d547f69172df73afef691a0f7886280fd781acea28def4ff4b4b212086a89d80"
14SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \ 14SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.xz \
15 file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \ 15 file://inetutils-1.8-0001-printf-parse-pull-in-features.h-for-__GLIBC__.patch \
16 file://inetutils-1.8-0003-wchar.patch \ 16 file://inetutils-1.8-0003-wchar.patch \