summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Shalygin2018-04-26 15:54:39 +0700
committerKonstantin Shalygin2018-04-26 15:54:39 +0700
commitc5066c14c875686d31c7c6cbf403e55e9dc5080a (patch)
treed6d288fa192b2691830028b82ee5b7bd58875d6d
parent2e6201e0138245a4455ad87711ffaed338ce641e (diff)
downloadaur-c5066c14c875686d31c7c6cbf403e55e9dc5080a.tar.gz
Added 'babeld' to conflicts.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD10
-rw-r--r--frr_4.0_systemd_arch.patch (renamed from frr_3.0_systemd_arch.patch)85
3 files changed, 62 insertions, 42 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e25e850ab70..f3b2fba96d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Mar 13 04:02:01 UTC 2018
+# Thu Apr 26 08:54:04 UTC 2018
pkgbase = frr
pkgdesc = FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, NHRP and EIGRP.
pkgver = 4.0
- pkgrel = 2
+ pkgrel = 3
url = https://frrouting.org/
arch = any
license = GPL2
@@ -26,15 +26,16 @@ pkgbase = frr
provides = quagga
provides = quagga_cumulus
conflicts = quagga
+ conflicts = babeld
conflicts = quagga_cumulus
source = https://github.com/FRRouting/frr/archive/frr-4.0.tar.gz
source = frr.sysusers
source = frr.tmpfiles
- source = frr_3.0_systemd_arch.patch
+ source = frr_4.0_systemd_arch.patch
sha256sums = a9932ef116106d56b0e17aa569aa56a458acdd50e0d07c042fd5cc725bf742cc
sha256sums = 9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e
sha256sums = 6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89
- sha256sums = caf47e9efa48678121437f41aaa0e8b1bf3f212539082b2b07e0de6b6b9c7ba3
+ sha256sums = 0f8b7a06412dd1f2a04615910a520a244cb35c30ff0f78138e2177b813ff8aad
pkgname = frr
diff --git a/PKGBUILD b/PKGBUILD
index 381cadf5740..a20d8ea7af8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,29 +3,29 @@
pkgname='frr'
pkgver='4.0'
-pkgrel='2'
+pkgrel='3'
pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, NHRP and EIGRP.'
arch=('any')
url="https://frrouting.org/"
license=('GPL2')
depends=('libcap' 'libnl' 'readline' 'ncurses' 'perl' 'json-c' 'net-snmp' 'rtrlib')
makedepends=('patch' 'gcc' 'net-snmp' 'json-c' 'bison' 'c-ares' 'perl-xml-libxml' 'rtrlib')
-conflicts=('quagga' 'quagga_cumulus')
+conflicts=('quagga' 'babeld' 'quagga_cumulus')
provides=('quagga' 'quagga_cumulus')
source=("https://github.com/FRRouting/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz"
"${pkgname}.sysusers"
"${pkgname}.tmpfiles"
- "${pkgname}_3.0_systemd_arch.patch")
+ "${pkgname}_4.0_systemd_arch.patch")
sha256sums=('a9932ef116106d56b0e17aa569aa56a458acdd50e0d07c042fd5cc725bf742cc'
'9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e'
'6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89'
- 'caf47e9efa48678121437f41aaa0e8b1bf3f212539082b2b07e0de6b6b9c7ba3')
+ '0f8b7a06412dd1f2a04615910a520a244cb35c30ff0f78138e2177b813ff8aad')
prepare() {
cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
# https://github.com/FRRouting/frr/issues/1422
- patch -p1 -i "${srcdir}/${pkgname}_3.0_systemd_arch.patch"
+ patch -p1 -i "${srcdir}/${pkgname}_4.0_systemd_arch.patch"
autoreconf -fvi
./configure \
diff --git a/frr_3.0_systemd_arch.patch b/frr_4.0_systemd_arch.patch
index 2d49be4056d..9a308c0b3ce 100644
--- a/frr_3.0_systemd_arch.patch
+++ b/frr_4.0_systemd_arch.patch
@@ -1,6 +1,25 @@
-diff -Naupr frr-frr-3.0_orig/redhat/bgpd.service frr-frr-3.0/redhat/bgpd.service
---- frr-frr-3.0_orig/redhat/bgpd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/bgpd.service 2017-10-17 19:25:16.036060790 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/babeld.service frr-frr-4.0/redhat/babeld.service
+--- frr-frr-4.0_orig/redhat/babeld.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/babeld.service 2018-04-26 15:28:34.256745385 +0700
+@@ -0,0 +1,15 @@
++[Unit]
++Description=Babel routing daemon
++Documentation=man:babeld(8) man:zebra(8)
++BindTo=zebra.service
++After=network.target zebra.service
++
++[Service]
++Type=forking
++PIDFile=/run/frr/babeld.pid
++ExecStart=/usr/bin/babeld -d
++ExecReload=/bin/kill -HUP $MAINPID
++Restart=on-abort
++
++[Install]
++WantedBy=multi-user.target
+diff -Naupr frr-frr-4.0_orig/redhat/bgpd.service frr-frr-4.0/redhat/bgpd.service
+--- frr-frr-4.0_orig/redhat/bgpd.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/bgpd.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=BGP routing daemon
@@ -17,9 +36,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/bgpd.service frr-frr-3.0/redhat/bgpd.service
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/isisd.service frr-frr-3.0/redhat/isisd.service
---- frr-frr-3.0_orig/redhat/isisd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/isisd.service 2017-10-17 19:25:16.036060790 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/isisd.service frr-frr-4.0/redhat/isisd.service
+--- frr-frr-4.0_orig/redhat/isisd.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/isisd.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=IS-IS routing daemon
@@ -36,9 +55,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/isisd.service frr-frr-3.0/redhat/isisd.servi
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/ldpd.service frr-frr-3.0/redhat/ldpd.service
---- frr-frr-3.0_orig/redhat/ldpd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/ldpd.service 2017-10-17 19:25:16.036060790 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/ldpd.service frr-frr-4.0/redhat/ldpd.service
+--- frr-frr-4.0_orig/redhat/ldpd.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/ldpd.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=LDP engine
@@ -55,9 +74,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/ldpd.service frr-frr-3.0/redhat/ldpd.service
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/nhrpd.service frr-frr-3.0/redhat/nhrpd.service
---- frr-frr-3.0_orig/redhat/nhrpd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/nhrpd.service 2017-10-17 19:31:33.177858913 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/nhrpd.service frr-frr-4.0/redhat/nhrpd.service
+--- frr-frr-4.0_orig/redhat/nhrpd.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/nhrpd.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=NHRP daemon
@@ -74,9 +93,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/nhrpd.service frr-frr-3.0/redhat/nhrpd.servi
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/ospf6d.service frr-frr-3.0/redhat/ospf6d.service
---- frr-frr-3.0_orig/redhat/ospf6d.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/ospf6d.service 2017-10-17 19:25:16.036060790 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/ospf6d.service frr-frr-4.0/redhat/ospf6d.service
+--- frr-frr-4.0_orig/redhat/ospf6d.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/ospf6d.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=OSPF routing daemon for IPv6
@@ -93,9 +112,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/ospf6d.service frr-frr-3.0/redhat/ospf6d.ser
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/ospfd-instance@.service frr-frr-3.0/redhat/ospfd-instance@.service
---- frr-frr-3.0_orig/redhat/ospfd-instance@.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/ospfd-instance@.service 2017-10-17 19:25:16.036060790 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/ospfd-instance@.service frr-frr-4.0/redhat/ospfd-instance@.service
+--- frr-frr-4.0_orig/redhat/ospfd-instance@.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/ospfd-instance@.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=OSPF routing daemon instance %i
@@ -112,9 +131,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/ospfd-instance@.service frr-frr-3.0/redhat/o
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/ospfd.service frr-frr-3.0/redhat/ospfd.service
---- frr-frr-3.0_orig/redhat/ospfd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/ospfd.service 2017-10-17 19:25:16.039394137 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/ospfd.service frr-frr-4.0/redhat/ospfd.service
+--- frr-frr-4.0_orig/redhat/ospfd.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/ospfd.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=OSPF routing daemon
@@ -131,9 +150,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/ospfd.service frr-frr-3.0/redhat/ospfd.servi
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/pimd.service frr-frr-3.0/redhat/pimd.service
---- frr-frr-3.0_orig/redhat/pimd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/pimd.service 2017-10-17 19:25:16.039394137 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/pimd.service frr-frr-4.0/redhat/pimd.service
+--- frr-frr-4.0_orig/redhat/pimd.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/pimd.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,14 @@
+[Unit]
+Description=PIM multicast routing engine
@@ -149,9 +168,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/pimd.service frr-frr-3.0/redhat/pimd.service
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/ripd.service frr-frr-3.0/redhat/ripd.service
---- frr-frr-3.0_orig/redhat/ripd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/ripd.service 2017-10-17 19:25:16.039394137 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/ripd.service frr-frr-4.0/redhat/ripd.service
+--- frr-frr-4.0_orig/redhat/ripd.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/ripd.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=RIP routing daemon
@@ -168,9 +187,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/ripd.service frr-frr-3.0/redhat/ripd.service
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/ripngd.service frr-frr-3.0/redhat/ripngd.service
---- frr-frr-3.0_orig/redhat/ripngd.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/ripngd.service 2017-10-17 19:25:16.039394137 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/ripngd.service frr-frr-4.0/redhat/ripngd.service
+--- frr-frr-4.0_orig/redhat/ripngd.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/ripngd.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=RIP routing daemon for IPv6
@@ -187,9 +206,9 @@ diff -Naupr frr-frr-3.0_orig/redhat/ripngd.service frr-frr-3.0/redhat/ripngd.ser
+
+[Install]
+WantedBy=multi-user.target
-diff -Naupr frr-frr-3.0_orig/redhat/zebra.service frr-frr-3.0/redhat/zebra.service
---- frr-frr-3.0_orig/redhat/zebra.service 1970-01-01 07:00:00.000000000 +0700
-+++ frr-frr-3.0/redhat/zebra.service 2017-10-17 19:25:16.039394137 +0700
+diff -Naupr frr-frr-4.0_orig/redhat/zebra.service frr-frr-4.0/redhat/zebra.service
+--- frr-frr-4.0_orig/redhat/zebra.service 1970-01-01 07:00:00.000000000 +0700
++++ frr-frr-4.0/redhat/zebra.service 2018-04-26 15:27:31.689567082 +0700
@@ -0,0 +1,15 @@
+[Unit]
+Description=GNU Zebra routing manager