Added new patch from eugeneai

3 files changed, 27 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0e19e2d6db3..44d13122e545 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = frr
 	pkgdesc = FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP.
 	pkgver = 7.4
-	pkgrel = 1
+	pkgrel = 2
 	url = https://frrouting.org/
 	arch = x86_64
 	license = GPL2
@@ -36,12 +36,12 @@ pkgbase = frr
 	source = https://github.com/FRRouting/frr/archive/frr-7.4.tar.gz
 	source = frr.sysusers
 	source = frr.tmpfiles
-	source = frr_7.3_Archlinux.patch
+	source = frr_7.4_Archlinux.patch
 	source = frr-init-functions
 	sha256sums = 3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a
 	sha256sums = 9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e
 	sha256sums = 6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89
-	sha256sums = 71017b61fac82ff69f9ed8fe4a74c8380c2206d209c60a64e16ba31dd5735049
+	sha256sums = 4662bcd384d40be42cc55182310cada2461c18f126f432dd31c9db286641bef8
 	sha256sums = e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a
 
 pkgname = frr
diff --git a/PKGBUILD b/PKGBUILD
index 12d73c927ce5..ade8875caea6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname='frr'
 pkgver='7.4'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP.'
 arch=('x86_64')
 url="https://frrouting.org/"
@@ -22,17 +22,17 @@ backup=("etc/${pkgname}/${pkgname}.conf"
 source=("https://github.com/FRRouting/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
-        "${pkgname}_7.3_Archlinux.patch"
+        "${pkgname}_${pkgver}_Archlinux.patch"
 	"frr-init-functions")
 sha256sums=('3c8204fda1c9b178d8446562579bbbc49d134b98f3ad02aa56f68724a2f9e40a'
             '9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e'
             '6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89'
-            '71017b61fac82ff69f9ed8fe4a74c8380c2206d209c60a64e16ba31dd5735049'
+            '4662bcd384d40be42cc55182310cada2461c18f126f432dd31c9db286641bef8'
             'e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/${pkgname}_7.3_Archlinux.patch"
+  patch -p1 -i "${srcdir}/${pkgname}_${pkgver}_Archlinux.patch"
 
   autoreconf -fvi
   ./configure \
diff --git a/frr_7.3_Archlinux.patch b/frr_7.4_Archlinux.patch
index 7cb24873c241..0a1036944e84 100644
--- a/frr_7.3_Archlinux.patch
+++ b/frr_7.4_Archlinux.patch
@@ -1,17 +1,24 @@
-diff -Naupr frr-frr-7.3_orig/ospf6d/ospf6_abr.c frr-frr-7.3/ospf6d/ospf6_abr.c
---- frr-frr-7.3_orig/ospf6d/ospf6_abr.c	2020-02-14 21:03:09.000000000 +0700
-+++ frr-frr-7.3/ospf6d/ospf6_abr.c	2020-02-26 09:05:46.084754077 +0700
-@@ -1209,8 +1209,8 @@ void ospf6_abr_examin_summary(struct osp
- 		/* For Inter-Prefix route: Update RIB/FIB,
- 		 * For Inter-Router trigger summary update
- 		 */
--		if (table->hook_add)
--			(*table->hook_add)(old_route);
-+		//if (table->hook_add)
-+		//	(*table->hook_add)(old_route);
+diff -ru frr-frr-7.4/lib/table.h /home/eugeneai/tmp/frr-new/src/frr-frr-7.4/lib/table.h
+--- frr-frr-7.4/lib/table.h	2020-06-30 19:08:57.000000000 +0800
++++ /home/eugeneai/tmp/frr-new/src/frr-frr-7.4/lib/table.h	2020-10-11 03:06:11.822840367 +0800
+@@ -248,7 +248,7 @@
+ /* Lock node. */
+ static inline struct route_node *route_lock_node(struct route_node *node)
+ {
+-	(*(unsigned *)&node->lock)++;
++	node->lock+=1;
+ 	return node;
+ }
+ 
+@@ -256,7 +256,7 @@
+ static inline void route_unlock_node(struct route_node *node)
+ {
+ 	assert(node->lock > 0);
+-	(*(unsigned *)&node->lock)--;
++	node->lock-=1;
  
- 		/* Delete new route */
- 		ospf6_route_delete(route);
+ 	if (node->lock == 0)
+ 		route_node_delete(node);
 diff -Naupr frr-frr-7.3_orig/tools/etc/frr/daemons frr-frr-7.3/tools/etc/frr/daemons
 --- frr-frr-7.3_orig/tools/etc/frr/daemons	2020-02-14 21:03:09.000000000 +0700
 +++ frr-frr-7.3/tools/etc/frr/daemons	2020-02-26 15:20:16.080215154 +0700