iproute2-selinux 6.3.0-2 update

3 files changed, 9 insertions, 45 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 75937687d619..a89553538ddb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = iproute2-selinux
 	pkgdesc = IP Routing Utilities with SELinux support
-	pkgver = 6.2.0
+	pkgver = 6.3.0
 	pkgrel = 2
 	url = https://git.kernel.org/pub/scm/network/iproute2/iproute2.git
 	arch = x86_64
@@ -18,7 +18,7 @@ pkgbase = iproute2-selinux
 	optdepends = linux-atm: ATM support
 	optdepends = python: for routel
 	provides = iproute
-	provides = iproute2=6.2.0-2
+	provides = iproute2=6.3.0-2
 	conflicts = iproute2
 	options = staticlibs
 	backup = etc/iproute2/bpf_pinning
@@ -30,16 +30,14 @@ 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.2.0.tar.xz
-	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.2.0.tar.sign
+	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.3.0.tar.xz
+	source = https://www.kernel.org/pub/linux/utils/net/iproute2/iproute2-6.3.0.tar.sign
 	source = 0001-make-iproute2-fhs-compliant.patch
 	source = 0002-bdb-5-3.patch
-	source = 0003-tc-add-missing-separator.patch
 	validpgpkeys = 9F6FC345B05BE7E766B83C8F80A77F6095CDE47E
-	sha256sums = 4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62
+	sha256sums = dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732
 	sha256sums = SKIP
 	sha256sums = 758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d
 	sha256sums = 611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6
-	sha256sums = 4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382
 
 pkgname = iproute2-selinux
diff --git a/0003-tc-add-missing-separator.patch b/0003-tc-add-missing-separator.patch
deleted file mode 100644
index 6d2e47238948..000000000000
--- a/0003-tc-add-missing-separator.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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 3c997b6b138d..33dbb1cc98d4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 # If you want to help keep it up to date, please open a Pull Request there.
 
 pkgname=iproute2-selinux
-pkgver=6.2.0
+pkgver=6.3.0
 pkgrel=2
 pkgdesc='IP Routing Utilities with SELinux support'
 arch=('x86_64' 'aarch64')
@@ -35,13 +35,11 @@ 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'
-        '0002-bdb-5-3.patch'
-        '0003-tc-add-missing-separator.patch')
-sha256sums=('4d72730200ec5b2aabaa1a2f20553c6748292f065d9a154c7d5e22559df9fd62'
+        '0002-bdb-5-3.patch')
+sha256sums=('dfb2a98db96e7a653cffc6693335a1a466e29a34b6ac528be48f35e1d2766732'
             'SKIP'
             '758b82bd61ed7512d215efafd5fab5ae7a28fbfa6161b85e2ce7373285e56a5d'
-            '611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6'
-            '4732160a99a5ded4357c3eca8d0f67108296c957986488c7d02b6e7f08400382')
+            '611c1ad7946aab226a5f4059922d9430f51b3377e33911427f8fdf7f7d31f7d6')
 
 prepare() {
   cd "${srcdir}/${pkgname/-selinux}-${pkgver}"
@@ -52,9 +50,6 @@ prepare() {
   # use Berkeley DB 5.3
   patch -Np1 -i "${srcdir}"/0002-bdb-5-3.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