diff options
| -rw-r--r-- | main/quagga/APKBUILD | 17 | ||||
| -rw-r--r-- | main/quagga/quagga.post-install | 6 | ||||
| -rw-r--r-- | main/quagga/quagga.pre-install | 5 |
3 files changed, 12 insertions, 16 deletions
diff --git a/main/quagga/APKBUILD b/main/quagga/APKBUILD index 3e04187a18..a6a30de896 100644 --- a/main/quagga/APKBUILD +++ b/main/quagga/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=quagga -pkgver=0.99.20 +pkgver=0.99.20.1 pkgrel=0 pkgdesc="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP." url="http://quagga.net/" @@ -9,8 +9,10 @@ license="GPL-2" depends="iproute2" makedepends="readline-dev ncurses-dev gawk autoconf automake libtool" -install="$pkgname.pre-install $pkgname.post-install" +install="$pkgname.pre-install" subpackages="$pkgname-dev $pkgname-doc" +pkgusers="quagga" +pkggroups="quagga" source="http://www.quagga.net/download/$pkgname-$pkgver.tar.gz $pkgname-0.99.11-link-libcap.patch $pkgname-0.99.11-del-routes.patch @@ -26,9 +28,10 @@ source="http://www.quagga.net/download/$pkgname-$pkgver.tar.gz _builddir="$srcdir"/$pkgname-$pkgver prepare() { cd "$_builddir" - for i in ../*.patch; do - msg "Applying $i..." - patch -p1 < $i || return 1 + for i in i$source; do + case $i in + *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;; + esac done msg "Running autotools..." @@ -62,13 +65,13 @@ package() { make DESTDIR="$pkgdir" install || return 1 rm "$pkgdir"/usr/lib/*.la || return 1 - install -d "$pkgdir"/var/run/quagga + install -o quagga -g quagga -d "$pkgdir"/var/run/quagga for i in zebra ripd ospfd bgpd ripngd ospf6d; do install -Dm755 "$srcdir"/$i.initd "$pkgdir"/etc/init.d/$i done install -Dm644 "$srcdir/zebra.confd" "$pkgdir"/etc/conf.d/zebra } -md5sums="64cc29394eb8a4e24649d19dac868f64 quagga-0.99.20.tar.gz +md5sums="270ddd464407f8ce6fa8ada8bc1abbd7 quagga-0.99.20.1.tar.gz 8f99d41a8ed79e51704e8f655d255f29 quagga-0.99.11-link-libcap.patch 1cbcf60a637b2577dee4d6df711e1247 quagga-0.99.11-del-routes.patch ec7ac8cc1103f023cf5b9482b26ece59 bgpd.initd diff --git a/main/quagga/quagga.post-install b/main/quagga/quagga.post-install deleted file mode 100644 index c1c670d201..0000000000 --- a/main/quagga/quagga.post-install +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -chown root:root var/empty -chown quagga:quagga /var/run/quagga -exit 0 - diff --git a/main/quagga/quagga.pre-install b/main/quagga/quagga.pre-install index 2a80ab591c..a17bfa7be1 100644 --- a/main/quagga/quagga.pre-install +++ b/main/quagga/quagga.pre-install @@ -1,7 +1,6 @@ #!/bin/sh -adduser -H -h /var/empty -s /bin/false -D quagga 2>/dev/null -mkdir -p var/empty -chmod 755 /var/empty +addgroup -S quagga 2>/dev/null +adduser -S -h /var/run/quagga -s /bin/false -D -G quagga quagga 2>/dev/null exit 0 |