3 files changed, 18 insertions, 16 deletions
diff --git a/network/miredo/miredo.SlackBuild b/network/miredo/miredo.SlackBuild
index 5e338253fa..0386b3c32d 100644
--- a/network/miredo/miredo.SlackBuild
+++ b/network/miredo/miredo.SlackBuild
@@ -1,7 +1,7 @@
-#!/bin/sh
-#
+#!/bin/bash
+
 # Slackware build script for Miredo
-#
+
 # Copyright 2011  Fridrich von Stauffenberg <cancellor2@gmail.com>
 # All rights reserved.
 #
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=miredo
-VERSION=1.2.4
+VERSION=1.2.5
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,11 +56,12 @@ fi
 
 if [ "${NOBODY:-no}" = "no" ]; then
   if ! grep -q "^$PRGNAM:" /etc/passwd || ! grep -q "^$PRGNAM:" /etc/group; then
-    echo "You must have a $PRGNAM user and $PRGNAM group to run this script:"
-    echo ""
-    echo "   groupadd -g 255 miredo"
-    echo "   useradd -u 255 -g 255 -c \"Teredo IPv6 Tunneling\" -d /dev/null -s /bin/false miredo"
-
+    cat << EOF
+You must have a $PRGNAM user and $PRGNAM group to run this script.
+Something like this should suffice for most systems:
+  # groupadd -g 255 miredo
+  # useradd -u 255 -g 255 -c "Teredo IPv6 Tunneling" -d /dev/null -s /bin/false miredo
+EOF
     exit 1
   fi
   enable_user="--enable-$PRGNAM-user"
@@ -74,11 +75,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
@@ -96,7 +98,7 @@ install -D -m 0644 $CWD/rc.$PRGNAM $PKG/etc/rc.d/rc.$PRGNAM.new
 ( cd $PKG/etc/$PRGNAM ; mv $PRGNAM.conf{,.new} )
 
 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
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 cp ChangeLog AUTHORS THANKS COPYING INSTALL README NEWS TODO ABOUT-NLS \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/network/miredo/miredo.info b/network/miredo/miredo.info
index e4c673db68..5aa2aed37b 100644
--- a/network/miredo/miredo.info
+++ b/network/miredo/miredo.info
@@ -1,10 +1,10 @@
 PRGNAM="miredo"
-VERSION="1.2.4"
+VERSION="1.2.5"
 HOMEPAGE="http://www.remlab.net/miredo"
-DOWNLOAD="http://www.remlab.net/files/miredo/miredo-1.2.4.tar.bz2"
-MD5SUM="1281e7e75bddbde244cd778d99fa22d4"
+DOWNLOAD="http://www.remlab.net/files/miredo/miredo-1.2.5.tar.xz"
+MD5SUM="5114debbf9fcab5d292176e4548f8cd1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Fridrich von Stauffenberg"
 EMAIL="cancellor2@gmail.com"
-APPROVED="Niels Horn"
+APPROVED="dsomero"
diff --git a/network/miredo/slack-desc b/network/miredo/slack-desc
index f6058c3414..d2cec8b3a8 100644
--- a/network/miredo/slack-desc
+++ b/network/miredo/slack-desc
@@ -6,7 +6,7 @@
 # customary to leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-miredo: Miredo (teredo IPv6 tunneling)
+miredo: miredo (teredo IPv6 tunneling)
 miredo:
 miredo: Miredo is an opensource Teredo IPv6 tunneling software for Linux
 miredo: and BSD operating systems. It includes functional implementations