diff options
Diffstat (limited to 'source/n/openssh/openssh.SlackBuild')
| -rwxr-xr-x | source/n/openssh/openssh.SlackBuild | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild index a917ee801..2620da6c8 100755 --- a/source/n/openssh/openssh.SlackBuild +++ b/source/n/openssh/openssh.SlackBuild @@ -1,8 +1,8 @@ -#!/bin/sh +#!/bin/bash # Copyright 2000 BSDi, Inc. Concord, CA, USA # Copyright 2001, 2002, 2003, 2004 Slackware Linux, Inc. Concord, CA, USA -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,14 +22,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) # Set initial variables: -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-openssh +PKGNAM=openssh VERSION=${VERSION:-$(echo openssh-*.tar.gz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-5} NUMJOBS=${NUMJOBS:--j6} @@ -43,6 +44,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "s390" ]; then @@ -65,11 +74,21 @@ mkdir -p $PKG cd $TMP rm -rf $PKG openssh-$VERSION tar xvf $CWD/openssh-$VERSION.tar.gz || tar xvf $CWD/openssh-$VERSION.tar.?z* || exit 1 -cd openssh-$VERSION +cd openssh-$VERSION || exit 1 chown -R root:root . +# OpenSSL 1.1.x support: +zcat $CWD/openssl-1.1.0.patch.gz | patch -p1 --verbose || exit 1 + +# Don't bail on finding OpenSSL 1.1.x, it's fine: +zcat $CWD/openssh.no.openssl.version.check.diff.gz | patch -p1 --verbose || exit 1 + # Restore support for tcpwrappers: -zcat $CWD/openssh-7.2p1-libwrap.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/openssh.tcp_wrappers.diff.gz | patch -p1 --verbose || exit 1 + +# Fix tunnel forwarding with -w option: +zcat $CWD/openssh.fix_tunnel_forwarding.diff.gz | patch -p1 --verbose || exit 1 + autoreconf -vif # Compile package: @@ -84,12 +103,12 @@ CFLAGS="$SLKCFLAGS" \ --with-default-path=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin \ --with-privsep-path=/var/empty \ --with-privsep-user=sshd \ - --build=$ARCH-slackware-linux + --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 # Install the package: -make install DESTDIR=$PKG +make install DESTDIR=$PKG || exit 1 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null @@ -113,6 +132,10 @@ fi mkdir -p $PKG/var/empty chmod 755 $PKG/var/empty +# Install defaults file +mkdir -p $PKG/etc/default +cat $CWD/sshd.default > $PKG/etc/default/sshd.new + # Install docs: mkdir -p $PKG/usr/doc/openssh-$VERSION cp -a \ |