summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.rss42
-rw-r--r--ChangeLog.txt28
-rw-r--r--FILELIST.TXT119
-rw-r--r--source/a/pkgtools/manpages/upgradepkg.812
-rwxr-xr-xsource/a/pkgtools/pkgtools.SlackBuild2
-rw-r--r--source/a/pkgtools/scripts/upgradepkg49
-rw-r--r--source/l/glibc/doinst.sh-glibc67
-rw-r--r--source/l/glibc/doinst.sh-glibc-solibs68
-rwxr-xr-xsource/l/glibc/glibc.SlackBuild2
-rw-r--r--source/l/glibc/slack-desc.glibc-solibs-linuxthreads19
10 files changed, 249 insertions, 159 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index a185971b..9fa34f36 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,9 +11,45 @@
<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, 6 Jun 2018 22:19:01 GMT</pubDate>
- <lastBuildDate>Thu, 7 Jun 2018 06:58:06 GMT</lastBuildDate>
- <generator>maintain_current_git.sh v 1.7</generator>
+ <pubDate>Fri, 8 Jun 2018 20:37:06 GMT</pubDate>
+ <lastBuildDate>Fri, 8 Jun 2018 23:06:18 GMT</lastBuildDate>
+ <generator>maintain_current_git.sh v 1.8</generator>
+ <item>
+ <title>Fri, 8 Jun 2018 20:37:06 GMT</title>
+ <pubDate>Fri, 8 Jun 2018 20:37:06 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20180608203706</link>
+ <guid isPermaLink="false">20180608203706</guid>
+ <description>
+ <![CDATA[<pre>
+a/glibc-solibs-2.27-x86_64-3.txz: Rebuilt.
+a/pkgtools-15.0-noarch-16.txz: Rebuilt.
+ upgradepkg: clean up --help output and add options
+ upgradepkg: accept -help option (not just --help)
+ upgradepkg: don't omit error messages in --terse mode
+ upgradepkg: only print missing new package in old%new mode
+ upgradepkg.8: move information about config file handling from BUGS to the
+ DESCRIPTION section
+ Thanks to Xsane.
+ap/vim-8.1.0039-x86_64-1.txz: Upgraded.
+l/glibc-2.27-x86_64-3.txz: Rebuilt.
+ When installing the package, remove old versions of the glibc shared
+ libraries. In addition to eliminating residue on the system from old
+ package versions, this change will make it possible in the future to
+ revert to older glibc packages using upgradepkg.
+l/glibc-i18n-2.27-x86_64-3.txz: Rebuilt.
+l/glibc-profile-2.27-x86_64-3.txz: Rebuilt.
+n/gnupg2-2.2.8-x86_64-1.txz: Upgraded.
+ Sanitize the diagnostic output of the original file name in verbose mode.
+ By using a made up file name in the message it was possible to fake status
+ messages. Using this technique it was for example possible to fake the
+ verification status of a signed mail.
+ For more information, see:
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-12020
+ (* Security fix *)
+xap/vim-gvim-8.1.0039-x86_64-1.txz: Upgraded.
+ </pre>]]>
+ </description>
+ </item>
<item>
<title>Wed, 6 Jun 2018 22:19:01 GMT</title>
<pubDate>Wed, 6 Jun 2018 22:19:01 GMT</pubDate>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9eb67b39..ec92c260 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,31 @@
+Fri Jun 8 20:37:06 UTC 2018
+a/glibc-solibs-2.27-x86_64-3.txz: Rebuilt.
+a/pkgtools-15.0-noarch-16.txz: Rebuilt.
+ upgradepkg: clean up --help output and add options
+ upgradepkg: accept -help option (not just --help)
+ upgradepkg: don't omit error messages in --terse mode
+ upgradepkg: only print missing new package in old%new mode
+ upgradepkg.8: move information about config file handling from BUGS to the
+ DESCRIPTION section
+ Thanks to Xsane.
+ap/vim-8.1.0039-x86_64-1.txz: Upgraded.
+l/glibc-2.27-x86_64-3.txz: Rebuilt.
+ When installing the package, remove old versions of the glibc shared
+ libraries. In addition to eliminating residue on the system from old
+ package versions, this change will make it possible in the future to
+ revert to older glibc packages using upgradepkg.
+l/glibc-i18n-2.27-x86_64-3.txz: Rebuilt.
+l/glibc-profile-2.27-x86_64-3.txz: Rebuilt.
+n/gnupg2-2.2.8-x86_64-1.txz: Upgraded.
+ Sanitize the diagnostic output of the original file name in verbose mode.
+ By using a made up file name in the message it was possible to fake status
+ messages. Using this technique it was for example possible to fake the
+ verification status of a signed mail.
+ For more information, see:
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-12020
+ (* Security fix *)
+xap/vim-gvim-8.1.0039-x86_64-1.txz: Upgraded.
++--------------------------+
Wed Jun 6 22:19:01 UTC 2018
a/bash-4.4.023-x86_64-1.txz: Upgraded.
a/kernel-firmware-20180604_1fa9ce3-noarch-1.txz: Upgraded.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index b121f497..d829de3b 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Wed Jun 6 22:36:53 UTC 2018
+Fri Jun 8 21:02:44 UTC 2018
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 2018-06-06 22:19 .
+drwxr-xr-x 12 root root 4096 2018-06-08 20:37 .
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
-rw-r--r-- 1 root root 11329 2018-01-08 02:48 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 893702 2018-06-05 05:35 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2018-06-05 05:35 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 894609 2018-06-06 22:37 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2018-06-06 22:37 ./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 408979 2018-06-06 22:19 ./ChangeLog.txt
+-rw-r--r-- 1 root root 410362 2018-06-08 20:37 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2018-06-06 20:39 ./EFI/BOOT
-rw-r--r-- 1 root root 1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2018-06-06 20:39 ./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 1176606 2018-06-05 05:34 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1177681 2018-06-06 22:36 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 724907 2018-06-06 22:35 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 724907 2018-06-08 21:01 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
-rw-r--r-- 1 root root 3634 2018-06-06 20:17 ./README.initrd
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
@@ -748,13 +748,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 2018-06-06 22:35 ./slackware64
--rw-r--r-- 1 root root 288025 2018-06-06 22:35 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2018-06-06 22:35 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 358846 2018-06-06 22:32 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 3615028 2018-06-06 22:33 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2018-06-08 21:01 ./slackware64
+-rw-r--r-- 1 root root 288025 2018-06-08 21:01 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2018-06-08 21:01 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 358846 2018-06-08 20:58 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 3617757 2018-06-08 20:59 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
-drwxr-xr-x 2 root root 20480 2018-06-06 22:31 ./slackware64/a
+drwxr-xr-x 2 root root 20480 2018-06-08 20:58 ./slackware64/a
-rw-r--r-- 1 root root 327 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txt
-rw-r--r-- 1 root root 10972 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz.asc
@@ -854,9 +854,9 @@ drwxr-xr-x 2 root root 20480 2018-06-06 22:31 ./slackware64/a
-rw-r--r-- 1 root root 510 2018-04-13 13:04 ./slackware64/a/getty-ps-2.1.0b-x86_64-4.txt
-rw-r--r-- 1 root root 61992 2018-04-13 13:04 ./slackware64/a/getty-ps-2.1.0b-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:04 ./slackware64/a/getty-ps-2.1.0b-x86_64-4.txz.asc
--rw-r--r-- 1 root root 323 2018-04-14 19:28 ./slackware64/a/glibc-solibs-2.27-x86_64-2.txt
--rw-r--r-- 1 root root 2897700 2018-04-14 19:28 ./slackware64/a/glibc-solibs-2.27-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-14 19:28 ./slackware64/a/glibc-solibs-2.27-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 323 2018-06-08 19:44 ./slackware64/a/glibc-solibs-2.27-x86_64-3.txt
+-rw-r--r-- 1 root root 2897996 2018-06-08 19:44 ./slackware64/a/glibc-solibs-2.27-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2018-06-08 19:44 ./slackware64/a/glibc-solibs-2.27-x86_64-3.txz.asc
-rw-r--r-- 1 root root 502 2018-05-24 17:58 ./slackware64/a/glibc-zoneinfo-2018e-noarch-2.txt
-rw-r--r-- 1 root root 193776 2018-05-24 17:58 ./slackware64/a/glibc-zoneinfo-2018e-noarch-2.txz
-rw-r--r-- 1 root root 163 2018-05-24 17:58 ./slackware64/a/glibc-zoneinfo-2018e-noarch-2.txz.asc
@@ -993,9 +993,9 @@ drwxr-xr-x 2 root root 20480 2018-06-06 22:31 ./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-05-31 19:38 ./slackware64/a/pkgtools-15.0-noarch-15.txt
--rw-r--r-- 1 root root 194008 2018-05-31 19:38 ./slackware64/a/pkgtools-15.0-noarch-15.txz
--rw-r--r-- 1 root root 163 2018-05-31 19:38 ./slackware64/a/pkgtools-15.0-noarch-15.txz.asc
+-rw-r--r-- 1 root root 672 2018-06-08 20:00 ./slackware64/a/pkgtools-15.0-noarch-16.txt
+-rw-r--r-- 1 root root 193864 2018-06-08 20:00 ./slackware64/a/pkgtools-15.0-noarch-16.txz
+-rw-r--r-- 1 root root 163 2018-06-08 20:00 ./slackware64/a/pkgtools-15.0-noarch-16.txz.asc
-rw-r--r-- 1 root root 523 2018-04-13 13:10 ./slackware64/a/plzip-1.7-x86_64-3.txt
-rw-r--r-- 1 root root 54224 2018-04-13 13:10 ./slackware64/a/plzip-1.7-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:10 ./slackware64/a/plzip-1.7-x86_64-3.txz.asc
@@ -1096,7 +1096,7 @@ drwxr-xr-x 2 root root 20480 2018-06-06 22:31 ./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 2018-06-06 22:31 ./slackware64/ap
+drwxr-xr-x 2 root root 20480 2018-06-08 20:58 ./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
@@ -1327,9 +1327,9 @@ drwxr-xr-x 2 root root 20480 2018-06-06 22:31 ./slackware64/ap
-rw-r--r-- 1 root root 375 2018-04-13 13:33 ./slackware64/ap/vbetool-1.2.2-x86_64-2.txt
-rw-r--r-- 1 root root 14852 2018-04-13 13:33 ./slackware64/ap/vbetool-1.2.2-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:33 ./slackware64/ap/vbetool-1.2.2-x86_64-2.txz.asc
--rw-r--r-- 1 root root 383 2018-05-28 19:08 ./slackware64/ap/vim-8.1.0026-x86_64-1.txt
--rw-r--r-- 1 root root 6921828 2018-05-28 19:08 ./slackware64/ap/vim-8.1.0026-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-05-28 19:08 ./slackware64/ap/vim-8.1.0026-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 383 2018-06-08 19:34 ./slackware64/ap/vim-8.1.0039-x86_64-1.txt
+-rw-r--r-- 1 root root 6923876 2018-06-08 19:34 ./slackware64/ap/vim-8.1.0039-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-08 19:34 ./slackware64/ap/vim-8.1.0039-x86_64-1.txz.asc
-rw-r--r-- 1 root root 604 2018-04-13 13:34 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-4.txt
-rw-r--r-- 1 root root 180908 2018-04-13 13:34 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:34 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-4.txz.asc
@@ -2401,7 +2401,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 2018-06-06 22:31 ./slackware64/l
+drwxr-xr-x 2 root root 69632 2018-06-08 20:58 ./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
@@ -2621,15 +2621,15 @@ drwxr-xr-x 2 root root 69632 2018-06-06 22:31 ./slackware64/l
-rw-r--r-- 1 root root 235 2018-04-13 14:40 ./slackware64/l/glib2-2.56.1-x86_64-2.txt
-rw-r--r-- 1 root root 3762456 2018-04-13 14:40 ./slackware64/l/glib2-2.56.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:40 ./slackware64/l/glib2-2.56.1-x86_64-2.txz.asc
--rw-r--r-- 1 root root 387 2018-04-14 19:29 ./slackware64/l/glibc-2.27-x86_64-2.txt
--rw-r--r-- 1 root root 5469260 2018-04-14 19:29 ./slackware64/l/glibc-2.27-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-14 19:29 ./slackware64/l/glibc-2.27-x86_64-2.txz.asc
--rw-r--r-- 1 root root 353 2018-04-14 19:28 ./slackware64/l/glibc-i18n-2.27-x86_64-2.txt
--rw-r--r-- 1 root root 7197464 2018-04-14 19:28 ./slackware64/l/glibc-i18n-2.27-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-14 19:28 ./slackware64/l/glibc-i18n-2.27-x86_64-2.txz.asc
--rw-r--r-- 1 root root 507 2018-04-14 19:28 ./slackware64/l/glibc-profile-2.27-x86_64-2.txt
--rw-r--r-- 1 root root 1621332 2018-04-14 19:28 ./slackware64/l/glibc-profile-2.27-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-14 19:28 ./slackware64/l/glibc-profile-2.27-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 387 2018-06-08 19:44 ./slackware64/l/glibc-2.27-x86_64-3.txt
+-rw-r--r-- 1 root root 5472764 2018-06-08 19:44 ./slackware64/l/glibc-2.27-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2018-06-08 19:44 ./slackware64/l/glibc-2.27-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 353 2018-06-08 19:44 ./slackware64/l/glibc-i18n-2.27-x86_64-3.txt
+-rw-r--r-- 1 root root 7259420 2018-06-08 19:44 ./slackware64/l/glibc-i18n-2.27-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2018-06-08 19:44 ./slackware64/l/glibc-i18n-2.27-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 507 2018-06-08 19:43 ./slackware64/l/glibc-profile-2.27-x86_64-3.txt
+-rw-r--r-- 1 root root 1621888 2018-06-08 19:43 ./slackware64/l/glibc-profile-2.27-x86_64-3.txz
+-rw-r--r-- 1 root root 163 2018-06-08 19:43 ./slackware64/l/glibc-profile-2.27-x86_64-3.txz.asc
-rw-r--r-- 1 root root 358 2018-04-17 18:36 ./slackware64/l/glibmm-2.56.0-x86_64-1.txt
-rw-r--r-- 1 root root 1130568 2018-04-17 18:36 ./slackware64/l/glibmm-2.56.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-04-17 18:36 ./slackware64/l/glibmm-2.56.0-x86_64-1.txz.asc
@@ -3349,7 +3349,7 @@ drwxr-xr-x 2 root root 69632 2018-06-06 22:31 ./slackware64/l
-rw-r--r-- 1 root root 388 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txt
-rw-r--r-- 1 root root 103500 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txz.asc
-drwxr-xr-x 2 root root 32768 2018-06-05 05:30 ./slackware64/n
+drwxr-xr-x 2 root root 32768 2018-06-08 20:58 ./slackware64/n
-rw-r--r-- 1 root root 368 2018-06-05 04:17 ./slackware64/n/ModemManager-1.8.0-x86_64-1.txt
-rw-r--r-- 1 root root 1510328 2018-06-05 04:17 ./slackware64/n/ModemManager-1.8.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-06-05 04:17 ./slackware64/n/ModemManager-1.8.0-x86_64-1.txz.asc
@@ -3434,9 +3434,9 @@ drwxr-xr-x 2 root root 32768 2018-06-05 05:30 ./slackware64/n
-rw-r--r-- 1 root root 369 2018-04-13 15:35 ./slackware64/n/gnupg-1.4.22-x86_64-2.txt
-rw-r--r-- 1 root root 1175556 2018-04-13 15:35 ./slackware64/n/gnupg-1.4.22-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:35 ./slackware64/n/gnupg-1.4.22-x86_64-2.txz.asc
--rw-r--r-- 1 root root 598 2018-05-03 12:15 ./slackware64/n/gnupg2-2.2.7-x86_64-1.txt
--rw-r--r-- 1 root root 2175240 2018-05-03 12:15 ./slackware64/n/gnupg2-2.2.7-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-05-03 12:15 ./slackware64/n/gnupg2-2.2.7-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 598 2018-06-08 18:58 ./slackware64/n/gnupg2-2.2.8-x86_64-1.txt
+-rw-r--r-- 1 root root 2176680 2018-06-08 18:58 ./slackware64/n/gnupg2-2.2.8-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-08 18:58 ./slackware64/n/gnupg2-2.2.8-x86_64-1.txz.asc
-rw-r--r-- 1 root root 492 2018-04-17 09:11 ./slackware64/n/gnutls-3.6.2-x86_64-2.txt
-rw-r--r-- 1 root root 2396956 2018-04-17 09:11 ./slackware64/n/gnutls-3.6.2-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-17 09:11 ./slackware64/n/gnutls-3.6.2-x86_64-2.txz.asc
@@ -4687,7 +4687,7 @@ drwxr-xr-x 2 root root 65536 2018-06-06 22:32 ./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 2018-06-06 22:31 ./slackware64/xap
+drwxr-xr-x 2 root root 12288 2018-06-08 20:58 ./slackware64/xap
-rw-r--r-- 1 root root 625 2018-04-13 16:15 ./slackware64/xap/MPlayer-20180208-x86_64-3.txt
-rw-r--r-- 1 root root 2774576 2018-04-13 16:15 ./slackware64/xap/MPlayer-20180208-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-04-13 16:15 ./slackware64/xap/MPlayer-20180208-x86_64-3.txz.asc
@@ -4786,9 +4786,9 @@ drwxr-xr-x 2 root root 12288 2018-06-06 22:31 ./slackware64/xap
-rw-r--r-- 1 root root 115596 2018-04-13 17:38 ./slackware64/xap/seyon-2.20c-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-13 17:38 ./slackware64/xap/seyon-2.20c-x86_64-4.txz.asc
-rw-r--r-- 1 root root 607 2018-03-31 20:49 ./slackware64/xap/tagfile
--rw-r--r-- 1 root root 503 2018-05-28 19:09 ./slackware64/xap/vim-gvim-8.1.0026-x86_64-1.txt
--rw-r--r-- 1 root root 1298160 2018-05-28 19:09 ./slackware64/xap/vim-gvim-8.1.0026-x86_64-1.txz
--rw-r--r-- 1 root root 163 2018-05-28 19:09 ./slackware64/xap/vim-gvim-8.1.0026-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 503 2018-06-08 19:35 ./slackware64/xap/vim-gvim-8.1.0039-x86_64-1.txt
+-rw-r--r-- 1 root root 1298832 2018-06-08 19:35 ./slackware64/xap/vim-gvim-8.1.0039-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-08 19:35 ./slackware64/xap/vim-gvim-8.1.0039-x86_64-1.txz.asc
-rw-r--r-- 1 root root 455 2018-04-13 17:42 ./slackware64/xap/windowmaker-0.95.8-x86_64-2.txt
-rw-r--r-- 1 root root 1741516 2018-04-13 17:42 ./slackware64/xap/windowmaker-0.95.8-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 17:42 ./slackware64/xap/windowmaker-0.95.8-x86_64-2.txz.asc
@@ -4927,11 +4927,11 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:35 ./slackware64/y
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez
-rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile
-drwxr-xr-x 19 root root 4096 2018-06-06 22:36 ./source
--rw-r--r-- 1 root root 451404 2018-06-06 22:36 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2018-06-06 22:36 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 638826 2018-06-06 22:36 ./source/FILE_LIST
--rw-r--r-- 1 root root 14753490 2018-06-06 22:36 ./source/MANIFEST.bz2
+drwxr-xr-x 19 root root 4096 2018-06-08 21:02 ./source
+-rw-r--r-- 1 root root 451323 2018-06-08 21:02 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2018-06-08 21:02 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 638727 2018-06-08 21:02 ./source/FILE_LIST
+-rw-r--r-- 1 root root 14758311 2018-06-08 21:02 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
drwxr-xr-x 108 root root 4096 2018-05-24 18:00 ./source/a
-rw-r--r-- 1 root root 567 2018-03-13 18:43 ./source/a/FTBFSlog
@@ -5526,8 +5526,8 @@ drwxr-xr-x 2 root root 4096 2018-04-11 19:37 ./source/a/pkgtools/manpages
-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 3189 2018-05-27 20:08 ./source/a/pkgtools/manpages/removepkg.8
--rw-r--r-- 1 root root 2966 2018-05-27 20:08 ./source/a/pkgtools/manpages/upgradepkg.8
--rwxr-xr-x 1 root root 3451 2018-05-31 19:38 ./source/a/pkgtools/pkgtools.SlackBuild
+-rw-r--r-- 1 root root 2962 2018-06-08 19:56 ./source/a/pkgtools/manpages/upgradepkg.8
+-rwxr-xr-x 1 root root 3451 2018-06-08 19:51 ./source/a/pkgtools/pkgtools.SlackBuild
drwxr-xr-x 2 root root 4096 2018-05-27 20:01 ./source/a/pkgtools/scripts
-rw-r--r-- 1 root root 3591 2018-04-11 19:36 ./source/a/pkgtools/scripts/explodepkg
-rw-r--r-- 1 root root 25896 2018-05-31 19:37 ./source/a/pkgtools/scripts/installpkg
@@ -5540,7 +5540,7 @@ drwxr-xr-x 2 root root 4096 2018-05-27 20:01 ./source/a/pkgtools/scripts
-rw-r--r-- 1 root root 9155 2018-04-28 19:11 ./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 8305 2018-04-28 19:11 ./source/a/pkgtools/scripts/setup.services
--rw-r--r-- 1 root root 14469 2018-05-31 19:38 ./source/a/pkgtools/scripts/upgradepkg
+-rw-r--r-- 1 root root 14070 2018-06-08 19:59 ./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 2018-04-23 17:20 ./source/a/plzip
-rw-r--r-- 1 root root 53414 2018-02-10 18:28 ./source/a/plzip/plzip-1.7.tar.lz
@@ -6305,14 +6305,14 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/vbetool
-rw-r--r-- 1 root root 24915 2015-12-20 20:37 ./source/ap/vbetool/vbetool-1.2.2.tar.gz
-rwxr-xr-x 1 root root 3202 2018-04-23 17:20 ./source/ap/vbetool/vbetool.SlackBuild
-rw-r--r-- 1 root root 129 2008-11-24 18:23 ./source/ap/vbetool/vbetool.info
-drwxr-xr-x 2 root root 4096 2018-05-28 18:59 ./source/ap/vim
+drwxr-xr-x 2 root root 4096 2018-06-08 19:32 ./source/ap/vim
-rw-r--r-- 1 root root 299348 2009-07-09 22:03 ./source/ap/vim/ctags-5.8.tar.xz
-rw-r--r-- 1 root root 118 2006-08-23 23:20 ./source/ap/vim/doinst.sh.gz
-rw-r--r-- 1 root root 4192 2018-01-17 00:56 ./source/ap/vim/gvim.desktop
-rw-r--r-- 1 root root 8249 2006-01-19 17:01 ./source/ap/vim/gvim.png
-rw-r--r-- 1 root root 834 2018-02-27 06:13 ./source/ap/vim/slack-desc.vim
-rw-r--r-- 1 root root 959 2018-03-15 02:41 ./source/ap/vim/slack-desc.vim-gvim
--rw-r--r-- 1 root root 8606081 2018-05-28 18:58 ./source/ap/vim/vim-8.1.0026.tar.lz
+-rw-r--r-- 1 root root 8608330 2018-06-08 19:31 ./source/ap/vim/vim-8.1.0039.tar.lz
-rwxr-xr-x 1 root root 6481 2018-05-19 03:58 ./source/ap/vim/vim-gvim.SlackBuild
-rwxr-xr-x 1 root root 7073 2018-05-19 03:58 ./source/ap/vim/vim.SlackBuild
-rw-r--r-- 1 root root 272 2016-08-11 16:46 ./source/ap/vim/vim.vimrc.diff.gz
@@ -7922,7 +7922,7 @@ drwxr-xr-x 2 root root 4096 2018-02-27 06:35 ./source/kdei/kde-l10n/slack
-rw-r--r-- 1 root root 648 2018-02-27 06:35 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-wa
-rw-r--r-- 1 root root 698 2018-02-27 06:37 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_CN
-rw-r--r-- 1 root root 687 2018-02-27 06:37 ./source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-zh_TW
-drwxr-xr-x 312 root root 12288 2018-05-30 16:45 ./source/l
+drwxr-xr-x 312 root root 12288 2018-06-08 19:29 ./source/l
drwxr-xr-x 3 root root 4096 2018-04-23 17:20 ./source/l/ConsoleKit2
-rw-r--r-- 1 root root 705880 2015-08-10 06:49 ./source/l/ConsoleKit2/ConsoleKit2-1.0.0.tar.xz
-rwxr-xr-x 1 root root 5303 2018-04-23 17:20 ./source/l/ConsoleKit2/ConsoleKit2.SlackBuild
@@ -8310,14 +8310,14 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/l/glib2
-rw-r--r-- 1 root root 999 2011-03-27 21:04 ./source/l/glib2/libglib2.csh
-rw-r--r-- 1 root root 982 2008-03-18 07:08 ./source/l/glib2/libglib2.sh
-rw-r--r-- 1 root root 688 2018-02-27 06:12 ./source/l/glib2/slack-desc
-drwxr-xr-x 3 root root 4096 2018-04-23 17:20 ./source/l/glibc
--rw-r--r-- 1 root root 6747 2016-08-16 16:25 ./source/l/glibc/doinst.sh-glibc
--rw-r--r-- 1 root root 4772 2014-05-04 22:16 ./source/l/glibc/doinst.sh-glibc-solibs
+drwxr-xr-x 3 root root 4096 2018-06-08 19:30 ./source/l/glibc
+-rw-r--r-- 1 root root 7742 2018-06-07 22:31 ./source/l/glibc/doinst.sh-glibc
+-rw-r--r-- 1 root root 5766 2018-06-07 22:31 ./source/l/glibc/doinst.sh-glibc-solibs
-rw-r--r-- 1 root root 15395316 2018-02-01 20:39 ./source/l/glibc/glibc-2.27.tar.xz
-rw-r--r-- 1 root root 801 2018-02-01 20:39 ./source/l/glibc/glibc-2.27.tar.xz.sig
-rw-r--r-- 1 root root 2617 2016-08-08 14:05 ./source/l/glibc/glibc-c-utf8-locale.patch.gz
-rwxr-xr-x 1 root root 174 2004-08-09 06:21 ./source/l/glibc/glibc-cvs-checkout.sh
--rwxr-xr-x 1 root root 13832 2018-04-23 17:20 ./source/l/glibc/glibc.SlackBuild
+-rwxr-xr-x 1 root root 13832 2018-06-07 21:33 ./source/l/glibc/glibc.SlackBuild
-rw-r--r-- 1 root root 309 2018-02-05 05:07 ./source/l/glibc/glibc.locale.no-archive.diff.gz
-rw-r--r-- 1 root root 648 2018-04-14 19:08 ./source/l/glibc/glibc.pkey_get.56170e0.diff.gz
-rw-r--r-- 1 root root 213 2006-08-22 06:33 ./source/l/glibc/glibc.ru_RU.CP1251.diff.gz
@@ -8329,7 +8329,6 @@ drwxr-xr-x 2 root root 4096 2006-09-14 06:32 ./source/l/glibc/profile.d
-rw-r--r-- 1 root root 811 2018-02-27 06:12 ./source/l/glibc/slack-desc.glibc-i18n
-rw-r--r-- 1 root root 968 2018-02-27 06:12 ./source/l/glibc/slack-desc.glibc-profile
-rw-r--r-- 1 root root 783 2018-02-27 06:12 ./source/l/glibc/slack-desc.glibc-solibs
--rw-r--r-- 1 root root 1248 2018-02-27 06:43 ./source/l/glibc/slack-desc.glibc-solibs-linuxthreads
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/l/glibmm
-rw-r--r-- 1 root root 6859520 2018-03-31 09:51 ./source/l/glibmm/glibmm-2.56.0.tar.xz
-rwxr-xr-x 1 root root 3602 2018-04-23 17:20 ./source/l/glibmm/glibmm.SlackBuild
@@ -9811,8 +9810,8 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/gnupg
-rw-r--r-- 1 root root 2660120 2017-07-19 09:24 ./source/n/gnupg/gnupg-1.4.22.tar.xz
-rwxr-xr-x 1 root root 3720 2018-04-23 17:20 ./source/n/gnupg/gnupg.SlackBuild
-rw-r--r-- 1 root root 822 2018-02-27 06:13 ./source/n/gnupg/slack-desc.gnupg
-drwxr-xr-x 2 root root 4096 2018-05-03 12:14 ./source/n/gnupg2
--rw-r--r-- 1 root root 4689619 2018-05-02 19:35 ./source/n/gnupg2/gnupg-2.2.7.tar.lz
+drwxr-xr-x 2 root root 4096 2018-06-08 18:57 ./source/n/gnupg2
+-rw-r--r-- 1 root root 4694045 2018-06-08 10:11 ./source/n/gnupg2/gnupg-2.2.8.tar.lz
-rwxr-xr-x 1 root root 4232 2018-05-03 12:14 ./source/n/gnupg2/gnupg2.SlackBuild
-rw-r--r-- 1 root root 1052 2018-05-28 20:05 ./source/n/gnupg2/slack-desc
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/gnutls
@@ -12453,7 +12452,7 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/xfce4-clipman-
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/xfce4-dev-tools
-rw-r--r-- 1 root root 820 2018-02-27 06:13 ./source/xfce/xfce4-dev-tools/slack-desc
-rw-r--r-- 1 root root 254756 2015-02-28 14:35 ./source/xfce/xfce4-dev-tools/xfce4-dev-tools-4.12.0.tar.xz
--rwxr-xr-x 1 root root 4592 2018-04-23 17:20 ./source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
+-rwxr-xr-x 1 root root 4592 2018-04-23 17:20 ./source/xfce/xfce4-dev-tools/xfce4-dev-tools.SlackBuild
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/xfce4-notifyd
-rw-r--r-- 1 root root 174 2009-02-26 05:47 ./source/xfce/xfce4-notifyd/doinst.sh.gz
-rw-r--r-- 1 root root 839 2018-03-01 19:39 ./source/xfce/xfce4-notifyd/slack-desc
diff --git a/source/a/pkgtools/manpages/upgradepkg.8 b/source/a/pkgtools/manpages/upgradepkg.8
index af526648..757d6003 100644
--- a/source/a/pkgtools/manpages/upgradepkg.8
+++ b/source/a/pkgtools/manpages/upgradepkg.8
@@ -66,7 +66,12 @@ If the old and new packages have the same name, a single argument is all that
is required. If the packages have different names, supply the name of the
old package followed by a percent symbol (%), then the name of the new package.
Do not add any extra whitespace between pairs of old/new package names.
-
+.P
+Before upgrading a package, save any configuration files (such as in /etc)
+that you wish to keep. Sometimes these will be preserved, but it depends on
+the package structure. If you want to force new versions of the config files
+to be installed, remove the old ones manually prior to running upgradepkg.
+.P
If upgradepkg finds more than one installed package matching the old package's
name, it will remove them all.
.TP
@@ -101,11 +106,6 @@ Maximum line length of --terse mode output. Default is the number of terminal co
.TP
.B \--verbose
Show all the gory details of the upgrade.
-.SH BUGS
-Before upgrading a package, save any configuration files (such as in /etc)
-that you wish to keep. Sometimes these will be preserved, but it depends on
-the package structure. If you want to force new versions of the config files
-to be installed, remove the old ones manually prior to running upgradepkg.
.SH AUTHOR
Patrick J. Volkerding <volkerdi@slackware.com>
.SH "SEE ALSO"
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index 15e0fb1b..f0cc6da4 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:-15}
+BUILD=${BUILD:-16}
# 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/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index 1acae7d6..500a970a 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -62,27 +62,24 @@ pkgbase() {
usage() {
cat << EOF
-Usage: upgradepkg newpackage [newpackage2 ... ]
- upgradepkg oldpackage%newpackage [oldpackage2%newpackage2 ... ]
-
-Upgradepkg upgrades a Slackware package (.tgz, .tbz, .tlz, .txz) from an
-older version to a newer one. It does this by INSTALLING the new package
-onto the system, and then REMOVING any files from the old package that
-aren't in the new package. If the old and new packages have the same
-name, a single argument is all that is required. If the packages have
-different names, supply the name of the old package followed by a percent
-symbol (%), then the name of the new package. Do not add any extra
-whitespace between pairs of old/new package names.
-
-Before upgrading a package, save any configuration files (such as in /etc)
-that you wish to keep. Sometimes these will be preserved, but it depends
-on the package. If you want to force new versions of the config files
-to be installed, remove the old ones manually prior to running upgradepkg.
-
-To upgrade in a directory other than / (such as /mnt):
-
- ROOT=/mnt upgradepkg package.tgz (or .tbz, .tlz, .txz)
-
+Usage: upgradepkg [options] <newpackage> ...
+ upgradepkg [options] <oldpackage%newpackage> ...
+
+Upgrade, install, or reinstall Slackware packages (.tgz, .tbz, .tlz, .txz).
+
+To operate on an alternate directory, such as /mnt:
+ ROOT=/mnt upgradepkg package.txz
+
+Options:
+ --dry-run only display what would be done
+ --install-new install new packages also
+ --reinstall upgrade packages of the same version
+ --terse display a single line for each package operation
+ --terselength <length> maximum line length of terse output
+ --verbose display all the gory details of the upgrade
+ --help display this help
+
+For more details see upgradepkg(8).
EOF
}
@@ -106,7 +103,7 @@ else
fi
# --help or no args?
-if [ "$1" = "" -o "$1" = "--help" -o "$1" = "-?" ]; then
+if [ "$1" = "" -o "$1" = "-help" -o "$1" = "--help" -o "$1" = "-?" ]; then
usage;
exit 1;
fi
@@ -208,7 +205,7 @@ for ARG; do
# Simple package integrity check:
if ! [ -f "$NEW" ]; then
ERRCODE=4
- ! [ $TERSE ] && echo "Cannot install $ARG: file not found"
+ echo "Cannot install $NEW: file not found"
continue;
fi
@@ -224,7 +221,7 @@ for ARG; do
# Make sure the extension is valid:
if [ "$NNAME" = "$NEW" ]; then
# We won't throw an ERRCODE for this, but the package is skipped:
- ! [ $TERSE ] && echo "Cannot install $OLD: invalid package extension"
+ echo "Cannot install $OLD: invalid package extension"
continue;
fi
@@ -250,7 +247,7 @@ for ARG; do
echo "$OLD would not be upgraded (no installed package named $SHORT)."
else
! [ $TERSE ] && echo
- ! [ $TERSE ] && echo "Error: there is no installed package named $OLD."
+ echo "Error: there is no installed package named $OLD."
! [ $TERSE ] && echo " (looking for $ROOT/var/log/packages/$OLD)"
! [ $TERSE ] && echo
fi
@@ -286,7 +283,7 @@ EOF
echo "$NEW incoming package not found (command line)."
else
! [ $TERSE ] && echo
- ! [ $TERSE ] && echo "Error: incoming package $INCOMINGDIR/$NNAME not found."
+ echo "Error: incoming package $INCOMINGDIR/$NNAME not found."
! [ $TERSE ] && echo
fi
ERRCODE=1
diff --git a/source/l/glibc/doinst.sh-glibc b/source/l/glibc/doinst.sh-glibc
index fc947587..e9929739 100644
--- a/source/l/glibc/doinst.sh-glibc
+++ b/source/l/glibc/doinst.sh-glibc
@@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (C) 2002, 2005 Slackware Linux, Inc.
-# Copyright 2005, 2006, 2007, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005, 2006, 2007, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -35,30 +35,55 @@ if [ -d lib/tls ]; then
mv lib/tls lib/obsolete
fi
if [ -x sbin/ldconfig ]; then
- sbin/ldconfig -r .
+ sbin/ldconfig -r . 2> /dev/null
fi
# Install NPTL glibc libraries:
if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly
- # First create copies of the incoming libraries:
- ( cd lib/incoming
- for file in * ; do
- if [ ! -r ../${file}.incoming ]; then
- cp -a $file ../${file}.incoming
- fi
- done
- )
- # Then switch to them all at once:
- /sbin/ldconfig -l lib/*.incoming 2> /dev/null
- # Finally, rename them and clean up:
- ( cd lib
- for file in *.incoming ; do
- rm -f `basename $file .incoming`
- cp -a $file `basename $file .incoming`
- /sbin/ldconfig -l `basename $file .incoming`
- rm -f $file
- done
- )
+ # Try to protect with flock against another installpkg/removepkg running
+ # ldconfig while we're doing the on-the-fly install:
+ mkdir -p run/lock/pkgtools
+ ( flock 9 || exit 11
+ # First create copies of the incoming libraries:
+ ( cd lib/incoming
+ for file in * ; do
+ if [ ! -r ../${file}.incoming ]; then
+ cp -a $file ../${file}.incoming
+ fi
+ done
+ )
+ # Then switch to them all at once:
+ /sbin/ldconfig -l lib/*.incoming 2> /dev/null
+ # Remove old versions of the glibc libraries. If you really don't want to
+ # do this for some reason, create a file /etc/glibc-nowipe.
+ if [ ! -r etc/glibc-nowipe ]; then
+ ( cd lib
+ for INCOMING in incoming/*-* ; do
+ LIBPREFIX=$(basename $INCOMING | cut -f 1 -d -)
+ for LIBRARY in ${LIBPREFIX}-* ; do
+ # Don't remove the library if it ends in .incoming:
+ if [ "$(echo $LIBRARY | rev | cut -f 1 -d .)" = "gnimocni" ]; then
+ continue
+ fi
+ # Don't remove symlinks:
+ if [ -L $LIBRARY ]; then
+ continue
+ fi
+ rm -f $LIBRARY
+ done
+ done
+ )
+ fi
+ # Finally, rename them and clean up:
+ ( cd lib
+ for file in *.incoming ; do
+ rm -f `basename $file .incoming`
+ cp -a $file `basename $file .incoming`
+ /sbin/ldconfig -l `basename $file .incoming` 2> /dev/null
+ rm -f $file
+ done
+ )
+ ) 9> run/lock/pkgtools/ldconfig.lock
else # no ldconfig? Good, it's safe to just jam it on home (and make links below):
( cd lib/incoming
for file in * ; do
diff --git a/source/l/glibc/doinst.sh-glibc-solibs b/source/l/glibc/doinst.sh-glibc-solibs
index a11c36a5..a285f4ed 100644
--- a/source/l/glibc/doinst.sh-glibc-solibs
+++ b/source/l/glibc/doinst.sh-glibc-solibs
@@ -1,6 +1,6 @@
#!/bin/sh
# Copyright (C) 2002, 2005 Slackware Linux, Inc.
-# Copyright 2005, 2006, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005, 2006, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -35,30 +35,55 @@ if [ -d lib/tls ]; then
mv lib/tls lib/obsolete
fi
if [ -x sbin/ldconfig ]; then
- sbin/ldconfig -r .
+ sbin/ldconfig -r . 2> /dev/null
fi
# Install NPTL glibc libraries:
if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly
- # First create copies of the incoming libraries:
- ( cd lib/incoming
- for file in * ; do
- if [ ! -r ../${file}.incoming ]; then
- cp -a $file ../${file}.incoming
- fi
- done
- )
- # Then switch to them all at once:
- /sbin/ldconfig -l lib/*.incoming 2> /dev/null
- # Finally, rename them and clean up:
- ( cd lib
- for file in *.incoming ; do
- rm -f `basename $file .incoming`
- cp -a $file `basename $file .incoming`
- /sbin/ldconfig -l `basename $file .incoming`
- rm -f $file
- done
- )
+ # Try to protect with flock against another installpkg/removepkg running
+ # ldconfig while we're doing the on-the-fly install:
+ mkdir -p run/lock/pkgtools
+ ( flock 9 || exit 11
+ # First create copies of the incoming libraries:
+ ( cd lib/incoming
+ for file in * ; do
+ if [ ! -r ../${file}.incoming ]; then
+ cp -a $file ../${file}.incoming
+ fi
+ done
+ )
+ # Then switch to them all at once:
+ /sbin/ldconfig -l lib/*.incoming 2> /dev/null
+ # Remove old versions of the glibc libraries. If you really don't want to
+ # do this for some reason, create a file /etc/glibc-nowipe.
+ if [ ! -r etc/glibc-nowipe ]; then
+ ( cd lib
+ for INCOMING in incoming/*-* ; do
+ LIBPREFIX=$(basename $INCOMING | cut -f 1 -d -)
+ for LIBRARY in ${LIBPREFIX}-* ; do
+ # Don't remove the library if it ends in .incoming:
+ if [ "$(echo $LIBRARY | rev | cut -f 1 -d .)" = "gnimocni" ]; then
+ continue
+ fi
+ # Don't remove symlinks:
+ if [ -L $LIBRARY ]; then
+ continue
+ fi
+ rm -f $LIBRARY
+ done
+ done
+ )
+ fi
+ # Finally, rename them and clean up:
+ ( cd lib
+ for file in *.incoming ; do
+ rm -f `basename $file .incoming`
+ cp -a $file `basename $file .incoming`
+ /sbin/ldconfig -l `basename $file .incoming` 2> /dev/null
+ rm -f $file
+ done
+ )
+ ) 9> run/lock/pkgtools/ldconfig.lock
else # no ldconfig? Good, it's safe to just jam it on home (and make links below):
( cd lib/incoming
for file in * ; do
@@ -134,4 +159,3 @@ fi
if [ -x /sbin/telinit ]; then
/sbin/telinit u
fi
-
diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild
index b5fdf021..57479292 100755
--- a/source/l/glibc/glibc.SlackBuild
+++ b/source/l/glibc/glibc.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glibc
VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# I was considering disabling NSCD, but MoZes talked me out of it. :)
#DISABLE_NSCD=" --disable-nscd "
diff --git a/source/l/glibc/slack-desc.glibc-solibs-linuxthreads b/source/l/glibc/slack-desc.glibc-solibs-linuxthreads
deleted file mode 100644
index fd91f4c5..00000000
--- a/source/l/glibc/slack-desc.glibc-solibs-linuxthreads
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-glibc-solibs-linuxthreads: glibc-solibs-linuxthreads (LinuxThreads shared GNU C libraries)
-glibc-solibs-linuxthreads:
-glibc-solibs-linuxthreads: This package contains the shared libraries for glibc that uses
-glibc-solibs-linuxthreads: LinuxThreads, the threading implementation in Linux 2.4.x and
-glibc-solibs-linuxthreads: earlier kernels. In some cases you'll need to use these libraries
-glibc-solibs-linuxthreads: to run old binaries by setting these environment variables:
-glibc-solibs-linuxthreads: export LD_ASSUME_KERNEL=2.4.33
-glibc-solibs-linuxthreads: export LD_LIBRARY_PATH=/lib/obsolete/linuxthreads
-glibc-solibs-linuxthreads: old-program
-glibc-solibs-linuxthreads: Most users should have no need for this package. Recompile. :-)
-glibc-solibs-linuxthreads: