iproute2-selinux 6.2.0-2 update

5 files changed, 53 insertions, 72 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e1386052d4a4..75937687d619 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = iproute2-selinux
 	pkgdesc = IP Routing Utilities with SELinux support
-	pkgver = 6.1.0
-	pkgrel = 5
+	pkgver = 6.2.0
+	pkgrel = 2
 	url = https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
 	arch = x86_64
 	arch = aarch64
@@ -18,7 +18,7 @@ pkgbase = iproute2-selinux
 	optdepends = linux-atm: ATM support
 	optdepends = python: for routel
 	provides = iproute
-	provides = iproute2=6.1.0-5
+	provides = iproute2=6.2.0-2
 	conflicts = iproute2
 	options = staticlibs
 	backup = etc/iproute2/bpf_pinning
@@ -30,16 +30,16 @@ pkgbase = iproute2-selinux
 	backup = etc/iproute2/rt_realms
 	backup = etc/iproute2/rt_scopes
 	backup = etc/iproute2/rt_tables
-	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.1.0.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.1.0.tar.sign
+	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.2.0.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.2.0.tar.sign
 	source = 0001-make-iproute2-fhs-compliant.patch
-	source = fix_overlapping_buffers.patch
-	source = bdb5.3.patch
+	source = 0002-bdb-5-3.patch
+	source = 0003-tc-add-missing-separator.patch
 	validpgpkeys = 9F6FC345B05BE7E766B83C8F80A77F6095CDE47E
-	sha256sums = 5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab
+	sha256sums = 4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62
 	sha256sums = SKIP
 	sha256sums = 758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d
-	sha256sums = 7d2fb8ba06f3b73a8fa3ab673b8f1ad41c0e4fd85e3c31a8d4002a1b074ec1ae
-	sha256sums = 908de44ee99bf78669e7c513298fc2a22ca9d7e816a8f99788b1e9b091035cf4
+	sha256sums = 611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6
+	sha256sums = 4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382
 
 pkgname = iproute2-selinux
diff --git a/bdb5.3.patch b/0002-bdb-5-3.patch
index 82c0694a7a45..a1fad8edf7c2 100644
--- a/bdb5.3.patch
+++ b/0002-bdb-5-3.patch
@@ -1,5 +1,5 @@
---- aaa/configure	2022-12-13 01:08:01.607329918 +0100
-+++ bbb/configure	2022-12-13 01:08:58.083857594 +0100
+--- a/configure	2022-12-13 01:08:01.607329918 +0100
++++ b/configure	2022-12-13 01:08:58.083857594 +0100
 @@ -433,7 +433,7 @@
  	return 0;
  }
@@ -9,8 +9,8 @@
  	echo "HAVE_BERKELEY_DB:=y" >>$CONFIG
  	echo "yes"
      else
---- aaa/misc/Makefile	2022-12-13 12:21:04.709608051 +0100
-+++ bbb/misc/Makefile	2022-12-13 12:21:19.966264418 +0100
+--- a/misc/Makefile	2022-12-13 12:21:04.709608051 +0100
++++ b/misc/Makefile	2022-12-13 12:21:19.966264418 +0100
 @@ -25,7 +25,7 @@
  	$(QUIET_CC)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LDLIBS) -lm
 
