Bump to 8.4.3

1 files changed, 20 insertions, 20 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 05db769f330f..c01498264bb2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@
 # Contributor: Evgeny Cherkashin <eugeneai@irnok.net>
 
 pkgname='frr'
-pkgver='8.4.2'
+pkgver='8.4.3'
 pkgrel='1'
-pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP.'
+pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, BFD, VRRP, NHRP and EIGRP'
 arch=('x86_64' 'aarch64' 'armv7h')
-url="https://frrouting.org/"
+url="https://frrouting.org"
 license=('GPL2')
 depends=('libcap' 'libnl' 'readline' 'ncurses' 'perl' 'pam' 'json-c' 'net-snmp'
 	 'rtrlib' 'libyang' 'libunwind' 'c-ares')
@@ -23,16 +23,16 @@ source=("https://github.com/FRRouting/${pkgname}/archive/${pkgname}-${pkgver}.ta
         "${pkgname}.sysusers"
         "${pkgname}.tmpfiles"
         "${pkgname}_8.4_Archlinux.patch"
-	"frr-init-functions")
-sha256sums=('8a6b0e0fa1e89493ba84cf176674e55c7a814821fd02a7188095b76c37c3935f'
+	"${pkgname}-init-functions")
+sha256sums=('7c3fccbfe3da6e2237d171d473fec4159d6029744fcf3ec16532067b31326e0d'
             '9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e'
             '6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89'
             '0aba0c37d16fd58a5aac99dbd6de157fcc88f99be53ecdab393628cd24f5be20'
             'e6e2592a8b0b18f7f173186fb4ebf23e642b3d912179f0bb36251962ca64cd7a')
 
 prepare() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
-  patch -p1 -i "${srcdir}/${pkgname}_8.4_Archlinux.patch"
+  cd "${pkgname}-${pkgname}-${pkgver}"
+  patch -p1 -i "../${pkgname}_8.4_Archlinux.patch"
 
   autoreconf -fvi
   ./configure \
@@ -54,27 +54,27 @@ prepare() {
 }
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgname}-${pkgver}"
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgname}-${pkgver}"
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
-  install -Dm0444 "${startdir}/frr-init-functions" "${pkgdir}/usr/bin/"
+  install -Dm0444 "../frr-init-functions" "${pkgdir}/usr/bin/"
+  install -Dm0644 "../${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  install -Dm0644 "../${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
 
   pushd "redhat"
   sed -ri 's|/var/run/frr|/run/frr|g' "${pkgname}.logrotate"
   install -Dm0644 "${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}"
   install -Dm0644 "${pkgname}.pam" "${pkgdir}/etc/pam.d/${pkgname}"
-  install -Dm0644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
-  install -Dm0644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
   popd
 
   pushd "tools"
@@ -93,15 +93,15 @@ package() {
   chown -R 177:177 "${pkgdir}/etc/frr"
 
   pushd "${pkgdir}/usr/bin"
-    for file in frr frr-reload frrcommon.sh frrinit.sh watchfrr.sh;
-    do
-      sed -ri 's|/lib/lsb/init-functions|/usr/bin/frr-init-functions|g' "$file";
-    done
-    sed -ri 's|C_PATH/daemons\"|C_PATH/daemons.conf\"|g' frrcommon.sh
-    sed -ri 's|load_old_config \"\$C_PATH/daemons.conf\"|load_old_config \"\$C_PATH/daemons\"|g' frrcommon.sh
+    for file in "${pkgname}" frr-reload frrcommon.sh frrinit.sh watchfrr.sh
+      do
+        sed -ri 's|/lib/lsb/init-functions|/usr/bin/frr-init-functions|g' "${file}"
+      done
+  sed -ri 's|C_PATH/daemons\"|C_PATH/daemons.conf\"|g' "frrcommon.sh"
+  sed -ri 's|load_old_config \"\$C_PATH/daemons.conf\"|load_old_config \"\$C_PATH/daemons\"|g' "frrcommon.sh"
   popd
 
   pushd "${pkgdir}/usr/lib/systemd/system"
-    sed -ri 's|frrinit.sh|frr|g' frr.service
+    sed -ri 's|frrinit.sh|frr|g' "${pkgname}.service"
   popd
 }