diff options
| -rw-r--r-- | main/quagga/APKBUILD | 18 | ||||
| -rw-r--r-- | main/quagga/zebra.initd | 2 |
2 files changed, 8 insertions, 12 deletions
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD index 25cd4f762e4..381b8fb3074 100644 --- a/main/quagga/APKBUILD +++ b/main/quagga/APKBUILD @@ -1,11 +1,11 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=quagga pkgver=1.2.4 -pkgrel=2 +pkgrel=3 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF, BGP and NHRP" url="http://quagga.net/" arch="all" -license="GPL-2.0" +license="GPL-2.0-or-later" depends="iproute2" replaces="quagga-nhrp" provides="quagga-nhrp=$pkgver" @@ -28,10 +28,8 @@ source="https://download.savannah.gnu.org/releases/quagga/quagga-$pkgver.tar.gz # 1.1.1-r0: # - CVE-2017-5495 -builddir="$srcdir"/$pkgname-$pkgver build() { - cd "$builddir" quagga_cv_ipforward_method=proc \ ./configure \ --build=$CBUILD \ @@ -49,23 +47,21 @@ build() { --enable-pimd \ --sysconfdir=/etc/quagga \ --enable-exampledir=/usr/share/doc/quagga/ \ - --localstatedir=/var/run/quagga \ - || return 1 + --localstatedir=/var/run/quagga # add CFLAGS to work around textrel issue - make CFLAGS+="-fPIC" || return 1 + make CFLAGS+="-fPIC" } package() { - cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install install -o quagga -g quagga -d "$pkgdir"/var/run/quagga for i in zebra bgpd; do install -Dm755 "$srcdir"/$i.initd "$pkgdir"/etc/init.d/$i done for i in ripd ospfd ripngd ospf6d nhrpd; do - ln -s bgpd "$pkgdir"/etc/init.d/$i || return 1 + ln -s bgpd "$pkgdir"/etc/init.d/$i done install -Dm644 "$srcdir/zebra.confd" "$pkgdir"/etc/conf.d/zebra install -o quagga -g quagga -d -m755 "$pkgdir"/etc/quagga @@ -74,5 +70,5 @@ sha512sums="3e72440bcccfd3c1a449a62b7ff8623441256399a2bee0a39fa0a19694a5a78ac909 dfa33341119fe51caa7bc33b44256f57361f2e3f8192862cca215b312ceb68e6a8c264dbf2a43d6244e6152bfad110cb0fdbefb065d95dd50389cf613d9720b3 1001-bgpd-allow-using-ebgp-multihop-for-ibgp-connections.patch 5ef5c5e6d70d991b33b13a062e25b6fbde395dceee36aea29384b0640a48d2957ed5f50d416a1f2f770bf69bae2340133e35b1114be7e1fa722eb6d3d021f37a dont-hook-core-signals.patch 13b5b57e10df013bd2d931abc49bf76b8c4dee59dbceab22c9f151ccb988b2c5f7167f2909027d5e0f990b59da8de115667b02484aee9a67d347625700f6cacd bgpd.initd -1638a4a64ffd066b1884f7e5a4243edab68739aabd83bd35ea8c9608af7b8623eece1d59fb08feead84e4386b6d1da4220764ccf5fd7f2a9959a8470d5cce86a zebra.initd +7099135b6e20ad81322e7ec5ec4f0734c0ace60a69c282ad458b9700e39258831ecf29d5eaba0cd0f44bf17004283f17a80c0c1d90e8f407ababe89a75e60850 zebra.initd 900972c6f98e561dfacf384111251db262326e8764b8c763a5ef639fa11c7949c03eef5e3bce324a4b1964fe45416d2db74ae1b6bc967f7d4ba48c2eeda017c4 zebra.confd" diff --git a/main/quagga/zebra.initd b/main/quagga/zebra.initd index 6ab297e74fd..c55b6da0043 100644 --- a/main/quagga/zebra.initd +++ b/main/quagga/zebra.initd @@ -11,7 +11,7 @@ depend() { } cleanup() { - ebegin "Cleaning up stale zebra routes..." + ebegin "Cleaning up stale zebra routes" ip route flush proto zebra eend $? } |