From e8b6134e76fd939e7a735e4fe95ac9fc9daf8a07 Mon Sep 17 00:00:00 2001
From: Michal Ruprich <mruprich@redhat.com>
Date: Mon, 28 Jul 2025 14:07:39 +0200
Subject: [PATCH] New version 10.4.0

---
 .gitignore                       |  1 +
 0002-enable-openssl.patch        |  2 +-
 0006-s390x-endianness-test.patch | 16 ----------------
 frr.spec                         |  8 +++++---
 sources                          |  2 +-
 5 files changed, 8 insertions(+), 21 deletions(-)
 delete mode 100644 0006-s390x-endianness-test.patch

diff --git a/.gitignore b/.gitignore
index 7b4c748..f5d62c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /frr-10.2.tar.gz
 /frr-10.2.1.tar.gz
 /frr-10.3.tar.gz
+/frr-10.4.0.tar.gz
diff --git a/0002-enable-openssl.patch b/0002-enable-openssl.patch
index 5101f06..928609f 100644
--- a/0002-enable-openssl.patch
+++ b/0002-enable-openssl.patch
@@ -24,8 +24,8 @@ index 0b7af18..0533e24 100644
  	lib/log_vty.h \
 -	lib/md5.h \
  	lib/memory.h \
- 	lib/mgmt.pb-c.h \
  	lib/mgmt_be_client.h \
+ 	lib/mgmt_defines.h \
 @@ -191,7 +190,6 @@ pkginclude_HEADERS += \
  	lib/route_opaque.h \
  	lib/sbuf.h \
diff --git a/0006-s390x-endianness-test.patch b/0006-s390x-endianness-test.patch
deleted file mode 100644
index 2adbadb..0000000
--- a/0006-s390x-endianness-test.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 df14b21..88ba1dc 100644
--- a/frr.spec
+++ b/frr.spec
@@ -8,8 +8,8 @@
 %bcond selinux 1
 
 Name:           frr
-Version:        10.3
-Release:        2%{?dist}
+Version:        10.4.0
+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,7 +26,6 @@ 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}
@@ -284,6 +283,9 @@ rm tests/lib/*grpc*
 %endif
 
 %changelog
+* Mon Jul 28 2025 Michal Ruprich <mruprich@redhat.com> - 10.4.0-1
+- New version 10.4.0
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 10.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
diff --git a/sources b/sources
index c2675e2..3672753 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (frr-10.3.tar.gz) = 6ea651f20c3957f5a7523e7cb316327ac5914154a31ed92e8ac5bb55e75eab2e1da3ddf255de5e669906946caa5c82b78bb769c3869e2f800f5bd3782963198c
 SHA512 (remove-babeld-ldpd.sh) = a5bf67a3722cb20d43cef1dac28f839db68df73a1b7d34d8438e4f9366da3b67d85c1f44281f93434e8dd8ebcb2d3dc258b77eaa5627475b7395d207f020839d
+SHA512 (frr-10.4.0.tar.gz) = 705cde41c6ce882fda5044133cf053047a6f9f9c4e7c511d965f62669ccf6776409b2dcda98d23dd297d5679b4475c3efeb50be042f059210d2ec453a7cce7bc