summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-10-13 19:01:25 +0000
committer Eric Hameleers <alien@slackware.com>2019-10-13 23:17:53 +0200
commit5d65e7741e0ac50a0c28d9e5c3575a0ae60fb66e (patch)
treeb7b86000ddbfe05618051d011fed5c16a63a78a6
parent775310bf07e34137f86d467187836baea192c3d7 (diff)
downloadcurrent-5d65e7741e0ac50a0c28d9e5c3575a0ae60fb66e.tar.gz
current-5d65e7741e0ac50a0c28d9e5c3575a0ae60fb66e.tar.xz
Sun Oct 13 19:01:25 UTC 201920191013190125
a/pkgtools-15.0-noarch-26.txz: Rebuilt. upgradepkg: add spaces to --dry-run package list. Thanks to Markus Wiesner. l/aspell-0.60.8-x86_64-1.txz: Upgraded. n/network-scripts-15.0-noarch-9.txz: Rebuilt. rc.inet1: Fix typos and spacing. rc.inet2: Start rc.firewall first. This had been later in the script due to the now unsupported idea of having /usr on NFS. Thanks to abga. rc.inet2: If present and executable, start the Kerberos init scripts. rc.inet2: Remove obsolete rpc.pcnfsd/rpc.bwnfsd section from the end. n/proftpd-1.3.6a-x86_64-1.txz: Upgraded. xap/pan-0.146-x86_64-1.txz: Upgraded.
-rw-r--r--ChangeLog.rss25
-rw-r--r--ChangeLog.txt13
-rw-r--r--FILELIST.TXT106
-rwxr-xr-xrecompress.sh5
-rwxr-xr-xsource/a/pkgtools/pkgtools.SlackBuild2
-rw-r--r--source/a/pkgtools/scripts/upgradepkg4
-rwxr-xr-xsource/n/network-scripts/network-scripts.SlackBuild2
-rw-r--r--source/n/network-scripts/scripts/rc.inet112
-rw-r--r--source/n/network-scripts/scripts/rc.inet280
-rwxr-xr-xsource/n/proftpd/proftpd.SlackBuild6
-rwxr-xr-xsource/xap/pan/pan.SlackBuild9
-rw-r--r--source/xap/pan/patches/0000-b9a4154942c932a493736d2292bbae16384e35df.patch25
-rw-r--r--source/xap/pan/patches/0001-e5be4d4a1d9d08796c1b5a5c763379383b8c119a.patch215
-rw-r--r--source/xap/pan/patches/0002-50f6c43a698dcc0ba6b490c086a73eeedbdd8a80.patch31
-rw-r--r--source/xap/pan/patches/0003-ddcd5761075a6fb3ef7b768f004fa1e6663cb65e.patch33
-rw-r--r--source/xap/pan/patches/0004-476b5a62fcda711ce2d7412a310b8182cca6940e.patch21
16 files changed, 145 insertions, 444 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index 9ec8925e..cc25b334 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,31 @@
<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>Sat, 12 Oct 2019 17:56:55 GMT</pubDate>
- <lastBuildDate>Sun, 13 Oct 2019 06:59:43 GMT</lastBuildDate>
+ <pubDate>Sun, 13 Oct 2019 19:01:25 GMT</pubDate>
+ <lastBuildDate>Sun, 13 Oct 2019 21:17:46 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.11</generator>
<item>
+ <title>Sun, 13 Oct 2019 19:01:25 GMT</title>
+ <pubDate>Sun, 13 Oct 2019 19:01:25 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20191013190125</link>
+ <guid isPermaLink="false">20191013190125</guid>
+ <description>
+ <![CDATA[<pre>
+a/pkgtools-15.0-noarch-26.txz: Rebuilt.
+ upgradepkg: add spaces to --dry-run package list. Thanks to Markus Wiesner.
+l/aspell-0.60.8-x86_64-1.txz: Upgraded.
+n/network-scripts-15.0-noarch-9.txz: Rebuilt.
+ rc.inet1: Fix typos and spacing.
+ rc.inet2: Start rc.firewall first. This had been later in the script due to
+ the now unsupported idea of having /usr on NFS. Thanks to abga.
+ rc.inet2: If present and executable, start the Kerberos init scripts.
+ rc.inet2: Remove obsolete rpc.pcnfsd/rpc.bwnfsd section from the end.
+n/proftpd-1.3.6a-x86_64-1.txz: Upgraded.
+xap/pan-0.146-x86_64-1.txz: Upgraded.
+ </pre>]]>
+ </description>
+ </item>
+ <item>
<title>Sat, 12 Oct 2019 17:56:55 GMT</title>
<pubDate>Sat, 12 Oct 2019 17:56:55 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20191012175655</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 81a6cf57..7ff1e893 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,16 @@
+Sun Oct 13 19:01:25 UTC 2019
+a/pkgtools-15.0-noarch-26.txz: Rebuilt.
+ upgradepkg: add spaces to --dry-run package list. Thanks to Markus Wiesner.
+l/aspell-0.60.8-x86_64-1.txz: Upgraded.
+n/network-scripts-15.0-noarch-9.txz: Rebuilt.
+ rc.inet1: Fix typos and spacing.
+ rc.inet2: Start rc.firewall first. This had been later in the script due to
+ the now unsupported idea of having /usr on NFS. Thanks to abga.
+ rc.inet2: If present and executable, start the Kerberos init scripts.
+ rc.inet2: Remove obsolete rpc.pcnfsd/rpc.bwnfsd section from the end.
+n/proftpd-1.3.6a-x86_64-1.txz: Upgraded.
+xap/pan-0.146-x86_64-1.txz: Upgraded.
++--------------------------+
Sat Oct 12 17:56:55 UTC 2019
ap/man-pages-5.03-noarch-1.txz: Upgraded.
d/binutils-2.33.1-x86_64-1.txz: Upgraded.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 5a285090..158cadaf 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Sat Oct 12 18:07:26 UTC 2019
+Sun Oct 13 19:12:40 UTC 2019
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
-drwxr-xr-x 12 root root 4096 2019-10-12 17:56 .
+drwxr-xr-x 12 root root 4096 2019-10-13 19:01 .
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
-rw-r--r-- 1 root root 14375 2019-08-09 05:36 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 924911 2019-10-11 21:35 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2019-10-11 21:35 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 925155 2019-10-12 18:08 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2019-10-12 18:08 ./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 712692 2019-10-12 17:56 ./ChangeLog.txt
+-rw-r--r-- 1 root root 713361 2019-10-13 19:01 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2019-10-11 21:22 ./EFI/BOOT
-rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2019-10-11 21:22 ./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 1216184 2019-10-11 21:34 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1216459 2019-10-12 18:07 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 733585 2019-10-12 18:05 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 733586 2019-10-13 19:10 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
-rw-r--r-- 1 root root 3635 2019-10-11 20:50 ./README.initrd
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
@@ -786,13 +786,13 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches
-rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT
-drwxr-xr-x 18 root root 4096 2019-10-12 18:05 ./slackware64
--rw-r--r-- 1 root root 291127 2019-10-12 18:05 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2019-10-12 18:05 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 362643 2019-10-12 18:03 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 3646455 2019-10-12 18:03 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2019-10-13 19:10 ./slackware64
+-rw-r--r-- 1 root root 291130 2019-10-13 19:10 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2019-10-13 19:10 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 362646 2019-10-13 19:08 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 3641162 2019-10-13 19:09 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
-drwxr-xr-x 2 root root 28672 2019-10-11 21:30 ./slackware64/a
+drwxr-xr-x 2 root root 28672 2019-10-13 19:08 ./slackware64/a
-rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt
-rw-r--r-- 1 root root 10820 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz
-rw-r--r-- 1 root root 163 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txz.asc
@@ -1040,9 +1040,9 @@ drwxr-xr-x 2 root root 28672 2019-10-11 21:30 ./slackware64/a
-rw-r--r-- 1 root root 450 2018-04-13 13:10 ./slackware64/a/pcmciautils-018-x86_64-2.txt
-rw-r--r-- 1 root root 32548 2018-04-13 13:10 ./slackware64/a/pcmciautils-018-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:10 ./slackware64/a/pcmciautils-018-x86_64-2.txz.asc
--rw-r--r-- 1 root root 672 2019-10-11 20:01 ./slackware64/a/pkgtools-15.0-noarch-25.txt
--rw-r--r-- 1 root root 195784 2019-10-11 20:01 ./slackware64/a/pkgtools-15.0-noarch-25.txz
--rw-r--r-- 1 root root 163 2019-10-11 20:01 ./slackware64/a/pkgtools-15.0-noarch-25.txz.asc
+-rw-r--r-- 1 root root 672 2019-10-13 17:38 ./slackware64/a/pkgtools-15.0-noarch-26.txt
+-rw-r--r-- 1 root root 195732 2019-10-13 17:38 ./slackware64/a/pkgtools-15.0-noarch-26.txz
+-rw-r--r-- 1 root root 163 2019-10-13 17:38 ./slackware64/a/pkgtools-15.0-noarch-26.txz.asc
-rw-r--r-- 1 root root 523 2019-01-07 20:48 ./slackware64/a/plzip-1.8-x86_64-1.txt
-rw-r--r-- 1 root root 55804 2019-01-07 20:48 ./slackware64/a/plzip-1.8-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-01-07 20:48 ./slackware64/a/plzip-1.8-x86_64-1.txz.asc
@@ -2457,7 +2457,7 @@ drwxr-xr-x 2 root root 20480 2016-03-10 03:11 ./slackware64/kdei
-rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag
-rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag.ez
-rw-r--r-- 1 root root 1500 2018-03-01 07:54 ./slackware64/kdei/tagfile
-drwxr-xr-x 2 root root 69632 2019-10-12 18:03 ./slackware64/l
+drwxr-xr-x 2 root root 69632 2019-10-13 19:08 ./slackware64/l
-rw-r--r-- 1 root root 338 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txt
-rw-r--r-- 1 root root 149752 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz.asc
@@ -2527,9 +2527,9 @@ drwxr-xr-x 2 root root 69632 2019-10-12 18:03 ./slackware64/l
-rw-r--r-- 1 root root 534 2019-07-29 21:35 ./slackware64/l/argon2-20190702-x86_64-3.txt
-rw-r--r-- 1 root root 32032 2019-07-29 21:35 ./slackware64/l/argon2-20190702-x86_64-3.txz
-rw-r--r-- 1 root root 163 2019-07-29 21:35 ./slackware64/l/argon2-20190702-x86_64-3.txz.asc
--rw-r--r-- 1 root root 251 2019-07-29 19:50 ./slackware64/l/aspell-0.60.7-x86_64-1.txt
--rw-r--r-- 1 root root 631308 2019-07-29 19:50 ./slackware64/l/aspell-0.60.7-x86_64-1.txz
--rw-r--r-- 1 root root 163 2019-07-29 19:50 ./slackware64/l/aspell-0.60.7-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 251 2019-10-13 17:34 ./slackware64/l/aspell-0.60.8-x86_64-1.txt
+-rw-r--r-- 1 root root 653880 2019-10-13 17:34 ./slackware64/l/aspell-0.60.8-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2019-10-13 17:34 ./slackware64/l/aspell-0.60.8-x86_64-1.txz.asc
-rw-r--r-- 1 root root 175 2018-04-17 19:02 ./slackware64/l/aspell-en-2018.04.16_0-x86_64-1.txt
-rw-r--r-- 1 root root 1110456 2018-04-17 19:02 ./slackware64/l/aspell-en-2018.04.16_0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-04-17 19:02 ./slackware64/l/aspell-en-2018.04.16_0-x86_64-1.txz.asc
@@ -3426,7 +3426,7 @@ drwxr-xr-x 2 root root 69632 2019-10-12 18:03 ./slackware64/l
-rw-r--r-- 1 root root 463 2019-08-21 04:36 ./slackware64/l/zstd-1.4.3-x86_64-1.txt
-rw-r--r-- 1 root root 400628 2019-08-21 04:36 ./slackware64/l/zstd-1.4.3-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-08-21 04:36 ./slackware64/l/zstd-1.4.3-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 36864 2019-10-12 17:48 ./slackware64/n
+drwxr-xr-x 2 root root 36864 2019-10-13 19:08 ./slackware64/n
-rw-r--r-- 1 root root 357 2019-09-15 20:54 ./slackware64/n/ModemManager-1.10.6-x86_64-1.txt
-rw-r--r-- 1 root root 1704048 2019-09-15 20:54 ./slackware64/n/ModemManager-1.10.6-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-09-15 20:54 ./slackware64/n/ModemManager-1.10.6-x86_64-1.txz.asc
@@ -3701,9 +3701,9 @@ drwxr-xr-x 2 root root 36864 2019-10-12 17:48 ./slackware64/n
-rw-r--r-- 1 root root 306 2018-04-13 15:43 ./slackware64/n/netwatch-1.3.1_2-x86_64-3.txt
-rw-r--r-- 1 root root 91924 2018-04-13 15:43 ./slackware64/n/netwatch-1.3.1_2-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:43 ./slackware64/n/netwatch-1.3.1_2-x86_64-3.txz.asc
--rw-r--r-- 1 root root 582 2018-05-29 20:44 ./slackware64/n/network-scripts-15.0-noarch-8.txt
--rw-r--r-- 1 root root 22372 2018-05-29 20:44 ./slackware64/n/network-scripts-15.0-noarch-8.txz
--rw-r--r-- 1 root root 163 2018-05-29 20:44 ./slackware64/n/network-scripts-15.0-noarch-8.txz.asc
+-rw-r--r-- 1 root root 582 2019-10-13 18:59 ./slackware64/n/network-scripts-15.0-noarch-9.txt
+-rw-r--r-- 1 root root 22420 2019-10-13 18:59 ./slackware64/n/network-scripts-15.0-noarch-9.txz
+-rw-r--r-- 1 root root 163 2019-10-13 18:59 ./slackware64/n/network-scripts-15.0-noarch-9.txz.asc
-rw-r--r-- 1 root root 557 2018-04-13 15:43 ./slackware64/n/netwrite-0.17-x86_64-2.txt
-rw-r--r-- 1 root root 6964 2018-04-13 15:43 ./slackware64/n/netwrite-0.17-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:43 ./slackware64/n/netwrite-0.17-x86_64-2.txz.asc
@@ -3779,9 +3779,9 @@ drwxr-xr-x 2 root root 36864 2019-10-12 17:48 ./slackware64/n
-rw-r--r-- 1 root root 687 2018-04-13 15:51 ./slackware64/n/procmail-3.22-x86_64-3.txt
-rw-r--r-- 1 root root 135716 2018-04-13 15:51 ./slackware64/n/procmail-3.22-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:51 ./slackware64/n/procmail-3.22-x86_64-3.txz.asc
--rw-r--r-- 1 root root 371 2018-05-08 04:26 ./slackware64/n/proftpd-1.3.6-x86_64-4.txt
--rw-r--r-- 1 root root 1348284 2018-05-08 04:26 ./slackware64/n/proftpd-1.3.6-x86_64-4.txz
--rw-r--r-- 1 root root 163 2018-05-08 04:26 ./slackware64/n/proftpd-1.3.6-x86_64-4.txz.asc
+-rw-r--r-- 1 root root 371 2019-10-13 17:29 ./slackware64/n/proftpd-1.3.6a-x86_64-1.txt
+-rw-r--r-- 1 root root 1353668 2019-10-13 17:29 ./slackware64/n/proftpd-1.3.6a-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2019-10-13 17:29 ./slackware64/n/proftpd-1.3.6a-x86_64-1.txz.asc
-rw-r--r-- 1 root root 590 2019-02-19 23:39 ./slackware64/n/pssh-2.3.1-x86_64-4.txt
-rw-r--r-- 1 root root 38948 2019-02-19 23:39 ./slackware64/n/pssh-2.3.1-x86_64-4.txz
-rw-r--r-- 1 root root 163 2019-02-19 23:39 ./slackware64/n/pssh-2.3.1-x86_64-4.txz.asc
@@ -4770,7 +4770,7 @@ drwxr-xr-x 2 root root 65536 2019-10-11 21:30 ./slackware64/x
-rw-r--r-- 1 root root 213 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txt
-rw-r--r-- 1 root root 25288 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz.asc
-drwxr-xr-x 2 root root 12288 2019-10-11 21:29 ./slackware64/xap
+drwxr-xr-x 2 root root 12288 2019-10-13 19:08 ./slackware64/xap
-rw-r--r-- 1 root root 625 2019-07-17 18:55 ./slackware64/xap/MPlayer-20190717-x86_64-1.txt
-rw-r--r-- 1 root root 2728104 2019-07-17 18:55 ./slackware64/xap/MPlayer-20190717-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-07-17 18:55 ./slackware64/xap/MPlayer-20190717-x86_64-1.txz.asc
@@ -4844,9 +4844,9 @@ drwxr-xr-x 2 root root 12288 2019-10-11 21:29 ./slackware64/xap
-rw-r--r-- 1 root root 359 2019-10-09 16:46 ./slackware64/xap/network-manager-applet-1.8.24-x86_64-1.txt
-rw-r--r-- 1 root root 1055396 2019-10-09 16:46 ./slackware64/xap/network-manager-applet-1.8.24-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-10-09 16:46 ./slackware64/xap/network-manager-applet-1.8.24-x86_64-1.txz.asc
--rw-r--r-- 1 root root 301 2019-07-25 22:26 ./slackware64/xap/pan-0.145-x86_64-2.txt
--rw-r--r-- 1 root root 1058244 2019-07-25 22:26 ./slackware64/xap/pan-0.145-x86_64-2.txz
--rw-r--r-- 1 root root 163 2019-07-25 22:26 ./slackware64/xap/pan-0.145-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 301 2019-10-13 18:11 ./slackware64/xap/pan-0.146-x86_64-1.txt
+-rw-r--r-- 1 root root 1055556 2019-10-13 18:11 ./slackware64/xap/pan-0.146-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2019-10-13 18:11 ./slackware64/xap/pan-0.146-x86_64-1.txz.asc
-rw-r--r-- 1 root root 478 2019-03-06 19:39 ./slackware64/xap/pavucontrol-4.0-x86_64-1.txt
-rw-r--r-- 1 root root 140148 2019-03-06 19:39 ./slackware64/xap/pavucontrol-4.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2019-03-06 19:39 ./slackware64/xap/pavucontrol-4.0-x86_64-1.txz.asc
@@ -5010,11 +5010,11 @@ drwxr-xr-x 2 root root 4096 2019-02-17 23:51 ./slackware64/y
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez
-rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile
-drwxr-xr-x 19 root root 4096 2019-10-12 18:07 ./source
--rw-r--r-- 1 root root 471662 2019-10-12 18:07 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2019-10-12 18:07 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 665612 2019-10-12 18:06 ./source/FILE_LIST
--rw-r--r-- 1 root root 17793129 2019-10-12 18:06 ./source/MANIFEST.bz2
+drwxr-xr-x 19 root root 4096 2019-10-13 19:12 ./source
+-rw-r--r-- 1 root root 471128 2019-10-13 19:12 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2019-10-13 19:12 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 664918 2019-10-13 19:11 ./source/FILE_LIST
+-rw-r--r-- 1 root root 17805601 2019-10-13 19:11 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
drwxr-xr-x 111 root root 4096 2019-10-04 19:12 ./source/a
-rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog
@@ -5658,7 +5658,7 @@ drwxr-xr-x 2 root root 4096 2019-10-04 06:20 ./source/a/pkgtools/manpages
-rw-r--r-- 1 root root 2518 2009-04-11 21:11 ./source/a/pkgtools/manpages/pkgtool.8
-rw-r--r-- 1 root root 3251 2018-06-19 19:28 ./source/a/pkgtools/manpages/removepkg.8
-rw-r--r-- 1 root root 2962 2018-06-08 19:56 ./source/a/pkgtools/manpages/upgradepkg.8
--rwxr-xr-x 1 root root 3742 2019-10-11 20:01 ./source/a/pkgtools/pkgtools.SlackBuild
+-rwxr-xr-x 1 root root 3742 2019-10-13 17:38 ./source/a/pkgtools/pkgtools.SlackBuild
drwxr-xr-x 2 root root 4096 2019-10-04 06:20 ./source/a/pkgtools/scripts
-rw-r--r-- 1 root root 3608 2018-06-19 19:28 ./source/a/pkgtools/scripts/explodepkg
-rw-r--r-- 1 root root 27102 2019-10-04 06:05 ./source/a/pkgtools/scripts/installpkg
@@ -5671,7 +5671,7 @@ drwxr-xr-x 2 root root 4096 2019-10-04 06:20 ./source/a/pkgtools/scripts
-rw-r--r-- 1 root root 9164 2018-06-19 19:28 ./source/a/pkgtools/scripts/setup.80.make-bootdisk
-rw-r--r-- 1 root root 1062 2018-04-28 19:12 ./source/a/pkgtools/scripts/setup.htmlview
-rw-r--r-- 1 root root 8875 2018-06-19 19:28 ./source/a/pkgtools/scripts/setup.services
--rw-r--r-- 1 root root 14168 2019-10-04 06:13 ./source/a/pkgtools/scripts/upgradepkg
+-rw-r--r-- 1 root root 14168 2019-10-13 17:37 ./source/a/pkgtools/scripts/upgradepkg
-rw-r--r-- 1 root root 1128 2018-04-11 19:51 ./source/a/pkgtools/slack-desc
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/a/plzip
-rw-r--r-- 1 root root 55697 2019-01-05 18:07 ./source/a/plzip/plzip-1.8.tar.lz
@@ -8224,8 +8224,8 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/argon2
-rw-r--r-- 1 root root 1185533 2019-07-04 18:35 ./source/l/argon2/20190702.tar.lz
-rwxr-xr-x 1 root root 4346 2019-09-29 23:48 ./source/l/argon2/argon2.SlackBuild
-rw-r--r-- 1 root root 991 2019-01-10 20:02 ./source/l/argon2/slack-desc
-drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/aspell
--rw-r--r-- 1 root root 981805 2019-07-29 06:59 ./source/l/aspell/aspell-0.60.7.tar.lz
+drwxr-xr-x 2 root root 4096 2019-10-13 17:33 ./source/l/aspell
+-rw-r--r-- 1 root root 984307 2019-10-12 22:31 ./source/l/aspell/aspell-0.60.8.tar.lz
-rwxr-xr-x 1 root root 3788 2019-09-29 23:48 ./source/l/aspell/aspell.SlackBuild
-rw-r--r-- 1 root root 705 2018-02-27 06:12 ./source/l/aspell/slack-desc
drwxr-xr-x 2 root root 4096 2019-10-08 18:37 ./source/l/at-spi2-atk
@@ -10490,8 +10490,8 @@ drwxr-xr-x 4 root root 4096 2018-05-24 06:24 ./source/n/network-scripts
drwxr-xr-x 2 root root 4096 2014-07-13 19:16 ./source/n/network-scripts/manpages
-rw-r--r-- 1 root root 3425 2018-05-24 06:24 ./source/n/network-scripts/manpages/rc.inet1.8
-rw-r--r-- 1 root root 7322 2018-05-24 06:24 ./source/n/network-scripts/manpages/rc.inet1.conf.5
--rwxr-xr-x 1 root root 2805 2018-05-24 06:24 ./source/n/network-scripts/network-scripts.SlackBuild
-drwxr-xr-x 2 root root 4096 2018-04-13 18:49 ./source/n/network-scripts/scripts
+-rwxr-xr-x 1 root root 2805 2019-10-13 18:43 ./source/n/network-scripts/network-scripts.SlackBuild
+drwxr-xr-x 2 root root 4096 2019-10-13 18:42 ./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
-rw-r--r-- 1 root root 627 2003-08-27 01:07 ./source/n/network-scripts/scripts/hosts
@@ -10502,9 +10502,9 @@ drwxr-xr-x 2 root root 4096 2018-04-13 18:49 ./source/n/network-scripts/s
-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 13486 2018-05-24 06:24 ./source/n/network-scripts/scripts/rc.inet1
+-rw-r--r-- 1 root root 13486 2019-10-13 18:50 ./source/n/network-scripts/scripts/rc.inet1
-rw-r--r-- 1 root root 6050 2018-05-24 06:24 ./source/n/network-scripts/scripts/rc.inet1.conf
--rw-r--r-- 1 root root 4932 2018-02-22 02:25 ./source/n/network-scripts/scripts/rc.inet2
+-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
-rw-r--r-- 1 root root 349 2003-02-18 23:53 ./source/n/network-scripts/scripts/setup.netconfig
@@ -10693,13 +10693,13 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/procmail
-rw-r--r-- 1 root root 277 2006-09-19 04:10 ./source/n/procmail/procmail.lfs.diff.gz
-rw-r--r-- 1 root root 13073 2002-12-26 21:18 ./source/n/procmail/procmail_3.22-5.diff.gz
-rw-r--r-- 1 root root 1143 2018-02-27 06:13 ./source/n/procmail/slack-desc
-drwxr-xr-x 3 root root 4096 2019-09-29 23:48 ./source/n/proftpd
+drwxr-xr-x 3 root root 4096 2019-10-13 17:27 ./source/n/proftpd
-rw-r--r-- 1 root root 306 2003-03-06 07:52 ./source/n/proftpd/doinst.sh.gz
drwxr-xr-x 2 root root 4096 2017-04-20 21:08 ./source/n/proftpd/etc
-rw-r--r-- 1 root root 581 2001-02-26 07:31 ./source/n/proftpd/etc/ftpusers
-rw-r--r-- 1 root root 1986 2017-04-20 21:08 ./source/n/proftpd/etc/proftpd.conf
--rw-r--r-- 1 root root 14458956 2017-04-10 03:00 ./source/n/proftpd/proftpd-1.3.6.tar.xz
--rwxr-xr-x 1 root root 4623 2019-09-29 23:48 ./source/n/proftpd/proftpd.SlackBuild
+-rw-r--r-- 1 root root 14424980 2019-10-12 23:39 ./source/n/proftpd/proftpd-1.3.6a.tar.lz
+-rwxr-xr-x 1 root root 4625 2019-10-13 17:28 ./source/n/proftpd/proftpd.SlackBuild
-rw-r--r-- 1 root root 826 2018-02-27 06:13 ./source/n/proftpd/slack-desc
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/pssh
-rw-r--r-- 1 root root 238 2017-04-16 10:40 ./source/n/pssh/pssh-2.3.1-py3-import.patch.gz
@@ -12541,15 +12541,9 @@ drwxr-xr-x 2 root root 4096 2019-10-09 16:45 ./source/xap/network-manager-
-rw-r--r-- 1 root root 2062132 2019-10-09 15:57 ./source/xap/network-manager-applet/network-manager-applet-1.8.24.tar.xz
-rwxr-xr-x 1 root root 4697 2019-10-09 16:45 ./source/xap/network-manager-applet/network-manager-applet.SlackBuild
-rw-r--r-- 1 root root 829 2018-02-27 06:13 ./source/xap/network-manager-applet/slack-desc
-drwxr-xr-x 3 root root 4096 2019-09-29 23:48 ./source/xap/pan
--rw-r--r-- 1 root root 1659450 2018-05-20 20:41 ./source/xap/pan/pan-0.145.tar.lz
--rwxr-xr-x 1 root root 5028 2019-09-29 23:48 ./source/xap/pan/pan.SlackBuild
-drwxr-xr-x 2 root root 4096 2019-07-25 22:22 ./source/xap/pan/patches
--rw-r--r-- 1 root root 563 2019-07-25 22:20 ./source/xap/pan/patches/0000-b9a4154942c932a493736d2292bbae16384e35df.patch.gz
--rw-r--r-- 1 root root 2063 2019-07-25 22:21 ./source/xap/pan/patches/0001-e5be4d4a1d9d08796c1b5a5c763379383b8c119a.patch.gz
--rw-r--r-- 1 root root 628 2019-07-25 22:21 ./source/xap/pan/patches/0002-50f6c43a698dcc0ba6b490c086a73eeedbdd8a80.patch.gz
--rw-r--r-- 1 root root 679 2019-07-25 22:22 ./source/xap/pan/patches/0003-ddcd5761075a6fb3ef7b768f004fa1e6663cb65e.patch.gz
--rw-r--r-- 1 root root 472 2019-07-25 22:22 ./source/xap/pan/patches/0004-476b5a62fcda711ce2d7412a310b8182cca6940e.patch.gz
+drwxr-xr-x 2 root root 4096 2019-10-13 18:09 ./source/xap/pan
+-rw-r--r-- 1 root root 1657736 2019-10-12 20:22 ./source/xap/pan/pan-0.146.tar.lz
+-rwxr-xr-x 1 root root 4456 2019-10-13 18:09 ./source/xap/pan/pan.SlackBuild
-rw-r--r-- 1 root root 752 2018-02-27 06:13 ./source/xap/pan/slack-desc
drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/xap/pavucontrol
-rw-r--r-- 1 root root 120 2013-11-05 03:45 ./source/xap/pavucontrol/doinst.sh.gz
diff --git a/recompress.sh b/recompress.sh
index a1216774..83b0bd2a 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -1122,11 +1122,6 @@ gzip ./source/xap/easytag/easytag.revert.ogg.handle.patch
gzip ./source/xap/easytag/easytag.no.freedb.musicbrainz.org.diff
gzip ./source/xap/easytag/doinst.sh
gzip ./source/xap/gkrellm/gkrellm.theme.defaults.diff
-gzip ./source/xap/pan/patches/0004-476b5a62fcda711ce2d7412a310b8182cca6940e.patch
-gzip ./source/xap/pan/patches/0001-e5be4d4a1d9d08796c1b5a5c763379383b8c119a.patch
-gzip ./source/xap/pan/patches/0000-b9a4154942c932a493736d2292bbae16384e35df.patch
-gzip ./source/xap/pan/patches/0003-ddcd5761075a6fb3ef7b768f004fa1e6663cb65e.patch
-gzip ./source/xap/pan/patches/0002-50f6c43a698dcc0ba6b490c086a73eeedbdd8a80.patch
gzip ./source/xap/pidgin/fix-gmain_h-compile-error.diff
gzip ./source/xap/pidgin/doinst.sh
gzip ./source/xap/mozilla-firefox/firefox.moz_plugin_path.diff
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index 773e3d6c..da23c76d 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
# *** UPDATE THESE WITH EACH BUILD:
VERSION=15.0
ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-25}
+BUILD=${BUILD:-26}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index f81d3c73..d71ca4b0 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -322,10 +322,10 @@ EOF
TIMESTAMP=$(date +%Y-%m-%d,%T)
SHORT="$(package_name $OLD)"
if [ "$DRY_RUN" = "true" ]; then
- echo -n "$NEW would upgrade: "
+ echo -n "$NEW would upgrade:"
for installed_package in $ADM_DIR/packages/$SHORT* ; do
if [ "$(package_name $installed_package)" = "$SHORT" ]; then
- echo -n "$(pkgbase $installed_package)"
+ echo -n " $(pkgbase $installed_package)"
fi
done
echo
diff --git a/source/n/network-scripts/network-scripts.SlackBuild b/source/n/network-scripts/network-scripts.SlackBuild
index 4f35ed36..1d9c866f 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:-8}
+BUILD=${BUILD:-9}
# 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/rc.inet1 b/source/n/network-scripts/scripts/rc.inet1
index cf9da0f4..59f89eda 100644
--- a/source/n/network-scripts/scripts/rc.inet1
+++ b/source/n/network-scripts/scripts/rc.inet1
@@ -22,7 +22,7 @@ else # output to stdout/stderr:
LOGGER=/bin/cat
fi
-# Handy wrapper for verbose logging
+# Handy wrapper for verbose logging:
debug_log() {
if [ "$DEBUG_ETH_UP" = "yes" ]; then
echo "/etc/rc.d/rc.inet1: $*" | $LOGGER
@@ -52,7 +52,7 @@ debug_log "List of interfaces: '${IFNAME[*]}'"
# LOOPBACK FUNCTIONS #
######################
-# Function to bring up the loopback interface. If loopback is
+# Function to bring up the loopback interface. If loopback is
# already up, do nothing.
lo_up() {
if [ -e /sys/class/net/lo ]; then
@@ -78,7 +78,7 @@ lo_down() {
# INTERFACE FUNCTIONS #
#######################
-# Function to create virtual interfaces
+# Function to create virtual interfaces.
virtif_create() {
# argument is 'i' - the position of this interface in the VIRTIFNAME array.
# this loop goes from i=0 to i=number_of_configured_virtual_interfaces_minus_one
@@ -88,7 +88,7 @@ virtif_create() {
done
}
-# Function to destory virtual interfaces
+# Function to destroy virtual interfaces.
virtif_destroy() {
# argument is 'i' - the position of this interface in the VIRTIFNAME array.
for i in $(seq 0 $((${#VIRTIFNAME[@]} - 1))); do
@@ -122,7 +122,7 @@ br_close() {
/sbin/ip link del ${IFNAME[$1]}
}
-# Function to bring up a network interface. If the interface is
+# Function to bring up a network interface. If the interface is
# already up or does not yet exist (perhaps because the kernel driver
# is not loaded yet), do nothing.
if_up() {
@@ -201,7 +201,7 @@ if_up() {
# fi
#fi
#### (end commented out)
- # 15 seconds should be a reasonable default DHCP timeout. 30 was too much.
+ # 15 seconds should be a reasonable default DHCP timeout. 30 was too much.
echo "/etc/rc.d/rc.inet1: /sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}" | $LOGGER
/sbin/dhcpcd -L -t ${DHCP_TIMEOUT[$i]:-15} ${DHCP_OPTIONS} ${1}
if [ "$?" == "0" ]; then # the dhcp call has succeeded
diff --git a/source/n/network-scripts/scripts/rc.inet2 b/source/n/network-scripts/scripts/rc.inet2
index 300ede3e..ec68ba0b 100644
--- a/source/n/network-scripts/scripts/rc.inet2
+++ b/source/n/network-scripts/scripts/rc.inet2
@@ -13,19 +13,52 @@
# Modified for Slackware by Patrick Volkerding <volkerdi@slackware.com>
-# At this point, we are ready to talk to The World...
+# At this point, we are (almost) ready to talk to The World...
+# If there is a firewall script, run it before enabling packet forwarding.
+# See the HOWTOs on http://www.netfilter.org/ for documentation on
+# setting up a firewall or NAT on Linux. In some cases this might need to
+# be moved past the section below dealing with IP packet forwarding.
+if [ -x /etc/rc.d/rc.firewall ]; then
+ /etc/rc.d/rc.firewall start
+fi
+
+# Turn on IPv4 packet forwarding support.
+if [ -x /etc/rc.d/rc.ip_forward ]; then
+ . /etc/rc.d/rc.ip_forward start
+fi
+
+# Start krb5kdc, which is the Kerberos version 5 Authentication Service
+# and Key Distribution Center (AS/KDC). This needs to run first on both
+# master and secondary KDCs.
+if [ -x /etc/rc.d/rc.krb5kdc ]; then
+ sh /etc/rc.d/rc.krb5kdc start
+fi
+
+# Start the Kerberos administration server. This typically runs on the
+# master Kerberos server, which stores the KDC database.
+if [ -x /etc/rc.d/rc.kadmind ]; then
+ sh /etc/rc.d/rc.kadmind start
+fi
+
+# Start the Kerberos V5 slave KDC update server. This runs on a slave
+# (secondary) KDC server. It allows the master Kerberos server to use
+# kprop(8) to propagate its database to the slave servers.
+if [ -x /etc/rc.d/rc.kpropd ]; then
+ sh /etc/rc.d/rc.kpropd start
+fi
+
# Mount remote (NFS) filesystems:
if cat /etc/fstab | grep -v '^#' | grep -w nfs 1> /dev/null 2> /dev/null ; then
# Start rpc.portmap, /sbin/rpc.lockd, and /sbin/rpc.statd if we find NFS
# volumes defined in /etc/fstab since these will need to be running in order
- # to mount them. If they are not running, attempting to mount an NFS
+ # to mount them. If they are not running, attempting to mount an NFS
# partition will cause mount to hang, or at least result in unreliable
- # operation. Keep this in mind if you plan to mount unlisted NFS
+ # operation. Keep this in mind if you plan to mount unlisted NFS
# partitions...
# If you have uncommented NFS partitions in your /etc/fstab, rc.rpc is run
- # whether it is set as executable or not. If you don't want to run it,
+ # whether it is set as executable or not. If you don't want to run it,
# comment the NFS partitions out in /etc/fstab or erase/rename rc.rpc.
if [ -r /etc/rc.d/rc.rpc ]; then
sh /etc/rc.d/rc.rpc start
@@ -37,15 +70,15 @@ if cat /etc/fstab | grep -v '^#' | grep -w nfs 1> /dev/null 2> /dev/null ; then
fi
# If /etc/rc.d/rc.rpc is executable, run it to load rpc.portmap, rpc.lockd,
-# and rpc.statd. This might be needed to mount NFS partitions that are not
-# listed in /etc/fstab. Starting this twice won't hurt as the script will
+# and rpc.statd. This might be needed to mount NFS partitions that are not
+# listed in /etc/fstab. Starting this twice won't hurt as the script will
# check if things are already running before trying to start them.
if [ -x /etc/rc.d/rc.rpc ]; then
sh /etc/rc.d/rc.rpc start
fi
-# Mount remote CIFS filesystems. Note that where possible, using CIFS is
-# preferred over SMBFS. SMBFS is no longer actively maintained.
+# Mount remote CIFS filesystems. Note that where possible, using CIFS is
+# preferred over SMBFS. SMBFS is no longer actively maintained.
if cat /etc/fstab | grep -v '^#' | grep -w cifs 1> /dev/null 2> /dev/null ; then
echo "Mounting remote CIFS file systems: /sbin/mount -a -t cifs"
/sbin/mount -a -t cifs
@@ -62,24 +95,13 @@ if cat /etc/fstab | grep -v '^#' | grep -w smbfs 1> /dev/null 2> /dev/null ; the
fi
# Start the system logger if it is not already running (maybe because /usr
-# is on a network partition).
+# is on a network partition). NOTE: Don't put /usr on a network partition,
+# or even a separate local partition. This is not supported and is likely to
+# cause some problems...
if [ -x /etc/rc.d/rc.syslog -a -d /var/log -a ! -r /var/run/syslogd.pid ]; then
. /etc/rc.d/rc.syslog start
fi
-# If there is a firewall script, run it before enabling packet forwarding.
-# See the HOWTOs on http://www.netfilter.org/ for documentation on
-# setting up a firewall or NAT on Linux. In some cases this might need to
-# be moved past the section below dealing with IP packet forwarding.
-if [ -x /etc/rc.d/rc.firewall ]; then
- /etc/rc.d/rc.firewall start
-fi
-
-# Turn on IPv4 packet forwarding support.
-if [ -x /etc/rc.d/rc.ip_forward ]; then
- . /etc/rc.d/rc.ip_forward start
-fi
-
# Start the inetd server:
if [ -x /etc/rc.d/rc.inetd ]; then
/etc/rc.d/rc.inetd start
@@ -106,7 +128,7 @@ if [ -x /etc/rc.d/rc.openvpn ]; then
/etc/rc.d/rc.openvpn start
fi
-# Start the NFS server. Note that for this to work correctly, you'll
+# Start the NFS server. Note that for this to work correctly, you'll
# need nfsd support in the kernel (the startup script will try to load
# the module for you).
# You'll also need to set up some shares in /etc/exports.
@@ -128,15 +150,3 @@ fi
# echo "Starting system status server: /usr/sbin/rwhod"
# /usr/sbin/rwhod
# fi
-
-# # Fire up the PC-NFS daemon(s). This is a primarily obsolete system, and may
-# # not be very secure. It's not at all needed for normal NFS server support.
-# # You probably should not run this.
-# if [ -x /usr/sbin/rpc.pcnfsd ]; then
-# echo "Starting PC-NFS daemons: /usr/sbin/rpc.pcnfsd /usr/sbin/rpc.bwnfsd"
-# /usr/sbin/rpc.pcnfsd /var/spool/lpd
-# fi
-# if [ -x /usr/sbin/rpc.bwnfsd ]; then
-# /usr/sbin/rpc.bwnfsd /var/spool/lpd
-# fi
-
diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild
index 5607c9c6..a2484230 100755
--- a/source/n/proftpd/proftpd.SlackBuild
+++ b/source/n/proftpd/proftpd.SlackBuild
@@ -23,9 +23,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=proftpd
-VERSION=1.3.6
-DIRVER=1.3.6
-BUILD=${BUILD:-4}
+VERSION=1.3.6a
+DIRVER=1.3.6a
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/xap/pan/pan.SlackBuild b/source/xap/pan/pan.SlackBuild
index 99b0541f..683ed8c4 100755
--- a/source/xap/pan/pan.SlackBuild
+++ b/source/xap/pan/pan.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pan
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -75,13 +75,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Upstream patches to fix when using gmime-3:
-zcat $CWD/patches/0000-b9a4154942c932a493736d2292bbae16384e35df.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/0001-e5be4d4a1d9d08796c1b5a5c763379383b8c119a.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/0002-50f6c43a698dcc0ba6b490c086a73eeedbdd8a80.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/0003-ddcd5761075a6fb3ef7b768f004fa1e6663cb65e.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/patches/0004-476b5a62fcda711ce2d7412a310b8182cca6940e.patch.gz | patch -p1 --verbose || exit 1
-
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/xap/pan/patches/0000-b9a4154942c932a493736d2292bbae16384e35df.patch b/source/xap/pan/patches/0000-b9a4154942c932a493736d2292bbae16384e35df.patch
deleted file mode 100644
index 1732e91f..00000000
--- a/source/xap/pan/patches/0000-b9a4154942c932a493736d2292bbae16384e35df.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From b9a4154942c932a493736d2292bbae16384e35df Mon Sep 17 00:00:00 2001
-From: Federico Cuello <fedux@fedux.com.ar>
-Date: Sat, 17 Nov 2018 17:44:49 +0100
-Subject: [PATCH] Fix ypart begin for bpf ranges
-
-It was creating yparts with begin=0 and end==previous_part_begin with
-multipart files. It should start from 1 and next part from previous end
-+ 1.
----
- uulib/uuencode.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/uulib/uuencode.c b/uulib/uuencode.c
-index b9a390e..2768771 100644
---- a/uulib/uuencode.c
-+++ b/uulib/uuencode.c
-@@ -1740,7 +1740,7 @@ UUEncodePartial_byFSize (FILE *outfile, FILE *infile,
- }
-
- fprintf (outfile, "=ypart begin=%ld end=%ld%s",
-- (partno-1)*bpf,
-+ (partno-1)*bpf+1,
- (partno*bpf) < progress.totsize ?
- (partno*bpf) : progress.totsize,
- eolstring);
diff --git a/source/xap/pan/patches/0001-e5be4d4a1d9d08796c1b5a5c763379383b8c119a.patch b/source/xap/pan/patches/0001-e5be4d4a1d9d08796c1b5a5c763379383b8c119a.patch
deleted file mode 100644
index 4cd6de19..00000000
--- a/source/xap/pan/patches/0001-e5be4d4a1d9d08796c1b5a5c763379383b8c119a.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-From e5be4d4a1d9d08796c1b5a5c763379383b8c119a Mon Sep 17 00:00:00 2001
-From: Detlef Graef <detlef.graef@yahoo.de>
-Date: Fri, 19 Apr 2019 15:12:27 +0200
-Subject: [PATCH] Fix to build Pan with options --with-gmime30 and
- --with-gmime-crypto
-
----
- pan/usenet-utils/gpg.cc | 76 ++++++++++++++++++++++++++--------
- pan/usenet-utils/mime-utils.cc | 35 ++++++++++++++++
- 2 files changed, 94 insertions(+), 17 deletions(-)
-
-diff --git a/pan/usenet-utils/gpg.cc b/pan/usenet-utils/gpg.cc
-index f24e723..4df4525 100644
---- a/pan/usenet-utils/gpg.cc
-+++ b/pan/usenet-utils/gpg.cc
-@@ -70,6 +70,45 @@ namespace pan
- signer.key_id = sig->cert->keyid ? sig->cert->keyid : "(null)";
- signer.fpr = sig->cert->fingerprint ? sig->cert->fingerprint : "(null)";
-
-+#ifdef HAVE_GMIME_30
-+ switch (sig->cert->trust) {
-+ case GMIME_TRUST_UNKNOWN:
-+ signer.trust = "None";
-+ break;
-+ case GMIME_TRUST_NEVER:
-+ signer.trust = "Never";
-+ break;
-+ case GMIME_TRUST_UNDEFINED:
-+ signer.trust = "Undefined";
-+ break;
-+ case GMIME_TRUST_MARGINAL:
-+ signer.trust = "Marginal";
-+ break;
-+ case GMIME_TRUST_FULL:
-+ signer.trust = "Fully";
-+ break;
-+ case GMIME_TRUST_ULTIMATE:
-+ signer.trust = "Ultimate";
-+ break;
-+ }
-+
-+ switch (sig->status) {
-+ case GMIME_SIGNATURE_STATUS_GREEN:
-+ signer.status = "GOOD";
-+ break;
-+ case GMIME_SIGNATURE_STATUS_RED:
-+ signer.status = "BAD";
-+ break;
-+ case GMIME_SIGNATURE_STATUS_SYS_ERROR:
-+ signer.status = "ERROR";
-+ break;
-+ }
-+
-+ signer.created = sig->created;
-+ signer.expires = sig->expires;
-+ if (sig->expires == (time_t) 0)
-+ signer.never_expires = true;
-+#else
- switch (sig->cert->trust) {
- case GMIME_CERTIFICATE_TRUST_NONE:
- signer.trust = "None";
-@@ -102,25 +141,28 @@ namespace pan
- signer.status = "ERROR";
- break;
- }
-+#endif
-
- signer.created = sig->created;
- signer.expires = sig->expires;
- if (sig->expires == (time_t) 0)
- signer.never_expires = true;
-
-- if (sig->errors) {
--
-- if (sig->errors & GMIME_SIGNATURE_ERROR_EXPSIG)
-- signer.error = "Expired";
-- if (sig->errors & GMIME_SIGNATURE_ERROR_NO_PUBKEY)
-- signer.error = "No Pub Key";
-- if (sig->errors & GMIME_SIGNATURE_ERROR_EXPKEYSIG)
-- signer.error = "Key Expired";
-- if (sig->errors & GMIME_SIGNATURE_ERROR_REVKEYSIG)
-- signer.error = "Key Revoked";
-- } else {
-- signer.error = "No errors for this signer";
-- }
-+// https://developer.gnome.org/gmime/stable/gmime-changes-3-0.html
-+// GMimeSignatureStatus and GMimeSignatureErrors have been merged into a single bitfield (GMimeSignatureStatus) ...
-+// if (sig->errors) {
-+
-+// if (sig->errors & GMIME_SIGNATURE_ERROR_EXPSIG)
-+// signer.error = "Expired";
-+// if (sig->errors & GMIME_SIGNATURE_ERROR_NO_PUBKEY)
-+// signer.error = "No Pub Key";
-+// if (sig->errors & GMIME_SIGNATURE_ERROR_EXPKEYSIG)
-+// signer.error = "Key Expired";
-+// if (sig->errors & GMIME_SIGNATURE_ERROR_REVKEYSIG)
-+// signer.error = "Key Revoked";
-+// } else {
-+// signer.error = "No errors for this signer";
-+// }
-
- info.signers.push_back(signer);
- }
-@@ -128,11 +170,11 @@ namespace pan
-
- void init_gpg()
- {
-- gpg_ctx = g_mime_gpg_context_new (request_passwd, "gpg2");
-+// gpg_ctx = g_mime_gpg_context_new (request_passwd, "gpg2");
- if (!gpg_ctx) gpg_inited = false; else gpg_inited = true;
-- g_mime_gpg_context_set_auto_key_retrieve(GMIME_GPG_CONTEXT(gpg_ctx),true);
-- g_mime_gpg_context_set_always_trust(GMIME_GPG_CONTEXT(gpg_ctx),false);
-- g_mime_gpg_context_set_use_agent(GMIME_GPG_CONTEXT(gpg_ctx), false);
-+// g_mime_gpg_context_set_auto_key_retrieve(GMIME_GPG_CONTEXT(gpg_ctx),true);
-+// g_mime_gpg_context_set_always_trust(GMIME_GPG_CONTEXT(gpg_ctx),false);
-+// g_mime_gpg_context_set_use_agent(GMIME_GPG_CONTEXT(gpg_ctx), false);
- }
-
-
-diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
-index 135f469..881df7b 100644
---- a/pan/usenet-utils/mime-utils.cc
-+++ b/pan/usenet-utils/mime-utils.cc
-@@ -1634,12 +1634,20 @@ namespace pan
- GMimeSignatureStatus
- get_sig_status (GMimeSignatureList *signatures)
- {
-+#ifdef HAVE_GMIME_30
-+ GMimeSignatureStatus status = GMIME_SIGNATURE_STATUS_VALID;
-+#else
- GMimeSignatureStatus status = GMIME_SIGNATURE_STATUS_GOOD;
-+#endif
- GMimeSignature *sig;
- int i;
-
- if (!signatures || signatures->array->len == 0)
-+#ifdef HAVE_GMIME_30
-+ return GMIME_SIGNATURE_STATUS_SYS_ERROR;
-+#else
- return GMIME_SIGNATURE_STATUS_ERROR;
-+#endif
-
- for (i = 0; i < g_mime_signature_list_length (signatures); i++) {
- sig = g_mime_signature_list_get_signature (signatures, i);
-@@ -1673,18 +1681,30 @@ namespace pan
-
- if (info.type == GPG_VERIFY)
- {
-+#ifdef HAVE_GMIME_30
-+ GMimeSignatureList * sigs = g_mime_multipart_signed_verify (mps, GMIME_VERIFY_NONE, &info.err);
-+#else
- GMimeSignatureList * sigs = g_mime_multipart_signed_verify (mps, gpg_ctx, &info.err);
-+#endif
- if (info.err || !sigs) return false;
- if (sigs) info.no_sigs = false;
- fill_signer_info(info.signers, sigs);
-+#ifdef HAVE_GMIME_30
-+ bool status = get_sig_status(sigs) == GMIME_SIGNATURE_STATUS_VALID;
-+#else
- bool status = get_sig_status(sigs) == GMIME_SIGNATURE_STATUS_GOOD;
-+#endif
- g_object_unref(sigs);
- return status;
- }
-
- if (info.type == GPG_DECODE)
- {
-+#ifdef HAVE_GMIME_30
-+ info.decrypted = g_mime_multipart_encrypted_decrypt (mpe, GMIME_DECRYPT_NONE, NULL, &info.result, &info.err);
-+#else
- info.decrypted = g_mime_multipart_encrypted_decrypt (mpe, gpg_ctx, &info.result, &info.err);
-+#endif
- if (!info.decrypted)
- if (info.err) return false;
-
-@@ -1693,7 +1713,11 @@ namespace pan
- {
- info.no_sigs = false;
- fill_signer_info(info.signers, sigs);
-+#ifdef HAVE_GMIME_30
-+ bool status = get_sig_status(info.result->signatures) == GMIME_SIGNATURE_STATUS_VALID;
-+#else
- bool status = get_sig_status(info.result->signatures) == GMIME_SIGNATURE_STATUS_GOOD;
-+#endif
- g_object_unref(sigs);
- return status;
- }
-@@ -1722,7 +1746,13 @@ namespace pan
- mps = g_mime_multipart_signed_new ();
-
- /* sign the part */
-+#ifdef HAVE_GMIME_30
-+ GMimeObject *gmo;
-+ gmo = g_mime_message_get_mime_part (body);
-+ if (g_mime_multipart_signed_sign (gpg_ctx, gmo, uid.c_str(), &err) <0)
-+#else
- if (g_mime_multipart_signed_sign (mps, GMIME_OBJECT (part), gpg_ctx, uid.c_str(), GMIME_DIGEST_ALGO_SHA1, &err) <0)
-+#endif
- {
- g_object_unref(mps);
- g_object_unref(G_OBJECT(part));
-@@ -1752,8 +1782,13 @@ namespace pan
-
- GMimeMultipartEncrypted * mpe = g_mime_multipart_encrypted_new();
-
-+#ifdef HAVE_GMIME_30
-+ if (g_mime_multipart_encrypted_encrypt(gpg_ctx, GMIME_OBJECT (part), sign, uid.c_str(),
-+ GMIME_ENCRYPT_NONE, rcp, &err) < 0)
-+#else
- if (g_mime_multipart_encrypted_encrypt(mpe, GMIME_OBJECT (part), gpg_ctx, sign,
- uid.c_str(), GMIME_DIGEST_ALGO_SHA1, rcp, &err) < 0)
-+#endif
- {
- g_object_unref(mpe);
- g_object_unref(G_OBJECT(part));
diff --git a/source/xap/pan/patches/0002-50f6c43a698dcc0ba6b490c086a73eeedbdd8a80.patch b/source/xap/pan/patches/0002-50f6c43a698dcc0ba6b490c086a73eeedbdd8a80.patch
deleted file mode 100644
index 02ed1b6e..00000000
--- a/source/xap/pan/patches/0002-50f6c43a698dcc0ba6b490c086a73eeedbdd8a80.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 50f6c43a698dcc0ba6b490c086a73eeedbdd8a80 Mon Sep 17 00:00:00 2001
-From: Detlef Graef <detlef.graef@yahoo.de>
-Date: Fri, 19 Apr 2019 18:43:21 +0200
-Subject: [PATCH] Attempt to fix issue #77; segfault when build with gmime-3
-
----
- pan/general/utf8-utils.cc | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/pan/general/utf8-utils.cc b/pan/general/utf8-utils.cc
-index be79a13..58565cf 100644
---- a/pan/general/utf8-utils.cc
-+++ b/pan/general/utf8-utils.cc
-@@ -135,13 +135,16 @@ pan :: header_to_utf8 (const StringView & header,
- const char * fallback_charset1,
- const char * fallback_charset2)
- {
-+
-+ GMimeParserOptions *gmpo = g_mime_parser_options_new();
- std::string s = content_to_utf8 (header, fallback_charset1, fallback_charset2);
- if (header.strstr ("=?")) {
-- char * decoded (g_mime_utils_header_decode_text (NULL, s.c_str()));
-+ char * decoded (g_mime_utils_header_decode_text (gmpo, s.c_str()));
- s = clean_utf8 (decoded);
- g_free (decoded);
- }
- return s;
-+ g_mime_parser_options_free (gmpo);
- }
-
- #else
diff --git a/source/xap/pan/patches/0003-ddcd5761075a6fb3ef7b768f004fa1e6663cb65e.patch b/source/xap/pan/patches/0003-ddcd5761075a6fb3ef7b768f004fa1e6663cb65e.patch
deleted file mode 100644
index 5e3449d3..00000000
--- a/source/xap/pan/patches/0003-ddcd5761075a6fb3ef7b768f004fa1e6663cb65e.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From ddcd5761075a6fb3ef7b768f004fa1e6663cb65e Mon Sep 17 00:00:00 2001
-From: Detlef Graef <detlef.graef@yahoo.de>
-Date: Fri, 26 Apr 2019 20:50:09 +0200
-Subject: [PATCH] Revert "Attempt to fix issue #77; segfault when build with
- gmime-3"
-
-This reverts commit 50f6c43a698dcc0ba6b490c086a73eeedbdd8a80.
----
- pan/general/utf8-utils.cc | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/pan/general/utf8-utils.cc b/pan/general/utf8-utils.cc
-index 58565cf..be79a13 100644
---- a/pan/general/utf8-utils.cc
-+++ b/pan/general/utf8-utils.cc
-@@ -135,16 +135,13 @@ pan :: header_to_utf8 (const StringView & header,
- const char * fallback_charset1,
- const char * fallback_charset2)
- {
--
-- GMimeParserOptions *gmpo = g_mime_parser_options_new();
- std::string s = content_to_utf8 (header, fallback_charset1, fallback_charset2);
- if (header.strstr ("=?")) {
-- char * decoded (g_mime_utils_header_decode_text (gmpo, s.c_str()));
-+ char * decoded (g_mime_utils_header_decode_text (NULL, s.c_str()));
- s = clean_utf8 (decoded);
- g_free (decoded);
- }
- return s;
-- g_mime_parser_options_free (gmpo);
- }
-
- #else
diff --git a/source/xap/pan/patches/0004-476b5a62fcda711ce2d7412a310b8182cca6940e.patch b/source/xap/pan/patches/0004-476b5a62fcda711ce2d7412a310b8182cca6940e.patch
deleted file mode 100644
index cc4788b4..00000000
--- a/source/xap/pan/patches/0004-476b5a62fcda711ce2d7412a310b8182cca6940e.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 476b5a62fcda711ce2d7412a310b8182cca6940e Mon Sep 17 00:00:00 2001
-From: Detlef Graef <detlef.graef@yahoo.de>
-Date: Fri, 26 Apr 2019 20:59:54 +0200
-Subject: [PATCH] Fix for issue #77. Segfault when build with gmime-3
-
----
- pan/gui/pan.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
-index 8d28fdb..fb3a696 100644
---- a/pan/gui/pan.cc
-+++ b/pan/gui/pan.cc
-@@ -906,6 +906,7 @@ main (int argc, char *argv[])
- g_thread_init (0);
- #endif
- #ifdef HAVE_GMIME_30
-+ g_mime_init ();
- #else
- g_mime_init (GMIME_ENABLE_RFC2047_WORKAROUNDS);
- #endif