automatic import of frr

3 files changed, 3 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index aa06d3c..57fa00a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /frr-10.2.1.tar.gz
 /frr-10.3.tar.gz
 /frr-10.3.1.tar.gz
+/frr-10.4.0.tar.gz
diff --git a/frr.spec b/frr.spec
index d12aebf..a736eaa 100644
--- a/frr.spec
+++ b/frr.spec
@@ -10,7 +10,7 @@
 %endif
 
 Name:           frr
-Version:        10.3.1
+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
@@ -110,8 +110,6 @@ cp -p %{SOURCE3} %{SOURCE4} %{SOURCE5} selinux
 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
diff --git a/sources b/sources
index c5f2021..0cf1cad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-825a7e9063e9907d448d48d8505ad010  frr-10.3.1.tar.gz
+a1bbf98d067ebf03461cce96f1b4345a  frr-10.4.0.tar.gz