Bump to 6.0

3 files changed, 101 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1304dc07ee2..c44d7ab5b476 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Aug 19 09:12:22 UTC 2018
+# Thu Oct 25 03:55:41 UTC 2018
 pkgbase = frr
 	pkgdesc = FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, NHRP and EIGRP.
-	pkgver = 5.0.1
-	pkgrel = 2
+	pkgver = 6.0
+	pkgrel = 1
 	url = https://frrouting.org/
 	arch = any
 	license = GPL2
@@ -28,14 +28,14 @@ pkgbase = frr
 	conflicts = quagga
 	conflicts = babeld
 	conflicts = quagga_cumulus
-	source = https://github.com/FRRouting/frr/archive/frr-5.0.1.tar.gz
+	source = https://github.com/FRRouting/frr/archive/frr-6.0.tar.gz
 	source = frr.sysusers
 	source = frr.tmpfiles
-	source = frr_5.0_systemd_arch.patch
-	sha256sums = b2d94960a248f953fef5ee34a95229ff6426ceac27f4d187179f0146275dbf14
+	source = frr_6.0_systemd_arch.patch
+	sha256sums = 3835d87e2329c1c08d1b2657312c0ba0155d8f442c338d60f0ddb51090f2f182
 	sha256sums = 9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e
 	sha256sums = 6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89
-	sha256sums = 7cb48afa57c9d9d29adbc2b000aaeb1736aebf7cc88e545e7b41ef1242171620
+	sha256sums = 9d98a0b5d7016cb66fe3cbec234f70327f0a961de47f7eae39a5bd4477b072ce
 
 pkgname = frr
 
diff --git a/PKGBUILD b/PKGBUILD
index 9f43dd598807..990f21378748 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Contributor: Shalygin Konstantin <k0ste@k0ste.ru>
 
 pkgname='frr'
-pkgver='5.0.1'
-pkgrel='2'
+pkgver='6.0'
+pkgrel='1'
 pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, NHRP and EIGRP.'
 arch=('any')
 url="https://frrouting.org/"
@@ -15,17 +15,17 @@ provides=('quagga' 'quagga_cumulus')
 source=("https://github.com/FRRouting/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
-        "${pkgname}_5.0_systemd_arch.patch")
-sha256sums=('b2d94960a248f953fef5ee34a95229ff6426ceac27f4d187179f0146275dbf14'
+        "${pkgname}_6.0_systemd_arch.patch")
+sha256sums=('3835d87e2329c1c08d1b2657312c0ba0155d8f442c338d60f0ddb51090f2f182'
             '9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e'
             '6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89'
-            '7cb48afa57c9d9d29adbc2b000aaeb1736aebf7cc88e545e7b41ef1242171620')
+            '9d98a0b5d7016cb66fe3cbec234f70327f0a961de47f7eae39a5bd4477b072ce')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
 
   # https://github.com/FRRouting/frr/issues/1422
-  patch -p1 -i "${srcdir}/${pkgname}_5.0_systemd_arch.patch"
+  patch -p1 -i "${srcdir}/${pkgname}_6.0_systemd_arch.patch"
 
   autoreconf -fvi
   ./configure \
