From c51a629483f6dbf16951d9589000a8ce28317cf4 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 22 Apr 2019 20:00:44 +0000 Subject: [PATCH] Mon Apr 22 20:00:44 UTC 2019 a/aaa_terminfo-6.1_20190420-x86_64-1.txz: Upgraded. l/ncurses-6.1_20190420-x86_64-1.txz: Upgraded. n/wpa_supplicant-2.8-x86_64-1.txz: Upgraded. xap/xpdf-4.00-x86_64-4.txz: Rebuilt. Recompiled with -DSYSTEM_XPDFRC="/etc/xpdfrc". Thanks to J_W. --- ChangeLog.rss | 19 +++- ChangeLog.txt | 7 ++ FILELIST.TXT | 102 +++++++++--------- recompress.sh | 3 - source/l/ncurses/ncurses.mkhashsize.diff | 10 +- ...pplicant-2.7-fix-undefined-remove-ie.patch | 38 ------- .../wpa_supplicant-assoc-timeout.patch | 16 --- ...pa_supplicant-dbus-service-file-args.patch | 20 ---- .../wpa_supplicant/wpa_supplicant.SlackBuild | 5 +- source/xap/xpdf/xpdf.SlackBuild | 9 +- source/xap/xpdf/xpdfIcon.xpm | 62 +++++++++++ 11 files changed, 147 insertions(+), 144 deletions(-) delete mode 100644 source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch delete mode 100644 source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch delete mode 100644 source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch create mode 100644 source/xap/xpdf/xpdfIcon.xpm diff --git a/ChangeLog.rss b/ChangeLog.rss index 1865c488d..f165869c5 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,9 +11,24 @@ Tracking Slackware development in git. en-us urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f - Sun, 21 Apr 2019 18:45:54 GMT - Mon, 22 Apr 2019 06:59:39 GMT + Mon, 22 Apr 2019 20:00:44 GMT + Tue, 23 Apr 2019 06:59:41 GMT maintain_current_git.sh v 1.11 + + Mon, 22 Apr 2019 20:00:44 GMT + Mon, 22 Apr 2019 20:00:44 GMT + https://git.slackware.nl/current/tag/?h=20190422200044 + 20190422200044 + + +a/aaa_terminfo-6.1_20190420-x86_64-1.txz: Upgraded. +l/ncurses-6.1_20190420-x86_64-1.txz: Upgraded. +n/wpa_supplicant-2.8-x86_64-1.txz: Upgraded. +xap/xpdf-4.00-x86_64-4.txz: Rebuilt. + Recompiled with -DSYSTEM_XPDFRC="/etc/xpdfrc". Thanks to J_W. + ]]> + + Sun, 21 Apr 2019 18:45:54 GMT Sun, 21 Apr 2019 18:45:54 GMT diff --git a/ChangeLog.txt b/ChangeLog.txt index f8d783e04..a3ead5949 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,10 @@ +Mon Apr 22 20:00:44 UTC 2019 +a/aaa_terminfo-6.1_20190420-x86_64-1.txz: Upgraded. +l/ncurses-6.1_20190420-x86_64-1.txz: Upgraded. +n/wpa_supplicant-2.8-x86_64-1.txz: Upgraded. +xap/xpdf-4.00-x86_64-4.txz: Rebuilt. + Recompiled with -DSYSTEM_XPDFRC="/etc/xpdfrc". Thanks to J_W. ++--------------------------+ Sun Apr 21 18:45:54 UTC 2019 a/bash-5.0.007-x86_64-1.txz: Upgraded. d/parallel-20190422-noarch-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 528b829f1..ac835e08b 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Mon Apr 22 01:47:14 UTC 2019 +Mon Apr 22 20:23:58 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-04-21 18:58 . +drwxr-xr-x 12 root root 4096 2019-04-22 20:00 . -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 913586 2019-04-21 18:58 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-04-21 18:58 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 913682 2019-04-22 01:48 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-04-22 01:48 ./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 615320 2019-04-21 18:45 ./ChangeLog.txt +-rw-r--r-- 1 root root 615627 2019-04-22 20:00 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2019-04-21 03:36 ./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 2019-04-21 03:36 ./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 1201463 2019-04-21 18:57 ./FILELIST.TXT +-rw-r--r-- 1 root root 1201576 2019-04-22 01:47 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 732386 2019-04-21 18:55 ./PACKAGES.TXT +-rw-r--r-- 1 root root 732386 2019-04-22 20:22 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3635 2019-04-21 02:36 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -787,22 +787,22 @@ 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-04-21 18:55 ./slackware64 --rw-r--r-- 1 root root 290575 2019-04-21 18:55 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-04-21 18:55 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 361950 2019-04-21 18:52 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3653180 2019-04-21 18:53 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2019-04-22 20:22 ./slackware64 +-rw-r--r-- 1 root root 290575 2019-04-22 20:22 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-04-22 20:22 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 361950 2019-04-22 20:19 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3653974 2019-04-22 20:20 ./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-04-21 18:52 ./slackware64/a +drwxr-xr-x 2 root root 28672 2019-04-22 20:19 ./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 -rw-r--r-- 1 root root 471 2019-04-03 22:15 ./slackware64/a/aaa_elflibs-15.0-x86_64-7.txt -rw-r--r-- 1 root root 13845832 2019-04-03 22:15 ./slackware64/a/aaa_elflibs-15.0-x86_64-7.txz -rw-r--r-- 1 root root 163 2019-04-03 22:15 ./slackware64/a/aaa_elflibs-15.0-x86_64-7.txz.asc --rw-r--r-- 1 root root 503 2019-02-27 21:25 ./slackware64/a/aaa_terminfo-6.1_20190223-x86_64-1.txt --rw-r--r-- 1 root root 48628 2019-02-27 21:25 ./slackware64/a/aaa_terminfo-6.1_20190223-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-02-27 21:25 ./slackware64/a/aaa_terminfo-6.1_20190223-x86_64-1.txz.asc +-rw-r--r-- 1 root root 503 2019-04-22 19:14 ./slackware64/a/aaa_terminfo-6.1_20190420-x86_64-1.txt +-rw-r--r-- 1 root root 48644 2019-04-22 19:14 ./slackware64/a/aaa_terminfo-6.1_20190420-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-22 19:14 ./slackware64/a/aaa_terminfo-6.1_20190420-x86_64-1.txz.asc -rw-r--r-- 1 root root 414 2018-06-19 20:04 ./slackware64/a/acl-2.2.53-x86_64-1.txt -rw-r--r-- 1 root root 128832 2018-06-19 20:04 ./slackware64/a/acl-2.2.53-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-06-19 20:04 ./slackware64/a/acl-2.2.53-x86_64-1.txz.asc @@ -2455,7 +2455,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-04-21 03:44 ./slackware64/l +drwxr-xr-x 2 root root 69632 2019-04-22 20:19 ./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 @@ -3153,9 +3153,9 @@ drwxr-xr-x 2 root root 69632 2019-04-21 03:44 ./slackware64/l -rw-r--r-- 1 root root 586 2019-02-01 01:16 ./slackware64/l/mpfr-4.0.2-x86_64-1.txt -rw-r--r-- 1 root root 329688 2019-02-01 01:16 ./slackware64/l/mpfr-4.0.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-02-01 01:16 ./slackware64/l/mpfr-4.0.2-x86_64-1.txz.asc --rw-r--r-- 1 root root 493 2019-02-27 21:24 ./slackware64/l/ncurses-6.1_20190223-x86_64-1.txt --rw-r--r-- 1 root root 1290360 2019-02-27 21:24 ./slackware64/l/ncurses-6.1_20190223-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-02-27 21:24 ./slackware64/l/ncurses-6.1_20190223-x86_64-1.txz.asc +-rw-r--r-- 1 root root 493 2019-04-22 19:14 ./slackware64/l/ncurses-6.1_20190420-x86_64-1.txt +-rw-r--r-- 1 root root 1292276 2019-04-22 19:14 ./slackware64/l/ncurses-6.1_20190420-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-22 19:14 ./slackware64/l/ncurses-6.1_20190420-x86_64-1.txz.asc -rw-r--r-- 1 root root 342 2018-05-08 02:28 ./slackware64/l/neon-0.30.2-x86_64-1.txt -rw-r--r-- 1 root root 212404 2018-05-08 02:28 ./slackware64/l/neon-0.30.2-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-05-08 02:28 ./slackware64/l/neon-0.30.2-x86_64-1.txz.asc @@ -3421,7 +3421,7 @@ drwxr-xr-x 2 root root 69632 2019-04-21 03:44 ./slackware64/l -rw-r--r-- 1 root root 463 2019-04-18 20:04 ./slackware64/l/zstd-1.4.0-x86_64-1.txt -rw-r--r-- 1 root root 390012 2019-04-18 20:04 ./slackware64/l/zstd-1.4.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-04-18 20:04 ./slackware64/l/zstd-1.4.0-x86_64-1.txz.asc -drwxr-xr-x 2 root root 36864 2019-04-21 18:52 ./slackware64/n +drwxr-xr-x 2 root root 36864 2019-04-22 20:19 ./slackware64/n -rw-r--r-- 1 root root 357 2019-01-19 18:48 ./slackware64/n/ModemManager-1.10.0-x86_64-1.txt -rw-r--r-- 1 root root 1644036 2019-01-19 18:48 ./slackware64/n/ModemManager-1.10.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-01-19 18:48 ./slackware64/n/ModemManager-1.10.0-x86_64-1.txz.asc @@ -3850,9 +3850,9 @@ drwxr-xr-x 2 root root 36864 2019-04-21 18:52 ./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 600 2019-04-03 22:03 ./slackware64/n/wpa_supplicant-2.7-x86_64-4.txt --rw-r--r-- 1 root root 1148020 2019-04-03 22:03 ./slackware64/n/wpa_supplicant-2.7-x86_64-4.txz --rw-r--r-- 1 root root 163 2019-04-03 22:03 ./slackware64/n/wpa_supplicant-2.7-x86_64-4.txz.asc +-rw-r--r-- 1 root root 600 2019-04-22 19:41 ./slackware64/n/wpa_supplicant-2.8-x86_64-1.txt +-rw-r--r-- 1 root root 1159072 2019-04-22 19:41 ./slackware64/n/wpa_supplicant-2.8-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-04-22 19:41 ./slackware64/n/wpa_supplicant-2.8-x86_64-1.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 @@ -4762,7 +4762,7 @@ drwxr-xr-x 2 root root 65536 2019-04-21 03:44 ./slackware64/x -rw-r--r-- 1 root root 213 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txt -rw-r--r-- 1 root root 25288 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz.asc -drwxr-xr-x 2 root root 12288 2019-04-18 21:21 ./slackware64/xap +drwxr-xr-x 2 root root 12288 2019-04-22 20:19 ./slackware64/xap -rw-r--r-- 1 root root 625 2019-04-18 19:18 ./slackware64/xap/MPlayer-20190418-x86_64-1.txt -rw-r--r-- 1 root root 2734976 2019-04-18 19:18 ./slackware64/xap/MPlayer-20190418-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-04-18 19:18 ./slackware64/xap/MPlayer-20190418-x86_64-1.txz.asc @@ -4897,9 +4897,9 @@ drwxr-xr-x 2 root root 12288 2019-04-18 21:21 ./slackware64/xap -rw-r--r-- 1 root root 443 2018-04-13 17:57 ./slackware64/xap/xpaint-2.10.2-x86_64-2.txt -rw-r--r-- 1 root root 514772 2018-04-13 17:57 ./slackware64/xap/xpaint-2.10.2-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 17:57 ./slackware64/xap/xpaint-2.10.2-x86_64-2.txz.asc --rw-r--r-- 1 root root 188 2018-04-13 17:59 ./slackware64/xap/xpdf-4.00-x86_64-3.txt --rw-r--r-- 1 root root 2298388 2018-04-13 17:59 ./slackware64/xap/xpdf-4.00-x86_64-3.txz --rw-r--r-- 1 root root 163 2018-04-13 17:59 ./slackware64/xap/xpdf-4.00-x86_64-3.txz.asc +-rw-r--r-- 1 root root 188 2019-04-22 19:03 ./slackware64/xap/xpdf-4.00-x86_64-4.txt +-rw-r--r-- 1 root root 2302800 2019-04-22 19:03 ./slackware64/xap/xpdf-4.00-x86_64-4.txz +-rw-r--r-- 1 root root 163 2019-04-22 19:03 ./slackware64/xap/xpdf-4.00-x86_64-4.txz.asc -rw-r--r-- 1 root root 498 2018-04-13 17:59 ./slackware64/xap/xsane-0.999-x86_64-2.txt -rw-r--r-- 1 root root 1631104 2018-04-13 17:59 ./slackware64/xap/xsane-0.999-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 17:59 ./slackware64/xap/xsane-0.999-x86_64-2.txz.asc @@ -5002,11 +5002,11 @@ drwxr-xr-x 2 root root 4096 2019-02-17 23:51 ./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-04-22 01:47 ./source --rw-r--r-- 1 root root 462931 2019-04-22 01:47 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-04-22 01:47 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 654001 2019-04-22 01:46 ./source/FILE_LIST --rw-r--r-- 1 root root 16721891 2019-04-22 01:46 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2019-04-22 20:23 ./source +-rw-r--r-- 1 root root 462669 2019-04-22 20:23 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-04-22 20:23 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 653703 2019-04-22 20:23 ./source/FILE_LIST +-rw-r--r-- 1 root root 16730264 2019-04-22 20:23 ./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-03-16 20:25 ./source/a -rw-r--r-- 1 root root 877 2018-11-21 18:49 ./source/a/FTBFSlog @@ -9287,12 +9287,12 @@ drwxr-xr-x 3 root root 4096 2019-02-01 01:02 ./source/l/mpfr -rwxr-xr-x 1 root root 4497 2019-02-01 00:57 ./source/l/mpfr/mpfr.SlackBuild drwxr-xr-x 2 root root 4096 2011-04-05 02:53 ./source/l/mpfr/patches -rw-r--r-- 1 root root 1038 2018-02-27 06:12 ./source/l/mpfr/slack-desc -drwxr-xr-x 3 root root 4096 2019-02-27 21:19 ./source/l/ncurses +drwxr-xr-x 3 root root 4096 2019-04-22 19:07 ./source/l/ncurses -rwxr-xr-x 1 root root 3292 2018-11-13 22:15 ./source/l/ncurses/aaa_terminfo.SlackBuild -rw-r--r-- 1 root root 139 2018-06-22 20:33 ./source/l/ncurses/doinst.sh.gz --rw-r--r-- 1 root root 1953116 2019-02-24 00:38 ./source/l/ncurses/ncurses-6.1-20190223.tar.lz +-rw-r--r-- 1 root root 1957705 2019-04-20 20:34 ./source/l/ncurses/ncurses-6.1-20190420.tar.lz -rwxr-xr-x 1 root root 8112 2018-11-13 22:15 ./source/l/ncurses/ncurses.SlackBuild --rw-r--r-- 1 root root 273 2006-12-27 23:21 ./source/l/ncurses/ncurses.mkhashsize.diff.gz +-rw-r--r-- 1 root root 272 2019-04-22 19:10 ./source/l/ncurses/ncurses.mkhashsize.diff.gz -rw-r--r-- 1 root root 948 2018-03-26 18:28 ./source/l/ncurses/slack-desc -rw-r--r-- 1 root root 963 2018-02-27 06:13 ./source/l/ncurses/slack-desc.aaa_terminfo drwxr-xr-x 2 root root 4096 2018-11-13 22:15 ./source/l/ncurses/terminfo @@ -9800,7 +9800,7 @@ drwxr-xr-x 2 root root 4096 2019-04-18 20:03 ./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 2019-03-28 19:24 ./source/n +drwxr-xr-x 147 root root 4096 2019-04-22 19:40 ./source/n -rw-r--r-- 1 root root 709 2019-04-13 19:02 ./source/n/FTBFSlog drwxr-xr-x 2 root root 4096 2019-01-19 18:47 ./source/n/ModemManager -rw-r--r-- 1 root root 2201468 2019-01-17 15:27 ./source/n/ModemManager/ModemManager-1.10.0.tar.xz @@ -10792,7 +10792,7 @@ 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 4 root root 4096 2019-04-03 20:44 ./source/n/wpa_supplicant +drwxr-xr-x 4 root root 4096 2019-04-22 18:33 ./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 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 @@ -10801,17 +10801,14 @@ drwxr-xr-x 2 root root 4096 2018-12-29 19:33 ./source/n/wpa_supplicant/co -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 2019-01-04 21:19 ./source/n/wpa_supplicant/patches +drwxr-xr-x 2 root root 4096 2019-04-22 18:35 ./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-04-03 20:44 ./source/n/wpa_supplicant/wpa_supplicant.SlackBuild +-rw-r--r-- 1 root root 2130172 2019-04-21 13:58 ./source/n/wpa_supplicant/wpa_supplicant-2.8.tar.lz +-rwxr-xr-x 1 root root 6022 2019-04-22 18:36 ./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 @@ -12445,12 +12442,12 @@ 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 -drwxr-xr-x 2 root root 4096 2018-11-09 20:41 ./source/xap/sane --rw-r--r-- 1 root root 133 2006-09-23 08:33 ./source/xap/sane/dll.conf.additions.gz --rw-r--r-- 1 root root 285 2008-02-12 16:23 ./source/xap/sane/doinst.sh.gz +-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 +drwxr-xr-x 2 root root 4096 2018-11-09 20:41 ./source/xap/sane +-rw-r--r-- 1 root root 133 2006-09-23 08:33 ./source/xap/sane/dll.conf.additions.gz +-rw-r--r-- 1 root root 285 2008-02-12 16:23 ./source/xap/sane/doinst.sh.gz -rw-r--r-- 1 root root 3581624 2017-05-23 13:08 ./source/xap/sane/sane-backends-1.0.27.tar.xz -rw-r--r-- 1 root root 341 2010-01-20 01:54 ./source/xap/sane/sane-frontends-1.0.14-sane_cap_always_settable.diff.gz -rw-r--r-- 1 root root 172596 2005-09-18 07:21 ./source/xap/sane/sane-frontends-1.0.14.tar.xz @@ -12569,7 +12566,7 @@ drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/xpaint -rw-r--r-- 1 root root 897 2018-02-27 06:13 ./source/xap/xpaint/slack-desc -rw-r--r-- 1 root root 1575492 2017-11-13 17:18 ./source/xap/xpaint/xpaint-2.10.2.tar.xz -rwxr-xr-x 1 root root 4904 2018-09-18 22:04 ./source/xap/xpaint/xpaint.SlackBuild -drwxr-xr-x 4 root root 4096 2018-09-18 22:04 ./source/xap/xpdf +drwxr-xr-x 4 root root 4096 2019-04-22 19:02 ./source/xap/xpdf -rw-r--r-- 1 root root 325 2010-01-11 04:59 ./source/xap/xpdf/doinst.sh.gz drwxr-xr-x 2 root root 4096 2017-09-27 18:41 ./source/xap/xpdf/lang -rw-r--r-- 1 root root 1080 2011-08-15 21:28 ./source/xap/xpdf/lang/xpdf-arabic-2011-aug-15.tar.xz @@ -12598,8 +12595,9 @@ drwxr-xr-x 2 root root 4096 2017-09-26 04:39 ./source/xap/xpdf/patches -rw-r--r-- 1 root root 555 2017-09-26 04:39 ./source/xap/xpdf/patches/xpdfrc.diff.gz -rw-r--r-- 1 root root 640 2018-02-27 06:13 ./source/xap/xpdf/slack-desc -rw-r--r-- 1 root root 616392 2017-08-09 20:14 ./source/xap/xpdf/xpdf-4.00.tar.xz --rwxr-xr-x 1 root root 5151 2018-09-18 22:04 ./source/xap/xpdf/xpdf.SlackBuild +-rwxr-xr-x 1 root root 5194 2019-04-22 19:03 ./source/xap/xpdf/xpdf.SlackBuild -rw-r--r-- 1 root root 3260 2010-01-11 05:07 ./source/xap/xpdf/xpdf.desktop +-rw-r--r-- 1 root root 2751 2016-03-03 05:04 ./source/xap/xpdf/xpdfIcon.xpm drwxr-xr-x 2 root root 4096 2018-09-18 22:04 ./source/xap/xsane -rw-r--r-- 1 root root 951 2018-02-27 06:13 ./source/xap/xsane/slack-desc -rw-r--r-- 1 root root 1073 2015-03-26 16:54 ./source/xap/xsane/xsane-0.995-close-fds.patch.gz diff --git a/recompress.sh b/recompress.sh index 994f7af14..ee7c59cc2 100755 --- a/recompress.sh +++ b/recompress.sh @@ -533,13 +533,10 @@ 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/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 diff --git a/source/l/ncurses/ncurses.mkhashsize.diff b/source/l/ncurses/ncurses.mkhashsize.diff index 7694a39d2..035956da6 100644 --- a/source/l/ncurses/ncurses.mkhashsize.diff +++ b/source/l/ncurses/ncurses.mkhashsize.diff @@ -1,11 +1,11 @@ ---- ./include/MKhashsize.sh.orig 2006-10-21 19:45:39.000000000 -0500 -+++ ./include/MKhashsize.sh 2006-12-27 17:21:06.000000000 -0600 +--- ./include/MKhashsize.sh.orig 2019-04-22 14:07:41.451003244 -0500 ++++ ./include/MKhashsize.sh 2019-04-22 14:10:09.163003249 -0500 @@ -35,7 +35,7 @@ echo " */" - CAPS="${1-Caps}" --TABSIZE=`grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l` -+TABSIZE=$(grep -v '^[ #]' $CAPS | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | wc -l) + test $# = 0 && set Caps +-TABSIZE=`cat "$@" | grep -v '^[ #]' | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | grep -v "^userdef" | grep -v "^used_by" | wc -l` ++TABSIZE=$(cat "$@" | grep -v '^[ #]' | grep -v "^$" | grep -v "^capalias"| grep -v "^infoalias" | grep -v "^userdef" | grep -v "^used_by" | wc -l) echo "" echo "#define CAPTABSIZE ${TABSIZE}" diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch deleted file mode 100644 index 97a8cc7f3..000000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f2973fa39d6109f0f34969e91551a98dc340d537 Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Mon, 3 Dec 2018 12:00:26 +0200 -Subject: FT: Fix CONFIG_IEEE80211X=y build without CONFIG_FILS=y - -remove_ie() was defined within an ifdef CONFIG_FILS block while it is -now needed even without CONFIG_FILS=y. Remove the CONFIG_FILS condition -there. - -Fixes 8c41734e5de1 ("FT: Fix Reassociation Request IEs during FT protocol") -Signed-off-by: Jouni Malinen ---- - wpa_supplicant/sme.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/wpa_supplicant/sme.c b/wpa_supplicant/sme.c -index 39c8069..f77f751 100644 ---- a/wpa_supplicant/sme.c -+++ b/wpa_supplicant/sme.c -@@ -1386,7 +1386,6 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data) - } - - --#ifdef CONFIG_FILS - #ifdef CONFIG_IEEE80211R - static void remove_ie(u8 *buf, size_t *len, u8 eid) - { -@@ -1401,7 +1400,6 @@ static void remove_ie(u8 *buf, size_t *len, u8 eid) - } - } - #endif /* CONFIG_IEEE80211R */ --#endif /* CONFIG_FILS */ - - - void sme_associate(struct wpa_supplicant *wpa_s, enum wpas_mode mode, --- -cgit v0.12 - diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch deleted file mode 100644 index c3b3568c6..000000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-assoc-timeout.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c.assoc-timeout wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c ---- wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c.assoc-timeout 2010-09-07 10:43:39.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/wpa_supplicant.c 2010-12-07 18:57:45.163457000 -0600 -@@ -1262,10 +1262,10 @@ void wpa_supplicant_associate(struct wpa - - if (assoc_failed) { - /* give IBSS a bit more time */ -- timeout = ssid->mode == WPAS_MODE_IBSS ? 10 : 5; -+ timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 10; - } else if (wpa_s->conf->ap_scan == 1) { - /* give IBSS a bit more time */ -- timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 10; -+ timeout = ssid->mode == WPAS_MODE_IBSS ? 20 : 20; - } - wpa_supplicant_req_auth_timeout(wpa_s, timeout, 0); - } diff --git a/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch b/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch deleted file mode 100644 index b7478dad8..000000000 --- a/source/n/wpa_supplicant/patches/wpa_supplicant-dbus-service-file-args.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in.fedora 2008-03-02 20:58:35.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2008-03-02 20:58:41.000000000 -0500 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.w1.wpa_supplicant1 --Exec=@BINDIR@/wpa_supplicant -u -+Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in.fedora 2008-03-02 20:58:35.000000000 -0500 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2008-03-02 20:58:41.000000000 -0500 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.epitest.hostap.WPASupplicant --Exec=@BINDIR@/wpa_supplicant -u -+Exec=@BINDIR@/wpa_supplicant -B -u -f /var/log/wpa_supplicant.log -c /etc/wpa_supplicant/wpa_supplicant.conf -P /var/run/wpa_supplicant.pid - User=root - SystemdService=wpa_supplicant.service diff --git a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild index f8386788d..5273f8f1a 100755 --- a/source/n/wpa_supplicant/wpa_supplicant.SlackBuild +++ b/source/n/wpa_supplicant/wpa_supplicant.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=wpa_supplicant VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-1} SRCVERSION=$(printf $VERSION | tr _ -) @@ -85,12 +85,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -zcat $CWD/patches/wpa_supplicant-assoc-timeout.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/wpa_supplicant-dbus-service-file-args.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-flush-debug-output.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-gui-qt4.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/wpa_supplicant-quiet-scan-results-message.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/patches/wpa_supplicant-2.7-fix-undefined-remove-ie.patch.gz | patch -p1 --verbose || exit 1 # Allow legacy tls to avoid breaking WPA2-Enterprise: zcat $CWD/patches/allow-tlsv1.patch.gz | patch -p1 --verbose || exit 1 diff --git a/source/xap/xpdf/xpdf.SlackBuild b/source/xap/xpdf/xpdf.SlackBuild index dd2f4815a..5d5d05e43 100755 --- a/source/xap/xpdf/xpdf.SlackBuild +++ b/source/xap/xpdf/xpdf.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xpdf VERSION=4.00 PATCHLEVEL= -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -91,6 +91,7 @@ cd build -DMAN_INSTALL_DIR=/usr/man \ -DCMAKE_BUILD_TYPE=Release \ -DXPDFWIDGET_PRINTING=1 \ + -DSYSTEM_XPDFRC="/etc/xpdfrc" \ .. || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 @@ -110,10 +111,10 @@ mkdir -p $PKG/etc cat doc/sample-xpdfrc > $PKG/etc/xpdfrc mv $PKG/etc/xpdfrc $PKG/etc/xpdfrc.new -# Add desktop menu entry and icon +# Add desktop menu entry and icon: mkdir -p $PKG/usr/share/{applications,pixmaps} cat $CWD/xpdf.desktop > $PKG/usr/share/applications/xpdf.desktop -cat xpdf/xpdfIcon.xpm > $PKG/usr/share/pixmaps/xpdfIcon.xpm +cat $CWD/xpdfIcon.xpm > $PKG/usr/share/pixmaps/xpdfIcon.xpm # Add additional language support: for language in xpdf-arabic xpdf-chinese-simplified xpdf-chinese-traditional xpdf-cyrillic xpdf-greek xpdf-hebrew xpdf-japanese xpdf-korean xpdf-latin2 xpdf-thai xpdf-turkish ; do diff --git a/source/xap/xpdf/xpdfIcon.xpm b/source/xap/xpdf/xpdfIcon.xpm new file mode 100644 index 000000000..5e05d20e2 --- /dev/null +++ b/source/xap/xpdf/xpdfIcon.xpm @@ -0,0 +1,62 @@ +/* XPM */ +static char *xpdfIcon[] = { +/* width height num_colors chars_per_pixel */ +" 48 48 7 1", +/* colors */ +". c #000000", +"# c #a00000", +"a c #a0a0a0", +"b c #c0c0c0", +"c c #e00000", +"d c #e0e0e0", +"e c #ffffff", +/* pixels */ +"................................................", +"................................................", +"................................................", +"................................................", +"#ccccccc#................................#ccc#..", +".#ccccccc#..............................#ccc#...", +"..#ccccccc#............................#ccc#....", +"...#ccccccc#................bbba.....abbbc#.....", +"....#ccccccc#...............beea....debbed......", +".....#ccccccc#...............ee....bebccee......", +"......#ccccccc#..............ee....eecc#bb......", +".......#ccccccc#............aee...#eec#.........", +"........#ccccccc#...........bed..#beb#..........", +".........#ccccccc#..........beb.#cbeb...........", +"..........#ccccccc#.........beb#ccbeb...........", +"...........#ccccccc#........bebcccbeb...........", +"............#ccccccc#.......eebcc#dea...........", +".............#ccccccc#......eecc#.ee............", +".........ae...#ccccccc#....#eec#..ee............", +"........aeeaeeeebcccccabeeeaee#.beeeeee.........", +".......aeeeea..debcccaed##ceee....ee............", +"......addee.....eeccaedccccbed...beb............", +"......a.bee.....ee#cbeaccccbeb...beb............", +"........beb.....ee.#eecccccbeb...beb............", +"........beb.....ee..eecccccbeb...beb............", +"........beb.....ee..eeccccceeb...dea............", +"........deb....aeb.#eeccccceec#..ee.............", +"........eea....dea#cee##ccceecc#.ee.............", +"........eee...dea#ccbeda#cdeeccc#ee.............", +"........eeaeeeba#ccc#beeeeaeeecceeee............", +"........ee.....#ccc#......#ccccccc#.............", +".......bee....#ccc#........#ccccccc#............", +".......beb...#ccc#..........#ccccccc#...........", +".......beb..#ccc#............#ccccccc#..........", +".......beb.#ccc#..............#ccccccc#.........", +".......deb#ccc#................#ccccccc#........", +".......eeaccc#..................#ccccccc#.......", +".......eeccc#....................#ccccccc#......", +".......eecc#......................#ccccccc#.....", +"......beeb#........................#ccccccc#....", +".....#bbbb..........................#ccccccc#...", +"....#ccc#............................#ccccccc#..", +"...#ccc#..............................#ccccccc#.", +"..#ccc#................................#ccccccc.", +"................................................", +"................................................", +"................................................", +"................................................" +};