diff options
Diffstat (limited to 'source/n/wpa_supplicant/wpa_supplicant.SlackBuild')
| -rwxr-xr-x | source/n/wpa_supplicant/wpa_supplicant.SlackBuild | 40 |
1 files changed, 31 insertions, 9 deletions
diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index 8657c4a6d..f753cc720 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # Copyright 2004-2008 Eric Hameleers, Eindhoven, NL -# Copyright 2008-2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008-2018 Patrick J. Volkerding, Sebeka, MN, USA # Permission to use, copy, modify, and distribute this software for # any purpose with or without fee is hereby granted, provided that # the above copyright notice and this permission notice appear in all @@ -21,9 +21,11 @@ # SUCH DAMAGE. # ----------------------------------------------------------------------------- +cd $(dirname $0) ; CWD=$(pwd) + PKGNAM=wpa_supplicant VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-6} SRCVERSION=$(printf $VERSION | tr _ -) @@ -37,6 +39,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 + NUMJOBS=${NUMJOBS:-" -j7 "} if [ "$ARCH" = "i586" ]; then @@ -59,7 +69,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -76,16 +85,29 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +zcat $CWD/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch.gz | patch -p1 || exit 1 +zcat $CWD/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch.gz | patch -p1 || exit 1 +zcat $CWD/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch.gz | patch -p1 || exit 1 +zcat $CWD/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch.gz | patch -p1 || exit 1 +zcat $CWD/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch.gz | patch -p1 || exit 1 +zcat $CWD/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch.gz | patch -p1 || exit 1 +zcat $CWD/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch.gz | patch -p1 || exit 1 +zcat $CWD/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch.gz | patch -p1 || exit 1 # Fixup various paths in the dbus service file -cat $CWD/patches/dbus-service-file-args.diff | patch -p1 --verbose || exit 1 +zcat $CWD/patches/dbus-service-file-args.diff.gz | patch -p1 --verbose || exit 1 # Eliminate some logspam -cat $CWD/patches/quiet-scan-results-message.diff | patch -p1 --verbose || exit 1 +zcat $CWD/patches/quiet-scan-results-message.diff.gz | patch -p1 --verbose || exit 1 + +# Apply a few other patches from Fedora +zcat $CWD/patches/assoc-timeout.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patches/flush-debug-output.diff.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patches/rh1451834-nl80211-Fix-race-condition-in-detecting-MAC-change.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patches/rh1497640-pae-validate-input-before-pointer.patch.gz | patch -p1 --verbose || exit 1 -# Apply a couple of other patches from Fedora -cat $CWD/patches/assoc-timeout.diff | patch -p1 --verbose || exit 1 -cat $CWD/patches/flush-debug-output.diff | patch -p1 --verbose || exit 1 +# Support OpenSSL-1.1.x: +zcat $CWD/patches/Fix-openssl-1-1-private-key-callback.patch.gz | patch -p1 --verbose || exit 1 cd wpa_supplicant |