network/dropbear: Updated for version 0.52

5 files changed, 42 insertions, 24 deletions

diff --git a/network/dropbear/doinst.sh b/network/dropbear/doinst.sh
index 7b2d54ca18..0b43865a56 100644
--- a/network/dropbear/doinst.sh
+++ b/network/dropbear/doinst.sh
@@ -22,3 +22,10 @@ if [ -e usr/bin/scp ]; then
 fi
 
 config etc/rc.d/rc.dropbear.new
+
+# Create a logfile if one doesn't already exist
+if [ ! -e var/log/dropbear.log ]; then
+  touch var/log/dropbear.log
+  chmod 600 var/log/dropbear.log
+fi
+
diff --git a/network/dropbear/dropbear.SlackBuild b/network/dropbear/dropbear.SlackBuild
index 0419cf8d49..017fffba47 100644
--- a/network/dropbear/dropbear.SlackBuild
+++ b/network/dropbear/dropbear.SlackBuild
@@ -21,9 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dropbear
-VERSION=0.50
+VERSION=0.52
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -33,18 +33,23 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -55,6 +60,8 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --bindir=/usr/sbin \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --disable-syslog \
   --disable-utmp \
   --disable-utmpx \
@@ -64,41 +71,43 @@ CXXFLAGS="$SLKCFLAGS" \
   --disable-pututxline \
   --build=$ARCH-slackware-linux
 
-make PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" MULTI="1" || exit 1
-make DESTDIR=$PKG MULTI="1" install || exit 1
-
-mkdir $PKG/usr/sbin
+make \
+  PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
+  MULTI="1"
+make install \
+  MULTI="1" \
+  DESTDIR=$PKG
 
 # Copy manpages to package
 mkdir -p $PKG/usr/man/man{1,8}
 cp dbclient.1 $PKG/usr/man/man1
 cp dropbearkey.8 dropbear.8 $PKG/usr/man/man8
 
-if [ -d $PKG/usr/man ]; then
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
-fi
 
 # Link binaries to dropbearmulti
-cd $PKG/usr/bin
-  ln -s ../bin/dropbearmulti ../sbin/dropbear
+mkdir $PKG/usr/sbin
+( cd $PKG/usr/sbin ; ln -s ../bin/dropbearmulti dropbear )
+( cd $PKG/usr/bin
   for i in dbclient dropbearkey dropbearconvert scp ; do
-    ln -s dropbearmulti $i
+    ln -s dropbearmulti $i ;
   done
-cd -
+)
 
 mkdir -p $PKG/etc/rc.d
 cat $CWD/rc.dropbear.new > $PKG/etc/rc.d/rc.dropbear.new
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGES INSTALL LICENSE MULTI README SMALL TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  CHANGES INSTALL LICENSE MULTI README SMALL TODO \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/dropbear/dropbear.info b/network/dropbear/dropbear.info
index 759766feef..a3e9038639 100644
--- a/network/dropbear/dropbear.info
+++ b/network/dropbear/dropbear.info
@@ -1,8 +1,10 @@
 PRGNAM="dropbear"
-VERSION="0.50"
+VERSION="0.52"
 HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
-DOWNLOAD="http://matt.ucc.asn.au/dropbear/releases/dropbear-0.50.tar.bz2"
-MD5SUM="212f519111ef0d5903d25d80b2f418f6"
+DOWNLOAD="http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2"
+MD5SUM="a1fc7adf601bca53330a792a9c873439"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Piter PUNK"
 EMAIL="piterpunk@slackware.com"
 APPROVED="Alan Hicks"
diff --git a/network/dropbear/rc.dropbear.new b/network/dropbear/rc.dropbear.new
index 81f92e266f..3135486afe 100644
--- a/network/dropbear/rc.dropbear.new
+++ b/network/dropbear/rc.dropbear.new
@@ -24,7 +24,7 @@ dropbear_restart() {
     echo "         'rc.dropbear restart' without being cut off.  If dropbear has been "
     echo "         upgraded, new connections will now use the new version, which should "
     echo "         be a safe enough approach." 
-    kill `cat /var/run/dropbear.pid`
+    kill $(cat /var/run/dropbear.pid)
   else
     echo "WARNING: There does not appear to be a parent instance of dropbear running."
     echo "         If you really want to kill all running instances of dropbear "
diff --git a/network/dropbear/slack-desc b/network/dropbear/slack-desc
index c2d5c5e517..fe4e459d1b 100644
--- a/network/dropbear/slack-desc
+++ b/network/dropbear/slack-desc
@@ -13,7 +13,7 @@ dropbear: variety of POSIX-based platforms. Dropbear is open source software,
 dropbear: distributed under a MIT-style license. Dropbear is particularly
 dropbear: useful for "embedded"-type Linux (or other Unix) systems, such as 
 dropbear: wireless routers.
-dropbear: 
+dropbear:
 dropbear:
 dropbear:
 dropbear: