network/dropbear: Updated for version 2016.73.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
This commit is contained in:
parent
7b7b9234f1
commit
148624f67c
|
@ -10,18 +10,23 @@ config() {
|
|||
# Otherwise, we leave the .new copy for the admin to consider...
|
||||
}
|
||||
|
||||
# Keep same perms on rc.dropbear.new:
|
||||
if [ -e etc/rc.d/rc.dropbear ]; then
|
||||
cp -a etc/rc.d/rc.dropbear etc/rc.d/rc.dropbear.new.incoming
|
||||
cat etc/rc.d/rc.dropbear.new > etc/rc.d/rc.dropbear.new.incoming
|
||||
mv etc/rc.d/rc.dropbear.new.incoming etc/rc.d/rc.dropbear.new
|
||||
fi
|
||||
preserve_perms() {
|
||||
NEW="$1"
|
||||
OLD="$(dirname $NEW)/$(basename $NEW .new)"
|
||||
if [ -e $OLD ]; then
|
||||
cp -a $OLD ${NEW}.incoming
|
||||
cat $NEW > ${NEW}.incoming
|
||||
mv ${NEW}.incoming $NEW
|
||||
fi
|
||||
config $NEW
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# Create a logfile if one doesn't already exist
|
||||
if [ ! -e var/log/dropbear.log ]; then
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
PRGNAM=dropbear
|
||||
VERSION=0.52
|
||||
VERSION=${VERSION:-2016.73}
|
||||
BUILD=${BUILD:-1}
|
||||
TAG=${TAG:-_SBo}
|
||||
|
||||
|
@ -35,7 +35,7 @@ fi
|
|||
|
||||
CWD=$(pwd)
|
||||
TMP=${TMP:-/tmp/SBo}
|
||||
PKG=$TMP/pkg-$PRGNAM
|
||||
PKG=$TMP/package-$PRGNAM
|
||||
OUTPUT=${OUTPUT:-/tmp}
|
||||
|
||||
if [ "$ARCH" = "i486" ]; then
|
||||
|
@ -65,10 +65,7 @@ find -L . \
|
|||
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
|
||||
-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 {} \;
|
||||
|
||||
# Apply xauth path patch
|
||||
patch -p0 < $CWD/dropbear.xauth.patch
|
||||
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
|
||||
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
|
@ -76,6 +73,7 @@ CXXFLAGS="$SLKCFLAGS" \
|
|||
--prefix=/usr \
|
||||
--bindir=/usr/sbin \
|
||||
--libdir=/usr/lib${LIBDIRSUFFIX} \
|
||||
--mandir=/usr/man \
|
||||
--disable-syslog \
|
||||
--disable-utmp \
|
||||
--disable-utmpx \
|
||||
|
@ -92,32 +90,14 @@ 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
|
||||
|
||||
( 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
|
||||
)
|
||||
|
||||
# Link binaries to dropbearmulti
|
||||
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 ;
|
||||
done
|
||||
)
|
||||
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/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
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
PRGNAM="dropbear"
|
||||
VERSION="0.52"
|
||||
HOMEPAGE="http://matt.ucc.asn.au/dropbear/dropbear.html"
|
||||
DOWNLOAD="http://matt.ucc.asn.au/dropbear/releases/dropbear-0.52.tar.bz2"
|
||||
MD5SUM="a1fc7adf601bca53330a792a9c873439"
|
||||
VERSION="2016.73"
|
||||
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_x86_64=""
|
||||
MD5SUM_x86_64=""
|
||||
REQUIRES=""
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
--- options.h.old 2008-01-29 11:54:45.000000000 -0200
|
||||
+++ options.h 2008-01-29 11:54:52.000000000 -0200
|
||||
@@ -197,7 +197,7 @@
|
||||
/* The command to invoke for xauth when using X11 forwarding.
|
||||
* "-q" for quiet */
|
||||
#ifndef XAUTH_COMMAND
|
||||
-#define XAUTH_COMMAND "/usr/X11R6/bin/xauth -q"
|
||||
+#define XAUTH_COMMAND "/usr/bin/xauth -q"
|
||||
#endif
|
||||
|
||||
/* if you want to enable running an sftp server (such as the one included with
|
Loading…
Reference in New Issue