summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-01-02 21:15:46 +0000
committer Eric Hameleers <alien@slackware.com>2020-01-03 08:59:49 +0100
commite4325044a8839cd09f34e5fd73e7f0ce01fcd986 (patch)
tree7316a18584df9dad63e58ed83a38ca0c4c6bbb86
parent28ca6fabe4f11e839f66810fb111ae094e9aa79c (diff)
downloadcurrent-e4325044a8839cd09f34e5fd73e7f0ce01fcd986.tar.gz
current-e4325044a8839cd09f34e5fd73e7f0ce01fcd986.tar.xz
Thu Jan 2 21:15:46 UTC 202020200102211546
a/dialog-1.3_20191210-x86_64-1.txz: Upgraded. a/shadow-4.8-x86_64-2.txz: Rebuilt. Don't ship /etc/environment.new since sudo is no longer complaining about it. ap/lxc-2.0.11_fad08f383-x86_64-4.txz: Rebuilt. Make sure all initial devices are properly created. Fix accidental handling of rc.lxc as a modified-for-lxc init script. Thanks to crts. d/python-setuptools-44.0.0-x86_64-1.txz: Upgraded. l/libedit-20191231_3.1-x86_64-1.txz: Upgraded. l/python-pillow-7.0.0-x86_64-1.txz: Upgraded.
-rw-r--r--ChangeLog.rss24
-rw-r--r--ChangeLog.txt12
-rw-r--r--FILELIST.TXT125
-rwxr-xr-xrecompress.sh3
-rwxr-xr-xsource/a/dialog/dialog.SlackBuild17
-rw-r--r--source/a/dialog/dialog.all.use_height.diff48
-rw-r--r--source/a/dialog/dialog.no.aspect.ratio.autoajust.patch31
-rw-r--r--source/a/shadow/doinst.sh2
-rw-r--r--source/a/shadow/environment6
-rwxr-xr-xsource/a/shadow/shadow.SlackBuild8
-rw-r--r--source/ap/lxc/lxc-slackware.in15
-rwxr-xr-xsource/ap/lxc/lxc.SlackBuild2
-rwxr-xr-xsource/l/python-pillow/python-pillow.SlackBuild11
13 files changed, 206 insertions, 98 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index 606b394d5..077a66d68 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,30 @@
<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>Wed, 1 Jan 2020 20:33:50 GMT</pubDate>
- <lastBuildDate>Thu, 2 Jan 2020 07:59:45 GMT</lastBuildDate>
+ <pubDate>Thu, 2 Jan 2020 21:15:46 GMT</pubDate>
+ <lastBuildDate>Fri, 3 Jan 2020 07:59:44 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.11</generator>
<item>
+ <title>Thu, 2 Jan 2020 21:15:46 GMT</title>
+ <pubDate>Thu, 2 Jan 2020 21:15:46 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20200102211546</link>
+ <guid isPermaLink="false">20200102211546</guid>
+ <description>
+ <![CDATA[<pre>
+a/dialog-1.3_20191210-x86_64-1.txz: Upgraded.
+a/shadow-4.8-x86_64-2.txz: Rebuilt.
+ Don't ship /etc/environment.new since sudo is no longer complaining about it.
+ap/lxc-2.0.11_fad08f383-x86_64-4.txz: Rebuilt.
+ Make sure all initial devices are properly created.
+ Fix accidental handling of rc.lxc as a modified-for-lxc init script.
+ Thanks to crts.
+d/python-setuptools-44.0.0-x86_64-1.txz: Upgraded.
+l/libedit-20191231_3.1-x86_64-1.txz: Upgraded.
+l/python-pillow-7.0.0-x86_64-1.txz: Upgraded.
+ </pre>]]>
+ </description>
+ </item>
+ <item>
<title>Wed, 1 Jan 2020 20:33:50 GMT</title>
<pubDate>Wed, 1 Jan 2020 20:33:50 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20200101203350</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8b548b0cc..b282495a5 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,15 @@
+Thu Jan 2 21:15:46 UTC 2020
+a/dialog-1.3_20191210-x86_64-1.txz: Upgraded.
+a/shadow-4.8-x86_64-2.txz: Rebuilt.
+ Don't ship /etc/environment.new since sudo is no longer complaining about it.
+ap/lxc-2.0.11_fad08f383-x86_64-4.txz: Rebuilt.
+ Make sure all initial devices are properly created.
+ Fix accidental handling of rc.lxc as a modified-for-lxc init script.
+ Thanks to crts.
+d/python-setuptools-44.0.0-x86_64-1.txz: Upgraded.
+l/libedit-20191231_3.1-x86_64-1.txz: Upgraded.
+l/python-pillow-7.0.0-x86_64-1.txz: Upgraded.
++--------------------------+
Wed Jan 1 20:33:50 UTC 2020
Happy 2020 to the Slackware community! :-)
a/aaa_terminfo-6.1_20191228-x86_64-1.txz: Upgraded.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 07bca5f67..db3220252 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Wed Jan 1 20:45:12 UTC 2020
+Thu Jan 2 21:26:03 UTC 2020
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 2020-01-01 20:33 .
+drwxr-xr-x 12 root root 4096 2020-01-02 21:15 .
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
-rw-r--r-- 1 root root 14809 2019-12-16 17:26 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 927753 2019-12-31 23:41 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2019-12-31 23:41 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 927746 2020-01-01 20:45 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2020-01-01 20:45 ./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 770684 2020-01-01 20:33 ./ChangeLog.txt
+-rw-r--r-- 1 root root 771244 2020-01-02 21:15 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2019-12-31 23:00 ./EFI/BOOT
-rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2019-12-31 23:00 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./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 1219888 2019-12-31 23:40 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1219881 2020-01-01 20:45 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 733911 2020-01-01 20:43 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 733911 2020-01-02 21:24 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
-rw-r--r-- 1 root root 3623 2019-12-31 22:26 ./README.initrd
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
@@ -830,13 +830,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 2020-01-01 20:43 ./slackware64
--rw-r--r-- 1 root root 290943 2020-01-01 20:43 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2020-01-01 20:43 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 362414 2020-01-01 20:41 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 3686698 2020-01-01 20:42 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2020-01-02 21:24 ./slackware64
+-rw-r--r-- 1 root root 290943 2020-01-02 21:24 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2020-01-02 21:24 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 362414 2020-01-02 21:22 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 3688526 2020-01-02 21:22 ./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 2020-01-01 20:41 ./slackware64/a
+drwxr-xr-x 2 root root 28672 2020-01-02 21:22 ./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
@@ -888,9 +888,9 @@ drwxr-xr-x 2 root root 28672 2020-01-01 20:41 ./slackware64/a
-rw-r--r-- 1 root root 311 2008-09-25 21:53 ./slackware64/a/devs-2.3.1-noarch-25.txt
-rw-r--r-- 1 root root 98596 2008-09-25 21:53 ./slackware64/a/devs-2.3.1-noarch-25.txz
-rw-r--r-- 1 root root 197 2008-09-25 21:53 ./slackware64/a/devs-2.3.1-noarch-25.txz.asc
--rw-r--r-- 1 root root 511 2018-04-13 13:01 ./slackware64/a/dialog-1.3_20170509-x86_64-2.txt
--rw-r--r-- 1 root root 169240 2018-04-13 13:01 ./slackware64/a/dialog-1.3_20170509-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-13 13:01 ./slackware64/a/dialog-1.3_20170509-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 511 2020-01-02 20:06 ./slackware64/a/dialog-1.3_20191210-x86_64-1.txt
+-rw-r--r-- 1 root root 178144 2020-01-02 20:06 ./slackware64/a/dialog-1.3_20191210-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-01-02 20:06 ./slackware64/a/dialog-1.3_20191210-x86_64-1.txz.asc
-rw-r--r-- 1 root root 336 2018-04-13 13:02 ./slackware64/a/dosfstools-4.1-x86_64-2.txt
-rw-r--r-- 1 root root 77464 2018-04-13 13:02 ./slackware64/a/dosfstools-4.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:02 ./slackware64/a/dosfstools-4.1-x86_64-2.txz.asc
@@ -1105,9 +1105,9 @@ drwxr-xr-x 2 root root 28672 2020-01-01 20:41 ./slackware64/a
-rw-r--r-- 1 root root 406 2018-12-21 16:51 ./slackware64/a/sed-4.7-x86_64-1.txt
-rw-r--r-- 1 root root 246084 2018-12-21 16:51 ./slackware64/a/sed-4.7-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-12-21 16:51 ./slackware64/a/sed-4.7-x86_64-1.txz.asc
--rw-r--r-- 1 root root 512 2019-12-06 20:56 ./slackware64/a/shadow-4.8-x86_64-1.txt
--rw-r--r-- 1 root root 1496700 2019-12-06 20:56 ./slackware64/a/shadow-4.8-x86_64-1.txz
--rw-r--r-- 1 root root 163 2019-12-06 20:56 ./slackware64/a/shadow-4.8-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 512 2020-01-02 20:49 ./slackware64/a/shadow-4.8-x86_64-2.txt
+-rw-r--r-- 1 root root 1496656 2020-01-02 20:49 ./slackware64/a/shadow-4.8-x86_64-2.txz
+-rw-r--r-- 1 root root 163 2020-01-02 20:49 ./slackware64/a/shadow-4.8-x86_64-2.txz.asc
-rw-r--r-- 1 root root 623 2018-04-13 13:12 ./slackware64/a/sharutils-4.15.2-x86_64-2.txt
-rw-r--r-- 1 root root 264912 2018-04-13 13:12 ./slackware64/a/sharutils-4.15.2-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:12 ./slackware64/a/sharutils-4.15.2-x86_64-2.txz.asc
@@ -1184,7 +1184,7 @@ drwxr-xr-x 2 root root 28672 2020-01-01 20:41 ./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 2020-01-01 20:41 ./slackware64/ap
+drwxr-xr-x 2 root root 20480 2020-01-02 21:21 ./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
@@ -1310,9 +1310,9 @@ drwxr-xr-x 2 root root 20480 2020-01-01 20:41 ./slackware64/ap
-rw-r--r-- 1 root root 366 2019-03-26 18:38 ./slackware64/ap/lsscsi-0.30-x86_64-1.txt
-rw-r--r-- 1 root root 50784 2019-03-26 18:38 ./slackware64/ap/lsscsi-0.30-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-03-26 18:38 ./slackware64/ap/lsscsi-0.30-x86_64-1.txz.asc
--rw-r--r-- 1 root root 504 2019-12-30 00:56 ./slackware64/ap/lxc-2.0.11_fad08f383-x86_64-3.txt
--rw-r--r-- 1 root root 642112 2019-12-30 00:56 ./slackware64/ap/lxc-2.0.11_fad08f383-x86_64-3.txz
--rw-r--r-- 1 root root 163 2019-12-30 00:56 ./slackware64/ap/lxc-2.0.11_fad08f383-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 504 2020-01-02 20:21 ./slackware64/ap/lxc-2.0.11_fad08f383-x86_64-4.txt
+-rw-r--r-- 1 root root 641928 2020-01-02 20:21 ./slackware64/ap/lxc-2.0.11_fad08f383-x86_64-4.txz
+-rw-r--r-- 1 root root 163 2020-01-02 20:21 ./slackware64/ap/lxc-2.0.11_fad08f383-x86_64-4.txz.asc
-rw-r--r-- 1 root root 338 2018-04-13 13:23 ./slackware64/ap/madplay-0.15.2b-x86_64-5.txt
-rw-r--r-- 1 root root 60100 2018-04-13 13:23 ./slackware64/ap/madplay-0.15.2b-x86_64-5.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:23 ./slackware64/ap/madplay-0.15.2b-x86_64-5.txz.asc
@@ -1430,7 +1430,7 @@ drwxr-xr-x 2 root root 20480 2020-01-01 20:41 ./slackware64/ap
-rw-r--r-- 1 root root 506 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txt
-rw-r--r-- 1 root root 3008036 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-02-04 20:25 ./slackware64/ap/zsh-5.7.1-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 20480 2020-01-01 20:41 ./slackware64/d
+drwxr-xr-x 2 root root 20480 2020-01-02 21:22 ./slackware64/d
-rw-r--r-- 1 root root 360 2019-12-30 00:49 ./slackware64/d/Cython-0.29.14-x86_64-2.txt
-rw-r--r-- 1 root root 3295652 2019-12-30 00:49 ./slackware64/d/Cython-0.29.14-x86_64-2.txz
-rw-r--r-- 1 root root 163 2019-12-30 00:49 ./slackware64/d/Cython-0.29.14-x86_64-2.txz.asc
@@ -1591,9 +1591,9 @@ drwxr-xr-x 2 root root 20480 2020-01-01 20:41 ./slackware64/d
-rw-r--r-- 1 root root 270 2019-12-30 00:49 ./slackware64/d/python-pip-19.3.1-x86_64-2.txt
-rw-r--r-- 1 root root 2209780 2019-12-30 00:49 ./slackware64/d/python-pip-19.3.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2019-12-30 00:49 ./slackware64/d/python-pip-19.3.1-x86_64-2.txz.asc
--rw-r--r-- 1 root root 562 2020-01-01 19:30 ./slackware64/d/python-setuptools-43.0.0-x86_64-1.txt
--rw-r--r-- 1 root root 687256 2020-01-01 19:30 ./slackware64/d/python-setuptools-43.0.0-x86_64-1.txz
--rw-r--r-- 1 root root 163 2020-01-01 19:30 ./slackware64/d/python-setuptools-43.0.0-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 562 2020-01-02 19:36 ./slackware64/d/python-setuptools-44.0.0-x86_64-1.txt
+-rw-r--r-- 1 root root 687248 2020-01-02 19:36 ./slackware64/d/python-setuptools-44.0.0-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-01-02 19:36 ./slackware64/d/python-setuptools-44.0.0-x86_64-1.txz.asc
-rw-r--r-- 1 root root 663 2019-12-30 00:48 ./slackware64/d/python3-3.8.1-x86_64-1.txt
-rw-r--r-- 1 root root 17264332 2019-12-30 00:48 ./slackware64/d/python3-3.8.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-12-30 00:48 ./slackware64/d/python3-3.8.1-x86_64-1.txz.asc
@@ -2501,7 +2501,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 2020-01-01 20:41 ./slackware64/l
+drwxr-xr-x 2 root root 69632 2020-01-02 21:21 ./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
@@ -2942,9 +2942,9 @@ drwxr-xr-x 2 root root 69632 2020-01-01 20:41 ./slackware64/l
-rw-r--r-- 1 root root 396 2019-10-14 17:28 ./slackware64/l/libdvdread-6.0.2-x86_64-1.txt
-rw-r--r-- 1 root root 74772 2019-10-14 17:28 ./slackware64/l/libdvdread-6.0.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-10-14 17:28 ./slackware64/l/libdvdread-6.0.2-x86_64-1.txz.asc
--rw-r--r-- 1 root root 428 2019-12-12 23:14 ./slackware64/l/libedit-20191211_3.1-x86_64-1.txt
--rw-r--r-- 1 root root 104324 2019-12-12 23:14 ./slackware64/l/libedit-20191211_3.1-x86_64-1.txz
--rw-r--r-- 1 root root 163 2019-12-12 23:14 ./slackware64/l/libedit-20191211_3.1-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 428 2020-01-02 19:14 ./slackware64/l/libedit-20191231_3.1-x86_64-1.txt
+-rw-r--r-- 1 root root 104152 2020-01-02 19:14 ./slackware64/l/libedit-20191231_3.1-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-01-02 19:14 ./slackware64/l/libedit-20191231_3.1-x86_64-1.txz.asc
-rw-r--r-- 1 root root 543 2019-08-02 18:22 ./slackware64/l/libevent-2.1.11-x86_64-1.txt
-rw-r--r-- 1 root root 276000 2019-08-02 18:22 ./slackware64/l/libevent-2.1.11-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-08-02 18:22 ./slackware64/l/libevent-2.1.11-x86_64-1.txz.asc
@@ -3325,9 +3325,9 @@ drwxr-xr-x 2 root root 69632 2020-01-01 20:41 ./slackware64/l
-rw-r--r-- 1 root root 333 2019-12-30 01:07 ./slackware64/l/python-packaging-19.2-x86_64-2.txt
-rw-r--r-- 1 root root 55804 2019-12-30 01:07 ./slackware64/l/python-packaging-19.2-x86_64-2.txz
-rw-r--r-- 1 root root 163 2019-12-30 01:07 ./slackware64/l/python-packaging-19.2-x86_64-2.txz.asc
--rw-r--r-- 1 root root 526 2019-12-30 00:56 ./slackware64/l/python-pillow-6.2.1-x86_64-2.txt
--rw-r--r-- 1 root root 839964 2019-12-30 00:56 ./slackware64/l/python-pillow-6.2.1-x86_64-2.txz
--rw-r--r-- 1 root root 163 2019-12-30 00:56 ./slackware64/l/python-pillow-6.2.1-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 526 2020-01-02 19:49 ./slackware64/l/python-pillow-7.0.0-x86_64-1.txt
+-rw-r--r-- 1 root root 623892 2020-01-02 19:49 ./slackware64/l/python-pillow-7.0.0-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2020-01-02 19:49 ./slackware64/l/python-pillow-7.0.0-x86_64-1.txz.asc
-rw-r--r-- 1 root root 280 2019-12-30 01:07 ./slackware64/l/python-ply-3.11-x86_64-2.txt
-rw-r--r-- 1 root root 103208 2019-12-30 01:07 ./slackware64/l/python-ply-3.11-x86_64-2.txz
-rw-r--r-- 1 root root 163 2019-12-30 01:07 ./slackware64/l/python-ply-3.11-x86_64-2.txz.asc
@@ -5051,13 +5051,13 @@ 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 2020-01-01 20:45 ./source
--rw-r--r-- 1 root root 472671 2020-01-01 20:45 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2020-01-01 20:45 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 666834 2020-01-01 20:44 ./source/FILE_LIST
--rw-r--r-- 1 root root 18238104 2020-01-01 20:44 ./source/MANIFEST.bz2
+drwxr-xr-x 19 root root 4096 2020-01-02 21:26 ./source
+-rw-r--r-- 1 root root 472773 2020-01-02 21:26 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2020-01-02 21:26 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 666954 2020-01-02 21:25 ./source/FILE_LIST
+-rw-r--r-- 1 root root 18250743 2020-01-02 21:25 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
-drwxr-xr-x 110 root root 4096 2019-12-21 19:45 ./source/a
+drwxr-xr-x 110 root root 4096 2020-01-02 20:03 ./source/a
-rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./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
@@ -5207,9 +5207,11 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/devs
-rw-r--r-- 1 root root 10037 1998-09-07 17:52 ./source/a/devs/makedev_2.3.1.orig.tar.gz
-rw-r--r-- 1 root root 262 2004-05-21 02:29 ./source/a/devs/makedev_2.3.1.slack.diff.gz
-rw-r--r-- 1 root root 762 2018-02-27 06:13 ./source/a/devs/slack-desc
-drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/dialog
--rw-r--r-- 1 root root 349472 2017-05-09 23:27 ./source/a/dialog/dialog-1.3-20170509.tar.xz
--rwxr-xr-x 1 root root 5663 2019-09-29 23:48 ./source/a/dialog/dialog.SlackBuild
+drwxr-xr-x 2 root root 4096 2020-01-02 20:01 ./source/a/dialog
+-rw-r--r-- 1 root root 365704 2019-12-11 02:27 ./source/a/dialog/dialog-1.3-20191210.tar.lz
+-rwxr-xr-x 1 root root 6113 2020-01-02 20:05 ./source/a/dialog/dialog.SlackBuild
+-rw-r--r-- 1 root root 412 2019-12-06 19:17 ./source/a/dialog/dialog.all.use_height.diff.gz
+-rw-r--r-- 1 root root 494 2019-12-07 20:40 ./source/a/dialog/dialog.no.aspect.ratio.autoajust.patch.gz
-rw-r--r-- 1 root root 334 2009-04-23 01:28 ./source/a/dialog/dialog.smaller.min.height.diff.gz
-rw-r--r-- 1 root root 965 2018-02-27 06:13 ./source/a/dialog/slack-desc
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/dosfstools
@@ -5638,10 +5640,10 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/mlocate
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/mt-st
-rw-r--r-- 1 root root 31212 2017-05-22 04:12 ./source/a/mt-st/mt-st-1.3.tar.xz
-rwxr-xr-x 1 root root 3373 2019-09-29 23:48 ./source/a/mt-st/mt-st.SlackBuild
--rw-r--r-- 1 root root 980 2018-02-27 06:13 ./source/a/mt-st/slack-desc
-drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/mtx
--rw-r--r-- 1 root root 235214 2009-02-15 18:02 ./source/a/mtx/mtx-1.3.12.tar.gz
--rwxr-xr-x 1 root root 3346 2019-09-29 23:48 ./source/a/mtx/mtx.SlackBuild
+-rw-r--r-- 1 root root 980 2018-02-27 06:13 ./source/a/mt-st/slack-desc
+drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/mtx
+-rw-r--r-- 1 root root 235214 2009-02-15 18:02 ./source/a/mtx/mtx-1.3.12.tar.gz
+-rwxr-xr-x 1 root root 3346 2019-09-29 23:48 ./source/a/mtx/mtx.SlackBuild
-rw-r--r-- 1 root root 851 2018-02-27 06:13 ./source/a/mtx/slack-desc
drwxr-xr-x 2 root root 4096 2019-12-31 22:34 ./source/a/ncompress
-rw-r--r-- 1 root root 36006 2019-12-31 22:33 ./source/a/ncompress/ncompress-4.2.4.6.tar.gz
@@ -5759,15 +5761,14 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/sed
-rw-r--r-- 1 root root 833 2018-12-21 06:04 ./source/a/sed/sed-4.7.tar.xz.sig
-rwxr-xr-x 1 root root 3825 2019-09-29 23:48 ./source/a/sed/sed.SlackBuild
-rw-r--r-- 1 root root 857 2018-02-27 06:13 ./source/a/sed/slack-desc
-drwxr-xr-x 2 root root 4096 2019-12-06 20:54 ./source/a/shadow
+drwxr-xr-x 2 root root 4096 2020-01-02 20:43 ./source/a/shadow
-rw-r--r-- 1 root root 16202 2019-04-02 20:18 ./source/a/shadow/adduser
--rw-r--r-- 1 root root 310 2019-10-18 19:51 ./source/a/shadow/doinst.sh.gz
--rw-r--r-- 1 root root 237 2019-10-18 19:58 ./source/a/shadow/environment.gz
+-rw-r--r-- 1 root root 301 2020-01-02 20:39 ./source/a/shadow/doinst.sh.gz
-rw-r--r-- 1 root root 4769 2019-12-02 00:16 ./source/a/shadow/login.defs.gz
-rw-r--r-- 1 root root 1609060 2019-12-01 17:54 ./source/a/shadow/shadow-4.8.tar.xz
-rw-r--r-- 1 root root 488 2019-12-01 17:54 ./source/a/shadow/shadow-4.8.tar.xz.asc
-rw-r--r-- 1 root root 734 2013-12-14 21:05 ./source/a/shadow/shadow.CVE-2005-4890.relax.diff.gz
--rwxr-xr-x 1 root root 6121 2019-12-02 00:11 ./source/a/shadow/shadow.SlackBuild
+-rwxr-xr-x 1 root root 5974 2020-01-02 20:45 ./source/a/shadow/shadow.SlackBuild
-rw-r--r-- 1 root root 301 2017-11-22 00:17 ./source/a/shadow/shadow.login.display.short.hostname.diff.gz
-rw-r--r-- 1 root root 39 2019-06-17 02:57 ./source/a/shadow/shadow.url
-rw-r--r-- 1 root root 966 2018-11-16 21:06 ./source/a/shadow/slack-desc
@@ -6242,12 +6243,12 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/lsscsi
-rwxr-xr-x 1 root root 4171 2019-09-29 23:48 ./source/ap/lsscsi/lsscsi.SlackBuild
-rw-r--r-- 1 root root 36 2008-11-29 19:46 ./source/ap/lsscsi/lsscsi.url
-rw-r--r-- 1 root root 821 2018-02-27 06:12 ./source/ap/lsscsi/slack-desc
-drwxr-xr-x 3 root root 4096 2019-12-29 19:15 ./source/ap/lxc
+drwxr-xr-x 3 root root 4096 2020-01-02 20:13 ./source/ap/lxc
-rw-r--r-- 1 root root 501 2015-09-01 21:57 ./source/ap/lxc/doinst.sh
-rwxr-xr-x 1 root root 2327 2019-02-12 20:26 ./source/ap/lxc/get-lxc.sh
-rw-r--r-- 1 root root 581588 2019-07-19 17:20 ./source/ap/lxc/lxc-2.0.11_fad08f383.tar.xz
--rw-r--r-- 1 root root 11289 2019-11-24 22:07 ./source/ap/lxc/lxc-slackware.in
--rwxr-xr-x 1 root root 6528 2019-12-29 19:15 ./source/ap/lxc/lxc.SlackBuild
+-rw-r--r-- 1 root root 11607 2020-01-02 20:20 ./source/ap/lxc/lxc-slackware.in
+-rwxr-xr-x 1 root root 6528 2020-01-02 20:20 ./source/ap/lxc/lxc.SlackBuild
-rw-r--r-- 1 root root 1340 2017-06-21 17:56 ./source/ap/lxc/rc.lxc
drwxr-xr-x 2 root root 4096 2017-11-27 18:45 ./source/ap/lxc/scripts
-rw-r--r-- 1 root root 512 2016-03-08 00:10 ./source/ap/lxc/scripts/README
@@ -6830,10 +6831,10 @@ drwxr-xr-x 2 root root 4096 2019-12-29 19:15 ./source/d/python-pip
-rw-r--r-- 1 root root 33 2018-03-29 06:10 ./source/d/python-pip/pip.url
-rwxr-xr-x 1 root root 3066 2019-12-29 19:15 ./source/d/python-pip/python-pip.SlackBuild
-rw-r--r-- 1 root root 760 2018-02-27 06:13 ./source/d/python-pip/slack-desc
-drwxr-xr-x 2 root root 4096 2020-01-01 19:30 ./source/d/python-setuptools
+drwxr-xr-x 2 root root 4096 2020-01-02 19:36 ./source/d/python-setuptools
-rwxr-xr-x 1 root root 3414 2020-01-01 19:30 ./source/d/python-setuptools/python-setuptools.SlackBuild
-rw-r--r-- 1 root root 40 2017-11-28 22:11 ./source/d/python-setuptools/python-setuptools.url
--rw-r--r-- 1 root root 459980 2019-12-31 18:24 ./source/d/python-setuptools/setuptools-43.0.0.tar.lz
+-rw-r--r-- 1 root root 460026 2020-01-01 23:41 ./source/d/python-setuptools/setuptools-44.0.0.tar.lz
-rw-r--r-- 1 root root 1059 2018-02-27 06:13 ./source/d/python-setuptools/slack-desc
-rw-r--r-- 1 root root 12855568 2019-10-19 19:00 ./source/d/python/Python-2.7.17.tar.xz
-rw-r--r-- 1 root root 833 2019-10-19 19:00 ./source/d/python/Python-2.7.17.tar.xz.asc
@@ -8952,8 +8953,8 @@ drwxr-xr-x 2 root root 4096 2019-10-14 17:27 ./source/l/libdvdread
-rwxr-xr-x 1 root root 3662 2019-09-29 23:48 ./source/l/libdvdread/libdvdread.SlackBuild
-rw-r--r-- 1 root root 54 2018-01-31 22:14 ./source/l/libdvdread/libdvdread.url
-rw-r--r-- 1 root root 853 2018-02-27 06:12 ./source/l/libdvdread/slack-desc
-drwxr-xr-x 2 root root 4096 2019-12-12 23:13 ./source/l/libedit
--rw-r--r-- 1 root root 350691 2019-12-11 20:11 ./source/l/libedit/libedit-20191211-3.1.tar.lz
+drwxr-xr-x 2 root root 4096 2020-01-02 19:13 ./source/l/libedit
+-rw-r--r-- 1 root root 350863 2019-12-31 11:00 ./source/l/libedit/libedit-20191231-3.1.tar.lz
-rwxr-xr-x 1 root root 4004 2019-09-29 23:48 ./source/l/libedit/libedit.SlackBuild
-rw-r--r-- 1 root root 915 2018-02-27 06:12 ./source/l/libedit/slack-desc
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/libevent
@@ -9626,9 +9627,9 @@ drwxr-xr-x 2 root root 4096 2019-12-29 19:15 ./source/l/python-packaging
-rw-r--r-- 1 root root 47794 2019-09-18 22:26 ./source/l/python-packaging/packaging-19.2.tar.lz
-rwxr-xr-x 1 root root 2950 2019-12-29 19:15 ./source/l/python-packaging/python-packaging.SlackBuild
-rw-r--r-- 1 root root 829 2018-08-27 18:22 ./source/l/python-packaging/slack-desc
-drwxr-xr-x 2 root root 4096 2019-12-29 19:15 ./source/l/python-pillow
--rw-r--r-- 1 root root 466344 2019-10-21 06:05 ./source/l/python-pillow/Pillow-6.2.1.tar.lz
--rwxr-xr-x 1 root root 3589 2019-12-29 19:15 ./source/l/python-pillow/python-pillow.SlackBuild
+drwxr-xr-x 2 root root 4096 2020-01-02 19:47 ./source/l/python-pillow
+-rw-r--r-- 1 root root 472665 2020-01-02 05:19 ./source/l/python-pillow/Pillow-7.0.0.tar.lz
+-rwxr-xr-x 1 root root 3337 2020-01-02 19:48 ./source/l/python-pillow/python-pillow.SlackBuild
-rw-r--r-- 1 root root 987 2019-10-02 22:29 ./source/l/python-pillow/slack-desc
drwxr-xr-x 2 root root 4096 2019-12-29 21:06 ./source/l/python-ply
-rw-r--r-- 1 root root 121069 2018-02-15 19:01 ./source/l/python-ply/ply-3.11.tar.lz
@@ -12403,7 +12404,7 @@ drwxr-xr-x 2 root root 4096 2019-11-18 18:52 ./source/x/xterm
-rw-r--r-- 1 root root 391 2019-01-01 20:06 ./source/x/xterm/doinst.sh.gz
-rw-r--r-- 1 root root 2694 2019-11-02 18:44 ./source/x/xterm/linux-console-xterm.ad
-rw-r--r-- 1 root root 761 2018-02-27 06:13 ./source/x/xterm/slack-desc
--rw-r--r-- 1 root root 971566 2019-11-18 01:50 ./source/x/xterm/xterm-351.tar.lz
+-rw-r--r-- 1 root root 971566 2019-11-18 01:50 ./source/x/xterm/xterm-351.tar.lz
-rwxr-xr-x 1 root root 4903 2019-11-04 20:43 ./source/x/xterm/xterm.SlackBuild
-rw-r--r-- 1 root root 38 2018-08-13 18:38 ./source/x/xterm/xterm.url
drwxr-xr-x 47 root root 4096 2019-12-13 00:33 ./source/xap
diff --git a/recompress.sh b/recompress.sh
index c20cdcb67..db515b699 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -117,7 +117,9 @@ gzip ./source/a/rpm2tgz/patches/0001-fix-d-handling.patch
gzip ./source/a/rpm2tgz/patches/0009-Add-c-option-just-as-makepkg-c-y.patch
gzip ./source/a/udisks/udisks.no.pci-db.diff
gzip ./source/a/udisks/udisks.glibc228.diff
+gzip ./source/a/dialog/dialog.all.use_height.diff
gzip ./source/a/dialog/dialog.smaller.min.height.diff
+gzip ./source/a/dialog/dialog.no.aspect.ratio.autoajust.patch
gzip ./source/a/haveged/doinst.sh
gzip ./source/a/grub/initrd_naming.patch
gzip ./source/a/grub/0198-align-struct-efi_variable-better.patch
@@ -198,7 +200,6 @@ gzip ./source/a/shadow/shadow.login.display.short.hostname.diff
gzip ./source/a/shadow/login.defs
gzip ./source/a/shadow/shadow.CVE-2005-4890.relax.diff
gzip ./source/a/shadow/doinst.sh
-gzip ./source/a/shadow/environment
gzip ./source/a/pciutils/pciutils.dontcompress.diff
gzip ./source/a/util-linux/setserial-undef_TIOCGHAYESESP.diff
gzip ./source/a/util-linux/setserial-rc.serial.diff
diff --git a/source/a/dialog/dialog.SlackBuild b/source/a/dialog/dialog.SlackBuild
index e7e94a382..261e73010 100755
--- a/source/a/dialog/dialog.SlackBuild
+++ b/source/a/dialog/dialog.SlackBuild
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -35,10 +35,13 @@ PKGNAM=dialog
# that uses dialog and found to work, and you've already gotten any needed
# patches accepted upstream... well... I like this version. If it's got bugs,
# they aren't bugs that I'm running into often.
-#VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)}
-VERSION=1.3-20170509
+#
+# Update: dialog-1.3-20191210 actually passes the formatting tests here (with a
+# couple of patches), so we will take our first dialog upgrade in quite a while.
+#VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1,2 -d - | rev)}
+VERSION=1.3-20191210
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -85,10 +88,14 @@ fi
cd $TMP
rm -rf ${PKGNAM}-${VERSION}
-tar xvf $CWD/${PKGNAM}-$VERSION.tar.xz || exit 1
+tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z || exit 1
cd ${PKGNAM}-$VERSION || exit 1
+# These patches take care of the formatting issues that were preventing
+# us from moving to a more recent version of dialog:
+zcat $CWD/dialog.all.use_height.diff.gz | patch -p1 --verbose || exit 1
zcat $CWD/dialog.smaller.min.height.diff.gz | patch -p1 --verbose || exit 1
+zcat $CWD/dialog.no.aspect.ratio.autoajust.patch.gz | patch -p1 --verbose || exit 1
# Make sure ownerships and permissions are sane:
chown -R root:root .
diff --git a/source/a/dialog/dialog.all.use_height.diff b/source/a/dialog/dialog.all.use_height.diff
new file mode 100644
index 000000000..9eb1952c7
--- /dev/null
+++ b/source/a/dialog/dialog.all.use_height.diff
@@ -0,0 +1,48 @@
+--- ./menubox.c.orig 2019-11-10 19:41:15.000000000 -0600
++++ ./menubox.c 2019-12-06 13:16:39.400865476 -0600
+@@ -433,7 +433,8 @@
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+- all.menu_height = height - MIN_HIGH - cur_y;
++ if (all.menu_height + MIN_HIGH > height - cur_y)
++ all.menu_height = height - MIN_HIGH - cur_y;
+ if (all.menu_height <= 0)
+ all.menu_height = 1;
+
+--- ./buildlist.c.orig 2019-11-10 19:41:43.000000000 -0600
++++ ./buildlist.c 2019-12-06 13:16:39.402865476 -0600
+@@ -653,7 +653,8 @@
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+- all.use_height = height - MIN_HIGH - cur_y;
++ if (all.use_height + MIN_HIGH > height - cur_y)
++ all.use_height = height - MIN_HIGH - cur_y;
+ if (all.use_height <= 0)
+ all.use_height = 1;
+
+--- ./checklist.c.orig 2019-11-10 19:26:35.000000000 -0600
++++ ./checklist.c 2019-12-06 13:16:39.404865476 -0600
+@@ -304,7 +304,8 @@
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+- all.use_height = height - MIN_HIGH - cur_y;
++ if (all.use_height + MIN_HIGH > height - cur_y)
++ all.use_height = height - MIN_HIGH - cur_y;
+ if (all.use_height <= 0)
+ all.use_height = 1;
+
+--- ./treeview.c.orig 2019-11-10 19:38:22.000000000 -0600
++++ ./treeview.c 2019-12-06 13:17:35.604866677 -0600
+@@ -291,7 +291,8 @@
+ * After displaying the prompt, we know how much space we really have.
+ * Limit the list to avoid overwriting the ok-button.
+ */
+- use_height = height - MIN_HIGH - cur_y;
++ if (use_height + MIN_HIGH > height - cur_y)
++ use_height = height - MIN_HIGH - cur_y;
+ if (use_height <= 0)
+ use_height = 1;
+
diff --git a/source/a/dialog/dialog.no.aspect.ratio.autoajust.patch b/source/a/dialog/dialog.no.aspect.ratio.autoajust.patch
new file mode 100644
index 000000000..7bce97b80
--- /dev/null
+++ b/source/a/dialog/dialog.no.aspect.ratio.autoajust.patch
@@ -0,0 +1,31 @@
+--- ./util.c.orig 2019-11-10 17:20:58.000000000 -0600
++++ ./util.c 2019-12-07 14:40:23.404722986 -0600
+@@ -1237,28 +1237,6 @@
+ justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide);
+ car = (float) (wide / high);
+
+- /*
+- * If the aspect ratio is greater than it should be, then decrease the
+- * width proportionately.
+- */
+- if (car > ar) {
+- float diff = car / (float) ar;
+- max_x = (int) ((float) wide / diff + 4);
+- justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide);
+- car = (float) wide / (float) high;
+- }
+-
+- /*
+- * If the aspect ratio is too small after decreasing the width, then
+- * incrementally increase the width until the aspect ratio is equal to or
+- * greater than the specified aspect ratio.
+- */
+- while (car < ar && max_x < max_width) {
+- max_x += 4;
+- justify_text((WINDOW *) 0, prompt, max_y, max_x, &high, &wide);
+- car = (float) (wide / high);
+- }
+-
+ *height = high;
+ *width = wide;
+ }
diff --git a/source/a/shadow/doinst.sh b/source/a/shadow/doinst.sh
index b5fcee426..a7bf2ee4a 100644
--- a/source/a/shadow/doinst.sh
+++ b/source/a/shadow/doinst.sh
@@ -11,9 +11,7 @@ config() {
}
config etc/default/useradd.new
-config etc/environment.new
config etc/login.access.new
config etc/login.defs.new
config var/log/faillog.new
rm -f var/log/faillog.new
-
diff --git a/source/a/shadow/environment b/source/a/shadow/environment
deleted file mode 100644
index 9e96a54ce..000000000
--- a/source/a/shadow/environment
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/environment
-# This file may contain environment variable settings that should be used
-# system-wide. Please note that it is not a script file and should only
-# contain assignment expressions, one per line.
-# The environment variables in this file will be loaded before those in other
-# files such as: /etc/profile, /etc/profile.d/*, ~/.profile, etc.
diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild
index fd184bb94..d3fd6d14b 100755
--- a/source/a/shadow/shadow.SlackBuild
+++ b/source/a/shadow/shadow.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=shadow
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -137,10 +137,6 @@ find $PKG -name groups.1 -exec rm {} \+
rm -f $PKG/etc/login.defs
zcat $CWD/login.defs.gz > $PKG/etc/login.defs.new
-# Install /etc/environment (referenced in login.defs and used by sudo and
-# other utilities):
-zcat $CWD/environment.gz > $PKG/etc/environment.new
-
mv $PKG/etc/login.access $PKG/etc/login.access.new
# I don't think this works well enough to recommend it.
diff --git a/source/ap/lxc/lxc-slackware.in b/source/ap/lxc/lxc-slackware.in
index c49366ac6..c362e95d8 100644
--- a/source/ap/lxc/lxc-slackware.in
+++ b/source/ap/lxc/lxc-slackware.in
@@ -90,8 +90,15 @@ cp $rootfs/etc/HOSTNAME $rootfs/etc/hostname
# http://www.vislab.uq.edu.au/howto/lxc/MAKEDEV.sh
DEV=$rootfs/dev
mkdir -p ${DEV}
-# Make sure ${DEV}/null isn't accidentally a file by deleting it first:
-rm -f ${DEV}/null
+# Remove any existing "devices" first, as these might be files
+# created by package install scripts:
+for clear_device in ${DEV}/null ${DEV}/zero ${DEV}/random ${DEV}/urandom \
+ ${DEV}/tty ${DEV}/console ${DEV}/tty0 ${DEV}/tty1 ${DEV}/tty2 ${DEV}/tty3 \
+ ${DEV}/tty4 ${DEV}/tty5 ${DEV}/full ${DEV}/initctl ${DEV}/loop0 \
+ ${DEV}/loop1 ; do
+ rm -f $clear_device
+done
+# Create initial set of devices:
mknod -m 666 ${DEV}/null c 1 3
mknod -m 666 ${DEV}/zero c 1 5
mknod -m 666 ${DEV}/random c 1 8
@@ -126,8 +133,8 @@ EOF
# Back up the existing init scripts and install the lxc versions:
( cd $rootfs/etc/rc.d
cp -a /usr/share/lxc/scripts/slackware/* .
- chmod 755 *.lxc
- for file in *.lxc ; do
+ chmod 755 rc.*.lxc
+ for file in rc.*.lxc ; do
cp -a $(basename $file .lxc) $(basename $file .lxc).orig
cp -a $file $(basename $file .lxc)
done
diff --git a/source/ap/lxc/lxc.SlackBuild b/source/ap/lxc/lxc.SlackBuild
index c6fb1c278..d44f5a883 100755
--- a/source/ap/lxc/lxc.SlackBuild
+++ b/source/ap/lxc/lxc.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=lxc
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/python-pillow/python-pillow.SlackBuild b/source/l/python-pillow/python-pillow.SlackBuild
index 6817cfd5c..84127f415 100755
--- a/source/l/python-pillow/python-pillow.SlackBuild
+++ b/source/l/python-pillow/python-pillow.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2009, 2010, 2013, 2014, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2013, 2014, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
# Copyright 2014 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=python-pillow
VERSION=${VERSION:-$(echo Pillow-*.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
@@ -59,7 +59,6 @@ elif [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
fi
-PYTHONINC=$( python -c 'from distutils.sysconfig import get_python_inc; print(get_python_inc())' )
PYTHON3INC=$( python3 -c 'from distutils.sysconfig import get_python_inc; print(get_python_inc())' )
TMP=${TMP:-/tmp}
@@ -79,12 +78,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-python setup.py install --root=$PKG || exit 1
-
-# install headers
-mkdir -p ${PKG}$PYTHONINC/Imaging
-install -m 644 src/libImaging/*.h ${PKG}$PYTHONINC/Imaging
-
python3 setup.py install --root=$PKG || exit 1
# install headers