[PATCH 1/3] iptables: upgrade 1.8.12 -> 1.8.13

[PATCH 1/3] iptables: upgrade 1.8.12 -> 1.8.13

[Yi Zhao]

ChangeLog:
https://www.netfilter.org/projects/iptables/files/changes-iptables-1.8.13.txt

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../iptables/{iptables_1.8.12.bb => iptables_1.8.13.bb}         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-extended/iptables/{iptables_1.8.12.bb => iptables_1.8.13.bb} (98%)

diff --git a/meta/recipes-extended/iptables/iptables_1.8.12.bb b/meta/recipes-extended/iptables/iptables_1.8.13.bb
similarity index 98%
rename from meta/recipes-extended/iptables/iptables_1.8.12.bb
rename to meta/recipes-extended/iptables/iptables_1.8.13.bb
index 928930d08c..003b1c1421 100644
--- a/meta/recipes-extended/iptables/iptables_1.8.12.bb
+++ b/meta/recipes-extended/iptables/iptables_1.8.13.bb
@@ -14,7 +14,7 @@ SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.xz \
            file://ip6tables.service \
            file://ip6tables.rules \
            "
-SRC_URI[sha256sum] = "8e7ee962601492de6503d171d4a948092ab18f89f111de72e3037c1f40cfb846"
+SRC_URI[sha256sum] = "1afcd33da9e8f913ace6a2126788162e207e26f5d5e29c6573c0e581ffc58b99"
 
 SYSTEMD_SERVICE:${PN} = "\
     iptables.service \
-- 
2.34.1

[PATCH 2/3] file: upgrade 5.46 -> 5.47

[Yi Zhao]

ChangeLog:
https://github.com/file/file/blob/FILE5_47/ChangeLog

Remove backport patches.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../file/{file_5.46.bb => file_5.47.bb}       |  4 +-
 ...0001-PR-579-net147-Fix-stack-overrun.patch | 33 -------
 ...-reset-previous-negative-offset-in-m.patch | 93 -------------------
 3 files changed, 1 insertion(+), 129 deletions(-)
 rename meta/recipes-devtools/file/{file_5.46.bb => file_5.47.bb} (91%)
 delete mode 100644 meta/recipes-devtools/file/files/0001-PR-579-net147-Fix-stack-overrun.patch
 delete mode 100644 meta/recipes-devtools/file/files/0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch

diff --git a/meta/recipes-devtools/file/file_5.46.bb b/meta/recipes-devtools/file/file_5.47.bb
similarity index 91%
rename from meta/recipes-devtools/file/file_5.46.bb
rename to meta/recipes-devtools/file/file_5.47.bb
index c035e0b11d..528ed49a12 100644
--- a/meta/recipes-devtools/file/file_5.46.bb
+++ b/meta/recipes-devtools/file/file_5.47.bb
@@ -12,11 +12,9 @@ DEPENDS = "file-replacement-native"
 DEPENDS:class-native = "bzip2-replacement-native"
 
 SRC_URI = "git://github.com/file/file.git;branch=master;protocol=https \
-           file://0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch \
-           file://0001-PR-579-net147-Fix-stack-overrun.patch \
            "
 
-SRCREV = "c5aa4f7f8d5063fb3c37ad57bf54bb67ec641a09"
+SRCREV = "7d20612996567ecedec7f5c58f7bf15c2cf42c19"
 
 inherit autotools update-alternatives
 
