summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD10
-rw-r--r--frr_8.0_Archlinux.patch (renamed from frr_7.4_Archlinux.patch)63
3 files changed, 45 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d6957cc04708..b58e46a403e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = frr
pkgdesc = FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP.
- pkgver = 7.5.1
+ pkgver = 8.0
pkgrel = 1
url = https://frrouting.org/
arch = x86_64
@@ -34,16 +34,15 @@ pkgbase = frr
backup = etc/frr/frr.conf
backup = etc/frr/daemons.conf
backup = etc/frr/vtysh.conf
- source = https://github.com/FRRouting/frr/archive/frr-7.5.1.tar.gz
+ source = https://github.com/FRRouting/frr/archive/frr-8.0.tar.gz
source = frr.sysusers
source = frr.tmpfiles
- source = frr_7.4_Archlinux.patch
+ source = frr_8.0_Archlinux.patch
source = frr-init-functions
- sha256sums = 030d4e66f577726dfea13bd3a9c669fd41d8fd89b25953a36b5b0966d406ff28
+ sha256sums = 53fcc136f1936fe325400db3e9f27f976fd39ea9197ceb355798d7f1da972cf6
sha256sums = 9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e
sha256sums = 6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89
- sha256sums = 4662bcd384d40be42cc55182310cada2461c18f126f432dd31c9db286641bef8
+ sha256sums = dd02d7b6df161cf8e6f58384e40227b2bffcf626707a44e2a7fd5fe4dcb10159
sha256sums = e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a
pkgname = frr
-
diff --git a/PKGBUILD b/PKGBUILD
index 8ae263f1b638..1b4d94b7f492 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Evgeny Cherkashin <eugeneai@irnok.net>
pkgname='frr'
-pkgver='7.5.1'
+pkgver='8.0'
pkgrel='1'
pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP.'
arch=('x86_64' 'aarch64')
@@ -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.4_Archlinux.patch"
+ "${pkgname}_8.0_Archlinux.patch"
"frr-init-functions")
-sha256sums=('030d4e66f577726dfea13bd3a9c669fd41d8fd89b25953a36b5b0966d406ff28'
+sha256sums=('53fcc136f1936fe325400db3e9f27f976fd39ea9197ceb355798d7f1da972cf6'
'9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e'
'6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89'
- '4662bcd384d40be42cc55182310cada2461c18f126f432dd31c9db286641bef8'
+ 'dd02d7b6df161cf8e6f58384e40227b2bffcf626707a44e2a7fd5fe4dcb10159'
'e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a')
prepare() {
cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
- patch -p1 -i "${srcdir}/${pkgname}_7.4_Archlinux.patch"
+ patch -p1 -i "${srcdir}/${pkgname}_8.0_Archlinux.patch"
autoreconf -fvi
./configure \
diff --git a/frr_7.4_Archlinux.patch b/frr_8.0_Archlinux.patch
index 0a1036944e84..d9e210af98d7 100644
--- a/frr_7.4_Archlinux.patch
+++ b/frr_8.0_Archlinux.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -Naupr frr-frr-8.0_orig/lib/table.h frr-frr-8.0/lib/table.h
+--- frr-frr-8.0_orig/lib/table.h 2021-07-21 20:06:19.000000000 +0700
++++ frr-frr-8.0/lib/table.h 2021-08-14 14:44:45.820799226 +0700
+@@ -244,7 +244,7 @@ extern void route_table_iter_cleanup(rou
/* Lock node. */
static inline struct route_node *route_lock_node(struct route_node *node)
{
@@ -10,7 +10,7 @@ diff -ru frr-frr-7.4/lib/table.h /home/eugeneai/tmp/frr-new/src/frr-frr-7.4/lib/
return node;
}
-@@ -256,7 +256,7 @@
+@@ -252,7 +252,7 @@ static inline struct route_node *route_l
static inline void route_unlock_node(struct route_node *node)
{
assert(node->lock > 0);
@@ -19,19 +19,19 @@ diff -ru frr-frr-7.4/lib/table.h /home/eugeneai/tmp/frr-new/src/frr-frr-7.4/lib/
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
-@@ -30,6 +30,8 @@ pbrd=no
- bfdd=no
+diff -Naupr frr-frr-8.0_orig/tools/etc/frr/daemons frr-frr-8.0/tools/etc/frr/daemons
+--- frr-frr-8.0_orig/tools/etc/frr/daemons 2021-07-21 20:06:19.000000000 +0700
++++ frr-frr-8.0/tools/etc/frr/daemons 2021-08-14 14:48:56.387345975 +0700
+@@ -31,6 +31,8 @@ bfdd=no
fabricd=no
vrrpd=no
+ pathd=no
+zebra=yes
+#ospfd_instances="1,2,3"
#
# If this option is set the /etc/init.d/frr script automatically loads
-@@ -37,24 +39,24 @@ vrrpd=no
+@@ -38,25 +40,25 @@ pathd=no
# Check /etc/pam.d/frr if you intend to use "vtysh"!
#
vtysh_enable=yes
@@ -53,6 +53,7 @@ diff -Naupr frr-frr-7.3_orig/tools/etc/frr/daemons frr-frr-7.3/tools/etc/frr/dae
-bfdd_options=" -A 127.0.0.1"
-fabricd_options="-A 127.0.0.1"
-vrrpd_options=" -A 127.0.0.1"
+-pathd_options=" -A 127.0.0.1"
+zebra_options=" -A 127.0.0.1 -s 90000000 -d -f /etc/frr/zebra.conf"
+bgpd_options=" -A 127.0.0.1 -d -f /etc/frr/bgpd.conf"
+ospfd_options=" -A 127.0.0.1 -d -f /etc/frr/ospfd.conf"
@@ -71,23 +72,29 @@ diff -Naupr frr-frr-7.3_orig/tools/etc/frr/daemons frr-frr-7.3/tools/etc/frr/dae
+bfdd_options=" -A 127.0.0.1 -d -f /etc/frr/bfdd.conf"
+fabricd_options="-A 127.0.0.1 -d -f /etc/frr/fabricd.conf"
+vrrpd_options=" -A 127.0.0.1 -d -f /etc/frr/vrrpd.conf"
++pathd_options=" -A 127.0.0.1 -d -f /etc/frr/pathd.conf"
# configuration profile
#
-@@ -70,7 +72,8 @@ vrrpd_options=" -A 127.0.0.1"
+@@ -72,12 +74,13 @@ pathd_options=" -A 127.0.0.1"
#MAX_FDS=1024
# The list of daemons to watch is automatically generated by the init script.
-#watchfrr_options=""
+watchfrr_enable=yes
+
+ # To make watchfrr create/join the specified netns, use the following option:
+ #watchfrr_options="--netns"
+ # This only has an effect in /etc/frr/<somename>/daemons, and you need to
+ # start FRR with "/usr/lib/frr/frrinit.sh start <somename>".
+watchfrr_options="-d -r '/usr/bin/frr restart %s' -s '/usr/bin/frr start %s' -k '/usr/bin/frr stop %s'"
# for debugging purposes, you can specify a "wrap" command to start instead
# of starting the daemon directly, e.g. to use valgrind on ospfd:
-diff -Naupr frr-frr-7.3_orig/tools/frrcommon.sh.in frr-frr-7.3/tools/frrcommon.sh.in
---- frr-frr-7.3_orig/tools/frrcommon.sh.in 2020-02-14 21:03:09.000000000 +0700
-+++ frr-frr-7.3/tools/frrcommon.sh.in 2020-02-26 09:05:46.084754077 +0700
-@@ -271,7 +271,7 @@ load_old_config() {
+diff -Naupr frr-frr-8.0_orig/tools/frrcommon.sh.in frr-frr-8.0/tools/frrcommon.sh.in
+--- frr-frr-8.0_orig/tools/frrcommon.sh.in 2021-07-21 20:06:19.000000000 +0700
++++ frr-frr-8.0/tools/frrcommon.sh.in 2021-08-14 14:44:45.824132559 +0700
+@@ -291,7 +291,7 @@ load_old_config() {
[ -s "$oldcfg" ] || return 0
grep -v '^[[:blank:]]*\(#\|$\)' "$oldcfg" > /dev/null || return 0
@@ -96,7 +103,7 @@ diff -Naupr frr-frr-7.3_orig/tools/frrcommon.sh.in frr-frr-7.3/tools/frrcommon.s
# save off settings from daemons for the OR below
for dmn in $DAEMONS; do eval "_new_$dmn=\${$dmn:-no}"; done
-@@ -282,8 +282,8 @@ load_old_config() {
+@@ -302,8 +302,8 @@ load_old_config() {
for dmn in $DAEMONS; do eval "test \$_new_$dmn != no && $dmn=\$_new_$dmn; unset _new_$dmn"; done
}
@@ -107,31 +114,31 @@ diff -Naupr frr-frr-7.3_orig/tools/frrcommon.sh.in frr-frr-7.3/tools/frrcommon.s
exit 1
}
. "$C_PATH/daemons"
-diff -Naupr frr-frr-7.3_orig/tools/frr.in frr-frr-7.3/tools/frr.in
---- frr-frr-7.3_orig/tools/frr.in 2020-02-14 21:03:09.000000000 +0700
-+++ frr-frr-7.3/tools/frr.in 2020-02-26 09:05:46.084754077 +0700
-@@ -27,7 +27,7 @@ FRR_DEFAULT_PROFILE="@DFLT_NAME@" # trad
+diff -Naupr frr-frr-8.0_orig/tools/frr.in frr-frr-8.0/tools/frr.in
+--- frr-frr-8.0_orig/tools/frr.in 2021-07-21 20:06:19.000000000 +0700
++++ frr-frr-8.0/tools/frr.in 2021-08-14 14:51:47.870597234 +0700
+@@ -28,7 +28,7 @@ FRR_DEFAULT_PROFILE="@DFLT_NAME@" # trad
# See /usr/share/doc/frr/README.Debian.gz for further information.
# Keep zebra first and do not list watchfrr!
- DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd"
+ DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd ldpd nhrpd eigrpd sharpd pbrd staticd bfdd fabricd vrrpd pathd"
-MAX_INSTANCES=5
+MAX_INSTANCES=1024
RELOAD_SCRIPT="$D_PATH/frr-reload.py"
if [ -e /lib/lsb/init-functions ]; then
-@@ -501,10 +501,9 @@ check_status()
+@@ -503,10 +503,8 @@ check_status()
#########################################################
# Config broken but script must exit silently.
-[ ! -r "$C_PATH/daemons" ] && exit 0
+-
+[ ! -r "$C_PATH/daemons.conf" ] && exit 0
-
# Load configuration
-. "$C_PATH/daemons"
if [ -e "$C_PATH/daemons.conf" ]; then
. "$C_PATH/daemons.conf"
fi
-@@ -524,7 +523,7 @@ if test -z "$frr_profile"; then
+@@ -526,7 +524,7 @@ if test -z "$frr_profile"; then
fi
test -n "$frr_profile" && frr_global_options="$frr_global_options -F $frr_profile"
@@ -140,9 +147,9 @@ diff -Naupr frr-frr-7.3_orig/tools/frr.in frr-frr-7.3/tools/frr.in
# Set priority of un-startable daemons to 'no' and substitute 'yes' to '0'
convert_daemon_prios
-diff -Naupr frr-frr-7.3_orig/tools/frr-reload frr-frr-7.3/tools/frr-reload
---- frr-frr-7.3_orig/tools/frr-reload 2020-02-14 21:03:09.000000000 +0700
-+++ frr-frr-7.3/tools/frr-reload 2020-02-26 09:05:46.084754077 +0700
+diff -Naupr frr-frr-8.0_orig/tools/frr-reload frr-frr-8.0/tools/frr-reload
+--- frr-frr-8.0_orig/tools/frr-reload 2021-07-21 20:06:19.000000000 +0700
++++ frr-frr-8.0/tools/frr-reload 2021-08-14 14:44:45.824132559 +0700
@@ -1,7 +1,7 @@
#!/bin/sh