From a0bf431987cac4ae4d0e15c08eafdd10116a6ea4 Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Mon, 2 Jun 2025 22:15:34 +0200
Subject: [PATCH] New version 10.3

---
 .gitignore                       |  1 +
 0006-s390x-endianness-test.patch | 16 ++++++++++++++++
 frr.spec                         |  9 +++++++--
 sources                          |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 0006-s390x-endianness-test.patch

diff --git a/.gitignore b/.gitignore
index 8ea72dd..7b4c748 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /frr-10.1.tar.gz
 /frr-10.2.tar.gz
 /frr-10.2.1.tar.gz
+/frr-10.3.tar.gz
diff --git a/0006-s390x-endianness-test.patch b/0006-s390x-endianness-test.patch
new file mode 100644
index 0000000..2adbadb
--- /dev/null
+++ b/0006-s390x-endianness-test.patch
@@ -0,0 +1,16 @@
+diff --git a/tests/lib/northbound/test_oper_data.c b/tests/lib/northbound/test_oper_data.c
+index 0b334c6..f66b78d 100644
+--- a/tests/lib/northbound/test_oper_data.c
++++ b/tests/lib/northbound/test_oper_data.c
+@@ -253,9 +253,10 @@ static enum nb_error frr_test_module_c2cont_c2value_get(const struct nb_node *nb
+ 							struct lyd_node *parent)
+ {
+ 	const struct lysc_node *snode = nb_node->snode;
+-	uint32_t value = 0xAB010203;
++	uint32_t value = htole32(0xAB010203);
+ 	LY_ERR err;
+ 
++	/* Note that this api expects 'value' to be in little-endian form */
+ 	err = lyd_new_term_bin(parent, snode->module, snode->name, &value, sizeof(value),
+ 			       LYD_NEW_PATH_UPDATE, NULL);
+ 	assert(err == LY_SUCCESS);
diff --git a/frr.spec b/frr.spec
index b2d034d..f7dc404 100644
--- a/frr.spec
+++ b/frr.spec
@@ -8,8 +8,8 @@
 %bcond selinux 1
 
 Name:           frr
-Version:        10.2.1
-Release:        5%{?dist}
+Version:        10.3
+Release:        1%{?dist}
 Summary:        Routing daemon
 License:        GPL-2.0-or-later AND ISC AND LGPL-2.0-or-later AND BSD-2-Clause AND BSD-3-Clause AND (GPL-2.0-or-later  OR ISC) AND MIT
 URL:            http://www.frrouting.org
@@ -26,6 +26,7 @@ Patch0002:      0002-enable-openssl.patch
 Patch0003:      0003-disable-eigrp-crypto.patch
 Patch0004:      0004-fips-mode.patch
 Patch0005:      0005-remove-grpc-test.patch
+Patch0006:      0006-s390x-endianness-test.patch
 
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 %if %{undefined fc40} && %{undefined fc41}
@@ -117,6 +118,7 @@ sed -r -i 's/(AX_CXX_COMPILE_STDCXX\(\[)11(\])/\117\2/' configure.ac
 %build
 #hopefully just temporary due to rhbz#2327314
 export LDFLAGS="%{build_ldflags} -Wl,-z,noseparate-code"
+export CFLAGS="%{optflags} -DINET_NTOP_NO_OVERRIDE"
 autoreconf -ivf
 
 %configure \
@@ -282,6 +284,9 @@ rm tests/lib/*grpc*
 %endif
 
 %changelog
+* Mon Jun 02 2025 Michal Ruprich <mruprich@redhat.com> - 10.3
+- New version 10.3
+
 * Tue Feb 25 2025 Benjamin A. Beasley <code@musicinmybrain.net> - 10.2.1-5
 - Rebuilt for abseil-cpp-20250127.0
 
diff --git a/sources b/sources
index f8cae9d..c2675e2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (frr-10.2.1.tar.gz) = c49b0afb7b9a923b65bdcc4d4a6868b08eaecc4620d251f18648e0a5d65fb28fef4af382e4d3a74c27f090eaeab02a649672845c29524d7339c1a1a1e23e14c2
+SHA512 (frr-10.3.tar.gz) = 6ea651f20c3957f5a7523e7cb316327ac5914154a31ed92e8ac5bb55e75eab2e1da3ddf255de5e669906946caa5c82b78bb769c3869e2f800f5bd3782963198c
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d