diff --git a/meta/recipes-devtools/file/files/0001-PR-579-net147-Fix-stack-overrun.patch b/meta/recipes-devtools/file/files/0001-PR-579-net147-Fix-stack-overrun.patch
deleted file mode 100644
index 57725b1c5f..0000000000
--- a/meta/recipes-devtools/file/files/0001-PR-579-net147-Fix-stack-overrun.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fc6b51aa67a11806c95363e1bec925d15b3a98a5 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Thu, 5 Dec 2024 18:35:40 +0000
-Subject: [PATCH] PR/579: net147: Fix stack overrun.
-
-Upstream-Status: Backport [https://github.com/file/file/commit/b3384a1fbfa1fee99986e5750ab8e700de4f24ad]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- src/readelf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/readelf.c b/src/readelf.c
-index fe4cf541..d209d86d 100644
---- a/src/readelf.c
-+++ b/src/readelf.c
-@@ -27,7 +27,7 @@
- #include "file.h"
- 
- #ifndef lint
--FILE_RCSID("@(#)$File: readelf.c,v 1.196 2024/11/11 15:49:11 christos Exp $")
-+FILE_RCSID("@(#)$File: readelf.c,v 1.197 2024/12/05 18:35:40 christos Exp $")
- #endif
- 
- #ifdef BUILTIN_ELF
-@@ -1726,7 +1726,7 @@ dophn_exec(struct magic_set *ms, int clazz, int swap, int fd, off_t off,
- 	Elf64_Phdr ph64;
- 	const char *linking_style;
- 	unsigned char nbuf[NBUFSIZE];
--	char interp[128];
-+	char interp[NBUFSIZE];
- 	ssize_t bufsize;
- 	size_t offset, align, need = 0;
- 	int pie = 0, dynamic = 0;
diff --git a/meta/recipes-devtools/file/files/0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch b/meta/recipes-devtools/file/files/0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch
deleted file mode 100644
index 7601e6dead..0000000000
--- a/meta/recipes-devtools/file/files/0001-Use-4-in-default-reset-previous-negative-offset-in-m.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From b310a0c2d3e4a1c12d579ad5c0266f1092a91340 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <christos@zoulas.com>
-Date: Wed, 27 Nov 2024 15:37:46 +0000
-Subject: [PATCH] Use +4 in default reset previous negative offset in magic in
- zip entry
-
-Upstream-Status: Backport [https://github.com/file/file/commit/b310a0c2d3e4a1c12d579ad5c0266f1092a91340]
-Signed-off-by: Alexander Kanavin <alex@linutronix.de>
----
- magic/Magdir/archive | 50 +++++++++++++++++++++++---------------------
- 1 file changed, 26 insertions(+), 24 deletions(-)
-
-diff --git a/magic/Magdir/archive b/magic/Magdir/archive
-index c8f440dc..b920f993 100644
---- a/magic/Magdir/archive
-+++ b/magic/Magdir/archive
-@@ -1,5 +1,5 @@
- #------------------------------------------------------------------------------
--# $File: archive,v 1.206 2024/11/26 19:39:14 christos Exp $
-+# $File: archive,v 1.207 2024/11/27 15:37:46 christos Exp $
- # archive:  file(1) magic for archive formats (see also "msdos" for self-
- #           extracting compressed archives)
- #
-@@ -1875,15 +1875,6 @@
- >>>>>-22	string	PK\005\006
- >>>>>>(-6.l-16)	string	APK\x20Sig\x20Block\x2042	\b, with APK Signing Block
- 
--# Keyman Compiled Package File (keyman.com)
--# https://help.keyman.com/developer/current-version/reference/file-types/kmp
--# Find start of central directory
-->>>(-6.l)	string		PK\001\002
--# Scan central directory for string 'kmp.json', will suffice for a
--# package containing about 150 files
-->>>>(-6.l)	search/9000	kmp.json	Keyman Compiled Package File
--!:mime	application/vnd.keyman.kmp+zip
--!:ext kmp
- 
- # Specialised zip formats which start with a member named 'mimetype'
- # (stored uncompressed, with no 'extra field') containing the file's MIME type.
-@@ -2123,25 +2114,36 @@
- #>30	search/100/b application/epub+zip	EPUB document
- #!:mime application/epub+zip
- 
--# Generic zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
--#   Next line excludes specialized formats:
-+# APK Signing Block
- >(26.s+30)	leshort	!0xcafe
- >>30	search/100/b !application/epub+zip
-->>>26    string          !\x8\0\0\0mimetype	Zip archive data
--!:mime	application/zip
-->>>>4	beshort		x			\b, at least
-->>>>4	use		zipversion
-->>>>4	beshort		x			to extract
-->>>>8	beshort		x			\b, compression method=
-->>>>8	use		zipcompression
-->>>>0x161	string		WINZIP		\b, WinZIP self-extracting
--# APK Signing Block
-->0	default	x
-->>-22	string	PK\005\006
-->>>(-6.l-16)	string	APK\x20Sig\x20Block\x2042	Android package (APK), with APK Signing Block
-+>>>26    string          !\x8\0\0\0mimetype
-+>>>>-22	string	PK\005\006
-+>>>>>(-6.l-16)	string	APK\x20Sig\x20Block\x2042	Android package (APK), with APK Signing Block
- !:mime	application/vnd.android.package-archive
- !:ext	apk
- 
-+# Keyman Compiled Package File (keyman.com)
-+# https://help.keyman.com/developer/current-version/reference/file-types/kmp
-+# Find start of central directory
-+>>>>>(-6.l)	string		PK\001\002
-+# Scan central directory for string 'kmp.json', will suffice for a
-+# package containing about 150 files
-+>>>>>>(-6.l)	search/9000	kmp.json	Keyman Compiled Package File
-+!:mime	application/vnd.keyman.kmp+zip
-+!:ext kmp
-+
-+# Generic zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
-+#   Next line excludes specialized formats:
-+>>>>+4	default		x
-+>>>>>4	beshort		x			Zip archive data, at least
-+!:mime	application/zip
-+>>>>>4	use		zipversion
-+>>>>>4	beshort		x			to extract
-+>>>>>8	beshort		x			\b, compression method=
-+>>>>>8	use		zipcompression
-+>>>>>0x161	string		WINZIP		\b, WinZIP self-extracting
-+
- # Zip archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
- 0	string		PK\005\006	Zip archive data (empty)
- !:mime application/zip
--- 
-2.39.5
-
-- 
2.34.1

[PATCH 3/3] libksba: upgrade 1.6.7 -> 1.6.8

[Yi Zhao]

ChangeLog:
https://github.com/gpg/libksba/blob/libksba-1.6.8/NEWS

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 .../libksba/libksba/ksba-add-pkgconfig-support.patch        | 6 +++---
 .../libksba/{libksba_1.6.7.bb => libksba_1.6.8.bb}          | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-support/libksba/{libksba_1.6.7.bb => libksba_1.6.8.bb} (95%)

diff --git a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
index 468fbd76f8..ef9066cd1f 100644
--- a/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
+++ b/meta/recipes-support/libksba/libksba/ksba-add-pkgconfig-support.patch
@@ -1,4 +1,4 @@
-From 46c0582d1087220e9404a14a851085b8f29773c4 Mon Sep 17 00:00:00 2001
+From 929f7670a6c1e9450f239ee374bb34ac13c13592 Mon Sep 17 00:00:00 2001
 From: Chen Qi <Qi.Chen@windriver.com>
 Date: Mon, 3 Dec 2012 18:17:31 +0800
 Subject: [PATCH] libksba: add pkgconfig support
@@ -15,7 +15,7 @@ Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
  1 file changed, 5 insertions(+), 88 deletions(-)
 
 diff --git a/src/ksba.m4 b/src/ksba.m4
-index 80f0d38..8f8761a 100644
+index 835cacb..bc729a9 100644
 --- a/src/ksba.m4
 +++ b/src/ksba.m4
 @@ -107,39 +107,7 @@ dnl this features allows to prevent build against newer versions of libksba
@@ -45,7 +45,7 @@ index 80f0d38..8f8761a 100644
 -  fi
 -
 -  use_gpgrt_config=""
--  if test x"$GPGRT_CONFIG" != x -a "$GPGRT_CONFIG" != "no"; then
+-  if test x"$GPGRT_CONFIG" != x && test "$GPGRT_CONFIG" != "no"; then
 -    if $GPGRT_CONFIG ksba --exists; then
 -      KSBA_CONFIG="$GPGRT_CONFIG ksba"
 -      AC_MSG_NOTICE([Use gpgrt-config as ksba-config])
diff --git a/meta/recipes-support/libksba/libksba_1.6.7.bb b/meta/recipes-support/libksba/libksba_1.6.8.bb
similarity index 95%
rename from meta/recipes-support/libksba/libksba_1.6.7.bb
rename to meta/recipes-support/libksba/libksba_1.6.8.bb
index 4b9e22538c..205704917e 100644
--- a/meta/recipes-support/libksba/libksba_1.6.7.bb
+++ b/meta/recipes-support/libksba/libksba_1.6.8.bb
@@ -28,7 +28,7 @@ SRC_URI = "${GNUPG_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://run-ptest \
            "
 
-SRC_URI[sha256sum] = "cf72510b8ebb4eb6693eef765749d83677a03c79291a311040a5bfd79baab763"
+SRC_URI[sha256sum] = "0f4510f1c7a679c3545990a31479f391ad45d84e039176309d42f80cf41743f5"
 
 do_configure:prepend () {
 	# Else these could be used in preference to those in aclocal-copy
-- 
2.34.1