From c51a629483f6dbf16951d9589000a8ce28317cf4 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 22 Apr 2019 20:00:44 +0000 Subject: Mon Apr 22 20:00:44 UTC 2019 a/aaa_terminfo-6.1_20190420-x86_64-1.txz: Upgraded. l/ncurses-6.1_20190420-x86_64-1.txz: Upgraded. n/wpa_supplicant-2.8-x86_64-1.txz: Upgraded. xap/xpdf-4.00-x86_64-4.txz: Rebuilt. Recompiled with -DSYSTEM_XPDFRC="/etc/xpdfrc". Thanks to J_W. --- ...pa_supplicant-2.7-fix-undefined-remove-ie.patch | 38 ---------------------- .../patches/wpa_supplicant-assoc-timeout.patch | 16 --------- .../wpa_supplicant-dbus-service-file-args.patch | 20 ------------ source/n/wpa_supplicant/wpa_supplicant.SlackBuild | 5 +-- 4 files changed, 1 insertion(+), 78 deletions(-) delete mode 100644 source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch delete mode 100644 source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch delete mode 100644 source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch (limited to 'source/n') diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch deleted file mode 100644 index 97a8cc7f..00000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 3 Dec 2018 12:00:26 +0200 -Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y - -remove_ie() was defined within an ifdef CONFIG_FILS block while it is -now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition -there. - -Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol") -Signed-off-by: Jouni Malinen ---- - wpa_supplicant/sme.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c -index 39c8069..f77f751 100644 ---- a/wpa_supplicant/sme.c -+++ b/wpa_supplicant/sme.c -@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) - } - - --#ifdef CONFIG_FILS - #ifdef CONFIG_IEEE80211R - static void remove_ie(u8 *buf, size_t *len, u8 eid) - { -@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid) - } - } - #endif /* CONFIG_IEEE80211R */ --#endif /* CONFIG_FILS */ - - - void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, --- -cgit v0.12 - diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch deleted file mode 100644 index c3b3568c..00000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c.assoc-timeout wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c ---- wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c.assoc-timeout 2010-09-07 10:43:39.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c 2010-12-07 18:57:45.163457000 -0600 -@@ -1262,10 +1262,10 @@ void wpa_supplicant_associate(struct wpa - - if (assoc_failed) { - /* give IBSS a bit more time */ -- timeout = ssid->mode == WPAS_MODE_IBSS ? 10 : 5; -+ timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 10; - } else if (wpa_s->conf->ap_scan == 1) { - /* give IBSS a bit more time */ -- timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 10; -+ timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 20; - } - wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0); - } diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch deleted file mode 100644 index b7478dad..00000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora 2008-03-02 20:58:35.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2008-03-02 20:58:41.000000000 -0500 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.w1.wpa_supplicant1 --Exec=@BINDIR@/wpa_supplicant -u -+Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora 2008-03-02 20:58:35.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2008-03-02 20:58:41.000000000 -0500 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.epitest.hostap.WPASupplicant --Exec=@BINDIR@/wpa_supplicant -u -+Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index f8386788..5273f8f1 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -25,7 +25,7 @@ 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:-4} +BUILD=${BUILD:-1} SRCVERSION=$(printf $VERSION | tr _ -) @@ -85,12 +85,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/patches/wpa_supplicant-assoc-timeout.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/wpa_supplicant-dbus-service-file-args.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-flush-debug-output.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-gui-qt4.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-quiet-scan-results-message.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch.gz | patch -p1 --verbose || exit 1 # Allow legacy tls to avoid breaking WPA2-Enterprise: zcat $CWD/patches/allow-tlsv1.patch.gz | patch -p1 --verbose || exit 1 -- cgit v1.2.3