network/quagga: Updated for version 1.2.2.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

6 files changed, 16 insertions, 18 deletions

diff --git a/network/quagga/quagga.SlackBuild b/network/quagga/quagga.SlackBuild
index bc60fb98a1..904a0b3397 100644
--- a/network/quagga/quagga.SlackBuild
+++ b/network/quagga/quagga.SlackBuild
@@ -7,13 +7,13 @@
 # Don't forget to set USE_PAM if you use it.
 
 PRGNAM=quagga
-VERSION=${VERSION:-1.0.20160315}
+VERSION=${VERSION:-1.2.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
        *) export ARCH=$( uname -m ) ;;
   esac
@@ -24,8 +24,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -73,7 +73,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -106,8 +106,6 @@ CXXFLAGS="$SLKCFLAGS" \
     --mandir=/usr/man \
     --infodir=/usr/info \
     --enable-vtysh \
-    --enable-opaque-lsa \
-    --enable-ospf-te \
     --enable-dependency-tracking \
     --enable-user=quagga \
     --enable-group=quagga \
@@ -134,7 +132,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
-mv $TMP/$PRGNAM-$VERSION/*/*.sample $PKG/etc/quagga
+mv $TMP/$PRGNAM-$VERSION/*/*.sample* $PKG/etc/quagga
 chown root.quagga $PKG/etc/quagga ; chmod 750 $PKG/etc/quagga
 chown -R root.quagga $PKG/etc/quagga/* ; chmod 640 $PKG/etc/quagga/*.sample
 
diff --git a/network/quagga/quagga.info b/network/quagga/quagga.info
index 0e84a7b1f3..1d0fa422fa 100644
--- a/network/quagga/quagga.info
+++ b/network/quagga/quagga.info
@@ -1,10 +1,10 @@
 PRGNAM="quagga"
-VERSION="1.0.20160315"
+VERSION="1.2.2"
 HOMEPAGE="http://www.nongnu.org/quagga/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/quagga/quagga-1.0.20160315.tar.xz"
-MD5SUM="61bfd0c8fb696dd778234ee8b05821bc"
+DOWNLOAD="http://download.savannah.gnu.org/releases/quagga/quagga-1.2.2.tar.gz"
+MD5SUM="e84be2938c26c0c872792090f1a6a866"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="c-ares"
 MAINTAINER="Marin Glibic"
 EMAIL="zhilla2@gmail.com"
diff --git a/network/quagga/quagga.logrotate b/network/quagga/quagga.logrotate
index d4ea4c3937..c2ce2e9b6f 100644
--- a/network/quagga/quagga.logrotate
+++ b/network/quagga/quagga.logrotate
@@ -8,7 +8,7 @@
 	create 640 quagga quagga
 
 	postrotate
-		for i in zebra bgpd ripd ospfd ripngd ospf6d isisd; do
+		for i in zebra bgpd isisd ospfd ospf6d pimd ripd ripngd nhrpd; do
 			if [ -e /var/run/quagga/$i.pid ] ; then
 				kill -USR1 $(cat /var/run/quagga/$i.pid)
 			fi
diff --git a/network/quagga/rc.quagga b/network/quagga/rc.quagga
index 3033da277c..883939de07 100644
--- a/network/quagga/rc.quagga
+++ b/network/quagga/rc.quagga
@@ -4,7 +4,7 @@
 
 start() {
 
-	for SERVICE in zebra bgpd ripd ospfd ripngd ospf6d isisd; do
+	for SERVICE in zebra bgpd isisd ospfd ospf6d pimd ripd ripngd nhrpd; do
 	    if [ -r /etc/quagga/$SERVICE.conf ] ; then
 	    echo -n "Starting ${SERVICE}: " && /usr/sbin/${SERVICE} -d && echo "done"
 	    fi
@@ -13,7 +13,7 @@ start() {
 
 stop() {
 
-	for SERVICE in zebra bgpd ripd ospfd ripngd ospf6d isisd; do
+	for SERVICE in zebra bgpd isisd ospfd ospf6d pimd ripd ripngd nhrpd; do
 	    echo -n "Stopping ${SERVICE}: "
 	    killall $SERVICE 2>/dev/null && echo -n "done" || echo -n "not started"
 	    echo
diff --git a/network/quagga/rc.watchquagga b/network/quagga/rc.watchquagga
index 0f9736e2de..4901da99a8 100644
--- a/network/quagga/rc.watchquagga
+++ b/network/quagga/rc.watchquagga
@@ -3,7 +3,7 @@
 start() {
 	if [ -x /usr/sbin/watchquagga ]; then
 
-	for i in zebra bgpd ripd ospfd ripngd ospf6d isisd; do
+	for i in zebra bgpd isisd ospfd ospf6d pimd ripd ripngd nhrpd; do
 	if [ -e /var/run/quagga/$i.pid ] ; then
 	    WATCHSERVICES="${WATCHSERVICES} ${i}"
 	fi
diff --git a/network/quagga/slack-desc b/network/quagga/slack-desc
index 4c6ccae645..2ebd8efb95 100644
--- a/network/quagga/slack-desc
+++ b/network/quagga/slack-desc
@@ -9,8 +9,8 @@
 quagga: quagga (IP routing daemons)
 quagga:
 quagga: Quagga is a routing software suite, providing implementations of
-quagga: OSPFv2, OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for Unix platforms.
-quagga: Quagga is a fork of GNU Zebra.
+quagga: OSPFv2, OSPFv3, RIP v1 and v2, RIPv3, BGPv4, PIM and NHRP for Unix
+quagga: platforms. Quagga is a fork of GNU Zebra.
 quagga:
 quagga:
 quagga: