From d983f44f67a6763bb6c19abc2168e3adb12762d0 Mon Sep 17 00:00:00 2001
From: Andrew Clemons <andrew.clemons@gmail.com>
Date: Sun, 21 May 2017 08:21:27 +0700
Subject: [PATCH] network/dropbear: Updated for version 2017.75, new
 maintainer.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 network/dropbear/README              |  2 +-
 network/dropbear/doinst.sh           |  6 +++---
 network/dropbear/dropbear.SlackBuild | 20 ++++++++++++--------
 network/dropbear/dropbear.info       | 10 +++++-----
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/network/dropbear/README b/network/dropbear/README
index 625d2d433c..6b32bd804e 100644
--- a/network/dropbear/README
+++ b/network/dropbear/README
@@ -3,7 +3,7 @@ dropbear (SSH server and client)
 Dropbear is a relatively small SSH 2 server and client. It runs on a
 variety of POSIX-based platforms. Dropbear is open source software,
 distributed under a MIT-style license. Dropbear is particularly
-useful for "embedded"-type Linux (or other Unix) systems, such as 
+useful for "embedded"-type Linux (or other Unix) systems, such as
 wireless routers.
 
 Please note that this package conflicts with OpenSSH's scp binary.
diff --git a/network/dropbear/doinst.sh b/network/dropbear/doinst.sh
index 9e867318e5..0ab69ba9ff 100644
--- a/network/dropbear/doinst.sh
+++ b/network/dropbear/doinst.sh
@@ -4,7 +4,8 @@ config() {
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
@@ -25,12 +26,11 @@ if [ -e usr/bin/scp ]; then
   mv usr/bin/scp usr/bin/scp.openssh
 fi
 
-config etc/rc.d/rc.dropbear.new
 preserve_perms etc/rc.d/rc.dropbear.new
+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 d9791560f1..6b86ba9ff3 100644
--- a/network/dropbear/dropbear.SlackBuild
+++ b/network/dropbear/dropbear.SlackBuild
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright 2007-2008, Piter Punk, São Paulo, Brazil
+# Copyright 2017, Andrew Clemons, Wellington New Zealand
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -9,7 +10,7 @@
 # 1. Redistributions of this script must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 #
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
 #  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
 #  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -21,13 +22,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=dropbear
-VERSION=${VERSION:-2016.73}
+VERSION=${VERSION:-2017.75}
 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
@@ -38,11 +39,11 @@ 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" = "s390" ]; then
-  SLKCFLAGS="-O2"
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
@@ -90,6 +91,9 @@ make install \
   MULTI="1" \
   DESTDIR=$PKG
 
+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
 
@@ -101,7 +105,7 @@ cp -a CHANGES INSTALL LICENSE MULTI README SMALL TODO $PKG/usr/doc/$PRGNAM-$VERS
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh  > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /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 7e76d3c969..214c3f86e9 100644
--- a/network/dropbear/dropbear.info
+++ b/network/dropbear/dropbear.info
@@ -1,10 +1,10 @@
 PRGNAM="dropbear"
-VERSION="2016.73"
+VERSION="2017.75"
 HOMEPAGE="https://matt.ucc.asn.au/dropbear/dropbear.html"
-DOWNLOAD="https://matt.ucc.asn.au/dropbear/releases/dropbear-2016.73.tar.bz2"
-MD5SUM="8d6d78ce60ca52350ec04fcbd711ce9b"
+DOWNLOAD="https://matt.ucc.asn.au/dropbear/releases/dropbear-2017.75.tar.bz2"
+MD5SUM="e57e9b9d25705dcb073ba15c416424fd"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Piter PUNK"
-EMAIL="piterpunk@slackware.com"
+MAINTAINER="Andrew Clemons"
+EMAIL="andrew.clemons@gmail.com"