diff options
54 files changed, 925 insertions, 2943 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index 2e2f239f..9c1cd65a 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,54 @@ <description>Tracking Slackware development in git.</description> <language>en-us</language> <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id> - <pubDate>Mon, 7 Jan 2019 23:22:24 GMT</pubDate> - <lastBuildDate>Tue, 8 Jan 2019 07:59:43 GMT</lastBuildDate> + <pubDate>Wed, 9 Jan 2019 03:21:06 GMT</pubDate> + <lastBuildDate>Wed, 9 Jan 2019 07:59:38 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.10</generator> <item> + <title>Wed, 9 Jan 2019 03:21:06 GMT</title> + <pubDate>Wed, 9 Jan 2019 03:21:06 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20190109032106</link> + <guid isPermaLink="false">20190109032106</guid> + <description> + <![CDATA[<pre> +ap/alsa-utils-1.1.8-x86_64-1.txz: Upgraded. +ap/gutenprint-5.3.1-x86_64-1.txz: Upgraded. + Shared library .so-version bump. +l/alsa-lib-1.1.8-x86_64-1.txz: Upgraded. +l/alsa-oss-1.1.8-x86_64-1.txz: Upgraded. +l/alsa-plugins-1.1.8-x86_64-1.txz: Upgraded. +extra/pure-alsa-system/alsa-lib-1.1.8-x86_64-1_alsa.txz: Upgraded. +extra/pure-alsa-system/alsa-plugins-1.1.8-x86_64-1_alsa.txz: Upgraded. + </pre>]]> + </description> + </item> + <item> + <title>Tue, 8 Jan 2019 21:16:29 GMT</title> + <pubDate>Tue, 8 Jan 2019 21:16:29 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20190108211629</link> + <guid isPermaLink="false">20190108211629</guid> + <description> + <![CDATA[<pre> +a/lvm2-2.02.177-x86_64-1.txz: Upgraded. + Done beta testing newer versions of LVM2 for a while, and back to what's + known to work properly. +a/sysvinit-scripts-2.1-noarch-25.txz: Rebuilt. + Call /etc/rc.d/rc.setterm instead of running setterm directly. +a/util-linux-2.33-x86_64-3.txz: Rebuilt. + Added /etc/rc.d/rc.setterm to allow editing the setterm command line. +d/mercurial-4.8.2-x86_64-1.txz: Upgraded. +d/scons-3.0.3-x86_64-1.txz: Upgraded. +l/gtk+3-3.24.2-x86_64-2.txz: Rebuilt. + Patched to fix segfaults. Thanks to bassmadrigal. +n/mutt-1.11.2-x86_64-1.txz: Upgraded. +n/wpa_supplicant-2.7-x86_64-3.txz: Rebuilt. + Moved from /testing as the patches seem to fix the issues with + WPA2-Enterprise. +x/xcursorgen-1.0.7-x86_64-1.txz: Upgraded. + </pre>]]> + </description> + </item> + <item> <title>Mon, 7 Jan 2019 23:22:24 GMT</title> <pubDate>Mon, 7 Jan 2019 23:22:24 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20190107232224</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index 2a7967ad..21dfa561 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,31 @@ +Wed Jan 9 03:21:06 UTC 2019 +ap/alsa-utils-1.1.8-x86_64-1.txz: Upgraded. +ap/gutenprint-5.3.1-x86_64-1.txz: Upgraded. + Shared library .so-version bump. +l/alsa-lib-1.1.8-x86_64-1.txz: Upgraded. +l/alsa-oss-1.1.8-x86_64-1.txz: Upgraded. +l/alsa-plugins-1.1.8-x86_64-1.txz: Upgraded. +extra/pure-alsa-system/alsa-lib-1.1.8-x86_64-1_alsa.txz: Upgraded. +extra/pure-alsa-system/alsa-plugins-1.1.8-x86_64-1_alsa.txz: Upgraded. ++--------------------------+ +Tue Jan 8 21:16:29 UTC 2019 +a/lvm2-2.02.177-x86_64-1.txz: Upgraded. + Done beta testing newer versions of LVM2 for a while, and back to what's + known to work properly. +a/sysvinit-scripts-2.1-noarch-25.txz: Rebuilt. + Call /etc/rc.d/rc.setterm instead of running setterm directly. +a/util-linux-2.33-x86_64-3.txz: Rebuilt. + Added /etc/rc.d/rc.setterm to allow editing the setterm command line. +d/mercurial-4.8.2-x86_64-1.txz: Upgraded. +d/scons-3.0.3-x86_64-1.txz: Upgraded. +l/gtk+3-3.24.2-x86_64-2.txz: Rebuilt. + Patched to fix segfaults. Thanks to bassmadrigal. +n/mutt-1.11.2-x86_64-1.txz: Upgraded. +n/wpa_supplicant-2.7-x86_64-3.txz: Rebuilt. + Moved from /testing as the patches seem to fix the issues with + WPA2-Enterprise. +x/xcursorgen-1.0.7-x86_64-1.txz: Upgraded. ++--------------------------+ Mon Jan 7 23:22:24 UTC 2019 a/plzip-1.8-x86_64-1.txz: Upgraded. ap/mariadb-10.3.12-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 2c551422..06fc1dcf 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Mon Jan 7 23:34:32 UTC 2019 +Wed Jan 9 03:32:32 UTC 2019 Here is the file list for this directory. If you are using a mirror site and find missing or extra files in the disk subdirectories, please have the archive administrator refresh the mirror. -drwxr-xr-x 12 root root 4096 2019-01-07 23:22 . +drwxr-xr-x 12 root root 4096 2019-01-09 03:21 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 14341 2018-11-29 05:40 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 915671 2019-01-06 20:16 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-01-06 20:16 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 912591 2019-01-08 21:29 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-01-08 21:29 ./CHECKSUMS.md5.asc -rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING -rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3 -rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT -rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT --rw-r--r-- 1 root root 542446 2019-01-07 23:22 ./ChangeLog.txt +-rw-r--r-- 1 root root 543711 2019-01-09 03:21 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2018-12-29 23:12 ./EFI/BOOT -rw-r--r-- 1 root root 1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2018-12-29 23:12 ./EFI/BOOT -rwxr-xr-x 1 root root 2494 2018-02-24 20:49 ./EFI/BOOT/make-grub.sh -rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg -rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg --rw-r--r-- 1 root root 1205057 2019-01-06 20:15 ./FILELIST.TXT +-rw-r--r-- 1 root root 1201168 2019-01-08 21:28 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 730962 2019-01-07 23:32 ./PACKAGES.TXT +-rw-r--r-- 1 root root 730962 2019-01-09 03:30 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3634 2018-12-29 22:37 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -39,12 +39,12 @@ drwxr-xr-x 2 root root 4096 2018-12-29 23:12 ./EFI/BOOT -rw-r--r-- 1 root root 17294 2008-12-08 18:13 ./SPEAK_INSTALL.TXT -rw-r--r-- 1 root root 57632 2016-06-29 18:46 ./Slackware-HOWTO -rw-r--r-- 1 root root 6668 2018-08-28 21:58 ./UPGRADE.TXT -drwxr-xr-x 18 root root 4096 2018-12-11 01:24 ./extra --rw-r--r-- 1 root root 54694 2018-12-11 01:24 ./extra/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2018-12-11 01:24 ./extra/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 67398 2018-12-11 01:24 ./extra/FILE_LIST --rw-r--r-- 1 root root 183558 2018-12-11 01:24 ./extra/MANIFEST.bz2 --rw-r--r-- 1 root root 46467 2018-12-11 01:24 ./extra/PACKAGES.TXT +drwxr-xr-x 18 root root 4096 2019-01-09 03:27 ./extra +-rw-r--r-- 1 root root 54694 2019-01-09 03:27 ./extra/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-01-09 03:27 ./extra/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 67398 2019-01-09 03:27 ./extra/FILE_LIST +-rw-r--r-- 1 root root 183550 2019-01-09 03:27 ./extra/MANIFEST.bz2 +-rw-r--r-- 1 root root 46467 2019-01-09 03:27 ./extra/PACKAGES.TXT -rw-r--r-- 1 root root 149 2002-02-09 00:18 ./extra/README.TXT drwxr-xr-x 2 root root 20480 2018-11-09 21:53 ./extra/aspell-word-lists -rw-r--r-- 1 root root 171 2016-06-06 20:10 ./extra/aspell-word-lists/aspell-af-0.50_0-x86_64-5.txt @@ -355,17 +355,17 @@ drwxr-xr-x 2 root root 4096 2018-02-27 06:13 ./extra/google-chrome -rwxr-xr-x 1 root root 3921 2015-03-05 21:54 ./extra/google-chrome/google-chrome.SlackBuild -rw-r--r-- 1 root root 840 2018-02-27 06:13 ./extra/google-chrome/slack-desc lrwxrwxrwx 1 root root 11 2012-07-30 20:41 ./extra/java -> source/java -drwxr-xr-x 2 root root 4096 2018-12-11 01:24 ./extra/pure-alsa-system +drwxr-xr-x 2 root root 4096 2019-01-09 03:27 ./extra/pure-alsa-system -rw-r--r-- 1 root root 625 2018-07-20 20:54 ./extra/pure-alsa-system/MPlayer-20180720-x86_64-1_alsa.txt -rw-r--r-- 1 root root 2729356 2018-07-20 20:54 ./extra/pure-alsa-system/MPlayer-20180720-x86_64-1_alsa.txz -rw-r--r-- 1 root root 163 2018-07-20 20:54 ./extra/pure-alsa-system/MPlayer-20180720-x86_64-1_alsa.txz.asc -rwxr-xr-x 1 root root 1211 2018-10-24 20:26 ./extra/pure-alsa-system/README --rw-r--r-- 1 root root 401 2018-11-14 19:36 ./extra/pure-alsa-system/alsa-lib-1.1.7-x86_64-2_alsa.txt --rw-r--r-- 1 root root 450348 2018-11-14 19:36 ./extra/pure-alsa-system/alsa-lib-1.1.7-x86_64-2_alsa.txz --rw-r--r-- 1 root root 163 2018-11-14 19:36 ./extra/pure-alsa-system/alsa-lib-1.1.7-x86_64-2_alsa.txz.asc --rw-r--r-- 1 root root 402 2018-10-24 19:04 ./extra/pure-alsa-system/alsa-plugins-1.1.7-x86_64-4_alsa.txt --rw-r--r-- 1 root root 53468 2018-10-24 19:04 ./extra/pure-alsa-system/alsa-plugins-1.1.7-x86_64-4_alsa.txz --rw-r--r-- 1 root root 163 2018-10-24 19:04 ./extra/pure-alsa-system/alsa-plugins-1.1.7-x86_64-4_alsa.txz.asc +-rw-r--r-- 1 root root 401 2019-01-09 02:05 ./extra/pure-alsa-system/alsa-lib-1.1.8-x86_64-1_alsa.txt +-rw-r--r-- 1 root root 453632 2019-01-09 02:05 ./extra/pure-alsa-system/alsa-lib-1.1.8-x86_64-1_alsa.txz +-rw-r--r-- 1 root root 163 2019-01-09 02:05 ./extra/pure-alsa-system/alsa-lib-1.1.8-x86_64-1_alsa.txz.asc +-rw-r--r-- 1 root root 402 2019-01-09 02:05 ./extra/pure-alsa-system/alsa-plugins-1.1.8-x86_64-1_alsa.txt +-rw-r--r-- 1 root root 53444 2019-01-09 02:05 ./extra/pure-alsa-system/alsa-plugins-1.1.8-x86_64-1_alsa.txz +-rw-r--r-- 1 root root 163 2019-01-09 02:05 ./extra/pure-alsa-system/alsa-plugins-1.1.8-x86_64-1_alsa.txz.asc -rw-r--r-- 1 root root 423 2018-08-09 18:05 ./extra/pure-alsa-system/audacious-plugins-3.10-x86_64-1_alsa.txt -rw-r--r-- 1 root root 1242968 2018-08-09 18:05 ./extra/pure-alsa-system/audacious-plugins-3.10-x86_64-1_alsa.txz -rw-r--r-- 1 root root 163 2018-08-09 18:05 ./extra/pure-alsa-system/audacious-plugins-3.10-x86_64-1_alsa.txz.asc @@ -798,13 +798,13 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches -rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT -drwxr-xr-x 18 root root 4096 2019-01-07 23:32 ./slackware64 --rw-r--r-- 1 root root 289915 2019-01-07 23:32 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-01-07 23:32 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 361153 2019-01-07 23:29 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3647008 2019-01-07 23:30 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2019-01-09 03:30 ./slackware64 +-rw-r--r-- 1 root root 289915 2019-01-09 03:30 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-01-09 03:30 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 361153 2019-01-09 03:28 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3653865 2019-01-09 03:28 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT -drwxr-xr-x 2 root root 28672 2019-01-07 23:29 ./slackware64/a +drwxr-xr-x 2 root root 28672 2019-01-08 21:23 ./slackware64/a -rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt -rw-r--r-- 1 root root 10820 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz -rw-r--r-- 1 root root 163 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz.asc @@ -996,9 +996,9 @@ drwxr-xr-x 2 root root 28672 2019-01-07 23:29 ./slackware64/a -rw-r--r-- 1 root root 445 2018-04-17 07:04 ./slackware64/a/lrzip-0.631-x86_64-2.txt -rw-r--r-- 1 root root 214724 2018-04-17 07:04 ./slackware64/a/lrzip-0.631-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-17 07:04 ./slackware64/a/lrzip-0.631-x86_64-2.txz.asc --rw-r--r-- 1 root root 555 2018-12-30 20:00 ./slackware64/a/lvm2-2.03.02-x86_64-1.txt --rw-r--r-- 1 root root 1435204 2018-12-30 20:00 ./slackware64/a/lvm2-2.03.02-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-12-30 20:00 ./slackware64/a/lvm2-2.03.02-x86_64-1.txz.asc +-rw-r--r-- 1 root root 555 2018-04-21 17:14 ./slackware64/a/lvm2-2.02.177-x86_64-1.txt +-rw-r--r-- 1 root root 1530500 2018-04-21 17:14 ./slackware64/a/lvm2-2.02.177-x86_64-1.txz +-rw-r--r-- 1 root root 163 2018-04-21 17:14 ./slackware64/a/lvm2-2.02.177-x86_64-1.txz.asc -rw-r--r-- 1 root root 441 2018-04-13 13:08 ./slackware64/a/lzip-1.20-x86_64-3.txt -rw-r--r-- 1 root root 84416 2018-04-13 13:08 ./slackware64/a/lzip-1.20-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 13:08 ./slackware64/a/lzip-1.20-x86_64-3.txz.asc @@ -1103,9 +1103,9 @@ drwxr-xr-x 2 root root 28672 2019-01-07 23:29 ./slackware64/a -rw-r--r-- 1 root root 694 2018-04-13 13:12 ./slackware64/a/sysvinit-functions-8.53-x86_64-3.txt -rw-r--r-- 1 root root 36252 2018-04-13 13:12 ./slackware64/a/sysvinit-functions-8.53-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 13:12 ./slackware64/a/sysvinit-functions-8.53-x86_64-3.txz.asc --rw-r--r-- 1 root root 378 2018-12-30 20:25 ./slackware64/a/sysvinit-scripts-2.1-noarch-24.txt --rw-r--r-- 1 root root 22428 2018-12-30 20:25 ./slackware64/a/sysvinit-scripts-2.1-noarch-24.txz --rw-r--r-- 1 root root 163 2018-12-30 20:25 ./slackware64/a/sysvinit-scripts-2.1-noarch-24.txz.asc +-rw-r--r-- 1 root root 378 2019-01-08 19:02 ./slackware64/a/sysvinit-scripts-2.1-noarch-25.txt +-rw-r--r-- 1 root root 22388 2019-01-08 19:02 ./slackware64/a/sysvinit-scripts-2.1-noarch-25.txz +-rw-r--r-- 1 root root 163 2019-01-08 19:02 ./slackware64/a/sysvinit-scripts-2.1-noarch-25.txz.asc -rw-r--r-- 1 root root 1408 2018-12-29 22:37 ./slackware64/a/tagfile -rw-r--r-- 1 root root 395 2019-01-02 22:49 ./slackware64/a/tar-1.31-x86_64-1.txt -rw-r--r-- 1 root root 844344 2019-01-02 22:49 ./slackware64/a/tar-1.31-x86_64-1.txz @@ -1140,9 +1140,9 @@ drwxr-xr-x 2 root root 28672 2019-01-07 23:29 ./slackware64/a -rw-r--r-- 1 root root 350 2018-04-13 13:13 ./slackware64/a/utempter-1.1.6-x86_64-3.txt -rw-r--r-- 1 root root 15656 2018-04-13 13:13 ./slackware64/a/utempter-1.1.6-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 13:13 ./slackware64/a/utempter-1.1.6-x86_64-3.txz.asc --rw-r--r-- 1 root root 344 2019-01-02 21:58 ./slackware64/a/util-linux-2.33-x86_64-2.txt --rw-r--r-- 1 root root 2471524 2019-01-02 21:58 ./slackware64/a/util-linux-2.33-x86_64-2.txz --rw-r--r-- 1 root root 163 2019-01-02 21:58 ./slackware64/a/util-linux-2.33-x86_64-2.txz.asc +-rw-r--r-- 1 root root 344 2019-01-08 18:55 ./slackware64/a/util-linux-2.33-x86_64-3.txt +-rw-r--r-- 1 root root 2471308 2019-01-08 18:55 ./slackware64/a/util-linux-2.33-x86_64-3.txz +-rw-r--r-- 1 root root 163 2019-01-08 18:55 ./slackware64/a/util-linux-2.33-x86_64-3.txz.asc -rw-r--r-- 1 root root 579 2018-04-13 13:14 ./slackware64/a/which-2.21-x86_64-2.txt -rw-r--r-- 1 root root 29812 2018-04-13 13:14 ./slackware64/a/which-2.21-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:14 ./slackware64/a/which-2.21-x86_64-2.txz.asc @@ -1155,16 +1155,16 @@ drwxr-xr-x 2 root root 28672 2019-01-07 23:29 ./slackware64/a -rw-r--r-- 1 root root 540 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txt -rw-r--r-- 1 root root 56156 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz.asc -drwxr-xr-x 2 root root 20480 2019-01-07 23:29 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2019-01-09 03:28 ./slackware64/ap -rw-r--r-- 1 root root 291 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txt -rw-r--r-- 1 root root 694880 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz -rw-r--r-- 1 root root 163 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz.asc -rw-r--r-- 1 root root 598 2018-04-13 13:16 ./slackware64/ap/acct-6.6.4-x86_64-2.txt -rw-r--r-- 1 root root 93132 2018-04-13 13:16 ./slackware64/ap/acct-6.6.4-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:16 ./slackware64/ap/acct-6.6.4-x86_64-2.txz.asc --rw-r--r-- 1 root root 620 2018-10-16 23:23 ./slackware64/ap/alsa-utils-1.1.7-x86_64-1.txt --rw-r--r-- 1 root root 985564 2018-10-16 23:23 ./slackware64/ap/alsa-utils-1.1.7-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-10-16 23:23 ./slackware64/ap/alsa-utils-1.1.7-x86_64-1.txz.asc +-rw-r--r-- 1 root root 620 2019-01-09 02:00 ./slackware64/ap/alsa-utils-1.1.8-x86_64-1.txt +-rw-r--r-- 1 root root 1021168 2019-01-09 02:00 ./slackware64/ap/alsa-utils-1.1.8-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-09 02:00 ./slackware64/ap/alsa-utils-1.1.8-x86_64-1.txz.asc -rw-r--r-- 1 root root 274 2018-04-13 13:16 ./slackware64/ap/amp-0.7.6-x86_64-2.txt -rw-r--r-- 1 root root 47748 2018-04-13 13:16 ./slackware64/ap/amp-0.7.6-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:16 ./slackware64/ap/amp-0.7.6-x86_64-2.txz.asc @@ -1237,9 +1237,9 @@ drwxr-xr-x 2 root root 20480 2019-01-07 23:29 ./slackware64/ap -rw-r--r-- 1 root root 429 2018-12-24 18:41 ./slackware64/ap/groff-1.22.4-x86_64-1.txt -rw-r--r-- 1 root root 3700024 2018-12-24 18:41 ./slackware64/ap/groff-1.22.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-24 18:41 ./slackware64/ap/groff-1.22.4-x86_64-1.txz.asc --rw-r--r-- 1 root root 547 2018-05-14 18:55 ./slackware64/ap/gutenprint-5.2.14-x86_64-2.txt --rw-r--r-- 1 root root 2613904 2018-05-14 18:55 ./slackware64/ap/gutenprint-5.2.14-x86_64-2.txz --rw-r--r-- 1 root root 163 2018-05-14 18:55 ./slackware64/ap/gutenprint-5.2.14-x86_64-2.txz.asc +-rw-r--r-- 1 root root 547 2019-01-09 02:20 ./slackware64/ap/gutenprint-5.3.1-x86_64-1.txt +-rw-r--r-- 1 root root 2624072 2019-01-09 02:20 ./slackware64/ap/gutenprint-5.3.1-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-09 02:20 ./slackware64/ap/gutenprint-5.3.1-x86_64-1.txz.asc -rw-r--r-- 1 root root 459 2018-12-06 20:01 ./slackware64/ap/hplip-3.18.12-x86_64-1.txt -rw-r--r-- 1 root root 18096776 2018-12-06 20:01 ./slackware64/ap/hplip-3.18.12-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-06 20:01 ./slackware64/ap/hplip-3.18.12-x86_64-1.txz.asc @@ -1401,7 +1401,7 @@ drwxr-xr-x 2 root root 20480 2019-01-07 23:29 ./slackware64/ap -rw-r--r-- 1 root root 506 2018-09-14 17:54 ./slackware64/ap/zsh-5.6.2-x86_64-1.txt -rw-r--r-- 1 root root 2973268 2018-09-14 17:54 ./slackware64/ap/zsh-5.6.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-09-14 17:54 ./slackware64/ap/zsh-5.6.2-x86_64-1.txz.asc -drwxr-xr-x 2 root root 16384 2019-01-06 20:10 ./slackware64/d +drwxr-xr-x 2 root root 16384 2019-01-08 21:23 ./slackware64/d -rw-r--r-- 1 root root 360 2018-12-14 23:51 ./slackware64/d/Cython-0.29.2-x86_64-1.txt -rw-r--r-- 1 root root 3073660 2018-12-14 23:51 ./slackware64/d/Cython-0.29.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-14 23:51 ./slackware64/d/Cython-0.29.2-x86_64-1.txz.asc @@ -1514,9 +1514,9 @@ drwxr-xr-x 2 root root 16384 2019-01-06 20:10 ./slackware64/d -rw-r--r-- 1 root root 163 2018-10-08 18:29 ./slackware64/d/make-4.2.1-x86_64-4.txz.asc -rw-r--r-- 1 root root 4973 2018-11-21 20:59 ./slackware64/d/maketag -rw-r--r-- 1 root root 4973 2018-11-21 20:59 ./slackware64/d/maketag.ez --rw-r--r-- 1 root root 659 2018-12-06 20:12 ./slackware64/d/mercurial-4.8.1-x86_64-1.txt --rw-r--r-- 1 root root 4026648 2018-12-06 20:12 ./slackware64/d/mercurial-4.8.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-12-06 20:12 ./slackware64/d/mercurial-4.8.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 659 2019-01-08 19:59 ./slackware64/d/mercurial-4.8.2-x86_64-1.txt +-rw-r--r-- 1 root root 4026860 2019-01-08 19:59 ./slackware64/d/mercurial-4.8.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-08 19:59 ./slackware64/d/mercurial-4.8.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 410 2018-12-10 20:22 ./slackware64/d/meson-0.49.0-x86_64-1.txt -rw-r--r-- 1 root root 609296 2018-12-10 20:22 ./slackware64/d/meson-0.49.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-10 20:22 ./slackware64/d/meson-0.49.0-x86_64-1.txz.asc @@ -1574,9 +1574,9 @@ drwxr-xr-x 2 root root 16384 2019-01-06 20:10 ./slackware64/d -rw-r--r-- 1 root root 426 2018-12-21 18:47 ./slackware64/d/rust-1.31.1-x86_64-1.txt -rw-r--r-- 1 root root 87647140 2018-12-21 18:47 ./slackware64/d/rust-1.31.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-21 18:47 ./slackware64/d/rust-1.31.1-x86_64-1.txz.asc --rw-r--r-- 1 root root 456 2019-01-06 01:13 ./slackware64/d/scons-3.0.2-x86_64-1.txt --rw-r--r-- 1 root root 755560 2019-01-06 01:13 ./slackware64/d/scons-3.0.2-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-01-06 01:13 ./slackware64/d/scons-3.0.2-x86_64-1.txz.asc +-rw-r--r-- 1 root root 456 2019-01-08 20:11 ./slackware64/d/scons-3.0.3-x86_64-1.txt +-rw-r--r-- 1 root root 815388 2019-01-08 20:11 ./slackware64/d/scons-3.0.3-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-08 20:11 ./slackware64/d/scons-3.0.3-x86_64-1.txz.asc -rw-r--r-- 1 root root 467 2018-04-13 20:22 ./slackware64/d/slacktrack-2.18-x86_64-2.txt -rw-r--r-- 1 root root 99944 2018-04-13 20:22 ./slackware64/d/slacktrack-2.18-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 20:22 ./slackware64/d/slacktrack-2.18-x86_64-2.txz.asc @@ -2466,7 +2466,7 @@ drwxr-xr-x 2 root root 20480 2016-03-10 03:11 ./slackware64/kdei -rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag -rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag.ez -rw-r--r-- 1 root root 1500 2018-03-01 07:54 ./slackware64/kdei/tagfile -drwxr-xr-x 2 root root 69632 2019-01-07 23:29 ./slackware64/l +drwxr-xr-x 2 root root 69632 2019-01-09 03:27 ./slackware64/l -rw-r--r-- 1 root root 338 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txt -rw-r--r-- 1 root root 149752 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz -rw-r--r-- 1 root root 163 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz.asc @@ -2518,15 +2518,15 @@ drwxr-xr-x 2 root root 69632 2019-01-07 23:29 ./slackware64/l -rw-r--r-- 1 root root 382 2018-12-14 03:43 ./slackware64/l/akonadi-1.13.0-x86_64-11.txt -rw-r--r-- 1 root root 952004 2018-12-14 03:43 ./slackware64/l/akonadi-1.13.0-x86_64-11.txz -rw-r--r-- 1 root root 163 2018-12-14 03:43 ./slackware64/l/akonadi-1.13.0-x86_64-11.txz.asc --rw-r--r-- 1 root root 401 2018-11-04 18:29 ./slackware64/l/alsa-lib-1.1.7-x86_64-2.txt --rw-r--r-- 1 root root 450748 2018-11-04 18:29 ./slackware64/l/alsa-lib-1.1.7-x86_64-2.txz --rw-r--r-- 1 root root 163 2018-11-04 18:29 ./slackware64/l/alsa-lib-1.1.7-x86_64-2.txz.asc --rw-r--r-- 1 root root 501 2018-04-13 14:22 ./slackware64/l/alsa-oss-1.1.6-x86_64-2.txt --rw-r--r-- 1 root root 32664 2018-04-13 14:22 ./slackware64/l/alsa-oss-1.1.6-x86_64-2.txz --rw-r--r-- 1 root root 163 2018-04-13 14:22 ./slackware64/l/alsa-oss-1.1.6-x86_64-2.txz.asc --rw-r--r-- 1 root root 402 2018-10-24 19:00 ./slackware64/l/alsa-plugins-1.1.7-x86_64-4.txt --rw-r--r-- 1 root root 65680 2018-10-24 19:00 ./slackware64/l/alsa-plugins-1.1.7-x86_64-4.txz --rw-r--r-- 1 root root 163 2018-10-24 19:00 ./slackware64/l/alsa-plugins-1.1.7-x86_64-4.txz.asc +-rw-r--r-- 1 root root 401 2019-01-09 01:57 ./slackware64/l/alsa-lib-1.1.8-x86_64-1.txt +-rw-r--r-- 1 root root 454024 2019-01-09 01:57 ./slackware64/l/alsa-lib-1.1.8-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-09 01:57 ./slackware64/l/alsa-lib-1.1.8-x86_64-1.txz.asc +-rw-r--r-- 1 root root 501 2019-01-09 01:59 ./slackware64/l/alsa-oss-1.1.8-x86_64-1.txt +-rw-r--r-- 1 root root 32852 2019-01-09 01:59 ./slackware64/l/alsa-oss-1.1.8-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-09 01:59 ./slackware64/l/alsa-oss-1.1.8-x86_64-1.txz.asc +-rw-r--r-- 1 root root 402 2019-01-09 01:58 ./slackware64/l/alsa-plugins-1.1.8-x86_64-1.txt +-rw-r--r-- 1 root root 65640 2019-01-09 01:58 ./slackware64/l/alsa-plugins-1.1.8-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-09 01:58 ./slackware64/l/alsa-plugins-1.1.8-x86_64-1.txz.asc -rw-r--r-- 1 root root 275 2018-09-27 18:56 ./slackware64/l/apr-1.6.5-x86_64-1.txt -rw-r--r-- 1 root root 263144 2018-09-27 18:56 ./slackware64/l/apr-1.6.5-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-09-27 18:56 ./slackware64/l/apr-1.6.5-x86_64-1.txz.asc @@ -2758,9 +2758,9 @@ drwxr-xr-x 2 root root 69632 2019-01-07 23:29 ./slackware64/l -rw-r--r-- 1 root root 334 2018-04-13 14:52 ./slackware64/l/gtk+2-2.24.32-x86_64-2.txt -rw-r--r-- 1 root root 6755204 2018-04-13 14:52 ./slackware64/l/gtk+2-2.24.32-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 14:52 ./slackware64/l/gtk+2-2.24.32-x86_64-2.txz.asc --rw-r--r-- 1 root root 325 2018-12-14 00:33 ./slackware64/l/gtk+3-3.24.2-x86_64-1.txt --rw-r--r-- 1 root root 10524216 2018-12-14 00:33 ./slackware64/l/gtk+3-3.24.2-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-12-14 00:33 ./slackware64/l/gtk+3-3.24.2-x86_64-1.txz.asc +-rw-r--r-- 1 root root 325 2019-01-08 20:38 ./slackware64/l/gtk+3-3.24.2-x86_64-2.txt +-rw-r--r-- 1 root root 10522500 2019-01-08 20:38 ./slackware64/l/gtk+3-3.24.2-x86_64-2.txz +-rw-r--r-- 1 root root 163 2019-01-08 20:38 ./slackware64/l/gtk+3-3.24.2-x86_64-2.txz.asc -rw-r--r-- 1 root root 341 2018-04-17 07:44 ./slackware64/l/gtkmm2-2.24.5-x86_64-2.txt -rw-r--r-- 1 root root 1336216 2018-04-17 07:44 ./slackware64/l/gtkmm2-2.24.5-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-17 07:44 ./slackware64/l/gtkmm2-2.24.5-x86_64-2.txz.asc @@ -3426,7 +3426,7 @@ drwxr-xr-x 2 root root 69632 2019-01-07 23:29 ./slackware64/l -rw-r--r-- 1 root root 463 2018-12-30 04:38 ./slackware64/l/zstd-1.3.8-x86_64-1.txt -rw-r--r-- 1 root root 385208 2018-12-30 04:38 ./slackware64/l/zstd-1.3.8-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-30 04:38 ./slackware64/l/zstd-1.3.8-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2019-01-07 23:29 ./slackware64/n +drwxr-xr-x 2 root root 36864 2019-01-08 21:23 ./slackware64/n -rw-r--r-- 1 root root 357 2018-09-24 19:22 ./slackware64/n/ModemManager-1.8.2-x86_64-1.txt -rw-r--r-- 1 root root 1519620 2018-09-24 19:22 ./slackware64/n/ModemManager-1.8.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-09-24 19:22 ./slackware64/n/ModemManager-1.8.2-x86_64-1.txz.asc @@ -3644,9 +3644,9 @@ drwxr-xr-x 2 root root 36864 2019-01-07 23:29 ./slackware64/n -rw-r--r-- 1 root root 325 2018-04-13 15:41 ./slackware64/n/mtr-0.92-x86_64-2.txt -rw-r--r-- 1 root root 66640 2018-04-13 15:41 ./slackware64/n/mtr-0.92-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 15:41 ./slackware64/n/mtr-0.92-x86_64-2.txz.asc --rw-r--r-- 1 root root 448 2018-12-03 03:40 ./slackware64/n/mutt-1.11.1-x86_64-1.txt --rw-r--r-- 1 root root 1236892 2018-12-03 03:40 ./slackware64/n/mutt-1.11.1-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-12-03 03:40 ./slackware64/n/mutt-1.11.1-x86_64-1.txz.asc +-rw-r--r-- 1 root root 448 2019-01-08 20:10 ./slackware64/n/mutt-1.11.2-x86_64-1.txt +-rw-r--r-- 1 root root 1236888 2019-01-08 20:10 ./slackware64/n/mutt-1.11.2-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-08 20:10 ./slackware64/n/mutt-1.11.2-x86_64-1.txz.asc -rw-r--r-- 1 root root 627 2018-04-13 15:41 ./slackware64/n/nc-1.10-x86_64-2.txt -rw-r--r-- 1 root root 53492 2018-04-13 15:41 ./slackware64/n/nc-1.10-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 15:41 ./slackware64/n/nc-1.10-x86_64-2.txz.asc @@ -3855,9 +3855,9 @@ drwxr-xr-x 2 root root 36864 2019-01-07 23:29 ./slackware64/n -rw-r--r-- 1 root root 677 2018-12-31 20:06 ./slackware64/n/wireless_tools-30.pre9-x86_64-1.txt -rw-r--r-- 1 root root 134480 2018-12-31 20:06 ./slackware64/n/wireless_tools-30.pre9-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-12-31 20:06 ./slackware64/n/wireless_tools-30.pre9-x86_64-1.txz.asc --rw-r--r-- 1 root root 601 2018-05-10 13:06 ./slackware64/n/wpa_supplicant-2.6-x86_64-6.txt --rw-r--r-- 1 root root 1089212 2018-05-10 13:06 ./slackware64/n/wpa_supplicant-2.6-x86_64-6.txz --rw-r--r-- 1 root root 163 2018-05-10 13:06 ./slackware64/n/wpa_supplicant-2.6-x86_64-6.txz.asc +-rw-r--r-- 1 root root 600 2019-01-04 21:23 ./slackware64/n/wpa_supplicant-2.7-x86_64-3.txt +-rw-r--r-- 1 root root 1147528 2019-01-04 21:23 ./slackware64/n/wpa_supplicant-2.7-x86_64-3.txz +-rw-r--r-- 1 root root 163 2019-01-04 21:23 ./slackware64/n/wpa_supplicant-2.7-x86_64-3.txz.asc -rw-r--r-- 1 root root 406 2018-06-18 04:09 ./slackware64/n/yptools-2.14-x86_64-11.txt -rw-r--r-- 1 root root 189104 2018-06-18 04:09 ./slackware64/n/yptools-2.14-x86_64-11.txz -rw-r--r-- 1 root root 163 2018-06-18 04:09 ./slackware64/n/yptools-2.14-x86_64-11.txz.asc @@ -3906,7 +3906,7 @@ drwxr-xr-x 2 root root 4096 2018-11-24 20:50 ./slackware64/tcl -rw-r--r-- 1 root root 227 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txt -rw-r--r-- 1 root root 1771556 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2019-01-07 23:29 ./slackware64/x +drwxr-xr-x 2 root root 65536 2019-01-08 21:23 ./slackware64/x -rw-r--r-- 1 root root 257 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txt -rw-r--r-- 1 root root 5074404 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz.asc @@ -4434,9 +4434,9 @@ drwxr-xr-x 2 root root 65536 2019-01-07 23:29 ./slackware64/x -rw-r--r-- 1 root root 379 2018-04-13 05:49 ./slackware64/x/xcursor-themes-1.0.5-noarch-2.txt -rw-r--r-- 1 root root 323800 2018-04-13 05:49 ./slackware64/x/xcursor-themes-1.0.5-noarch-2.txz -rw-r--r-- 1 root root 163 2018-04-13 05:49 ./slackware64/x/xcursor-themes-1.0.5-noarch-2.txz.asc --rw-r--r-- 1 root root 373 2018-04-13 06:05 ./slackware64/x/xcursorgen-1.0.6-x86_64-4.txt --rw-r--r-- 1 root root 18596 2018-04-13 06:05 ./slackware64/x/xcursorgen-1.0.6-x86_64-4.txz --rw-r--r-- 1 root root 163 2018-04-13 06:05 ./slackware64/x/xcursorgen-1.0.6-x86_64-4.txz.asc +-rw-r--r-- 1 root root 373 2019-01-08 19:05 ./slackware64/x/xcursorgen-1.0.7-x86_64-1.txt +-rw-r--r-- 1 root root 20044 2019-01-08 19:05 ./slackware64/x/xcursorgen-1.0.7-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-01-08 19:05 ./slackware64/x/xcursorgen-1.0.7-x86_64-1.txz.asc -rw-r--r-- 1 root root 254 2018-04-13 06:05 ./slackware64/x/xdbedizzy-1.1.0-x86_64-3.txt -rw-r--r-- 1 root root 17496 2018-04-13 06:05 ./slackware64/x/xdbedizzy-1.1.0-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 06:05 ./slackware64/x/xdbedizzy-1.1.0-x86_64-3.txz.asc @@ -5004,13 +5004,13 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:35 ./slackware64/y -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez -rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile -drwxr-xr-x 19 root root 4096 2019-01-07 23:34 ./source --rw-r--r-- 1 root root 463004 2019-01-07 23:34 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-01-07 23:34 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 654822 2019-01-07 23:33 ./source/FILE_LIST --rw-r--r-- 1 root root 16648514 2019-01-07 23:33 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2019-01-09 03:32 ./source +-rw-r--r-- 1 root root 461640 2019-01-09 03:32 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-01-09 03:32 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 653182 2019-01-09 03:31 ./source/FILE_LIST +-rw-r--r-- 1 root root 16631370 2019-01-09 03:31 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT -drwxr-xr-x 111 root root 4096 2019-01-02 22:01 ./source/a +drwxr-xr-x 111 root root 4096 2019-01-08 19:53 ./source/a -rw-r--r-- 1 root root 877 2018-11-21 18:49 ./source/a/FTBFSlog drwxr-xr-x 2 root root 4096 2018-06-24 18:43 ./source/a/aaa_base -rw-r--r-- 1 root root 11115 2018-06-24 18:43 ./source/a/aaa_base/_aaa_base.tar.gz @@ -5530,12 +5530,11 @@ drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/a/lrzip -rw-r--r-- 1 root root 422744 2016-10-21 00:46 ./source/a/lrzip/lrzip-0.631.tar.xz -rwxr-xr-x 1 root root 4477 2018-09-18 22:04 ./source/a/lrzip/lrzip.SlackBuild -rw-r--r-- 1 root root 898 2018-02-27 06:13 ./source/a/lrzip/slack-desc -drwxr-xr-x 2 root root 4096 2018-12-30 04:52 ./source/a/lvm2 --rw-r--r-- 1 root root 1571228 2018-12-18 14:23 ./source/a/lvm2/LVM2.2.03.02.tar.lz +drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/a/lvm2 +-rw-r--r-- 1 root root 1665394 2017-12-18 20:49 ./source/a/lvm2/LVM2.2.02.177.tar.lz -rw-r--r-- 1 root root 302 2014-12-09 04:47 ./source/a/lvm2/create-dm-run-dir.diff.gz -rw-r--r-- 1 root root 271 2008-10-06 12:21 ./source/a/lvm2/doinst.sh.gz -rw-r--r-- 1 root root 35 2017-10-08 18:12 ./source/a/lvm2/lvm.url --rw-r--r-- 1 root root 1433840 2018-12-30 04:23 ./source/a/lvm2/lvm2-2.03.02-x86_64-1.txz -rwxr-xr-x 1 root root 5058 2018-09-18 22:04 ./source/a/lvm2/lvm2.SlackBuild -rw-r--r-- 1 root root 1007 2018-02-27 06:13 ./source/a/lvm2/slack-desc drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/a/lzip @@ -5663,7 +5662,7 @@ drwxr-xr-x 2 root root 4096 2018-09-06 22:16 ./source/a/pkgtools/scripts -rw-r--r-- 1 root root 21938 2018-06-19 19:28 ./source/a/pkgtools/scripts/pkgtool -rw-r--r-- 1 root root 15611 2018-06-19 19:39 ./source/a/pkgtools/scripts/removepkg -rw-r--r-- 1 root root 170 2003-02-16 00:56 ./source/a/pkgtools/scripts/setup.70.install-kernel --rw-r--r-- 1 root root 9164 2018-06-19 19:28 ./source/a/pkgtools/scripts/setup.80.make-bootdisk +-rw-r--r-- 1 root root 9164 2018-06-19 19:28 ./source/a/pkgtools/scripts/setup.80.make-bootdisk -rw-r--r-- 1 root root 1062 2018-04-28 19:12 ./source/a/pkgtools/scripts/setup.htmlview -rw-r--r-- 1 root root 8875 2018-06-19 19:28 ./source/a/pkgtools/scripts/setup.services -rw-r--r-- 1 root root 14138 2018-06-19 19:41 ./source/a/pkgtools/scripts/upgradepkg @@ -5786,7 +5785,7 @@ drwxr-xr-x 2 root root 4096 2018-09-13 20:33 ./source/a/sysvinit-scripts/ -rw-r--r-- 1 root root 1642 2017-05-23 23:57 ./source/a/sysvinit-scripts/scripts/rc.4 -rw-r--r-- 1 root root 9341 2018-12-30 20:25 ./source/a/sysvinit-scripts/scripts/rc.6 -rw-r--r-- 1 root root 3157 2018-07-23 21:35 ./source/a/sysvinit-scripts/scripts/rc.K --rw-r--r-- 1 root root 12517 2018-08-13 21:39 ./source/a/sysvinit-scripts/scripts/rc.M +-rw-r--r-- 1 root root 12482 2019-01-08 19:02 ./source/a/sysvinit-scripts/scripts/rc.M -rw-r--r-- 1 root root 16897 2018-11-28 19:44 ./source/a/sysvinit-scripts/scripts/rc.S -rw-r--r-- 1 root root 3328 2018-09-04 22:22 ./source/a/sysvinit-scripts/scripts/rc.cpufreq -rw-r--r-- 1 root root 272 2006-08-12 02:07 ./source/a/sysvinit-scripts/scripts/rc.local @@ -5797,7 +5796,7 @@ drwxr-xr-x 2 root root 4096 2018-09-13 20:33 ./source/a/sysvinit-scripts/ -rw-r--r-- 1 root root 22473 2012-09-07 17:51 ./source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh -rw-r--r-- 1 root root 645 2012-09-07 17:52 ./source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh.diff -rw-r--r-- 1 root root 842 2018-02-27 06:13 ./source/a/sysvinit-scripts/slack-desc --rwxr-xr-x 1 root root 2677 2018-12-30 19:49 ./source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +-rwxr-xr-x 1 root root 2677 2019-01-08 19:02 ./source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild -rw-r--r-- 1 root root 668 2015-08-06 22:54 ./source/a/sysvinit/doinst.sh.gz -rw-r--r-- 1 root root 1009 2018-06-21 18:24 ./source/a/sysvinit/slack-desc -rw-r--r-- 1 root root 117580 2018-11-24 16:38 ./source/a/sysvinit/sysvinit-2.93.tar.xz @@ -5881,14 +5880,15 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/utempter -rw-r--r-- 1 root root 198 2010-11-04 14:14 ./source/a/utempter/libutempter-1.1.6.tar.bz2.asc -rw-r--r-- 1 root root 806 2018-02-27 06:13 ./source/a/utempter/slack-desc -rwxr-xr-x 1 root root 4159 2018-04-23 17:20 ./source/a/utempter/utempter.SlackBuild -drwxr-xr-x 2 root root 4096 2019-01-02 22:54 ./source/a/util-linux +drwxr-xr-x 2 root root 4096 2019-01-08 18:52 ./source/a/util-linux -rw-r--r-- 1 root root 53236 2011-07-12 20:47 ./source/a/util-linux/adjtimex_1.29-2.2.diff.gz -rw-r--r-- 1 root root 85551 2010-04-17 03:32 ./source/a/util-linux/adjtimex_1.29.orig.tar.gz -rw-r--r-- 1 root root 434 2014-10-30 15:31 ./source/a/util-linux/bsdstrings-util-linux_overflow.diff.gz -rw-r--r-- 1 root root 4513 2009-05-30 01:25 ./source/a/util-linux/bsdstrings.tar.gz -rw-r--r-- 1 root root 3054 2015-02-10 20:38 ./source/a/util-linux/ddate.1 -rw-r--r-- 1 root root 10917 2015-02-10 20:38 ./source/a/util-linux/ddate.c --rw-r--r-- 1 root root 337 2009-05-30 01:25 ./source/a/util-linux/doinst.sh.gz +-rw-r--r-- 1 root root 342 2019-01-08 18:52 ./source/a/util-linux/doinst.sh.gz +-rw-r--r-- 1 root root 483 2019-01-08 18:50 ./source/a/util-linux/rc.setterm -rw-r--r-- 1 root root 1266 2009-05-30 01:25 ./source/a/util-linux/scsi_ioctl.h -rw-r--r-- 1 root root 52437 2009-05-30 01:25 ./source/a/util-linux/setserial-2.17.tar.gz -rw-r--r-- 1 root root 729 2009-05-30 01:25 ./source/a/util-linux/setserial-rc.serial.diff.gz @@ -5896,7 +5896,7 @@ drwxr-xr-x 2 root root 4096 2019-01-02 22:54 ./source/a/util-linux -rw-r--r-- 1 root root 796 2018-02-27 06:13 ./source/a/util-linux/slack-desc -rw-r--r-- 1 root root 833 2018-11-06 11:25 ./source/a/util-linux/util-linux-2.33.tar.sign -rw-r--r-- 1 root root 4663072 2018-11-06 11:25 ./source/a/util-linux/util-linux-2.33.tar.xz --rwxr-xr-x 1 root root 10342 2019-01-02 21:55 ./source/a/util-linux/util-linux.SlackBuild +-rwxr-xr-x 1 root root 10570 2019-01-08 18:51 ./source/a/util-linux/util-linux.SlackBuild -rw-r--r-- 1 root root 275 2019-01-02 21:53 ./source/a/util-linux/util-linux.do.not.list.ram.devices.diff.gz -rw-r--r-- 1 root root 335 2014-07-03 08:34 ./source/a/util-linux/util-linux.fdisk-no-solaris.diff.gz -rw-r--r-- 1 root root 10292 2009-05-30 01:25 ./source/a/util-linux/ziptool-1.4.0.tar.xz @@ -5922,7 +5922,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/zoo -rw-r--r-- 1 root root 173607 1994-12-30 20:19 ./source/a/zoo/zoo-2.10.tar.gz -rwxr-xr-x 1 root root 3143 2018-04-23 17:20 ./source/a/zoo/zoo.SlackBuild -rw-r--r-- 1 root root 14136 2010-05-22 09:49 ./source/a/zoo/zoo_2.10-22.debian.tar.gz -drwxr-xr-x 82 root root 4096 2018-11-28 22:40 ./source/ap +drwxr-xr-x 82 root root 4096 2019-01-09 02:23 ./source/ap -rw-r--r-- 1 root root 270 2018-02-12 23:18 ./source/ap/FTBFSlog drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/ap/a2ps -rw-r--r-- 1 root root 1521 2017-10-01 17:59 ./source/ap/a2ps/a2ps-4.14-texinfo-nodes.patch.gz @@ -5937,8 +5937,8 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/acct -rwxr-xr-x 1 root root 5045 2018-09-18 18:45 ./source/ap/acct/acct.SlackBuild -rw-r--r-- 1 root root 390 2017-04-06 17:03 ./source/ap/acct/acct.logdir.fhs.diff.gz -rw-r--r-- 1 root root 1050 2018-02-27 06:12 ./source/ap/acct/slack-desc -drwxr-xr-x 2 root root 4096 2018-10-16 23:23 ./source/ap/alsa-utils --rw-r--r-- 1 root root 1104709 2018-10-16 08:14 ./source/ap/alsa-utils/alsa-utils-1.1.7.tar.lz +drwxr-xr-x 2 root root 4096 2019-01-09 01:59 ./source/ap/alsa-utils +-rw-r--r-- 1 root root 1149938 2019-01-07 14:31 ./source/ap/alsa-utils/alsa-utils-1.1.8.tar.lz -rwxr-xr-x 1 root root 4624 2018-10-16 23:23 ./source/ap/alsa-utils/alsa-utils.SlackBuild -rw-r--r-- 1 root root 989 2010-05-30 02:08 ./source/ap/alsa-utils/alsa-utils.alsaconf.diff.gz -rw-r--r-- 1 root root 317 2013-05-03 01:22 ./source/ap/alsa-utils/doinst.sh.gz @@ -6086,10 +6086,10 @@ drwxr-xr-x 2 root root 4096 2018-12-24 18:38 ./source/ap/groff -rwxr-xr-x 1 root root 5120 2018-12-24 18:40 ./source/ap/groff/groff.SlackBuild -rw-r--r-- 1 root root 459 2005-06-23 01:46 ./source/ap/groff/groff.man.mdoc.local.gz -rw-r--r-- 1 root root 882 2018-02-27 06:12 ./source/ap/groff/slack-desc -drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/ap/gutenprint +drwxr-xr-x 2 root root 4096 2019-01-09 02:18 ./source/ap/gutenprint -rw-r--r-- 1 root root 165 2016-02-03 04:19 ./source/ap/gutenprint/doinst.sh.gz --rw-r--r-- 1 root root 4929432 2018-04-08 13:39 ./source/ap/gutenprint/gutenprint-5.2.14.tar.lz --rwxr-xr-x 1 root root 4776 2018-09-18 22:04 ./source/ap/gutenprint/gutenprint.SlackBuild +-rw-r--r-- 1 root root 5021064 2018-09-23 00:31 ./source/ap/gutenprint/gutenprint-5.3.1.tar.lz +-rwxr-xr-x 1 root root 4776 2019-01-09 02:18 ./source/ap/gutenprint/gutenprint.SlackBuild -rw-r--r-- 1 root root 121 2016-02-03 04:22 ./source/ap/gutenprint/setup.cups-genppdupdate -rw-r--r-- 1 root root 1005 2018-02-27 06:13 ./source/ap/gutenprint/slack-desc drwxr-xr-x 2 root root 4096 2018-12-06 19:59 ./source/ap/hplip @@ -6681,9 +6681,9 @@ drwxr-xr-x 2 root root 4096 2018-10-08 18:28 ./source/d/make -rw-r--r-- 1 root root 438 2018-02-16 20:42 ./source/d/make/make.glibc-2.27.glob.diff.gz -rw-r--r-- 1 root root 304 2017-12-02 18:21 ./source/d/make/make.guile22.diff.gz -rw-r--r-- 1 root root 918 2018-02-27 06:13 ./source/d/make/slack-desc -drwxr-xr-x 2 root root 4096 2018-12-06 20:11 ./source/d/mercurial +drwxr-xr-x 2 root root 4096 2019-01-08 19:58 ./source/d/mercurial -rw-r--r-- 1 root root 279 2010-05-18 06:20 ./source/d/mercurial/doinst.sh.gz --rw-r--r-- 1 root root 3963371 2018-12-04 22:07 ./source/d/mercurial/mercurial-4.8.1.tar.lz +-rw-r--r-- 1 root root 3964768 2019-01-08 00:02 ./source/d/mercurial/mercurial-4.8.2.tar.lz -rwxr-xr-x 1 root root 4113 2018-07-04 20:29 ./source/d/mercurial/mercurial.SlackBuild -rw-r--r-- 1 root root 38 2017-12-02 19:13 ./source/d/mercurial/mercurial.url -rw-r--r-- 1 root root 1245 2018-02-27 06:13 ./source/d/mercurial/slack-desc @@ -6812,8 +6812,8 @@ drwxr-xr-x 2 root root 4096 2018-12-21 23:30 ./source/d/rust -rw-r--r-- 1 root root 1147 2018-12-21 16:51 ./source/d/rust/rust.url -rw-r--r-- 1 root root 92173661 2018-12-20 17:53 ./source/d/rust/rustc-1.31.1-src.tar.lz -rw-r--r-- 1 root root 910 2018-02-27 06:49 ./source/d/rust/slack-desc -drwxr-xr-x 2 root root 4096 2019-01-06 19:41 ./source/d/scons --rw-r--r-- 1 root root 429956 2019-01-01 18:40 ./source/d/scons/scons-3.0.2.tar.lz +drwxr-xr-x 2 root root 4096 2019-01-08 20:11 ./source/d/scons +-rw-r--r-- 1 root root 488767 2019-01-08 03:13 ./source/d/scons/scons-3.0.3.tar.lz -rwxr-xr-x 1 root root 3273 2019-01-06 01:12 ./source/d/scons/scons.SlackBuild -rw-r--r-- 1 root root 909 2018-02-27 06:13 ./source/d/scons/slack-desc drwxr-xr-x 3 root root 4096 2018-04-23 17:20 ./source/d/slacktrack @@ -8189,24 +8189,21 @@ drwxr-xr-x 2 root root 4096 2018-12-14 03:15 ./source/l/akonadi -rw-r--r-- 1 root root 110 2009-08-31 04:24 ./source/l/akonadi/doinst.sh.gz -rw-r--r-- 1 root root 505 2017-08-31 17:45 ./source/l/akonadi/mysql-global.conf.patch.gz -rw-r--r-- 1 root root 836 2018-02-27 06:12 ./source/l/akonadi/slack-desc -drwxr-xr-x 2 root root 4096 2018-11-04 18:03 ./source/l/alsa-lib --rw-r--r-- 1 root root 747188 2018-10-16 08:14 ./source/l/alsa-lib/alsa-lib-1.1.7.tar.lz --rwxr-xr-x 1 root root 4550 2018-11-04 18:04 ./source/l/alsa-lib/alsa-lib.SlackBuild --rw-r--r-- 1 root root 1276 2018-11-04 18:03 ./source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch.gz +drwxr-xr-x 2 root root 4096 2019-01-09 01:56 ./source/l/alsa-lib +-rw-r--r-- 1 root root 751489 2019-01-07 13:21 ./source/l/alsa-lib/alsa-lib-1.1.8.tar.lz +-rwxr-xr-x 1 root root 4472 2019-01-09 01:56 ./source/l/alsa-lib/alsa-lib.SlackBuild -rw-r--r-- 1 root root 31 2018-04-25 18:34 ./source/l/alsa-lib/asound.conf.alsa -rw-r--r-- 1 root root 105 2016-02-22 18:50 ./source/l/alsa-lib/asound.conf.pulse -rw-r--r-- 1 root root 263 2016-01-07 20:26 ./source/l/alsa-lib/doinst.sh.gz -rw-r--r-- 1 root root 857 2018-02-27 06:12 ./source/l/alsa-lib/slack-desc -rw-rw-r-- 1 root root 155 2017-11-14 07:52 ./source/l/alsa-lib/smixer.conf -drwxr-xr-x 2 root root 4096 2018-09-18 23:42 ./source/l/alsa-oss --rw-r--r-- 1 root root 233402 2018-04-03 07:04 ./source/l/alsa-oss/alsa-oss-1.1.6.tar.lz --rwxr-xr-x 1 root root 3525 2018-09-18 23:42 ./source/l/alsa-oss/alsa-oss.SlackBuild --rw-r--r-- 1 root root 172 2018-09-18 23:42 ./source/l/alsa-oss/alsa-oss.glibc228.diff.gz +drwxr-xr-x 2 root root 4096 2019-01-09 01:59 ./source/l/alsa-oss +-rw-r--r-- 1 root root 233430 2019-01-07 13:23 ./source/l/alsa-oss/alsa-oss-1.1.8.tar.lz +-rwxr-xr-x 1 root root 3456 2019-01-09 01:59 ./source/l/alsa-oss/alsa-oss.SlackBuild -rw-r--r-- 1 root root 957 2018-02-27 06:12 ./source/l/alsa-oss/slack-desc -drwxr-xr-x 2 root root 4096 2018-10-24 18:59 ./source/l/alsa-plugins --rw-r--r-- 1 root root 293648 2018-10-16 12:02 ./source/l/alsa-plugins/alsa-plugins-1.1.7.tar.lz --rwxr--r-- 1 root root 3835 2018-10-24 19:00 ./source/l/alsa-plugins/alsa-plugins.SlackBuild --rw-r--r-- 1 root root 578 2018-10-24 18:58 ./source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch.gz +drwxr-xr-x 2 root root 4096 2019-01-09 01:57 ./source/l/alsa-plugins +-rw-r--r-- 1 root root 299994 2019-01-07 13:22 ./source/l/alsa-plugins/alsa-plugins-1.1.8.tar.lz +-rwxr--r-- 1 root root 3675 2019-01-09 01:57 ./source/l/alsa-plugins/alsa-plugins.SlackBuild -rw-r--r-- 1 root root 894 2018-02-27 06:12 ./source/l/alsa-plugins/slack-desc drwxr-xr-x 2 root root 4096 2018-09-27 18:56 ./source/l/apr drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/l/apr-util @@ -8650,10 +8647,11 @@ drwxr-xr-x 2 root root 4096 2003-01-11 06:27 ./source/l/gtk+2/profile.d -rw-r--r-- 1 root root 778 2018-11-29 19:16 ./source/l/gtk+2/slack-desc -rw-r--r-- 1 root root 339 2011-02-24 20:40 ./source/l/gtk+2/update-gtk-immodules -rw-r--r-- 1 root root 1459 2013-07-12 04:52 ./source/l/gtk+2/update-gtk-immodules-2.0 -drwxr-xr-x 2 root root 4096 2018-12-14 00:29 ./source/l/gtk+3 +drwxr-xr-x 2 root root 4096 2019-01-08 20:31 ./source/l/gtk+3 -rw-r--r-- 1 root root 639 2014-09-30 04:11 ./source/l/gtk+3/doinst.sh.gz -rw-r--r-- 1 root root 21731348 2018-12-12 19:47 ./source/l/gtk+3/gtk+-3.24.2.tar.xz --rwxr-xr-x 1 root root 5414 2018-12-14 00:29 ./source/l/gtk+3/gtk+3.SlackBuild +-rwxr-xr-x 1 root root 5527 2019-01-08 20:31 ./source/l/gtk+3/gtk+3.SlackBuild +-rw-r--r-- 1 root root 727 2019-01-08 20:25 ./source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch.gz -rw-r--r-- 1 root root 223 2018-12-14 00:29 ./source/l/gtk+3/gtk.typo.fix.diff.gz -rw-r--r-- 1 root root 778 2018-11-29 19:16 ./source/l/gtk+3/slack-desc -rw-r--r-- 1 root root 1458 2013-07-12 05:02 ./source/l/gtk+3/update-gtk-immodules-3.0 @@ -9815,7 +9813,7 @@ drwxr-xr-x 2 root root 4096 2018-12-30 04:38 ./source/l/zstd -rw-r--r-- 1 root root 325 2018-12-30 04:38 ./source/l/zstd/zstd.dont.link.pzstd.to.static.libzstd.a.diff.gz -rw-r--r-- 1 root root 33 2018-11-08 01:06 ./source/l/zstd/zstd.url -rwxr-xr-x 1 root root 14025 2018-11-20 03:08 ./source/make_world.sh -drwxr-xr-x 147 root root 4096 2018-12-29 19:36 ./source/n +drwxr-xr-x 147 root root 4096 2019-01-08 20:12 ./source/n -rw-r--r-- 1 root root 534 2018-03-24 17:45 ./source/n/FTBFSlog drwxr-xr-x 2 root root 4096 2018-09-24 19:21 ./source/n/ModemManager -rw-r--r-- 1 root root 2088248 2018-09-22 09:10 ./source/n/ModemManager/ModemManager-1.8.2.tar.xz @@ -10261,9 +10259,9 @@ drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/n/mtr -rw-r--r-- 1 root root 206056 2017-06-02 10:55 ./source/n/mtr/mtr-0.92.tar.xz -rwxr-xr-x 1 root root 3739 2018-09-18 22:04 ./source/n/mtr/mtr.SlackBuild -rw-r--r-- 1 root root 776 2018-02-27 06:13 ./source/n/mtr/slack-desc -drwxr-xr-x 2 root root 4096 2018-12-03 03:39 ./source/n/mutt +drwxr-xr-x 2 root root 4096 2019-01-08 20:09 ./source/n/mutt -rw-r--r-- 1 root root 264 2002-06-01 05:12 ./source/n/mutt/doinst.sh.gz --rw-r--r-- 1 root root 2159493 2018-12-01 20:33 ./source/n/mutt/mutt-1.11.1.tar.lz +-rw-r--r-- 1 root root 2161627 2019-01-08 01:53 ./source/n/mutt/mutt-1.11.2.tar.lz -rwxr-xr-x 1 root root 4414 2018-12-03 03:39 ./source/n/mutt/mutt.SlackBuild -rw-r--r-- 1 root root 29 2018-11-26 18:07 ./source/n/mutt/mutt.url -rw-r--r-- 1 root root 900 2018-08-27 17:37 ./source/n/mutt/slack-desc @@ -10804,36 +10802,26 @@ drwxr-xr-x 2 root root 4096 2017-11-14 23:02 ./source/n/wireless_tools/sc -rwxr-xr-x 1 root root 4055 2018-12-31 20:06 ./source/n/wireless_tools/wireless_tools.SlackBuild -rw-r--r-- 1 root root 227 2005-07-14 05:20 ./source/n/wireless_tools/wireless_tools.nowhine.diff.gz -rw-r--r-- 1 root root 59 2018-12-31 19:59 ./source/n/wireless_tools/wireless_tools.url -drwxr-xr-x 5 root root 4096 2018-09-18 22:04 ./source/n/wpa_supplicant -drwxr-xr-x 2 root root 4096 2017-10-17 00:41 ./source/n/wpa_supplicant/2017-1 --rw-r--r-- 1 root root 2472 2017-10-02 16:19 ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch.gz --rw-r--r-- 1 root root 2568 2017-10-02 16:19 ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch.gz --rw-r--r-- 1 root root 2079 2017-10-02 16:19 ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch.gz --rw-r--r-- 1 root root 1301 2017-10-02 16:19 ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch.gz --rw-r--r-- 1 root root 1069 2017-10-02 16:19 ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch.gz --rw-r--r-- 1 root root 1977 2017-10-02 16:19 ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch.gz --rw-r--r-- 1 root root 880 2017-10-02 16:19 ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch.gz --rw-r--r-- 1 root root 1374 2017-10-02 16:19 ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch.gz --rw-r--r-- 1 root root 11037 2017-10-16 09:17 ./source/n/wpa_supplicant/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt +drwxr-xr-x 4 root root 4096 2019-01-04 21:22 ./source/n/wpa_supplicant -rw-r--r-- 1 root root 2080 2005-08-06 20:17 ./source/n/wpa_supplicant/README.slackware -drwxr-xr-x 2 root root 4096 2017-12-13 07:32 ./source/n/wpa_supplicant/config --rw-r--r-- 1 root root 896 2017-12-13 07:32 ./source/n/wpa_supplicant/config/dot.config +drwxr-xr-x 2 root root 4096 2018-12-29 19:33 ./source/n/wpa_supplicant/config +-rw-r--r-- 1 root root 21700 2019-01-04 21:22 ./source/n/wpa_supplicant/config/dot.config -rw-r--r-- 1 root root 139 2012-05-06 07:11 ./source/n/wpa_supplicant/config/wpa_gui.desktop -rw-r--r-- 1 root root 5124 2009-04-20 18:10 ./source/n/wpa_supplicant/config/wpa_gui.png -rw-r--r-- 1 root root 65 2012-05-06 07:08 ./source/n/wpa_supplicant/config/wpa_supplicant.conf -rw-r--r-- 1 root root 100 2012-05-06 07:05 ./source/n/wpa_supplicant/config/wpa_supplicant.logrotate -rw-r--r-- 1 root root 284 2012-05-06 07:31 ./source/n/wpa_supplicant/doinst.sh.gz -drwxr-xr-x 2 root root 4096 2018-05-10 13:04 ./source/n/wpa_supplicant/patches --rw-r--r-- 1 root root 1543 2018-02-10 04:09 ./source/n/wpa_supplicant/patches/Fix-openssl-1-1-private-key-callback.patch.gz --rw-r--r-- 1 root root 333 2014-12-04 19:03 ./source/n/wpa_supplicant/patches/assoc-timeout.diff.gz --rw-r--r-- 1 root root 350 2012-05-31 00:15 ./source/n/wpa_supplicant/patches/dbus-service-file-args.diff.gz --rw-r--r-- 1 root root 537 2014-12-04 19:03 ./source/n/wpa_supplicant/patches/flush-debug-output.diff.gz --rw-r--r-- 1 root root 388 2017-01-05 17:31 ./source/n/wpa_supplicant/patches/quiet-scan-results-message.diff.gz --rw-r--r-- 1 root root 1453 2017-11-01 12:20 ./source/n/wpa_supplicant/patches/rh1451834-nl80211-Fix-race-condition-in-detecting-MAC-change.patch.gz --rw-r--r-- 1 root root 1121 2017-11-01 12:20 ./source/n/wpa_supplicant/patches/rh1497640-pae-validate-input-before-pointer.patch.gz --rw-r--r-- 1 root root 1062 2018-02-27 06:13 ./source/n/wpa_supplicant/slack-desc --rw-r--r-- 1 root root 1883252 2016-10-02 19:29 ./source/n/wpa_supplicant/wpa_supplicant-2.6.tar.xz --rwxr-xr-x 1 root root 7300 2018-09-18 22:04 ./source/n/wpa_supplicant/wpa_supplicant.SlackBuild +drwxr-xr-x 2 root root 4096 2019-01-04 21:19 ./source/n/wpa_supplicant/patches +-rw-r--r-- 1 root root 454 2018-12-15 14:31 ./source/n/wpa_supplicant/patches/allow-tlsv1.patch.gz +-rw-r--r-- 1 root root 648 2018-12-28 20:02 ./source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch.gz +-rw-r--r-- 1 root root 362 2018-12-18 16:36 ./source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch.gz +-rw-r--r-- 1 root root 348 2018-12-18 16:36 ./source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch.gz +-rw-r--r-- 1 root root 589 2018-12-18 16:36 ./source/n/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch.gz +-rw-r--r-- 1 root root 687 2018-12-18 16:36 ./source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch.gz +-rw-r--r-- 1 root root 625 2018-12-18 16:36 ./source/n/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch.gz +-rw-r--r-- 1 root root 1061 2018-12-06 20:13 ./source/n/wpa_supplicant/slack-desc +-rw-r--r-- 1 root root 2102704 2018-12-02 20:45 ./source/n/wpa_supplicant/wpa_supplicant-2.7.tar.xz +-rwxr-xr-x 1 root root 6309 2019-01-04 21:23 ./source/n/wpa_supplicant/wpa_supplicant.SlackBuild drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/yptools -rw-r--r-- 1 root root 616 2000-11-24 23:39 ./source/n/yptools/nsswitch.conf-nis.gz -rw-r--r-- 1 root root 1355 2017-11-19 02:09 ./source/n/yptools/rc.yp.gz @@ -11344,7 +11332,7 @@ drwxr-xr-x 2 root root 12288 2018-11-11 20:32 ./source/x/x11/build -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xcompmgr -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xconsole -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xcursor-themes --rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xcursorgen +-rw-r--r-- 1 root root 2 2019-01-08 19:04 ./source/x/x11/build/xcursorgen -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xdbedizzy -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xdg-user-dirs -rw-r--r-- 1 root root 2 2018-04-13 02:44 ./source/x/x11/build/xdg-utils @@ -11979,8 +11967,8 @@ drwxr-xr-x 2 root root 12288 2018-11-11 20:32 ./source/x/x11/slack-desc -rw-r--r-- 1 root root 716 2012-04-08 02:21 ./source/x/x11/slack-desc/xwd -rw-r--r-- 1 root root 702 2012-04-08 02:21 ./source/x/x11/slack-desc/xwininfo -rw-r--r-- 1 root root 668 2012-04-07 23:42 ./source/x/x11/slack-desc/xwud -drwxr-xr-x 12 root root 4096 2018-10-25 18:29 ./source/x/x11/src -drwxr-xr-x 2 root root 4096 2018-11-11 20:32 ./source/x/x11/src/app +drwxr-xr-x 12 root root 4096 2019-01-08 19:04 ./source/x/x11/src +drwxr-xr-x 2 root root 4096 2019-01-08 19:04 ./source/x/x11/src/app -rw-r--r-- 1 root root 115464 2018-03-05 03:32 ./source/x/x11/src/app/appres-1.0.5.tar.xz -rw-r--r-- 1 root root 139452 2017-11-07 19:12 ./source/x/x11/src/app/bdftopcf-1.1.tar.xz -rw-r--r-- 1 root root 109956 2013-01-15 05:23 ./source/x/x11/src/app/beforelight-1.0.5.tar.xz @@ -12018,7 +12006,7 @@ drwxr-xr-x 2 root root 4096 2018-11-11 20:32 ./source/x/x11/src/app -rw-r--r-- 1 root root 130232 2015-04-17 05:53 ./source/x/x11/src/app/xcmsdb-1.0.5.tar.xz -rw-r--r-- 1 root root 126964 2015-04-17 05:57 ./source/x/x11/src/app/xcompmgr-1.1.7.tar.xz -rw-r--r-- 1 root root 125640 2017-01-29 19:18 ./source/x/x11/src/app/xconsole-1.0.7.tar.xz --rw-r--r-- 1 root root 115284 2014-05-31 23:35 ./source/x/x11/src/app/xcursorgen-1.0.6.tar.xz +-rw-r--r-- 1 root root 119100 2019-01-06 23:21 ./source/x/x11/src/app/xcursorgen-1.0.7.tar.xz -rw-r--r-- 1 root root 102156 2010-10-31 17:10 ./source/x/x11/src/app/xdbedizzy-1.1.0.tar.xz -rw-r--r-- 1 root root 136580 2015-04-17 06:08 ./source/x/x11/src/app/xditview-1.0.4.tar.xz -rw-r--r-- 1 root root 381740 2011-09-25 07:43 ./source/x/x11/src/app/xdm-1.1.11.tar.xz @@ -12436,34 +12424,34 @@ lrwxrwxrwx 1 root root 4 2013-11-14 21:24 ./source/xap/mozilla-thunder -rw-r--r-- 1 root root 836 2018-12-20 19:12 ./source/xap/mozilla-thunderbird/thunderbird-60.4.0.source.tar.xz.asc drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/network-manager-applet -rw-r--r-- 1 root root 207 2012-08-10 23:59 ./source/xap/network-manager-applet/doinst.sh.gz --rw-r--r-- 1 root root 1550448 2018-09-07 13:46 ./source/xap/network-manager-applet/network-manager-applet-1.8.18.tar.xz --rwxr-xr-x 1 root root 4192 2018-09-18 22:04 ./source/xap/network-manager-applet/network-manager-applet.SlackBuild --rw-r--r-- 1 root root 829 2018-02-27 06:13 ./source/xap/network-manager-applet/slack-desc -drwxr-xr-x 2 root root 4096 2018-10-24 20:33 ./source/xap/pan --rw-r--r-- 1 root root 1659450 2018-05-20 20:41 ./source/xap/pan/pan-0.145.tar.lz --rwxr-xr-x 1 root root 4431 2018-10-24 20:33 ./source/xap/pan/pan.SlackBuild --rw-r--r-- 1 root root 752 2018-02-27 06:13 ./source/xap/pan/slack-desc -drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/pavucontrol --rw-r--r-- 1 root root 120 2013-11-05 03:45 ./source/xap/pavucontrol/doinst.sh.gz --rw-r--r-- 1 root root 145092 2015-03-24 14:57 ./source/xap/pavucontrol/pavucontrol-3.0.tar.xz --rwxr-xr-x 1 root root 3423 2018-09-18 22:04 ./source/xap/pavucontrol/pavucontrol.SlackBuild --rw-r--r-- 1 root root 344 2016-01-05 04:40 ./source/xap/pavucontrol/replace-gtk-stock-lock-icon.diff.gz --rw-r--r-- 1 root root 961 2018-02-27 06:13 ./source/xap/pavucontrol/slack-desc -drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/pidgin --rw-r--r-- 1 root root 172 2016-01-04 03:06 ./source/xap/pidgin/doinst.sh.gz --rw-r--r-- 1 root root 355 2012-05-02 03:59 ./source/xap/pidgin/fix-gmain_h-compile-error.diff.gz --rw-r--r-- 1 root root 6641203 2018-03-09 02:25 ./source/xap/pidgin/pidgin-2.13.0.tar.lz --rw-r--r-- 1 root root 604129 2010-05-18 16:51 ./source/xap/pidgin/pidgin-encryption-3.1.tar.gz --rwxr-xr-x 1 root root 7550 2018-09-18 22:04 ./source/xap/pidgin/pidgin.SlackBuild --rw-r--r-- 1 root root 920 2018-02-27 06:13 ./source/xap/pidgin/slack-desc -drwxr-xr-x 2 root root 4096 2019-01-02 22:46 ./source/xap/rdesktop --rw-r--r-- 1 root root 250484 2019-01-02 14:21 ./source/xap/rdesktop/rdesktop-1.8.4.tar.xz --rwxr-xr-x 1 root root 3809 2019-01-02 22:46 ./source/xap/rdesktop/rdesktop.SlackBuild --rw-r--r-- 1 root root 850 2018-02-27 06:13 ./source/xap/rdesktop/slack-desc -drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/rxvt-unicode --rw-r--r-- 1 root root 222 2018-03-31 17:18 ./source/xap/rxvt-unicode/rxvt-unicode-256color.desktop --rw-r--r-- 1 root root 712702 2016-01-23 20:09 ./source/xap/rxvt-unicode/rxvt-unicode-9.22.tar.lz --rwxr-xr-x 1 root root 5651 2018-11-30 21:13 ./source/xap/rxvt-unicode/rxvt-unicode.SlackBuild +-rw-r--r-- 1 root root 1550448 2018-09-07 13:46 ./source/xap/network-manager-applet/network-manager-applet-1.8.18.tar.xz +-rwxr-xr-x 1 root root 4192 2018-09-18 22:04 ./source/xap/network-manager-applet/network-manager-applet.SlackBuild +-rw-r--r-- 1 root root 829 2018-02-27 06:13 ./source/xap/network-manager-applet/slack-desc +drwxr-xr-x 2 root root 4096 2018-10-24 20:33 ./source/xap/pan +-rw-r--r-- 1 root root 1659450 2018-05-20 20:41 ./source/xap/pan/pan-0.145.tar.lz +-rwxr-xr-x 1 root root 4431 2018-10-24 20:33 ./source/xap/pan/pan.SlackBuild +-rw-r--r-- 1 root root 752 2018-02-27 06:13 ./source/xap/pan/slack-desc +drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/pavucontrol +-rw-r--r-- 1 root root 120 2013-11-05 03:45 ./source/xap/pavucontrol/doinst.sh.gz +-rw-r--r-- 1 root root 145092 2015-03-24 14:57 ./source/xap/pavucontrol/pavucontrol-3.0.tar.xz +-rwxr-xr-x 1 root root 3423 2018-09-18 22:04 ./source/xap/pavucontrol/pavucontrol.SlackBuild +-rw-r--r-- 1 root root 344 2016-01-05 04:40 ./source/xap/pavucontrol/replace-gtk-stock-lock-icon.diff.gz +-rw-r--r-- 1 root root 961 2018-02-27 06:13 ./source/xap/pavucontrol/slack-desc +drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/pidgin +-rw-r--r-- 1 root root 172 2016-01-04 03:06 ./source/xap/pidgin/doinst.sh.gz +-rw-r--r-- 1 root root 355 2012-05-02 03:59 ./source/xap/pidgin/fix-gmain_h-compile-error.diff.gz +-rw-r--r-- 1 root root 6641203 2018-03-09 02:25 ./source/xap/pidgin/pidgin-2.13.0.tar.lz +-rw-r--r-- 1 root root 604129 2010-05-18 16:51 ./source/xap/pidgin/pidgin-encryption-3.1.tar.gz +-rwxr-xr-x 1 root root 7550 2018-09-18 22:04 ./source/xap/pidgin/pidgin.SlackBuild +-rw-r--r-- 1 root root 920 2018-02-27 06:13 ./source/xap/pidgin/slack-desc +drwxr-xr-x 2 root root 4096 2019-01-02 22:46 ./source/xap/rdesktop +-rw-r--r-- 1 root root 250484 2019-01-02 14:21 ./source/xap/rdesktop/rdesktop-1.8.4.tar.xz +-rwxr-xr-x 1 root root 3809 2019-01-02 22:46 ./source/xap/rdesktop/rdesktop.SlackBuild +-rw-r--r-- 1 root root 850 2018-02-27 06:13 ./source/xap/rdesktop/slack-desc +drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/rxvt-unicode +-rw-r--r-- 1 root root 222 2018-03-31 17:18 ./source/xap/rxvt-unicode/rxvt-unicode-256color.desktop +-rw-r--r-- 1 root root 712702 2016-01-23 20:09 ./source/xap/rxvt-unicode/rxvt-unicode-9.22.tar.lz +-rwxr-xr-x 1 root root 5651 2018-11-30 21:13 ./source/xap/rxvt-unicode/rxvt-unicode.SlackBuild -rw-r--r-- 1 root root 207 2018-03-31 17:17 ./source/xap/rxvt-unicode/rxvt-unicode.desktop -rw-r--r-- 1 root root 7758 2018-03-31 16:26 ./source/xap/rxvt-unicode/rxvt-unicode.utempter.diff.gz -rw-r--r-- 1 root root 940 2018-03-31 16:58 ./source/xap/rxvt-unicode/slack-desc @@ -12822,37 +12810,14 @@ drwxr-xr-x 2 root root 4096 2012-03-02 16:01 ./source/y/bsd-games/fortune- -rw-r--r-- 1 root root 364407 2002-03-10 05:09 ./source/y/bsd-games/fortunes-o.tar.gz -rw-r--r-- 1 root root 104848 1993-10-25 00:02 ./source/y/bsd-games/hangman-words.gz -rw-r--r-- 1 root root 1048 2018-02-27 06:13 ./source/y/bsd-games/slack-desc -drwxr-xr-x 4 root root 4096 2019-01-04 21:56 ./testing --rw-r--r-- 1 root root 2325 2019-01-04 21:56 ./testing/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-01-04 21:56 ./testing/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 2993 2019-01-04 21:56 ./testing/FILE_LIST --rw-r--r-- 1 root root 7469 2019-01-04 21:56 ./testing/MANIFEST.bz2 --rw-r--r-- 1 root root 997 2019-01-04 21:56 ./testing/PACKAGES.TXT -drwxr-xr-x 2 root root 4096 2019-01-04 21:56 ./testing/packages --rw-r--r-- 1 root root 600 2019-01-04 21:23 ./testing/packages/wpa_supplicant-2.7-x86_64-3.txt --rw-r--r-- 1 root root 1147528 2019-01-04 21:23 ./testing/packages/wpa_supplicant-2.7-x86_64-3.txz --rw-r--r-- 1 root root 163 2019-01-04 21:23 ./testing/packages/wpa_supplicant-2.7-x86_64-3.txz.asc -drwxr-xr-x 3 root root 4096 2018-12-29 19:43 ./testing/source -drwxr-xr-x 4 root root 4096 2019-01-04 21:22 ./testing/source/wpa_supplicant --rw-r--r-- 1 root root 2080 2005-08-06 20:17 ./testing/source/wpa_supplicant/README.slackware -drwxr-xr-x 2 root root 4096 2018-12-29 19:33 ./testing/source/wpa_supplicant/config --rw-r--r-- 1 root root 21700 2019-01-04 21:22 ./testing/source/wpa_supplicant/config/dot.config --rw-r--r-- 1 root root 139 2012-05-06 07:11 ./testing/source/wpa_supplicant/config/wpa_gui.desktop --rw-r--r-- 1 root root 5124 2009-04-20 18:10 ./testing/source/wpa_supplicant/config/wpa_gui.png --rw-r--r-- 1 root root 65 2012-05-06 07:08 ./testing/source/wpa_supplicant/config/wpa_supplicant.conf --rw-r--r-- 1 root root 100 2012-05-06 07:05 ./testing/source/wpa_supplicant/config/wpa_supplicant.logrotate --rw-r--r-- 1 root root 284 2012-05-06 07:31 ./testing/source/wpa_supplicant/doinst.sh.gz -drwxr-xr-x 2 root root 4096 2019-01-04 21:19 ./testing/source/wpa_supplicant/patches --rw-r--r-- 1 root root 454 2018-12-15 14:31 ./testing/source/wpa_supplicant/patches/allow-tlsv1.patch.gz --rw-r--r-- 1 root root 648 2018-12-28 20:02 ./testing/source/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch.gz --rw-r--r-- 1 root root 362 2018-12-18 16:36 ./testing/source/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch.gz --rw-r--r-- 1 root root 348 2018-12-18 16:36 ./testing/source/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch.gz --rw-r--r-- 1 root root 589 2018-12-18 16:36 ./testing/source/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch.gz --rw-r--r-- 1 root root 687 2018-12-18 16:36 ./testing/source/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch.gz --rw-r--r-- 1 root root 625 2018-12-18 16:36 ./testing/source/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch.gz --rw-r--r-- 1 root root 1061 2018-12-06 20:13 ./testing/source/wpa_supplicant/slack-desc --rw-r--r-- 1 root root 2102704 2018-12-02 20:45 ./testing/source/wpa_supplicant/wpa_supplicant-2.7.tar.xz --rwxr-xr-x 1 root root 6309 2019-01-04 21:23 ./testing/source/wpa_supplicant/wpa_supplicant.SlackBuild +drwxr-xr-x 4 root root 4096 2019-01-08 21:28 ./testing +-rw-r--r-- 1 root root 552 2019-01-08 21:28 ./testing/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-01-08 21:28 ./testing/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 685 2019-01-08 21:28 ./testing/FILE_LIST +-rw-r--r-- 1 root root 14 2019-01-08 21:28 ./testing/MANIFEST.bz2 +-rw-r--r-- 1 root root 224 2019-01-08 21:28 ./testing/PACKAGES.TXT +drwxr-xr-x 2 root root 4096 2019-01-08 20:12 ./testing/packages +drwxr-xr-x 2 root root 4096 2019-01-08 20:12 ./testing/source drwxr-xr-x 2 root root 4096 2018-12-29 23:12 ./usb-and-pxe-installers -rw-r--r-- 1 root root 31203 2011-03-21 21:21 ./usb-and-pxe-installers/README_PXE.TXT -rw-r--r-- 1 root root 9197 2013-09-25 04:33 ./usb-and-pxe-installers/README_USB.TXT diff --git a/recompress.sh b/recompress.sh index c56a01f7..51389855 100755 --- a/recompress.sh +++ b/recompress.sh @@ -485,21 +485,13 @@ gzip ./source/n/vsftpd/vsftpd.builddefs.diff gzip ./source/n/net-tools/net-tools.config.h gzip ./source/n/nc/nc-110-21.diff gzip ./source/n/nc/nc.diff -gzip ./source/n/wpa_supplicant/patches/rh1451834-nl80211-Fix-race-condition-in-detecting-MAC-change.patch -gzip ./source/n/wpa_supplicant/patches/dbus-service-file-args.diff -gzip ./source/n/wpa_supplicant/patches/assoc-timeout.diff -gzip ./source/n/wpa_supplicant/patches/quiet-scan-results-message.diff -gzip ./source/n/wpa_supplicant/patches/Fix-openssl-1-1-private-key-callback.patch -gzip ./source/n/wpa_supplicant/patches/rh1497640-pae-validate-input-before-pointer.patch -gzip ./source/n/wpa_supplicant/patches/flush-debug-output.diff -gzip ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch -gzip ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch -gzip ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch -gzip ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch -gzip ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch -gzip ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch -gzip ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch -gzip ./source/n/wpa_supplicant/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +gzip ./source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch +gzip ./source/n/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch +gzip ./source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch +gzip ./source/n/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch +gzip ./source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch +gzip ./source/n/wpa_supplicant/patches/allow-tlsv1.patch +gzip ./source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch gzip ./source/n/wpa_supplicant/doinst.sh gzip ./source/n/php/php-fpm.conf.diff gzip ./source/n/php/doinst.sh @@ -725,7 +717,6 @@ gzip ./source/l/db44/patch.4.4.20.2 gzip ./source/l/libxml2/libxml2.do-not-check-crc.diff gzip ./source/l/gnome-themes-standard/doinst.sh gzip ./source/l/libgpod/doinst.sh -gzip ./source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch gzip ./source/l/alsa-lib/doinst.sh gzip ./source/l/djvulibre/doinst.sh gzip ./source/l/icon-naming-utils/icon-naming-utils.pkgconfigdir.diff @@ -831,7 +822,6 @@ gzip ./source/l/ConsoleKit2/patches/0004-Apply-overlooked-prefix-lib-libdir-subs gzip ./source/l/ConsoleKit2/doinst.sh gzip ./source/l/qt-gstreamer/doinst.sh gzip ./source/l/apr-util/apr-util-mariadb-upstream.patch -gzip ./source/l/alsa-oss/alsa-oss.glibc228.diff gzip ./source/l/desktop-file-utils/doinst.sh gzip ./source/l/desktop-file-utils/desktop-file-utils.quiet.warnings.diff gzip ./source/l/mozjs52/autoconf/autoconf-2.13-consolidated_fixes-1.patch @@ -846,7 +836,6 @@ gzip ./source/l/mozjs52/patches/build-missing-xlocale-h.patch gzip ./source/l/mozjs52/patches/xulrunner-24.0-jemalloc-ppc.patch gzip ./source/l/mozjs52/patches/copy-headers.patch gzip ./source/l/mozjs52/patches/mozilla-1253216.patch -gzip ./source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch gzip ./source/l/gdk-pixbuf2/doinst.sh gzip ./source/l/pulseaudio/0002-allow-autospawn-for-root-default.diff gzip ./source/l/pulseaudio/030_posix-completion.diff @@ -936,6 +925,7 @@ gzip ./source/l/db42/patch.4.2.52.4 gzip ./source/l/db42/patch.4.2.52.2 gzip ./source/l/db42/patch.4.2.52.3 gzip ./source/l/gtk+3/gtk.typo.fix.diff +gzip ./source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch gzip ./source/l/gtk+3/doinst.sh gzip ./source/l/system-config-printer/system-config-printer.auth.dialog.2766d74a.patch gzip ./source/l/system-config-printer/doinst.sh @@ -1125,14 +1115,6 @@ gzip ./source/x/x11/patch/xf86-video-intel/0001-Fix-build-on-i686.patch gzip ./source/x/x11/patch/xf86-video-intel/intel-gcc-pr65873.patch gzip ./source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff gzip ./source/x/xcm/xcm.udev.rules.diff -gzip ./testing/source/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch -gzip ./testing/source/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch -gzip ./testing/source/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch -gzip ./testing/source/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch -gzip ./testing/source/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch -gzip ./testing/source/wpa_supplicant/patches/allow-tlsv1.patch -gzip ./testing/source/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch -gzip ./testing/source/wpa_supplicant/doinst.sh gzip ./pasture/source/php/php-fpm.conf.diff gzip ./pasture/source/php/doinst.sh gzip ./pasture/source/php/PHP-5.6.31-OpenSSL-1.1.0-compatibility-20170801.patch diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M index 5eb1055e..cfffb8ec 100644 --- a/source/a/sysvinit-scripts/scripts/rc.M +++ b/source/a/sysvinit-scripts/scripts/rc.M @@ -20,9 +20,11 @@ if [ -x /sbin/ldconfig ]; then /sbin/ldconfig & fi -# Screen blanks after 15 minutes idle time, and powers down in one hour -# if the kernel supports APM or ACPI power management: -/bin/setterm -blank 15 -powersave powerdown -powerdown 60 +# Call the setterm init script to set screen blanking and power management +# defaults: +if [ -x /etc/rc.d/rc.setterm ]; then + /etc/rc.d/rc.setterm +fi # Set the hostname. if [ -r /etc/HOSTNAME ]; then diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index 63c897e9..4bc29169 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-2.1} ARCH=noarch -BUILD=${BUILD:-24} +BUILD=${BUILD:-25} # 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 diff --git a/source/a/util-linux/doinst.sh b/source/a/util-linux/doinst.sh index 678c228f..f3010148 100644 --- a/source/a/util-linux/doinst.sh +++ b/source/a/util-linux/doinst.sh @@ -19,5 +19,6 @@ if [ -e etc/rc.d/rc.serial ]; then fi config etc/rc.d/rc.serial.new +config etc/rc.d/rc.setterm.new config etc/serial.conf.new diff --git a/source/a/util-linux/rc.setterm b/source/a/util-linux/rc.setterm new file mode 100644 index 00000000..b98b1020 --- /dev/null +++ b/source/a/util-linux/rc.setterm @@ -0,0 +1,13 @@ +#!/bin/sh +# +# This file provides the command line for the setterm utility to set the +# terminal attributes (primarily used for screen blanking and power +# management). + +# Screen blanks after 15 minutes idle time, and powers down in one hour +# if the kernel supports APM or ACPI power management (default setting): +/bin/setterm -blank 15 -powersave powerdown -powerdown 60 + +# Screen does not blank or use power management features: +#/bin/setterm -blank 0 -powersave off -powerdown 0 + diff --git a/source/a/util-linux/util-linux.SlackBuild b/source/a/util-linux/util-linux.SlackBuild index 5bda2e60..0729a531 100755 --- a/source/a/util-linux/util-linux.SlackBuild +++ b/source/a/util-linux/util-linux.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=util-linux VERSION=${VERSION:-$(echo util-linux*.tar.xz | cut -d - -f 3 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} ADJTIMEXVERS=1.29 SETSERIALVERS=2.17 @@ -181,6 +181,12 @@ if [ -r $PKG/usr/sbin/fdformat ]; then ) fi +# Add the rc.setterm init script to set default terminal attributes: +mkdir -p $PKG/etc/rc.d +cp -a $CWD/rc.setterm $PKG/etc/rc.d/rc.setterm.new +chown root:root $PKG/etc/rc.d/rc.setterm.new +chmod 755 $PKG/etc/rc.d/rc.setterm.new + # ddate.{1,c} taken from https://github.com/bo0ts/ddate: cp -a $CWD/ddate.? . cc -O -o ddate ddate.c diff --git a/source/ap/gutenprint/gutenprint.SlackBuild b/source/ap/gutenprint/gutenprint.SlackBuild index 4f7eba07..6c3361c8 100755 --- a/source/ap/gutenprint/gutenprint.SlackBuild +++ b/source/ap/gutenprint/gutenprint.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gutenprint VERSION=${VERSION:-$(echo gutenprint-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/l/alsa-lib/alsa-lib.SlackBuild b/source/l/alsa-lib/alsa-lib.SlackBuild index 0c2b56c1..d6c6517c 100755 --- a/source/l/alsa-lib/alsa-lib.SlackBuild +++ b/source/l/alsa-lib/alsa-lib.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-lib VERSION=${VERSION:-$(echo alsa-lib-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -81,8 +81,6 @@ if [ ! -r src/conf/smixer.conf ]; then cp -a $CWD/smixer.conf src/conf fi -zcat $CWD/alsa-lib.fix.pcm.interval.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch b/source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch deleted file mode 100644 index fa8f379a..00000000 --- a/source/l/alsa-lib/alsa-lib.fix.pcm.interval.patch +++ /dev/null @@ -1,72 +0,0 @@ -From b420056604f06117c967b65d43d01536c5ffcbc9 Mon Sep 17 00:00:00 2001 -From: Timo Wischer <twischer@de.adit-jv.com> -Date: Thu, 18 Oct 2018 13:33:24 +0200 -Subject: [PATCH] pcm: interval: Interpret (x x+1] correctly and return x+1 - -Without this change an interval of (x x+1] will be interpreted as an -empty interval but the right value would be x+1. -This leads to a failing snd_pcm_hw_params() call which returns -EINVAL. - -An example issue log is given in the following: -snd_pcm_hw_params failed with err -22 (Invalid argument) -ACCESS: MMAP_NONINTERLEAVED -FORMAT: S16_LE -SUBFORMAT: STD -SAMPLE_BITS: 16 -FRAME_BITS: 16 -CHANNELS: 1 -RATE: 16000 -PERIOD_TIME: (15999 16000] -PERIOD_SIZE: (255 256] -PERIOD_BYTES: (510 512] -PERIODS: [2 3) -BUFFER_TIME: 32000 -BUFFER_SIZE: 512 -BUFFER_BYTES: 1024 - -In case of (x x+1) we have to interpret it anyway as a single value of x to -compensate rounding issues. -For example the period size will result in an interval of (352 353) when -the period time is 16ms and the sample rate 22050 Hz -(16ms * 22,05 kHz = 352,8 frames). But 352 has to be chosen to allow a -buffer size of 705 (32ms * 22,05 kHz = 705,6 frames) which has to be >= 2x -period size to avoid Xruns. The buffer size will not end up with an -interval of (705 706) simular to the period size because -snd_pcm_rate_hw_refine_cchange() calls snd_interval_floor() for the buffer -size. Therefore this value will be interpreted as an integer interval -instead of a real interval further on. - -This issue seems to exist since the change of 9bb985c38 ("pcm: -snd_interval_refine_first/last: exclude value only if also excluded -before") - -Signed-off-by: Timo Wischer <twischer@de.adit-jv.com> -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - src/pcm/interval_inline.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/pcm/interval_inline.h b/src/pcm/interval_inline.h -index a68e292..d9a30b2 100644 ---- a/src/pcm/interval_inline.h -+++ b/src/pcm/interval_inline.h -@@ -51,12 +51,14 @@ INTERVAL_INLINE int snd_interval_single(const snd_interval_t *i) - { - assert(!snd_interval_empty(i)); - return (i->min == i->max || -- (i->min + 1 == i->max && i->openmax)); -+ (i->min + 1 == i->max && (i->openmin || i->openmax))); - } - - INTERVAL_INLINE int snd_interval_value(const snd_interval_t *i) - { - assert(snd_interval_single(i)); -+ if (i->openmin && !i->openmax) -+ return i->max; - return i->min; - } - --- -1.7.11.7 - - diff --git a/source/l/alsa-oss/alsa-oss.SlackBuild b/source/l/alsa-oss/alsa-oss.SlackBuild index d7cd0292..5a073205 100755 --- a/source/l/alsa-oss/alsa-oss.SlackBuild +++ b/source/l/alsa-oss/alsa-oss.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-oss VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -76,8 +76,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/alsa-oss.glibc228.diff.gz | patch -p1 --verbose || exit 1 - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/source/l/alsa-oss/alsa-oss.glibc228.diff b/source/l/alsa-oss/alsa-oss.glibc228.diff deleted file mode 100644 index d44b3806..00000000 --- a/source/l/alsa-oss/alsa-oss.glibc228.diff +++ /dev/null @@ -1,10 +0,0 @@ ---- ./alsa/stdioemu.c.orig 2018-04-03 02:01:38.000000000 -0500 -+++ ./alsa/stdioemu.c 2018-09-18 18:42:01.227057630 -0500 -@@ -37,7 +37,6 @@ - #endif - - #include <stdio.h> --#include <libio.h> - - struct fd_cookie { - int fd; diff --git a/source/l/alsa-plugins/alsa-plugins.SlackBuild b/source/l/alsa-plugins/alsa-plugins.SlackBuild index dc4ed984..7fde7eb2 100755 --- a/source/l/alsa-plugins/alsa-plugins.SlackBuild +++ b/source/l/alsa-plugins/alsa-plugins.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=alsa-plugins VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,9 +77,6 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 -# Upstream fix for USB devices causing a double free: -zcat $CWD/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch.gz | patch -p1 --verbose || exit 1 - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch b/source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch deleted file mode 100644 index 9b3a8159..00000000 --- a/source/l/alsa-plugins/alsa-plugins.a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9.patch +++ /dev/null @@ -1,34 +0,0 @@ -From a4e7e1282c57a2f4e83afe9a4008042d8b4c5bb9 Mon Sep 17 00:00:00 2001 -From: Jaroslav Kysela <perex@perex.cz> -Date: Tue, 23 Oct 2018 09:32:46 +0200 -Subject: [PATCH] a52_close: set slave to NULL to avoid double pcm free in - open fcn - -Signed-off-by: Jaroslav Kysela <perex@perex.cz> ---- - a52/pcm_a52.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/a52/pcm_a52.c b/a52/pcm_a52.c -index e431fd0..b005bc2 100644 ---- a/a52/pcm_a52.c -+++ b/a52/pcm_a52.c -@@ -654,10 +654,13 @@ static int a52_poll_revents(snd_pcm_ioplug_t *io, struct pollfd *pfd, - static int a52_close(snd_pcm_ioplug_t *io) - { - struct a52_ctx *rec = io->private_data; -+ snd_pcm_t *slave = rec->slave; - - a52_free(rec); -- if (rec->slave) -- return snd_pcm_close(rec->slave); -+ if (slave) { -+ rec->slave = NULL; -+ return snd_pcm_close(slave); -+ } - return 0; - } - --- -1.7.11.7 - diff --git a/source/l/gtk+3/gtk+3.SlackBuild b/source/l/gtk+3/gtk+3.SlackBuild index 9b546092..7d880bde 100755 --- a/source/l/gtk+3/gtk+3.SlackBuild +++ b/source/l/gtk+3/gtk+3.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gtk+3 VERSION=${VERSION:-$(echo gtk+-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -79,6 +79,9 @@ find . \ zcat $CWD/gtk.typo.fix.diff.gz | patch -p1 --verbose || exit 1 +# Fix segfault: +zcat $CWD/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch.gz | patch -p1 --verbose || exit 1 + # Regenerate ./configure: libtoolize --copy --force autoreconf -vif diff --git a/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch b/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch new file mode 100644 index 00000000..99806d19 --- /dev/null +++ b/source/l/gtk+3/gtk.e3a1593a0984cc0156ec1892a46af8f256a64878.patch @@ -0,0 +1,42 @@ +From e3a1593a0984cc0156ec1892a46af8f256a64878 Mon Sep 17 00:00:00 2001 +From: Daniel Boles <dboles.src@gmail.com> +Date: Thu, 13 Dec 2018 17:20:13 +0100 +Subject: [PATCH] x11: Fix deprecation macro use + +G_GNUC_END_IGNORE_DEPRECATIONS terminates the if statement and does not +consider the following block to be part of the if. So that block was +always taken irregardless of the pattern. + +Fixes #1280 +--- + gdk/x11/gdkwindow-x11.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c +index 97ada6d739..764e39495f 100644 +--- a/gdk/x11/gdkwindow-x11.c ++++ b/gdk/x11/gdkwindow-x11.c +@@ -2985,6 +2985,7 @@ gdk_window_x11_set_background (GdkWindow *window, + double r, g, b, a; + cairo_surface_t *surface; + cairo_matrix_t matrix; ++ cairo_pattern_t *parent_relative_pattern; + + if (GDK_WINDOW_DESTROYED (window)) + return; +@@ -2997,8 +2998,10 @@ gdk_window_x11_set_background (GdkWindow *window, + } + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS +- if (pattern == gdk_x11_get_parent_relative_pattern ()) ++ parent_relative_pattern = gdk_x11_get_parent_relative_pattern (); + G_GNUC_END_IGNORE_DEPRECATIONS ++ ++ if (pattern == parent_relative_pattern) + { + GdkWindow *parent; + +-- +2.18.1 + + diff --git a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch b/source/n/wpa_supplicant/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch deleted file mode 100644 index 72768486..00000000 --- a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch +++ /dev/null @@ -1,174 +0,0 @@ -From cf4cab804c7afd5c45505528a8d16e46163243a2 Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Fri, 14 Jul 2017 15:15:35 +0200 -Subject: [PATCH 1/8] hostapd: Avoid key reinstallation in FT handshake - -Do not reinstall TK to the driver during Reassociation Response frame -processing if the first attempt of setting the TK succeeded. This avoids -issues related to clearing the TX/RX PN that could result in reusing -same PN values for transmitted frames (e.g., due to CCM nonce reuse and -also hitting replay protection on the receiver) and accepting replayed -frames on RX side. - -This issue was introduced by the commit -0e84c25434e6a1f283c7b4e62e483729085b78d2 ('FT: Fix PTK configuration in -authenticator') which allowed wpa_ft_install_ptk() to be called multiple -times with the same PTK. While the second configuration attempt is -needed with some drivers, it must be done only if the first attempt -failed. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/ap/ieee802_11.c | 16 +++++++++++++--- - src/ap/wpa_auth.c | 11 +++++++++++ - src/ap/wpa_auth.h | 3 ++- - src/ap/wpa_auth_ft.c | 10 ++++++++++ - src/ap/wpa_auth_i.h | 1 + - 5 files changed, 37 insertions(+), 4 deletions(-) - -diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c -index 4e04169..333035f 100644 ---- a/src/ap/ieee802_11.c -+++ b/src/ap/ieee802_11.c -@@ -1841,6 +1841,7 @@ static int add_associated_sta(struct hostapd_data *hapd, - { - struct ieee80211_ht_capabilities ht_cap; - struct ieee80211_vht_capabilities vht_cap; -+ int set = 1; - - /* - * Remove the STA entry to ensure the STA PS state gets cleared and -@@ -1848,9 +1849,18 @@ static int add_associated_sta(struct hostapd_data *hapd, - * FT-over-the-DS, where a station re-associates back to the same AP but - * skips the authentication flow, or if working with a driver that - * does not support full AP client state. -+ * -+ * Skip this if the STA has already completed FT reassociation and the -+ * TK has been configured since the TX/RX PN must not be reset to 0 for -+ * the same key. - */ -- if (!sta->added_unassoc) -+ if (!sta->added_unassoc && -+ (!(sta->flags & WLAN_STA_AUTHORIZED) || -+ !wpa_auth_sta_ft_tk_already_set(sta->wpa_sm))) { - hostapd_drv_sta_remove(hapd, sta->addr); -+ wpa_auth_sm_event(sta->wpa_sm, WPA_DRV_STA_REMOVED); -+ set = 0; -+ } - - #ifdef CONFIG_IEEE80211N - if (sta->flags & WLAN_STA_HT) -@@ -1873,11 +1883,11 @@ static int add_associated_sta(struct hostapd_data *hapd, - sta->flags & WLAN_STA_VHT ? &vht_cap : NULL, - sta->flags | WLAN_STA_ASSOC, sta->qosinfo, - sta->vht_opmode, sta->p2p_ie ? 1 : 0, -- sta->added_unassoc)) { -+ set)) { - hostapd_logger(hapd, sta->addr, - HOSTAPD_MODULE_IEEE80211, HOSTAPD_LEVEL_NOTICE, - "Could not %s STA to kernel driver", -- sta->added_unassoc ? "set" : "add"); -+ set ? "set" : "add"); - - if (sta->added_unassoc) { - hostapd_drv_sta_remove(hapd, sta->addr); -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 3587086..707971d 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1745,6 +1745,9 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event) - #else /* CONFIG_IEEE80211R */ - break; - #endif /* CONFIG_IEEE80211R */ -+ case WPA_DRV_STA_REMOVED: -+ sm->tk_already_set = FALSE; -+ return 0; - } - - #ifdef CONFIG_IEEE80211R -@@ -3250,6 +3253,14 @@ int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm) - } - - -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm) -+{ -+ if (!sm || !wpa_key_mgmt_ft(sm->wpa_key_mgmt)) -+ return 0; -+ return sm->tk_already_set; -+} -+ -+ - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry) - { -diff --git a/src/ap/wpa_auth.h b/src/ap/wpa_auth.h -index 0de8d97..97461b0 100644 ---- a/src/ap/wpa_auth.h -+++ b/src/ap/wpa_auth.h -@@ -267,7 +267,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth, - u8 *data, size_t data_len); - enum wpa_event { - WPA_AUTH, WPA_ASSOC, WPA_DISASSOC, WPA_DEAUTH, WPA_REAUTH, -- WPA_REAUTH_EAPOL, WPA_ASSOC_FT -+ WPA_REAUTH_EAPOL, WPA_ASSOC_FT, WPA_DRV_STA_REMOVED - }; - void wpa_remove_ptk(struct wpa_state_machine *sm); - int wpa_auth_sm_event(struct wpa_state_machine *sm, enum wpa_event event); -@@ -280,6 +280,7 @@ int wpa_auth_pairwise_set(struct wpa_state_machine *sm); - int wpa_auth_get_pairwise(struct wpa_state_machine *sm); - int wpa_auth_sta_key_mgmt(struct wpa_state_machine *sm); - int wpa_auth_sta_wpa_version(struct wpa_state_machine *sm); -+int wpa_auth_sta_ft_tk_already_set(struct wpa_state_machine *sm); - int wpa_auth_sta_clear_pmksa(struct wpa_state_machine *sm, - struct rsn_pmksa_cache_entry *entry); - struct rsn_pmksa_cache_entry * -diff --git a/src/ap/wpa_auth_ft.c b/src/ap/wpa_auth_ft.c -index 42242a5..e63b99a 100644 ---- a/src/ap/wpa_auth_ft.c -+++ b/src/ap/wpa_auth_ft.c -@@ -780,6 +780,14 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - return; - } - -+ if (sm->tk_already_set) { -+ /* Must avoid TK reconfiguration to prevent clearing of TX/RX -+ * PN in the driver */ -+ wpa_printf(MSG_DEBUG, -+ "FT: Do not re-install same PTK to the driver"); -+ return; -+ } -+ - /* FIX: add STA entry to kernel/driver here? The set_key will fail - * most likely without this.. At the moment, STA entry is added only - * after association has been completed. This function will be called -@@ -792,6 +800,7 @@ void wpa_ft_install_ptk(struct wpa_state_machine *sm) - - /* FIX: MLME-SetProtection.Request(TA, Tx_Rx) */ - sm->pairwise_set = TRUE; -+ sm->tk_already_set = TRUE; - } - - -@@ -898,6 +907,7 @@ static int wpa_ft_process_auth_req(struct wpa_state_machine *sm, - - sm->pairwise = pairwise; - sm->PTK_valid = TRUE; -+ sm->tk_already_set = FALSE; - wpa_ft_install_ptk(sm); - - buflen = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + -diff --git a/src/ap/wpa_auth_i.h b/src/ap/wpa_auth_i.h -index 72b7eb3..7fd8f05 100644 ---- a/src/ap/wpa_auth_i.h -+++ b/src/ap/wpa_auth_i.h -@@ -65,6 +65,7 @@ struct wpa_state_machine { - struct wpa_ptk PTK; - Boolean PTK_valid; - Boolean pairwise_set; -+ Boolean tk_already_set; - int keycount; - Boolean Pair; - struct wpa_key_replay_counter { --- -2.7.4 - diff --git a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch b/source/n/wpa_supplicant/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch deleted file mode 100644 index 1802d664..00000000 --- a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch +++ /dev/null @@ -1,250 +0,0 @@ -From 927f891007c402fefd1ff384645b3f07597c3ede Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Wed, 12 Jul 2017 16:03:24 +0200 -Subject: [PATCH 2/8] Prevent reinstallation of an already in-use group key - -Track the current GTK and IGTK that is in use and when receiving a -(possibly retransmitted) Group Message 1 or WNM-Sleep Mode Response, do -not install the given key if it is already in use. This prevents an -attacker from trying to trick the client into resetting or lowering the -sequence counter associated to the group key. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/common/wpa_common.h | 11 +++++ - src/rsn_supp/wpa.c | 116 ++++++++++++++++++++++++++++++------------------ - src/rsn_supp/wpa_i.h | 4 ++ - 3 files changed, 87 insertions(+), 44 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index af1d0f0..d200285 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -217,6 +217,17 @@ struct wpa_ptk { - size_t tk_len; - }; - -+struct wpa_gtk { -+ u8 gtk[WPA_GTK_MAX_LEN]; -+ size_t gtk_len; -+}; -+ -+#ifdef CONFIG_IEEE80211W -+struct wpa_igtk { -+ u8 igtk[WPA_IGTK_MAX_LEN]; -+ size_t igtk_len; -+}; -+#endif /* CONFIG_IEEE80211W */ - - /* WPA IE version 1 - * 00-50-f2:1 (OUI:OUI type) -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 3c47879..95bd7be 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -714,6 +714,15 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - -+ /* Detect possible key reinstallation */ -+ if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", -+ gd->keyidx, gd->tx, gd->gtk_len); -+ return 0; -+ } -+ - wpa_hexdump_key(MSG_DEBUG, "WPA: Group Key", gd->gtk, gd->gtk_len); - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Installing GTK to the driver (keyidx=%d tx=%d len=%d)", -@@ -748,6 +757,9 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ - return 0; - } - -@@ -854,6 +866,48 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - } - - -+#ifdef CONFIG_IEEE80211W -+static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -+ const struct wpa_igtk_kde *igtk) -+{ -+ size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); -+ u16 keyidx = WPA_GET_LE16(igtk->keyid); -+ -+ /* Detect possible key reinstallation */ -+ if (sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", -+ keyidx); -+ return 0; -+ } -+ -+ wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, -+ "WPA: IGTK keyid %d pn %02x%02x%02x%02x%02x%02x", -+ keyidx, MAC2STR(igtk->pn)); -+ wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", igtk->igtk, len); -+ if (keyidx > 4095) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Invalid IGTK KeyID %d", keyidx); -+ return -1; -+ } -+ if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -+ broadcast_ether_addr, -+ keyidx, 0, igtk->pn, sizeof(igtk->pn), -+ igtk->igtk, len) < 0) { -+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -+ "WPA: Failed to configure IGTK to the driver"); -+ return -1; -+ } -+ -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ -+ return 0; -+} -+#endif /* CONFIG_IEEE80211W */ -+ -+ - static int ieee80211w_set_keys(struct wpa_sm *sm, - struct wpa_eapol_ie_parse *ie) - { -@@ -864,30 +918,14 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - if (ie->igtk) { - size_t len; - const struct wpa_igtk_kde *igtk; -- u16 keyidx; -+ - len = wpa_cipher_key_len(sm->mgmt_group_cipher); - if (ie->igtk_len != WPA_IGTK_KDE_PREFIX_LEN + len) - return -1; -+ - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- keyidx = WPA_GET_LE16(igtk->keyid); -- wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, "WPA: IGTK keyid %d " -- "pn %02x%02x%02x%02x%02x%02x", -- keyidx, MAC2STR(igtk->pn)); -- wpa_hexdump_key(MSG_DEBUG, "WPA: IGTK", -- igtk->igtk, len); -- if (keyidx > 4095) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Invalid IGTK KeyID %d", keyidx); -- return -1; -- } -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igtk->pn, sizeof(igtk->pn), -- igtk->igtk, len) < 0) { -- wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, -- "WPA: Failed to configure IGTK to the driver"); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } - } - - return 0; -@@ -2307,7 +2345,7 @@ void wpa_sm_deinit(struct wpa_sm *sm) - */ - void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - { -- int clear_ptk = 1; -+ int clear_keys = 1; - - if (sm == NULL) - return; -@@ -2333,11 +2371,11 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - /* Prepare for the next transition */ - wpa_ft_prepare_auth_request(sm, NULL); - -- clear_ptk = 0; -+ clear_keys = 0; - } - #endif /* CONFIG_IEEE80211R */ - -- if (clear_ptk) { -+ if (clear_keys) { - /* - * IEEE 802.11, 8.4.10: Delete PTK SA on (re)association if - * this is not part of a Fast BSS Transition. -@@ -2347,6 +2385,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - } - - #ifdef CONFIG_TDLS -@@ -2877,6 +2919,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(sm->pmk, 0, sizeof(sm->pmk)); - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); -+ os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+#ifdef CONFIG_IEEE80211W -+ os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+#endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); - os_memset(sm->pmk_r0, 0, sizeof(sm->pmk_r0)); -@@ -2949,29 +2995,11 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - os_memset(&gd, 0, sizeof(gd)); - #ifdef CONFIG_IEEE80211W - } else if (subelem_id == WNM_SLEEP_SUBELEM_IGTK) { -- struct wpa_igtk_kde igd; -- u16 keyidx; -- -- os_memset(&igd, 0, sizeof(igd)); -- keylen = wpa_cipher_key_len(sm->mgmt_group_cipher); -- os_memcpy(igd.keyid, buf + 2, 2); -- os_memcpy(igd.pn, buf + 4, 6); -- -- keyidx = WPA_GET_LE16(igd.keyid); -- os_memcpy(igd.igtk, buf + 10, keylen); -- -- wpa_hexdump_key(MSG_DEBUG, "Install IGTK (WNM SLEEP)", -- igd.igtk, keylen); -- if (wpa_sm_set_key(sm, wpa_cipher_to_alg(sm->mgmt_group_cipher), -- broadcast_ether_addr, -- keyidx, 0, igd.pn, sizeof(igd.pn), -- igd.igtk, keylen) < 0) { -- wpa_printf(MSG_DEBUG, "Failed to install the IGTK in " -- "WNM mode"); -- os_memset(&igd, 0, sizeof(igd)); -+ const struct wpa_igtk_kde *igtk; -+ -+ igtk = (const struct wpa_igtk_kde *) (buf + 2); -+ if (wpa_supplicant_install_igtk(sm, igtk) < 0) - return -1; -- } -- os_memset(&igd, 0, sizeof(igd)); - #endif /* CONFIG_IEEE80211W */ - } else { - wpa_printf(MSG_DEBUG, "Unknown element id"); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index f653ba6..afc9e37 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -31,6 +31,10 @@ struct wpa_sm { - u8 rx_replay_counter[WPA_REPLAY_COUNTER_LEN]; - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; -+ struct wpa_gtk gtk; -+#ifdef CONFIG_IEEE80211W -+ struct wpa_igtk igtk; -+#endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ - --- -2.7.4 - diff --git a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch b/source/n/wpa_supplicant/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch deleted file mode 100644 index e2937b85..00000000 --- a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch +++ /dev/null @@ -1,184 +0,0 @@ -From 8280294e74846ea342389a0cd17215050fa5afe8 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sun, 1 Oct 2017 12:12:24 +0300 -Subject: [PATCH 3/8] Extend protection of GTK/IGTK reinstallation of WNM-Sleep - Mode cases - -This extends the protection to track last configured GTK/IGTK value -separately from EAPOL-Key frames and WNM-Sleep Mode frames to cover a -corner case where these two different mechanisms may get used when the -GTK/IGTK has changed and tracking a single value is not sufficient to -detect a possible key reconfiguration. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/wpa.c | 53 +++++++++++++++++++++++++++++++++++++--------------- - src/rsn_supp/wpa_i.h | 2 ++ - 2 files changed, 40 insertions(+), 15 deletions(-) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 95bd7be..7a2c68d 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -709,14 +709,17 @@ struct wpa_gtk_data { - - static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - const struct wpa_gtk_data *gd, -- const u8 *key_rsc) -+ const u8 *key_rsc, int wnm_sleep) - { - const u8 *_gtk = gd->gtk; - u8 gtk_buf[32]; - - /* Detect possible key reinstallation */ -- if (sm->gtk.gtk_len == (size_t) gd->gtk_len && -- os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) { -+ if ((sm->gtk.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len) == 0) || -+ (sm->gtk_wnm_sleep.gtk_len == (size_t) gd->gtk_len && -+ os_memcmp(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use GTK to the driver (keyidx=%d tx=%d len=%d)", - gd->keyidx, gd->tx, gd->gtk_len); -@@ -757,8 +760,14 @@ static int wpa_supplicant_install_gtk(struct wpa_sm *sm, - } - os_memset(gtk_buf, 0, sizeof(gtk_buf)); - -- sm->gtk.gtk_len = gd->gtk_len; -- os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ if (wnm_sleep) { -+ sm->gtk_wnm_sleep.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk_wnm_sleep.gtk, gd->gtk, -+ sm->gtk_wnm_sleep.gtk_len); -+ } else { -+ sm->gtk.gtk_len = gd->gtk_len; -+ os_memcpy(sm->gtk.gtk, gd->gtk, sm->gtk.gtk_len); -+ } - - return 0; - } -@@ -852,7 +861,7 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - (wpa_supplicant_check_group_cipher(sm, sm->group_cipher, - gtk_len, gtk_len, - &gd.key_rsc_len, &gd.alg) || -- wpa_supplicant_install_gtk(sm, &gd, key_rsc))) { -+ wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0))) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "RSN: Failed to install GTK"); - os_memset(&gd, 0, sizeof(gd)); -@@ -868,14 +877,18 @@ static int wpa_supplicant_pairwise_gtk(struct wpa_sm *sm, - - #ifdef CONFIG_IEEE80211W - static int wpa_supplicant_install_igtk(struct wpa_sm *sm, -- const struct wpa_igtk_kde *igtk) -+ const struct wpa_igtk_kde *igtk, -+ int wnm_sleep) - { - size_t len = wpa_cipher_key_len(sm->mgmt_group_cipher); - u16 keyidx = WPA_GET_LE16(igtk->keyid); - - /* Detect possible key reinstallation */ -- if (sm->igtk.igtk_len == len && -- os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) { -+ if ((sm->igtk.igtk_len == len && -+ os_memcmp(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len) == 0) || -+ (sm->igtk_wnm_sleep.igtk_len == len && -+ os_memcmp(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len) == 0)) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Not reinstalling already in-use IGTK to the driver (keyidx=%d)", - keyidx); -@@ -900,8 +913,14 @@ static int wpa_supplicant_install_igtk(struct wpa_sm *sm, - return -1; - } - -- sm->igtk.igtk_len = len; -- os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ if (wnm_sleep) { -+ sm->igtk_wnm_sleep.igtk_len = len; -+ os_memcpy(sm->igtk_wnm_sleep.igtk, igtk->igtk, -+ sm->igtk_wnm_sleep.igtk_len); -+ } else { -+ sm->igtk.igtk_len = len; -+ os_memcpy(sm->igtk.igtk, igtk->igtk, sm->igtk.igtk_len); -+ } - - return 0; - } -@@ -924,7 +943,7 @@ static int ieee80211w_set_keys(struct wpa_sm *sm, - return -1; - - igtk = (const struct wpa_igtk_kde *) ie->igtk; -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 0) < 0) - return -1; - } - -@@ -1574,7 +1593,7 @@ static void wpa_supplicant_process_1_of_2(struct wpa_sm *sm, - if (wpa_supplicant_rsc_relaxation(sm, key->key_rsc)) - key_rsc = null_rsc; - -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc) || -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 0) || - wpa_supplicant_send_2_of_2(sm, key, ver, key_info) < 0) - goto failed; - os_memset(&gd, 0, sizeof(gd)); -@@ -2386,8 +2405,10 @@ void wpa_sm_notify_assoc(struct wpa_sm *sm, const u8 *bssid) - sm->tptk_set = 0; - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - } - -@@ -2920,8 +2941,10 @@ void wpa_sm_drop_sa(struct wpa_sm *sm) - os_memset(&sm->ptk, 0, sizeof(sm->ptk)); - os_memset(&sm->tptk, 0, sizeof(sm->tptk)); - os_memset(&sm->gtk, 0, sizeof(sm->gtk)); -+ os_memset(&sm->gtk_wnm_sleep, 0, sizeof(sm->gtk_wnm_sleep)); - #ifdef CONFIG_IEEE80211W - os_memset(&sm->igtk, 0, sizeof(sm->igtk)); -+ os_memset(&sm->igtk_wnm_sleep, 0, sizeof(sm->igtk_wnm_sleep)); - #endif /* CONFIG_IEEE80211W */ - #ifdef CONFIG_IEEE80211R - os_memset(sm->xxkey, 0, sizeof(sm->xxkey)); -@@ -2986,7 +3009,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - - wpa_hexdump_key(MSG_DEBUG, "Install GTK (WNM SLEEP)", - gd.gtk, gd.gtk_len); -- if (wpa_supplicant_install_gtk(sm, &gd, key_rsc)) { -+ if (wpa_supplicant_install_gtk(sm, &gd, key_rsc, 1)) { - os_memset(&gd, 0, sizeof(gd)); - wpa_printf(MSG_DEBUG, "Failed to install the GTK in " - "WNM mode"); -@@ -2998,7 +3021,7 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf) - const struct wpa_igtk_kde *igtk; - - igtk = (const struct wpa_igtk_kde *) (buf + 2); -- if (wpa_supplicant_install_igtk(sm, igtk) < 0) -+ if (wpa_supplicant_install_igtk(sm, igtk, 1) < 0) - return -1; - #endif /* CONFIG_IEEE80211W */ - } else { -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index afc9e37..9a54631 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -32,8 +32,10 @@ struct wpa_sm { - int rx_replay_counter_set; - u8 request_counter[WPA_REPLAY_COUNTER_LEN]; - struct wpa_gtk gtk; -+ struct wpa_gtk gtk_wnm_sleep; - #ifdef CONFIG_IEEE80211W - struct wpa_igtk igtk; -+ struct wpa_igtk igtk_wnm_sleep; - #endif /* CONFIG_IEEE80211W */ - - struct eapol_sm *eapol; /* EAPOL state machine from upper level code */ --- -2.7.4 - diff --git a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch b/source/n/wpa_supplicant/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch deleted file mode 100644 index 22ee2179..00000000 --- a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 8f82bc94e8697a9d47fa8774dfdaaede1084912c Mon Sep 17 00:00:00 2001 -From: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> -Date: Fri, 29 Sep 2017 04:22:51 +0200 -Subject: [PATCH 4/8] Prevent installation of an all-zero TK - -Properly track whether a PTK has already been installed to the driver -and the TK part cleared from memory. This prevents an attacker from -trying to trick the client into installing an all-zero TK. - -This fixes the earlier fix in commit -ad00d64e7d8827b3cebd665a0ceb08adabf15e1e ('Fix TK configuration to the -driver in EAPOL-Key 3/4 retry case') which did not take into account -possibility of an extra message 1/4 showing up between retries of -message 3/4. - -Signed-off-by: Mathy Vanhoef <Mathy.Vanhoef@cs.kuleuven.be> ---- - src/common/wpa_common.h | 1 + - src/rsn_supp/wpa.c | 5 ++--- - src/rsn_supp/wpa_i.h | 1 - - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/common/wpa_common.h b/src/common/wpa_common.h -index d200285..1021ccb 100644 ---- a/src/common/wpa_common.h -+++ b/src/common/wpa_common.h -@@ -215,6 +215,7 @@ struct wpa_ptk { - size_t kck_len; - size_t kek_len; - size_t tk_len; -+ int installed; /* 1 if key has already been installed to driver */ - }; - - struct wpa_gtk { -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 7a2c68d..0550a41 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -510,7 +510,6 @@ static void wpa_supplicant_process_1_of_4(struct wpa_sm *sm, - os_memset(buf, 0, sizeof(buf)); - } - sm->tptk_set = 1; -- sm->tk_to_set = 1; - - kde = sm->assoc_wpa_ie; - kde_len = sm->assoc_wpa_ie_len; -@@ -615,7 +614,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - enum wpa_alg alg; - const u8 *key_rsc; - -- if (!sm->tk_to_set) { -+ if (sm->ptk.installed) { - wpa_dbg(sm->ctx->msg_ctx, MSG_DEBUG, - "WPA: Do not re-install same PTK to the driver"); - return 0; -@@ -659,7 +658,7 @@ static int wpa_supplicant_install_ptk(struct wpa_sm *sm, - - /* TK is not needed anymore in supplicant */ - os_memset(sm->ptk.tk, 0, WPA_TK_MAX_LEN); -- sm->tk_to_set = 0; -+ sm->ptk.installed = 1; - - if (sm->wpa_ptk_rekey) { - eloop_cancel_timeout(wpa_sm_rekey_ptk, sm, NULL); -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 9a54631..41f371f 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -24,7 +24,6 @@ struct wpa_sm { - struct wpa_ptk ptk, tptk; - int ptk_set, tptk_set; - unsigned int msg_3_of_4_ok:1; -- unsigned int tk_to_set:1; - u8 snonce[WPA_NONCE_LEN]; - u8 anonce[WPA_NONCE_LEN]; /* ANonce from the last 1/4 msg */ - int renew_snonce; --- -2.7.4 - diff --git a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch b/source/n/wpa_supplicant/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch deleted file mode 100644 index c19c4c71..00000000 --- a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0005-Fix-PTK-rekeying-to-generate-a-new-ANonce.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 12fac09b437a1dc8a0f253e265934a8aaf4d2f8b Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Sun, 1 Oct 2017 12:32:57 +0300 -Subject: [PATCH 5/8] Fix PTK rekeying to generate a new ANonce - -The Authenticator state machine path for PTK rekeying ended up bypassing -the AUTHENTICATION2 state where a new ANonce is generated when going -directly to the PTKSTART state since there is no need to try to -determine the PMK again in such a case. This is far from ideal since the -new PTK would depend on a new nonce only from the supplicant. - -Fix this by generating a new ANonce when moving to the PTKSTART state -for the purpose of starting new 4-way handshake to rekey PTK. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/ap/wpa_auth.c | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c -index 707971d..bf10cc1 100644 ---- a/src/ap/wpa_auth.c -+++ b/src/ap/wpa_auth.c -@@ -1901,6 +1901,21 @@ SM_STATE(WPA_PTK, AUTHENTICATION2) - } - - -+static int wpa_auth_sm_ptk_update(struct wpa_state_machine *sm) -+{ -+ if (random_get_bytes(sm->ANonce, WPA_NONCE_LEN)) { -+ wpa_printf(MSG_ERROR, -+ "WPA: Failed to get random data for ANonce"); -+ sm->Disconnect = TRUE; -+ return -1; -+ } -+ wpa_hexdump(MSG_DEBUG, "WPA: Assign new ANonce", sm->ANonce, -+ WPA_NONCE_LEN); -+ sm->TimeoutCtr = 0; -+ return 0; -+} -+ -+ - SM_STATE(WPA_PTK, INITPMK) - { - u8 msk[2 * PMK_LEN]; -@@ -2458,9 +2473,12 @@ SM_STEP(WPA_PTK) - SM_ENTER(WPA_PTK, AUTHENTICATION); - else if (sm->ReAuthenticationRequest) - SM_ENTER(WPA_PTK, AUTHENTICATION2); -- else if (sm->PTKRequest) -- SM_ENTER(WPA_PTK, PTKSTART); -- else switch (sm->wpa_ptk_state) { -+ else if (sm->PTKRequest) { -+ if (wpa_auth_sm_ptk_update(sm) < 0) -+ SM_ENTER(WPA_PTK, DISCONNECTED); -+ else -+ SM_ENTER(WPA_PTK, PTKSTART); -+ } else switch (sm->wpa_ptk_state) { - case WPA_PTK_INITIALIZE: - break; - case WPA_PTK_DISCONNECT: --- -2.7.4 - diff --git a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch b/source/n/wpa_supplicant/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch deleted file mode 100644 index e1bd5a57..00000000 --- a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 6c4bed4f47d1960ec04981a9d50e5076aea5223d Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 11:03:15 +0300 -Subject: [PATCH 6/8] TDLS: Reject TPK-TK reconfiguration - -Do not try to reconfigure the same TPK-TK to the driver after it has -been successfully configured. This is an explicit check to avoid issues -related to resetting the TX/RX packet number. There was already a check -for this for TPK M2 (retries of that message are ignored completely), so -that behavior does not get modified. - -For TPK M3, the TPK-TK could have been reconfigured, but that was -followed by immediate teardown of the link due to an issue in updating -the STA entry. Furthermore, for TDLS with any real security (i.e., -ignoring open/WEP), the TPK message exchange is protected on the AP path -and simple replay attacks are not feasible. - -As an additional corner case, make sure the local nonce gets updated if -the peer uses a very unlikely "random nonce" of all zeros. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/tdls.c | 38 ++++++++++++++++++++++++++++++++++++-- - 1 file changed, 36 insertions(+), 2 deletions(-) - -diff --git a/src/rsn_supp/tdls.c b/src/rsn_supp/tdls.c -index e424168..9eb9738 100644 ---- a/src/rsn_supp/tdls.c -+++ b/src/rsn_supp/tdls.c -@@ -112,6 +112,7 @@ struct wpa_tdls_peer { - u8 tk[16]; /* TPK-TK; assuming only CCMP will be used */ - } tpk; - int tpk_set; -+ int tk_set; /* TPK-TK configured to the driver */ - int tpk_success; - int tpk_in_progress; - -@@ -192,6 +193,20 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - u8 rsc[6]; - enum wpa_alg alg; - -+ if (peer->tk_set) { -+ /* -+ * This same TPK-TK has already been configured to the driver -+ * and this new configuration attempt (likely due to an -+ * unexpected retransmitted frame) would result in clearing -+ * the TX/RX sequence number which can break security, so must -+ * not allow that to happen. -+ */ -+ wpa_printf(MSG_INFO, "TDLS: TPK-TK for the peer " MACSTR -+ " has already been configured to the driver - do not reconfigure", -+ MAC2STR(peer->addr)); -+ return -1; -+ } -+ - os_memset(rsc, 0, 6); - - switch (peer->cipher) { -@@ -209,12 +224,15 @@ static int wpa_tdls_set_key(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - return -1; - } - -+ wpa_printf(MSG_DEBUG, "TDLS: Configure pairwise key for peer " MACSTR, -+ MAC2STR(peer->addr)); - if (wpa_sm_set_key(sm, alg, peer->addr, -1, 1, - rsc, sizeof(rsc), peer->tpk.tk, key_len) < 0) { - wpa_printf(MSG_WARNING, "TDLS: Failed to set TPK to the " - "driver"); - return -1; - } -+ peer->tk_set = 1; - return 0; - } - -@@ -696,7 +714,7 @@ static void wpa_tdls_peer_clear(struct wpa_sm *sm, struct wpa_tdls_peer *peer) - peer->cipher = 0; - peer->qos_info = 0; - peer->wmm_capable = 0; -- peer->tpk_set = peer->tpk_success = 0; -+ peer->tk_set = peer->tpk_set = peer->tpk_success = 0; - peer->chan_switch_enabled = 0; - os_memset(&peer->tpk, 0, sizeof(peer->tpk)); - os_memset(peer->inonce, 0, WPA_NONCE_LEN); -@@ -1159,6 +1177,7 @@ skip_rsnie: - wpa_tdls_peer_free(sm, peer); - return -1; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - wpa_hexdump(MSG_DEBUG, "TDLS: Initiator Nonce for TPK handshake", - peer->inonce, WPA_NONCE_LEN); - os_memcpy(ftie->Snonce, peer->inonce, WPA_NONCE_LEN); -@@ -1751,6 +1770,19 @@ static int wpa_tdls_addset_peer(struct wpa_sm *sm, struct wpa_tdls_peer *peer, - } - - -+static int tdls_nonce_set(const u8 *nonce) -+{ -+ int i; -+ -+ for (i = 0; i < WPA_NONCE_LEN; i++) { -+ if (nonce[i]) -+ return 1; -+ } -+ -+ return 0; -+} -+ -+ - static int wpa_tdls_process_tpk_m1(struct wpa_sm *sm, const u8 *src_addr, - const u8 *buf, size_t len) - { -@@ -2004,7 +2036,8 @@ skip_rsn: - peer->rsnie_i_len = kde.rsn_ie_len; - peer->cipher = cipher; - -- if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0) { -+ if (os_memcmp(peer->inonce, ftie->Snonce, WPA_NONCE_LEN) != 0 || -+ !tdls_nonce_set(peer->inonce)) { - /* - * There is no point in updating the RNonce for every obtained - * TPK M1 frame (e.g., retransmission due to timeout) with the -@@ -2020,6 +2053,7 @@ skip_rsn: - "TDLS: Failed to get random data for responder nonce"); - goto error; - } -+ peer->tk_set = 0; /* A new nonce results in a new TK */ - } - - #if 0 --- -2.7.4 - diff --git a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch b/source/n/wpa_supplicant/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch deleted file mode 100644 index 85ea1d62..00000000 --- a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 53c5eb58e95004f86e65ee9fbfccbc291b139057 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 11:25:02 +0300 -Subject: [PATCH 7/8] WNM: Ignore WNM-Sleep Mode Response without pending - request - -Commit 03ed0a52393710be6bdae657d1b36efa146520e5 ('WNM: Ignore WNM-Sleep -Mode Response if WNM-Sleep Mode has not been used') started ignoring the -response when no WNM-Sleep Mode Request had been used during the -association. This can be made tighter by clearing the used flag when -successfully processing a response. This adds an additional layer of -protection against unexpected retransmissions of the response frame. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - wpa_supplicant/wnm_sta.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c -index 1b3409c..67a07ff 100644 ---- a/wpa_supplicant/wnm_sta.c -+++ b/wpa_supplicant/wnm_sta.c -@@ -260,7 +260,7 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - - if (!wpa_s->wnmsleep_used) { - wpa_printf(MSG_DEBUG, -- "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode has not been used in this association"); -+ "WNM: Ignore WNM-Sleep Mode Response frame since WNM-Sleep Mode operation has not been requested"); - return; - } - -@@ -299,6 +299,8 @@ static void ieee802_11_rx_wnmsleep_resp(struct wpa_supplicant *wpa_s, - return; - } - -+ wpa_s->wnmsleep_used = 0; -+ - if (wnmsleep_ie->status == WNM_STATUS_SLEEP_ACCEPT || - wnmsleep_ie->status == WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) { - wpa_printf(MSG_DEBUG, "Successfully recv WNM-Sleep Response " --- -2.7.4 - diff --git a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch b/source/n/wpa_supplicant/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch deleted file mode 100644 index b9678f68..00000000 --- a/source/n/wpa_supplicant/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch +++ /dev/null @@ -1,82 +0,0 @@ -From b372ab0b7daea719749194dc554b26e6367603f2 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Fri, 22 Sep 2017 12:06:37 +0300 -Subject: [PATCH 8/8] FT: Do not allow multiple Reassociation Response frames - -The driver is expected to not report a second association event without -the station having explicitly request a new association. As such, this -case should not be reachable. However, since reconfiguring the same -pairwise or group keys to the driver could result in nonce reuse issues, -be extra careful here and do an additional state check to avoid this -even if the local driver ends up somehow accepting an unexpected -Reassociation Response frame. - -Signed-off-by: Jouni Malinen <j@w1.fi> ---- - src/rsn_supp/wpa.c | 3 +++ - src/rsn_supp/wpa_ft.c | 8 ++++++++ - src/rsn_supp/wpa_i.h | 1 + - 3 files changed, 12 insertions(+) - -diff --git a/src/rsn_supp/wpa.c b/src/rsn_supp/wpa.c -index 0550a41..2a53c6f 100644 ---- a/src/rsn_supp/wpa.c -+++ b/src/rsn_supp/wpa.c -@@ -2440,6 +2440,9 @@ void wpa_sm_notify_disassoc(struct wpa_sm *sm) - #ifdef CONFIG_TDLS - wpa_tdls_disassoc(sm); - #endif /* CONFIG_TDLS */ -+#ifdef CONFIG_IEEE80211R -+ sm->ft_reassoc_completed = 0; -+#endif /* CONFIG_IEEE80211R */ - - /* Keys are not needed in the WPA state machine anymore */ - wpa_sm_drop_sa(sm); -diff --git a/src/rsn_supp/wpa_ft.c b/src/rsn_supp/wpa_ft.c -index 205793e..d45bb45 100644 ---- a/src/rsn_supp/wpa_ft.c -+++ b/src/rsn_supp/wpa_ft.c -@@ -153,6 +153,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len, - u16 capab; - - sm->ft_completed = 0; -+ sm->ft_reassoc_completed = 0; - - buf_len = 2 + sizeof(struct rsn_mdie) + 2 + sizeof(struct rsn_ftie) + - 2 + sm->r0kh_id_len + ric_ies_len + 100; -@@ -681,6 +682,11 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ if (sm->ft_reassoc_completed) { -+ wpa_printf(MSG_DEBUG, "FT: Reassociation has already been completed for this FT protocol instance - ignore unexpected retransmission"); -+ return 0; -+ } -+ - if (wpa_ft_parse_ies(ies, ies_len, &parse) < 0) { - wpa_printf(MSG_DEBUG, "FT: Failed to parse IEs"); - return -1; -@@ -781,6 +787,8 @@ int wpa_ft_validate_reassoc_resp(struct wpa_sm *sm, const u8 *ies, - return -1; - } - -+ sm->ft_reassoc_completed = 1; -+ - if (wpa_ft_process_gtk_subelem(sm, parse.gtk, parse.gtk_len) < 0) - return -1; - -diff --git a/src/rsn_supp/wpa_i.h b/src/rsn_supp/wpa_i.h -index 41f371f..56f88dc 100644 ---- a/src/rsn_supp/wpa_i.h -+++ b/src/rsn_supp/wpa_i.h -@@ -128,6 +128,7 @@ struct wpa_sm { - size_t r0kh_id_len; - u8 r1kh_id[FT_R1KH_ID_LEN]; - int ft_completed; -+ int ft_reassoc_completed; - int over_the_ds_in_progress; - u8 target_ap[ETH_ALEN]; /* over-the-DS target AP */ - int set_ptk_after_assoc; --- -2.7.4 - diff --git a/source/n/wpa_supplicant/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt b/source/n/wpa_supplicant/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt deleted file mode 100644 index 5ccb5098..00000000 --- a/source/n/wpa_supplicant/2017-1/wpa-packet-number-reuse-with-replayed-messages.txt +++ /dev/null @@ -1,226 +0,0 @@ -WPA packet number reuse with replayed messages and key reinstallation - -Published: October 16, 2017 -Identifiers: -- CERT case ID: VU#228519 -- CVE-2017-13077 -- CVE-2017-13078 -- CVE-2017-13079 -- CVE-2017-13080 -- CVE-2017-13081 -- CVE-2017-13082 -- CVE-2017-13084 (not applicable) -- CVE-2017-13086 -- CVE-2017-13087 -- CVE-2017-13088 -Latest version available from: https://w1.fi/security/2017-1/ - - -Vulnerability - -A vulnerability was found in how a number of implementations can be -triggered to reconfigure WPA/WPA2/RSN keys (TK, GTK, or IGTK) by -replaying a specific frame that is used to manage the keys. Such -reinstallation of the encryption key can result in two different types -of vulnerabilities: disabling replay protection and significantly -reducing the security of encryption to the point of allowing frames to -be decrypted or some parts of the keys to be determined by an attacker -depending on which cipher is used. - -This document focuses on the cases that apply to systems using hostapd -(AP) or wpa_supplicant (station), but it should be noted that the -generic vulnerability itself is applicable to other implementations and -may have different impact in other cases. - -This vulnerability can in theory apply to any case where a TK (the -pairwise/unicast encryption key used with TKIP, CCMP, GCMP), a GTK -(group/multicast encryption key), or an IGTK (group management frame -integrity protection key) is configured by the Authentication/Supplicant -component to the WLAN driver/firmware taking care of the TX/RX path and -encryption/decryption of frames. - -If the same key is configured multiple times, it is likely that the -transmit and receive packet numbers (PN, IPN, RSC/TSC, etc.) are cleared -to a smaller value (zero in case of pairwise keys, zero or at least a -smaller value than the last used value in case of group keys). When this -happens with the same key, this breaks replay protection on RX side and -can result in reuse of packet numbers on TX side. The former may allow -replaying of previously delivered packets (without the attacker being -able to decrypt them or modify their contents) while the latter may -result in more severe issues on the TX side due to resulting CCM nonce -replay and related issues with GCMP and TKIP. The TX side issue may make -it significantly easier for the attacker to decrypt frames and determine -some parts of the keys (e.g., a Michael MIC key in case of TKIP). - -Impact on AP/hostapd - -On the AP side, this generic issue has been determined to be applicable -in the case where hostapd is used to operate an RSN/WPA2 network with FT -(Fast BSS Transition from IEEE 802.11r) enabled. Replaying of the -Reassociation Request frame can be used to get the AP reinstalling the -TK which results in the AP accepting previously delivered unicast frames -from the station and the AP reusing previously used packet numbers -(local TX packet number gets reset to zero). This latter issue on the TX -side can result in CCM nonce reuse which invalidates CCMP security -properties. In case of TKIP this can result in the attacker being able -to determine part of the TK more easily and with GCMP, result in similar -issues. - -It should be noted that the AP side issue with FT would be close to -applying to FILS authentication (from IEEE 802.11ai) in hostapd with -replaying of (Re)Association Request frames. However, due to a different -handling of the repeated association processing with FILS, this would -actually result in the station getting immediately disconnected which -prevents this attack in practice. In addition, the FILS implementation -in the current hostapd version is still experimental and documented as -being discouraged in production use cases. - -Another area of potentially reduced security was identified when looking -into these issues. When AP/Authenticator implementation in hostapd is -requested to rekey the PTK without performing EAP reauthentication -(either through local periodic rekeying or due to a request from an -association station), the ANonce value does not get updated. This -results in the new 4-way handshake depending on the station/supplicant -side generating a new, unique (for the current PMK/PSK) SNonce for the -PTK derivation to result in a new key. While a properly working -supplicant would do so, if there is a supplicant implementation that -does not, this combination could result in deriving the same PTK -again. When the TK from that PTK gets configured in the driver, this -would result in reinstalling the same key and the same issues as -described above for the FT protocol case. - -Impact on station/wpa_supplicant - -On the station side, this generic issue has been determined to be -applicable in the cases where wpa_supplicant processes a group key (GTK -or IGTK) update from the AP. An attacker that is able to limit access -to frame delivery may be able to extract two update messages and deliver -those to the station with significant time delay between them. When -wpa_supplicant processes the second message, it may end up reinstalling -the same key to the driver and when doing this, clear the RX packet -number to an old value. This would allow the attacker to replay all -group-addressed frames that the AP sent between the time the key update -message was originally sent and the time when the attacker forwarded the -second frame to the station. The attacker would not be able to decrypt -or modify the frames based on this vulnerability, though. There is an -exception to this with older wpa_supplicant versions as noted below in -version specific notes. - -For the current wpa_supplicant version (v2.6), there is also an -additional EAPOL-Key replay sequence where an additional forged -EAPOL-Key message can be used to bypass the existing protection for the -pairwise key reconfiguration in a manner that ends up configuring a -known TK that an attacker could use to decrypt any frame sent by the -station and to inject arbitrary unicast frames. Similar issues are -reachable in older versions as noted below. - -PeerKey / TDLS PeerKey - -As far as the related CVE-2017-13084 (reinstallation of the STK key in -the PeerKey handshake) is concerned, it should be noted that PeerKey -implementation in wpa_supplicant is not fully functional and the actual -installation of the key into the driver does not work. As such, this -item is not applicable in practice. Furthermore, the PeerKey handshake -for IEEE 802.11e DLS is obsolete and not known to have been deployed. - -As far as the TDLS PeerKey handshake is concerned (CVE-2017-13086), -wpa_supplicant implementation is already rejecting TPK M2 retries, so -the reconfiguration issue cannot apply for it. For TPK M3, there is a -theoretical impact. However, if that frame is replayed, the current -wpa_supplicant implementation ends up tearing down the TDLS link -immediately and as such, there is no real window for performing the -attack. Furthermore, TPK M3 goes through the AP path and if RSN is used -there, that frame has replay protection, so the attacker could not -perform the attack. If the AP path were to use WEP, the frame could be -replayed, though. That said, if WEP is used on the AP path, it would be -fair to assume that there is no security in the network, so a new attack -vector would be of small additional value. - -With older wpa_supplicant versions, it may be possible for an attacker -to cause TPK M2 to be retransmitted with delay that would be able to -trigger reinstallation of TK on the peer receiving TPK M2 -(CVE-2017-13086). This may open a short window for the attack with v2.3, -v2.4, and v2.5; and a longer window with older versions. - -Vulnerable versions/configurations - -For the AP/Authenticator TK (unicast) reinstallation in FT protocol -(CVE-2017-13082): - -hostapd v0.7.2 and newer with FT enabled (i.e., practically all versions -that include full FT implementation). FT needs to be enabled in the -runtime configuration to make this applicable. - -For the AP/Authenticator missing ANonce during PTK rekeying: - -All hostapd versions. - -For the station/Supplicant side GTK/IGTK reinstallation and TK -configuration: - -All wpa_supplicant versions. The impact on older versions can be more -severe due to earlier changes in this area: v2.3 and older can also -reinstall the pairwise key and as such have similar impact as the AP FT -case (CVE-2017-13077); v2.4 and v2.5 end up configuring an all-zero TK -which breaks the normal data path, but could allow an attacker to -decrypt all following frames from the station and to inject arbitrary -frames to the station. In addition, a different message sequence -involving 4-way handshake can result in configuration of an all-zero TK -in v2.6 and the current snapshot of the development repository as of the -publication of this advisory. - - -Acknowledgments - -Thanks to Mathy Vanhoef of the imec-DistriNet research group of KU -Leuven for discovering and reporting this issue. Thanks to John A. Van -Boxtel for finding additional issues related to this topic. - - -Possible mitigation steps - -- For AP/hostapd and FT replay issue (CVE-2017-13082), it is possible to - prevent the issue temporarily by disabling FT in runtime - configuration, if needed before being able to update the - implementations. - -- Merge the following commits to hostapd/wpa_supplicant and rebuild them: - - hostapd and replayed FT reassociation request frame (CVE-2017-13082): - hostapd: Avoid key reinstallation in FT handshake - - hostapd PTK rekeying and ANonce update: - Fix PTK rekeying to generate a new ANonce - - wpa_supplicant and GTK/IGTK rekeying (CVE-2017-13078, CVE-2017-13079, - CVE-2017-13080, CVE-2017-13081, CVE-2017-13087, CVE-2017-13088): - Prevent reinstallation of an already in-use group key - Extend protection of GTK/IGTK reinstallation of WNM-Sleep Mode cases - - wpa_supplicant (v2.6 or newer snapshot) and known TK issue: - Prevent installation of an all-zero TK - - Additional protection steps for wpa_supplicant: - TDLS: Reject TPK-TK reconfiguration - WNM: Ignore WNM-Sleep Mode Response without pending request - FT: Do not allow multiple Reassociation Response frames - - These patches are available from https://w1.fi/security/2017-1/ - (both against the snapshot of hostap.git master branch and rebased on - top of the v2.6 release) - - For the TDLS TPK M2 retransmission issue (CVE-2017-13086) with older - wpa_supplicant versions, consider updating to the latest version or - merge in a commit that is present in v2.6: - https://w1.fi/cgit/hostap/commit/?id=dabdef9e048b17b22b1c025ad592922eab30dda8 - ('TDLS: Ignore incoming TDLS Setup Response retries') - -- Update to hostapd/wpa_supplicant v2.7 or newer, once available - * it should be noted that there are number of additional changes in - the related areas of the implementation to provide extra layer of - protection for potential unknown issues; these changes are not - included in this advisory as they have not been identified to be - critical for preventing any of the identified security - vulnerabilities; however, users of hostapd/wpa_supplicant are - encouraged to consider merging such changes even if not fully - moving to v2.7 diff --git a/source/n/wpa_supplicant/config/dot.config b/source/n/wpa_supplicant/config/dot.config index 1c7f67df..966a98c2 100644 --- a/source/n/wpa_supplicant/config/dot.config +++ b/source/n/wpa_supplicant/config/dot.config @@ -1,44 +1,599 @@ -CONFIG_AP=y -CONFIG_BACKEND=file -CONFIG_BGSCAN_SIMPLE=y -CONFIG_CTRL_IFACE=y -CONFIG_CTRL_IFACE_DBUS=y -CONFIG_CTRL_IFACE_DBUS_INTRO=y -CONFIG_CTRL_IFACE_DBUS_NEW=y -CONFIG_DEBUG_FILE=y -CONFIG_DEBUG_SYSLOG=y -CONFIG_DRIVER_NL80211=y +# Example wpa_supplicant build time configuration +# +# This file lists the configuration options that are used when building the +# wpa_supplicant binary. All lines starting with # are ignored. Configuration +# option lines must be commented out complete, if they are not to be included, +# i.e., just setting VARIABLE=n is not disabling that variable. +# +# This file is included in Makefile, so variables like CFLAGS and LIBS can also +# be modified from here. In most cases, these lines should use += in order not +# to override previous values of the variables. + + +# Uncomment following two lines and fix the paths if you have installed OpenSSL +# or GnuTLS in non-default location +#CFLAGS += -I/usr/local/openssl/include +#LIBS += -L/usr/local/openssl/lib + +# Some Red Hat versions seem to include kerberos header files from OpenSSL, but +# the kerberos files are not in the default include path. Following line can be +# used to fix build issues on such systems (krb5.h not found). +#CFLAGS += -I/usr/include/kerberos + +# Driver interface for generic Linux wireless extensions +# Note: WEXT is deprecated in the current Linux kernel version and no new +# functionality is added to it. nl80211-based interface is the new +# replacement for WEXT and its use allows wpa_supplicant to properly control +# the driver to improve existing functionality like roaming and to support new +# functionality. CONFIG_DRIVER_WEXT=y + +# Driver interface for Linux drivers using the nl80211 kernel interface +CONFIG_DRIVER_NL80211=y + +# QCA vendor extensions to nl80211 +CONFIG_DRIVER_NL80211_QCA=y + +# driver_nl80211.c requires libnl. If you are compiling it yourself +# you may need to point hostapd to your version of libnl. +# +#CFLAGS += -I$<path to libnl include files> +#LIBS += -L$<path to libnl library files> + +# Use libnl v2.0 (or 3.0) libraries. +#CONFIG_LIBNL20=y + +# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored) +CONFIG_LIBNL32=y + + +# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) +#CONFIG_DRIVER_BSD=y +#CFLAGS += -I/usr/local/include +#LIBS += -L/usr/local/lib +#LIBS_p += -L/usr/local/lib +#LIBS_c += -L/usr/local/lib + +# Driver interface for Windows NDIS +#CONFIG_DRIVER_NDIS=y +#CFLAGS += -I/usr/include/w32api/ddk +#LIBS += -L/usr/local/lib +# For native build using mingw +#CONFIG_NATIVE_WINDOWS=y +# Additional directories for cross-compilation on Linux host for mingw target +#CFLAGS += -I/opt/mingw/mingw32/include/ddk +#LIBS += -L/opt/mingw/mingw32/lib +#CC=mingw32-gcc +# By default, driver_ndis uses WinPcap for low-level operations. This can be +# replaced with the following option which replaces WinPcap calls with NDISUIO. +# However, this requires that WZC is disabled (net stop wzcsvc) before starting +# wpa_supplicant. +# CONFIG_USE_NDISUIO=y + +# Driver interface for wired Ethernet drivers CONFIG_DRIVER_WIRED=y -CONFIG_EAP_AKA=y -CONFIG_EAP_FAST=y -CONFIG_EAP_GPSK=y -CONFIG_EAP_GPSK_SHA256=y -CONFIG_EAP_GTC=y -CONFIG_EAP_IKEV2=y -CONFIG_EAP_LEAP=y + +# Driver interface for MACsec capable Qualcomm Atheros drivers +#CONFIG_DRIVER_MACSEC_QCA=y + +# Driver interface for Linux MACsec drivers +CONFIG_DRIVER_MACSEC_LINUX=y + +# Driver interface for the Broadcom RoboSwitch family +#CONFIG_DRIVER_ROBOSWITCH=y + +# Driver interface for no driver (e.g., WPS ER only) +#CONFIG_DRIVER_NONE=y + +# Solaris libraries +#LIBS += -lsocket -ldlpi -lnsl +#LIBS_c += -lsocket + +# Enable IEEE 802.1X Supplicant (automatically included if any EAP method or +# MACsec is included) +CONFIG_IEEE8021X_EAPOL=y + +# EAP-MD5 CONFIG_EAP_MD5=y + +# EAP-MSCHAPv2 CONFIG_EAP_MSCHAPV2=y + +# EAP-TLS +CONFIG_EAP_TLS=y + +# EAL-PEAP +CONFIG_EAP_PEAP=y + +# EAP-TTLS +CONFIG_EAP_TTLS=y + +# EAP-FAST +# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed +# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g., +# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions. +CONFIG_EAP_FAST=y + +# EAP-GTC +CONFIG_EAP_GTC=y + +# EAP-OTP CONFIG_EAP_OTP=y + +# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) +#CONFIG_EAP_SIM=y + +# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) +#CONFIG_EAP_PSK=y + +# EAP-pwd (secure authentication using only a password) +#CONFIG_EAP_PWD=y + +# EAP-PAX CONFIG_EAP_PAX=y -CONFIG_EAP_PEAP=y + +# LEAP +CONFIG_EAP_LEAP=y + +# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) +CONFIG_EAP_AKA=y + +# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). +# This requires CONFIG_EAP_AKA to be enabled, too. +#CONFIG_EAP_AKA_PRIME=y + +# Enable USIM simulator (Milenage) for EAP-AKA +#CONFIG_USIM_SIMULATOR=y + +# EAP-SAKE CONFIG_EAP_SAKE=y -CONFIG_EAP_TLS=y + +# EAP-GPSK +CONFIG_EAP_GPSK=y +# Include support for optional SHA256 cipher suite in EAP-GPSK +CONFIG_EAP_GPSK_SHA256=y + +# EAP-TNC and related Trusted Network Connect support (experimental) CONFIG_EAP_TNC=y -CONFIG_EAP_TTLS=y -CONFIG_IBSS_RSN=y -CONFIG_IEEE80211N=y -CONFIG_IEEE80211R=y -CONFIG_IEEE80211W=y -CONFIG_IEEE8021X_EAPOL=y -CONFIG_LIBNL32=y -CONFIG_P2P=y + +# Wi-Fi Protected Setup (WPS) +CONFIG_WPS=y +# Enable WPS external registrar functionality +#CONFIG_WPS_ER=y +# Disable credentials for an open network by default when acting as a WPS +# registrar. +#CONFIG_WPS_REG_DISABLE_OPEN=y +# Enable WPS support with NFC config method +#CONFIG_WPS_NFC=y + +# EAP-IKEv2 +CONFIG_EAP_IKEV2=y + +# EAP-EKE +#CONFIG_EAP_EKE=y + +# MACsec +CONFIG_MACSEC=y + +# Peerkey support: CONFIG_PEERKEY=y + +# PKCS#12 (PFX) support (used to read private key and certificate file from +# a file that usually has extension .p12 or .pfx) CONFIG_PKCS12=y -CONFIG_READLINE=y + +# Smartcard support (i.e., private key on a smartcard), e.g., with openssl +# engine. CONFIG_SMARTCARD=y -CONFIG_TLS_DEFAULT_CIPHERS="PROFILE=SYSTEM:3DES" + +# PC/SC interface for smartcards (USIM, GSM SIM) +# Enable this if EAP-SIM or EAP-AKA is included +#CONFIG_PCSC=y + +# Support HT overrides (disable HT/HT40, mask MCS rates, etc.) +#CONFIG_HT_OVERRIDES=y + +# Support VHT overrides (disable VHT, mask MCS rates, etc.) +#CONFIG_VHT_OVERRIDES=y + +# Development testing +#CONFIG_EAPOL_TEST=y + +# Select control interface backend for external programs, e.g, wpa_cli: +# unix = UNIX domain sockets (default for Linux/*BSD) +# udp = UDP sockets using localhost (127.0.0.1) +# udp6 = UDP IPv6 sockets using localhost (::1) +# named_pipe = Windows Named Pipe (default for Windows) +# udp-remote = UDP sockets with remote access (only for tests systems/purpose) +# udp6-remote = UDP IPv6 sockets with remote access (only for tests purpose) +# y = use default (backwards compatibility) +# If this option is commented out, control interface is not included in the +# build. +CONFIG_CTRL_IFACE=y + +# Include support for GNU Readline and History Libraries in wpa_cli. +# When building a wpa_cli binary for distribution, please note that these +# libraries are licensed under GPL and as such, BSD license may not apply for +# the resulting binary. +CONFIG_READLINE=y + +# Include internal line edit mode in wpa_cli. This can be used as a replacement +# for GNU Readline to provide limited command line editing and history support. +#CONFIG_WPA_CLI_EDIT=y + +# Remove debugging code that is printing out debug message to stdout. +# This can be used to reduce the size of the wpa_supplicant considerably +# if debugging code is not needed. The size reduction can be around 35% +# (e.g., 90 kB). +#CONFIG_NO_STDOUT_DEBUG=y + +# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save +# 35-50 kB in code size. +#CONFIG_NO_WPA=y + +# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support +# This option can be used to reduce code size by removing support for +# converting ASCII passphrases into PSK. If this functionality is removed, the +# PSK can only be configured as the 64-octet hexstring (e.g., from +# wpa_passphrase). This saves about 0.5 kB in code size. +#CONFIG_NO_WPA_PASSPHRASE=y + +# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. +# This can be used if ap_scan=1 mode is never enabled. +#CONFIG_NO_SCAN_PROCESSING=y + +# Select configuration backend: +# file = text file (e.g., wpa_supplicant.conf; note: the configuration file +# path is given on command line, not here; this option is just used to +# select the backend that allows configuration files to be used) +# winreg = Windows registry (see win_example.reg for an example) +CONFIG_BACKEND=file + +# Remove configuration write functionality (i.e., to allow the configuration +# file to be updated based on runtime configuration changes). The runtime +# configuration can still be changed, the changes are just not going to be +# persistent over restarts. This option can be used to reduce code size by +# about 3.5 kB. +#CONFIG_NO_CONFIG_WRITE=y + +# Remove support for configuration blobs to reduce code size by about 1.5 kB. +#CONFIG_NO_CONFIG_BLOBS=y + +# Select program entry point implementation: +# main = UNIX/POSIX like main() function (default) +# main_winsvc = Windows service (read parameters from registry) +# main_none = Very basic example (development use only) +#CONFIG_MAIN=main + +# Select wrapper for operating system and C library specific functions +# unix = UNIX/POSIX like systems (default) +# win32 = Windows systems +# none = Empty template +#CONFIG_OS=unix + +# Select event loop implementation +# eloop = select() loop (default) +# eloop_win = Windows events and WaitForMultipleObject() loop +#CONFIG_ELOOP=eloop + +# Should we use poll instead of select? Select is used by default. +#CONFIG_ELOOP_POLL=y + +# Should we use epoll instead of select? Select is used by default. +#CONFIG_ELOOP_EPOLL=y + +# Should we use kqueue instead of select? Select is used by default. +#CONFIG_ELOOP_KQUEUE=y + +# Select layer 2 packet implementation +# linux = Linux packet socket (default) +# pcap = libpcap/libdnet/WinPcap +# freebsd = FreeBSD libpcap +# winpcap = WinPcap with receive thread +# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) +# none = Empty template +#CONFIG_L2_PACKET=linux + +# Disable Linux packet socket workaround applicable for station interface +# in a bridge for EAPOL frames. This should be uncommented only if the kernel +# is known to not have the regression issue in packet socket behavior with +# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). +#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y + +# IEEE 802.11w (management frame protection), also known as PMF +# Driver support is also needed for IEEE 802.11w. +CONFIG_IEEE80211W=y + +# Select TLS implementation +# openssl = OpenSSL (default) +# gnutls = GnuTLS +# internal = Internal TLSv1 implementation (experimental) +# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental) +# none = Empty template +CONFIG_TLS=openssl + +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) +# can be enabled to get a stronger construction of messages when block ciphers +# are used. It should be noted that some existing TLS v1.0 -based +# implementation may not be compatible with TLS v1.1 message (ClientHello is +# sent prior to negotiating which version will be used) +CONFIG_TLSV11=y + +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) +# can be enabled to enable use of stronger crypto algorithms. It should be +# noted that some existing TLS v1.0 -based implementation may not be compatible +# with TLS v1.2 message (ClientHello is sent prior to negotiating which version +# will be used) +#CONFIG_TLSV12=y + +# Select which ciphers to use by default with OpenSSL if the user does not +# specify them. +#CONFIG_TLS_DEFAULT_CIPHERS="PROFILE=SYSTEM:3DES" +CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT@SECLEVEL=1" + +# If CONFIG_TLS=internal is used, additional library and include paths are +# needed for LibTomMath. Alternatively, an integrated, minimal version of +# LibTomMath can be used. See beginning of libtommath.c for details on benefits +# and drawbacks of this option. +#CONFIG_INTERNAL_LIBTOMMATH=y +#ifndef CONFIG_INTERNAL_LIBTOMMATH +#LTM_PATH=/usr/src/libtommath-0.39 +#CFLAGS += -I$(LTM_PATH) +#LIBS += -L$(LTM_PATH) +#LIBS_p += -L$(LTM_PATH) +#endif +# At the cost of about 4 kB of additional binary size, the internal LibTomMath +# can be configured to include faster routines for exptmod, sqr, and div to +# speed up DH and RSA calculation considerably +#CONFIG_INTERNAL_LIBTOMMATH_FAST=y + +# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. +# This is only for Windows builds and requires WMI-related header files and +# WbemUuid.Lib from Platform SDK even when building with MinGW. +#CONFIG_NDIS_EVENTS_INTEGRATED=y +#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" + +# Add support for old DBus control interface +# (fi.epitest.hostap.WPASupplicant) +CONFIG_CTRL_IFACE_DBUS=y + +# Add support for new DBus control interface +# (fi.w1.hostap.wpa_supplicant1) +CONFIG_CTRL_IFACE_DBUS_NEW=y + +# Add introspection support for new DBus control interface +CONFIG_CTRL_IFACE_DBUS_INTRO=y + +# Add support for loading EAP methods dynamically as shared libraries. +# When this option is enabled, each EAP method can be either included +# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn). +# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to +# be loaded in the beginning of the wpa_supplicant configuration file +# (see load_dynamic_eap parameter in the example file) before being used in +# the network blocks. +# +# Note that some shared parts of EAP methods are included in the main program +# and in order to be able to use dynamic EAP methods using these parts, the +# main program must have been build with the EAP method enabled (=y or =dyn). +# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries +# unless at least one of them was included in the main build to force inclusion +# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included +# in the main build to be able to load these methods dynamically. +# +# Please also note that using dynamic libraries will increase the total binary +# size. Thus, it may not be the best option for targets that have limited +# amount of memory/flash. +#CONFIG_DYNAMIC_EAP_METHODS=y + +# IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode +CONFIG_IEEE80211R=y + +# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) +CONFIG_DEBUG_FILE=y + +# Send debug messages to syslog instead of stdout +CONFIG_DEBUG_SYSLOG=y +# Set syslog facility for debug messages +#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON + +# Add support for sending all debug messages (regardless of debug verbosity) +# to the Linux kernel tracing facility. This helps debug the entire stack by +# making it easy to record everything happening from the driver up into the +# same file, e.g., using trace-cmd. +#CONFIG_DEBUG_LINUX_TRACING=y + +# Add support for writing debug log to Android logcat instead of standard +# output +#CONFIG_ANDROID_LOG=y + +# Enable privilege separation (see README 'Privilege separation' for details) +#CONFIG_PRIVSEP=y + +# Enable mitigation against certain attacks against TKIP by delaying Michael +# MIC error reports by a random amount of time between 0 and 60 seconds +#CONFIG_DELAYED_MIC_ERROR_REPORT=y + +# Enable tracing code for developer debugging +# This tracks use of memory allocations and other registrations and reports +# incorrect use with a backtrace of call (or allocation) location. +#CONFIG_WPA_TRACE=y +# For BSD, uncomment these. +#LIBS += -lexecinfo +#LIBS_p += -lexecinfo +#LIBS_c += -lexecinfo + +# Use libbfd to get more details for developer debugging +# This enables use of libbfd to get more detailed symbols for the backtraces +# generated by CONFIG_WPA_TRACE=y. +#CONFIG_WPA_TRACE_BFD=y +# For BSD, uncomment these. +#LIBS += -lbfd -liberty -lz +#LIBS_p += -lbfd -liberty -lz +#LIBS_c += -lbfd -liberty -lz + +# wpa_supplicant depends on strong random number generation being available +# from the operating system. os_get_random() function is used to fetch random +# data when needed, e.g., for key generation. On Linux and BSD systems, this +# works by reading /dev/urandom. It should be noted that the OS entropy pool +# needs to be properly initialized before wpa_supplicant is started. This is +# important especially on embedded devices that do not have a hardware random +# number generator and may by default start up with minimal entropy available +# for random number generation. +# +# As a safety net, wpa_supplicant is by default trying to internally collect +# additional entropy for generating random data to mix in with the data fetched +# from the OS. This by itself is not considered to be very strong, but it may +# help in cases where the system pool is not initialized properly. However, it +# is very strongly recommended that the system pool is initialized with enough +# entropy either by using hardware assisted random number generator or by +# storing state over device reboots. +# +# wpa_supplicant can be configured to maintain its own entropy store over +# restarts to enhance random number generation. This is not perfect, but it is +# much more secure than using the same sequence of random numbers after every +# reboot. This can be enabled with -e<entropy file> command line option. The +# specified file needs to be readable and writable by wpa_supplicant. +# +# If the os_get_random() is known to provide strong random data (e.g., on +# Linux/BSD, the board in question is known to have reliable source of random +# data from /dev/urandom), the internal wpa_supplicant random pool can be +# disabled. This will save some in binary size and CPU use. However, this +# should only be considered for builds that are known to be used on devices +# that meet the requirements described above. +#CONFIG_NO_RANDOM_POOL=y + +# IEEE 802.11n (High Throughput) support (mainly for AP mode) +CONFIG_IEEE80211N=y + +# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode) +# (depends on CONFIG_IEEE80211N) +CONFIG_IEEE80211AC=y + +# Wireless Network Management (IEEE Std 802.11v-2011) +# Note: This is experimental and not complete implementation. +#CONFIG_WNM=y + +# Interworking (IEEE 802.11u) +# This can be used to enable functionality to improve interworking with +# external networks (GAS/ANQP to learn more about the networks and network +# selection based on available credentials). +#CONFIG_INTERWORKING=y + +# Hotspot 2.0 +#CONFIG_HS20=y + +# Enable interface matching in wpa_supplicant +#CONFIG_MATCH_IFACE=y + +# Disable roaming in wpa_supplicant +#CONFIG_NO_ROAMING=y + +# AP mode operations with wpa_supplicant +# This can be used for controlling AP mode operations with wpa_supplicant. It +# should be noted that this is mainly aimed at simple cases like +# WPA2-Personal while more complex configurations like WPA2-Enterprise with an +# external RADIUS server can be supported with hostapd. +CONFIG_AP=y + +# P2P (Wi-Fi Direct) +# This can be used to enable P2P support in wpa_supplicant. See README-P2P for +# more information on P2P operations. +CONFIG_P2P=y + +# Enable TDLS support +#CONFIG_TDLS=y + +# Wi-Fi Direct +# This can be used to enable Wi-Fi Direct extensions for P2P using an external +# program to control the additional information exchanges in the messages. CONFIG_WIFI_DISPLAY=y -CONFIG_WPS=y -#CONFIG_MACSEC=y -#CONFIG_DRIVER_MACSEC_LINUX=y + +# Autoscan +# This can be used to enable automatic scan support in wpa_supplicant. +# See wpa_supplicant.conf for more information on autoscan usage. +# +# Enabling directly a module will enable autoscan support. +# For exponential module: +#CONFIG_AUTOSCAN_EXPONENTIAL=y +# For periodic module: +#CONFIG_AUTOSCAN_PERIODIC=y + +# Password (and passphrase, etc.) backend for external storage +# These optional mechanisms can be used to add support for storing passwords +# and other secrets in external (to wpa_supplicant) location. This allows, for +# example, operating system specific key storage to be used +# +# External password backend for testing purposes (developer use) +#CONFIG_EXT_PASSWORD_TEST=y + +# Enable Fast Session Transfer (FST) +#CONFIG_FST=y + +# Enable CLI commands for FST testing +#CONFIG_FST_TEST=y + +# OS X builds. This is only for building eapol_test. +#CONFIG_OSX=y + +# Automatic Channel Selection +# This will allow wpa_supplicant to pick the channel automatically when channel +# is set to "0". +# +# TODO: Extend parser to be able to parse "channel=acs_survey" as an alternative +# to "channel=0". This would enable us to eventually add other ACS algorithms in +# similar way. +# +# Automatic selection is currently only done through initialization, later on +# we hope to do background checks to keep us moving to more ideal channels as +# time goes by. ACS is currently only supported through the nl80211 driver and +# your driver must have survey dump capability that is filled by the driver +# during scanning. +# +# TODO: In analogy to hostapd be able to customize the ACS survey algorithm with +# a newly to create wpa_supplicant.conf variable acs_num_scans. +# +# Supported ACS drivers: +# * ath9k +# * ath5k +# * ath10k +# +# For more details refer to: +# http://wireless.kernel.org/en/users/Documentation/acs +#CONFIG_ACS=y + +# Support Multi Band Operation +#CONFIG_MBO=y + +# Fast Initial Link Setup (FILS) (IEEE 802.11ai) +# Note: This is an experimental and not yet complete implementation. This +# should not be enabled for production use. +#CONFIG_FILS=y +# FILS shared key authentication with PFS +#CONFIG_FILS_SK_PFS=y + +# Support RSN on IBSS networks +# This is needed to be able to use mode=1 network profile with proto=RSN and +# key_mgmt=WPA-PSK (i.e., full key management instead of WPA-None). +CONFIG_IBSS_RSN=y + +# External PMKSA cache control +# This can be used to enable control interface commands that allow the current +# PMKSA cache entries to be fetched and new entries to be added. +#CONFIG_PMKSA_CACHE_EXTERNAL=y + +# Mesh Networking (IEEE 802.11s) +#CONFIG_MESH=y + +# Background scanning modules +# These can be used to request wpa_supplicant to perform background scanning +# operations for roaming within an ESS (same SSID). See the bgscan parameter in +# the wpa_supplicant.conf file for more details. +# Periodic background scans based on signal strength +CONFIG_BGSCAN_SIMPLE=y +# Learn channels used by the network and try to avoid bgscans on other +# channels (experimental) +#CONFIG_BGSCAN_LEARN=y + +# Opportunistic Wireless Encryption (OWE) +# Experimental implementation of draft-harkins-owe-07.txt +#CONFIG_OWE=y diff --git a/source/n/wpa_supplicant/patches/Fix-openssl-1-1-private-key-callback.patch b/source/n/wpa_supplicant/patches/Fix-openssl-1-1-private-key-callback.patch deleted file mode 100644 index bee574a5..00000000 --- a/source/n/wpa_supplicant/patches/Fix-openssl-1-1-private-key-callback.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 25b37c54a47e49d591f5752bbf0f510480402cae Mon Sep 17 00:00:00 2001 -From: Beniamino Galvani <bgalvani@redhat.com> -Date: Sun, 9 Jul 2017 11:14:10 +0200 -Subject: [PATCH 1/2] OpenSSL: Fix private key password handling with OpenSSL - >= 1.1.0f - -Since OpenSSL version 1.1.0f, SSL_use_PrivateKey_file() uses the -callback from the SSL object instead of the one from the CTX, so let's -set the callback on both SSL and CTX. Note that -SSL_set_default_passwd_cb*() is available only in 1.1.0. - -Signed-off-by: Beniamino Galvani <bgalvani@redhat.com> -(cherry picked from commit f665c93e1d28fbab3d9127a8c3985cc32940824f) ---- - src/crypto/tls_openssl.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c -index c4170b6..bceb8c3 100644 ---- a/src/crypto/tls_openssl.c -+++ b/src/crypto/tls_openssl.c -@@ -2779,6 +2779,15 @@ static int tls_connection_private_key(struct tls_data *data, - } else - passwd = NULL; - -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+ /* -+ * In OpenSSL >= 1.1.0f SSL_use_PrivateKey_file() uses the callback -+ * from the SSL object. See OpenSSL commit d61461a75253. -+ */ -+ SSL_set_default_passwd_cb(conn->ssl, tls_passwd_cb); -+ SSL_set_default_passwd_cb_userdata(conn->ssl, passwd); -+#endif /* >= 1.1.0f && !LibreSSL */ -+ /* Keep these for OpenSSL < 1.1.0f */ - SSL_CTX_set_default_passwd_cb(ssl_ctx, tls_passwd_cb); - SSL_CTX_set_default_passwd_cb_userdata(ssl_ctx, passwd); - -@@ -2869,6 +2878,9 @@ static int tls_connection_private_key(struct tls_data *data, - return -1; - } - ERR_clear_error(); -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+ SSL_set_default_passwd_cb(conn->ssl, NULL); -+#endif /* >= 1.1.0f && !LibreSSL */ - SSL_CTX_set_default_passwd_cb(ssl_ctx, NULL); - os_free(passwd); - --- -2.9.3 - -From b2887d6964a406eb5f88f4ad4e9764c468954382 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen <j@w1.fi> -Date: Mon, 17 Jul 2017 12:06:17 +0300 -Subject: [PATCH 2/2] OpenSSL: Clear default_passwd_cb more thoroughly - -Previously, the pointer to strdup passwd was left in OpenSSL library -default_passwd_cb_userdata and even the default_passwd_cb was left set -on an error path. To avoid unexpected behavior if something were to -manage to use there pointers, clear them explicitly once done with -loading of the private key. - -Signed-off-by: Jouni Malinen <j@w1.fi> -(cherry picked from commit 89971d8b1e328a2f79699c953625d1671fd40384) ---- - src/crypto/tls_openssl.c | 22 +++++++++++++++++----- - 1 file changed, 17 insertions(+), 5 deletions(-) - -diff --git a/src/crypto/tls_openssl.c b/src/crypto/tls_openssl.c -index bceb8c3..770af9e 100644 ---- a/src/crypto/tls_openssl.c -+++ b/src/crypto/tls_openssl.c -@@ -2758,6 +2758,19 @@ static int tls_connection_engine_private_key(struct tls_connection *conn) - } - - -+static void tls_clear_default_passwd_cb(SSL_CTX *ssl_ctx, SSL *ssl) -+{ -+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -+ if (ssl) { -+ SSL_set_default_passwd_cb(ssl, NULL); -+ SSL_set_default_passwd_cb_userdata(ssl, NULL); -+ } -+#endif /* >= 1.1.0f && !LibreSSL */ -+ SSL_CTX_set_default_passwd_cb(ssl_ctx, NULL); -+ SSL_CTX_set_default_passwd_cb_userdata(ssl_ctx, NULL); -+} -+ -+ - static int tls_connection_private_key(struct tls_data *data, - struct tls_connection *conn, - const char *private_key, -@@ -2874,14 +2887,12 @@ static int tls_connection_private_key(struct tls_data *data, - if (!ok) { - tls_show_errors(MSG_INFO, __func__, - "Failed to load private key"); -+ tls_clear_default_passwd_cb(ssl_ctx, conn->ssl); - os_free(passwd); - return -1; - } - ERR_clear_error(); --#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) -- SSL_set_default_passwd_cb(conn->ssl, NULL); --#endif /* >= 1.1.0f && !LibreSSL */ -- SSL_CTX_set_default_passwd_cb(ssl_ctx, NULL); -+ tls_clear_default_passwd_cb(ssl_ctx, conn->ssl); - os_free(passwd); - - if (!SSL_check_private_key(conn->ssl)) { -@@ -2924,13 +2935,14 @@ static int tls_global_private_key(struct tls_data *data, - tls_read_pkcs12(data, NULL, private_key, passwd)) { - tls_show_errors(MSG_INFO, __func__, - "Failed to load private key"); -+ tls_clear_default_passwd_cb(ssl_ctx, NULL); - os_free(passwd); - ERR_clear_error(); - return -1; - } -+ tls_clear_default_passwd_cb(ssl_ctx, NULL); - os_free(passwd); - ERR_clear_error(); -- SSL_CTX_set_default_passwd_cb(ssl_ctx, NULL); - - if (!SSL_CTX_check_private_key(ssl_ctx)) { - tls_show_errors(MSG_INFO, __func__, --- -2.9.3 - diff --git a/testing/source/wpa_supplicant/patches/allow-tlsv1.patch b/source/n/wpa_supplicant/patches/allow-tlsv1.patch index eb5fb781..eb5fb781 100644 --- a/testing/source/wpa_supplicant/patches/allow-tlsv1.patch +++ b/source/n/wpa_supplicant/patches/allow-tlsv1.patch diff --git a/source/n/wpa_supplicant/patches/assoc-timeout.diff b/source/n/wpa_supplicant/patches/assoc-timeout.diff deleted file mode 100644 index 8be4d2cd..00000000 --- a/source/n/wpa_supplicant/patches/assoc-timeout.diff +++ /dev/null @@ -1,16 +0,0 @@ -diff -Nur wpa_supplicant-2.0.orig/wpa_supplicant/wpa_supplicant.c wpa_supplicant-2.0/wpa_supplicant/wpa_supplicant.c ---- wpa_supplicant-2.0.orig/wpa_supplicant/wpa_supplicant.c 2013-01-12 09:42:53.000000000 -0600 -+++ wpa_supplicant-2.0/wpa_supplicant/wpa_supplicant.c 2013-05-11 14:09:34.586718122 -0500 -@@ -1666,10 +1666,10 @@ - - 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/dbus-service-file-args.diff b/source/n/wpa_supplicant/patches/dbus-service-file-args.diff deleted file mode 100644 index 7e2449f2..00000000 --- a/source/n/wpa_supplicant/patches/dbus-service-file-args.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -Nur wpa_supplicant-1.0-rc3.orig/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in ---- wpa_supplicant-1.0-rc3.orig/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2012-04-16 15:15:40.000000000 -0500 -+++ wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2012-05-06 01:07:44.523999837 -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 -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service -diff -Nur wpa_supplicant-1.0-rc3.orig/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in ---- wpa_supplicant-1.0-rc3.orig/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2012-04-16 15:15:40.000000000 -0500 -+++ wpa_supplicant-1.0-rc3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2012-05-06 01:06:59.528589953 -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 -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service diff --git a/source/n/wpa_supplicant/patches/flush-debug-output.diff b/source/n/wpa_supplicant/patches/flush-debug-output.diff deleted file mode 100644 index 7d6af7b3..00000000 --- a/source/n/wpa_supplicant/patches/flush-debug-output.diff +++ /dev/null @@ -1,50 +0,0 @@ -diff -Nur wpa_supplicant-2.0.orig/src/utils/wpa_debug.c wpa_supplicant-2.0/src/utils/wpa_debug.c ---- wpa_supplicant-2.0.orig/src/utils/wpa_debug.c 2013-01-12 09:42:53.000000000 -0600 -+++ wpa_supplicant-2.0/src/utils/wpa_debug.c 2013-05-11 14:10:37.886101742 -0500 -@@ -75,6 +75,7 @@ - if (out_file) { - fprintf(out_file, "%ld.%06u: ", (long) tv.sec, - (unsigned int) tv.usec); -+ fflush(out_file); - } else - #endif /* CONFIG_DEBUG_FILE */ - printf("%ld.%06u: ", (long) tv.sec, (unsigned int) tv.usec); -@@ -221,6 +222,7 @@ - if (out_file) { - vfprintf(out_file, fmt, ap); - fprintf(out_file, "\n"); -+ fflush(out_file); - } else { - #endif /* CONFIG_DEBUG_FILE */ - vprintf(fmt, ap); -@@ -357,6 +359,7 @@ - fprintf(out_file, " [REMOVED]"); - } - fprintf(out_file, "\n"); -+ fflush(out_file); - } else { - #endif /* CONFIG_DEBUG_FILE */ - printf("%s - hexdump(len=%lu):", title, (unsigned long) len); -@@ -425,12 +428,14 @@ - fprintf(out_file, - "%s - hexdump_ascii(len=%lu): [REMOVED]\n", - title, (unsigned long) len); -+ fflush(out_file); - return; - } - if (buf == NULL) { - fprintf(out_file, - "%s - hexdump_ascii(len=%lu): [NULL]\n", - title, (unsigned long) len); -+ fflush(out_file); - return; - } - fprintf(out_file, "%s - hexdump_ascii(len=%lu):\n", -@@ -455,6 +460,7 @@ - pos += llen; - len -= llen; - } -+ fflush(out_file); - } else { - #endif /* CONFIG_DEBUG_FILE */ - if (!show) { diff --git a/source/n/wpa_supplicant/patches/quiet-scan-results-message.diff b/source/n/wpa_supplicant/patches/quiet-scan-results-message.diff deleted file mode 100644 index 7f85e810..00000000 --- a/source/n/wpa_supplicant/patches/quiet-scan-results-message.diff +++ /dev/null @@ -1,16 +0,0 @@ ---- ./wpa_supplicant/events.c.orig 2017-01-05 11:29:16.968898845 -0600 -+++ ./wpa_supplicant/events.c 2017-01-05 11:31:13.515907254 -0600 -@@ -1555,11 +1555,11 @@ - if (wpa_s->last_scan_req == MANUAL_SCAN_REQ && - wpa_s->manual_scan_use_id && wpa_s->own_scan_running && - own_request && !(data && data->scan_info.external_scan)) { -- wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS "id=%u", -+ wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS "id=%u", - wpa_s->manual_scan_id); - wpa_s->manual_scan_use_id = 0; - } else { -- wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS); -+ wpa_msg_ctrl(wpa_s, MSG_DEBUG, WPA_EVENT_SCAN_RESULTS); - } - wpas_notify_scan_results(wpa_s); - diff --git a/source/n/wpa_supplicant/patches/rh1451834-nl80211-Fix-race-condition-in-detecting-MAC-change.patch b/source/n/wpa_supplicant/patches/rh1451834-nl80211-Fix-race-condition-in-detecting-MAC-change.patch deleted file mode 100644 index 0c03e1dc..00000000 --- a/source/n/wpa_supplicant/patches/rh1451834-nl80211-Fix-race-condition-in-detecting-MAC-change.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 290834df69556b903b49f2a45671cc62b44f13bb Mon Sep 17 00:00:00 2001 -From: Beniamino Galvani <bgalvani@redhat.com> -Date: Fri, 28 Apr 2017 17:59:30 +0200 -Subject: [PATCH] nl80211: Fix race condition in detecting MAC change - -Commit 3e0272ca00ce1df35b45e7d739dd7e935f13fd84 ('nl80211: Re-read MAC -address on RTM_NEWLINK') added the detection of external changes to MAC -address when the interface is brought up. - -If the interface state is changed quickly enough, wpa_supplicant may -receive the netlink message for the !IFF_UP event when the interface -has already been brought up and would ignore the next netlink IFF_UP -message, missing the MAC change. - -Fix this by also reloading the MAC address when a !IFF_UP event is -received with the interface up, because this implies that the -interface went down and up again, possibly changing the address. - -Signed-off-by: Beniamino Galvani <bgalvani@redhat.com> ---- - src/drivers/driver_nl80211.c | 47 +++++++++++++++++++++++++------------------- - 1 file changed, 27 insertions(+), 20 deletions(-) - -diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c -index af1cb84..24fad29 100644 ---- a/src/drivers/driver_nl80211.c -+++ b/src/drivers/driver_nl80211.c -@@ -933,6 +933,30 @@ nl80211_find_drv(struct nl80211_global *global, int idx, u8 *buf, size_t len) - } - - -+static void nl80211_refresh_mac(struct wpa_driver_nl80211_data *drv, -+ int ifindex) -+{ -+ struct i802_bss *bss; -+ u8 addr[ETH_ALEN]; -+ -+ bss = get_bss_ifindex(drv, ifindex); -+ if (bss && -+ linux_get_ifhwaddr(drv->global->ioctl_sock, -+ bss->ifname, addr) < 0) { -+ wpa_printf(MSG_DEBUG, -+ "nl80211: %s: failed to re-read MAC address", -+ bss->ifname); -+ } else if (bss && os_memcmp(addr, bss->addr, ETH_ALEN) != 0) { -+ wpa_printf(MSG_DEBUG, -+ "nl80211: Own MAC address on ifindex %d (%s) changed from " -+ MACSTR " to " MACSTR, -+ ifindex, bss->ifname, -+ MAC2STR(bss->addr), MAC2STR(addr)); -+ os_memcpy(bss->addr, addr, ETH_ALEN); -+ } -+} -+ -+ - static void wpa_driver_nl80211_event_rtm_newlink(void *ctx, - struct ifinfomsg *ifi, - u8 *buf, size_t len) -@@ -997,6 +1021,8 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx, - namebuf[0] = '\0'; - if (if_indextoname(ifi->ifi_index, namebuf) && - linux_iface_up(drv->global->ioctl_sock, namebuf) > 0) { -+ /* Re-read MAC address as it may have changed */ -+ nl80211_refresh_mac(drv, ifi->ifi_index); - wpa_printf(MSG_DEBUG, "nl80211: Ignore interface down " - "event since interface %s is up", namebuf); - drv->ignore_if_down_event = 0; -@@ -1044,27 +1070,8 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx, - "event since interface %s is marked " - "removed", drv->first_bss->ifname); - } else { -- struct i802_bss *bss; -- u8 addr[ETH_ALEN]; -- - /* Re-read MAC address as it may have changed */ -- bss = get_bss_ifindex(drv, ifi->ifi_index); -- if (bss && -- linux_get_ifhwaddr(drv->global->ioctl_sock, -- bss->ifname, addr) < 0) { -- wpa_printf(MSG_DEBUG, -- "nl80211: %s: failed to re-read MAC address", -- bss->ifname); -- } else if (bss && -- os_memcmp(addr, bss->addr, ETH_ALEN) != 0) { -- wpa_printf(MSG_DEBUG, -- "nl80211: Own MAC address on ifindex %d (%s) changed from " -- MACSTR " to " MACSTR, -- ifi->ifi_index, bss->ifname, -- MAC2STR(bss->addr), -- MAC2STR(addr)); -- os_memcpy(bss->addr, addr, ETH_ALEN); -- } -+ nl80211_refresh_mac(drv, ifi->ifi_index); - - wpa_printf(MSG_DEBUG, "nl80211: Interface up"); - drv->if_disabled = 0; --- -2.9.3 - diff --git a/source/n/wpa_supplicant/patches/rh1497640-pae-validate-input-before-pointer.patch b/source/n/wpa_supplicant/patches/rh1497640-pae-validate-input-before-pointer.patch deleted file mode 100644 index d99be04c..00000000 --- a/source/n/wpa_supplicant/patches/rh1497640-pae-validate-input-before-pointer.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 0ad5893a2f1f521d44712cd395e067ccf0a397c3 Mon Sep 17 00:00:00 2001 -From: Michael Braun <michael-dev@fami-braun.de> -Date: Fri, 18 Aug 2017 01:14:28 +0200 -Subject: PAE: Validate input before pointer - -ieee802_1x_kay_decode_mkpdu() calls ieee802_1x_mka_i_in_peerlist() -before body_len has been checked on all segments. - -ieee802_1x_kay_decode_mkpdu() and ieee802_1x_mka_i_in_peerlist() might -continue and thus underflow left_len even if it finds left_len to small -(or before checking). - -Additionally, ieee802_1x_mka_dump_peer_body() might perform out of bound -reads in this case. - -Fix this by checking left_len and aborting if too small early. - -Signed-off-by: Michael Braun <michael-dev@fami-braun.de> ---- - src/pae/ieee802_1x_kay.c | 23 ++++++++++++----------- - 1 file changed, 12 insertions(+), 11 deletions(-) - -diff --git a/src/pae/ieee802_1x_kay.c b/src/pae/ieee802_1x_kay.c -index c4bfcbc..cad0292 100644 ---- a/src/pae/ieee802_1x_kay.c -+++ b/src/pae/ieee802_1x_kay.c -@@ -964,21 +964,19 @@ ieee802_1x_mka_i_in_peerlist(struct ieee802_1x_mka_participant *participant, - body_len = get_mka_param_body_len(hdr); - body_type = get_mka_param_body_type(hdr); - -- if (body_type != MKA_LIVE_PEER_LIST && -- body_type != MKA_POTENTIAL_PEER_LIST) -- continue; -- -- ieee802_1x_mka_dump_peer_body( -- (struct ieee802_1x_mka_peer_body *)pos); -- -- if (left_len < (MKA_HDR_LEN + body_len + DEFAULT_ICV_LEN)) { -+ if (left_len < (MKA_HDR_LEN + MKA_ALIGN_LENGTH(body_len) + DEFAULT_ICV_LEN)) { - wpa_printf(MSG_ERROR, - "KaY: MKA Peer Packet Body Length (%zu bytes) is less than the Parameter Set Header Length (%zu bytes) + the Parameter Set Body Length (%zu bytes) + %d bytes of ICV", - left_len, MKA_HDR_LEN, -- body_len, DEFAULT_ICV_LEN); -- continue; -+ MKA_ALIGN_LENGTH(body_len), -+ DEFAULT_ICV_LEN); -+ return FALSE; - } - -+ if (body_type != MKA_LIVE_PEER_LIST && -+ body_type != MKA_POTENTIAL_PEER_LIST) -+ continue; -+ - if ((body_len % 16) != 0) { - wpa_printf(MSG_ERROR, - "KaY: MKA Peer Packet Body Length (%zu bytes) should be a multiple of 16 octets", -@@ -986,6 +984,9 @@ ieee802_1x_mka_i_in_peerlist(struct ieee802_1x_mka_participant *participant, - continue; - } - -+ ieee802_1x_mka_dump_peer_body( -+ (struct ieee802_1x_mka_peer_body *)pos); -+ - for (i = 0; i < body_len; - i += sizeof(struct ieee802_1x_mka_peer_id)) { - const struct ieee802_1x_mka_peer_id *peer_mi; -@@ -3018,7 +3019,7 @@ static int ieee802_1x_kay_decode_mkpdu(struct ieee802_1x_kay *kay, - "KaY: MKA Peer Packet Body Length (%zu bytes) is less than the Parameter Set Header Length (%zu bytes) + the Parameter Set Body Length (%zu bytes) + %d bytes of ICV", - left_len, MKA_HDR_LEN, - body_len, DEFAULT_ICV_LEN); -- continue; -+ return -1; - } - - if (handled[body_type]) --- -cgit v0.12 - diff --git a/testing/source/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 index 97a8cc7f..97a8cc7f 100644 --- a/testing/source/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 diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch index c3b3568c..c3b3568c 100644 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch +++ b/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch index b7478dad..b7478dad 100644 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch +++ b/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch index a6868518..a6868518 100644 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch +++ b/source/n/wpa_supplicant/patches/wpa_supplicant-flush-debug-output.patch diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch index c54cd9a2..c54cd9a2 100644 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch +++ b/source/n/wpa_supplicant/patches/wpa_supplicant-gui-qt4.patch diff --git a/testing/source/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch index c646a304..c646a304 100644 --- a/testing/source/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch +++ b/source/n/wpa_supplicant/patches/wpa_supplicant-quiet-scan-results-message.patch diff --git a/source/n/wpa_supplicant/slack-desc b/source/n/wpa_supplicant/slack-desc index b891fbbd..a6b63978 100644 --- a/source/n/wpa_supplicant/slack-desc +++ b/source/n/wpa_supplicant/slack-desc @@ -13,6 +13,6 @@ wpa_supplicant: component that is used in the client stations. It implements key wpa_supplicant: negotiation with a WPA Authenticator and it controls the roaming and wpa_supplicant: IEEE 802.11 authentication/association of the wlan driver. wpa_supplicant: -wpa_supplicant: More info: http://hostap.epitest.fi/wpa_supplicant/ +wpa_supplicant: Homepage: http://hostap.epitest.fi/wpa_supplicant/ wpa_supplicant: wpa_supplicant: diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index d4e56cbb..492ddb72 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:-6} +BUILD=${BUILD:-3} SRCVERSION=$(printf $VERSION | tr _ -) @@ -85,29 +85,15 @@ 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 -zcat $CWD/patches/dbus-service-file-args.diff.gz | patch -p1 --verbose || exit 1 - -# Eliminate some logspam -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 - -# Support OpenSSL-1.1.x: -zcat $CWD/patches/Fix-openssl-1-1-private-key-callback.patch.gz | patch -p1 --verbose || exit 1 +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 cd wpa_supplicant diff --git a/source/x/x11/build/xcursorgen b/source/x/x11/build/xcursorgen index b8626c4c..d00491fd 100644 --- a/source/x/x11/build/xcursorgen +++ b/source/x/x11/build/xcursorgen @@ -1 +1 @@ -4 +1 diff --git a/testing/source/wpa_supplicant/README.slackware b/testing/source/wpa_supplicant/README.slackware deleted file mode 100644 index 7ab40a28..00000000 --- a/testing/source/wpa_supplicant/README.slackware +++ /dev/null @@ -1,55 +0,0 @@ -================================================= -How do I get my card to use WPA-PSK in Slackware? -================================================= - -First off: wpa_supplicant REQUIRES the AP to broadcast the SSID. When the AP -hides its SSID, all you will get out of wpa_supplicant is the message: -"No suitable AP found" - -Also, read the MADwifi FAQ (http://madwifi.sourceforge.net/dokuwiki/doku.php) -since it contains a wealth of information. - -This being said, you'll have to do the following (as root): -Edit the file named /etc/wpa_supplicant.conf and add these lines: - -network={ - scan_ssid=0 - proto=WPA - key_mgmt=WPA-PSK - pairwise=CCMP TKIP - group=CCMP TKIP WEP104 WEP40 -} - -Then execute: - -/usr/sbin/wpa_passphrase YOURSSID passphrase - -with the SSID of your AP and the passphrase you've entered in its WPA-PSK configuration. You'll receive an output, which looks like this: - -network={ - ssid="YOURSSID" - #psk="passphrase" - -psk=66a4bfb03de5656cf26cfa03a116097546046f4aea11ee044b841171207d8308 -} - -Copy the three lines within the network-tag into your own entry in wpa_supplicant.conf and change the permissions after you've finished editing: - -chmod 640 /etc/wpa_supplicant.conf - -To get your network device up and running, execute: - -### /usr/sbin/wpa_supplicant -Bw -c/etc/wpa_supplicant.conf -iath0 -Dmadwifi ### -### you don't have to run the above command by hand, because it will ### -### be executed by the rc.inet1 command that you run: ### - -/etc/rc.d/rc.inet1 ath0_start - -In case you want to see the wpa_supplicant in action, start it on the command line before enabling the wireless device, by running: -/usr/sbin/wpa_supplicant -dw -c/etc/wpa_supplicant.conf -iath0 -Dmadwifi -The terminal where you've started the wpa_supplicant should now show the communication between your wlan card and the AP. If you got everything up and running you can let Slackware's init script take over by killing wpa_supplicant and running: - -/etc/rc.d/rc.inet1 ath0_restart - -Studying the wpa_supplicant README is also highly recommended for further insight! - diff --git a/testing/source/wpa_supplicant/config/dot.config b/testing/source/wpa_supplicant/config/dot.config deleted file mode 100644 index 966a98c2..00000000 --- a/testing/source/wpa_supplicant/config/dot.config +++ /dev/null @@ -1,599 +0,0 @@ -# Example wpa_supplicant build time configuration -# -# This file lists the configuration options that are used when building the -# wpa_supplicant binary. All lines starting with # are ignored. Configuration -# option lines must be commented out complete, if they are not to be included, -# i.e., just setting VARIABLE=n is not disabling that variable. -# -# This file is included in Makefile, so variables like CFLAGS and LIBS can also -# be modified from here. In most cases, these lines should use += in order not -# to override previous values of the variables. - - -# Uncomment following two lines and fix the paths if you have installed OpenSSL -# or GnuTLS in non-default location -#CFLAGS += -I/usr/local/openssl/include -#LIBS += -L/usr/local/openssl/lib - -# Some Red Hat versions seem to include kerberos header files from OpenSSL, but -# the kerberos files are not in the default include path. Following line can be -# used to fix build issues on such systems (krb5.h not found). -#CFLAGS += -I/usr/include/kerberos - -# Driver interface for generic Linux wireless extensions -# Note: WEXT is deprecated in the current Linux kernel version and no new -# functionality is added to it. nl80211-based interface is the new -# replacement for WEXT and its use allows wpa_supplicant to properly control -# the driver to improve existing functionality like roaming and to support new -# functionality. -CONFIG_DRIVER_WEXT=y - -# Driver interface for Linux drivers using the nl80211 kernel interface -CONFIG_DRIVER_NL80211=y - -# QCA vendor extensions to nl80211 -CONFIG_DRIVER_NL80211_QCA=y - -# driver_nl80211.c requires libnl. If you are compiling it yourself -# you may need to point hostapd to your version of libnl. -# -#CFLAGS += -I$<path to libnl include files> -#LIBS += -L$<path to libnl library files> - -# Use libnl v2.0 (or 3.0) libraries. -#CONFIG_LIBNL20=y - -# Use libnl 3.2 libraries (if this is selected, CONFIG_LIBNL20 is ignored) -CONFIG_LIBNL32=y - - -# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) -#CONFIG_DRIVER_BSD=y -#CFLAGS += -I/usr/local/include -#LIBS += -L/usr/local/lib -#LIBS_p += -L/usr/local/lib -#LIBS_c += -L/usr/local/lib - -# Driver interface for Windows NDIS -#CONFIG_DRIVER_NDIS=y -#CFLAGS += -I/usr/include/w32api/ddk -#LIBS += -L/usr/local/lib -# For native build using mingw -#CONFIG_NATIVE_WINDOWS=y -# Additional directories for cross-compilation on Linux host for mingw target -#CFLAGS += -I/opt/mingw/mingw32/include/ddk -#LIBS += -L/opt/mingw/mingw32/lib -#CC=mingw32-gcc -# By default, driver_ndis uses WinPcap for low-level operations. This can be -# replaced with the following option which replaces WinPcap calls with NDISUIO. -# However, this requires that WZC is disabled (net stop wzcsvc) before starting -# wpa_supplicant. -# CONFIG_USE_NDISUIO=y - -# Driver interface for wired Ethernet drivers -CONFIG_DRIVER_WIRED=y - -# Driver interface for MACsec capable Qualcomm Atheros drivers -#CONFIG_DRIVER_MACSEC_QCA=y - -# Driver interface for Linux MACsec drivers -CONFIG_DRIVER_MACSEC_LINUX=y - -# Driver interface for the Broadcom RoboSwitch family -#CONFIG_DRIVER_ROBOSWITCH=y - -# Driver interface for no driver (e.g., WPS ER only) -#CONFIG_DRIVER_NONE=y - -# Solaris libraries -#LIBS += -lsocket -ldlpi -lnsl -#LIBS_c += -lsocket - -# Enable IEEE 802.1X Supplicant (automatically included if any EAP method or -# MACsec is included) -CONFIG_IEEE8021X_EAPOL=y - -# EAP-MD5 -CONFIG_EAP_MD5=y - -# EAP-MSCHAPv2 -CONFIG_EAP_MSCHAPV2=y - -# EAP-TLS -CONFIG_EAP_TLS=y - -# EAL-PEAP -CONFIG_EAP_PEAP=y - -# EAP-TTLS -CONFIG_EAP_TTLS=y - -# EAP-FAST -# Note: If OpenSSL is used as the TLS library, OpenSSL 1.0 or newer is needed -# for EAP-FAST support. Older OpenSSL releases would need to be patched, e.g., -# with openssl-0.9.8x-tls-extensions.patch, to add the needed functions. -CONFIG_EAP_FAST=y - -# EAP-GTC -CONFIG_EAP_GTC=y - -# EAP-OTP -CONFIG_EAP_OTP=y - -# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) -#CONFIG_EAP_SIM=y - -# EAP-PSK (experimental; this is _not_ needed for WPA-PSK) -#CONFIG_EAP_PSK=y - -# EAP-pwd (secure authentication using only a password) -#CONFIG_EAP_PWD=y - -# EAP-PAX -CONFIG_EAP_PAX=y - -# LEAP -CONFIG_EAP_LEAP=y - -# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used) -CONFIG_EAP_AKA=y - -# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used). -# This requires CONFIG_EAP_AKA to be enabled, too. -#CONFIG_EAP_AKA_PRIME=y - -# Enable USIM simulator (Milenage) for EAP-AKA -#CONFIG_USIM_SIMULATOR=y - -# EAP-SAKE -CONFIG_EAP_SAKE=y - -# EAP-GPSK -CONFIG_EAP_GPSK=y -# Include support for optional SHA256 cipher suite in EAP-GPSK -CONFIG_EAP_GPSK_SHA256=y - -# EAP-TNC and related Trusted Network Connect support (experimental) -CONFIG_EAP_TNC=y - -# Wi-Fi Protected Setup (WPS) -CONFIG_WPS=y -# Enable WPS external registrar functionality -#CONFIG_WPS_ER=y -# Disable credentials for an open network by default when acting as a WPS -# registrar. -#CONFIG_WPS_REG_DISABLE_OPEN=y -# Enable WPS support with NFC config method -#CONFIG_WPS_NFC=y - -# EAP-IKEv2 -CONFIG_EAP_IKEV2=y - -# EAP-EKE -#CONFIG_EAP_EKE=y - -# MACsec -CONFIG_MACSEC=y - -# Peerkey support: -CONFIG_PEERKEY=y - -# PKCS#12 (PFX) support (used to read private key and certificate file from -# a file that usually has extension .p12 or .pfx) -CONFIG_PKCS12=y - -# Smartcard support (i.e., private key on a smartcard), e.g., with openssl -# engine. -CONFIG_SMARTCARD=y - -# PC/SC interface for smartcards (USIM, GSM SIM) -# Enable this if EAP-SIM or EAP-AKA is included -#CONFIG_PCSC=y - -# Support HT overrides (disable HT/HT40, mask MCS rates, etc.) -#CONFIG_HT_OVERRIDES=y - -# Support VHT overrides (disable VHT, mask MCS rates, etc.) -#CONFIG_VHT_OVERRIDES=y - -# Development testing -#CONFIG_EAPOL_TEST=y - -# Select control interface backend for external programs, e.g, wpa_cli: -# unix = UNIX domain sockets (default for Linux/*BSD) -# udp = UDP sockets using localhost (127.0.0.1) -# udp6 = UDP IPv6 sockets using localhost (::1) -# named_pipe = Windows Named Pipe (default for Windows) -# udp-remote = UDP sockets with remote access (only for tests systems/purpose) -# udp6-remote = UDP IPv6 sockets with remote access (only for tests purpose) -# y = use default (backwards compatibility) -# If this option is commented out, control interface is not included in the -# build. -CONFIG_CTRL_IFACE=y - -# Include support for GNU Readline and History Libraries in wpa_cli. -# When building a wpa_cli binary for distribution, please note that these -# libraries are licensed under GPL and as such, BSD license may not apply for -# the resulting binary. -CONFIG_READLINE=y - -# Include internal line edit mode in wpa_cli. This can be used as a replacement -# for GNU Readline to provide limited command line editing and history support. -#CONFIG_WPA_CLI_EDIT=y - -# Remove debugging code that is printing out debug message to stdout. -# This can be used to reduce the size of the wpa_supplicant considerably -# if debugging code is not needed. The size reduction can be around 35% -# (e.g., 90 kB). -#CONFIG_NO_STDOUT_DEBUG=y - -# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save -# 35-50 kB in code size. -#CONFIG_NO_WPA=y - -# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support -# This option can be used to reduce code size by removing support for -# converting ASCII passphrases into PSK. If this functionality is removed, the -# PSK can only be configured as the 64-octet hexstring (e.g., from -# wpa_passphrase). This saves about 0.5 kB in code size. -#CONFIG_NO_WPA_PASSPHRASE=y - -# Disable scan result processing (ap_mode=1) to save code size by about 1 kB. -# This can be used if ap_scan=1 mode is never enabled. -#CONFIG_NO_SCAN_PROCESSING=y - -# Select configuration backend: -# file = text file (e.g., wpa_supplicant.conf; note: the configuration file -# path is given on command line, not here; this option is just used to -# select the backend that allows configuration files to be used) -# winreg = Windows registry (see win_example.reg for an example) -CONFIG_BACKEND=file - -# Remove configuration write functionality (i.e., to allow the configuration -# file to be updated based on runtime configuration changes). The runtime -# configuration can still be changed, the changes are just not going to be -# persistent over restarts. This option can be used to reduce code size by -# about 3.5 kB. -#CONFIG_NO_CONFIG_WRITE=y - -# Remove support for configuration blobs to reduce code size by about 1.5 kB. -#CONFIG_NO_CONFIG_BLOBS=y - -# Select program entry point implementation: -# main = UNIX/POSIX like main() function (default) -# main_winsvc = Windows service (read parameters from registry) -# main_none = Very basic example (development use only) -#CONFIG_MAIN=main - -# Select wrapper for operating system and C library specific functions -# unix = UNIX/POSIX like systems (default) -# win32 = Windows systems -# none = Empty template -#CONFIG_OS=unix - -# Select event loop implementation -# eloop = select() loop (default) -# eloop_win = Windows events and WaitForMultipleObject() loop -#CONFIG_ELOOP=eloop - -# Should we use poll instead of select? Select is used by default. -#CONFIG_ELOOP_POLL=y - -# Should we use epoll instead of select? Select is used by default. -#CONFIG_ELOOP_EPOLL=y - -# Should we use kqueue instead of select? Select is used by default. -#CONFIG_ELOOP_KQUEUE=y - -# Select layer 2 packet implementation -# linux = Linux packet socket (default) -# pcap = libpcap/libdnet/WinPcap -# freebsd = FreeBSD libpcap -# winpcap = WinPcap with receive thread -# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) -# none = Empty template -#CONFIG_L2_PACKET=linux - -# Disable Linux packet socket workaround applicable for station interface -# in a bridge for EAPOL frames. This should be uncommented only if the kernel -# is known to not have the regression issue in packet socket behavior with -# bridge interfaces (commit 'bridge: respect RFC2863 operational state')'). -#CONFIG_NO_LINUX_PACKET_SOCKET_WAR=y - -# IEEE 802.11w (management frame protection), also known as PMF -# Driver support is also needed for IEEE 802.11w. -CONFIG_IEEE80211W=y - -# Select TLS implementation -# openssl = OpenSSL (default) -# gnutls = GnuTLS -# internal = Internal TLSv1 implementation (experimental) -# linux = Linux kernel AF_ALG and internal TLSv1 implementation (experimental) -# none = Empty template -CONFIG_TLS=openssl - -# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1) -# can be enabled to get a stronger construction of messages when block ciphers -# are used. It should be noted that some existing TLS v1.0 -based -# implementation may not be compatible with TLS v1.1 message (ClientHello is -# sent prior to negotiating which version will be used) -CONFIG_TLSV11=y - -# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2) -# can be enabled to enable use of stronger crypto algorithms. It should be -# noted that some existing TLS v1.0 -based implementation may not be compatible -# with TLS v1.2 message (ClientHello is sent prior to negotiating which version -# will be used) -#CONFIG_TLSV12=y - -# Select which ciphers to use by default with OpenSSL if the user does not -# specify them. -#CONFIG_TLS_DEFAULT_CIPHERS="PROFILE=SYSTEM:3DES" -CONFIG_TLS_DEFAULT_CIPHERS="DEFAULT@SECLEVEL=1" - -# If CONFIG_TLS=internal is used, additional library and include paths are -# needed for LibTomMath. Alternatively, an integrated, minimal version of -# LibTomMath can be used. See beginning of libtommath.c for details on benefits -# and drawbacks of this option. -#CONFIG_INTERNAL_LIBTOMMATH=y -#ifndef CONFIG_INTERNAL_LIBTOMMATH -#LTM_PATH=/usr/src/libtommath-0.39 -#CFLAGS += -I$(LTM_PATH) -#LIBS += -L$(LTM_PATH) -#LIBS_p += -L$(LTM_PATH) -#endif -# At the cost of about 4 kB of additional binary size, the internal LibTomMath -# can be configured to include faster routines for exptmod, sqr, and div to -# speed up DH and RSA calculation considerably -#CONFIG_INTERNAL_LIBTOMMATH_FAST=y - -# Include NDIS event processing through WMI into wpa_supplicant/wpasvc. -# This is only for Windows builds and requires WMI-related header files and -# WbemUuid.Lib from Platform SDK even when building with MinGW. -#CONFIG_NDIS_EVENTS_INTEGRATED=y -#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib" - -# Add support for old DBus control interface -# (fi.epitest.hostap.WPASupplicant) -CONFIG_CTRL_IFACE_DBUS=y - -# Add support for new DBus control interface -# (fi.w1.hostap.wpa_supplicant1) -CONFIG_CTRL_IFACE_DBUS_NEW=y - -# Add introspection support for new DBus control interface -CONFIG_CTRL_IFACE_DBUS_INTRO=y - -# Add support for loading EAP methods dynamically as shared libraries. -# When this option is enabled, each EAP method can be either included -# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn). -# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to -# be loaded in the beginning of the wpa_supplicant configuration file -# (see load_dynamic_eap parameter in the example file) before being used in -# the network blocks. -# -# Note that some shared parts of EAP methods are included in the main program -# and in order to be able to use dynamic EAP methods using these parts, the -# main program must have been build with the EAP method enabled (=y or =dyn). -# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries -# unless at least one of them was included in the main build to force inclusion -# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included -# in the main build to be able to load these methods dynamically. -# -# Please also note that using dynamic libraries will increase the total binary -# size. Thus, it may not be the best option for targets that have limited -# amount of memory/flash. -#CONFIG_DYNAMIC_EAP_METHODS=y - -# IEEE Std 802.11r-2008 (Fast BSS Transition) for station mode -CONFIG_IEEE80211R=y - -# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) -CONFIG_DEBUG_FILE=y - -# Send debug messages to syslog instead of stdout -CONFIG_DEBUG_SYSLOG=y -# Set syslog facility for debug messages -#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON - -# Add support for sending all debug messages (regardless of debug verbosity) -# to the Linux kernel tracing facility. This helps debug the entire stack by -# making it easy to record everything happening from the driver up into the -# same file, e.g., using trace-cmd. -#CONFIG_DEBUG_LINUX_TRACING=y - -# Add support for writing debug log to Android logcat instead of standard -# output -#CONFIG_ANDROID_LOG=y - -# Enable privilege separation (see README 'Privilege separation' for details) -#CONFIG_PRIVSEP=y - -# Enable mitigation against certain attacks against TKIP by delaying Michael -# MIC error reports by a random amount of time between 0 and 60 seconds -#CONFIG_DELAYED_MIC_ERROR_REPORT=y - -# Enable tracing code for developer debugging -# This tracks use of memory allocations and other registrations and reports -# incorrect use with a backtrace of call (or allocation) location. -#CONFIG_WPA_TRACE=y -# For BSD, uncomment these. -#LIBS += -lexecinfo -#LIBS_p += -lexecinfo -#LIBS_c += -lexecinfo - -# Use libbfd to get more details for developer debugging -# This enables use of libbfd to get more detailed symbols for the backtraces -# generated by CONFIG_WPA_TRACE=y. -#CONFIG_WPA_TRACE_BFD=y -# For BSD, uncomment these. -#LIBS += -lbfd -liberty -lz -#LIBS_p += -lbfd -liberty -lz -#LIBS_c += -lbfd -liberty -lz - -# wpa_supplicant depends on strong random number generation being available -# from the operating system. os_get_random() function is used to fetch random -# data when needed, e.g., for key generation. On Linux and BSD systems, this -# works by reading /dev/urandom. It should be noted that the OS entropy pool -# needs to be properly initialized before wpa_supplicant is started. This is -# important especially on embedded devices that do not have a hardware random -# number generator and may by default start up with minimal entropy available -# for random number generation. -# -# As a safety net, wpa_supplicant is by default trying to internally collect -# additional entropy for generating random data to mix in with the data fetched -# from the OS. This by itself is not considered to be very strong, but it may -# help in cases where the system pool is not initialized properly. However, it -# is very strongly recommended that the system pool is initialized with enough -# entropy either by using hardware assisted random number generator or by -# storing state over device reboots. -# -# wpa_supplicant can be configured to maintain its own entropy store over -# restarts to enhance random number generation. This is not perfect, but it is -# much more secure than using the same sequence of random numbers after every -# reboot. This can be enabled with -e<entropy file> command line option. The -# specified file needs to be readable and writable by wpa_supplicant. -# -# If the os_get_random() is known to provide strong random data (e.g., on -# Linux/BSD, the board in question is known to have reliable source of random -# data from /dev/urandom), the internal wpa_supplicant random pool can be -# disabled. This will save some in binary size and CPU use. However, this -# should only be considered for builds that are known to be used on devices -# that meet the requirements described above. -#CONFIG_NO_RANDOM_POOL=y - -# IEEE 802.11n (High Throughput) support (mainly for AP mode) -CONFIG_IEEE80211N=y - -# IEEE 802.11ac (Very High Throughput) support (mainly for AP mode) -# (depends on CONFIG_IEEE80211N) -CONFIG_IEEE80211AC=y - -# Wireless Network Management (IEEE Std 802.11v-2011) -# Note: This is experimental and not complete implementation. -#CONFIG_WNM=y - -# Interworking (IEEE 802.11u) -# This can be used to enable functionality to improve interworking with -# external networks (GAS/ANQP to learn more about the networks and network -# selection based on available credentials). -#CONFIG_INTERWORKING=y - -# Hotspot 2.0 -#CONFIG_HS20=y - -# Enable interface matching in wpa_supplicant -#CONFIG_MATCH_IFACE=y - -# Disable roaming in wpa_supplicant -#CONFIG_NO_ROAMING=y - -# AP mode operations with wpa_supplicant -# This can be used for controlling AP mode operations with wpa_supplicant. It -# should be noted that this is mainly aimed at simple cases like -# WPA2-Personal while more complex configurations like WPA2-Enterprise with an -# external RADIUS server can be supported with hostapd. -CONFIG_AP=y - -# P2P (Wi-Fi Direct) -# This can be used to enable P2P support in wpa_supplicant. See README-P2P for -# more information on P2P operations. -CONFIG_P2P=y - -# Enable TDLS support -#CONFIG_TDLS=y - -# Wi-Fi Direct -# This can be used to enable Wi-Fi Direct extensions for P2P using an external -# program to control the additional information exchanges in the messages. -CONFIG_WIFI_DISPLAY=y - -# Autoscan -# This can be used to enable automatic scan support in wpa_supplicant. -# See wpa_supplicant.conf for more information on autoscan usage. -# -# Enabling directly a module will enable autoscan support. -# For exponential module: -#CONFIG_AUTOSCAN_EXPONENTIAL=y -# For periodic module: -#CONFIG_AUTOSCAN_PERIODIC=y - -# Password (and passphrase, etc.) backend for external storage -# These optional mechanisms can be used to add support for storing passwords -# and other secrets in external (to wpa_supplicant) location. This allows, for -# example, operating system specific key storage to be used -# -# External password backend for testing purposes (developer use) -#CONFIG_EXT_PASSWORD_TEST=y - -# Enable Fast Session Transfer (FST) -#CONFIG_FST=y - -# Enable CLI commands for FST testing -#CONFIG_FST_TEST=y - -# OS X builds. This is only for building eapol_test. -#CONFIG_OSX=y - -# Automatic Channel Selection -# This will allow wpa_supplicant to pick the channel automatically when channel -# is set to "0". -# -# TODO: Extend parser to be able to parse "channel=acs_survey" as an alternative -# to "channel=0". This would enable us to eventually add other ACS algorithms in -# similar way. -# -# Automatic selection is currently only done through initialization, later on -# we hope to do background checks to keep us moving to more ideal channels as -# time goes by. ACS is currently only supported through the nl80211 driver and -# your driver must have survey dump capability that is filled by the driver -# during scanning. -# -# TODO: In analogy to hostapd be able to customize the ACS survey algorithm with -# a newly to create wpa_supplicant.conf variable acs_num_scans. -# -# Supported ACS drivers: -# * ath9k -# * ath5k -# * ath10k -# -# For more details refer to: -# http://wireless.kernel.org/en/users/Documentation/acs -#CONFIG_ACS=y - -# Support Multi Band Operation -#CONFIG_MBO=y - -# Fast Initial Link Setup (FILS) (IEEE 802.11ai) -# Note: This is an experimental and not yet complete implementation. This -# should not be enabled for production use. -#CONFIG_FILS=y -# FILS shared key authentication with PFS -#CONFIG_FILS_SK_PFS=y - -# Support RSN on IBSS networks -# This is needed to be able to use mode=1 network profile with proto=RSN and -# key_mgmt=WPA-PSK (i.e., full key management instead of WPA-None). -CONFIG_IBSS_RSN=y - -# External PMKSA cache control -# This can be used to enable control interface commands that allow the current -# PMKSA cache entries to be fetched and new entries to be added. -#CONFIG_PMKSA_CACHE_EXTERNAL=y - -# Mesh Networking (IEEE 802.11s) -#CONFIG_MESH=y - -# Background scanning modules -# These can be used to request wpa_supplicant to perform background scanning -# operations for roaming within an ESS (same SSID). See the bgscan parameter in -# the wpa_supplicant.conf file for more details. -# Periodic background scans based on signal strength -CONFIG_BGSCAN_SIMPLE=y -# Learn channels used by the network and try to avoid bgscans on other -# channels (experimental) -#CONFIG_BGSCAN_LEARN=y - -# Opportunistic Wireless Encryption (OWE) -# Experimental implementation of draft-harkins-owe-07.txt -#CONFIG_OWE=y diff --git a/testing/source/wpa_supplicant/config/wpa_gui.desktop b/testing/source/wpa_supplicant/config/wpa_gui.desktop deleted file mode 100644 index 31b8b6b0..00000000 --- a/testing/source/wpa_supplicant/config/wpa_gui.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[Desktop Entry] -Name=wpa_gui -Comment[en]=Wpa_supplicant management -Exec=kdesu wpa_gui -Icon=wpa_gui -Type=Application -Categories=Qt;Network; diff --git a/testing/source/wpa_supplicant/config/wpa_gui.png b/testing/source/wpa_supplicant/config/wpa_gui.png Binary files differdeleted file mode 100644 index a72f3569..00000000 --- a/testing/source/wpa_supplicant/config/wpa_gui.png +++ /dev/null diff --git a/testing/source/wpa_supplicant/config/wpa_supplicant.conf b/testing/source/wpa_supplicant/config/wpa_supplicant.conf deleted file mode 100644 index 4dbbf96a..00000000 --- a/testing/source/wpa_supplicant/config/wpa_supplicant.conf +++ /dev/null @@ -1,2 +0,0 @@ -ctrl_interface=/var/run/wpa_supplicant -ctrl_interface_group=root diff --git a/testing/source/wpa_supplicant/config/wpa_supplicant.logrotate b/testing/source/wpa_supplicant/config/wpa_supplicant.logrotate deleted file mode 100644 index bd7ef91c..00000000 --- a/testing/source/wpa_supplicant/config/wpa_supplicant.logrotate +++ /dev/null @@ -1,6 +0,0 @@ -/var/log/wpa_supplicant.log { - missingok - notifempty - size 30k - create 0600 root root -} diff --git a/testing/source/wpa_supplicant/doinst.sh b/testing/source/wpa_supplicant/doinst.sh deleted file mode 100644 index 6052fca4..00000000 --- a/testing/source/wpa_supplicant/doinst.sh +++ /dev/null @@ -1,15 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # 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 - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/wpa_supplicant.conf.new -config etc/logrotate.d/wpa_supplicant.new diff --git a/testing/source/wpa_supplicant/slack-desc b/testing/source/wpa_supplicant/slack-desc deleted file mode 100644 index a6b63978..00000000 --- a/testing/source/wpa_supplicant/slack-desc +++ /dev/null @@ -1,18 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - |-----handy-ruler------------------------------------------------------| -wpa_supplicant: wpa_supplicant (WPA/WPA2/IEEE 802.1X Supplicant) -wpa_supplicant: -wpa_supplicant: wpa_supplicant is a WPA Supplicant for Linux with support for WPA and -wpa_supplicant: WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE 802.1X/WPA -wpa_supplicant: component that is used in the client stations. It implements key -wpa_supplicant: negotiation with a WPA Authenticator and it controls the roaming and -wpa_supplicant: IEEE 802.11 authentication/association of the wlan driver. -wpa_supplicant: -wpa_supplicant: Homepage: http://hostap.epitest.fi/wpa_supplicant/ -wpa_supplicant: -wpa_supplicant: diff --git a/testing/source/wpa_supplicant/wpa_supplicant.SlackBuild b/testing/source/wpa_supplicant/wpa_supplicant.SlackBuild deleted file mode 100755 index 492ddb72..00000000 --- a/testing/source/wpa_supplicant/wpa_supplicant.SlackBuild +++ /dev/null @@ -1,180 +0,0 @@ -#!/bin/bash - -# Copyright 2004-2008 Eric Hameleers, Eindhoven, NL -# 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 -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR 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) - -PKGNAM=wpa_supplicant -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} - -SRCVERSION=$(printf $VERSION | tr _ -) - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i586 ;; - arm*) export ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: - *) export ARCH=$( uname -m ) ;; - 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:-" -j$(expr $(nproc) + 1) "} - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "armel" ]; then - SLKCFLAGS="-O2 -march=armv4t" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG -cd $TMP -rm -rf ${PKGNAM}-${SRCVERSION} -tar xvf $CWD/${PKGNAM}-${SRCVERSION}.tar.?z* || exit 1 -cd ${PKGNAM}-${SRCVERSION} -chown -R root:root . -find . \ - \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ - \( -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 - -cd wpa_supplicant - -# Create the configuration file for building wpa_supplicant: -cat $CWD/config/dot.config > .config - -# Build the usual binaries -CFLAGS="$SLKCFLAGS" \ -make $NUMJOBS \ - BINDIR=/usr/sbin \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1 - -# Build the Qt4 GUI client -CFLAGS="$SLKCFLAGS" \ -make $NUMJOBS \ - wpa_gui-qt4 \ - BINDIR=/usr/sbin \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} || exit 1 - -# Make sure man pages are built -make -C doc/docbook man - -# This goes into the doc directory later on: -mv wpa_supplicant.conf wpa_supplicant.conf.sample - -# Install binaries: -mkdir -p $PKG/usr/sbin $PKG/usr/bin -cp wpa_supplicant wpa_passphrase wpa_cli $PKG/usr/sbin/ -cp wpa_gui-qt4/wpa_gui $PKG/usr/bin/ - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -# Install dbus configuration file: -mkdir -p $PKG/etc/dbus-1/system.d/ -cp dbus/dbus-wpa_supplicant.conf \ - $PKG/etc/dbus-1/system.d/dbus-wpa_supplicant.conf - -mkdir -p $PKG/usr/share/dbus-1/system-services -install -m644 dbus/*.service $PKG/usr/share/dbus-1/system-services/ - -# Install a .desktop file and icon for wpa_gui: -# (converted from the wpa_gui.svg in the source) -mkdir -p $PKG/usr/share/{applications,pixmaps} -cat $CWD/config/wpa_gui.desktop > $PKG/usr/share/applications/wpa_gui.desktop -cat $CWD/config/wpa_gui.png > $PKG/usr/share/pixmaps/wpa_gui.png - -# Install a logrotate config -mkdir -p $PKG/etc/logrotate.d -cat $CWD/config/wpa_supplicant.logrotate > $PKG/etc/logrotate.d/wpa_supplicant.new - -# Install man pages: -for m in 5 8; do - mkdir -p $PKG/usr/man/man${m} - cp doc/docbook/*.${m} $PKG/usr/man/man${m}/ -done -find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; - -# Install a default configuration file (only readable by root): -mkdir -p $PKG/etc -cat $CWD/config/wpa_supplicant.conf > $PKG/etc/wpa_supplicant.conf.new -chmod 600 $PKG/etc/wpa_supplicant.conf.new - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - ChangeLog ../COPYING README README-{P2P,WPS} examples *.txt *.sample $CWD/README.slackware \ - $PKG/usr/doc/$PKGNAM-$VERSION -chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION/* -chmod -R a-w $PKG/usr/doc/$PKGNAM-$VERSION/* - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -zcat $CWD/doinst.sh.gz >> $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz |
