summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Shalygin2019-05-17 16:08:56 +0700
committerKonstantin Shalygin2019-05-17 16:08:56 +0700
commit9290869db45fcce71e92279df83b7456eb408ea9 (patch)
treeafffca7c238a84c6ae64b2f37e853985dcaf5d67
parent802e13d8b9c3e701497aa3098fcec0f17f26ffea (diff)
downloadaur-9290869db45fcce71e92279df83b7456eb408ea9.tar.gz
Bump to 7.0.1
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD20
2 files changed, 13 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c89e230d350..c0c1e240e8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Fri May 10 08:27:50 UTC 2019
pkgbase = frr
pkgdesc = FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, NHRP and EIGRP.
- pkgver = 7.0
- pkgrel = 4
+ pkgver = 7.0.1
+ pkgrel = 1
url = https://frrouting.org/
arch = any
license = GPL2
@@ -33,12 +31,12 @@ 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.0.tar.gz
+ source = https://github.com/FRRouting/frr/archive/frr-7.0.1.tar.gz
source = frr.sysusers
source = frr.tmpfiles
source = frr_6.0_systemd_arch.patch
source = frr_7.0_Archlinux.patch
- sha256sums = 15b62dc0c52531e4bcefa6b830e9b9b07d1d0f189c2110307dbc19d80b719354
+ sha256sums = 5b74fc2c730e9973eab03546415f8dd7b36fa00fbf0bc856458266773dd5ae6d
sha256sums = 9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e
sha256sums = 6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89
sha256sums = 9d98a0b5d7016cb66fe3cbec234f70327f0a961de47f7eae39a5bd4477b072ce
diff --git a/PKGBUILD b/PKGBUILD
index 0a11fef9905..48a90ac23a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Contributor: Shalygin Konstantin <k0ste@k0ste.ru>
pkgname='frr'
-pkgver='7.0'
-pkgrel='4'
+pkgver='7.0.1'
+pkgrel='1'
pkgdesc='FRRouting (quagga fork) supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM, LDP, NHRP and EIGRP.'
arch=('any')
url="https://frrouting.org/"
@@ -23,7 +23,7 @@ source=("https://github.com/FRRouting/${pkgname}/archive/${pkgname}-${pkgver}.ta
"${pkgname}.tmpfiles"
"${pkgname}_6.0_systemd_arch.patch"
"${pkgname}_7.0_Archlinux.patch")
-sha256sums=('15b62dc0c52531e4bcefa6b830e9b9b07d1d0f189c2110307dbc19d80b719354'
+sha256sums=('5b74fc2c730e9973eab03546415f8dd7b36fa00fbf0bc856458266773dd5ae6d'
'9371cc0522d13621c623b5da77719052bdebdceb7ffdbdc06fc32a2f07118e7e'
'6f8dd86ef9c600763faead3052908531e8dc8ef67058e6f7f8da01bf0fe4eb89'
'9d98a0b5d7016cb66fe3cbec234f70327f0a961de47f7eae39a5bd4477b072ce'
@@ -64,28 +64,26 @@ build() {
make
}
-check() {
- cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
- make check
-}
-
package() {
cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
pushd "redhat"
sed -ri 's|/var/run/frr|/run/frr|g' "${pkgname}.logrotate"
- sed -ri 's|/usr/lib/frr/|/usr/bin/|g' "${pkgname}.service"
install -Dm0644 "${pkgname}.logrotate" "${pkgdir}/etc/logrotate.d/${pkgname}"
for d in babeld bgpd bfdd eigrpd isisd ldpd nhrpd ospf6d ospfd ospfd-instance@ pbrd pimd ripd ripngd staticd zebra; do
install -Dm0644 ${d}.service "${pkgdir}/usr/lib/systemd/system/${d}.service"
done
install -Dm0644 "${pkgname}.pam" "${pkgdir}/etc/pam.d/${pkgname}"
- install -Dm0644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
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"
+ sed -ri 's|/usr/lib/frr/|/usr/bin/|g' "${pkgname}.service"
+ install -Dm0644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+ popd
+
pushd "tools/etc"
install -Dm0644 "${pkgname}/daemons" "${pkgdir}/etc/${pkgname}/daemons.conf"
install -Dm0644 "iproute2/rt_protos.d/${pkgname}.conf" "${pkgdir}/etc/iproute2/rt_protos.d/${pkgname}.conf"