diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-08 13:30:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-02-08 13:35:42 +0000 |
| commit | bb328568465eb4144c70829a6eecb636b705df82 (patch) | |
| tree | aea58009059a04efc2a1a7fd4bd23e4fd08d8253 | |
| parent | a09d19aec0e9f05f5158bc7db885cb8465480c15 (diff) | |
| download | aports-bb328568465eb4144c70829a6eecb636b705df82.tar.bz2 aports-bb328568465eb4144c70829a6eecb636b705df82.tar.xz | |
main/quagga: have zebra start after opennhrp
fixes #262
(cherry picked from commit 48c7f07294786a39cbb7ad396f4f4669cfe7d447)
| -rw-r--r-- | main/quagga/APKBUILD | 18 | ||||
| -rw-r--r-- | main/quagga/bgpd.initd | 2 | ||||
| -rw-r--r-- | main/quagga/zebra.initd | 2 |
3 files changed, 15 insertions, 7 deletions
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD index a4f09695..6ce2b926 100644 --- a/main/quagga/APKBUILD +++ b/main/quagga/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=quagga pkgver=0.99.15 -pkgrel=2 +pkgrel=3 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP." url="http://quagga.net/" license="GPL-2" @@ -23,8 +23,9 @@ source="http://www.quagga.net/download/$pkgname-$pkgver.tar.gz zebra.confd " -build() { - cd "$srcdir"/$pkgname-$pkgver +_builddir="$srcdir"/$pkgname-$pkgver +prepare() { + cd "$_builddir" for i in ../*.patch; do msg "Applying $i..." patch -p1 < $i || return 1 @@ -35,7 +36,10 @@ build() { autoconf || return 1 automake || return 1 libtoolize || return 1 +} +build() { + cd "$_builddir" ./configure --prefix=/usr \ --disable-static \ --enable-ipv6 \ @@ -51,6 +55,10 @@ build() { || return 1 make || return 1 +} + +package() { + cd "$_builddir" make DESTDIR="$pkgdir" install install -d "$pkgdir"/var/run/quagga @@ -63,10 +71,10 @@ md5sums="8975414c76a295f4855a417af0b5ddce quagga-0.99.15.tar.gz 8f99d41a8ed79e51704e8f655d255f29 quagga-0.99.11-link-libcap.patch 1cbcf60a637b2577dee4d6df711e1247 quagga-0.99.11-del-routes.patch 9a9ad8ac543901f3eab6a6f2a914b69d quagga-revert-confed-check.patch -c4c3b174b1e3400a143407fcc3d27cf5 bgpd.initd +ec7ac8cc1103f023cf5b9482b26ece59 bgpd.initd 92aba039c049050c48abf984c2db7e2b ospf6d.initd 878328ead225e6eb5f5f77f05ab39106 ospfd.initd 5945863133a0db33898c5c39ef23663c ripd.initd cda4115283d9f4a8304fec1b6881a7eb ripngd.initd -be935134c5e3400989b427d7c114e634 zebra.initd +172e5b0e3f169e2b3328123e73517084 zebra.initd 34e06a1d2bc602ce691abc9ed169dd15 zebra.confd" diff --git a/main/quagga/bgpd.initd b/main/quagga/bgpd.initd index af9e2435..92ed536f 100644 --- a/main/quagga/bgpd.initd +++ b/main/quagga/bgpd.initd @@ -5,7 +5,7 @@ depend() { need net zebra - after firewall + after firewall opennhrp } checkconfig() { diff --git a/main/quagga/zebra.initd b/main/quagga/zebra.initd index df817540..2e2f2caa 100644 --- a/main/quagga/zebra.initd +++ b/main/quagga/zebra.initd @@ -5,7 +5,7 @@ depend() { need net - after firewall + after firewall opennhrp } checkconfig() { |