Fixed source of frr, added nhrpd.service, add /etc/frr

1 files changed, 10 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c8dcfee1051f..f6ea1ef96f07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname='frr'
 pkgver='3.0'
-pkgrel='1'
+pkgrel='2'
 pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, NHRP and EIGRP.'
 arch=('any')
 url="https://frrouting.org/"
@@ -12,18 +12,18 @@ depends=('libcap' 'libnl' 'readline' 'ncurses' 'perl' 'json-c' 'net-snmp')
 makedepends=('patch' 'gcc' 'net-snmp' 'json-c')
 conflicts=('quagga' 'quagga_cumulus')
 provides=('quagga' 'quagga_cumulus')
-source=("${url}/archive/${pkgname}-${pkgver}.tar.gz"
+source=("https://github.com/FRRouting/${pkgname}/archive/${pkgname}-${pkgver}.tar.gz"
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
-        "${pkgname}_systemd_arch.patch")
+        "${pkgname}_3.0_systemd_arch.patch")
 sha256sums=('9335c83c2c0a21e64b4e64a130ee95c1f90d76103cff05e816f452a8ba0603d9'
-            'd3eb1648c018d37e0327dad07ba42f08dfe610838d444d454ca4ab38ece1e8c4'
+            '9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e'
             '6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89'
-            '85f3396b49e3a3c84c344ee548bb2d185152356ca8a7bdcb5a850dc2e477665d')
+            'caf47e9efa48678121437f41aaa0e8b1bf3f212539082b2b07e0de6b6b9c7ba3')
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/${pkgname}_systemd_arch.patch"
+  patch -p1 -i "${srcdir}/${pkgname}_3.0_systemd_arch.patch"
 
   autoreconf -fvi
   ./configure \
@@ -31,7 +31,7 @@ prepare() {
     --sbindir="/usr/bin" \
     --sysconfdir="/etc/${pkgname}" \
     --localstatedir="/run/${pkgname}" \
-    --enable-exampledir="/usr/share/doc/${pkgname}/examples" \
+    --enable-exampledir="/etc/${pkgname}" \
     --enable-ldpd \
     --enable-nhrpd \
     --disable-bgp-vnc \
@@ -66,7 +66,7 @@ package() {
   sed -ri 's|/var/run/frr|/run/frr|g' "${pkgname}.logrotate"
   install -Dm0644 "${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}"
 
-  for d in zebra ripd ripngd bgpd ospfd ospfd-instance@ ospf6d isisd pimd ldpd; do
+  for d in zebra ripd ripngd bgpd ospfd ospfd-instance@ ospf6d isisd pimd ldpd nhrpd; do
     install -Dm0644 ${d}.service "${pkgdir}/usr/lib/systemd/system/${d}.service"
   done
 
@@ -74,4 +74,6 @@ package() {
   install -Dm0644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
   rm -rfv "${pkgdir}/usr/bin/${pkgname}"
   rm -rfv "${pkgdir}/usr/bin/${pkgname}-reload.py"
+  # frr:frrvty
+  chown -R 177:178 "${pkgdir}/etc/frr" 
 }