summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-03-18 23:54:14 +0000
committer Eric Hameleers <alien@slackware.com>2021-03-19 08:59:51 +0100
commitda4119a5e08aaa161e577324030abde7a21a2b81 (patch)
tree9028fe8c2b687c14bba95261a8cc6d3582a79ec7
parent1b9db3bbdd03829675039f602457316463410699 (diff)
downloadcurrent-da4119a5e08aaa161e577324030abde7a21a2b81.tar.gz
current-da4119a5e08aaa161e577324030abde7a21a2b81.tar.xz
Thu Mar 18 23:54:14 UTC 202120210318235414
ap/slackpkg-15.0.1-noarch-1.txz: Upgraded. Tweak default blacklist file's help text (thanks, dive). Fix display of blacklisted packages. Tweaks to slack-desc. Note that kernel-headers should not be blacklisted. Added Lithuania mirrors (Totoro-kun on LQ). Fix exit code for pending updates (dive). Avoid matching txz/tgz etc extension when blacklisting (dive). Use https for all slackpkg homepage links. Update mirror files (14.2 -> 15.0). Add blacklist to search option. Move applyblacklist to end of makelist(). Clarify how to blacklist duplicate packages. Fix new-config dialog. Reduce false positives in DOUBLEFILES detection. Remove spaces in awk.. More blacklisting fixups (see full commit msg). Escape plus signs in blacklist regex. Convert ${ROOT}/${WORKDIR} > ${WORKDIR} (dive). Convert ${ROOT}/${CONF} -> ${CONF} and tweak blacklists (dive). Further fixup/enhancement to blacklisting issues. Fix "slackpkg blacklist" so that it shows blacklist again. Fixup internal blacklist handling. Use ERE for sanity_check() function (David Woodfall). Remove "slackpkg blacklist" from manual pages. Fix aaa_elflibs --> aaa_libraries in sample blacklist file (mozes). Split aarch64 and arm mirrors into separate files (mozes). Allow new-config after slackpkg upgrade itself (PiterPUNK). Modify blacklist regex line ending. Thanks to Robby Workman. ap/sqlite-3.35.2-x86_64-1.txz: Upgraded. kde/kid3-3.8.6-x86_64-1.txz: Upgraded. l/glib2-2.66.8-x86_64-1.txz: Upgraded. l/pango-1.48.3-x86_64-2.txz: Rebuilt. Eliminate dangling symlink. Thanks to upnort. n/bind-9.16.13-x86_64-1.txz: Upgraded. n/links-2.22-x86_64-1.txz: Upgraded. n/network-scripts-15.0-noarch-14.txz: Rebuilt. Fix discrepancies between rc.inet1.conf versions. Move configuration of SLACC before DHCP. Don't bring up a bridge interface if it will be brought up later by IP config. Fix a typo in br_open when configuring IFOPTS: i->1. Add SLAAC security and privacy options. Fix typo of 'default'. Added debugging output around new SLAAC enhancements. Move enabling RA before SLAAC security section. Thanks to davjohn on LQ. Fix domain name validation checks. Thanks to xbeastx74 on LQ for the report. Thanks to Darren "Tadgy" Austin and Robby Workman. n/wireless_tools-30.pre9-x86_64-5.txz: Rebuilt. rc.wireless: don't leave interfaces in up state as it prevents SLAAC. Take interface down at exit from rc.wireless. Thanks to davjohn. x/libgee-0.20.4-x86_64-1.txz: Upgraded.
-rw-r--r--ChangeLog.rss66
-rw-r--r--ChangeLog.txt54
-rw-r--r--FILELIST.TXT292
-rwxr-xr-xrecompress.sh1
-rw-r--r--source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch25
-rw-r--r--source/ap/slackpkg/doinst.sh3
-rw-r--r--source/ap/slackpkg/files/ChangeLog36
-rw-r--r--source/ap/slackpkg/files/blacklist.new9
-rw-r--r--source/ap/slackpkg/files/core-functions.sh191
-rw-r--r--source/ap/slackpkg/files/cutpkg.awk4
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/de.slackpkg12
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/el.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/es.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/fa.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/fr.slackpkg12
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/id.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/it.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/nb.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/nl.slackpkg12
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/pl.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/ru.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/sv.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/tr.slackpkg11
-rw-r--r--source/ap/slackpkg/files/manpages-l10n/uk.slackpkg9
-rw-r--r--source/ap/slackpkg/files/mirrors-aarch64.sample68
-rw-r--r--source/ap/slackpkg/files/mirrors-arm.sample15
-rw-r--r--source/ap/slackpkg/files/mirrors-s390.sample2
-rw-r--r--source/ap/slackpkg/files/mirrors-x86.sample238
-rw-r--r--source/ap/slackpkg/files/mirrors-x86_64.sample234
-rw-r--r--source/ap/slackpkg/files/post-functions.sh133
-rw-r--r--source/ap/slackpkg/files/slackpkg37
-rw-r--r--source/ap/slackpkg/files/slackpkg.813
-rw-r--r--source/ap/slackpkg/files/slackpkg.conf.52
-rw-r--r--source/ap/slackpkg/files/slackpkg.conf.new2
-rw-r--r--source/ap/slackpkg/slack-desc4
-rwxr-xr-xsource/ap/slackpkg/slackpkg.SlackBuild9
-rw-r--r--source/kde/kde/build/kid32
-rwxr-xr-xsource/l/glib2/glib2.SlackBuild2
-rwxr-xr-xsource/l/pango/pango.SlackBuild3
-rw-r--r--source/n/bind/bind-9.16.11.CVE-2020-8625.diff12
-rwxr-xr-xsource/n/bind/bind.SlackBuild6
-rwxr-xr-xsource/n/links/links.SlackBuild2
-rw-r--r--source/n/network-scripts/modprobe.d/modprobe.d/bonding.conf9
-rw-r--r--source/n/network-scripts/modprobe.d/modprobe.d/ipv6.conf8
-rwxr-xr-xsource/n/network-scripts/network-scripts.SlackBuild2
-rw-r--r--source/n/network-scripts/scripts/netconfig18
-rw-r--r--source/n/network-scripts/scripts/rc.inet191
-rw-r--r--source/n/network-scripts/scripts/rc.inet1.conf18
-rw-r--r--source/n/wireless_tools/scripts/rc.wireless13
-rwxr-xr-xsource/n/wireless_tools/wireless_tools.SlackBuild2
-rwxr-xr-xsource/x/libgee/libgee.SlackBuild2
53 files changed, 967 insertions, 838 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index 36141d2b..9e09b968 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,72 @@
<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, 18 Mar 2021 04:01:02 GMT</pubDate>
- <lastBuildDate>Thu, 18 Mar 2021 07:59:38 GMT</lastBuildDate>
+ <pubDate>Thu, 18 Mar 2021 23:54:14 GMT</pubDate>
+ <lastBuildDate>Fri, 19 Mar 2021 07:59:43 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.12</generator>
<item>
+ <title>Thu, 18 Mar 2021 23:54:14 GMT</title>
+ <pubDate>Thu, 18 Mar 2021 23:54:14 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20210318235414</link>
+ <guid isPermaLink="false">20210318235414</guid>
+ <description>
+ <![CDATA[<pre>
+ap/slackpkg-15.0.1-noarch-1.txz: Upgraded.
+ Tweak default blacklist file's help text (thanks, dive).
+ Fix display of blacklisted packages.
+ Tweaks to slack-desc.
+ Note that kernel-headers should not be blacklisted.
+ Added Lithuania mirrors (Totoro-kun on LQ).
+ Fix exit code for pending updates (dive).
+ Avoid matching txz/tgz etc extension when blacklisting (dive).
+ Use https for all slackpkg homepage links.
+ Update mirror files (14.2 -> 15.0).
+ Add blacklist to search option.
+ Move applyblacklist to end of makelist().
+ Clarify how to blacklist duplicate packages.
+ Fix new-config dialog.
+ Reduce false positives in DOUBLEFILES detection.
+ Remove spaces in awk..
+ More blacklisting fixups (see full commit msg).
+ Escape plus signs in blacklist regex.
+ Convert ${ROOT}/${WORKDIR} > ${WORKDIR} (dive).
+ Convert ${ROOT}/${CONF} -> ${CONF} and tweak blacklists (dive).
+ Further fixup/enhancement to blacklisting issues.
+ Fix "slackpkg blacklist" so that it shows blacklist again.
+ Fixup internal blacklist handling.
+ Use ERE for sanity_check() function (David Woodfall).
+ Remove "slackpkg blacklist" from manual pages.
+ Fix aaa_elflibs --> aaa_libraries in sample blacklist file (mozes).
+ Split aarch64 and arm mirrors into separate files (mozes).
+ Allow new-config after slackpkg upgrade itself (PiterPUNK).
+ Modify blacklist regex line ending.
+ Thanks to Robby Workman.
+ap/sqlite-3.35.2-x86_64-1.txz: Upgraded.
+kde/kid3-3.8.6-x86_64-1.txz: Upgraded.
+l/glib2-2.66.8-x86_64-1.txz: Upgraded.
+l/pango-1.48.3-x86_64-2.txz: Rebuilt.
+ Eliminate dangling symlink. Thanks to upnort.
+n/bind-9.16.13-x86_64-1.txz: Upgraded.
+n/links-2.22-x86_64-1.txz: Upgraded.
+n/network-scripts-15.0-noarch-14.txz: Rebuilt.
+ Fix discrepancies between rc.inet1.conf versions.
+ Move configuration of SLACC before DHCP.
+ Don't bring up a bridge interface if it will be brought up later by IP config.
+ Fix a typo in br_open when configuring IFOPTS: i->1.
+ Add SLAAC security and privacy options.
+ Fix typo of 'default'.
+ Added debugging output around new SLAAC enhancements.
+ Move enabling RA before SLAAC security section. Thanks to davjohn on LQ.
+ Fix domain name validation checks. Thanks to xbeastx74 on LQ for the report.
+ Thanks to Darren "Tadgy" Austin and Robby Workman.
+n/wireless_tools-30.pre9-x86_64-5.txz: Rebuilt.
+ rc.wireless: don't leave interfaces in up state as it prevents SLAAC.
+ Take interface down at exit from rc.wireless. Thanks to davjohn.
+x/libgee-0.20.4-x86_64-1.txz: Upgraded.
+ </pre>]]>
+ </description>
+ </item>
+ <item>
<title>Thu, 18 Mar 2021 04:01:02 GMT</title>
<pubDate>Thu, 18 Mar 2021 04:01:02 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20210318040102</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 25c26f27..2e3fb4fd 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,57 @@
+Thu Mar 18 23:54:14 UTC 2021
+ap/slackpkg-15.0.1-noarch-1.txz: Upgraded.
+ Tweak default blacklist file's help text (thanks, dive).
+ Fix display of blacklisted packages.
+ Tweaks to slack-desc.
+ Note that kernel-headers should not be blacklisted.
+ Added Lithuania mirrors (Totoro-kun on LQ).
+ Fix exit code for pending updates (dive).
+ Avoid matching txz/tgz etc extension when blacklisting (dive).
+ Use https for all slackpkg homepage links.
+ Update mirror files (14.2 -> 15.0).
+ Add blacklist to search option.
+ Move applyblacklist to end of makelist().
+ Clarify how to blacklist duplicate packages.
+ Fix new-config dialog.
+ Reduce false positives in DOUBLEFILES detection.
+ Remove spaces in awk..
+ More blacklisting fixups (see full commit msg).
+ Escape plus signs in blacklist regex.
+ Convert ${ROOT}/${WORKDIR} > ${WORKDIR} (dive).
+ Convert ${ROOT}/${CONF} -> ${CONF} and tweak blacklists (dive).
+ Further fixup/enhancement to blacklisting issues.
+ Fix "slackpkg blacklist" so that it shows blacklist again.
+ Fixup internal blacklist handling.
+ Use ERE for sanity_check() function (David Woodfall).
+ Remove "slackpkg blacklist" from manual pages.
+ Fix aaa_elflibs --> aaa_libraries in sample blacklist file (mozes).
+ Split aarch64 and arm mirrors into separate files (mozes).
+ Allow new-config after slackpkg upgrade itself (PiterPUNK).
+ Modify blacklist regex line ending.
+ Thanks to Robby Workman.
+ap/sqlite-3.35.2-x86_64-1.txz: Upgraded.
+kde/kid3-3.8.6-x86_64-1.txz: Upgraded.
+l/glib2-2.66.8-x86_64-1.txz: Upgraded.
+l/pango-1.48.3-x86_64-2.txz: Rebuilt.
+ Eliminate dangling symlink. Thanks to upnort.
+n/bind-9.16.13-x86_64-1.txz: Upgraded.
+n/links-2.22-x86_64-1.txz: Upgraded.
+n/network-scripts-15.0-noarch-14.txz: Rebuilt.
+ Fix discrepancies between rc.inet1.conf versions.
+ Move configuration of SLACC before DHCP.
+ Don't bring up a bridge interface if it will be brought up later by IP config.
+ Fix a typo in br_open when configuring IFOPTS: i->1.
+ Add SLAAC security and privacy options.
+ Fix typo of 'default'.
+ Added debugging output around new SLAAC enhancements.
+ Move enabling RA before SLAAC security section. Thanks to davjohn on LQ.
+ Fix domain name validation checks. Thanks to xbeastx74 on LQ for the report.
+ Thanks to Darren "Tadgy" Austin and Robby Workman.
+n/wireless_tools-30.pre9-x86_64-5.txz: Rebuilt.
+ rc.wireless: don't leave interfaces in up state as it prevents SLAAC.
+ Take interface down at exit from rc.wireless. Thanks to davjohn.
+x/libgee-0.20.4-x86_64-1.txz: Upgraded.
++--------------------------+
Thu Mar 18 04:01:02 UTC 2021
Hope everyone had a fine St. Paddy's day! :-)
a/kernel-generic-5.10.24-x86_64-1.txz: Upgraded.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 140a49a0..a7a25b8b 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Thu Mar 18 04:05:57 UTC 2021
+Thu Mar 18 23:57:09 UTC 2021
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 2021-03-18 04:01 .
+drwxr-xr-x 12 root root 4096 2021-03-18 23:54 .
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
-rw-r--r-- 1 root root 15339 2021-02-28 22:06 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 1070346 2021-03-16 18:49 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2021-03-16 18:49 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 1070346 2021-03-18 04:06 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2021-03-18 04:06 ./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 1416074 2021-03-18 04:01 ./ChangeLog.txt
+-rw-r--r-- 1 root root 1418663 2021-03-18 23:54 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2021-03-18 04:00 ./EFI/BOOT
-rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2021-03-18 04:00 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r-- 1 root root 1395230 2021-03-16 18:49 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1395230 2021-03-18 04:05 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 844533 2021-03-18 04:05 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 844536 2021-03-18 23:56 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
-rw-r--r-- 1 root root 3635 2021-03-18 03:46 ./README.initrd
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
@@ -714,11 +714,11 @@ 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 17 root root 4096 2021-03-18 04:05 ./slackware64
--rw-r--r-- 1 root root 330296 2021-03-18 04:05 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2021-03-18 04:05 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 409909 2021-03-18 04:04 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 4004784 2021-03-18 04:04 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 17 root root 4096 2021-03-18 23:56 ./slackware64
+-rw-r--r-- 1 root root 330302 2021-03-18 23:56 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2021-03-18 23:56 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 409915 2021-03-18 23:56 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 4009874 2021-03-18 23:56 ./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 2021-03-18 04:04 ./slackware64/a
-rw-r--r-- 1 root root 327 2021-02-13 10:54 ./slackware64/a/aaa_base-14.2-x86_64-7.txt
@@ -1101,7 +1101,7 @@ drwxr-xr-x 2 root root 28672 2021-03-18 04:04 ./slackware64/a
-rw-r--r-- 1 root root 540 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txt
-rw-r--r-- 1 root root 56160 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:22 ./slackware64/a/zoo-2.10_22-x86_64-4.txz.asc
-drwxr-xr-x 2 root root 20480 2021-03-16 18:47 ./slackware64/ap
+drwxr-xr-x 2 root root 20480 2021-03-18 23:56 ./slackware64/ap
-rw-r--r-- 1 root root 291 2021-02-13 11:23 ./slackware64/ap/a2ps-4.14-x86_64-9.txt
-rw-r--r-- 1 root root 703580 2021-02-13 11:23 ./slackware64/ap/a2ps-4.14-x86_64-9.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:23 ./slackware64/ap/a2ps-4.14-x86_64-9.txz.asc
@@ -1301,18 +1301,18 @@ drwxr-xr-x 2 root root 20480 2021-03-16 18:47 ./slackware64/ap
-rw-r--r-- 1 root root 452 2021-02-13 11:43 ./slackware64/ap/seejpeg-1.10-x86_64-4.txt
-rw-r--r-- 1 root root 56116 2021-02-13 11:43 ./slackware64/ap/seejpeg-1.10-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:43 ./slackware64/ap/seejpeg-1.10-x86_64-4.txz.asc
--rw-r--r-- 1 root root 555 2021-02-13 11:43 ./slackware64/ap/slackpkg-15.0-noarch-3.txt
--rw-r--r-- 1 root root 178164 2021-02-13 11:43 ./slackware64/ap/slackpkg-15.0-noarch-3.txz
--rw-r--r-- 1 root root 163 2021-02-13 11:43 ./slackware64/ap/slackpkg-15.0-noarch-3.txz.asc
+-rw-r--r-- 1 root root 556 2021-03-18 23:33 ./slackware64/ap/slackpkg-15.0.1-noarch-1.txt
+-rw-r--r-- 1 root root 177712 2021-03-18 23:33 ./slackware64/ap/slackpkg-15.0.1-noarch-1.txz
+-rw-r--r-- 1 root root 163 2021-03-18 23:33 ./slackware64/ap/slackpkg-15.0.1-noarch-1.txz.asc
-rw-r--r-- 1 root root 298 2021-02-13 11:43 ./slackware64/ap/soma-3.3.7-noarch-2.txt
-rw-r--r-- 1 root root 31044 2021-02-13 11:43 ./slackware64/ap/soma-3.3.7-noarch-2.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:43 ./slackware64/ap/soma-3.3.7-noarch-2.txz.asc
-rw-r--r-- 1 root root 293 2021-02-13 11:43 ./slackware64/ap/sox-14.4.2-x86_64-8.txt
-rw-r--r-- 1 root root 387228 2021-02-13 11:43 ./slackware64/ap/sox-14.4.2-x86_64-8.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:43 ./slackware64/ap/sox-14.4.2-x86_64-8.txz.asc
--rw-r--r-- 1 root root 483 2021-03-16 17:32 ./slackware64/ap/sqlite-3.35.1-x86_64-1.txt
--rw-r--r-- 1 root root 1012516 2021-03-16 17:32 ./slackware64/ap/sqlite-3.35.1-x86_64-1.txz
--rw-r--r-- 1 root root 163 2021-03-16 17:32 ./slackware64/ap/sqlite-3.35.1-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 483 2021-03-18 18:40 ./slackware64/ap/sqlite-3.35.2-x86_64-1.txt
+-rw-r--r-- 1 root root 1012836 2021-03-18 18:40 ./slackware64/ap/sqlite-3.35.2-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2021-03-18 18:40 ./slackware64/ap/sqlite-3.35.2-x86_64-1.txz.asc
-rw-r--r-- 1 root root 584 2021-02-13 11:44 ./slackware64/ap/squashfs-tools-4.4-x86_64-4.txt
-rw-r--r-- 1 root root 136912 2021-02-13 11:44 ./slackware64/ap/squashfs-tools-4.4-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:44 ./slackware64/ap/squashfs-tools-4.4-x86_64-4.txz.asc
@@ -1605,7 +1605,7 @@ drwxr-xr-x 2 root root 4096 2021-03-18 04:04 ./slackware64/k
-rw-r--r-- 1 root root 1171 2021-03-18 03:46 ./slackware64/k/maketag
-rw-r--r-- 1 root root 1171 2021-03-18 03:46 ./slackware64/k/maketag.ez
-rw-r--r-- 1 root root 18 2021-03-18 03:46 ./slackware64/k/tagfile
-drwxr-xr-x 2 root root 77824 2021-03-16 18:47 ./slackware64/kde
+drwxr-xr-x 2 root root 77824 2021-03-18 23:56 ./slackware64/kde
-rw-r--r-- 1 root root 382 2021-03-05 18:58 ./slackware64/kde/akonadi-20.12.3-x86_64-1.txt
-rw-r--r-- 1 root root 2415612 2021-03-05 18:58 ./slackware64/kde/akonadi-20.12.3-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-03-05 18:58 ./slackware64/kde/akonadi-20.12.3-x86_64-1.txz.asc
@@ -2052,9 +2052,9 @@ drwxr-xr-x 2 root root 77824 2021-03-16 18:47 ./slackware64/kde
-rw-r--r-- 1 root root 292 2021-03-14 01:04 ./slackware64/kde/kiconthemes-5.80.0-x86_64-1.txt
-rw-r--r-- 1 root root 124588 2021-03-14 01:04 ./slackware64/kde/kiconthemes-5.80.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-03-14 01:04 ./slackware64/kde/kiconthemes-5.80.0-x86_64-1.txz.asc
--rw-r--r-- 1 root root 417 2021-02-13 16:06 ./slackware64/kde/kid3-3.8.5-x86_64-2.txt
--rw-r--r-- 1 root root 2553452 2021-02-13 16:06 ./slackware64/kde/kid3-3.8.5-x86_64-2.txz
--rw-r--r-- 1 root root 163 2021-02-13 16:06 ./slackware64/kde/kid3-3.8.5-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 417 2021-03-18 18:35 ./slackware64/kde/kid3-3.8.6-x86_64-1.txt
+-rw-r--r-- 1 root root 2556780 2021-03-18 18:35 ./slackware64/kde/kid3-3.8.6-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2021-03-18 18:35 ./slackware64/kde/kid3-3.8.6-x86_64-1.txz.asc
-rw-r--r-- 1 root root 335 2021-03-05 18:59 ./slackware64/kde/kidentitymanagement-20.12.3-x86_64-1.txt
-rw-r--r-- 1 root root 96136 2021-03-05 18:59 ./slackware64/kde/kidentitymanagement-20.12.3-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-03-05 18:59 ./slackware64/kde/kidentitymanagement-20.12.3-x86_64-1.txz.asc
@@ -2703,7 +2703,7 @@ drwxr-xr-x 2 root root 77824 2021-03-16 18:47 ./slackware64/kde
-rw-r--r-- 1 root root 296 2021-03-05 19:33 ./slackware64/kde/zeroconf-ioslave-20.12.3-x86_64-1.txt
-rw-r--r-- 1 root root 52680 2021-03-05 19:33 ./slackware64/kde/zeroconf-ioslave-20.12.3-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-03-05 19:33 ./slackware64/kde/zeroconf-ioslave-20.12.3-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 73728 2021-03-18 04:04 ./slackware64/l
+drwxr-xr-x 2 root root 73728 2021-03-18 23:56 ./slackware64/l
-rw-r--r-- 1 root root 329 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txt
-rw-r--r-- 1 root root 928148 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txz
-rw-r--r-- 1 root root 163 2021-02-13 05:56 ./slackware64/l/GConf-3.2.6-x86_64-7.txz.asc
@@ -2950,9 +2950,9 @@ drwxr-xr-x 2 root root 73728 2021-03-18 04:04 ./slackware64/l
-rw-r--r-- 1 root root 300 2021-02-13 06:33 ./slackware64/l/glib-networking-2.66.0-x86_64-3.txt
-rw-r--r-- 1 root root 120064 2021-02-13 06:33 ./slackware64/l/glib-networking-2.66.0-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 06:33 ./slackware64/l/glib-networking-2.66.0-x86_64-3.txz.asc
--rw-r--r-- 1 root root 407 2021-02-13 06:36 ./slackware64/l/glib2-2.66.7-x86_64-2.txt
--rw-r--r-- 1 root root 3942712 2021-02-13 06:36 ./slackware64/l/glib2-2.66.7-x86_64-2.txz
--rw-r--r-- 1 root root 163 2021-02-13 06:36 ./slackware64/l/glib2-2.66.7-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 407 2021-03-18 16:53 ./slackware64/l/glib2-2.66.8-x86_64-1.txt
+-rw-r--r-- 1 root root 3944696 2021-03-18 16:53 ./slackware64/l/glib2-2.66.8-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2021-03-18 16:53 ./slackware64/l/glib2-2.66.8-x86_64-1.txz.asc
-rw-r--r-- 1 root root 313 2021-02-13 05:52 ./slackware64/l/glibc-2.33-x86_64-1.txt
-rw-r--r-- 1 root root 5290396 2021-02-13 05:52 ./slackware64/l/glibc-2.33-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-02-13 05:52 ./slackware64/l/glibc-2.33-x86_64-1.txz.asc
@@ -3515,9 +3515,9 @@ drwxr-xr-x 2 root root 73728 2021-03-18 04:04 ./slackware64/l
-rw-r--r-- 1 root root 446 2021-02-13 07:34 ./slackware64/l/orc-0.4.32-x86_64-3.txt
-rw-r--r-- 1 root root 210488 2021-02-13 07:34 ./slackware64/l/orc-0.4.32-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 07:34 ./slackware64/l/orc-0.4.32-x86_64-3.txz.asc
--rw-r--r-- 1 root root 429 2021-03-13 19:57 ./slackware64/l/pango-1.48.3-x86_64-1.txt
--rw-r--r-- 1 root root 374636 2021-03-13 19:57 ./slackware64/l/pango-1.48.3-x86_64-1.txz
--rw-r--r-- 1 root root 163 2021-03-13 19:57 ./slackware64/l/pango-1.48.3-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 429 2021-03-18 21:13 ./slackware64/l/pango-1.48.3-x86_64-2.txt
+-rw-r--r-- 1 root root 374732 2021-03-18 21:13 ./slackware64/l/pango-1.48.3-x86_64-2.txz
+-rw-r--r-- 1 root root 163 2021-03-18 21:13 ./slackware64/l/pango-1.48.3-x86_64-2.txz.asc
-rw-r--r-- 1 root root 186 2021-02-13 07:35 ./slackware64/l/pangomm-2.42.2-x86_64-3.txt
-rw-r--r-- 1 root root 111740 2021-02-13 07:35 ./slackware64/l/pangomm-2.42.2-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 07:35 ./slackware64/l/pangomm-2.42.2-x86_64-3.txz.asc
@@ -3783,7 +3783,7 @@ drwxr-xr-x 2 root root 73728 2021-03-18 04:04 ./slackware64/l
-rw-r--r-- 1 root root 463 2021-03-05 21:29 ./slackware64/l/zstd-1.4.9-x86_64-1.txt
-rw-r--r-- 1 root root 421332 2021-03-05 21:29 ./slackware64/l/zstd-1.4.9-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-03-05 21:29 ./slackware64/l/zstd-1.4.9-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 32768 2021-03-18 04:04 ./slackware64/n
+drwxr-xr-x 2 root root 32768 2021-03-18 23:56 ./slackware64/n
-rw-r--r-- 1 root root 357 2021-02-13 11:52 ./slackware64/n/ModemManager-1.14.10-x86_64-3.txt
-rw-r--r-- 1 root root 1877092 2021-02-13 11:52 ./slackware64/n/ModemManager-1.14.10-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:52 ./slackware64/n/ModemManager-1.14.10-x86_64-3.txz.asc
@@ -3799,9 +3799,9 @@ drwxr-xr-x 2 root root 32768 2021-03-18 04:04 ./slackware64/n
-rw-r--r-- 1 root root 683 2021-02-13 11:55 ./slackware64/n/biff+comsat-0.17-x86_64-4.txt
-rw-r--r-- 1 root root 11280 2021-02-13 11:55 ./slackware64/n/biff+comsat-0.17-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 11:55 ./slackware64/n/biff+comsat-0.17-x86_64-4.txz.asc
--rw-r--r-- 1 root root 334 2021-02-24 20:07 ./slackware64/n/bind-9.16.11-x86_64-3.txt
--rw-r--r-- 1 root root 2202736 2021-02-24 20:07 ./slackware64/n/bind-9.16.11-x86_64-3.txz
--rw-r--r-- 1 root root 163 2021-02-24 20:07 ./slackware64/n/bind-9.16.11-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 334 2021-03-18 16:48 ./slackware64/n/bind-9.16.13-x86_64-1.txt
+-rw-r--r-- 1 root root 2210388 2021-03-18 16:48 ./slackware64/n/bind-9.16.13-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2021-03-18 16:48 ./slackware64/n/bind-9.16.13-x86_64-1.txz.asc
-rw-r--r-- 1 root root 333 2021-02-23 21:49 ./slackware64/n/bluez-5.56-x86_64-1.txt
-rw-r--r-- 1 root root 1171408 2021-02-23 21:49 ./slackware64/n/bluez-5.56-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-02-23 21:49 ./slackware64/n/bluez-5.56-x86_64-1.txz.asc
@@ -3987,9 +3987,9 @@ drwxr-xr-x 2 root root 32768 2021-03-18 04:04 ./slackware64/n
-rw-r--r-- 1 root root 334 2021-02-13 12:11 ./slackware64/n/libtirpc-1.3.1-x86_64-3.txt
-rw-r--r-- 1 root root 168476 2021-02-13 12:11 ./slackware64/n/libtirpc-1.3.1-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 12:11 ./slackware64/n/libtirpc-1.3.1-x86_64-3.txz.asc
--rw-r--r-- 1 root root 445 2021-02-13 12:12 ./slackware64/n/links-2.21-x86_64-3.txt
--rw-r--r-- 1 root root 2952472 2021-02-13 12:12 ./slackware64/n/links-2.21-x86_64-3.txz
--rw-r--r-- 1 root root 163 2021-02-13 12:12 ./slackware64/n/links-2.21-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 445 2021-03-18 18:38 ./slackware64/n/links-2.22-x86_64-1.txt
+-rw-r--r-- 1 root root 2965860 2021-03-18 18:38 ./slackware64/n/links-2.22-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2021-03-18 18:38 ./slackware64/n/links-2.22-x86_64-1.txz.asc
-rw-r--r-- 1 root root 495 2021-02-13 12:12 ./slackware64/n/lynx-2.8.9rel.1-x86_64-3.txt
-rw-r--r-- 1 root root 1741512 2021-02-13 12:12 ./slackware64/n/lynx-2.8.9rel.1-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 12:12 ./slackware64/n/lynx-2.8.9rel.1-x86_64-3.txz.asc
@@ -4064,9 +4064,9 @@ drwxr-xr-x 2 root root 32768 2021-03-18 04:04 ./slackware64/n
-rw-r--r-- 1 root root 306 2021-02-13 12:15 ./slackware64/n/netwatch-1.3.1_2-x86_64-5.txt
-rw-r--r-- 1 root root 86984 2021-02-13 12:15 ./slackware64/n/netwatch-1.3.1_2-x86_64-5.txz
-rw-r--r-- 1 root root 163 2021-02-13 12:15 ./slackware64/n/netwatch-1.3.1_2-x86_64-5.txz.asc
--rw-r--r-- 1 root root 582 2021-03-01 19:51 ./slackware64/n/network-scripts-15.0-noarch-13.txt
--rw-r--r-- 1 root root 39572 2021-03-01 19:51 ./slackware64/n/network-scripts-15.0-noarch-13.txz
--rw-r--r-- 1 root root 163 2021-03-01 19:51 ./slackware64/n/network-scripts-15.0-noarch-13.txz.asc
+-rw-r--r-- 1 root root 582 2021-03-18 23:28 ./slackware64/n/network-scripts-15.0-noarch-14.txt
+-rw-r--r-- 1 root root 39928 2021-03-18 23:28 ./slackware64/n/network-scripts-15.0-noarch-14.txz
+-rw-r--r-- 1 root root 163 2021-03-18 23:28 ./slackware64/n/network-scripts-15.0-noarch-14.txz.asc
-rw-r--r-- 1 root root 557 2021-02-13 12:16 ./slackware64/n/netwrite-0.17-x86_64-4.txt
-rw-r--r-- 1 root root 6912 2021-02-13 12:16 ./slackware64/n/netwrite-0.17-x86_64-4.txz
-rw-r--r-- 1 root root 163 2021-02-13 12:16 ./slackware64/n/netwrite-0.17-x86_64-4.txz.asc
@@ -4221,9 +4221,9 @@ drwxr-xr-x 2 root root 32768 2021-03-18 04:04 ./slackware64/n
-rw-r--r-- 1 root root 367 2021-02-16 19:24 ./slackware64/n/whois-5.5.8-x86_64-1.txt
-rw-r--r-- 1 root root 60868 2021-02-16 19:24 ./slackware64/n/whois-5.5.8-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-02-16 19:24 ./slackware64/n/whois-5.5.8-x86_64-1.txz.asc
--rw-r--r-- 1 root root 677 2021-02-28 19:29 ./slackware64/n/wireless_tools-30.pre9-x86_64-4.txt
--rw-r--r-- 1 root root 134404 2021-02-28 19:29 ./slackware64/n/wireless_tools-30.pre9-x86_64-4.txz
--rw-r--r-- 1 root root 163 2021-02-28 19:29 ./slackware64/n/wireless_tools-30.pre9-x86_64-4.txz.asc
+-rw-r--r-- 1 root root 677 2021-03-18 23:31 ./slackware64/n/wireless_tools-30.pre9-x86_64-5.txt
+-rw-r--r-- 1 root root 134520 2021-03-18 23:31 ./slackware64/n/wireless_tools-30.pre9-x86_64-5.txz
+-rw-r--r-- 1 root root 163 2021-03-18 23:31 ./slackware64/n/wireless_tools-30.pre9-x86_64-5.txz.asc
-rw-r--r-- 1 root root 600 2021-02-13 12:33 ./slackware64/n/wpa_supplicant-2.9-x86_64-6.txt
-rw-r--r-- 1 root root 1166008 2021-02-13 12:33 ./slackware64/n/wpa_supplicant-2.9-x86_64-6.txz
-rw-r--r-- 1 root root 163 2021-02-13 12:33 ./slackware64/n/wpa_supplicant-2.9-x86_64-6.txz.asc
@@ -4275,7 +4275,7 @@ drwxr-xr-x 2 root root 4096 2021-02-15 19:35 ./slackware64/tcl
-rw-r--r-- 1 root root 227 2021-02-13 12:42 ./slackware64/tcl/tk-8.6.11.1-x86_64-3.txt
-rw-r--r-- 1 root root 1787440 2021-02-13 12:42 ./slackware64/tcl/tk-8.6.11.1-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 12:42 ./slackware64/tcl/tk-8.6.11.1-x86_64-3.txz.asc
-drwxr-xr-x 2 root root 65536 2021-03-18 04:04 ./slackware64/x
+drwxr-xr-x 2 root root 65536 2021-03-18 23:56 ./slackware64/x
-rw-r--r-- 1 root root 440 2021-03-05 02:40 ./slackware64/x/OpenCC-1.1.2-x86_64-1.txt
-rw-r--r-- 1 root root 681960 2021-03-05 02:40 ./slackware64/x/OpenCC-1.1.2-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-03-05 02:40 ./slackware64/x/OpenCC-1.1.2-x86_64-1.txz.asc
@@ -4650,9 +4650,9 @@ drwxr-xr-x 2 root root 65536 2021-03-18 04:04 ./slackware64/x
-rw-r--r-- 1 root root 346 2021-02-13 13:08 ./slackware64/x/libfontenc-1.1.4-x86_64-3.txt
-rw-r--r-- 1 root root 27772 2021-02-13 13:08 ./slackware64/x/libfontenc-1.1.4-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 13:08 ./slackware64/x/libfontenc-1.1.4-x86_64-3.txz.asc
--rw-r--r-- 1 root root 286 2021-02-13 12:50 ./slackware64/x/libgee-0.20.3-x86_64-3.txt
--rw-r--r-- 1 root root 272968 2021-02-13 12:50 ./slackware64/x/libgee-0.20.3-x86_64-3.txz
--rw-r--r-- 1 root root 163 2021-02-13 12:50 ./slackware64/x/libgee-0.20.3-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 286 2021-03-18 18:36 ./slackware64/x/libgee-0.20.4-x86_64-1.txt
+-rw-r--r-- 1 root root 290308 2021-03-18 18:36 ./slackware64/x/libgee-0.20.4-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2021-03-18 18:36 ./slackware64/x/libgee-0.20.4-x86_64-1.txz.asc
-rw-r--r-- 1 root root 462 2021-02-13 12:51 ./slackware64/x/libglvnd-1.3.2-x86_64-3.txt
-rw-r--r-- 1 root root 339640 2021-02-13 12:51 ./slackware64/x/libglvnd-1.3.2-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 12:51 ./slackware64/x/libglvnd-1.3.2-x86_64-3.txz.asc
@@ -5484,11 +5484,11 @@ drwxr-xr-x 2 root root 4096 2021-02-15 19:33 ./slackware64/y
-rw-r--r-- 1 root root 1486956 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz
-rw-r--r-- 1 root root 163 2021-02-13 13:56 ./slackware64/y/nethack-3.6.6-x86_64-3.txz.asc
-rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile
-drwxr-xr-x 18 root root 4096 2021-03-18 04:05 ./source
--rw-r--r-- 1 root root 566645 2021-03-18 04:05 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2021-03-18 04:05 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 788900 2021-03-18 04:05 ./source/FILE_LIST
--rw-r--r-- 1 root root 22323940 2021-03-18 04:05 ./source/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2021-03-18 23:57 ./source
+-rw-r--r-- 1 root root 566363 2021-03-18 23:57 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2021-03-18 23:57 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 788475 2021-03-18 23:56 ./source/FILE_LIST
+-rw-r--r-- 1 root root 22335204 2021-03-18 23:56 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
drwxr-xr-x 122 root root 4096 2021-03-08 19:03 ./source/a
-rw-r--r-- 1 root root 1470 2021-01-17 20:11 ./source/a/FTBFSlog
@@ -6992,64 +6992,64 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/seejpeg
-rw-r--r-- 1 root root 46550 1999-11-09 00:03 ./source/ap/seejpeg/seejpeg-1.10.tgz
-rwxr-xr-x 1 root root 2938 2021-02-13 05:31 ./source/ap/seejpeg/seejpeg.SlackBuild
-rw-r--r-- 1 root root 907 2018-02-27 06:12 ./source/ap/seejpeg/slack-desc
-drwxr-xr-x 3 root root 4096 2021-02-13 05:31 ./source/ap/slackpkg
--rw-r--r-- 1 root root 784 2021-02-09 20:30 ./source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch
--rw-r--r-- 1 root root 967 2019-07-15 20:15 ./source/ap/slackpkg/doinst.sh
-drwxr-xr-x 3 root root 4096 2021-02-05 01:54 ./source/ap/slackpkg/files
--rw-r--r-- 1 root root 58568 2021-02-05 01:54 ./source/ap/slackpkg/files/ChangeLog
--rw-r--r-- 1 root root 17992 2010-05-01 23:10 ./source/ap/slackpkg/files/GPL
--rw-r--r-- 1 root root 2922 2017-10-08 20:27 ./source/ap/slackpkg/files/README
--rw-r--r-- 1 root root 1294 2019-07-15 20:15 ./source/ap/slackpkg/files/blacklist.new
--rw-r--r-- 1 root root 38930 2021-02-05 01:54 ./source/ap/slackpkg/files/core-functions.sh
--rw-r--r-- 1 root root 77 2019-04-08 06:41 ./source/ap/slackpkg/files/cutpkg.awk
--rw-r--r-- 1 root root 2456 2020-02-19 00:54 ./source/ap/slackpkg/files/dialog-functions.sh
--rw-r--r-- 1 root root 424 2010-05-01 23:10 ./source/ap/slackpkg/files/filelist.awk
--rw-r--r-- 1 root root 1250 2019-07-15 20:07 ./source/ap/slackpkg/files/install-new.awk
-drwxr-xr-x 2 root root 4096 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n
--rw-r--r-- 1 root root 11149 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/de.slackpkg
--rw-r--r-- 1 root root 9907 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/de.slackpkg.conf
--rw-r--r-- 1 root root 17402 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/el.slackpkg
--rw-r--r-- 1 root root 16243 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/el.slackpkg.conf
--rw-r--r-- 1 root root 10467 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/es.slackpkg
--rw-r--r-- 1 root root 9936 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/es.slackpkg.conf
--rw-r--r-- 1 root root 15030 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/fa.slackpkg
--rw-r--r-- 1 root root 14016 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/fa.slackpkg.conf
--rw-r--r-- 1 root root 11033 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/fr.slackpkg
--rw-r--r-- 1 root root 10261 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/fr.slackpkg.conf
--rw-r--r-- 1 root root 9782 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/id.slackpkg
--rw-r--r-- 1 root root 9187 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/id.slackpkg.conf
--rw-r--r-- 1 root root 10082 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/it.slackpkg
--rw-r--r-- 1 root root 9488 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/it.slackpkg.conf
--rw-r--r-- 1 root root 9887 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/nb.slackpkg
--rw-r--r-- 1 root root 9055 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/nb.slackpkg.conf
--rw-r--r-- 1 root root 10405 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/nl.slackpkg
--rw-r--r-- 1 root root 9062 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/nl.slackpkg.conf
--rw-r--r-- 1 root root 10229 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/pl.slackpkg
--rw-r--r-- 1 root root 9255 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/pl.slackpkg.conf
--rw-r--r-- 1 root root 10329 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg
--rw-r--r-- 1 root root 9576 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg.conf
--rw-r--r-- 1 root root 10338 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg
--rw-r--r-- 1 root root 9664 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg.conf
--rw-r--r-- 1 root root 13925 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/ru.slackpkg
--rw-r--r-- 1 root root 13758 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/ru.slackpkg.conf
--rw-r--r-- 1 root root 9968 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/sv.slackpkg
--rw-r--r-- 1 root root 9079 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/sv.slackpkg.conf
--rw-r--r-- 1 root root 9989 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/tr.slackpkg
--rw-r--r-- 1 root root 9382 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/tr.slackpkg.conf
--rw-r--r-- 1 root root 15883 2017-11-08 00:42 ./source/ap/slackpkg/files/manpages-l10n/uk.slackpkg
--rw-r--r-- 1 root root 15268 2019-01-29 03:51 ./source/ap/slackpkg/files/manpages-l10n/uk.slackpkg.conf
--rw-r--r-- 1 root root 3908 2021-01-19 00:22 ./source/ap/slackpkg/files/mirrors-arm.sample
--rw-r--r-- 1 root root 1763 2011-03-31 02:04 ./source/ap/slackpkg/files/mirrors-s390.sample
--rw-r--r-- 1 root root 18772 2020-08-03 05:08 ./source/ap/slackpkg/files/mirrors-x86.sample
--rw-r--r-- 1 root root 18750 2020-08-03 05:09 ./source/ap/slackpkg/files/mirrors-x86_64.sample
--rw-r--r-- 1 root root 815 2020-11-27 08:57 ./source/ap/slackpkg/files/pkglist.awk
--rw-r--r-- 1 root root 6717 2019-07-15 20:15 ./source/ap/slackpkg/files/post-functions.sh
--rw-r--r-- 1 root root 14073 2021-02-05 01:54 ./source/ap/slackpkg/files/slackpkg
--rw-r--r-- 1 root root 9760 2021-02-05 01:54 ./source/ap/slackpkg/files/slackpkg.8
--rw-r--r-- 1 root root 8943 2021-01-18 17:26 ./source/ap/slackpkg/files/slackpkg.conf.5
--rw-r--r-- 1 root root 6108 2021-02-05 01:54 ./source/ap/slackpkg/files/slackpkg.conf.new
--rw-r--r-- 1 root root 1007 2018-04-29 18:06 ./source/ap/slackpkg/slack-desc
--rwxr-xr-x 1 root root 4385 2021-02-13 05:31 ./source/ap/slackpkg/slackpkg.SlackBuild
+drwxr-xr-x 3 root root 4096 2021-03-14 15:18 ./source/ap/slackpkg
+-rw-r--r-- 1 root root 1026 2021-02-12 23:30 ./source/ap/slackpkg/doinst.sh
+drwxr-xr-x 3 root root 4096 2021-03-14 15:17 ./source/ap/slackpkg/files
+-rw-r--r-- 1 root root 60084 2021-03-14 15:17 ./source/ap/slackpkg/files/ChangeLog
+-rw-r--r-- 1 root root 17992 2021-02-12 23:30 ./source/ap/slackpkg/files/GPL
+-rw-r--r-- 1 root root 2922 2021-02-12 23:30 ./source/ap/slackpkg/files/README
+-rw-r--r-- 1 root root 1326 2021-03-13 03:29 ./source/ap/slackpkg/files/blacklist.new
+-rw-r--r-- 1 root root 39465 2021-03-14 15:15 ./source/ap/slackpkg/files/core-functions.sh
+-rw-r--r-- 1 root root 46 2021-03-10 04:17 ./source/ap/slackpkg/files/cutpkg.awk
+-rw-r--r-- 1 root root 2456 2021-02-12 23:30 ./source/ap/slackpkg/files/dialog-functions.sh
+-rw-r--r-- 1 root root 424 2021-02-12 23:30 ./source/ap/slackpkg/files/filelist.awk
+-rw-r--r-- 1 root root 1250 2021-02-12 23:30 ./source/ap/slackpkg/files/install-new.awk
+drwxr-xr-x 2 root root 4096 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n
+-rw-r--r-- 1 root root 10795 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/de.slackpkg
+-rw-r--r-- 1 root root 9907 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/de.slackpkg.conf
+-rw-r--r-- 1 root root 16876 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/el.slackpkg
+-rw-r--r-- 1 root root 16243 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/el.slackpkg.conf
+-rw-r--r-- 1 root root 10162 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/es.slackpkg
+-rw-r--r-- 1 root root 9936 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/es.slackpkg.conf
+-rw-r--r-- 1 root root 14552 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/fa.slackpkg
+-rw-r--r-- 1 root root 14016 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/fa.slackpkg.conf
+-rw-r--r-- 1 root root 10693 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/fr.slackpkg
+-rw-r--r-- 1 root root 10261 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/fr.slackpkg.conf
+-rw-r--r-- 1 root root 9487 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/id.slackpkg
+-rw-r--r-- 1 root root 9187 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/id.slackpkg.conf
+-rw-r--r-- 1 root root 9782 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/it.slackpkg
+-rw-r--r-- 1 root root 9488 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/it.slackpkg.conf
+-rw-r--r-- 1 root root 9612 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/nb.slackpkg
+-rw-r--r-- 1 root root 9055 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/nb.slackpkg.conf
+-rw-r--r-- 1 root root 10064 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/nl.slackpkg
+-rw-r--r-- 1 root root 9062 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/nl.slackpkg.conf
+-rw-r--r-- 1 root root 9930 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/pl.slackpkg
+-rw-r--r-- 1 root root 9255 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/pl.slackpkg.conf
+-rw-r--r-- 1 root root 10025 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg
+-rw-r--r-- 1 root root 9576 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg.conf
+-rw-r--r-- 1 root root 10040 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg
+-rw-r--r-- 1 root root 9664 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg.conf
+-rw-r--r-- 1 root root 13506 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/ru.slackpkg
+-rw-r--r-- 1 root root 13758 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/ru.slackpkg.conf
+-rw-r--r-- 1 root root 9686 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/sv.slackpkg
+-rw-r--r-- 1 root root 9079 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/sv.slackpkg.conf
+-rw-r--r-- 1 root root 9684 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/tr.slackpkg
+-rw-r--r-- 1 root root 9382 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/tr.slackpkg.conf
+-rw-r--r-- 1 root root 15374 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/uk.slackpkg
+-rw-r--r-- 1 root root 15268 2021-02-12 23:30 ./source/ap/slackpkg/files/manpages-l10n/uk.slackpkg.conf
+-rw-r--r-- 1 root root 2781 2021-03-03 02:23 ./source/ap/slackpkg/files/mirrors-aarch64.sample
+-rw-r--r-- 1 root root 3357 2021-03-03 02:23 ./source/ap/slackpkg/files/mirrors-arm.sample
+-rw-r--r-- 1 root root 1764 2021-03-03 02:23 ./source/ap/slackpkg/files/mirrors-s390.sample
+-rw-r--r-- 1 root root 19033 2021-03-13 01:59 ./source/ap/slackpkg/files/mirrors-x86.sample
+-rw-r--r-- 1 root root 19019 2021-03-13 01:59 ./source/ap/slackpkg/files/mirrors-x86_64.sample
+-rw-r--r-- 1 root root 815 2021-02-12 23:30 ./source/ap/slackpkg/files/pkglist.awk
+-rw-r--r-- 1 root root 7721 2021-02-28 19:40 ./source/ap/slackpkg/files/post-functions.sh
+-rw-r--r-- 1 root root 14086 2021-03-13 03:29 ./source/ap/slackpkg/files/slackpkg
+-rw-r--r-- 1 root root 9495 2021-03-13 03:30 ./source/ap/slackpkg/files/slackpkg.8
+-rw-r--r-- 1 root root 8945 2021-03-13 03:30 ./source/ap/slackpkg/files/slackpkg.conf.5
+-rw-r--r-- 1 root root 6109 2021-03-03 02:23 ./source/ap/slackpkg/files/slackpkg.conf.new
+-rw-r--r-- 1 root root 1008 2021-03-13 02:08 ./source/ap/slackpkg/slack-desc
+-rwxr-xr-x 1 root root 4192 2021-03-13 03:30 ./source/ap/slackpkg/slackpkg.SlackBuild
drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/soma
-rw-r--r-- 1 root root 3364 2020-08-21 17:24 ./source/ap/soma/README
-rw-r--r-- 1 root root 336 2020-06-16 06:05 ./source/ap/soma/doinst.sh.gz
@@ -7061,10 +7061,10 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/sox
-rw-r--r-- 1 root root 744 2018-06-26 22:00 ./source/ap/sox/slack-desc
-rw-r--r-- 1 root root 763840 2015-02-22 21:04 ./source/ap/sox/sox-14.4.2.tar.xz
-rwxr-xr-x 1 root root 4156 2021-02-13 05:31 ./source/ap/sox/sox.SlackBuild
-drwxr-xr-x 2 root root 4096 2021-03-16 17:31 ./source/ap/sqlite
+drwxr-xr-x 2 root root 4096 2021-03-18 18:39 ./source/ap/sqlite
-rw-r--r-- 1 root root 1684 2008-08-01 05:31 ./source/ap/sqlite/COPYRIGHT.gz
-rw-r--r-- 1 root root 937 2018-11-29 19:15 ./source/ap/sqlite/slack-desc
--rw-r--r-- 1 root root 7118581 2021-03-15 23:35 ./source/ap/sqlite/sqlite-src-3350100.tar.lz
+-rw-r--r-- 1 root root 7118519 2021-03-17 23:45 ./source/ap/sqlite/sqlite-src-3350200.tar.lz
-rwxr-xr-x 1 root root 6251 2021-03-13 20:00 ./source/ap/sqlite/sqlite.SlackBuild
drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/ap/squashfs-tools
-rwxr-xr-x 1 root root 1939 2020-07-09 18:37 ./source/ap/squashfs-tools/get-squashfs-tools.sh
@@ -7840,7 +7840,7 @@ drwxr-xr-x 2 root root 16384 2021-03-05 18:59 ./source/kde/kde/build
-rw-r--r-- 1 root root 2 2021-02-16 04:19 ./source/kde/kde/build/khtml
-rw-r--r-- 1 root root 2 2021-02-16 04:19 ./source/kde/kde/build/ki18n
-rw-r--r-- 1 root root 2 2021-02-16 04:19 ./source/kde/kde/build/kiconthemes
--rw-r--r-- 1 root root 2 2021-02-13 05:34 ./source/kde/kde/build/kid3
+-rw-r--r-- 1 root root 2 2021-03-18 18:35 ./source/kde/kde/build/kid3
-rw-r--r-- 1 root root 2 2021-03-05 18:56 ./source/kde/kde/build/kidentitymanagement
-rw-r--r-- 1 root root 2 2021-02-16 04:19 ./source/kde/kde/build/kidletime
-rw-r--r-- 1 root root 2 2021-03-05 18:56 ./source/kde/kde/build/kig
@@ -8726,7 +8726,7 @@ drwxr-xr-x 2 root root 12288 2021-03-05 19:00 ./source/kde/kde/slack-desc
-rw-r--r-- 1 root root 760 2020-11-01 20:11 ./source/kde/kde/slack-desc/zeroconf-ioslave
drwxr-xr-x 7 root root 4096 2020-09-29 01:10 ./source/kde/kde/src
drwxr-xr-x 2 root root 36864 2021-03-05 18:48 ./source/kde/kde/src/applications
-drwxr-xr-x 2 root root 4096 2021-03-07 18:52 ./source/kde/kde/src/applications-extra
+drwxr-xr-x 2 root root 4096 2021-03-18 18:34 ./source/kde/kde/src/applications-extra
-rw-r--r-- 1 root root 230804 2021-03-03 22:04 ./source/kde/kde/src/applications-extra/alkimia-8.1.0.tar.xz
-rw-r--r-- 1 root root 833 2021-03-03 22:04 ./source/kde/kde/src/applications-extra/alkimia-8.1.0.tar.xz.sig
-rw-r--r-- 1 root root 55207684 2020-05-23 15:58 ./source/kde/kde/src/applications-extra/calligra-3.2.1.tar.xz
@@ -8749,8 +8749,8 @@ drwxr-xr-x 2 root root 4096 2021-03-07 18:52 ./source/kde/kde/src/applicat
-rw-r--r-- 1 root root 833 2020-02-09 15:18 ./source/kde/kde/src/applications-extra/kdevelop-pg-qt-2.2.1.tar.xz.sig
-rw-r--r-- 1 root root 691044 2021-01-15 08:59 ./source/kde/kde/src/applications-extra/kdiagram-2.8.0.tar.xz
-rw-r--r-- 1 root root 833 2021-01-15 08:59 ./source/kde/kde/src/applications-extra/kdiagram-2.8.0.tar.xz.sig
--rw-r--r-- 1 root root 1674656 2021-01-31 07:43 ./source/kde/kde/src/applications-extra/kid3-3.8.5.tar.xz
--rw-r--r-- 1 root root 195 2021-01-31 07:46 ./source/kde/kde/src/applications-extra/kid3-3.8.5.tar.xz.sig
+-rw-r--r-- 1 root root 1676076 2021-03-18 04:38 ./source/kde/kde/src/applications-extra/kid3-3.8.6.tar.xz
+-rw-r--r-- 1 root root 195 2021-03-18 04:38 ./source/kde/kde/src/applications-extra/kid3-3.8.6.tar.xz.sig
-rw-r--r-- 1 root root 6246456 2019-11-08 20:40 ./source/kde/kde/src/applications-extra/kile-2.9.93.tar.xz
-rw-r--r-- 1 root root 95827 2020-12-06 06:06 ./source/kde/kde/src/applications-extra/kjots-20201206_f7d555c.tar.lz
-rw-r--r-- 1 root root 12059768 2020-12-20 09:41 ./source/kde/kde/src/applications-extra/kmymoney-5.1.1.tar.xz
@@ -9945,11 +9945,11 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/l/glib-networking
-rw-r--r-- 1 root root 346080 2001-03-15 14:59 ./source/l/glib/glib-1.2.10.tar.bz2
-rwxr-xr-x 1 root root 5498 2021-02-13 05:31 ./source/l/glib/glib.SlackBuild
-rw-r--r-- 1 root root 754 2018-02-27 06:12 ./source/l/glib/slack-desc
-drwxr-xr-x 2 root root 4096 2021-02-13 05:31 ./source/l/glib2
+drwxr-xr-x 2 root root 4096 2021-03-18 16:49 ./source/l/glib2
-rw-r--r-- 1 root root 516 2011-11-06 22:03 ./source/l/glib2/doinst.sh.gz
--rw-r--r-- 1 root root 4844892 2021-02-11 12:34 ./source/l/glib2/glib-2.66.7.tar.xz
+-rw-r--r-- 1 root root 4845548 2021-03-18 13:52 ./source/l/glib2/glib-2.66.8.tar.xz
-rw-r--r-- 1 root root 302 2020-09-15 18:26 ./source/l/glib2/glib.allow.gtk-doc-1.32.diff.gz
--rwxr-xr-x 1 root root 5438 2021-02-13 05:31 ./source/l/glib2/glib2.SlackBuild
+-rwxr-xr-x 1 root root 5438 2021-03-18 16:50 ./source/l/glib2/glib2.SlackBuild
-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 860 2018-11-15 04:21 ./source/l/glib2/slack-desc
@@ -10950,7 +10950,7 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/orc
-rw-r--r-- 1 root root 929 2019-10-17 18:01 ./source/l/orc/slack-desc
drwxr-xr-x 2 root root 4096 2021-03-13 19:54 ./source/l/pango
-rw-r--r-- 1 root root 565956 2021-03-11 22:38 ./source/l/pango/pango-1.48.3.tar.xz
--rwxr-xr-x 1 root root 4208 2021-03-13 19:57 ./source/l/pango/pango.SlackBuild
+-rwxr-xr-x 1 root root 4139 2021-03-18 21:13 ./source/l/pango/pango.SlackBuild
-rw-r--r-- 1 root root 882 2018-02-27 06:12 ./source/l/pango/slack-desc
drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/l/pangomm
-rw-r--r-- 1 root root 656760 2020-12-13 14:18 ./source/l/pangomm/pangomm-2.42.2.tar.xz
@@ -11498,15 +11498,14 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/biff+comsat
-rw-r--r-- 1 root root 729 2004-06-21 20:51 ./source/n/biff+comsat/biff+comsat.badutmp.diff.gz
-rw-r--r-- 1 root root 1222 2001-06-03 08:32 ./source/n/biff+comsat/biff+comsat.offset.diff.gz
-rw-r--r-- 1 root root 1142 2018-02-27 06:13 ./source/n/biff+comsat/slack-desc
-drwxr-xr-x 3 root root 4096 2021-02-24 19:58 ./source/n/bind
+drwxr-xr-x 3 root root 4096 2021-03-18 16:46 ./source/n/bind
-rw-r--r-- 1 root root 5120 2007-06-08 04:48 ./source/n/bind/3link.sh
--rw-r--r-- 1 root root 262 2021-02-24 19:58 ./source/n/bind/bind-9.16.11.CVE-2020-8625.diff.gz
--rw-r--r-- 1 root root 5007520 2021-01-20 22:15 ./source/n/bind/bind-9.16.11.tar.xz
--rw-r--r-- 1 root root 1601 2021-01-20 22:15 ./source/n/bind/bind-9.16.11.tar.xz.asc
--rw-r--r-- 1 root root 1601 2021-01-20 22:15 ./source/n/bind/bind-9.16.11.tar.xz.sha1.asc
--rw-r--r-- 1 root root 1601 2021-01-20 22:15 ./source/n/bind/bind-9.16.11.tar.xz.sha256.asc
--rw-r--r-- 1 root root 1601 2021-01-20 22:15 ./source/n/bind/bind-9.16.11.tar.xz.sha512.asc
--rwxr-xr-x 1 root root 5579 2021-02-24 19:58 ./source/n/bind/bind.SlackBuild
+-rw-r--r-- 1 root root 5028340 2021-03-17 23:00 ./source/n/bind/bind-9.16.13.tar.xz
+-rw-r--r-- 1 root root 833 2021-03-17 23:00 ./source/n/bind/bind-9.16.13.tar.xz.asc
+-rw-r--r-- 1 root root 833 2021-03-17 23:00 ./source/n/bind/bind-9.16.13.tar.xz.sha1.asc
+-rw-r--r-- 1 root root 833 2021-03-17 23:00 ./source/n/bind/bind-9.16.13.tar.xz.sha256.asc
+-rw-r--r-- 1 root root 833 2021-03-17 23:00 ./source/n/bind/bind-9.16.13.tar.xz.sha512.asc
+-rwxr-xr-x 1 root root 5385 2021-03-18 16:47 ./source/n/bind/bind.SlackBuild
drwxr-xr-x 2 root root 4096 2019-08-19 18:12 ./source/n/bind/caching-example
-rw-r--r-- 1 root root 195 2001-05-18 02:03 ./source/n/bind/caching-example/localhost.zone
-rw-r--r-- 1 root root 681 2008-04-13 21:47 ./source/n/bind/caching-example/named.conf
@@ -11901,9 +11900,9 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/libtirpc
-rw-r--r-- 1 root root 404549 2020-12-02 14:03 ./source/n/libtirpc/libtirpc-1.3.1.tar.lz
-rwxr-xr-x 1 root root 5350 2021-02-13 05:32 ./source/n/libtirpc/libtirpc.SlackBuild
-rw-r--r-- 1 root root 790 2019-12-22 18:36 ./source/n/libtirpc/slack-desc
-drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/links
--rw-r--r-- 1 root root 6124753 2020-08-05 19:23 ./source/n/links/links-2.21.tar.lz
--rwxr-xr-x 1 root root 3962 2021-02-13 05:32 ./source/n/links/links.SlackBuild
+drwxr-xr-x 2 root root 4096 2021-03-18 18:37 ./source/n/links
+-rw-r--r-- 1 root root 6154007 2021-03-17 20:28 ./source/n/links/links-2.22.tar.lz
+-rwxr-xr-x 1 root root 3962 2021-03-18 18:37 ./source/n/links/links.SlackBuild
-rw-r--r-- 1 root root 36 2018-05-16 20:42 ./source/n/links/links.url
-rw-r--r-- 1 root root 898 2018-02-27 06:13 ./source/n/links/slack-desc
drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/lynx
@@ -12047,8 +12046,8 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/netkit-rsh
-rwxr-xr-x 1 root root 3671 2021-02-13 05:32 ./source/n/netkit-rsh/netkit-rsh.SlackBuild
-rw-r--r-- 1 root root 728 2018-04-10 07:06 ./source/n/netkit-rsh/netkit-rsh.arg_max.diff.gz
-rw-r--r-- 1 root root 169 2018-04-10 07:19 ./source/n/netkit-rsh/netkit-rsh.auth.c.stddef.diff.gz
--rw-r--r-- 1 root root 354 2018-04-10 07:10 ./source/n/netkit-rsh/netkit-rsh.union_wait.diff.gz
--rw-r--r-- 1 root root 878 2018-02-27 06:13 ./source/n/netkit-rsh/slack-desc
+-rw-r--r-- 1 root root 354 2018-04-10 07:10 ./source/n/netkit-rsh/netkit-rsh.union_wait.diff.gz
+-rw-r--r-- 1 root root 878 2018-02-27 06:13 ./source/n/netkit-rsh/slack-desc
drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/netkit-rusers
-rw-r--r-- 1 root root 221 2001-02-26 02:17 ./source/n/netkit-rusers/netkit-rusers-0.17.diff.gz
-rw-r--r-- 1 root root 22063 2000-07-31 03:03 ./source/n/netkit-rusers/netkit-rusers-0.17.tar.gz
@@ -12084,7 +12083,7 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/n/netwatch
-rw-r--r-- 1 root root 491 2009-03-04 08:01 ./source/n/netwatch/netwatch.makefile.diff.gz
-rw-r--r-- 1 root root 233 2009-03-04 08:01 ./source/n/netwatch/netwatch.phonemyself.diff.gz
-rw-r--r-- 1 root root 762 2018-02-27 06:13 ./source/n/netwatch/slack-desc
-drwxr-xr-x 5 root root 4096 2021-02-28 05:39 ./source/n/network-scripts
+drwxr-xr-x 5 root root 4096 2021-03-10 04:17 ./source/n/network-scripts
-rw-r--r-- 1 root root 8788 2021-02-28 22:32 ./source/n/network-scripts/README.IPv6
-rw-r--r-- 1 root root 1919 2021-02-28 02:09 ./source/n/network-scripts/README.VLANs
-rw-r--r-- 1 root root 6258 2021-02-28 05:34 ./source/n/network-scripts/README.bonding
@@ -12093,13 +12092,10 @@ drwxr-xr-x 5 root root 4096 2021-02-28 05:39 ./source/n/network-scripts
drwxr-xr-x 2 root root 4096 2020-08-14 03:30 ./source/n/network-scripts/manpages
-rw-r--r-- 1 root root 3482 2021-02-28 05:34 ./source/n/network-scripts/manpages/rc.inet1.8
-rw-r--r-- 1 root root 12258 2021-02-28 05:34 ./source/n/network-scripts/manpages/rc.inet1.conf.5
-drwxr-xr-x 3 root root 4096 2021-02-28 05:29 ./source/n/network-scripts/modprobe.d
+drwxr-xr-x 2 root root 4096 2021-03-13 05:06 ./source/n/network-scripts/modprobe.d
-rw-r--r-- 1 root root 442 2021-02-28 02:09 ./source/n/network-scripts/modprobe.d/bonding.conf
-rw-r--r-- 1 root root 344 2021-02-28 02:09 ./source/n/network-scripts/modprobe.d/ipv6.conf
-drwxr-xr-x 2 root root 4096 2021-02-28 02:09 ./source/n/network-scripts/modprobe.d/modprobe.d
--rw-r--r-- 1 root root 442 2021-02-28 02:09 ./source/n/network-scripts/modprobe.d/modprobe.d/bonding.conf
--rw-r--r-- 1 root root 344 2021-02-28 02:09 ./source/n/network-scripts/modprobe.d/modprobe.d/ipv6.conf
--rwxr-xr-x 1 root root 3298 2021-02-28 19:23 ./source/n/network-scripts/network-scripts.SlackBuild
+-rwxr-xr-x 1 root root 3298 2021-03-10 04:17 ./source/n/network-scripts/network-scripts.SlackBuild
drwxr-xr-x 2 root root 4096 2021-02-27 18:53 ./source/n/network-scripts/scripts
-rw-r--r-- 1 root root 21 1999-01-28 01:15 ./source/n/network-scripts/scripts/HOSTNAME
-rw-r--r-- 1 root root 27 1994-07-07 15:39 ./source/n/network-scripts/scripts/host.conf
@@ -12107,12 +12103,12 @@ drwxr-xr-x 2 root root 4096 2021-02-27 18:53 ./source/n/network-scripts/sc
-rw-r--r-- 1 root root 293 1993-11-26 01:54 ./source/n/network-scripts/scripts/hosts.allow
-rw-r--r-- 1 root root 296 1993-11-26 01:54 ./source/n/network-scripts/scripts/hosts.deny
-rw-r--r-- 1 root root 320 1998-02-09 01:57 ./source/n/network-scripts/scripts/hosts.equiv
--rw-r--r-- 1 root root 37824 2021-02-28 21:25 ./source/n/network-scripts/scripts/netconfig
+-rw-r--r-- 1 root root 38717 2021-03-09 00:13 ./source/n/network-scripts/scripts/netconfig
-rw-r--r-- 1 root root 233 1999-10-07 05:21 ./source/n/network-scripts/scripts/networks
-rw-r--r-- 1 root root 24 1998-02-09 02:21 ./source/n/network-scripts/scripts/nntpserver
-rw-r--r-- 1 root root 5748 2002-02-10 09:01 ./source/n/network-scripts/scripts/protocols
--rw-r--r-- 1 root root 27317 2021-02-28 21:01 ./source/n/network-scripts/scripts/rc.inet1
--rw-r--r-- 1 root root 9934 2021-02-28 05:37 ./source/n/network-scripts/scripts/rc.inet1.conf
+-rw-r--r-- 1 root root 28771 2021-03-09 00:13 ./source/n/network-scripts/scripts/rc.inet1
+-rw-r--r-- 1 root root 10656 2021-03-09 00:13 ./source/n/network-scripts/scripts/rc.inet1.conf
-rw-r--r-- 1 root root 5340 2019-10-13 18:53 ./source/n/network-scripts/scripts/rc.inet2
-rw-r--r-- 1 root root 3781 2013-05-19 03:20 ./source/n/network-scripts/scripts/rc.ip_forward
-rw-r--r-- 1 root root 19 1999-01-28 01:15 ./source/n/network-scripts/scripts/resolv.conf
@@ -12500,14 +12496,14 @@ drwxr-xr-x 2 root root 4096 2021-02-16 19:24 ./source/n/whois
-rw-r--r-- 1 root root 84632 2021-02-16 00:54 ./source/n/whois/whois-5.5.8.tar.lz
-rwxr-xr-x 1 root root 2907 2021-02-16 19:24 ./source/n/whois/whois.SlackBuild
-rw-r--r-- 1 root root 33 2019-07-24 18:55 ./source/n/whois/whois.url
-drwxr-xr-x 3 root root 4096 2021-02-28 05:49 ./source/n/wireless_tools
+drwxr-xr-x 3 root root 4096 2021-03-10 04:16 ./source/n/wireless_tools
-rw-r--r-- 1 root root 389 2007-05-10 01:04 ./source/n/wireless_tools/doinst.sh.gz
drwxr-xr-x 2 root root 4096 2017-11-14 23:02 ./source/n/wireless_tools/scripts
--rw-r--r-- 1 root root 13538 2021-02-28 05:47 ./source/n/wireless_tools/scripts/rc.wireless
+-rw-r--r-- 1 root root 13885 2021-03-10 03:15 ./source/n/wireless_tools/scripts/rc.wireless
-rw-r--r-- 1 root root 7349 2017-07-11 21:58 ./source/n/wireless_tools/scripts/rc.wireless.conf
-rw-r--r-- 1 root root 1139 2018-04-10 12:34 ./source/n/wireless_tools/slack-desc
-rw-r--r-- 1 root root 182226 2016-11-04 17:56 ./source/n/wireless_tools/wireless_tools.30.pre9.tar.lz
--rwxr-xr-x 1 root root 4055 2021-02-28 05:49 ./source/n/wireless_tools/wireless_tools.SlackBuild
+-rwxr-xr-x 1 root root 4055 2021-03-10 04:16 ./source/n/wireless_tools/wireless_tools.SlackBuild
-rw-r--r-- 1 root root 227 2005-07-14 05:20 ./source/n/wireless_tools/wireless_tools.nowhine.diff.gz
-rw-r--r-- 1 root root 59 2018-12-31 19:59 ./source/n/wireless_tools/wireless_tools.url
drwxr-xr-x 4 root root 4096 2021-02-13 05:32 ./source/n/wpa_supplicant
@@ -12824,9 +12820,9 @@ drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/x/libevdev
-rwxr-xr-x 1 root root 3608 2021-02-13 05:32 ./source/x/libevdev/libevdev.SlackBuild
-rw-r--r-- 1 root root 46 2019-08-26 18:14 ./source/x/libevdev/libevdev.url
-rw-r--r-- 1 root root 913 2018-02-27 06:13 ./source/x/libevdev/slack-desc
-drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/x/libgee
--rw-r--r-- 1 root root 678488 2020-02-09 19:07 ./source/x/libgee/libgee-0.20.3.tar.xz
--rwxr-xr-x 1 root root 3544 2021-02-13 05:32 ./source/x/libgee/libgee.SlackBuild
+drwxr-xr-x 2 root root 4096 2021-03-18 18:36 ./source/x/libgee
+-rw-r--r-- 1 root root 684068 2021-03-17 20:02 ./source/x/libgee/libgee-0.20.4.tar.xz
+-rwxr-xr-x 1 root root 3544 2021-03-18 18:36 ./source/x/libgee/libgee.SlackBuild
-rw-r--r-- 1 root root 43 2020-12-08 18:36 ./source/x/libgee/libgee.url
-rw-r--r-- 1 root root 773 2013-11-22 19:47 ./source/x/libgee/slack-desc
drwxr-xr-x 2 root root 4096 2021-02-13 05:32 ./source/x/libglvnd
diff --git a/recompress.sh b/recompress.sh
index 4137d6f5..74a1fa6a 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -569,7 +569,6 @@ gzip ./source/n/s-nail/s-nail.no.emptystart.diff
gzip ./source/n/iputils/iputils.docbook.revert.diff
gzip ./source/n/dhcpcd/doinst.sh
gzip ./source/n/bind/doinst.sh
-gzip ./source/n/bind/bind-9.16.11.CVE-2020-8625.diff
gzip ./source/n/wireless_tools/doinst.sh
gzip ./source/n/wireless_tools/wireless_tools.nowhine.diff
gzip ./source/n/irssi/doinst.sh
diff --git a/source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch b/source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch
deleted file mode 100644
index 82e9f5a2..00000000
--- a/source/ap/slackpkg/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 5edf86dcebd2ab55a4a7221db77e10676723bbb1 Mon Sep 17 00:00:00 2001
-From: piterpunk <piterpunk@slackware.com>
-Date: Mon, 8 Feb 2021 18:22:33 -0300
-Subject: [PATCH] Allow new-config after slackpkg upgrade itself
-
-Signed-off-by: Robby Workman <rworkman@slackware.com>
----
- files/core-functions.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/files/core-functions.sh b/files/core-functions.sh
-index dcbceae..9816458 100644
---- a/files/core-functions.sh
-+++ b/files/core-functions.sh
-@@ -345,6 +345,7 @@ use slackpkg.\n"
- CHECKMD5=off
- elif ! [ -f ${ROOT}/${WORKDIR}/CHECKSUMS.md5 ] && \
- [ "$CMD" != "update" ] && \
-+ [ "$CMD" != "new-config" ] && \
- [ "$CHECKMD5" = "on" ]; then
- echo -e "\n\
- No CHECKSUMS.md5 found! Please disable md5sums checking\n\
---
-2.30.0
-
diff --git a/source/ap/slackpkg/doinst.sh b/source/ap/slackpkg/doinst.sh
index 87799a3c..02790a48 100644
--- a/source/ap/slackpkg/doinst.sh
+++ b/source/ap/slackpkg/doinst.sh
@@ -25,6 +25,9 @@ copy_mirror_file() {
arm*)
SRCMIRROR=mirrors-arm.sample
;;
+ aarch64)
+ SRCMIRROR=mirrors-aarch64.sample
+ ;;
*)
SRCMIRROR=mirrors-x86.sample
;;
diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index f4b43eae..46971acd 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,3 +1,39 @@
+Sun Mar 14 15:17:21 UTC 2021
+---------------
+ - Re-release slackpkg-15.0.1 (no package generated yet anyway)
+ - Modifiy blacklist regex line ending
+
+Sat Mar 13 03:30:01 UTC 2021
+---------------
+ - Release slackpkg-15.0.1
+ - Tweak default blacklist file's help text (thanks, dive)
+ - Fix display of blacklisted packages
+ - Tweaks to slack-desc
+ - Note that kernel-headers should not be blacklisted
+ - Added Lithuania mirrors (Totoro-kun on LQ)
+ - Fix exit code for pending updates (dive)
+ - Avoid matching txz/tgz etc extension when blacklisting (dive)
+ - Use https for all slackpkg homepage links
+ - Update mirror files (14.2 -> 15.0)
+ - Add blacklist to search option
+ - Move applyblacklist to end of makelist()
+ - Clarify how to blacklist duplicate packages
+ - Fix new-config dialog
+ - Reduce false positives in DOUBLEFILES detection
+ - Remove spaces in awk.
+ - More blacklisting fixups (see full commit msg)
+ - Escape plus signs in blacklist regex
+ - Convert ${ROOT}/${WORKDIR} > ${WORKDIR} (dive)
+ - Convert ${ROOT}/${CONF} -> ${CONF} and tweak blacklists (dive)
+ - Further fixup/enhancement to blacklisting issues
+ - Fix "slackpkg blacklist" so that it shows blacklist again
+ - Fixup internal blacklist handling
+ - Use ERE for sanity_check() function (David Woodfall)
+ - Remove "slackpkg blacklist" from manual pages
+ - Fix aaa_elflibs --> aaa_libraries in sample blacklist file (mozes)
+ - Split aarch64 and arm mirrors into separate files (mozes)
+ - Allow new-config after slackpkg upgrade itself (PiterPUNK)
+
Wed Feb 3 04:40:10 UTC 2021
---------------
- Release slackpkg-15.0 (yes, jump from 2.84_beta12 to 15.0)
diff --git a/source/ap/slackpkg/files/blacklist.new b/source/ap/slackpkg/files/blacklist.new
index 34cf0d10..e1ddd2b9 100644
--- a/source/ap/slackpkg/files/blacklist.new
+++ b/source/ap/slackpkg/files/blacklist.new
@@ -3,12 +3,12 @@
# This is a blacklist file. Any packages listed here won't be
# upgraded, removed, or installed by slackpkg.
-# aaa_elflibs should NOT be blacklisted!
+# aaa_libraries should NOT be blacklisted!
#
# You can blacklist using regular expressions.
#
-# Don't use *full* regex here, because all of the following will be checked
-# for the regex: series, name, version, arch, build, and fullname.
+# All of the following will be checked for the regex:
+# Package series, name, version, arch, build, and fullname
# When blacklisting packages, you can use extended regex on package names
# (such as xorg-.* instead of xorg-server, xorg-docs, etc), and a trailing
# slash for package series ("n/", "ap/", "xap/", etc).
@@ -29,7 +29,8 @@
# DON'T put any space(s) before or after the package name or regex.
#
# Automated upgrade of kernel packages may not be wanted in some situations;
-# uncomment the lines below if that fits your circumstances:
+# uncomment the lines below if that fits your circumstances, but note that
+# kernel-headers should *not* be blacklisted:
#
#kernel-generic.*
#kernel-huge.*
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index dcbceae0..9591d652 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -7,7 +7,7 @@
# Clean-up tmp and lock files
#
function cleanup() {
- local retval=0
+ local retval=${PENDING_UPDATES:-0}
[ "$SPINNING" = "off" ] || tput cnorm
if [ -e $TMPDIR/error.log ]; then
retval=1
@@ -62,7 +62,7 @@ spinning() {
function system_setup() {
# Create $WORKDIR just in case
- mkdir -p "${ROOT}/${WORKDIR}"
+ mkdir -p "${WORKDIR}"
# Set LOCAL if mirror isn't through network
# If mirror is through network, select the command to fetch
@@ -161,8 +161,12 @@ function system_setup() {
mkdir $TEMPLATEDIR
fi
+ # Create initial blacklist of single package names from regexps in
+ # ${CONF}/blacklist.
+ mkregex_blacklist
+
SLACKCFVERSION=$(grep "# v[0-9.]\+" $CONF/slackpkg.conf | cut -f2 -dv)
- CHECKSUMSFILE=${ROOT}/${WORKDIR}/CHECKSUMS.md5
+ CHECKSUMSFILE=${WORKDIR}/CHECKSUMS.md5
KERNELMD5=$(md5sum /boot/vmlinuz 2>/dev/null)
DIALOG_MAXARGS=${DIALOG_MAXARGS:-19500}
echo "$0 $VERSION - Slackware Linux $SLACKWARE_VERSION" > $TMPDIR/timestamp
@@ -197,7 +201,7 @@ ARCH values\n"
# Check if the config files are updated to the new slackpkg version
#
- if [ "${ROOT}/${WORKDIR}" = "" ]; then
+ if [ "${WORKDIR}" = "" ]; then
echo -e "\
\nYou need to upgrade your slackpkg.conf.\n\
This is a new slackpkg version and many changes happened in config files.\n\
@@ -234,7 +238,7 @@ the problem.\n"
# Checking if is the first time running slackpkg
#
- if ! [ -f ${ROOT}/${WORKDIR}/pkglist ] && [ "$CMD" != "update" ]; then
+ if ! [ -f ${WORKDIR}/pkglist ] && [ "$CMD" != "update" ]; then
if [ "$SOURCE" = "" ]; then
echo -e "\
\nThis appears to be the first time you have run slackpkg.\n\
@@ -271,7 +275,7 @@ mirrors uncommented is not valid syntax.
cleanup
fi
MIRROR_VERSION=$(echo $SOURCE|sed "s/.*-//;s/.$//")
- if [ "$MIRROR_VERSION" = "current" ] && [ ! -f ${ROOT}/${WORKDIR}/current ]; then
+ if [ "$MIRROR_VERSION" = "current" ] && [ ! -f ${WORKDIR}/current ]; then
echo -n "
You have selected a mirror for Slackware -current in ${CONF}/mirrors,
but Slackware version $SLACKWARE_VERSION appears to be installed.
@@ -283,7 +287,7 @@ Is this really what you want?
To confirm your choice, press Y, else press N. Then, press Enter: "
read current
if [ "$current" = "Y" ] || [ "$current" = "y" ]; then
- touch ${ROOT}/${WORKDIR}/current
+ touch ${WORKDIR}/current
echo -n "
Slackpkg will not show this warning again unless you remove the
${WORKDIR}/current file.
@@ -293,7 +297,7 @@ ${WORKDIR}/current file.
cleanup
fi
fi
- [ ! "$MIRROR_VERSION" = "current" ] && rm -f ${ROOT}/${WORKDIR}/current
+ [ ! "$MIRROR_VERSION" = "current" ] && rm -f ${WORKDIR}/current
# It will check if the mirror selected are ftp.slackware.com
# if set to "ftp.slackware.com" tell the user to choose another
@@ -343,8 +347,9 @@ use slackpkg.\n"
#
if ! [ $(which md5sum 2>/dev/null) ]; then
CHECKMD5=off
- elif ! [ -f ${ROOT}/${WORKDIR}/CHECKSUMS.md5 ] && \
+ elif ! [ -f ${WORKDIR}/CHECKSUMS.md5 ] && \
[ "$CMD" != "update" ] && \
+ [ "$CMD" != "new-config" ] && \
[ "$CHECKMD5" = "on" ]; then
echo -e "\n\
No CHECKSUMS.md5 found! Please disable md5sums checking\n\
@@ -582,8 +587,37 @@ function listpkgname() {
cut -f1 -d\ | uniq > ${TMPDIR}/dpkg
}
+# Create a blacklist of single package names from regexps in original blacklist
+# any sets such as kde/ are converted to single package names in the process
+# the final list will be used by 'applyblacklist' later.
+function mkregex_blacklist() {
+ # Check that we have the files we need
+ if [ ! -f ${WORKDIR}/pkglist ] || [ ! -f ${CONF}/blacklist ];then
+ return 1
+ fi
+
+ # Create tmp blacklist in a more usable format
+ sed -E "s,(^[[:blank:]]+|[[:blank:]]+$),,
+ /(^#|^$)/d
+ s,^, ,
+ s,$, ,
+ s,^ (extra|pasture|patches|slackware(|64)|testing)/ $,^\1 ,
+ s,^ ([^/]+)/ $, \\\.\\\/$PKGMAIN\\\/\1\$,
+ " ${CONF}/blacklist > ${TMPDIR}/blacklist.tmp
+
+ # Filter server and local package lists through blacklist
+ ( cat ${WORKDIR}/pkglist
+ printf "%s\n" $ROOT/var/log/packages/* |
+ awk -f /usr/libexec/slackpkg/pkglist.awk
+ ) | cut -d\ -f1-7 | grep -E -f ${TMPDIR}/blacklist.tmp |
+ awk '{print $2}' | sort -u | sed "s,[+],[+],g
+ s,$,-[^-]+-($ARCH|noarch|fw)-[^-]+,g" > ${TMPDIR}/blacklist
+}
+
+# Blacklist filter
+#
function applyblacklist() {
- grep -vE -f ${TMPDIR}/blacklist
+ grep -vxE -f ${TMPDIR}/blacklist
}
# Function to make install/reinstall/upgrade lists
@@ -595,22 +629,14 @@ function makelist() {
INPUTLIST=$@
- grep -vE "(^#|^[[:blank:]]*$)" ${ROOT}/${CONF}/blacklist | \
- sed -E "
- s,^, ,
- s,$, ,
- s,^\s(extra|pasture|patches|slackware(|64)|testing)\s$,\1 ,
- s,^\s(tgz|txz)\s$, \1,
- s,^\s([^/]*)/\s$, ./$PKGMAIN/\1 ,
- " \
- > ${TMPDIR}/blacklist
-
if echo $CMD | grep -q install ; then
- ls -1 $ROOT/var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
+ ls -1 $ROOT/var/log/packages/* |
+ awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
else
- ls -1 $ROOT/var/log/packages/* | awk -f /usr/libexec/slackpkg/pkglist.awk | applyblacklist > ${TMPDIR}/tmplist
+ ls -1 $ROOT/var/log/packages/* |
+ awk -f /usr/libexec/slackpkg/pkglist.awk > ${TMPDIR}/tmplist
fi
- cat ${ROOT}/${WORKDIR}/pkglist | applyblacklist > ${TMPDIR}/pkglist
+ cat ${WORKDIR}/pkglist > ${TMPDIR}/pkglist
touch ${TMPDIR}/waiting
@@ -707,7 +733,7 @@ function makelist() {
done
;;
install-new)
- for i in $(awk -f /usr/libexec/slackpkg/install-new.awk ${ROOT}/${WORKDIR}/ChangeLog.txt |\
+ for i in $(awk -f /usr/libexec/slackpkg/install-new.awk ${WORKDIR}/ChangeLog.txt |\
sort -u ) dialog aaa_terminfo fontconfig \
ntfs-3g ghostscript wqy-zenhei-font-ttf \
xbacklight xf86-video-geode ; do
@@ -744,8 +770,8 @@ function makelist() {
if [ "$CMD" = "file-search" ]; then
# Search filelist.gz for possible matches
for i in ${PRIORITY[@]}; do
- if [ -e ${ROOT}/${WORKDIR}/${i}-filelist.gz ]; then
- PKGS="$(zegrep -w "${INPUTLIST}" ${ROOT}/${WORKDIR}/${i}-filelist.gz | \
+ if [ -e ${WORKDIR}/${i}-filelist.gz ]; then
+ PKGS="$(zegrep -w "${INPUTLIST}" ${WORKDIR}/${i}-filelist.gz | \
cut -d\ -f 1 | awk -F'/' '{print $NF}')"
for FULLNAME in $PKGS ; do
NAME=$(cutpkg ${FULLNAME})
@@ -757,8 +783,13 @@ function makelist() {
done
else
for i in ${PRIORITY[@]}; do
- PKGS=$(grep "^${i}.*${PATTERN}" \
- ${TMPDIR}/pkglist | cut -f6 -d\ )
+
+ # Test for search pattern in blacklist first
+ grep -q "^${PATTERN}$" ${TMPDIR}/blacklist && continue
+
+ PKGS=$( cut -d\ -f1-7 ${TMPDIR}/pkglist |
+ grep "^${i}.*${PATTERN}" | cut -f6 -d\ )
+
for FULLNAME in $PKGS ; do
NAME=$(cutpkg ${FULLNAME})
@@ -769,9 +800,14 @@ function makelist() {
done
fi
rm -f $PKGNAMELIST
+ rm ${TMPDIR}/waiting
+
+ echo -e "DONE\n"
+ # We need to return early before the blacklist
+ return
;;
esac
- LIST=$(echo -e $LIST | tr \ "\n" | uniq )
+ LIST=$( printf "%s\n" $LIST | applyblacklist | uniq )
rm ${TMPDIR}/waiting
@@ -832,7 +868,14 @@ function searchlist() {
echo "[${STATUS}] - ${INSTPKG}"
else
STATUS=" upgrade "
- echo "[${STATUS}] - ${INSTPKG} --> ${RAWNAME}"
+ INSTPKG=$( printf "$INSTPKG" | tr '\n' ' ' )
+
+ if echo "$INSTPKG" | grep -q ' '; then
+ printf "%s - %s / %s\n --> %s\n" \
+ "[${STATUS}]" ${INSTPKG} ${RAWNAME}
+ else
+ echo "[${STATUS}] - ${INSTPKG} --> ${RAWNAME}"
+ fi
fi
else
echo "[${STATUS}] - ${RAWNAME}"
@@ -986,12 +1029,12 @@ function getpkg() {
# Check if anything has changed. If so, return 1, else 0 if no change.
function checkchangelog()
{
- if ! [ -e ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc ]; then
- touch ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc
+ if ! [ -e ${WORKDIR}/CHECKSUMS.md5.asc ]; then
+ touch ${WORKDIR}/CHECKSUMS.md5.asc
fi
- if ! [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then
- touch ${ROOT}/${WORKDIR}/ChangeLog.txt
+ if ! [ -e ${WORKDIR}/ChangeLog.txt ]; then
+ touch ${WORKDIR}/ChangeLog.txt
fi
# First we will download CHECKSUMS.md5.asc since it is a very small
@@ -1005,7 +1048,7 @@ function checkchangelog()
Please check your mirror and try again."
cleanup
fi
- if diff --brief ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc $TMPDIR/CHECKSUMS.md5.asc ; then
+ if diff --brief ${WORKDIR}/CHECKSUMS.md5.asc $TMPDIR/CHECKSUMS.md5.asc ; then
return 0
else
return 1
@@ -1092,10 +1135,10 @@ Please check your mirror and try again."
ISOK=$(checkmd5 ${TMPDIR}/FILELIST.TXT)
fi
if [ "$ISOK" = "1" ]; then
- if ! [ -e ${ROOT}/${WORKDIR}/LASTUPDATE ]; then
- echo "742868196" > ${ROOT}/${WORKDIR}/LASTUPDATE
+ if ! [ -e ${WORKDIR}/LASTUPDATE ]; then
+ echo "742868196" > ${WORKDIR}/LASTUPDATE
fi
- LASTUPDATE=$(cat ${ROOT}/${WORKDIR}/LASTUPDATE)
+ LASTUPDATE=$(cat ${WORKDIR}/LASTUPDATE)
ACTUALDATE=$(date -d "$(head -1 $TMPDIR/FILELIST.TXT)" "+%s")
if [ $ACTUALDATE -lt $LASTUPDATE ]; then
echo -e "\
@@ -1107,7 +1150,7 @@ Please check your mirror and try again."
fi
echo
fi
- echo $ACTUALDATE > ${ROOT}/${WORKDIR}/LASTUPDATE
+ echo $ACTUALDATE > ${WORKDIR}/LASTUPDATE
else
rm $TMPDIR/FILELIST.TXT
fi
@@ -1146,10 +1189,10 @@ Please check your mirror and try again."
grep "\.t[blxg]z$" $FILELIST| \
awk -f /usr/libexec/slackpkg/pkglist.awk |\
sed -e 's/^M//g' > ${TMPDIR}/pkglist
- cp ${TMPDIR}/pkglist ${ROOT}/${WORKDIR}/pkglist
+ cp ${TMPDIR}/pkglist ${WORKDIR}/pkglist
# Create the slackware tree under TEMP directory
- for i in $( cut -f7 -d\ ${ROOT}/${WORKDIR}/pkglist | sort -u ) ; do
+ for i in $( cut -f7 -d\ ${WORKDIR}/pkglist | sort -u ) ; do
if ! [ -d ${ROOT}/${TEMP}/${i} ]; then
mkdir -p ${ROOT}/${TEMP}/${i}
fi
@@ -1165,11 +1208,11 @@ Please check your mirror and try again."
bunzip2 -c $TMPDIR/${i}-MANIFEST.bz2 | awk -f /usr/libexec/slackpkg/filelist.awk | \
gzip > ${TMPDIR}/${i}-filelist.gz
done
- cp ${TMPDIR}/*-filelist.gz ${ROOT}/${WORKDIR}/
+ cp ${TMPDIR}/*-filelist.gz ${WORKDIR}/
- if [ -r ${ROOT}/${WORKDIR}/filelist.gz ]; then
- rm ${ROOT}/${WORKDIR}/filelist.gz
- ln -s ${ROOT}/${WORKDIR}/${MAIN}-filelist.gz ${ROOT}/${WORKDIR}/filelist.gz
+ if [ -r ${WORKDIR}/filelist.gz ]; then
+ rm ${WORKDIR}/filelist.gz
+ ln -s ${WORKDIR}/${MAIN}-filelist.gz ${WORKDIR}/filelist.gz
fi
# Concatenate PACKAGE.TXT files
@@ -1178,20 +1221,20 @@ Please check your mirror and try again."
for i in $DIRS; do
cat $TMPDIR/${i}-PACKAGES.TXT >> $TMPDIR/PACKAGES.TXT
done
- cp $TMPDIR/PACKAGES.TXT ${ROOT}/${WORKDIR}/PACKAGES.TXT
+ cp $TMPDIR/PACKAGES.TXT ${WORKDIR}/PACKAGES.TXT
if [ -e $TMPDIR/CHECKSUMS.md5 ]; then
- cp $TMPDIR/CHECKSUMS.md5 ${ROOT}/${WORKDIR}/CHECKSUMS.md5 2>/dev/null
+ cp $TMPDIR/CHECKSUMS.md5 ${WORKDIR}/CHECKSUMS.md5 2>/dev/null
fi
if [ -e $TMPDIR/CHECKSUMS.md5.asc ]; then
cp $TMPDIR/CHECKSUMS.md5.asc \
- ${ROOT}/${WORKDIR}/CHECKSUMS.md5.asc 2>/dev/null
+ ${WORKDIR}/CHECKSUMS.md5.asc 2>/dev/null
fi
# Finally, copy ChangeLog.txt
if [ -e $TMPDIR/ChangeLog.txt ]; then
cp $TMPDIR/ChangeLog.txt \
- ${ROOT}/${WORKDIR}/ChangeLog.txt 2>/dev/null
+ ${WORKDIR}/ChangeLog.txt 2>/dev/null
fi
}
@@ -1214,60 +1257,42 @@ function sanity_check() {
mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME}
done
- ls -1 $ROOT/var/log/packages/ | egrep "^.*-(${ARCH}|fw|noarch)-[^-]+$" | \
- batchcutpkg | sort > $TMPDIR/list1
- cat $TMPDIR/list1 | uniq > $TMPDIR/list2
- FILES="$(diff $TMPDIR/list1 $TMPDIR/list2 | grep '<' | cut -f2 -d\ )"
- if [ "$FILES" != "" ]; then
- for i in $FILES ; do
- grep -qx "${i}" ${CONF}/blacklist && continue
- DOUBLEFILES="$DOUBLEFILES $i"
- done
- unset FILES
- fi
+ DOUBLEFILES=$( ls -1 $ROOT/var/log/packages/ |
+ batchcutpkg | uniq -D | sort -u | sed "s,[+],[+],g" |
+ xargs -I '{}' find $ROOT/var/log/packages/ -regextype awk -regex \
+ ".*/{}-[^-]+-($ARCH|noarch|fw)-[^-]+" | awk -F/ '{print $NF}' |
+ applyblacklist )
rm ${TMPDIR}/waiting
echo -e "DONE"
if [ "$DOUBLEFILES" != "" ]; then
echo -e "\
-You have a broken $ROOT/var/log/packages/ - with two versions of the same package.\n\
-The list of packages duplicated in your machine is shown below, but don't\n\
-worry about this list - when you select your action, slackpkg will show a\n\
-better list:\n"
- for i in $DOUBLEFILES ; do
- ls -1 $ROOT/var/log/packages/ |\
- egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-"
- done
+You have a broken $ROOT/var/log/packages/ - with multiple versions of the same package.\n\
+The list of packages duplicated in your machine is shown below:\n"
+ printf "%s\n" $DOUBLEFILES
+
echo -ne "\n\
-You can (R)emove, or (I)gnore these packages.\n\
+You can (R)emove one or more of, or (I)gnore these packages.\n\
Select your action (R/I): "
read ANSWER
echo
case "$ANSWER" in
R|r)
- for i in $DOUBLEFILES ; do
- FILE=$(ls -1 $ROOT/var/log/packages/ |\
- egrep -i -- "^${i}-[^-]+-(${ARCH}|fw|noarch)-")
- FILES="$FILES $FILE"
- done
- showlist "$FILES" remove
+ showlist "$DOUBLEFILES" remove
remove_pkg
;;
*)
- echo -e "\n\
-Remove or blacklist the affected packages in order for slackpkg to work properly.\n"
+ echo "Remove one or more of OR blacklist the affected packages in order
+for slackpkg to work properly.
+"
+ echo "To blacklist the affected packages, edit /etc/slackpkg/blacklist"
cleanup
;;
esac
fi
}
-function blacklist_pkg() {
- echo -e "\nThis function no longer adds packages to your blacklist.\n\
-As of slackpkg 15.0, you will need to edit ${CONF}/blacklist instead.\n"
-}
-
function remove_pkg() {
local i
@@ -1367,7 +1392,7 @@ generate_template() {
[ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting &
for i in $ROOT/var/log/packages/* ; do
PKGNAME=$( cutpkg $(basename $i))
- grep -q " $PKGNAME " ${ROOT}/${WORKDIR}/pkglist && \
+ grep -q " $PKGNAME " ${WORKDIR}/pkglist && \
echo $PKGNAME >> $TMPDIR/$TEMPLATE.work
done
rm $TMPDIR/waiting
diff --git a/source/ap/slackpkg/files/cutpkg.awk b/source/ap/slackpkg/files/cutpkg.awk
index 62aaad73..d4cc57cf 100644
--- a/source/ap/slackpkg/files/cutpkg.awk
+++ b/source/ap/slackpkg/files/cutpkg.awk
@@ -1,8 +1,6 @@
OFS="-" {
if ( NF > 3 ) {
NF=NF-3
- print $0
- } else {
- print $0
}
}
+1
diff --git a/source/ap/slackpkg/files/manpages-l10n/de.slackpkg b/source/ap/slackpkg/files/manpages-l10n/de.slackpkg
index f724dfd1..286a105f 100644
--- a/source/ap/slackpkg/files/manpages-l10n/de.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/de.slackpkg
@@ -10,7 +10,7 @@ Linuxpaketen
.SH ZUSAMMENFASSUNG
\fBslackpkg\fP \fB[OPTIONEN]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIMUSTER\fP\fB|\fP\fIDATEI\fP\fB}\fP
\fBslackpkg [OPTIONEN] {clean\-system|upgrade\-all|install\-new}\fP
@@ -222,16 +222,6 @@ Mit der Aktion "remove" können Sie installierte Pakete entfernen. Beispiel:
wird alle Pakete mit "kde" im Namen entfernen.
.TP 5
-\fBblacklist\fP
-.br
-Mit dieser Aktion können Sie gewissen Pakete auf die "Blacklist" setzen.
-.br
-Pakete, die in der "Blacklist" sind, werden bei Aktionen wie "install",
-"upgrade" oder "remove" ignoriert. Um Pakete auf die "Blacklist" zu setzten
-oder sie von dieser zu entfernen, bearbeiten Sie bitte die Datei
-/etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Mit dieser Aktion lädt Slackpkg Pakete herunter, installiert sie aber
diff --git a/source/ap/slackpkg/files/manpages-l10n/el.slackpkg b/source/ap/slackpkg/files/manpages-l10n/el.slackpkg
index 85355fe9..51841a37 100644
--- a/source/ap/slackpkg/files/manpages-l10n/el.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/el.slackpkg
@@ -10,7 +10,7 @@ Slackware Linux
.SH ΣΥΝΟΨΗ
\fBslackpkg\fP \fB[ΕΠΙΛΟΓΕΣ]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIΠΡΟΤΥΠΟ\fP\fB|\fP\fIΑΡΧΕΙΟ\fP\fB}\fP
\fBslackpkg [ΕΠΙΛΟΓΕΣ] {clean\-system|upgrade\-all|install\-new}\fP
@@ -230,15 +230,6 @@ Slackware.
θα αφαιρέσει όλα τα πακέτα με το "kde" στο όνομά τους.
.TP 5
-\fBblacklist\fP
-.br
-Με την ενέργεια αυτή, μπορείτε να βάλετε στη "μαύρη λίστα" ορισμένα πακέτα.
-.br
-Τα ανεπιθύμητα πακέτα δεν θα εγκατασταθούν, αναβαθμιστούν ή αφαιρεθούν από
-το slackpkg. Εάν θέλετε να αφαιρέσετε κάποιο πακέτο από τη μαύρη λίστα,
-παρακαλούμε να επεξεργαστείτε το /etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Η δράση αυτή λέει στο slackpkg να κατεβάσει τα πακέτα, αλλά όχι να τα
diff --git a/source/ap/slackpkg/files/manpages-l10n/es.slackpkg b/source/ap/slackpkg/files/manpages-l10n/es.slackpkg
index 98e24d0d..435eec44 100644
--- a/source/ap/slackpkg/files/manpages-l10n/es.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/es.slackpkg
@@ -10,7 +10,7 @@ Slackware Linux
.SH SINOPSIS
\fBslackpkg\fP \fB[OPCIONES]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIPATRÓN\fP\fB|\fP\fIARCHIVO\fP\fB}\fP
\fBslackpkg [OPCIONES] {clean\-system|upgrade\-all|install\-new}\fP
@@ -217,15 +217,6 @@ Con "remove", es posible eliminar ciertos paquetes instalados. Por ejemplo:
eliminará todos los paquetes con "kde" en su nombre.
.TP 5
-\fBblacklist\fP
-.br
-Con esta acción, se pueden agregar ciertos paquetes a una "lista negra".
-.br
-Los paquetes en la lista negra no serán instalados, actualizados o
-eliminados por slackpkg. Si necesita eliminar algún paquete de la lista
-negra, por favor edite /etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Esta acción hace que slackpkg descargue los paquetes, pero no los
diff --git a/source/ap/slackpkg/files/manpages-l10n/fa.slackpkg b/source/ap/slackpkg/files/manpages-l10n/fa.slackpkg
index 740da974..87ed95e9 100644
--- a/source/ap/slackpkg/files/manpages-l10n/fa.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/fa.slackpkg
@@ -9,7 +9,7 @@
.SH اختصار
\fBslackpkg\fP \fB[گزینه ها]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIفایل\fP\fB|\fP\fIالگو\fP\fB}\fP
\fBslackpkg [گزینه ها] {clean\-system|upgrade\-all|install\-new}\fP
@@ -210,15 +210,6 @@ install استفاده کنید که باعث نصب آخرین نسخه رسم
تمام پکیج هایی که عبارت "kde" در نام آنها وجود دارد، حذف خواهند شد.
.TP 5
-\fBblacklist\fP
-.br
-با این عملیات، شما می توانید پکیج های خاصی را وارد لیست سیاه کنید.
-.br
-پکیج هایی که وارد لیست سیاه شده اند بوسیله slackpkg نصب، ارتقاء و حذف
-نخواهند شد. اگر می خواهید برخی پکیج ها را از لیست سیاه خارج کنید، فایل واقع
-در مسیر etc/slackpkg/blacklist/ را تدوین کنید.
-
-.TP 5
\fBdownload\fP
.br
با استفاده از این گزینه slackpkg پکیج را دانلود می کند اما آن را نصب نمی
diff --git a/source/ap/slackpkg/files/manpages-l10n/fr.slackpkg b/source/ap/slackpkg/files/manpages-l10n/fr.slackpkg
index e7b11c8f..6850a204 100644
--- a/source/ap/slackpkg/files/manpages-l10n/fr.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/fr.slackpkg
@@ -9,7 +9,7 @@
.SH SYNOPSIS
\fBslackpkg\fP \fB[OPTIONS]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIMOTIF\fP\fB|\fP\fIFICHIER\fP\fB}\fP
\fBslackpkg [OPTIONS] {clean\-system|upgrade\-all|install\-new}\fP
@@ -224,16 +224,6 @@ Avec "remove" vous pouvez enlever des paquets installés. Par exemple :
enlèvera tous les paquets avec "kde" dans leur nom.
.TP 5
-\fBblacklist\fP
-.br
-Avec cette fonction vous pouvez "blacklister" (mettre en liste noire)
-certains paquets.
-.br
-Les paquets en liste noire ne seront pas installés, mis à niveau ou enlevés
-par slackpkg. Si vous voulez enlever un paquet de la liste noire, merci
-d'éditer le fichier /etc/slackpkg/blacklist à cet effet.
-
-.TP 5
\fBdownload\fP
.br
Cette action indique à slackpkg de télé\-charger les paquets, mais de ne pas
diff --git a/source/ap/slackpkg/files/manpages-l10n/id.slackpkg b/source/ap/slackpkg/files/manpages-l10n/id.slackpkg
index 048af070..741202f6 100644
--- a/source/ap/slackpkg/files/manpages-l10n/id.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/id.slackpkg
@@ -9,7 +9,7 @@
.SH SINOPSIS
\fBslackpkg\fP \fB[OPTIONS]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIPOLA\fP\fB|\fP\fIFILE\fP\fB}\fP
\fBslackpkg [OPTIONS] {clean\-system|upgrade\-all|install\-new}\fP
@@ -213,15 +213,6 @@ contoh:
akan menghapus semua paket dengan "kde" sebagai namanya.
.TP 5
-\fBblacklist\fP
-.br
-Dengan aksi ini, Anda bisa mem\-"blacklist" paket tertentu.
-.br
-Paket yang di\-blacklist tidak akan diinstall, diupgrade, atau dihapus oleh
-slackpkg. Jika Anda ingin menghapus beberapa paket dari daftar blacklist,
-silahkan mengedit /etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Aksi ini memberitahu slackpkg untuk mendownload paket, tetapi tidak
diff --git a/source/ap/slackpkg/files/manpages-l10n/it.slackpkg b/source/ap/slackpkg/files/manpages-l10n/it.slackpkg
index 0d9db3fb..1f674490 100644
--- a/source/ap/slackpkg/files/manpages-l10n/it.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/it.slackpkg
@@ -10,7 +10,7 @@ Slackware Linux
.SH SINOSSI
\fBslackpkg\fP \fB[OPZIONI]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fISCHEMA\fP\fB|\fP\fIFILE\fP\fB}\fP
\fBslackpkg [OPZIONI] {clean\-system|upgrade\-all|install\-new}\fP
@@ -216,15 +216,6 @@ Con remove, puoi rimuovere i pacchetti installati. Per esempio:
rimuoverà tutti i pacchetti con "kde" nel loro nome.
.TP 5
-\fBblacklist\fP
-.br
-Con questa azione, puoi mettere in una "listanera" certi pacchetti.
-.br
-I pacchetti della lista nera non saranno installati, aggiornati o rimossi
-con slackpkg. Se vuoi eliminare i pacchetti dalla lista nera, per favore
-modifica il file /etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Questa azione dice a slackpkg di scaricare il pacchetto, ma senza
diff --git a/source/ap/slackpkg/files/manpages-l10n/nb.slackpkg b/source/ap/slackpkg/files/manpages-l10n/nb.slackpkg
index 412fb72f..64b82f20 100644
--- a/source/ap/slackpkg/files/manpages-l10n/nb.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/nb.slackpkg
@@ -9,7 +9,7 @@
Linux
.SH SAMMENDRAG
-\fBslackpkg\fP \fB[VALG]\fP \fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fBslackpkg\fP \fB[VALG]\fP \fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fITEKST\fP\fB|\fP\fIFIL\fP\fB}\fP
\fBslackpkg [VALG] {clean\-system|upgrade\-all|install\-new}\fP
@@ -211,15 +211,6 @@ remove kan fjerne pakker som er installert. For eksempel:
vil fjerne alle pakker som inkluderer "kde" i sitt navn.
.TP 5
-\fBblacklist\fP
-.br
-Denne handlingen lar deg "svarteliste" visse pakker.
-.br
-Pakker som er svartelistet vil ikke bli installert, oppgradert eller fjernet
-av slackpkg. Hvis du vil fjerne pakker fra svartelisten kan du gjøre dette i
-/etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Denne handlingen lar slackpkg laste ned pakkene, men installerer dem
diff --git a/source/ap/slackpkg/files/manpages-l10n/nl.slackpkg b/source/ap/slackpkg/files/manpages-l10n/nl.slackpkg
index 931c33d1..0e22f64d 100644
--- a/source/ap/slackpkg/files/manpages-l10n/nl.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/nl.slackpkg
@@ -10,7 +10,7 @@ pakketten
.SH SYNOPSIS
\fBslackpkg\fP \fB[OPTIES]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIPATROON\fP\fB|\fP\fIBESTAND\fP\fB}\fP
\fBslackpkg [OPTIES] {clean\-system|upgrade\-all|install\-new}\fP
@@ -221,16 +221,6 @@ verwijderen. Bijvoorbeeld:
zal alle pakketten verwijderen met "kde" in hun naam.
.TP 5
-\fBblacklist\fP
-.br
-Met deze actie kun je bepaalde pakketten op een "zwarte lijst" zetten.
-.br
-Pakketten op de zwarte lijst zullen niet worden geïnstalleerd, opgewaardeerd
-of verwijderd door slackpkg. Als je een pakket wilt verwijderen uit de
-zwarte lijst, moet je het bestand /etc/slackpkg/blacklist handmatig
-aanpassen.
-
-.TP 5
\fBdownload\fP
.br
Deze actie laat slackpkg de pakketten downloaden maar niet installeren. Ze
diff --git a/source/ap/slackpkg/files/manpages-l10n/pl.slackpkg b/source/ap/slackpkg/files/manpages-l10n/pl.slackpkg
index fd0b39d9..e79275f8 100644
--- a/source/ap/slackpkg/files/manpages-l10n/pl.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/pl.slackpkg
@@ -10,7 +10,7 @@ Slackware Linux.
.SH STRESZCZENIE
\fBslackpkg\fP \fB[OPCJE]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fICIĄG\fP\fB|\fP\fIPLIK\fP\fB}\fP
\fBslackpkg [OPCJE] {clean\-system|upgrade\-all|install\-new}\fP
@@ -213,15 +213,6 @@ Z remove, możesz usunąć pewne zainstalowane pakiety. Na przykład:
usunie wszystkie pakiety zawierające "kde" w swojej nazwie.
.TP 5
-\fBblacklist\fP
-.br
-Ta funkcja pozwala na zablokowanie (blacklist) danych pakietów.
-.br
-Zablokowane pakiety nie będą instalowane, aktualizowane, ani usuwane przez
-slackpkg. Jeśli chcesz usunąć pakiet z listy zablokowanych pakietów, musisz
-edytować /etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Opcja pozwala na pobranie pakietów bez ich instalacji. Będą one umieszczone
diff --git a/source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg b/source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg
index c10b2cd2..0b106fc1 100644
--- a/source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/pt_BR.slackpkg
@@ -10,7 +10,7 @@ Slackware Linux
.SH SINOPSE
\fBslackpkg\fP \fB[OPÇÕES]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIPADRÃO\fP\fB|\fP\fIARQUIVO\fP\fB}\fP
\fBslackpkg [OPÇÕES] {clean\-system|upgrade\-all|install\-new}\fP
@@ -217,15 +217,6 @@ Com remove, você pode remover alguns pacotes instalados. Como um exemplo:
removerá todos os pacotes com "kde" em seu nome.
.TP 5
-\fBblacklist\fP
-.br
-Com essa ação, você pode colocar em "blacklist" certos pacotes.
-.br
-Pacotes em blacklist não serão instalados, atualizados ou removidos por meio
-do slackpkg. Se você quiser remover algum pacote que esteja na blacklist,
-por favor edite /etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Esta ação diz ao slackpkg para baixar os pacotes, mas não instalá\-los. Eles
diff --git a/source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg b/source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg
index 2997331a..31ae57e7 100644
--- a/source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/pt_PT.slackpkg
@@ -9,7 +9,7 @@
.SH SINOPSE
\fBslackpkg\fP \fB[OPÇÕES]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIPADRÃO\fP\fB|\fP\fIFICHEIRO\fP\fB}\fP
\fBslackpkg [OPÇÕES] {clean\-system|upgrade\-all|install\-new}\fP
@@ -215,15 +215,6 @@ Com remove, você pode remover certos pacotes instalados. Como um exemplo:
removerá todos os pacotes com "kde" no seu nome.
.TP 5
-\fBblacklist\fP
-.br
-Com esta ação, você pode colocar na "blacklist" certos pacotes.
-.br
-Pacotes colocados na blacklist não serão instalados, atualizados ou
-removidos pelo slackpkg. Se você quiser remover algum pacote da blacklist,
-por favor edite o /etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Esta ação diz ao slackpkg para transferir os pacotes, mas não
diff --git a/source/ap/slackpkg/files/manpages-l10n/ru.slackpkg b/source/ap/slackpkg/files/manpages-l10n/ru.slackpkg
index a4244a17..d8139d97 100644
--- a/source/ap/slackpkg/files/manpages-l10n/ru.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/ru.slackpkg
@@ -10,7 +10,7 @@ Linux
.SH СИНТАКСИС
\fBslackpkg\fP \fB[ОПЦИИ]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIОБРАЗЕЦ\fP\fB|\fP\fIФАЙЛ\fP\fB}\fP
\fBslackpkg [ОПЦИИ] {clean\-system|upgrade\-all|install\-new}\fP
@@ -210,15 +210,6 @@ file\-search, можно увидеть, установлены пакеты и
удалит пакеты, содержащие в имени "kde".
.TP 5
-\fBblacklist\fP
-.br
-Добавляет указанные пакеты в "черный список".
-.br
-Пакеты из "черного списка" не могут быть установлены, обновлены или удалены
-с помощью slackpkg. Для удаления пакетов из "черного списка" отредактируйте
-/etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Загружает, но не устанавливает пакеты. Они будут помещены в
diff --git a/source/ap/slackpkg/files/manpages-l10n/sv.slackpkg b/source/ap/slackpkg/files/manpages-l10n/sv.slackpkg
index a8e435de..2ea366da 100644
--- a/source/ap/slackpkg/files/manpages-l10n/sv.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/sv.slackpkg
@@ -9,7 +9,7 @@
.SH ÖVERSIKT
\fBslackpkg\fP \fB[ALTERNATIV]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIMÖNSTER\fP\fB|\fP\fIFIL\fP\fB}\fP
\fBslackpkg [ALTERNATIV] {clean\-system|upgrade\-all|install\-new}\fP
@@ -213,15 +213,6 @@ Med remove, kan du ta bort vissa installerade paket. Som ett exempel:
kommer att ta bort alla paket med "kde" i sitt namn.
.TP 5
-\fBblacklist\fP
-.br
-Med den här åtgärden kan du "svartlista" vissa paket.
-.br
-Svartlistade paket kommer inte att installeras, uppgraderas, eller tas bort
-av slackpkg. Om du vill ta bort vissa paket från svartlistan, vänligen
-redigera /etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Denna åtgärd talar om för slackpkg att hämta paketen, men inte att
diff --git a/source/ap/slackpkg/files/manpages-l10n/tr.slackpkg b/source/ap/slackpkg/files/manpages-l10n/tr.slackpkg
index 29cee71a..05e0178c 100644
--- a/source/ap/slackpkg/files/manpages-l10n/tr.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/tr.slackpkg
@@ -9,7 +9,7 @@
.SH ÖZET
\fBslackpkg\fP \fB[SEÇİMLER]\fP
-\fB{install|remove|search|upgrade|reinstall|blacklist}\fP
+\fB{install|remove|search|upgrade|reinstall}\fP
\fB{\fP\fIKALIP\fP\fB|\fP\fIDOSYA\fP\fB}\fP
\fBslackpkg [SEÇİMLER] {clean\-system|upgrade\-all|install\-new}\fP
@@ -210,15 +210,6 @@ remove il, belirli kurulu paketleri kaldırabilirsiniz. Örneğin:
isminde "kde" olan tüm paketleri kaldıracaktır.
.TP 5
-\fBblacklist\fP
-.br
-Bu eylemle, belirli paketlerden "karaliste" oluşturabilirsiniz.
-.br
-Karaliste paketleri slackpkg tarafından kurulmaz, yükseltilmez ya da
-kaldırılmaz. Bazı paketleri kara listeden çıkartmak isterseniz lütfen
-/etc/slackpkg/blacklist dosyasını düzenleyiniz.
-
-.TP 5
\fBdownload\fP
.br
Bu eylem slackpkg'ye paketi indirmesini fakat kurmamasını
diff --git a/source/ap/slackpkg/files/manpages-l10n/uk.slackpkg b/source/ap/slackpkg/files/manpages-l10n/uk.slackpkg
index 1d03e0e6..d69dd0b4 100644
--- a/source/ap/slackpkg/files/manpages-l10n/uk.slackpkg
+++ b/source/ap/slackpkg/files/manpages-l10n/uk.slackpkg
@@ -216,15 +216,6 @@ slackpkg.
буде вилучено пакунки що містять "kde" у своїй назві.
.TP 5
-\fBblacklist\fP
-.br
-Цією командою ви можете створити "чорний список" деяких пакунків.
-.br
-Пакунки з "чорного списку" не можуть бути встановлені, оновлені або вилучені
-за допомогою slackpkg. Якщо вам потрібно вилучити декілька пакунків з
-чорного списку, спочатку вилучіть їх з /etc/slackpkg/blacklist.
-
-.TP 5
\fBdownload\fP
.br
Ця команда вкаже slackpkg стягнути пакунки, але не встановлювати їх. Вони
diff --git a/source/ap/slackpkg/files/mirrors-aarch64.sample b/source/ap/slackpkg/files/mirrors-aarch64.sample
new file mode 100644
index 00000000..db48c08a
--- /dev/null
+++ b/source/ap/slackpkg/files/mirrors-aarch64.sample
@@ -0,0 +1,68 @@
+# mirrors - List of Slackware Linux mirrors.
+#
+# SlackPkg - An Automated packaging tool for Slackware Linux
+# Copyright (C) 2003-2011 Roberto F. Batista, Evaldo Gardenali
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# Project Page: https://slackpkg.org/
+# Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com
+# Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br
+#
+# END OF LEGAL NOTICE
+#
+#
+# You only need to select one mirror and uncomment it.
+# ONLY ONE mirror can be uncommented.
+#
+# You can use a mirror not included in this file. Many people have mirrors
+# in their local networks.
+#
+# Slackpkg only needs to point to the directory that contains
+# "ChangeLog.txt", and don't forget the trailing slash.
+#
+#----------------------------------------------------------------
+# Local CD/DVD drive
+#----------------------------------------------------------------
+#cdrom://media/cdrom/
+#
+#----------------------------------------------------------------
+# Local Directory
+#----------------------------------------------------------------
+#file://path/to/some/directory/
+#
+#----------------------------------------------------------------
+# Local CD/DVD drive
+#----------------------------------------------------------------
+#cdrom://media/cdrom/
+#
+#----------------------------------------------------------------
+# Local Directory
+#----------------------------------------------------------------
+#file://path/to/some/directory/
+#
+
+#----------------------------------------------------------------
+# Slackware AArch64 (ARM64) current: 64bit armv8
+#----------------------------------------------------------------
+#http://slackware.uk/slackwarearm/slackwareaarch64-current/
+#http://ftp.halifax.rwth-aachen.de/slackwarearm/slackwareaarch64-current/
+#http://ftp.slackware.pl/pub/slackwarearm/slackwareaarch64-current/
+#https://mirror.slackbuilds.org/slackwarearm/slackwareaarch64-current/
+#https://slackware.absolutehosting.net/pub/slackwarearm/slackwareaarch64-current/
+#
+# Use this as the default if you don't know which to pick:
+#http://ftp.arm.slackware.com/slackwarearm/slackwareaarch64-current/
+#
diff --git a/source/ap/slackpkg/files/mirrors-arm.sample b/source/ap/slackpkg/files/mirrors-arm.sample
index b26736bd..c81ce21e 100644
--- a/source/ap/slackpkg/files/mirrors-arm.sample
+++ b/source/ap/slackpkg/files/mirrors-arm.sample
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Project Page: http://slackpkg.org/
+# Project Page: https://slackpkg.org/
# Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com
# Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br
#
@@ -74,17 +74,6 @@
#https://mirror.slackbuilds.org/slackwarearm/slackwarearm-current/
#https://slackware.absolutehosting.net/pub/slackwarearm/slackwarearm-current/
#
+# Use this as the default if you don't know which to pick:
#http://ftp.arm.slackware.com/slackwarearm/slackwarearm-current/
#
-
-#----------------------------------------------------------------
-# Slackware AArch64 (ARM64) current: 64 bit armv8
-#----------------------------------------------------------------
-#http://slackware.uk/slackwarearm/slackwareaarch64-current/
-#http://ftp.halifax.rwth-aachen.de/slackwarearm/slackwareaarch64-current/
-#http://ftp.slackware.pl/pub/slackwarearm/slackwareaarch64-current/
-#https://mirror.slackbuilds.org/slackwarearm/slackwareaarch64-current/
-#https://slackware.absolutehosting.net/pub/slackwarearm/slackwareaarch64-current/
-#
-#http://ftp.arm.slackware.com/slackwarearm/slackwareaarch64-current/
-#
diff --git a/source/ap/slackpkg/files/mirrors-s390.sample b/source/ap/slackpkg/files/mirrors-s390.sample
index 03cad827..e5a3fbc5 100644
--- a/source/ap/slackpkg/files/mirrors-s390.sample
+++ b/source/ap/slackpkg/files/mirrors-s390.sample
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Project Page: http://slackpkg.org/
+# Project Page: https://slackpkg.org/
# Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com
# Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br
#
diff --git a/source/ap/slackpkg/files/mirrors-x86.sample b/source/ap/slackpkg/files/mirrors-x86.sample
index b72dd80e..5ede5cbc 100644
--- a/source/ap/slackpkg/files/mirrors-x86.sample
+++ b/source/ap/slackpkg/files/mirrors-x86.sample
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Project Page: http://slackpkg.org/
+# Project Page: https://slackpkg.org/
# Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com
# Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br
#
@@ -46,10 +46,10 @@
# file://path/to/some/directory/
#
#----------------------------------------------------------------
-# Slackware-14.2
+# Slackware-15.0
#----------------------------------------------------------------
# USE MIRRORS.SLACKWARE.COM (DO NOT USE FTP - ONLY HTTP FINDS A NEARBY MIRROR)
-https://mirrors.slackware.com/slackware/slackware-14.2/
+# https://mirrors.slackware.com/slackware/slackware-15.0/
#
#
# Here are some individual mirrors that can be used instead of the
@@ -57,148 +57,151 @@ https://mirrors.slackware.com/slackware/slackware-14.2/
# list is not guaranteed to be up-to-date
#
# AUSTRALIA (AU)
-# ftp://ftp.cc.swin.edu.au/slackware/slackware-14.2/
-# http://ftp.cc.swin.edu.au/slackware/slackware-14.2/
-# ftp://ftp.iinet.net.au/pub/slackware/slackware-14.2/
-# http://ftp.iinet.net.au/pub/slackware/slackware-14.2/
-# ftp://mirror.as24220.net/pub/slackware/slackware-14.2/
-# http://mirror.as24220.net/pub/slackware/slackware-14.2/
-# ftp://mirror.internode.on.net/.pub2/slackware/slackware-14.2/
-# http://mirror.internode.on.net/pub/slackware/slackware-14.2/
+# ftp://ftp.cc.swin.edu.au/slackware/slackware-15.0/
+# http://ftp.cc.swin.edu.au/slackware/slackware-15.0/
+# ftp://ftp.iinet.net.au/pub/slackware/slackware-15.0/
+# http://ftp.iinet.net.au/pub/slackware/slackware-15.0/
+# ftp://mirror.as24220.net/pub/slackware/slackware-15.0/
+# http://mirror.as24220.net/pub/slackware/slackware-15.0/
+# ftp://mirror.internode.on.net/.pub2/slackware/slackware-15.0/
+# http://mirror.internode.on.net/pub/slackware/slackware-15.0/
# AUSTRIA (AT)
-# http://gd.tuwien.ac.at/opsys/linux/freesoftware.com/slackware-14.2/
+# http://gd.tuwien.ac.at/opsys/linux/freesoftware.com/slackware-15.0/
# BELARUS (BY)
-# ftp://mirror.datacenter.by/pub/slackware/slackware-14.2/
-# http://mirror.datacenter.by/pub/slackware/slackware-14.2/
+# ftp://mirror.datacenter.by/pub/slackware/slackware-15.0/
+# http://mirror.datacenter.by/pub/slackware/slackware-15.0/
# BRAZIL (BR)
-# ftp://ftp.slackware-brasil.com.br/slackware-14.2/
-# http://ftp.slackware-brasil.com.br/slackware-14.2/
+# ftp://ftp.slackware-brasil.com.br/slackware-15.0/
+# http://ftp.slackware-brasil.com.br/slackware-15.0/
# BULGARIA (BG)
-# ftp://mirrors.unixsol.org/slackware/slackware-14.2/
-# http://mirrors.unixsol.org/slackware/slackware-14.2/
+# ftp://mirrors.unixsol.org/slackware/slackware-15.0/
+# http://mirrors.unixsol.org/slackware/slackware-15.0/
# CANADA (CA)
-# ftp://mirror.csclub.uwaterloo.ca/slackware/slackware-14.2/
-# http://mirror.csclub.uwaterloo.ca/slackware/slackware-14.2/
-# ftp://mirror.its.dal.ca/slackware/slackware-14.2/
-# http://mirror.its.dal.ca/slackware/slackware-14.2/
+# ftp://mirror.csclub.uwaterloo.ca/slackware/slackware-15.0/
+# http://mirror.csclub.uwaterloo.ca/slackware/slackware-15.0/
+# ftp://mirror.its.dal.ca/slackware/slackware-15.0/
+# http://mirror.its.dal.ca/slackware/slackware-15.0/
# CHINA (CN)
-# http://mirrors.163.com/slackware/slackware-14.2/
-# http://mirrors.ustc.edu.cn/slackware/slackware-14.2/
+# http://mirrors.163.com/slackware/slackware-15.0/
+# http://mirrors.ustc.edu.cn/slackware/slackware-15.0/
# COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-14.2/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-14.2/
+# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-15.0/
+# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-15.0/
# CZECH REPUBLIC (CZ)
-# ftp://odysseus.linux.cz/pub/linux/slackware/slackware-14.2/
-# http://odysseus.linux.cz/pub/linux/slackware/slackware-14.2/
+# ftp://odysseus.linux.cz/pub/linux/slackware/slackware-15.0/
+# http://odysseus.linux.cz/pub/linux/slackware/slackware-15.0/
# DENMARK (DK)
-# ftp://mirrors.dotsrc.org/slackware/slackware-14.2/
-# https://mirrors.dotsrc.org/slackware/slackware-14.2/
+# ftp://mirrors.dotsrc.org/slackware/slackware-15.0/
+# https://mirrors.dotsrc.org/slackware/slackware-15.0/
# FINLAND (FI)
-# ftp://elektroni.phys.tut.fi/slackware-14.2/
+# ftp://elektroni.phys.tut.fi/slackware-15.0/
# FRANCE (FR)
-# ftp://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware-14.2/
-# http://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware-14.2/
+# ftp://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware-15.0/
+# http://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware-15.0/
# GERMANY (DE)
-# ftp://ftp.gwdg.de/pub/linux/slackware/slackware-13.2/
-# http://ftp.gwdg.de/pub/linux/slackware/slackware-14.2/
-# ftp://ftp.tu-chemnitz.de/pub/linux/slackware/slackware-14.2/
-# http://ftp.tu-chemnitz.de/pub/linux/slackware/slackware-14.2/
-# ftp://ftp.zimt.uni-siegen.de/pub/slackware/slackware-14.2/
-# http://ftp.zimt.uni-siegen.de/slackware/slackware-14.2/
-# ftp://sunsite.informatik.rwth-aachen.de/pub/comp/Linux/slackware/slackware-14.2/
-# http://sunsite.informatik.rwth-aachen.de/ftp/pub/comp/Linux/slackware/slackware-14.2/
+# ftp://ftp.gwdg.de/pub/linux/slackware/slackware-15.0/
+# http://ftp.gwdg.de/pub/linux/slackware/slackware-15.0/
+# ftp://ftp.tu-chemnitz.de/pub/linux/slackware/slackware-15.0/
+# http://ftp.tu-chemnitz.de/pub/linux/slackware/slackware-15.0/
+# ftp://ftp.zimt.uni-siegen.de/pub/slackware/slackware-15.0/
+# http://ftp.zimt.uni-siegen.de/slackware/slackware-15.0/
+# ftp://sunsite.informatik.rwth-aachen.de/pub/comp/Linux/slackware/slackware-15.0/
+# http://sunsite.informatik.rwth-aachen.de/ftp/pub/comp/Linux/slackware/slackware-15.0/
# GREECE (GR)
-# ftp://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware-14.2/
-# http://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware-14.2/
-# ftp://ftp.otenet.gr/pub/linux/slackware/slackware-14.2/
-# http://ftp.otenet.gr/linux/slackware/slackware-14.2/
-# ftp://patroklos.noc.ntua.gr/pub/linux/slackware/slackware-14.2/
-# http://patroklos.noc.ntua.gr/pub/linux/slackware/slackware-14.2/
+# ftp://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware-15.0/
+# http://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware-15.0/
+# ftp://ftp.otenet.gr/pub/linux/slackware/slackware-15.0/
+# http://ftp.otenet.gr/linux/slackware/slackware-15.0/
+# ftp://patroklos.noc.ntua.gr/pub/linux/slackware/slackware-15.0/
+# http://patroklos.noc.ntua.gr/pub/linux/slackware/slackware-15.0/
# INDONESIA (ID)
-# http://kambing.ui.ac.id/slackware/slackware-14.2/
-# https://repo.ukdw.ac.id/slackware/slackware-14.2/
+# http://kambing.ui.ac.id/slackware/slackware-15.0/
+# https://repo.ukdw.ac.id/slackware/slackware-15.0/
# IRELAND (IE)
-# ftp://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware-14.2/
-# http://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware-14.2/
+# ftp://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware-15.0/
+# http://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware-15.0/
# ITALY (IT)
-# ftp://ba.mirror.garr.it/mirrors/Slackware/slackware-14.2/
-# http://ba.mirror.garr.it/mirrors/Slackware/slackware-14.2/
+# ftp://ba.mirror.garr.it/mirrors/Slackware/slackware-15.0/
+# http://ba.mirror.garr.it/mirrors/Slackware/slackware-15.0/
# JAPAN (JP)
-# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-14.2/
-# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-14.2/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-14.2/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-14.2/
-# ftp://riksun.riken.go.jp/Linux/slackware/slackware-14.2/
-# http://riksun.riken.go.jp/Linux/slackware/slackware-14.2/
+# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-15.0/
+# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-15.0/
+# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-15.0/
+# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-15.0/
+# ftp://riksun.riken.go.jp/Linux/slackware/slackware-15.0/
+# http://riksun.riken.go.jp/Linux/slackware/slackware-15.0/
+# LITHUANIA (LT)
+# http://mirrors.atviras.lt/slackware/slackware-15.0/
+# https://mirrors.atviras.lt/slackware/slackware-15.0/
# NETHERLANDS (NL)
-# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware-14.2/
-# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware-14.2/
-# ftp://mirror.nl.leaseweb.net/slackware/slackware-14.2/
-# http://mirror.nl.leaseweb.net/slackware/slackware-14.2/
+# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware-15.0/
+# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware-15.0/
+# ftp://mirror.nl.leaseweb.net/slackware/slackware-15.0/
+# http://mirror.nl.leaseweb.net/slackware/slackware-15.0/
# NORWAY (NO)
-# ftp://ftp.slackware.no/slackware/slackware-14.2/
-# http://ftp.slackware.no/slackware/slackware-14.2/
+# ftp://ftp.slackware.no/slackware/slackware-15.0/
+# http://ftp.slackware.no/slackware/slackware-15.0/
# POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-14.2/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-14.2/
-# ftp://ftp.slackware.pl/pub/slackware/slackware-14.2/
-# http://ftp.slackware.pl/pub/slackware/slackware-14.2/
-# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware-14.2/
-# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware-14.2/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-14.2/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-14.2/
+# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-15.0/
+# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-15.0/
+# ftp://ftp.slackware.pl/pub/slackware/slackware-15.0/
+# http://ftp.slackware.pl/pub/slackware/slackware-15.0/
+# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware-15.0/
+# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware-15.0/
+# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-15.0/
+# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-15.0/
# RUSSIA (RU)
-# http://mirror.rol.ru/slackware/slackware-14.2/
-# ftp://mirror.yandex.ru/slackware/slackware-14.2/
-# http://mirror.yandex.ru/slackware/slackware-14.2/
+# http://mirror.rol.ru/slackware/slackware-15.0/
+# ftp://mirror.yandex.ru/slackware/slackware-15.0/
+# http://mirror.yandex.ru/slackware/slackware-15.0/
# SOUTH AFRICA (ZA)
-# ftp://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware-14.2/
-# http://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware-14.2/
-# ftp://ftp.wa.co.za/pub/slackware/slackware-14.2/
-# http://ftp.wa.co.za/pub/slackware/slackware-14.2/
-# ftp://slackware.mirror.ac.za/slackware-14.2/
-# http://slackware.mirror.ac.za/slackware-14.2/
+# ftp://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware-15.0/
+# http://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware-15.0/
+# ftp://ftp.wa.co.za/pub/slackware/slackware-15.0/
+# http://ftp.wa.co.za/pub/slackware/slackware-15.0/
+# ftp://slackware.mirror.ac.za/slackware-15.0/
+# http://slackware.mirror.ac.za/slackware-15.0/
# SWEDEN (SE)
-# ftp://ftp.sunet.se/mirror/slackware.com/slackware-14.2/
-# http://ftp.sunet.se/mirror/slackware.com/slackware-14.2/
+# ftp://ftp.sunet.se/mirror/slackware.com/slackware-15.0/
+# http://ftp.sunet.se/mirror/slackware.com/slackware-15.0/
# SWITZERLAND (CH)
-# https://mirror.init7.net/slackware/slackware-14.2/
+# https://mirror.init7.net/slackware/slackware-15.0/
# TAIWAN (TW)
-# ftp://ftp.isu.edu.tw/pub/Linux/Slackware/slackware-14.2/
-# http://ftp.isu.edu.tw/pub/Linux/Slackware/slackware-14.2/
-# ftp://ftp.twaren.net/pub/Linux/Slackware/slackware-14.2/
-# http://ftp.twaren.net/Linux/Slackware/slackware-14.2/
+# ftp://ftp.isu.edu.tw/pub/Linux/Slackware/slackware-15.0/
+# http://ftp.isu.edu.tw/pub/Linux/Slackware/slackware-15.0/
+# ftp://ftp.twaren.net/pub/Linux/Slackware/slackware-15.0/
+# http://ftp.twaren.net/Linux/Slackware/slackware-15.0/
# TURKEY (TR)
-# ftp://ftp.linux.org.tr/slackware/slackware-14.2/
-# http://ftp.linux.org.tr/slackware/slackware-14.2/
+# ftp://ftp.linux.org.tr/slackware/slackware-15.0/
+# http://ftp.linux.org.tr/slackware/slackware-15.0/
# UKRAINE (UA)
-# ftp://mirrors.mithril.org.ua/linux/slackware/slackware-14.2/
-# http://mirrors.mithril.org.ua/linux/slackware/slackware-14.2/
+# ftp://mirrors.mithril.org.ua/linux/slackware/slackware-15.0/
+# http://mirrors.mithril.org.ua/linux/slackware/slackware-15.0/
# UNITED KINGDOM (UK)
-# http://slackware.uk/slackware/slackware-14.2/
-# ftp://slackware.uk/slackware/slackware-14.2/
-# ftp://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware-14.2/
-# http://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware-14.2/
-# ftp://mirror.bytemark.co.uk/slackware/slackware-14.2/
-# http://mirror.bytemark.co.uk/slackware/slackware-14.2/
+# http://slackware.uk/slackware/slackware-15.0/
+# ftp://slackware.uk/slackware/slackware-15.0/
+# ftp://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware-15.0/
+# http://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware-15.0/
+# ftp://mirror.bytemark.co.uk/slackware/slackware-15.0/
+# http://mirror.bytemark.co.uk/slackware/slackware-15.0/
# UNITED STATES (US)
-# ftp://ftp.gtlib.gatech.edu/nv/ao2/lxmirror/ftp.slackware.com/slackware-14.2/
-# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware-14.2/
-# ftp://mirrors.easynews.com/linux/slackware/slackware-14.2/
-# http://mirrors.easynews.com/linux/slackware/slackware-14.2/
-# ftp://mirrors.us.kernel.org/slackware/slackware-14.2/
-# http://mirrors.us.kernel.org/slackware/slackware-14.2/
-# ftp://mirrors.xmission.com/slackware/slackware-14.2/
-# http://mirrors.xmission.com/slackware/slackware-14.2/
-# https://mirror.slackbuilds.org/slackware/slackware-14.2/
-# http://slackware.cs.utah.edu/pub/slackware/slackware-14.2/
-# http://slackware.mirrors.pair.com/slackware-14.2/
-# ftp://slackware.mirrors.tds.net/pub/slackware/slackware-14.2/
-# http://slackware.mirrors.tds.net/pub/slackware/slackware-14.2/
-# ftp://spout.ussg.indiana.edu/linux/slackware/slackware-14.2/
-# http://spout.ussg.indiana.edu/linux/slackware/slackware-14.2/
-# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-14.2/
-# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-14.2/
+# ftp://ftp.gtlib.gatech.edu/nv/ao2/lxmirror/ftp.slackware.com/slackware-15.0/
+# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware-15.0/
+# ftp://mirrors.easynews.com/linux/slackware/slackware-15.0/
+# http://mirrors.easynews.com/linux/slackware/slackware-15.0/
+# ftp://mirrors.us.kernel.org/slackware/slackware-15.0/
+# http://mirrors.us.kernel.org/slackware/slackware-15.0/
+# ftp://mirrors.xmission.com/slackware/slackware-15.0/
+# http://mirrors.xmission.com/slackware/slackware-15.0/
+# https://mirror.slackbuilds.org/slackware/slackware-15.0/
+# http://slackware.cs.utah.edu/pub/slackware/slackware-15.0/
+# http://slackware.mirrors.pair.com/slackware-15.0/
+# ftp://slackware.mirrors.tds.net/pub/slackware/slackware-15.0/
+# http://slackware.mirrors.tds.net/pub/slackware/slackware-15.0/
+# ftp://spout.ussg.indiana.edu/linux/slackware/slackware-15.0/
+# http://spout.ussg.indiana.edu/linux/slackware/slackware-15.0/
+# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-15.0/
+# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware-15.0/
#
#----------------------------------------------------------------
# Slackware-current
@@ -296,6 +299,9 @@ https://mirrors.slackware.com/slackware/slackware-14.2/
# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-current/
# ftp://riksun.riken.go.jp/Linux/slackware/slackware-current/
# http://riksun.riken.go.jp/Linux/slackware/slackware-current/
+# LITHUANIA (LT)
+# http://mirrors.atviras.lt/slackware/slackware-current/
+# https://mirrors.atviras.lt/slackware/slackware-current/
# NETHERLANDS (NL)
# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware-current/
# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware-current/
diff --git a/source/ap/slackpkg/files/mirrors-x86_64.sample b/source/ap/slackpkg/files/mirrors-x86_64.sample
index aa174282..e66828a4 100644
--- a/source/ap/slackpkg/files/mirrors-x86_64.sample
+++ b/source/ap/slackpkg/files/mirrors-x86_64.sample
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Project Page: http://slackpkg.org/
+# Project Page: https://slackpkg.org/
# Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com
# Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br
#
@@ -46,10 +46,10 @@
# file://path/to/some/directory/
#
#----------------------------------------------------------------
-# Slackware64-14.2
+# Slackware64-15.0
#----------------------------------------------------------------
# USE MIRRORS.SLACKWARE.COM (DO NOT USE FTP - ONLY HTTP FINDS A NEARBY MIRROR)
-https://mirrors.slackware.com/slackware/slackware64-14.2/
+# https://mirrors.slackware.com/slackware/slackware64-15.0/
#
#
# Here are some individual mirrors that can be used instead of the
@@ -57,146 +57,149 @@ https://mirrors.slackware.com/slackware/slackware64-14.2/
# list is not guaranteed to be up-to-date
#
# AUSTRALIA (AU)
-# ftp://ftp.cc.swin.edu.au/slackware/slackware64-14.2/
-# http://ftp.cc.swin.edu.au/slackware/slackware64-14.2/
-# ftp://ftp.iinet.net.au/pub/slackware/slackware64-14.2/
-# http://ftp.iinet.net.au/pub/slackware/slackware64-14.2/
-# ftp://mirror.as24220.net/pub/slackware/slackware64-14.2/
-# http://mirror.as24220.net/pub/slackware/slackware64-14.2/
-# ftp://mirror.internode.on.net/.pub2/slackware/slackware64-14.2/
-# http://mirror.internode.on.net/pub/slackware/slackware64-14.2/
+# ftp://ftp.cc.swin.edu.au/slackware/slackware64-15.0/
+# http://ftp.cc.swin.edu.au/slackware/slackware64-15.0/
+# ftp://ftp.iinet.net.au/pub/slackware/slackware64-15.0/
+# http://ftp.iinet.net.au/pub/slackware/slackware64-15.0/
+# ftp://mirror.as24220.net/pub/slackware/slackware64-15.0/
+# http://mirror.as24220.net/pub/slackware/slackware64-15.0/
+# ftp://mirror.internode.on.net/.pub2/slackware/slackware64-15.0/
+# http://mirror.internode.on.net/pub/slackware/slackware64-15.0/
# AUSTRIA (AT)
-# http://gd.tuwien.ac.at/opsys/linux/freesoftware.com/slackware64-14.2/
+# http://gd.tuwien.ac.at/opsys/linux/freesoftware.com/slackware64-15.0/
# BELARUS (BY)
-# ftp://mirror.datacenter.by/pub/slackware/slackware64-14.2/
-# http://mirror.datacenter.by/pub/slackware/slackware64-14.2/
+# ftp://mirror.datacenter.by/pub/slackware/slackware64-15.0/
+# http://mirror.datacenter.by/pub/slackware/slackware64-15.0/
# BRAZIL (BR)
-# ftp://ftp.slackware-brasil.com.br/slackware64-14.2/
-# http://ftp.slackware-brasil.com.br/slackware64-14.2/
+# ftp://ftp.slackware-brasil.com.br/slackware64-15.0/
+# http://ftp.slackware-brasil.com.br/slackware64-15.0/
# BULGARIA (BG)
-# ftp://mirrors.unixsol.org/slackware/slackware64-14.2/
-# http://mirrors.unixsol.org/slackware/slackware64-14.2/
+# ftp://mirrors.unixsol.org/slackware/slackware64-15.0/
+# http://mirrors.unixsol.org/slackware/slackware64-15.0/
# CANADA (CA)
-# ftp://mirror.csclub.uwaterloo.ca/slackware/slackware64-14.2/
-# http://mirror.csclub.uwaterloo.ca/slackware/slackware64-14.2/
-# ftp://mirror.its.dal.ca/slackware/slackware64-14.2/
-# http://mirror.its.dal.ca/slackware/slackware64-14.2/
+# ftp://mirror.csclub.uwaterloo.ca/slackware/slackware64-15.0/
+# http://mirror.csclub.uwaterloo.ca/slackware/slackware64-15.0/
+# ftp://mirror.its.dal.ca/slackware/slackware64-15.0/
+# http://mirror.its.dal.ca/slackware/slackware64-15.0/
# CHINA (CN)
-# http://mirrors.163.com/slackware/slackware64-14.2/
-# http://mirrors.ustc.edu.cn/slackware/slackware64-14.2/
+# http://mirrors.163.com/slackware/slackware64-15.0/
+# http://mirrors.ustc.edu.cn/slackware/slackware64-15.0/
# COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-14.2/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-14.2/
+# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-15.0/
+# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-15.0/
# CZECH REPUBLIC (CZ)
-# ftp://odysseus.linux.cz/pub/linux/slackware/slackware64-14.2/
-# http://odysseus.linux.cz/pub/linux/slackware/slackware64-14.2/
+# ftp://odysseus.linux.cz/pub/linux/slackware/slackware64-15.0/
+# http://odysseus.linux.cz/pub/linux/slackware/slackware64-15.0/
# DENMARK (DK)
-# ftp://mirrors.dotsrc.org/slackware/slackware64-14.2/
-# https://mirrors.dotsrc.org/slackware/slackware64-14.2/
+# ftp://mirrors.dotsrc.org/slackware/slackware64-15.0/
+# https://mirrors.dotsrc.org/slackware/slackware64-15.0/
# FINLAND (FI)
-# ftp://elektroni.phys.tut.fi/slackware64-14.2/
+# ftp://elektroni.phys.tut.fi/slackware64-15.0/
# FRANCE (FR)
-# ftp://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware64-14.2/
-# http://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware64-14.2/
+# ftp://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware64-15.0/
+# http://nephtys.lip6.fr/pub/linux/distributions/slackware/slackware64-15.0/
# GERMANY (DE)
-# ftp://ftp.gwdg.de/pub/linux/slackware/slackware64-14.2/
-# http://ftp.gwdg.de/pub/linux/slackware/slackware64-14.2/
-# ftp://ftp.tu-chemnitz.de/pub/linux/slackware/slackware64-14.2/
-# http://ftp.tu-chemnitz.de/pub/linux/slackware/slackware64-14.2/
-# ftp://sunsite.informatik.rwth-aachen.de/pub/comp/Linux/slackware/slackware64-14.2/
-# http://sunsite.informatik.rwth-aachen.de/ftp/pub/comp/Linux/slackware/slackware64-14.2/
+# ftp://ftp.gwdg.de/pub/linux/slackware/slackware64-15.0/
+# http://ftp.gwdg.de/pub/linux/slackware/slackware64-15.0/
+# ftp://ftp.tu-chemnitz.de/pub/linux/slackware/slackware64-15.0/
+# http://ftp.tu-chemnitz.de/pub/linux/slackware/slackware64-15.0/
+# ftp://sunsite.informatik.rwth-aachen.de/pub/comp/Linux/slackware/slackware64-15.0/
+# http://sunsite.informatik.rwth-aachen.de/ftp/pub/comp/Linux/slackware/slackware64-15.0/
# GREECE (GR)
-# ftp://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware64-14.2/
-# http://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware64-14.2/
-# ftp://ftp.otenet.gr/pub/linux/slackware/slackware64-14.2/
-# http://ftp.otenet.gr/linux/slackware/slackware64-14.2/
-# ftp://patroklos.noc.ntua.gr/pub/linux/slackware/slackware64-14.2/
-# http://patroklos.noc.ntua.gr/pub/linux/slackware/slackware64-14.2/
+# ftp://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware64-15.0/
+# http://ftp.cc.uoc.gr/mirrors/linux/slackware/slackware64-15.0/
+# ftp://ftp.otenet.gr/pub/linux/slackware/slackware64-15.0/
+# http://ftp.otenet.gr/linux/slackware/slackware64-15.0/
+# ftp://patroklos.noc.ntua.gr/pub/linux/slackware/slackware64-15.0/
+# http://patroklos.noc.ntua.gr/pub/linux/slackware/slackware64-15.0/
# INDONESIA (ID)
-# http://kambing.ui.ac.id/slackware/slackware64-14.2/
-# https://repo.ukdw.ac.id/slackware/slackware64-14.2/
+# http://kambing.ui.ac.id/slackware/slackware64-15.0/
+# https://repo.ukdw.ac.id/slackware/slackware64-15.0/
# IRELAND (IE)
-# ftp://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware64-14.2/
-# http://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware64-14.2/
+# ftp://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware64-15.0/
+# http://ftp.heanet.ie/mirrors/ftp.slackware.com/pub/slackware/slackware64-15.0/
# ITALY (IT)
-# ftp://ba.mirror.garr.it/mirrors/Slackware/slackware64-14.2/
-# http://ba.mirror.garr.it/mirrors/Slackware/slackware64-14.2/
+# ftp://ba.mirror.garr.it/mirrors/Slackware/slackware64-15.0/
+# http://ba.mirror.garr.it/mirrors/Slackware/slackware64-15.0/
# JAPAN (JP)
-# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-14.2/
-# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-14.2/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-14.2/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-14.2/
-# ftp://riksun.riken.go.jp/Linux/slackware/slackware64-14.2/
-# http://riksun.riken.go.jp/Linux/slackware/slackware64-14.2/
+# ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-15.0/
+# http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-15.0/
+# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-15.0/
+# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-15.0/
+# ftp://riksun.riken.go.jp/Linux/slackware/slackware64-15.0/
+# http://riksun.riken.go.jp/Linux/slackware/slackware64-15.0/
+# LITHUANIA (LT)
+# http://mirrors.atviras.lt/slackware/slackware64-15.0/
+# https://mirrors.atviras.lt/slackware/slackware64-15.0/
# NETHERLANDS (NL)
-# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware64-14.2/
-# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-14.2/
-# ftp://mirror.nl.leaseweb.net/slackware/slackware64-14.2/
-# http://mirror.nl.leaseweb.net/slackware/slackware64-14.2/
+# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware64-15.0/
+# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-15.0/
+# ftp://mirror.nl.leaseweb.net/slackware/slackware64-15.0/
+# http://mirror.nl.leaseweb.net/slackware/slackware64-15.0/
# NORWAY (NO)
-# ftp://ftp.slackware.no/slackware/slackware64-14.2/
-# http://ftp.slackware.no/slackware/slackware64-14.2/
+# ftp://ftp.slackware.no/slackware/slackware64-15.0/
+# http://ftp.slackware.no/slackware/slackware64-15.0/
# POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-14.2/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-14.2/
-# ftp://ftp.slackware.pl/pub/slackware/slackware64-14.2/
-# http://ftp.slackware.pl/pub/slackware/slackware64-14.2/
-# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware64-14.2/
-# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware64-14.2/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-14.2/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-14.2/
+# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-15.0/
+# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-15.0/
+# ftp://ftp.slackware.pl/pub/slackware/slackware64-15.0/
+# http://ftp.slackware.pl/pub/slackware/slackware64-15.0/
+# ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware64-15.0/
+# http://sunsite.icm.edu.pl/packages/linux-slackware/slackware64-15.0/
+# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-15.0/
+# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-15.0/
# RUSSIA (RU)
-# http://mirror.rol.ru/slackware/slackware64-14.2/
-# ftp://mirror.yandex.ru/slackware/slackware64-14.2/
-# http://mirror.yandex.ru/slackware/slackware64-14.2/
+# http://mirror.rol.ru/slackware/slackware64-15.0/
+# ftp://mirror.yandex.ru/slackware/slackware64-15.0/
+# http://mirror.yandex.ru/slackware/slackware64-15.0/
# SOUTH AFRICA (ZA)
-# ftp://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware64-14.2/
-# http://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware64-14.2/
-# ftp://ftp.wa.co.za/pub/slackware/slackware64-14.2/
-# http://ftp.wa.co.za/pub/slackware/slackware64-14.2/
-# ftp://slackware.mirror.ac.za/slackware64-14.2/
-# http://slackware.mirror.ac.za/slackware64-14.2/
+# ftp://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware64-15.0/
+# http://ftp.is.co.za/mirror/ftp.slackware.com/pub/slackware64-15.0/
+# ftp://ftp.wa.co.za/pub/slackware/slackware64-15.0/
+# http://ftp.wa.co.za/pub/slackware/slackware64-15.0/
+# ftp://slackware.mirror.ac.za/slackware64-15.0/
+# http://slackware.mirror.ac.za/slackware64-15.0/
# SWEDEN (SE)
-# ftp://ftp.sunet.se/mirror/slackware.com/slackware64-14.2/
-# http://ftp.sunet.se/mirror/slackware.com/slackware64-14.2/
+# ftp://ftp.sunet.se/mirror/slackware.com/slackware64-15.0/
+# http://ftp.sunet.se/mirror/slackware.com/slackware64-15.0/
# SWITZERLAND (CH)
-# https://mirror.init7.net/slackware/slackware64-14.2/
+# https://mirror.init7.net/slackware/slackware64-15.0/
# TAIWAN (TW)
-# ftp://ftp.isu.edu.tw/pub/Linux/Slackware/slackware64-14.2/
-# http://ftp.isu.edu.tw/pub/Linux/Slackware/slackware64-14.2/
-# ftp://ftp.twaren.net/pub/Linux/Slackware/slackware64-14.2/
-# http://ftp.twaren.net/Linux/Slackware/slackware64-14.2/
+# ftp://ftp.isu.edu.tw/pub/Linux/Slackware/slackware64-15.0/
+# http://ftp.isu.edu.tw/pub/Linux/Slackware/slackware64-15.0/
+# ftp://ftp.twaren.net/pub/Linux/Slackware/slackware64-15.0/
+# http://ftp.twaren.net/Linux/Slackware/slackware64-15.0/
# TURKEY (TR)
-# ftp://ftp.linux.org.tr/slackware/slackware64-14.2/
-# http://ftp.linux.org.tr/slackware/slackware64-14.2/
+# ftp://ftp.linux.org.tr/slackware/slackware64-15.0/
+# http://ftp.linux.org.tr/slackware/slackware64-15.0/
# UKRAINE (UA)
-# ftp://mirrors.mithril.org.ua/linux/slackware/slackware64-14.2/
-# http://mirrors.mithril.org.ua/linux/slackware/slackware64-14.2/
+# ftp://mirrors.mithril.org.ua/linux/slackware/slackware64-15.0/
+# http://mirrors.mithril.org.ua/linux/slackware/slackware64-15.0/
# UNITED KINGDOM (UK)
-# http://slackware.uk/slackware/slackware64-14.2/
-# ftp://slackware.uk/slackware/slackware64-14.2/
-# ftp://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-14.2/
-# http://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-14.2/
-# ftp://mirror.bytemark.co.uk/slackware/slackware64-14.2/
-# http://mirror.bytemark.co.uk/slackware/slackware64-14.2/
+# http://slackware.uk/slackware/slackware64-15.0/
+# ftp://slackware.uk/slackware/slackware64-15.0/
+# ftp://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-15.0/
+# http://ftp.mirrorservice.org/sites/ftp.slackware.com/pub/slackware/slackware64-15.0/
+# ftp://mirror.bytemark.co.uk/slackware/slackware64-15.0/
+# http://mirror.bytemark.co.uk/slackware/slackware64-15.0/
# UNITED STATES (US)
-# ftp://ftp.gtlib.gatech.edu/nv/ao2/lxmirror/ftp.slackware.com/slackware64-14.2/
-# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware64-14.2/
-# ftp://mirrors.easynews.com/linux/slackware/slackware64-14.2/
-# http://mirrors.easynews.com/linux/slackware/slackware64-14.2/
-# ftp://mirrors.us.kernel.org/slackware/slackware64-14.2/
-# http://mirrors.us.kernel.org/slackware/slackware64-14.2/
-# ftp://mirrors.xmission.com/slackware/slackware64-14.2/
-# http://mirrors.xmission.com/slackware/slackware64-14.2/
-# https://mirror.slackbuilds.org/slackware/slackware64-14.2/
-# http://slackware.cs.utah.edu/pub/slackware/slackware64-14.2/
-# http://slackware.mirrors.pair.com/slackware64-14.2/
-# ftp://slackware.mirrors.tds.net/pub/slackware/slackware64-14.2/
-# http://slackware.mirrors.tds.net/pub/slackware/slackware64-14.2/
-# ftp://spout.ussg.indiana.edu/linux/slackware/slackware64-14.2/
-# http://spout.ussg.indiana.edu/linux/slackware/slackware64-14.2/
-# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-14.2/
-# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-14.2/
+# ftp://ftp.gtlib.gatech.edu/nv/ao2/lxmirror/ftp.slackware.com/slackware64-15.0/
+# ftp://mirror.cs.princeton.edu/pub/mirrors/slackware/slackware64-15.0/
+# ftp://mirrors.easynews.com/linux/slackware/slackware64-15.0/
+# http://mirrors.easynews.com/linux/slackware/slackware64-15.0/
+# ftp://mirrors.us.kernel.org/slackware/slackware64-15.0/
+# http://mirrors.us.kernel.org/slackware/slackware64-15.0/
+# ftp://mirrors.xmission.com/slackware/slackware64-15.0/
+# http://mirrors.xmission.com/slackware/slackware64-15.0/
+# https://mirror.slackbuilds.org/slackware/slackware64-15.0/
+# http://slackware.cs.utah.edu/pub/slackware/slackware64-15.0/
+# http://slackware.mirrors.pair.com/slackware64-15.0/
+# ftp://slackware.mirrors.tds.net/pub/slackware/slackware64-15.0/
+# http://slackware.mirrors.tds.net/pub/slackware/slackware64-15.0/
+# ftp://spout.ussg.indiana.edu/linux/slackware/slackware64-15.0/
+# http://spout.ussg.indiana.edu/linux/slackware/slackware64-15.0/
+# ftp://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-15.0/
+# http://teewurst.cc.columbia.edu/pub/linux/slackware/slackware64-15.0/
#
#----------------------------------------------------------------
# Slackware64-current
@@ -292,6 +295,9 @@ https://mirrors.slackware.com/slackware/slackware64-14.2/
# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-current/
# ftp://riksun.riken.go.jp/Linux/slackware/slackware64-current/
# http://riksun.riken.go.jp/Linux/slackware/slackware64-current/
+# LITHUANIA (LT)
+# http://mirrors.atviras.lt/slackware/slackware64-current/
+# https://mirrors.atviras.lt/slackware/slackware64-current/
# NETHERLANDS (NL)
# ftp://ftp.nluug.nl/pub/os/Linux/distr/slackware/slackware64-current/
# http://ftp.nluug.nl/os/Linux/distr/slackware/slackware64-current/
diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index 593c47b0..a9f86f80 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -124,6 +124,10 @@ runvimdiff() {
}
looknew() {
+ local ROWS SIZE FILES PROMPTTEXT TEXTLINES MAXROWS
+ local newcount f n fn
+ f=0
+ n=0
# with ONLY_NEW_DOTNEW set, slackpkg will search only for
# .new files installed in actual slackpkg's execution
@@ -133,59 +137,108 @@ looknew() {
ONLY_NEW_DOTNEW=""
fi
- echo -e "\nSearching for NEW configuration files"
- FILES=$(find ${ROOT}/etc ${ROOT}/var/yp ${ROOT}/usr/share/vim -name "*.new" ${ONLY_NEW_DOTNEW} \
+ printf "%s\n" "Searching for NEW configuration files..."
+
+ FILES=$( find \
+ ${ROOT}/etc \
+ ${ROOT}/var/yp \
+ ${ROOT}/usr/share/vim \
+ -name "*.new" \
+ ${ONLY_NEW_DOTNEW} \
-not -name "rc.inet1.conf.new" \
-not -name "group.new" \
-not -name "passwd.new" \
-not -name "shadow.new" \
- -not -name "gshadow.new" 2>/dev/null | sort 2>/dev/null)
- if [ "$FILES" != "" ]; then
- newcount=$(echo "$FILES" | wc -l)
- echo -ne "\n\
-Some packages had new configuration files installed ($newcount new files):\n\n"
+ -not -name "gshadow.new" 2>/dev/null |
+ sort -V 2>/dev/null )
- SIZE=$(stty size)
+ if [ -n "$FILES" ]; then
+ newcount=$( echo "$FILES" | wc -l )
+ SIZE=$( stty size )
ROWS=${SIZE% *}
- LISTMAX=$((ROWS-20))
- if [ $newcount -le $LISTMAX ]; then
- echo -e "$FILES"
- else
- F=0
- for FN in $FILES; do
- F=$((F+1))
- echo "$FN"
-
- if [ $F -ge $LISTMAX ]; then
- F=0
- echo -ne "\nPress SPACE for more, ENTER to skip"
- IFS=$'\n' read -rn 1 junk
- echo -e "\n"
-
- if [ "$junk" = " " ]; then
- continue
- elif [ "$junk" = "" ]; then
- break
- fi
- fi
- done
- fi
-
- echo -ne "\n\
-You have four choices:
+ # Set here so we can count the No. of lines
+ PROMPTTEXT="\n\
+What do you want (K/O/R/P)?
(K)eep the old files and consider .new files later
(O)verwrite all old files with the new ones"
- [ "$ORIG_BACKUPS" != "off" ] && echo -ne ". The
+
+ [ "$ORIG_BACKUPS" != "off" ] && PROMPTTEXT+=". The
old files will be stored with the suffix .orig"
- echo -e "\n\n\
+
+ PROMPTTEXT+="\n\n\
(R)emove all .new files
- (P)rompt K, O, R selection for every single file
+ (P)rompt K, O, R selection for every single file\n"
+
+ printf "%s %s\n\n" "Some packages had new configuration" \
+ "files installed ($newcount new files):"
+
+ # No. of prompt etc. lines to print.
+ TEXTLINES=$(( $( printf %b "$PROMPTTEXT" | wc -l ) + 3 ))
+
+ if [ $(( newcount + TEXTLINES )) -lt $ROWS ]; then
+ # All files will fit on screen.
+ printf "%s\n" "$FILES"
+ else
+ # Won't all fit, so scroll a screenfull at a time.
+ # No. of lines minus 'Searching for' + 'Press SPACE...'
+ MAXROWS=$(( ROWS - 5 ))
+
+ for fn in $FILES; do
+ junk=" "
+ f=$(( f + 1 ))
+ n=$(( n + 1 ))
+ echo "$fn"
+
+ # Stop printing at bottom of screen
+ if [ $f -ge $MAXROWS ]; then
+
+ # No. of lines minus 'Press SPACE...'
+ MAXROWS=$(( ROWS - 2 ))
+ f=0
+ IFS=$( printf "\n" ) read -rn 1 -p "
+ Press SPACE for more, ENTER to skip" junk
+
+ # Enter pressed
+ if [ -z "$junk" ]; then
+ tput -S <<EOF
+ cuu 1
+ el 2
+ cuu 1
+ el 2
+EOF
+ break
+ else
+ # Space pressed
+ printf "\n"
+ tput -S <<EOF
+ cuu 1
+ el 2
+ cuu 1
+ el 2
+EOF
+ fi
+ fi
+ done
+
+ # Final prompt to stop list scrolling off the top
+ if [ ! -z "$junk" ] && [ $f -ne 0 ]; then
+ IFS=$( printf "\n" ) read -rn 1 -p "
+ Press any key to continue" junk
+ printf "\n"
+ tput -S <<EOF
+ cuu 1
+ el 2
+ cuu 1
+ el 2
+EOF
+ fi
+ fi
-What do you want (K/O/R/P)?"
+ printf %b "$PROMPTTEXT"
answer
case $ANSWER in
K|k)
@@ -238,7 +291,9 @@ What do you want (K/O/R/P)?"
break
;;
*)
- echo "OK! Your choice is nothing! slackpkg will Keep the old files for you to deal with later"
+ echo "
+OK! Your choice is nothing! slackpkg will Keep the old files \
+for you to deal with later"
;;
esac
else
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index 49a12376..2553191d 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -17,7 +17,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Project Page: http://slackpkg.org/
+# Project Page: https://slackpkg.org/
# Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com
# Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br
#
@@ -52,7 +52,10 @@ fi
VERSION=@VERSION@
PATH=/bin:/usr/bin:/sbin:/usr/sbin
SLACKWARE_VERSION=$(cat /etc/slackware-version | cut -f2 -d\ )
-CONF=${CONF:-/etc/slackpkg}
+
+[ -z "$ROOT" ] && CONF=${CONF:-/etc/slackpkg}
+[ -n "$ROOT" ] && CONF=${CONF:-"${ROOT}/etc/slackpkg"}
+
SOURCE=$(sed -n '
# Remove leading and trailing blanks
s/^[[:blank:]]*//
@@ -68,6 +71,7 @@ SOURCE=$(sed -n '
\@^https\{0,1\}://@p
\@^ftps\{0,1\}://@p' $CONF/mirrors)
. $CONF/slackpkg.conf
+WORKDIR=${ROOT}/${WORKDIR}
ERROR=""
# Set temporary directory
@@ -238,6 +242,10 @@ while [ -n "$1" ] ; do
fi
shift $#
;;
+ blacklist)
+ CMD=$1
+ shift $#
+ ;;
update)
CMD=$1
shift
@@ -324,12 +332,13 @@ case "$CMD" in
echo "Slackpkg: No updated packages since last check."
else
echo "Slackpkg: Updated packages are available since last check." >&2
+ PENDING_UPDATES=1
fi
;;
show-changelog)
# display changelog and exit
- if [ -e ${ROOT}/${WORKDIR}/ChangeLog.txt ]; then
- $MORECMD ${ROOT}/${WORKDIR}/ChangeLog.txt
+ if [ -e ${WORKDIR}/ChangeLog.txt ]; then
+ $MORECMD ${WORKDIR}/ChangeLog.txt
else
echo "ChangeLog.txt file not found. Aborting"
fi
@@ -472,17 +481,11 @@ case "$CMD" in
fi
;;
blacklist)
- #
- # If blacklist is called without package name, list
- # all blacklisted packages
- if [ "$INPUTLIST" = "" ]; then
- echo -e "Packages in blacklist:\n"
- grep -e "^\([a-z]\)" $CONF/blacklist | $MORECMD
- cleanup
- fi
-
- # As of 15.0, this function just runs /bin/false and exits with a comment
- blacklist_pkg
+ echo -e "Edit /etc/slackpkg/blacklist to add or remove packages."
+ echo -e ""
+ echo -e "Packages in blacklist:\n"
+ grep -v "^#" $CONF/blacklist | $MORECMD
+ echo -e ""
;;
file-search)
PATTERN=$(echo $ARG | sed -e 's/\+/\\\+/g' -e 's/\./\\\./g' -e 's/ /\|/g')
@@ -523,7 +526,7 @@ case "$CMD" in
if ( found != 1 ) {
print \"No packages found! Try:\n\n\tslackpkg search $PATTERN\n\nand choose one (and ONLY one package).\n\"
}
- }" ${ROOT}/${WORKDIR}/PACKAGES.TXT 2>/dev/null
+ }" ${WORKDIR}/PACKAGES.TXT 2>/dev/null
;;
new-config)
POSTINST=on
@@ -597,7 +600,7 @@ esac
# That options don't change configurations files and, if
# someone remove the kernel, i hope he knows what is doing.
#
-for i in check-updates remove search file-search update info \
+for i in check-updates remove search file-search update info blacklist \
clean-system download generate-template remove-template; do
if [ "$CMD" = "$i" ]; then
POSTINST=off
diff --git a/source/ap/slackpkg/files/slackpkg.8 b/source/ap/slackpkg/files/slackpkg.8
index b1baa45d..ab36202e 100644
--- a/source/ap/slackpkg/files/slackpkg.8
+++ b/source/ap/slackpkg/files/slackpkg.8
@@ -1,4 +1,4 @@
-.TH SLACKPKG 8 "March 22, 2018" slackpkg-2.82.2 ""
+.TH SLACKPKG 8 "March 12, 2021" slackpkg-15.0.1 ""
.SH NAME
.B slackpkg
\- Automated tool for managing Slackware Linux packages
@@ -6,7 +6,7 @@
.SH SYNOPSIS
.B slackpkg
.B [OPTIONS]
-.B {install|remove|search|file-search|download|upgrade|reinstall|blacklist}
+.B {install|remove|search|file-search|download|upgrade|reinstall}
.BI { PATTERN | FILE }
.B slackpkg [OPTIONS] {clean-system|upgrade-all|install-new}
@@ -226,15 +226,6 @@ With remove, you can remove certain installed packages. As an example:
will remove all packages with "kde" in their name.
.TP 5
-.B blacklist
-.br
-With this action, you can "blacklist" certain packages.
-.br
-Blacklisted packages will not be installed, upgraded, or removed by slackpkg.
-If you want to remove some package from the black list, please edit
-/etc/slackpkg/blacklist.
-
-.TP 5
.B download
.br
This action tells slackpkg to download the packages, but not to install them.
diff --git a/source/ap/slackpkg/files/slackpkg.conf.5 b/source/ap/slackpkg/files/slackpkg.conf.5
index 529bfba7..e8ca95d8 100644
--- a/source/ap/slackpkg/files/slackpkg.conf.5
+++ b/source/ap/slackpkg/files/slackpkg.conf.5
@@ -1,4 +1,4 @@
-.TH SLACKPKG.CONF 5 "Oct 2017" slackpkg-2.82.2 ""
+.TH SLACKPKG.CONF 5 "March 2021" slackpkg-15.0.1 ""
.SH NAME
.B slackpkg.conf
\- Configuration data for slackpkg
diff --git a/source/ap/slackpkg/files/slackpkg.conf.new b/source/ap/slackpkg/files/slackpkg.conf.new
index fb6ae1dd..cbc845da 100644
--- a/source/ap/slackpkg/files/slackpkg.conf.new
+++ b/source/ap/slackpkg/files/slackpkg.conf.new
@@ -21,7 +21,7 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-# Project Page: http://slackpkg.org/
+# Project Page: https://slackpkg.org/
# Roberto F. Batista (aka PiterPunk) piterpunk@slackware.com
# Evaldo Gardenali (aka UdontKnow) evaldogardenali@fasternet.com.br
diff --git a/source/ap/slackpkg/slack-desc b/source/ap/slackpkg/slack-desc
index 5aecad48..6fb6bb07 100644
--- a/source/ap/slackpkg/slack-desc
+++ b/source/ap/slackpkg/slack-desc
@@ -14,6 +14,6 @@ slackpkg: official Slackware package repository. With it, you can also
slackpkg: search in the Slackware Package database and find which package
slackpkg: has the selected file.
slackpkg:
-slackpkg: Slackpkg DOESN'T replace the Slackware pkgtools. Actually,
-slackpkg: Slackpkg uses the pkgtools for install/upgrade/remove functions.
+slackpkg: Slackpkg DOES NOT replace the Slackware pkgtools; actually,
+slackpkg: Slackpkg uses pkgtools for the install/upgrade/remove functions.
slackpkg:
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 2c945b31..788eb52d 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -23,9 +23,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=slackpkg
-VERSION=${VERSION:-15.0}
+VERSION=${VERSION:-15.0.1}
ARCH="noarch"
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# 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
@@ -113,11 +113,6 @@ chmod 644 $PKG/usr/doc/slackpkg-$VERSION/*
mkdir -pv $PKG/var/lib/slackpkg
mkdir -pv $PKG/var/cache/packages
-# Allow new-config after slackpkg upgrade itself:
-( cd $PKG/usr/libexec/slackpkg
- cat $CWD/0001-Allow-new-config-after-slackpkg-upgrade-itself.patch | patch -p2 --verbose || exit 1
-) || exit 1
-
mkdir -p $PKG/install
cat $CWD/doinst.sh | sed -e "s/@VERSION@/$VERSION/g" > $PKG/install/doinst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/kde/kde/build/kid3 b/source/kde/kde/build/kid3
index 0cfbf088..d00491fd 100644
--- a/source/kde/kde/build/kid3
+++ b/source/kde/kde/build/kid3
@@ -1 +1 @@
-2
+1
diff --git a/source/l/glib2/glib2.SlackBuild b/source/l/glib2/glib2.SlackBuild
index 6f198f2f..cc9d5897 100755
--- a/source/l/glib2/glib2.SlackBuild
+++ b/source/l/glib2/glib2.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=glib2
VERSION=${VERSION:-$(echo glib-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/l/pango/pango.SlackBuild b/source/l/pango/pango.SlackBuild
index f39466bf..09d8426d 100755
--- a/source/l/pango/pango.SlackBuild
+++ b/source/l/pango/pango.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pango
VERSION=${VERSION:-$(echo pango-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -130,7 +130,6 @@ mkdir -p $PKG/usr/doc/pango-$VERSION
cp -a \
AUTHORS COPYING* NEWS README* TODO \
$PKG/usr/doc/pango-$VERSION
-ln -s /usr/share/gtk-doc/html/pango $PKG/usr/doc/pango-$VERSION/html
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/n/bind/bind-9.16.11.CVE-2020-8625.diff b/source/n/bind/bind-9.16.11.CVE-2020-8625.diff
deleted file mode 100644
index 419b5bea..00000000
--- a/source/n/bind/bind-9.16.11.CVE-2020-8625.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u -r --new-file bind-9.16.11.orig/lib/dns/spnego.c bind-9.16.11/lib/dns/spnego.c
---- bind-9.16.11.orig/lib/dns/spnego.c 2021-01-11 07:23:31.000000000 -0600
-+++ bind-9.16.11/lib/dns/spnego.c 2021-02-24 13:57:17.199873321 -0600
-@@ -848,7 +848,7 @@
- return (ASN1_OVERRUN);
- }
-
-- data->components = malloc(len * sizeof(*data->components));
-+ data->components = malloc((len + 1) * sizeof(*data->components));
- if (data->components == NULL) {
- return (ENOMEM);
- }
diff --git a/source/n/bind/bind.SlackBuild b/source/n/bind/bind.SlackBuild
index a77c5317..1b7af895 100755
--- a/source/n/bind/bind.SlackBuild
+++ b/source/n/bind/bind.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=bind
VERSION=${VERSION:-$(echo ${PKGNAM}-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -82,10 +82,6 @@ else
GSSAPI=" "
fi
-# Fix a security vulnerability. This is fixed in 9.16.12, but we can't use
-# that version due to other regressions.
-zcat $CWD/bind-9.16.11.CVE-2020-8625.diff.gz | patch -p1 --verbose || exit 1
-
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/n/links/links.SlackBuild b/source/n/links/links.SlackBuild
index af131604..2d51626a 100755
--- a/source/n/links/links.SlackBuild
+++ b/source/n/links/links.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=links
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/network-scripts/modprobe.d/modprobe.d/bonding.conf b/source/n/network-scripts/modprobe.d/modprobe.d/bonding.conf
deleted file mode 100644
index c33faf65..00000000
--- a/source/n/network-scripts/modprobe.d/modprobe.d/bonding.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-##############################################################################
-# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that
-##############################################################################
-#
-# Disable the automatic creation of a bond0 interface when module is loaded
-# Otherwise, /etc/rc.d/rc.inet1 will not be able to configure it
-#
-options bonding max_bonds=0
-options rtnl-link-bond max_bonds=0
diff --git a/source/n/network-scripts/modprobe.d/modprobe.d/ipv6.conf b/source/n/network-scripts/modprobe.d/modprobe.d/ipv6.conf
deleted file mode 100644
index a0395a5a..00000000
--- a/source/n/network-scripts/modprobe.d/modprobe.d/ipv6.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-##############################################################################
-# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that
-##############################################################################
-#
-# Disable IPv6 auto configuration (SLAAC) by default
-#
-options ipv6 autoconf=0
-options net-pf-10 autoconf=0
diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild
index 4832d4db..0093d246 100755
--- a/source/n/network-scripts/network-scripts.SlackBuild
+++ b/source/n/network-scripts/network-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=network-scripts
VERSION=${VERSION:-15.0}
ARCH=noarch
-BUILD=${BUILD:-13}
+BUILD=${BUILD:-14}
# 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/n/network-scripts/scripts/netconfig b/source/n/network-scripts/scripts/netconfig
index 69c6d6ed..bb5a5acc 100644
--- a/source/n/network-scripts/scripts/netconfig
+++ b/source/n/network-scripts/scripts/netconfig
@@ -185,6 +185,7 @@ GATEWAY6="$GATEWAY6"
# these for your wireless network.
#IFNAME[4]="wlan0"
#IPADDRS[4]=""
+#USE_DHCP[4]="yes"
#DHCP_HOSTNAME[4]="icculus-wireless"
#DHCP_KEEPRESOLV[4]="yes"
#DHCP_KEEPNTP[4]="yes"
@@ -231,6 +232,16 @@ GATEWAY6="$GATEWAY6"
#SLAAC_TIMEOUT[4]="15" # The default timeout for auto configuration to
# wait for the interface to come up is 15 sec.
# Increase the timeout if required.
+#SLAAC_PRIVIPGEN[4]="yes" # When assigning addresses via SLAAC, use the
+ # 'private' (RFC7217) address generation method.
+ # It is advisable to also set SLAAC_SECRET[x].
+#SLAAC_SECRET[4]="xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx"
+ # When SLAAC_PRIVIPGEN[x]="yes" is set, this is
+ # the secret to be used. This must be in the
+ # form of an IPv6 address. When left unset, a
+ # random secret is used (this is the default).
+#SLAAC_TEMPADDR[4]="yes" # Use a temporary address with SLAAC to enhance
+ # security.
#USE_RA[4]="yes" # Accept router advertisements even when SLAAC
# is disabled on the interface.
#WLAN_ESSID[4]="DARKSTAR" # An example of how you can override _any_
@@ -481,8 +492,11 @@ EOF
DOMAIN="`cat $TMP/SeTdom`"
rm -f $TMP/SeTdom $TMP/tempmsg
# These regexes doon't catch everything, just basic syntax mistakes.
- if [ "$DOMAIN" = "" ] || [[ ! "$DOMAIN" =~ ^([[:alnum:]]+[-.]*[[:alnum:]]+)+$ ]] || \
- [[ "${DOMAIN:0:1}" =~ ^[.-]$ ]] || [[ "${DOMAIN: -1:1}" == ^[.-]$ ]]; then
+ DN="${DOMAIN%.*}"
+ TLD="${DOMAIN##*.}"
+ if [ -z "$DOMAIN" ] || [ -z "$TLD" ] || [ -z "$DN" ] || [[ ! "$DOMAIN" =~ ^[^.-][[:alnum:].-]+[^.-]$ ]] || \
+ [[ ! "$DN" =~ ^[^.-][[:alnum:].-]+[^.-]$ ]] || [[ "$DN" =~ \.\. ]] || [[ "$DN" =~ -- ]] || \
+ [[ ! "$TLD" =~ ^[^-][[:alnum:]-]+[^-]$ ]]; then
dialog --title "DOMAINNAME" --ok-button "Back" --msgbox \
"That doesn't appear to be a valid domain name.\n
Domain names can only contain letters and numbers, hyphens
diff --git a/source/n/network-scripts/scripts/rc.inet1 b/source/n/network-scripts/scripts/rc.inet1
index 755e7efe..d33ab774 100644
--- a/source/n/network-scripts/scripts/rc.inet1
+++ b/source/n/network-scripts/scripts/rc.inet1
@@ -159,9 +159,13 @@ br_open() {
debug_log "/sbin/ip link set dev ${IFNAME[$1]} type bridge $IFOPT"
/sbin/ip link set dev ${IFNAME[$1]} type bridge $IFOPT
fi
- done <<<"${IFOPTS[$i]/%|*([[:blank:]])}|" # The | on the end is required.
- debug_log "/sbin/ip link set dev ${IFNAME[$1]} up"
- /sbin/ip link set dev ${IFNAME[$1]} up
+ done <<<"${IFOPTS[$1]/%|*([[:blank:]])}|" # The | on the end is required.
+ # Don't bring up the interface if it will be brought up later during IP configuration.
+ # This prevents a situation where SLAAC takes a while to apply if the interface is already up.
+ if [ -z "${IPADDRS[$1]}" ] && [ -z "${IP6ADDRS[$1]}" ] && [ -z "${IPADDR[$1]}" ] && [ "${USE_DHCP[$1]}" != "yes" ] && [ "${USE_DHCP6[$1]}" != "yes" ] && [ "${USE_SLAAC[$1]}" != "yes" ]; then
+ debug_log "/sbin/ip link set dev ${IFNAME[$1]} up"
+ /sbin/ip link set dev ${IFNAME[$1]} up
+ fi
}
# Function to disassemble a bridge interface.
@@ -323,6 +327,51 @@ if_up() {
debug_log "/sbin/ip address flush dev ${1}"
/sbin/ip address flush dev ${1}
IF_UP=0
+ if [ -e /proc/sys/net/ipv6 ] && [ "${USE_DHCP6[$i]}" != "yes" ] && [ "${USE_SLAAC[$i]}" = "yes" ]; then # configure via SLAAC
+ info_log "${1}: enabling SLAAC"
+ # Enable accepting of RA packets, unless explicitly configured not to:
+ if [ "${USE_RA[$i]}" = "no" ]; then
+ debug_log "${1}: ignoring IPv6 RA"
+ echo "0" >/proc/sys/net/ipv6/conf/${1}/accept_ra
+ else
+ debug_log "${1}: accepting IPv6 RA"
+ echo "1" >/proc/sys/net/ipv6/conf/${1}/accept_ra
+ fi
+ # Set up SLAAC privacy enhancements if configured.
+ if [ "${SLAAC_PRIVIPGEN[$i]}" = "yes" ]; then
+ if [ -n "${SLAAC_SECRET[$i]}" ]; then
+ debug_log "${1}: seeding secret and enabling private IPv6 generation"
+ echo "${SLAAC_SECRET[$i]}" >/proc/sys/net/ipv6/conf/${1}/stable_secret
+ echo "2" >/proc/sys/net/ipv6/conf/${1}/addr_gen_mode
+ else
+ debug_log "${1}: using random secret and enabling private IPv6 generation"
+ echo -n >/proc/sys/net/ipv6/conf/${1}/stable_secret
+ echo "3" >/proc/sys/net/ipv6/conf/${1}/addr_gen_mode
+ fi
+ fi
+ if [ "${SLAAC_TEMPADDR[$i]}" = "yes" ]; then
+ debug_log "${1}: enabling SLAAC tempaddr"
+ echo "2" >/proc/sys/net/ipv6/conf/${1}/use_tempaddr
+ fi
+ # Enable auto configuration of interfaces:
+ echo "1" >/proc/sys/net/ipv6/conf/${1}/autoconf
+ # Bring the interface up:
+ debug_log "/sbin/ip link set dev ${1} up"
+ /sbin/ip link set dev ${1} up
+ echo "${1}: waiting for router announcement"
+ for ((j = ${SLAAC_TIMEOUT[$i]:=15} * 2; j--;)); do # by default, wait a max of 15 seconds for the interface to configure
+ /sbin/ip -6 address show dynamic dev ${1} 2>/dev/null | grep -Ewq 'inet6' && { IF_UP=1; break; }
+ sleep 0.5
+ done
+ if ((IF_UP != 1)); then
+ echo "${1}: timed out"
+ info_log "${1}: failed to auto configure after ${SLAAC_TIMEOUT[$i]} seconds"
+ debug_log "/sbin/ip address flush dev ${1}"
+ /sbin/ip address flush dev ${1}
+ debug_log "/sbin/ip link set dev ${1} down"
+ /sbin/ip link set dev ${1} down
+ fi
+ fi
# Slackware historically favours dynamic configuration over fixed IP to configure interfaces, so keep that tradition:
if [ "${USE_DHCP[$i]}" = "yes" ] || { [ -e /proc/sys/net/ipv6 ] && [ "${USE_DHCP6[$i]}" = "yes" ]; }; then # use dhcpcd
info_log "${1}: starting dhcpcd"
@@ -368,35 +417,6 @@ if_up() {
/sbin/ip link set dev ${1} down
fi
fi
- if [ -e /proc/sys/net/ipv6 ] && [ "${USE_DHCP6[$i]}" != "yes" ] && [ "${USE_SLAAC[$i]}" = "yes" ]; then # configure via SLAAC
- info_log "${1}: enabling SLAAC"
- # Enable accepting of RA packets, unless explicitly configured not to:
- if [ "${USE_RA[$i]}" = "no" ]; then
- debug_log "${1}: ignoring IPv6 RA"
- echo "0" >/proc/sys/net/ipv6/conf/${1}/accept_ra
- else
- debug_log "${1}: accepting IPv6 RA"
- echo "1" >/proc/sys/net/ipv6/conf/${1}/accept_ra
- fi
- # Enable auto configuration of interfaces:
- echo "1" >/proc/sys/net/ipv6/conf/${1}/autoconf
- # Bring the interface up:
- debug_log "/sbin/ip link set dev ${1} up"
- /sbin/ip link set dev ${1} up
- echo "${1}: waiting for router announcement"
- for ((j = ${SLAAC_TIMEOUT[$i]:=15} * 2; j--;)); do # by default, wait a max of 15 seconds for the interface to configure
- /sbin/ip -6 address show dynamic dev ${1} 2>/dev/null | grep -Ewq 'inet6' && { IF_UP=1; break; }
- sleep 0.5
- done
- if ((IF_UP != 1)); then
- echo "${1}: timed out"
- info_log "${1}: failed to auto configure after ${SLAAC_TIMEOUT[$i]} seconds"
- debug_log "/sbin/ip address flush dev ${1}"
- /sbin/ip address flush dev ${1}
- debug_log "/sbin/ip link set dev ${1} down"
- /sbin/ip link set dev ${1} down
- fi
- fi
if [ -e /proc/sys/net/ipv6 ] && [ -n "${IP6ADDRS[$i]}" ]; then # add v6 IPs
info_log "${1}: setting IPv6 addresses"
# IPv6's Duplicate Address Detection (DAD) causes a race condition when bringing up interfaces, as
@@ -545,11 +565,14 @@ if_down() {
# Bring the interface down:
debug_log "/sbin/ip link set dev ${1} down"
/sbin/ip link set dev ${1} down
- # Reset autoconf and accept_ra back to defaults:
+ # Reset everything back to defaults:
if [ -e /proc/sys/net/ipv6 ]; then
- debug_log "${1}: resetting IPv6 autoconf and RA to defaults"
+ debug_log "${1}: resetting IPv6 configuration to defaults"
cat /proc/sys/net/ipv6/conf/default/autoconf >/proc/sys/net/ipv6/conf/${1}/autoconf
cat /proc/sys/net/ipv6/conf/default/accept_ra >/proc/sys/net/ipv6/conf/${1}/accept_ra
+ cat /proc/sys/net/ipv6/conf/default/use_tempaddr >/proc/sys/net/ipv6/conf/${1}/use_tempaddr
+ cat /proc/sys/net/ipv6/conf/default/addr_gen_mode >/proc/sys/net/ipv6/conf/${1}/addr_gen_mode
+ echo -n >/proc/sys/net/ipv6/conf/${1}/stable_secret
fi
# If the interface is a bridge, then destroy it now:
[ -n "${BRNICS[$i]}" ] && br_close $i
diff --git a/source/n/network-scripts/scripts/rc.inet1.conf b/source/n/network-scripts/scripts/rc.inet1.conf
index 0daee701..e952498e 100644
--- a/source/n/network-scripts/scripts/rc.inet1.conf
+++ b/source/n/network-scripts/scripts/rc.inet1.conf
@@ -69,7 +69,7 @@ GATEWAY6=""
# BONDNICS is a space delimited list of interfaces to add to this bond. The
# BONDNICS interfaces will be brought up and configured while bringing up the
# bond interface, so do not need to be previously defined in rc.inet1.conf.
-# BONDMODE sets the bonding mode for this interface. If not specified when
+# BONDMODE sets the bonding mode for this interface. If not specified when
# BONDNICS has been used, the default is 'balance-rr'.
# IFOPTS is a pipe (|) delimited list of bonding module specific settings to be
# applied to the interface, and should always include the 'miimon' option when
@@ -83,9 +83,7 @@ GATEWAY6=""
#BONDNICS[0]="eth0 eth1"
#BONDMODE[0]="balance-rr"
#IFOPTS[0]="xmit_hash_policy layer2+3 | miimon 100"
-#IPADDR[0]="192.168.0.1"
-#NETMASK[0]="24"
-#IPALIASES[0]=""
+#IPADDRS[0]="192.168.0.1/24"
#USE_DHCP[0]=""
#DHCP_HOSTNAME[0]=""
#IP6ADDRS[0]=""
@@ -174,7 +172,7 @@ GATEWAY6=""
# Some examples of additional network parameters that you can use.
#IFNAME[4]="wlan0" # Use a different interface name instead of
# the default 'eth4'
-#IFOPTS[4]="" # A pipe (|) delimited list of interface type
+#IFOPTS[4]="" # A pipe (|) delimited list of interface type
# specific options to apply. These options
# can be found in the ip-link(8) man page in
# the approprite section for the interface
@@ -200,6 +198,16 @@ GATEWAY6=""
#SLAAC_TIMEOUT[4]="15" # The default timeout for auto configuration to
# wait for the interface to come up is 15 sec.
# Increase the timeout if required.
+#SLAAC_PRIVIPGEN[4]="yes" # When assigning addresses via SLAAC, use the
+ # 'private' (RFC7217) address generation method.
+ # It is advisable to also set SLAAC_SECRET[x].
+#SLAAC_SECRET[4]="xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx:xxxx"
+ # When SLAAC_PRIVIPGEN[x]="yes" is set, this is
+ # the secret to be used. This must be in the
+ # form of an IPv6 address. When left unset, a
+ # random secret is used (this is the default).
+#SLAAC_TEMPADDR[4]="yes" # Use a temporary address with SLAAC to enhance
+ # security.
#USE_RA[4]="yes" # Accept router advertisements even when SLAAC
# is disabled on the interface.
#WLAN_ESSID[4]="DARKSTAR" # An example of how you can override _any_
diff --git a/source/n/wireless_tools/scripts/rc.wireless b/source/n/wireless_tools/scripts/rc.wireless
index 52559ff5..b9713ade 100644
--- a/source/n/wireless_tools/scripts/rc.wireless
+++ b/source/n/wireless_tools/scripts/rc.wireless
@@ -61,6 +61,9 @@
# 11/Nov/2019 * Darren Austin * Log to syslog, failling back to stdout.
# Output error to stderr if not called from
# rc.inet1.
+# 09/Mar/2021 * Darren Austin * Don't leave the interface in an 'up' state upon
+# exit from the script - this causes problems for
+# SLAAC in rc.inet1 when control is returned.
# ------------------------------------------------------------------------------
# If possible, log events in /var/log/messages:
@@ -326,11 +329,10 @@ if [ "$WPA" = "wpa_supplicant" ] || [ "$WPA" = "wpaxsupplicant" ] && [ -x ${SUPP
echo "$0: WPA authentication did not complete, try running '/etc/rc.d/rc.inet1 ${INTERFACE}_start' in a few seconds." | $LOGGER
fi
# Bring interface up to avoid 'not ready' errors when calling iwconfig
- $IFCOMMAND up
- sleep 3
-
+ # Update 09/Mar/21: No point bringing it up here to be taken down at exit.
+ # $IFCOMMAND up
+ # sleep 3
else
-
# ESSID need to be last: most devices re-perform the scanning/discovery
# when this is set, and things like encryption keys had better be
# defined if we want to discover the right set of APs/nodes.
@@ -344,5 +346,6 @@ else
echo "$0: $IWCOMMAND essid \"$ESSID\"" | $LOGGER
$IWCOMMAND essid "$ESSID"
fi
-
fi
+$IFCOMMAND down
+sleep 3
diff --git a/source/n/wireless_tools/wireless_tools.SlackBuild b/source/n/wireless_tools/wireless_tools.SlackBuild
index c7f721eb..393f770d 100755
--- a/source/n/wireless_tools/wireless_tools.SlackBuild
+++ b/source/n/wireless_tools/wireless_tools.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=wireless_tools
VERSION=30.pre9
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/x/libgee/libgee.SlackBuild b/source/x/libgee/libgee.SlackBuild
index ab83a8f1..832fa223 100755
--- a/source/x/libgee/libgee.SlackBuild
+++ b/source/x/libgee/libgee.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libgee
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}