system/burp: Updated for version 2.0.54 + new maintainer.

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

5 files changed, 76 insertions, 65 deletions

diff --git a/system/burp/README b/system/burp/README
index 2166ad1e88..98d0f7cc4c 100644
--- a/system/burp/README
+++ b/system/burp/README
@@ -1,3 +1,5 @@
 Burp is a backup and restore program. It uses librsync in order to save on
 the amount of space that is used by each backup. It also uses VSS (Volume
 Shadow Copy Service) to make snapshots when backing up Windows computers.
+
+See README.SBo for information about starting and stopping burp.
diff --git a/system/burp/README.SBo b/system/burp/README.SBo
index d86b102ddf..6bcdb4472c 100644
--- a/system/burp/README.SBo
+++ b/system/burp/README.SBo
@@ -1,19 +1,19 @@
-To start the burp server run:
+To start the burp server run
 
-/etc/rc.d/rc.burp start
+  /etc/rc.d/rc.burp start
 
 To start burp automatically on boot up, add these lines to /etc/rc.d/rc.local
 
-# Start burp
-if [ -x /etc/rc.d/rc.burp ]; then
-  /etc/rc.d/rc.burp start
-fi
+  # Start burp
+  if [ -x /etc/rc.d/rc.burp ]; then
+    /etc/rc.d/rc.burp start
+  fi
 
 and the following lines in /etc/rc.d/rc.local_shutdown to stop burp on shutdown
 
-# Stop burp
-if [ -x /etc/rc.d/rc.burp ]; then
-  /etc/rc.d/rc.burp stop
-fi
+  # Stop burp
+  if [ -x /etc/rc.d/rc.burp ]; then
+    /etc/rc.d/rc.burp stop
+  fi
 
 Naturally, ensure that all these scripts have executable permissions.
diff --git a/system/burp/burp.SlackBuild b/system/burp/burp.SlackBuild
index 8f62985990..5d7400d5d2 100644
--- a/system/burp/burp.SlackBuild
+++ b/system/burp/burp.SlackBuild
@@ -23,14 +23,16 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Maintained by David Spencer <baildon.research@googlemail.com>
+
 PRGNAM=burp
-VERSION=${VERSION:-1.3.48}
+VERSION=${VERSION:-2.0.54}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -41,8 +43,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"
@@ -60,23 +62,20 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
-cd $PRGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-# Maximum compression for the man files
-sed -i 's/gzip/gzip -9/1' manpages/Makefile*
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/ \
+  --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc/$PRGNAM \
   --localstatedir=/var \
@@ -85,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --build=$ARCH-slackware-linux
 
 make
-make install DESTDIR=$PKG
+make install-all DESTDIR=$PKG
 
 # Install the handy rc script
 install -D -m 755 -o root -g root $CWD/rc.burp $PKG/etc/rc.d/rc.burp
@@ -93,6 +92,9 @@ install -D -m 755 -o root -g root $CWD/rc.burp $PKG/etc/rc.d/rc.burp
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
+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
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   CHANGELOG CONTRIBUTORS DONATIONS LICENSE README TODO UPGRADING docs \
@@ -109,8 +111,11 @@ cd $PKG
 for FILE in $(find etc -type f); do
   mv $FILE $FILE.new
   # Preserve the permissions only of executable config files
-  [ -x $FILE.new ] && echo preserve_perms $FILE.new >> $PKG/install/doinst.sh \
-    || echo config $FILE.new >> $PKG/install/doinst.sh
+  if [ -x $FILE.new ]; then
+    echo preserve_perms $FILE.new >> $PKG/install/doinst.sh
+  else
+    echo config $FILE.new >> $PKG/install/doinst.sh
+  fi
 done
 
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/burp/burp.info b/system/burp/burp.info
index f1f9f326d9..9c7e9334fd 100644
--- a/system/burp/burp.info
+++ b/system/burp/burp.info
@@ -1,10 +1,10 @@
 PRGNAM="burp"
-VERSION="1.3.48"
+VERSION="2.0.54"
 HOMEPAGE="http://burp.grke.net"
-DOWNLOAD="http://sourceforge.net/projects/burp/files/burp-1.3.48/burp-1.3.48.tar.bz2"
-MD5SUM="87116e5b1ed179c553ddbe563fa7252a"
+DOWNLOAD="http://sourceforge.net/projects/burp/files/burp-2.0.54/burp-2.0.54.tar.bz2"
+MD5SUM="2244811cc53127ad5283dd1d830f11ba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="librsync"
-MAINTAINER="Ryan P.C. McQuen"
-EMAIL="ryanpcmcquen@member.fsf.org"
+REQUIRES="librsync uthash"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"
diff --git a/system/burp/rc.burp b/system/burp/rc.burp
index 9f4b117e6f..89e71e8812 100644
--- a/system/burp/rc.burp
+++ b/system/burp/rc.burp
@@ -3,29 +3,33 @@
 
 RETVAL=0
 
-start(){
-    echo "Starting burp: /usr/sbin/burp -c /etc/burp/burp-server.conf"
-    /usr/sbin/burp -c /etc/burp/burp-server.conf
-    RETVAL=$?
-    [ "$RETVAL" = 0 ] && touch /var/lock/subsys/burp
-    return $RETVAL
+start()
+{
+  echo "Starting burp: /usr/sbin/burp -c /etc/burp/burp-server.conf"
+  /usr/sbin/burp -c /etc/burp/burp-server.conf
+  RETVAL=$?
+  [ "$RETVAL" = 0 ] && touch /var/lock/subsys/burp
+  return $RETVAL
 }
 
-stop(){
-    echo "Stopping burp... "
-    killall burp 2>/dev/null
-    RETVAL=$?
-    rm -f /var/lock/subsys/burp
-    return $RETVAL
+stop()
+{
+  echo "Stopping burp... "
+  killall burp 2>/dev/null
+  RETVAL=$?
+  rm -f /var/lock/subsys/burp
+  return $RETVAL
 }
 
-restart(){
-    stop
-    sleep 1
-    start
+restart()
+{
+  stop
+  sleep 1
+  start
 }
 
-status(){
+status()
+{
   echo -n $"Checking burp: "
   /bin/kill -s IOT burp 2>/dev/null
   RETVAL=$?
@@ -37,23 +41,23 @@ status(){
   return $RETVAL
 }
 
-# See how we were called.
 case "$1" in
-    start)
-	start
-	;;
-    stop)
-	stop
-	;;
-    restart)
-	restart
-	;;
-    status)
-        status
-	;;
-    *)
-	echo $"Usage: $0 {start|stop|restart|status}"
-	RETVAL=1
+  start)
+	  start
+	  ;;
+  stop)
+	  stop
+    ;;
+  restart)
+	  restart
+	  ;;
+  status)
+    status
+	  ;;
+  *)
+	  echo $"Usage: $0 {start|stop|restart|status}"
+	  RETVAL=1
+    ;;
 esac
 
 exit $RETVAL