4 files changed, 19 insertions, 9 deletions
diff --git a/network/quagga/quagga.SlackBuild b/network/quagga/quagga.SlackBuild
index 1053596a2d..00bf116e82 100644
--- a/network/quagga/quagga.SlackBuild
+++ b/network/quagga/quagga.SlackBuild
@@ -11,7 +11,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=quagga
 VERSION=${VERSION:-1.2.4}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -98,7 +98,7 @@ USE_PAM=${USE_PAM:-NO}
 
 if [ "$USE_PAM" == 'YES' ]; then
     DO_PAM="--with-libpam"
-    zcat $CWD/vtysh_user.c.diff.gz | patch -p1
+    cat $CWD/vtysh_user.c.diff.gz | patch -p1
     mkdir -p $PKG/etc/pam.d
     cat $CWD/quagga.pam > $PKG/etc/pam.d/quagga
 else
@@ -106,8 +106,9 @@ else
 fi
 
 #./bootstrap.sh
+autoreconf -fi
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
     --prefix=/usr \
@@ -132,7 +133,7 @@ make install DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-chown -R root.root $PKG/usr/sbin
+chown -R root:root $PKG/usr/sbin
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -141,18 +142,20 @@ rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*
 
 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
+chown root:quagga $PKG/etc/quagga ; chmod 750 $PKG/etc/quagga
+chown -R root:quagga $PKG/etc/quagga/* ; chmod 640 $PKG/etc/quagga/*.sample
 
 mkdir -p $PKG/var/run/quagga $PKG/var/log/quagga
-chown quagga.quagga $PKG/var/run/quagga ; chmod 770 $PKG/var/run/quagga
-chown quagga.quagga $PKG/var/log/quagga ; chmod 770 $PKG/var/log/quagga
+chown quagga:quagga $PKG/var/run/quagga ; chmod 770 $PKG/var/run/quagga
+chown quagga:quagga $PKG/var/log/quagga ; chmod 770 $PKG/var/log/quagga
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS ChangeLog COPYING* README INSTALL REPORTING-BUGS TODO SERVICES \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
+rm -f $PKG/usr/lib*/*.la
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
diff --git a/network/quagga/quagga.info b/network/quagga/quagga.info
index c7d88e4c6e..21efebc7ba 100644
--- a/network/quagga/quagga.info
+++ b/network/quagga/quagga.info
@@ -1,7 +1,7 @@
 PRGNAM="quagga"
 VERSION="1.2.4"
 HOMEPAGE="http://www.nongnu.org/quagga/"
-DOWNLOAD="http://download.savannah.gnu.org/releases/quagga/quagga-1.2.4.tar.gz"
+DOWNLOAD="http://distcache.freebsd.org/ports-distfiles/quagga-1.2.4.tar.gz"
 MD5SUM="eced21b054d71c9e1b7c6ac43286a166"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
diff --git a/network/quagga/vtysh_user.c.diff b/network/quagga/vtysh_user.c.diff
new file mode 100644
index 0000000000..7dfad30861
--- /dev/null
+++ b/network/quagga/vtysh_user.c.diff
@@ -0,0 +1,7 @@
+--- old/vtysh/vtysh_user.c.orig	2006-11-03 01:53:58.000000000 +0100
++++ new/vtysh/vtysh_user.c	2006-11-03 01:59:02.000000000 +0100
+@@ -60,2 +60,4 @@ vtysh_pam (const char *user)
+     ret = pam_authenticate (pamh, 0);
++  if (ret != PAM_SUCCESS)
++    printf("Not authenticated. Check /etc/pam.d/quagga.\n");
+   /* printf ("ret %d\n", ret); */
diff --git a/network/quagga/vtysh_user.c.diff.gz b/network/quagga/vtysh_user.c.diff.gz
deleted file mode 100644
index 4bdc3d8455..0000000000
--- a/network/quagga/vtysh_user.c.diff.gz
+++ /dev/null