diff --git a/0003-tc-add-missing-separator.patch b/0003-tc-add-missing-separator.patch
new file mode 100644
index 000000000000..6d2e47238948
--- /dev/null
+++ b/0003-tc-add-missing-separator.patch
@@ -0,0 +1,29 @@
+From 095b223e9b46b07b29875b4ce5110763a7636b8a Mon Sep 17 00:00:00 2001
+From: Christian Hesse <mail@eworm.de>
+Date: Thu, 23 Feb 2023 11:04:45 +0100
+Subject: [PATCH 1/1] tc: add missing separator
+
+This is missing a separator, that was removed in commit
+010a8388aea11e767ba3a2506728b9ad9760df0e. Let's add it back.
+
+Signed-off-by: Christian Hesse <mail@eworm.de>
+---
+ tc/tc_class.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tc/tc_class.c b/tc/tc_class.c
+index c1feb009..096fa2ec 100644
+--- a/tc/tc_class.c
++++ b/tc/tc_class.c
+@@ -356,7 +356,7 @@ int print_class(struct nlmsghdr *n, void *arg)
+ 		print_string(PRINT_ANY, "parent", "parent %s ", abuf);
+ 	}
+ 	if (t->tcm_info)
+-		print_0xhex(PRINT_ANY, "leaf", "leaf %x", t->tcm_info>>16);
++		print_0xhex(PRINT_ANY, "leaf", "leaf %x: ", t->tcm_info>>16);
+ 
+ 	q = get_qdisc_kind(RTA_DATA(tb[TCA_KIND]));
+ 	if (tb[TCA_OPTIONS]) {
+-- 
+2.39.2
+
diff --git a/PKGBUILD b/PKGBUILD
index 5b0bbb114c5a..3c997b6b138d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 # If you want to help keep it up to date, please open a Pull Request there.
 
 pkgname=iproute2-selinux
-pkgver=6.1.0
-pkgrel=5
+pkgver=6.2.0
+pkgrel=2
 pkgdesc='IP Routing Utilities with SELinux support'
 arch=('x86_64' 'aarch64')
 license=('GPL2')
@@ -35,13 +35,13 @@ options=('staticlibs')
 validpgpkeys=('9F6FC345B05BE7E766B83C8F80A77F6095CDE47E') # Stephen Hemminger
 source=("https://www.kernel.org/pub/linux/utils/net/${pkgname/-selinux}/${pkgname/-selinux}-${pkgver}.tar."{xz,sign}
         '0001-make-iproute2-fhs-compliant.patch'
-        'fix_overlapping_buffers.patch'
-        'bdb5.3.patch')
-sha256sums=('5ce12a0fec6b212725ef218735941b2dab76244db7e72646a76021b0537b43ab'
+        '0002-bdb-5-3.patch'
+        '0003-tc-add-missing-separator.patch')
+sha256sums=('4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62'
             'SKIP'
             '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d'
-            '7d2fb8ba06f3b73a8fa3ab673b8f1ad41c0e4fd85e3c31a8d4002a1b074ec1ae'
-            '908de44ee99bf78669e7c513298fc2a22ca9d7e816a8f99788b1e9b091035cf4')
+            '611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6'
+            '4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382')
 
 prepare() {
   cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
@@ -50,12 +50,10 @@ prepare() {
   patch -Np1 -i "${srcdir}"/0001-make-iproute2-fhs-compliant.patch
 
   # use Berkeley DB 5.3
-  patch -Np1 -i "${srcdir}"/bdb5.3.patch
+  patch -Np1 -i "${srcdir}"/0002-bdb-5-3.patch
 
-  # fix overlapping buffers leading to cut off IPv6 adresses since glibc 2.37
-  # See FS#77451 and
-  # https://lore.kernel.org/netdev/0011AC38-4823-4D0A-8580-B108D08959C2@gentoo.org/T/#u
-  patch -Np1 -i "${srcdir}"/fix_overlapping_buffers.patch
+  # tc: add missing separator
+  patch -Np1 -i "${srcdir}"/0003-tc-add-missing-separator.patch
 
   # do not treat warnings as errors
   sed -i 's/-Werror//' Makefile
diff --git a/fix_overlapping_buffers.patch b/fix_overlapping_buffers.patch
deleted file mode 100644
index 44706131c410..000000000000
--- a/fix_overlapping_buffers.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Fix overlapping buffers passed to strncpy which is UB. format_host_rta_r writes
-to the buffer passed to it, so hostname (derived from b1) & b1 partly overlap.
-
-This gets worse with sys-libs/glibc-2.37 where the ip route output can be truncated,
-but it was UB anyway and you can see it occurring w/ glibc-2.36.
-
-Bug: https://lore.kernel.org/netdev/0011AC38-4823-4D0A-8580-B108D08959C2@gentoo.org/T/#u
-Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30112
-Thanks-to: Doug Freed <dwfreed@mtu.edu>
-Signed-off-by: Sam James <sam@gentoo.org>
----
- ip/iproute.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/ip/iproute.c b/ip/iproute.c
-index 0bab0fdf..a7cd9543 100644
---- a/ip/iproute.c
-+++ b/ip/iproute.c
-@@ -748,6 +748,7 @@ int print_route(struct nlmsghdr *n, void *arg)
- 	int ret;
-
- 	SPRINT_BUF(b1);
-+	SPRINT_BUF(b2);
-
- 	if (n->nlmsg_type != RTM_NEWROUTE && n->nlmsg_type != RTM_DELROUTE) {
- 		fprintf(stderr, "Not a route: %08x %08x %08x\n",
-@@ -809,7 +810,7 @@ int print_route(struct nlmsghdr *n, void *arg)
- 				 r->rtm_dst_len);
- 		} else {
- 			const char *hostname = format_host_rta_r(family, tb[RTA_DST],
--					  b1, sizeof(b1));
-+					  b2, sizeof(b2));
- 			if (hostname)
- 				strncpy(b1, hostname, sizeof(b1) - 1);
- 		}
-@@ -832,7 +833,7 @@ int print_route(struct nlmsghdr *n, void *arg)
- 				 r->rtm_src_len);
- 		} else {
- 			const char *hostname = format_host_rta_r(family, tb[RTA_SRC],
--					  b1, sizeof(b1));
-+					  b2, sizeof(b2));
- 			if (hostname)
- 				strncpy(b1, hostname, sizeof(b1) - 1);
- 		}
---
-2.39.1