@@ -34,7 +34,6 @@ prepare() {
     --sysconfdir="/etc/${pkgname}" \
     --localstatedir="/run/${pkgname}" \
     --enable-exampledir="/etc/${pkgname}" \
-    --enable-ldpd \
     --disable-watchfrr \
     --enable-snmp="agentx" \
     --enable-multipath=256 \
@@ -44,13 +43,9 @@ prepare() {
     --enable-configfile-mask="0640" \
     --enable-logfile-mask="0640" \
     --enable-shell-access \
-    --enable-realms \
-    --enable-pcreposix \
     --enable-systemd \
-    --enable-poll="yes" \
-    --enable-shared \
-    --enable-irdp \
-    --enable-rpki
+    --enable-rpki \
+    --enable-fpm
 }
 
 build() {
@@ -66,7 +61,12 @@ check() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -Dm0644 "zebra/GNOME-PRODUCT-ZEBRA-MIB" "${pkgdir}/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB"
+  install -Dm0644 "bgpd/BGP4-MIB.txt" "${pkgdir}/usr/share/snmp/mibs/BGP4-MIB.txt"
+  install -Dm0644 "eigrpd/EIGRP-MIB.txt" "${pkgdir}/usr/share/snmp/mibs/EIGRP-MIB.txt"
+  install -Dm0644 "ospf6d/OSPFv3-MIB.txt" "${pkgdir}/usr/share/snmp/mibs/OSPFv3-MIB.txt"
+  install -Dm0644 "ospfd/OSPF-MIB.txt" "${pkgdir}/usr/share/snmp/mibs/OSPF-MIB.txt"
+  install -Dm0644 "ospfd/OSPF-TRAP-MIB.txt" "${pkgdir}/usr/share/snmp/mibs/OSPF-TRAP-MIB.txt"
+  install -Dm0644 "ripd/RIPv2-MIB.txt" "${pkgdir}/usr/share/snmp/mibs/RIPv2-MIB.txt"
 
   cd "redhat"
   sed -ri 's|/var/run/frr|/run/frr|g' "${pkgname}.logrotate"
diff --git a/frr_5.0_systemd_arch.patch b/frr_6.0_systemd_arch.patch
index 5de8e865393d..a05d313fa33d 100644
--- a/frr_5.0_systemd_arch.patch
+++ b/frr_6.0_systemd_arch.patch
@@ -1,6 +1,6 @@
-diff -Naupr frr-frr-5.0_orig/redhat/babeld.service frr-frr-5.0/redhat/babeld.service
---- frr-frr-5.0_orig/redhat/babeld.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/babeld.service	2018-06-12 10:29:41.517126062 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/babeld.service frr-frr-6.0/redhat/babeld.service
+--- frr-frr-6.0_orig/redhat/babeld.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/babeld.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=Babel routing daemon
@@ -17,9 +17,28 @@ diff -Naupr frr-frr-5.0_orig/redhat/babeld.service frr-frr-5.0/redhat/babeld.ser
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/bgpd.service frr-frr-5.0/redhat/bgpd.service
---- frr-frr-5.0_orig/redhat/bgpd.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/bgpd.service	2018-06-12 10:29:41.517126062 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/bfdd.service frr-frr-6.0/redhat/bfdd.service
+--- frr-frr-6.0_orig/redhat/bfdd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/bfdd.service	2018-10-12 10:05:33.009496639 +0700
+@@ -0,0 +1,15 @@
++[Unit]
++Description=Communication failure detection daemon
++Documentation=man:bfdd(8) man:zebra(8)
++BindTo=zebra.service
++After=network.target zebra.service
++
++[Service]
++Type=forking
++PIDFile=/run/frr/bfdd.pid
++ExecStart=/usr/bin/bfdd -d
++ExecReload=/bin/kill -HUP $MAINPID
++Restart=on-abort
++
++[Install]
++WantedBy=multi-user.target
+diff -Naupr frr-frr-6.0_orig/redhat/bgpd.service frr-frr-6.0/redhat/bgpd.service
+--- frr-frr-6.0_orig/redhat/bgpd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/bgpd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=BGP routing daemon
@@ -36,9 +55,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/bgpd.service frr-frr-5.0/redhat/bgpd.service
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr "frr-frr-5.0_orig/redhat/eigrpd.service" "frr-frr-5.0/redhat/eigrpd.service"
---- "frr-frr-5.0_orig/redhat/eigrpd.service"	1970-01-01 07:00:00.000000000 +0700
-+++ "frr-frr-5.0/redhat/eigrpd.service"	2018-06-12 10:33:14.136729580 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/eigrpd.service frr-frr-6.0/redhat/eigrpd.service
+--- frr-frr-6.0_orig/redhat/eigrpd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/eigrpd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=EIGRP routing daemon
@@ -55,9 +74,9 @@ diff -Naupr "frr-frr-5.0_orig/redhat/eigrpd.service" "frr-frr-5.0/redhat/eigrpd.
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/isisd.service frr-frr-5.0/redhat/isisd.service
---- frr-frr-5.0_orig/redhat/isisd.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/isisd.service	2018-06-12 10:29:41.517126062 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/isisd.service frr-frr-6.0/redhat/isisd.service
+--- frr-frr-6.0_orig/redhat/isisd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/isisd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=IS-IS routing daemon
@@ -74,9 +93,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/isisd.service frr-frr-5.0/redhat/isisd.servi
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/ldpd.service frr-frr-5.0/redhat/ldpd.service
---- frr-frr-5.0_orig/redhat/ldpd.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/ldpd.service	2018-06-12 10:29:41.520459491 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/ldpd.service frr-frr-6.0/redhat/ldpd.service
+--- frr-frr-6.0_orig/redhat/ldpd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/ldpd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=LDP engine
@@ -93,9 +112,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/ldpd.service frr-frr-5.0/redhat/ldpd.service
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/nhrpd.service frr-frr-5.0/redhat/nhrpd.service
---- frr-frr-5.0_orig/redhat/nhrpd.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/nhrpd.service	2018-06-12 10:29:41.520459491 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/nhrpd.service frr-frr-6.0/redhat/nhrpd.service
+--- frr-frr-6.0_orig/redhat/nhrpd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/nhrpd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=NHRP daemon
@@ -112,9 +131,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/nhrpd.service frr-frr-5.0/redhat/nhrpd.servi
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/ospf6d.service frr-frr-5.0/redhat/ospf6d.service
---- frr-frr-5.0_orig/redhat/ospf6d.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/ospf6d.service	2018-06-12 10:29:41.520459491 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/ospf6d.service frr-frr-6.0/redhat/ospf6d.service
+--- frr-frr-6.0_orig/redhat/ospf6d.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/ospf6d.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=OSPF routing daemon for IPv6
@@ -131,9 +150,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/ospf6d.service frr-frr-5.0/redhat/ospf6d.ser
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/ospfd-instance@.service frr-frr-5.0/redhat/ospfd-instance@.service
---- frr-frr-5.0_orig/redhat/ospfd-instance@.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/ospfd-instance@.service	2018-06-12 10:29:41.520459491 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/ospfd-instance@.service frr-frr-6.0/redhat/ospfd-instance@.service
+--- frr-frr-6.0_orig/redhat/ospfd-instance@.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/ospfd-instance@.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=OSPF routing daemon instance %i
@@ -150,9 +169,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/ospfd-instance@.service frr-frr-5.0/redhat/o
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/ospfd.service frr-frr-5.0/redhat/ospfd.service
---- frr-frr-5.0_orig/redhat/ospfd.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/ospfd.service	2018-06-12 10:29:41.520459491 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/ospfd.service frr-frr-6.0/redhat/ospfd.service
+--- frr-frr-6.0_orig/redhat/ospfd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/ospfd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=OSPF routing daemon
@@ -169,9 +188,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/ospfd.service frr-frr-5.0/redhat/ospfd.servi
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/pbrd.service frr-frr-5.0/redhat/pbrd.service
---- frr-frr-5.0_orig/redhat/pbrd.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/pbrd.service	2018-06-12 10:33:26.043757381 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/pbrd.service frr-frr-6.0/redhat/pbrd.service
+--- frr-frr-6.0_orig/redhat/pbrd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/pbrd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=PBR routing daemon
@@ -188,9 +207,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/pbrd.service frr-frr-5.0/redhat/pbrd.service
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/pimd.service frr-frr-5.0/redhat/pimd.service
---- frr-frr-5.0_orig/redhat/pimd.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/pimd.service	2018-06-12 10:29:41.520459491 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/pimd.service frr-frr-6.0/redhat/pimd.service
+--- frr-frr-6.0_orig/redhat/pimd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/pimd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,14 @@
 +[Unit]
 +Description=PIM multicast routing engine
@@ -206,9 +225,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/pimd.service frr-frr-5.0/redhat/pimd.service
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/ripd.service frr-frr-5.0/redhat/ripd.service
---- frr-frr-5.0_orig/redhat/ripd.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/ripd.service	2018-06-12 10:29:41.520459491 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/ripd.service frr-frr-6.0/redhat/ripd.service
+--- frr-frr-6.0_orig/redhat/ripd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/ripd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=RIP routing daemon
@@ -225,9 +244,9 @@ diff -Naupr frr-frr-5.0_orig/redhat/ripd.service frr-frr-5.0/redhat/ripd.service
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/ripngd.service frr-frr-5.0/redhat/ripngd.service
---- frr-frr-5.0_orig/redhat/ripngd.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/ripngd.service	2018-06-12 10:29:41.520459491 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/ripngd.service frr-frr-6.0/redhat/ripngd.service
+--- frr-frr-6.0_orig/redhat/ripngd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/ripngd.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=RIP routing daemon for IPv6
@@ -244,9 +263,28 @@ diff -Naupr frr-frr-5.0_orig/redhat/ripngd.service frr-frr-5.0/redhat/ripngd.ser
 +
 +[Install]
 +WantedBy=multi-user.target
-diff -Naupr frr-frr-5.0_orig/redhat/zebra.service frr-frr-5.0/redhat/zebra.service
---- frr-frr-5.0_orig/redhat/zebra.service	1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-5.0/redhat/zebra.service	2018-06-12 10:29:41.520459491 +0700
+diff -Naupr frr-frr-6.0_orig/redhat/staticd.service frr-frr-6.0/redhat/staticd.service
+--- frr-frr-6.0_orig/redhat/staticd.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/staticd.service	2018-10-12 10:13:47.017305494 +0700
+@@ -0,0 +1,15 @@
++[Unit]
++Description=Zebra daemon responsible for management of static routes
++Documentation=man:staticd(8) man:zebra(8)
++BindTo=zebra.service
++After=network.target zebra.service
++
++[Service]
++Type=forking
++PIDFile=/run/frr/staticd.pid
++ExecStart=/usr/bin/staticd -d
++ExecReload=/bin/kill -HUP $MAINPID
++Restart=on-abort
++
++[Install]
++WantedBy=multi-user.target
+diff -Naupr frr-frr-6.0_orig/redhat/zebra.service frr-frr-6.0/redhat/zebra.service
+--- frr-frr-6.0_orig/redhat/zebra.service	1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-6.0/redhat/zebra.service	2018-10-12 09:58:16.424665052 +0700
 @@ -0,0 +1,15 @@
 +[Unit]
 +Description=GNU Zebra routing manager