diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2019-10-04 21:35:49 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2019-10-05 08:59:49 +0200 |
commit | daaabd8ee20406533b88fb272e342409ba51190d (patch) | |
tree | ba129884da64efd41c3f8b9dca07ab52a316f0cf | |
parent | 4599171894453ce9b77106663288c843113f87e0 (diff) | |
download | current-daaabd8ee20406533b88fb272e342409ba51190d.tar.gz current-daaabd8ee20406533b88fb272e342409ba51190d.tar.xz |
Fri Oct 4 21:35:49 UTC 201920191004213549
a/pkgtools-15.0-noarch-24.txz: Rebuilt.
installpkg: support --no-overwrite option for upgradepkg's second install
pass. Don't use this option directly unless you have a good reason.
upgradepkg: call installpkg with --no-overwrite for the second install pass.
This cuts the drive writes for a package upgrade almost in half so we can
be kinder to SSDs.
ap/nano-4.5-x86_64-1.txz: Upgraded.
l/gmime-3.2.4-x86_64-1.txz: Upgraded.
l/gnu-efi-3.0.10-x86_64-1.txz: Upgraded.
l/gtk+3-3.24.12-x86_64-1.txz: Upgraded.
testing/packages/rust-1.38.0-x86_64-2.txz: Rebuilt.
The package size here has been put on a tremendous diet.
Thanks to Andrew Clemons and Willy Sudiarto Raharjo for help with this.
Compile test results:
firefox-68.1.0esr: fail
firefox-69.0.2: pass
seamonkey-2.49.5: pass
thunderbird-68.1.1: fail
-rw-r--r-- | ChangeLog.rss | 32 | ||||
-rw-r--r-- | ChangeLog.txt | 20 | ||||
-rw-r--r-- | FILELIST.TXT | 132 | ||||
-rwxr-xr-x | recompress.sh | 2 | ||||
-rwxr-xr-x | source/a/lilo/lilo.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/pkgtools/manpages/installpkg.8 | 9 | ||||
-rwxr-xr-x | source/a/pkgtools/pkgtools.SlackBuild | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/installpkg | 20 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/upgradepkg | 4 | ||||
-rw-r--r-- | source/l/gnu-efi/gnu-efi.url | 2 | ||||
-rw-r--r-- | testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch | 74 | ||||
-rw-r--r-- | testing/source/rust/link_libffi.diff | 12 | ||||
-rwxr-xr-x | testing/source/rust/rust.SlackBuild | 303 | ||||
-rw-r--r-- | testing/source/rust/rust.url | 23 | ||||
-rw-r--r-- | testing/source/rust/slack-desc | 19 |
15 files changed, 584 insertions, 72 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index 58bcb3864..88cbc888d 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,38 @@ <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>Thu, 3 Oct 2019 19:58:15 GMT</pubDate> - <lastBuildDate>Fri, 4 Oct 2019 06:59:45 GMT</lastBuildDate> + <pubDate>Fri, 4 Oct 2019 21:35:49 GMT</pubDate> + <lastBuildDate>Sat, 5 Oct 2019 06:59:44 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.11</generator> <item> + <title>Fri, 4 Oct 2019 21:35:49 GMT</title> + <pubDate>Fri, 4 Oct 2019 21:35:49 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20191004213549</link> + <guid isPermaLink="false">20191004213549</guid> + <description> + <![CDATA[<pre> +a/pkgtools-15.0-noarch-24.txz: Rebuilt. + installpkg: support --no-overwrite option for upgradepkg's second install + pass. Don't use this option directly unless you have a good reason. + upgradepkg: call installpkg with --no-overwrite for the second install pass. + This cuts the drive writes for a package upgrade almost in half so we can + be kinder to SSDs. +ap/nano-4.5-x86_64-1.txz: Upgraded. +l/gmime-3.2.4-x86_64-1.txz: Upgraded. +l/gnu-efi-3.0.10-x86_64-1.txz: Upgraded. +l/gtk+3-3.24.12-x86_64-1.txz: Upgraded. +testing/packages/rust-1.38.0-x86_64-2.txz: Rebuilt. + The package size here has been put on a tremendous diet. + Thanks to Andrew Clemons and Willy Sudiarto Raharjo for help with this. + Compile test results: + firefox-68.1.0esr: fail + firefox-69.0.2: pass + seamonkey-2.49.5: pass + thunderbird-68.1.1: fail + </pre>]]> + </description> + </item> + <item> <title>Thu, 3 Oct 2019 19:58:15 GMT</title> <pubDate>Thu, 3 Oct 2019 19:58:15 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20191003195815</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index e89e0d574..d3a94cd1c 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,23 @@ +Fri Oct 4 21:35:49 UTC 2019 +a/pkgtools-15.0-noarch-24.txz: Rebuilt. + installpkg: support --no-overwrite option for upgradepkg's second install + pass. Don't use this option directly unless you have a good reason. + upgradepkg: call installpkg with --no-overwrite for the second install pass. + This cuts the drive writes for a package upgrade almost in half so we can + be kinder to SSDs. +ap/nano-4.5-x86_64-1.txz: Upgraded. +l/gmime-3.2.4-x86_64-1.txz: Upgraded. +l/gnu-efi-3.0.10-x86_64-1.txz: Upgraded. +l/gtk+3-3.24.12-x86_64-1.txz: Upgraded. +testing/packages/rust-1.38.0-x86_64-2.txz: Rebuilt. + The package size here has been put on a tremendous diet. + Thanks to Andrew Clemons and Willy Sudiarto Raharjo for help with this. + Compile test results: + firefox-68.1.0esr: fail + firefox-69.0.2: pass + seamonkey-2.49.5: pass + thunderbird-68.1.1: fail ++--------------------------+ Thu Oct 3 19:58:15 UTC 2019 a/hwdata-0.328-noarch-1.txz: Upgraded. ap/powertop-2.11-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index e386471bc..1da365903 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Thu Oct 3 20:09:46 UTC 2019 +Fri Oct 4 21:47:27 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-10-03 19:58 . +drwxr-xr-x 12 root root 4096 2019-10-04 21:35 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 14375 2019-08-09 05:36 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 924589 2019-10-02 19:53 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-10-02 19:53 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 924609 2019-10-03 20:10 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-10-03 20:10 ./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 706351 2019-10-03 19:58 ./ChangeLog.txt +-rw-r--r-- 1 root root 707242 2019-10-04 21:35 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2019-10-02 06:46 ./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-10-02 06:46 ./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 1215782 2019-10-02 19:53 ./FILELIST.TXT +-rw-r--r-- 1 root root 1215819 2019-10-03 20:09 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 733598 2019-10-03 20:07 ./PACKAGES.TXT +-rw-r--r-- 1 root root 733599 2019-10-04 21:45 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3635 2019-10-02 04:06 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -786,13 +786,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-10-03 20:07 ./slackware64 --rw-r--r-- 1 root root 291121 2019-10-03 20:07 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-10-03 20:07 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 362637 2019-10-03 20:05 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3642084 2019-10-03 20:06 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2019-10-04 21:45 ./slackware64 +-rw-r--r-- 1 root root 291124 2019-10-04 21:45 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-10-04 21:45 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 362640 2019-10-04 21:42 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3641898 2019-10-04 21:43 ./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-10-03 20:05 ./slackware64/a +drwxr-xr-x 2 root root 28672 2019-10-04 21:42 ./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 @@ -1040,9 +1040,9 @@ drwxr-xr-x 2 root root 28672 2019-10-03 20:05 ./slackware64/a -rw-r--r-- 1 root root 450 2018-04-13 13:10 ./slackware64/a/pcmciautils-018-x86_64-2.txt -rw-r--r-- 1 root root 32548 2018-04-13 13:10 ./slackware64/a/pcmciautils-018-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:10 ./slackware64/a/pcmciautils-018-x86_64-2.txz.asc --rw-r--r-- 1 root root 672 2018-09-06 22:16 ./slackware64/a/pkgtools-15.0-noarch-23.txt --rw-r--r-- 1 root root 195380 2018-09-06 22:16 ./slackware64/a/pkgtools-15.0-noarch-23.txz --rw-r--r-- 1 root root 163 2018-09-06 22:16 ./slackware64/a/pkgtools-15.0-noarch-23.txz.asc +-rw-r--r-- 1 root root 672 2019-10-04 19:13 ./slackware64/a/pkgtools-15.0-noarch-24.txt +-rw-r--r-- 1 root root 195748 2019-10-04 19:13 ./slackware64/a/pkgtools-15.0-noarch-24.txz +-rw-r--r-- 1 root root 163 2019-10-04 19:13 ./slackware64/a/pkgtools-15.0-noarch-24.txz.asc -rw-r--r-- 1 root root 523 2019-01-07 20:48 ./slackware64/a/plzip-1.8-x86_64-1.txt -rw-r--r-- 1 root root 55804 2019-01-07 20:48 ./slackware64/a/plzip-1.8-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-01-07 20:48 ./slackware64/a/plzip-1.8-x86_64-1.txz.asc @@ -1143,7 +1143,7 @@ drwxr-xr-x 2 root root 28672 2019-10-03 20:05 ./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-10-03 20:05 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2019-10-04 21:42 ./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 @@ -1298,9 +1298,9 @@ drwxr-xr-x 2 root root 20480 2019-10-03 20:05 ./slackware64/ap -rw-r--r-- 1 root root 331 2019-08-26 18:17 ./slackware64/ap/mpg123-1.25.12-x86_64-1.txt -rw-r--r-- 1 root root 321832 2019-08-26 18:17 ./slackware64/ap/mpg123-1.25.12-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-08-26 18:17 ./slackware64/ap/mpg123-1.25.12-x86_64-1.txz.asc --rw-r--r-- 1 root root 430 2019-08-25 22:24 ./slackware64/ap/nano-4.4-x86_64-1.txt --rw-r--r-- 1 root root 559836 2019-08-25 22:24 ./slackware64/ap/nano-4.4-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-08-25 22:24 ./slackware64/ap/nano-4.4-x86_64-1.txz.asc +-rw-r--r-- 1 root root 430 2019-10-04 19:18 ./slackware64/ap/nano-4.5-x86_64-1.txt +-rw-r--r-- 1 root root 562536 2019-10-04 19:18 ./slackware64/ap/nano-4.5-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-10-04 19:18 ./slackware64/ap/nano-4.5-x86_64-1.txz.asc -rw-r--r-- 1 root root 512 2018-04-13 13:28 ./slackware64/ap/normalize-0.7.7-x86_64-3.txt -rw-r--r-- 1 root root 63188 2018-04-13 13:28 ./slackware64/ap/normalize-0.7.7-x86_64-3.txz -rw-r--r-- 1 root root 163 2018-04-13 13:28 ./slackware64/ap/normalize-0.7.7-x86_64-3.txz.asc @@ -2457,7 +2457,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-10-03 20:05 ./slackware64/l +drwxr-xr-x 2 root root 69632 2019-10-04 21:42 ./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 @@ -2695,9 +2695,9 @@ drwxr-xr-x 2 root root 69632 2019-10-03 20:05 ./slackware64/l -rw-r--r-- 1 root root 358 2019-09-20 17:19 ./slackware64/l/glibmm-2.62.0-x86_64-1.txt -rw-r--r-- 1 root root 1196820 2019-09-20 17:19 ./slackware64/l/glibmm-2.62.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-09-20 17:19 ./slackware64/l/glibmm-2.62.0-x86_64-1.txz.asc --rw-r--r-- 1 root root 297 2019-07-25 22:16 ./slackware64/l/gmime-3.2.3-x86_64-1.txt --rw-r--r-- 1 root root 382528 2019-07-25 22:16 ./slackware64/l/gmime-3.2.3-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-07-25 22:16 ./slackware64/l/gmime-3.2.3-x86_64-1.txz.asc +-rw-r--r-- 1 root root 297 2019-10-04 17:32 ./slackware64/l/gmime-3.2.4-x86_64-1.txt +-rw-r--r-- 1 root root 386956 2019-10-04 17:32 ./slackware64/l/gmime-3.2.4-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-10-04 17:32 ./slackware64/l/gmime-3.2.4-x86_64-1.txz.asc -rw-r--r-- 1 root root 576 2019-06-17 02:44 ./slackware64/l/gmm-5.3-noarch-1.txt -rw-r--r-- 1 root root 117712 2019-06-17 02:44 ./slackware64/l/gmm-5.3-noarch-1.txz -rw-r--r-- 1 root root 163 2019-06-17 02:44 ./slackware64/l/gmm-5.3-noarch-1.txz.asc @@ -2710,9 +2710,9 @@ drwxr-xr-x 2 root root 69632 2019-10-03 20:05 ./slackware64/l -rw-r--r-- 1 root root 323 2019-09-19 20:22 ./slackware64/l/gnome-themes-extra-3.28-x86_64-1.txt -rw-r--r-- 1 root root 2388528 2019-09-19 20:22 ./slackware64/l/gnome-themes-extra-3.28-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-09-19 20:22 ./slackware64/l/gnome-themes-extra-3.28-x86_64-1.txz.asc --rw-r--r-- 1 root root 280 2018-11-07 23:36 ./slackware64/l/gnu-efi-3.0.9-x86_64-1.txt --rw-r--r-- 1 root root 113544 2018-11-07 23:36 ./slackware64/l/gnu-efi-3.0.9-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-11-07 23:36 ./slackware64/l/gnu-efi-3.0.9-x86_64-1.txz.asc +-rw-r--r-- 1 root root 280 2019-10-04 17:32 ./slackware64/l/gnu-efi-3.0.10-x86_64-1.txt +-rw-r--r-- 1 root root 113888 2019-10-04 17:32 ./slackware64/l/gnu-efi-3.0.10-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-10-04 17:32 ./slackware64/l/gnu-efi-3.0.10-x86_64-1.txz.asc -rw-r--r-- 1 root root 634 2019-09-19 20:18 ./slackware64/l/gobject-introspection-1.62.0-x86_64-1.txt -rw-r--r-- 1 root root 1254092 2019-09-19 20:18 ./slackware64/l/gobject-introspection-1.62.0-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-09-19 20:18 ./slackware64/l/gobject-introspection-1.62.0-x86_64-1.txz.asc @@ -2755,9 +2755,9 @@ drwxr-xr-x 2 root root 69632 2019-10-03 20:05 ./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 2019-09-04 18:32 ./slackware64/l/gtk+3-3.24.11-x86_64-1.txt --rw-r--r-- 1 root root 10664352 2019-09-04 18:32 ./slackware64/l/gtk+3-3.24.11-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-09-04 18:32 ./slackware64/l/gtk+3-3.24.11-x86_64-1.txz.asc +-rw-r--r-- 1 root root 325 2019-10-04 19:29 ./slackware64/l/gtk+3-3.24.12-x86_64-1.txt +-rw-r--r-- 1 root root 10698700 2019-10-04 19:29 ./slackware64/l/gtk+3-3.24.12-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-10-04 19:29 ./slackware64/l/gtk+3-3.24.12-x86_64-1.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 @@ -5010,13 +5010,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 2019-10-03 20:09 ./source --rw-r--r-- 1 root root 471805 2019-10-03 20:09 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-10-03 20:09 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 665883 2019-10-03 20:08 ./source/FILE_LIST --rw-r--r-- 1 root root 17793495 2019-10-03 20:08 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2019-10-04 21:47 ./source +-rw-r--r-- 1 root root 471806 2019-10-04 21:47 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-10-04 21:47 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 665884 2019-10-04 21:46 ./source/FILE_LIST +-rw-r--r-- 1 root root 17794421 2019-10-04 21:46 ./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-09-23 22:02 ./source/a +drwxr-xr-x 111 root root 4096 2019-10-04 19:12 ./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 @@ -5504,7 +5504,7 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/libgudev drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/lilo -rw-r--r-- 1 root root 777400 2015-11-22 00:41 ./source/a/lilo/lilo-24.2.tar.gz -rw-r--r-- 1 root root 648 2015-11-22 00:41 ./source/a/lilo/lilo-24.2.tar.gz.asc --rwxr-xr-x 1 root root 3873 2018-04-23 17:20 ./source/a/lilo/lilo.SlackBuild +-rwxr-xr-x 1 root root 3875 2019-10-03 21:01 ./source/a/lilo/lilo.SlackBuild -rw-r--r-- 1 root root 727 2017-03-23 20:31 ./source/a/lilo/lilo.allow.colons.in.by-id.diff.gz -rw-r--r-- 1 root root 893 2016-04-21 20:15 ./source/a/lilo/lilo.ignore.usable.memory.above.4G.diff.gz -rw-r--r-- 1 root root 1231 2018-02-26 19:22 ./source/a/lilo/lilo.nvme.support.diff.gz @@ -5649,19 +5649,19 @@ drwxr-xr-x 2 root root 4096 2008-09-12 04:35 ./source/a/pcmciautils/config -rw-r--r-- 1 root root 910 2018-02-27 06:13 ./source/a/pcmciautils/slack-desc drwxr-xr-x 4 root root 4096 2018-06-19 21:12 ./source/a/pkgtools -rw-r--r-- 1 root root 984 2018-06-19 19:28 ./source/a/pkgtools/doinst.sh.gz -drwxr-xr-x 2 root root 4096 2018-07-09 19:21 ./source/a/pkgtools/manpages +drwxr-xr-x 2 root root 4096 2019-10-04 06:20 ./source/a/pkgtools/manpages -rw-r--r-- 1 root root 76636 2016-06-15 01:08 ./source/a/pkgtools/manpages-l10n.tar.xz -rw-r--r-- 1 root root 1265 2018-06-19 19:28 ./source/a/pkgtools/manpages/explodepkg.8 --rw-r--r-- 1 root root 3554 2018-06-19 19:28 ./source/a/pkgtools/manpages/installpkg.8 +-rw-r--r-- 1 root root 3926 2019-10-04 06:10 ./source/a/pkgtools/manpages/installpkg.8 -rw-r--r-- 1 root root 5702 2018-07-09 19:21 ./source/a/pkgtools/manpages/makepkg.8 -rw-r--r-- 1 root root 1401 2018-04-11 19:48 ./source/a/pkgtools/manpages/pkgdiff.8 -rw-r--r-- 1 root root 2518 2009-04-11 21:11 ./source/a/pkgtools/manpages/pkgtool.8 -rw-r--r-- 1 root root 3251 2018-06-19 19:28 ./source/a/pkgtools/manpages/removepkg.8 -rw-r--r-- 1 root root 2962 2018-06-08 19:56 ./source/a/pkgtools/manpages/upgradepkg.8 --rwxr-xr-x 1 root root 3742 2018-09-06 22:16 ./source/a/pkgtools/pkgtools.SlackBuild -drwxr-xr-x 2 root root 4096 2018-09-06 22:16 ./source/a/pkgtools/scripts +-rwxr-xr-x 1 root root 3742 2019-10-04 19:12 ./source/a/pkgtools/pkgtools.SlackBuild +drwxr-xr-x 2 root root 4096 2019-10-04 06:20 ./source/a/pkgtools/scripts -rw-r--r-- 1 root root 3608 2018-06-19 19:28 ./source/a/pkgtools/scripts/explodepkg --rw-r--r-- 1 root root 26417 2018-09-06 22:14 ./source/a/pkgtools/scripts/installpkg +-rw-r--r-- 1 root root 27102 2019-10-04 06:05 ./source/a/pkgtools/scripts/installpkg -rw-r--r-- 1 root root 13672 2018-06-19 19:28 ./source/a/pkgtools/scripts/makebootdisk -rw-r--r-- 1 root root 16183 2018-07-09 19:20 ./source/a/pkgtools/scripts/makepkg -rw-r--r-- 1 root root 4712 2018-04-11 20:28 ./source/a/pkgtools/scripts/pkgdiff @@ -5671,7 +5671,7 @@ drwxr-xr-x 2 root root 4096 2018-09-06 22:16 ./source/a/pkgtools/scripts -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 +-rw-r--r-- 1 root root 14168 2019-10-04 06:13 ./source/a/pkgtools/scripts/upgradepkg -rw-r--r-- 1 root root 1128 2018-04-11 19:51 ./source/a/pkgtools/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/plzip -rw-r--r-- 1 root root 55697 2019-01-05 18:07 ./source/a/plzip/plzip-1.8.tar.lz @@ -6284,10 +6284,10 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/mpg123 -rwxr-xr-x 1 root root 6140 2019-09-29 23:48 ./source/ap/mpg123/mpg123.SlackBuild -rw-r--r-- 1 root root 27 2019-08-26 18:16 ./source/ap/mpg123/mpg123.url -rw-r--r-- 1 root root 785 2018-02-27 06:12 ./source/ap/mpg123/slack-desc -drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/nano +drwxr-xr-x 2 root root 4096 2019-10-04 19:17 ./source/ap/nano -rw-r--r-- 1 root root 269 2012-06-18 08:46 ./source/ap/nano/doinst.sh.gz --rw-r--r-- 1 root root 1488452 2019-08-25 08:56 ./source/ap/nano/nano-4.4.tar.xz --rw-r--r-- 1 root root 833 2019-08-25 08:56 ./source/ap/nano/nano-4.4.tar.xz.sig +-rw-r--r-- 1 root root 1493816 2019-10-04 10:12 ./source/ap/nano/nano-4.5.tar.xz +-rw-r--r-- 1 root root 833 2019-10-04 10:12 ./source/ap/nano/nano-4.5.tar.xz.sig -rwxr-xr-x 1 root root 5377 2019-09-29 23:48 ./source/ap/nano/nano.SlackBuild -rw-r--r-- 1 root root 882 2018-02-27 06:12 ./source/ap/nano/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/normalize @@ -8532,8 +8532,8 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/glibmm -rw-r--r-- 1 root root 7398144 2019-09-18 18:50 ./source/l/glibmm/glibmm-2.62.0.tar.xz -rwxr-xr-x 1 root root 3621 2019-09-29 23:48 ./source/l/glibmm/glibmm.SlackBuild -rw-r--r-- 1 root root 844 2018-02-27 06:12 ./source/l/glibmm/slack-desc -drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/gmime --rw-r--r-- 1 root root 2217320 2018-11-27 02:15 ./source/l/gmime/gmime-3.2.3.tar.xz +drwxr-xr-x 2 root root 4096 2019-10-04 17:11 ./source/l/gmime +-rw-r--r-- 1 root root 2219876 2019-10-03 18:01 ./source/l/gmime/gmime-3.2.4.tar.xz -rwxr-xr-x 1 root root 4067 2019-09-29 23:48 ./source/l/gmime/gmime.SlackBuild -rw-r--r-- 1 root root 750 2018-02-27 06:12 ./source/l/gmime/slack-desc drwxr-xr-x 2 root root 4096 2019-06-17 02:43 ./source/l/gmm @@ -8556,10 +8556,10 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/gnome-themes-extr -rw-r--r-- 1 root root 2953272 2018-03-22 17:18 ./source/l/gnome-themes-extra/gnome-themes-extra-3.28.tar.xz -rwxr-xr-x 1 root root 3574 2019-09-29 23:48 ./source/l/gnome-themes-extra/gnome-themes-extra.SlackBuild -rw-r--r-- 1 root root 789 2019-08-22 05:49 ./source/l/gnome-themes-extra/slack-desc -drwxr-xr-x 2 root root 4096 2018-11-07 23:35 ./source/l/gnu-efi --rw-r--r-- 1 root root 141971 2018-10-11 12:49 ./source/l/gnu-efi/gnu-efi-3.0.9.tar.lz +drwxr-xr-x 2 root root 4096 2019-10-04 17:12 ./source/l/gnu-efi +-rw-r--r-- 1 root root 142596 2019-10-03 16:07 ./source/l/gnu-efi/gnu-efi-3.0.10.tar.lz -rwxr-xr-x 1 root root 3583 2018-06-12 19:37 ./source/l/gnu-efi/gnu-efi.SlackBuild --rw-r--r-- 1 root root 64 2018-11-07 23:35 ./source/l/gnu-efi/gnu-efi.url +-rw-r--r-- 1 root root 65 2019-10-04 17:12 ./source/l/gnu-efi/gnu-efi.url -rw-r--r-- 1 root root 734 2018-02-27 06:12 ./source/l/gnu-efi/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/gobject-introspection -rw-r--r-- 1 root root 980732 2019-09-09 19:27 ./source/l/gobject-introspection/gobject-introspection-1.62.0.tar.xz @@ -8673,9 +8673,9 @@ 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 2019-09-29 23:48 ./source/l/gtk+3 +drwxr-xr-x 2 root root 4096 2019-10-04 19:24 ./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 20974300 2019-09-04 05:07 ./source/l/gtk+3/gtk+-3.24.11.tar.xz +-rw-r--r-- 1 root root 20977596 2019-10-04 12:58 ./source/l/gtk+3/gtk+-3.24.12.tar.xz -rwxr-xr-x 1 root root 5350 2019-09-29 23:48 ./source/l/gtk+3/gtk+3.SlackBuild -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 @@ -12939,17 +12939,20 @@ drwxr-xr-x 2 root root 4096 2019-02-17 22:03 ./source/y/bsd-games/patches -rw-r--r-- 1 root root 313 2019-02-17 22:07 ./source/y/bsd-games/patches/bsd-games.fortunepath.diff.gz -rw-r--r-- 1 root root 1960 2006-09-09 00:47 ./source/y/bsd-games/patches/bsd-games.pom.diff.gz -rw-r--r-- 1 root root 1065 2019-02-17 22:28 ./source/y/bsd-games/slack-desc -drwxr-xr-x 4 root root 4096 2019-09-30 21:20 ./testing --rw-r--r-- 1 root root 1219 2019-09-30 21:20 ./testing/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-09-30 21:20 ./testing/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 1549 2019-09-30 21:20 ./testing/FILE_LIST --rw-r--r-- 1 root root 8198 2019-09-30 21:20 ./testing/MANIFEST.bz2 --rw-r--r-- 1 root root 841 2019-09-30 21:20 ./testing/PACKAGES.TXT -drwxr-xr-x 2 root root 4096 2019-09-12 01:56 ./testing/packages +drwxr-xr-x 4 root root 4096 2019-10-04 21:47 ./testing +-rw-r--r-- 1 root root 1851 2019-10-04 21:47 ./testing/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-10-04 21:47 ./testing/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 2415 2019-10-04 21:47 ./testing/FILE_LIST +-rw-r--r-- 1 root root 1003505 2019-10-04 21:47 ./testing/MANIFEST.bz2 +-rw-r--r-- 1 root root 1439 2019-10-04 21:47 ./testing/PACKAGES.TXT +drwxr-xr-x 2 root root 4096 2019-10-04 21:47 ./testing/packages -rw-r--r-- 1 root root 434 2019-07-10 06:03 ./testing/packages/blueman-2.1.1-x86_64-1.txt -rw-r--r-- 1 root root 832340 2019-07-10 06:03 ./testing/packages/blueman-2.1.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-07-10 06:03 ./testing/packages/blueman-2.1.1-x86_64-1.txz.asc -drwxr-xr-x 3 root root 4096 2019-09-12 01:51 ./testing/source +-rw-r--r-- 1 root root 426 2019-10-04 04:46 ./testing/packages/rust-1.38.0-x86_64-2.txt +-rw-r--r-- 1 root root 46589528 2019-10-04 04:46 ./testing/packages/rust-1.38.0-x86_64-2.txz +-rw-r--r-- 1 root root 163 2019-10-04 04:46 ./testing/packages/rust-1.38.0-x86_64-2.txz.asc +drwxr-xr-x 4 root root 4096 2019-10-04 19:40 ./testing/source drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./testing/source/blueman -rw-r--r-- 1 root root 290 2018-08-04 01:09 ./testing/source/blueman/30-blueman-netdev-allow-access.rules.gz -rw-r--r-- 1 root root 950296 2019-07-08 05:49 ./testing/source/blueman/blueman-2.1.1.tar.xz @@ -12957,6 +12960,13 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./testing/source/blueman -rw-r--r-- 1 root root 439 2018-08-04 01:12 ./testing/source/blueman/doinst.sh.gz -rw-r--r-- 1 root root 269 2017-06-27 21:59 ./testing/source/blueman/dont-autostart-applet-in-kde.diff.gz -rw-r--r-- 1 root root 889 2018-02-27 06:13 ./testing/source/blueman/slack-desc +drwxr-xr-x 2 root root 4096 2019-10-04 19:45 ./testing/source/rust +-rw-r--r-- 1 root root 1175 2019-10-03 21:04 ./testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch.gz +-rw-r--r-- 1 root root 300 2017-10-16 20:00 ./testing/source/rust/link_libffi.diff.gz +-rwxr-xr-x 1 root root 9953 2019-10-04 03:26 ./testing/source/rust/rust.SlackBuild +-rw-r--r-- 1 root root 1147 2019-09-27 19:59 ./testing/source/rust/rust.url +-rw-r--r-- 1 root root 89100704 2019-09-26 14:09 ./testing/source/rust/rustc-1.38.0-src.tar.lz +-rw-r--r-- 1 root root 910 2018-02-27 06:49 ./testing/source/rust/slack-desc drwxr-xr-x 2 root root 4096 2019-10-02 06:46 ./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 c5776df7f..00e2a61aa 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1198,6 +1198,8 @@ gzip ./source/x/xcm/xcm.udev.rules.diff gzip ./testing/source/blueman/dont-autostart-applet-in-kde.diff gzip ./testing/source/blueman/30-blueman-netdev-allow-access.rules gzip ./testing/source/blueman/doinst.sh +gzip ./testing/source/rust/link_libffi.diff +gzip ./testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch 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/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild index 6bae6e5a6..295a4abc9 100755 --- a/source/a/lilo/lilo.SlackBuild +++ b/source/a/lilo/lilo.SlackBuild @@ -93,7 +93,7 @@ chown root:root \ rm -rf $PKG/usr/doc/lilo-$VERSION mkdir -p $PKG/usr/doc/lilo-$VERSION -cp -a CHANGES COPYING COPYRIGHT INCOMPAT QuickInst READM* doc sample \ +cp -a CHANGELOG COPYING COPYRIGHT INCOMPAT QuickInst READM* doc sample \ $PKG/usr/doc/lilo-$VERSION for bootsplash in $CWD/*.bmp ; do cp -a $bootsplash $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash) diff --git a/source/a/pkgtools/manpages/installpkg.8 b/source/a/pkgtools/manpages/installpkg.8 index 204cc841e..990e15942 100644 --- a/source/a/pkgtools/manpages/installpkg.8 +++ b/source/a/pkgtools/manpages/installpkg.8 @@ -45,6 +45,9 @@ installpkg \- install Slackware packages. [ .B \--threads <number> ] +[ +.B \--no-overwrite +] .BI packagename [ .B packagename2 ... @@ -102,6 +105,12 @@ For xz/plzip compressed packages, set the maximum number of threads to be used f decompression. Only has an effect if a multithreaded compressor was used, and then only on large packages. The default for plzip is the number of CPU threads available. The default for xz is 2. +.TP +.B \--no-overwrite +When extracting the package, do not overwrite existing files. Usually, this option +should not be used. It exists so that upgradepkg can use it for the second installation +pass. The first pass has already overwritten the previous package's files, and this will +catch the few corner cases without generating unnecessary writes. .SH EXAMPLES .TP .B Install a font package for X: diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index 1b0614125..7c8dc9c09 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -30,7 +30,7 @@ PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: VERSION=15.0 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-23} +BUILD=${BUILD:-24} # 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/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index 2180016f5..f334728c6 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 1994, 1998, 2000 Patrick Volkerding, Concord, CA, USA # Copyright 2001, 2003 Slackware Linux, Inc., Concord, CA, USA -# Copyright 2007, 2009, 2011, 2017, 2018 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2009, 2011, 2017, 2018, 2019 Patrick Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,6 +21,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# Fri Oct 4 06:04:39 UTC 2019 +# Add support for --no-overwrite so that upgradepkg can be kind to SSDs. +# # Mon Jun 4 21:17:58 UTC 2018 # Migrate the package database and directories from /var/log to # /var/lib/pkgtools. /var/log was never a good place for this data, as it is @@ -163,13 +166,19 @@ options: --warn (warn if files will be overwritten, but do not install) --tagfile /somedir/tagfile (specify a different file to use for package priorities. The default is "tagfile" in the package's directory) - --threads <number> For xz/plzip compressed packages, set the max + --threads <number> For xz/plzip compressed packages, set the max number of threads to be used for decompression. Only has an effect if a multithreaded compressor was used, and then only on large packages. For plzip, the default is equal to the number of CPU threads available on the machine. For xz, the default is equal to 2. --md5sum (record the package's md5sum in the metadata file) + --no-overwrite When extracting the package, do not overwrite + existing files. Usually, this option should not be used. + It exists so that upgradepkg can use it for the second + installation pass. The first pass has already overwritten + the previous package's files, and this will catch the few + corner cases without generating unnecessary writes. EOF } @@ -227,6 +236,9 @@ while [ 0 ]; do elif [ "$1" = "-ask" -o "$1" = "--ask" ]; then ALWAYSASK="yes" shift 1 + elif [ "$1" = "--no-overwrite" ]; then + NO_OVERWRITE=" --skip-old-files " + shift 1 elif [ "$1" = "-tagfile" -o "$1" = "--tagfile" ]; then if [ -r "$2" ]; then USERTAGFILE="$2" @@ -625,9 +637,9 @@ EOF fi echo "FILE LIST:" >> $ADM_DIR/packages/$shortname if [ "$INSTDIR" = "install" ]; then - ( cd $ROOT/ ; $packagecompression -dc | tar --acls --xattrs --xattrs-include='*' --keep-directory-symlink -xpvf - | LC_ALL=C sort ) < $package >> $TMP/$shortname 2> /dev/null + ( cd $ROOT/ ; $packagecompression -dc | tar --acls --xattrs --xattrs-include='*' --keep-directory-symlink $NO_OVERWRITE -xpvf - | LC_ALL=C sort ) < $package >> $TMP/$shortname 2> /dev/null else - ( cd $ROOT/ ; $packagecompression -dc | tar --transform "s,^install$,$INSTDIR," --transform "s,^install/,$INSTDIR/," --acls --xattrs --xattrs-include='*' --keep-directory-symlink -xpvf - | LC_ALL=C sort ) < $package >> $TMP/$shortname 2> /dev/null + ( cd $ROOT/ ; $packagecompression -dc | tar --transform "s,^install$,$INSTDIR," --transform "s,^install/,$INSTDIR/," --acls --xattrs --xattrs-include='*' --keep-directory-symlink $NO_OVERWRITE -xpvf - | LC_ALL=C sort ) < $package >> $TMP/$shortname 2> /dev/null fi if [ "$( grep '^\./' $TMP/$shortname | wc -l | tr -d ' ')" = "1" ]; then # Good. We have a package that meets the Slackware spec. diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg index f53d21d99..f81d3c738 100644 --- a/source/a/pkgtools/scripts/upgradepkg +++ b/source/a/pkgtools/scripts/upgradepkg @@ -406,9 +406,9 @@ EOF # shift location, so we should always reinstall as the final step: if [ ! "$NOT_PARANOID" = "true" ]; then if ! [ $TERSE ]; then - /sbin/installpkg $INCOMINGDIR/$NNAME + /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME else - /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null + /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null fi fi ! [ $TERSE ] && echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME." diff --git a/source/l/gnu-efi/gnu-efi.url b/source/l/gnu-efi/gnu-efi.url index 50941d120..2c39025ea 100644 --- a/source/l/gnu-efi/gnu-efi.url +++ b/source/l/gnu-efi/gnu-efi.url @@ -1 +1 @@ -https://downloads.sourceforge.net/gnu-efi/gnu-efi-3.0.9.tar.bz2 +https://downloads.sourceforge.net/gnu-efi/gnu-efi-3.0.10.tar.bz2 diff --git a/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch b/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch new file mode 100644 index 000000000..04be717a3 --- /dev/null +++ b/testing/source/rust/0001-WIP-minimize-the-rust-std-component.patch @@ -0,0 +1,74 @@ +From 2bf05f208272cd58c57f4d7d8d0e10fdb22e8719 Mon Sep 17 00:00:00 2001 +From: Josh Stone <jistone@redhat.com> +Date: Fri, 27 Sep 2019 12:33:08 -0700 +Subject: [PATCH] [WIP] minimize the rust-std component + +--- + src/bootstrap/dist.rs | 45 +++++++++++++++---------------------------- + 1 file changed, 16 insertions(+), 29 deletions(-) + +diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs +index 552965863d10..76fbd07f9fb5 100644 +--- a/src/bootstrap/dist.rs ++++ b/src/bootstrap/dist.rs +@@ -667,41 +667,28 @@ impl Step for Std { + return distdir(builder).join(format!("{}-{}.tar.gz", name, target)); + } + +- // We want to package up as many target libraries as possible +- // for the `rust-std` package, so if this is a host target we +- // depend on librustc and otherwise we just depend on libtest. +- if builder.hosts.iter().any(|t| t == target) { +- builder.ensure(compile::Rustc { compiler, target }); +- } else { +- if builder.no_std(target) == Some(true) { +- // the `test` doesn't compile for no-std targets +- builder.ensure(compile::Std { compiler, target }); +- } else { +- builder.ensure(compile::Test { compiler, target }); +- } +- } ++ builder.ensure(compile::Std { compiler, target }); ++ builder.ensure(compile::Test { compiler, target }); + + let image = tmpdir(builder).join(format!("{}-{}-image", name, target)); + let _ = fs::remove_dir_all(&image); + +- let dst = image.join("lib/rustlib").join(target); ++ let dst = image.join("lib/rustlib").join(target).join("lib"); + t!(fs::create_dir_all(&dst)); +- let mut src = builder.sysroot_libdir(compiler, target).to_path_buf(); +- src.pop(); // Remove the trailing /lib folder from the sysroot_libdir +- builder.cp_filtered(&src, &dst, &|path| { +- if let Some(name) = path.file_name().and_then(|s| s.to_str()) { +- if name == builder.config.rust_codegen_backends_dir.as_str() { +- return false +- } +- if name == "bin" { +- return false +- } +- if name.contains("LLVM") { +- return false +- } ++ ++ let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target); ++ let stamp = dbg!(compile::libstd_stamp(builder, compiler_to_use, target)); ++ for (path, host) in builder.read_stamp_file(&stamp) { ++ if !host { ++ builder.copy(&path, &dst.join(path.file_name().unwrap())); + } +- true +- }); ++ } ++ let stamp = dbg!(compile::libtest_stamp(builder, compiler_to_use, target)); ++ for (path, host) in builder.read_stamp_file(&stamp) { ++ if !host { ++ builder.copy(&path, &dst.join(path.file_name().unwrap())); ++ } ++ } + + let mut cmd = rust_installer(builder); + cmd.arg("generate") +-- +2.21.0 + diff --git a/testing/source/rust/link_libffi.diff b/testing/source/rust/link_libffi.diff new file mode 100644 index 000000000..38e0113e9 --- /dev/null +++ b/testing/source/rust/link_libffi.diff @@ -0,0 +1,12 @@ +diff -Naur rustc-1.21.0-src.bak/src/librustc_llvm/build.rs rustc-1.21.0-src/src/librustc_llvm/build.rs +--- rustc-1.21.0-src.bak/src/librustc_llvm/build.rs 2017-10-10 09:04:51.000000000 +1300 ++++ rustc-1.21.0-src/src/librustc_llvm/build.rs 2017-10-14 15:28:56.761081727 +1300 +@@ -221,6 +221,8 @@ + println!("cargo:rustc-link-lib={}={}", kind, name); + } + ++ println!("cargo:rustc-link-lib=dylib=ffi"); ++ + // LLVM ldflags + // + // If we're a cross-compile of LLVM then unfortunately we can't trust these diff --git a/testing/source/rust/rust.SlackBuild b/testing/source/rust/rust.SlackBuild new file mode 100755 index 000000000..b76374cf7 --- /dev/null +++ b/testing/source/rust/rust.SlackBuild @@ -0,0 +1,303 @@ +#!/bin/bash + +# Copyright 2017 Andrew Clemons, Wellington, New Zealand +# Copyright 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2017 Stuart Winter +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS 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 AUTHOR 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=rust +SRCNAM="${PKGNAM}c" +VERSION=${VERSION:-1.38.0} +BUILD=${BUILD:-2} + +# Set this to YES to build with the system LLVM, or NO to use the bundled LLVM. +# YES is probably better (when it works...) +SYSTEM_LLVM=${SYSTEM_LLVM:-YES} + +# Bootstrap variables (might not be kept updated for latest Rust): +RSTAGE0_VERSION=${RSTAGE0_VERSION:-1.37.0} +RSTAGE0_DIR=${RSTAGE0_DIR:-2019-08-15} +CSTAGE0_VERSION=${CSTAGE0_VERSION:-0.38.0} +CSTAGE0_DIR=${CSTAGE0_DIR:-$RSTAGE0_DIR} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i686 ;; + armv7hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi +unset MARCH + +# For compiling i686 under an x86_64 kernel: +if [ "$(uname -m)" = "x86_64" -a "$(file -L /usr/bin/gcc | grep 80386 | grep 32-bit)" != "" ]; then + ARCH=i686 +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 + +# if you already have rust and cargo installed, you can bootstrap from the +# previous version. +if [ "$LOCAL_BOOTSTRAP" = "" ] && [ -x /usr/bin/cargo ] && [ -x /usr/bin/rustc ] ; then + LOCAL_BOOTSTRAP=yes +fi + +# https://forge.rust-lang.org/platform-support.html +# Bootstrapping ARCH: +if [ "$ARCH" = "i586" ]; then + if [ "$LOCAL_BOOTSTRAP" = "yes" ] ; then + if rustc -Vv | grep host | grep i586 > /dev/null ; then + BARCH="$ARCH" + else + BARCH="i686" + + if case "$( uname -m )" in i586) true ;; *) false ;; esac ; then + echo "rust must be bootstrapped from an i686 machine" + exit 1 + fi + fi + else + # i586 must be built on a i686 machine, since the bootstrap compiler is i686 + BARCH="i686" + + if case "$( uname -m )" in i586) true ;; *) false ;; esac ; then + echo "rust must be bootstrapped from an i686 machine" + exit 1 + fi + fi + + TARCH="$ARCH" +elif [ "$ARCH" = "armv7hl" ]; then + BARCH="armv7" + TARCH="$BARCH" +else + BARCH="$ARCH" + TARCH="$ARCH" +fi + +# Bootstrapping ABI: +if [ "$ARCH" = "armv7hl" ]; then + BABI="gnueabihf" +else + BABI="gnu" +fi + +TMP=${TMP:-/tmp} +OUTPUT=${OUTPUT:-/tmp} +PKG=$TMP/package-$PKGNAM + +# Not needed, as the build will automatically use as many jobs as there are +# cores. +#NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION-src +tar xvf $CWD/$SRCNAM-$VERSION-src.tar.?z || exit 1 +cd $SRCNAM-$VERSION-src || exit 1 + +# Link with -lffi in case of using system LLVM: +if [ "${SYSTEM_LLVM}" = "YES" ]; then + zcat $CWD/link_libffi.diff.gz | patch -p1 --verbose || exit 1 +fi + +# Try to debloat the build: +zcat $CWD/0001-WIP-minimize-the-rust-std-component.patch.gz | patch -p1 --verbose || exit 1 + +if [ "$LOCAL_BOOTSTRAP" != "yes" ] ; then + # rust requires bootstrapping with the previous rust version. + # versions are defined in src/stage0.txt. + mkdir -p build/cache/$RSTAGE0_DIR + cp $CWD/$PKGNAM-std-$RSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z \ + $CWD/$SRCNAM-$RSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z \ + build/cache/$RSTAGE0_DIR + mkdir -p build/cache/$CSTAGE0_DIR + cp $CWD/cargo-$CSTAGE0_VERSION-$BARCH-unknown-linux-gnu.tar.?z build/cache/$CSTAGE0_DIR +fi + +# Build configuration. We'll go ahead and build with rpath because it may be +# needed during the build, and then we'll strip the rpaths out of the +# binaries later. +cat << EOF > config.toml +[llvm] +ccache = "/usr/bin/ccache" +link-shared = true + +[build] +build = "$BARCH-unknown-linux-$BABI" +host = ["$TARCH-unknown-linux-$BABI"] +target = ["$TARCH-unknown-linux-$BABI"] +submodules = false +vendor = true +extended = true + +[install] +prefix = "/usr" +docdir = "doc/rust-$VERSION" +libdir = "lib$LIBDIRSUFFIX" +mandir = "man" + +[rust] +codegen-units = 0 +channel = "stable" +rpath = true +codegen-tests = false +ignore-git = true + +EOF + +if [ "${SYSTEM_LLVM}" = "YES" ]; then + cat << EOF >> config.toml +# Add this stuff to build with the system LLVM: +[target.i586-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config" + +[target.i686-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config" + +[target.x86_64-unknown-linux-gnu] +llvm-config = "/usr/bin/llvm-config" + +[target.armv7-unknown-linux-gnueabihf] +llvm-config = "/usr/bin/llvm-config" +EOF +fi + +if [ "$LOCAL_BOOTSTRAP" = "yes" ] ; then + sed -i "s|^\(extended = true\)$|\1\nrustc = \"/usr/bin/rustc\"\ncargo = \"/usr/bin/cargo\"|" config.toml +fi + +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ + -o -perm 511 \) -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ + +export PKG_CONFIG_ALLOW_CROSS=1 + +if [ "$BARCH" = "i586" ] ; then + # when bootstrapping from i586 (rust already installed), also build a i686 + # rustlib: + sed -i 's/^target =.*$/target = ["i686-unknown-linux-gnu"]/' config.toml +elif [ "$BARCH" = "i686" ] ; then + if [ "$TARCH" = "i586" ] ; then + # this will cause some messages like: + # warning: redundant linker flag specified for library `m` + # but will keep the build from falling over when doing the stage1 compiler + # linking for the i586 compiler. seems the correct flags don't get passed + # through and we end up failures like: + # error: linking with `clang` failed: exit code: 1 + # /tmp/SBo/rustc-1.20.0-src/build/i686-unknown-linux-gnu/stage1-rustc/i586-unknown-linux-gnu/release/deps/librustc_llvm-4ab259c9aed547db.so: undefined reference to `xxx` + export RUSTFLAGS="$RUSTFLAGS -C link-args=-lrt -ldl -lcurses -lpthread -lz -lm" + fi +fi + +if [ "$ARCH" = "armv7hl" ] ; then + python x.py dist +else + # README.md says gcc 4.7 / clang 3.x or later needed + # but building fails for me with GCC 5.3 from slackware 14.2 + export CC=clang + export CXX=clang++ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" \ + python x.py dist || exit 1 +fi + +DESTDIR=$PKG python x.py install || exit 1 + +# Eh, none of this is all that big. Might as well leave it around as a +# reference. +#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/components +#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/install.log +#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* +#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/rust-installer-version +#rm -f $PKG/usr/lib$LIBDIRSUFFIX/rustlib/uninstall.sh +# Make sure the paths are correct, though: +sed -i "s,/tmp/package-rust/,/,g" $PKG/usr/lib$LIBDIRSUFFIX/rustlib/install.log $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* +# And a little compression doesn't hurt either: +gzip -9 $PKG/usr/lib$LIBDIRSUFFIX/rustlib/manifest-* + +# Correct permissions on shared libraries: +find $PKG/usr/lib$LIBDIRSUFFIX -name "*.so" -exec chmod 755 "{}" \+ + +# Evidently there are a lot of duplicated libraries in this tree, so let's +# try to save some space: +( cd $PKG/usr/lib${LIBDIRSUFFIX}/rustlib/*-linux-gnu/lib && for file in *.so ; do if cmp -s $file ../../../$file ; then ln -sf ../../../$file .; fi; done ) + +# Strip ELF objects: +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Remove any compiled-in RPATHs: +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | while read elfobject ; do + patchelf --remove-rpath $elfobject || exit 1 +done + +# Compress man pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +# Add some documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a *.md COPYRIGHT* COPYING* LICENSE* $PKG/usr/doc/$PKGNAM-$VERSION +# Include licenses from third party vendors: +mkdir $PKG/usr/doc/$PKGNAM-$VERSION/vendor +( cd src/vendor + tar cf - $(find . -maxdepth 2 | grep -e README -e LICENSE -e COPYING -e CHANGELOG -e PERFORMANCE -e UPGRADE ) | ( cd $PKG/usr/doc/$PKGNAM-$VERSION/vendor ; tar xf - ) +) + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/testing/source/rust/rust.url b/testing/source/rust/rust.url new file mode 100644 index 000000000..560589366 --- /dev/null +++ b/testing/source/rust/rust.url @@ -0,0 +1,23 @@ +# Source code (repacked to .tar.xz): +lftpget https://static.rust-lang.org/dist/rustc-1.38.0-src.tar.gz +gzip -d rustc-*tar.gz +plzip -9 -v rustc-*tar + +# Please note that the bootstrap binary packages listed below might not be kept +# updated for later versions. The Rust compiler as shipped with Slackware +# should be able to compile the next released version of Rust. +# +# To find the expected date/versions for bootstrap binaries to be able to +# update the urls below, look at src/stage0.txt in the Rust sources. +exit 0 + +# i686 bootstrap: +lftpget https://static.rust-lang.org/dist/2019-08-15/cargo-0.38.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-08-15/rust-std-1.37.0-i686-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-08-15/rustc-1.37.0-i686-unknown-linux-gnu.tar.gz + +# x86_64 bootstrap: +lftpget https://static.rust-lang.org/dist/2019-08-15/cargo-0.38.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-08-15/rust-std-1.37.0-x86_64-unknown-linux-gnu.tar.gz +lftpget https://static.rust-lang.org/dist/2019-08-15/rustc-1.37.0-x86_64-unknown-linux-gnu.tar.gz + diff --git a/testing/source/rust/slack-desc b/testing/source/rust/slack-desc new file mode 100644 index 000000000..924b1907e --- /dev/null +++ b/testing/source/rust/slack-desc @@ -0,0 +1,19 @@ +# 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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +rust: rust (a safe, concurrent, practical language) +rust: +rust: Rust is a curly-brace, block-structured expression language. +rust: Its design is oriented toward concerns of "programming in the large", +rust: that is, of creating and maintaining boundaries - both abstract and +rust: operational - that preserve large-system integrity, availability, +rust: and concurrency. +rust: +rust: Homepage: https://rust-lang.org +rust: +rust: |