summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.rss33
-rw-r--r--ChangeLog.txt21
-rw-r--r--FILELIST.TXT104
-rwxr-xr-xrecompress.sh1
-rw-r--r--source/a/etc/doinst.sh114
-rwxr-xr-xsource/a/etc/etc.SlackBuild16
-rw-r--r--source/a/etc/group.new54
-rw-r--r--source/a/etc/passwd.new33
-rw-r--r--source/a/etc/shadow.new33
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.M10
-rw-r--r--source/a/sysvinit-scripts/scripts/rc.S6
-rwxr-xr-xsource/a/sysvinit-scripts/sysvinit-scripts.SlackBuild2
-rwxr-xr-xsource/ap/at/at.SlackBuild2
-rw-r--r--source/ap/at/rc.atd2
-rwxr-xr-xsource/n/libgcrypt/libgcrypt.SlackBuild2
15 files changed, 370 insertions, 63 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss
index 21718c50b..be08b5e24 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,10 +11,39 @@
<description>Tracking Slackware development in git.</description>
<language>en-us</language>
<id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id>
- <pubDate>Wed, 13 Jun 2018 05:43:00 GMT</pubDate>
- <lastBuildDate>Wed, 13 Jun 2018 07:44:16 GMT</lastBuildDate>
+ <pubDate>Wed, 13 Jun 2018 21:55:19 GMT</pubDate>
+ <lastBuildDate>Thu, 14 Jun 2018 06:58:05 GMT</lastBuildDate>
<generator>maintain_current_git.sh v 1.8</generator>
<item>
+ <title>Wed, 13 Jun 2018 21:55:19 GMT</title>
+ <pubDate>Wed, 13 Jun 2018 21:55:19 GMT</pubDate>
+ <link>https://git.slackware.nl/current/tag/?h=20180613215519</link>
+ <guid isPermaLink="false">20180613215519</guid>
+ <description>
+ <![CDATA[<pre>
+a/etc-15.0-x86_64-5.txz: Rebuilt.
+ Don't hardcode passwd/shadow/group additions in doinst.sh - get them from
+ the .new files.
+a/sysvinit-scripts-2.1-noarch-11.txz: Rebuilt.
+ rc.S: don't start rc.haveged in this script - move it to rc.M.
+ rc.M: start rc.haveged after seeding /dev/urandom in rc.S, and after
+ starting syslogd, klogd, and udev in rc.M.
+ rc.M: start rc.rndg (we don't ship it or rng-tools) after udev.
+ H. Peter Anvin says that it's fine to run both haveged and rndg,
+ and I trust his opinion on that.
+ Thanks to GazL.
+ap/at-3.1.20-x86_64-4.txz: Rebuilt.
+ Fixed wrong variable in rc.atd. Thanks to upnort.
+n/libgcrypt-1.8.3-x86_64-1.txz: Upgraded.
+ Use blinding for ECDSA signing to mitigate a novel side-channel attack.
+ For more information, see:
+ https://www.nccgroup.trust/us/our-research/technical-advisory-return-of-the-hidden-number-problem/
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0495
+ (* Security fix *)
+ </pre>]]>
+ </description>
+ </item>
+ <item>
<title>Wed, 13 Jun 2018 05:43:00 GMT</title>
<pubDate>Wed, 13 Jun 2018 05:43:00 GMT</pubDate>
<link>https://git.slackware.nl/current/tag/?h=20180613054300</link>
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4c8cb487b..52a7d8090 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,24 @@
+Wed Jun 13 21:55:19 UTC 2018
+a/etc-15.0-x86_64-5.txz: Rebuilt.
+ Don't hardcode passwd/shadow/group additions in doinst.sh - get them from
+ the .new files.
+a/sysvinit-scripts-2.1-noarch-11.txz: Rebuilt.
+ rc.S: don't start rc.haveged in this script - move it to rc.M.
+ rc.M: start rc.haveged after seeding /dev/urandom in rc.S, and after
+ starting syslogd, klogd, and udev in rc.M.
+ rc.M: start rc.rndg (we don't ship it or rng-tools) after udev.
+ H. Peter Anvin says that it's fine to run both haveged and rndg,
+ and I trust his opinion on that.
+ Thanks to GazL.
+ap/at-3.1.20-x86_64-4.txz: Rebuilt.
+ Fixed wrong variable in rc.atd. Thanks to upnort.
+n/libgcrypt-1.8.3-x86_64-1.txz: Upgraded.
+ Use blinding for ECDSA signing to mitigate a novel side-channel attack.
+ For more information, see:
+ https://www.nccgroup.trust/us/our-research/technical-advisory-return-of-the-hidden-number-problem/
+ https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-0495
+ (* Security fix *)
++--------------------------+
Wed Jun 13 05:43:00 UTC 2018
a/dcron-4.5-x86_64-7.txz: Rebuilt.
Added init script and defaults file.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 1b99de455..3aaf89115 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Wed Jun 13 05:57:33 UTC 2018
+Wed Jun 13 22:09:45 UTC 2018
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
-drwxr-xr-x 12 root root 4096 2018-06-13 05:43 .
+drwxr-xr-x 12 root root 4096 2018-06-13 21:55 .
-rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2
-rw-r--r-- 1 root root 13424 2018-06-13 05:25 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 894786 2018-06-12 05:32 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2018-06-12 05:32 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 895587 2018-06-13 05:58 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2018-06-13 05:58 ./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 413995 2018-06-13 05:43 ./ChangeLog.txt
+-rw-r--r-- 1 root root 415021 2018-06-13 21:55 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2018-06-12 04:57 ./EFI/BOOT
-rw-r--r-- 1 root root 1253376 2018-02-24 20:49 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2018-06-12 04:57 ./EFI/BOOT
-rwxr-xr-x 1 root root 2494 2018-02-24 20:49 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r-- 1 root root 1177886 2018-06-12 05:32 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1179034 2018-06-13 05:57 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 725989 2018-06-13 05:56 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 725989 2018-06-13 22:08 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT
-rw-r--r-- 1 root root 3634 2018-06-12 04:26 ./README.initrd
-rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT
@@ -748,13 +748,13 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches
-rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT
-drwxr-xr-x 18 root root 4096 2018-06-13 05:56 ./slackware64
--rw-r--r-- 1 root root 288405 2018-06-13 05:56 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2018-06-13 05:56 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 359320 2018-06-13 05:53 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 3613751 2018-06-13 05:54 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2018-06-13 22:08 ./slackware64
+-rw-r--r-- 1 root root 288405 2018-06-13 22:08 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2018-06-13 22:08 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 359320 2018-06-13 22:05 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 3611113 2018-06-13 22:06 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
-drwxr-xr-x 2 root root 20480 2018-06-13 05:53 ./slackware64/a
+drwxr-xr-x 2 root root 20480 2018-06-13 22:05 ./slackware64/a
-rw-r--r-- 1 root root 327 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txt
-rw-r--r-- 1 root root 10972 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-14 20:33 ./slackware64/a/aaa_base-14.2-x86_64-4.txz.asc
@@ -830,9 +830,9 @@ drwxr-xr-x 2 root root 20480 2018-06-13 05:53 ./slackware64/a
-rw-r--r-- 1 root root 387 2018-04-13 13:03 ./slackware64/a/elvis-2.2_0-x86_64-4.txt
-rw-r--r-- 1 root root 711352 2018-04-13 13:03 ./slackware64/a/elvis-2.2_0-x86_64-4.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:03 ./slackware64/a/elvis-2.2_0-x86_64-4.txz.asc
--rw-r--r-- 1 root root 202 2018-04-13 13:02 ./slackware64/a/etc-15.0-x86_64-4.txt
--rw-r--r-- 1 root root 27776 2018-04-13 13:02 ./slackware64/a/etc-15.0-x86_64-4.txz
--rw-r--r-- 1 root root 163 2018-04-13 13:02 ./slackware64/a/etc-15.0-x86_64-4.txz.asc
+-rw-r--r-- 1 root root 202 2018-06-13 20:14 ./slackware64/a/etc-15.0-x86_64-5.txt
+-rw-r--r-- 1 root root 27400 2018-06-13 20:14 ./slackware64/a/etc-15.0-x86_64-5.txz
+-rw-r--r-- 1 root root 163 2018-06-13 20:14 ./slackware64/a/etc-15.0-x86_64-5.txz.asc
-rw-r--r-- 1 root root 510 2018-05-01 15:41 ./slackware64/a/eudev-3.2.5-x86_64-3.txt
-rw-r--r-- 1 root root 975148 2018-05-01 15:41 ./slackware64/a/eudev-3.2.5-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-05-01 15:41 ./slackware64/a/eudev-3.2.5-x86_64-3.txz.asc
@@ -1050,9 +1050,9 @@ drwxr-xr-x 2 root root 20480 2018-06-13 05:53 ./slackware64/a
-rw-r--r-- 1 root root 694 2018-04-13 13:12 ./slackware64/a/sysvinit-functions-8.53-x86_64-3.txt
-rw-r--r-- 1 root root 36252 2018-04-13 13:12 ./slackware64/a/sysvinit-functions-8.53-x86_64-3.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:12 ./slackware64/a/sysvinit-functions-8.53-x86_64-3.txz.asc
--rw-r--r-- 1 root root 378 2018-06-13 04:40 ./slackware64/a/sysvinit-scripts-2.1-noarch-10.txt
--rw-r--r-- 1 root root 21780 2018-06-13 04:40 ./slackware64/a/sysvinit-scripts-2.1-noarch-10.txz
--rw-r--r-- 1 root root 163 2018-06-13 04:40 ./slackware64/a/sysvinit-scripts-2.1-noarch-10.txz.asc
+-rw-r--r-- 1 root root 378 2018-06-13 21:42 ./slackware64/a/sysvinit-scripts-2.1-noarch-11.txt
+-rw-r--r-- 1 root root 21780 2018-06-13 21:42 ./slackware64/a/sysvinit-scripts-2.1-noarch-11.txz
+-rw-r--r-- 1 root root 163 2018-06-13 21:42 ./slackware64/a/sysvinit-scripts-2.1-noarch-11.txz.asc
-rw-r--r-- 1 root root 1370 2018-06-12 04:26 ./slackware64/a/tagfile
-rw-r--r-- 1 root root 379 2018-04-13 13:15 ./slackware64/a/tar-1.30-x86_64-2.txt
-rw-r--r-- 1 root root 793456 2018-04-13 13:15 ./slackware64/a/tar-1.30-x86_64-2.txz
@@ -1102,7 +1102,7 @@ drwxr-xr-x 2 root root 20480 2018-06-13 05:53 ./slackware64/a
-rw-r--r-- 1 root root 540 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txt
-rw-r--r-- 1 root root 56156 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz.asc
-drwxr-xr-x 2 root root 20480 2018-06-13 05:53 ./slackware64/ap
+drwxr-xr-x 2 root root 20480 2018-06-13 22:05 ./slackware64/ap
-rw-r--r-- 1 root root 291 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txt
-rw-r--r-- 1 root root 694880 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz.asc
@@ -1115,9 +1115,9 @@ drwxr-xr-x 2 root root 20480 2018-06-13 05:53 ./slackware64/ap
-rw-r--r-- 1 root root 274 2018-04-13 13:16 ./slackware64/ap/amp-0.7.6-x86_64-2.txt
-rw-r--r-- 1 root root 47748 2018-04-13 13:16 ./slackware64/ap/amp-0.7.6-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:16 ./slackware64/ap/amp-0.7.6-x86_64-2.txz.asc
--rw-r--r-- 1 root root 338 2018-06-13 04:31 ./slackware64/ap/at-3.1.20-x86_64-3.txt
--rw-r--r-- 1 root root 41112 2018-06-13 04:31 ./slackware64/ap/at-3.1.20-x86_64-3.txz
--rw-r--r-- 1 root root 163 2018-06-13 04:31 ./slackware64/ap/at-3.1.20-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 338 2018-06-13 20:20 ./slackware64/ap/at-3.1.20-x86_64-4.txt
+-rw-r--r-- 1 root root 41184 2018-06-13 20:20 ./slackware64/ap/at-3.1.20-x86_64-4.txz
+-rw-r--r-- 1 root root 163 2018-06-13 20:20 ./slackware64/ap/at-3.1.20-x86_64-4.txz.asc
-rw-r--r-- 1 root root 383 2018-04-13 13:16 ./slackware64/ap/bc-1.07.1-x86_64-2.txt
-rw-r--r-- 1 root root 116064 2018-04-13 13:16 ./slackware64/ap/bc-1.07.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 13:16 ./slackware64/ap/bc-1.07.1-x86_64-2.txz.asc
@@ -3355,7 +3355,7 @@ drwxr-xr-x 2 root root 69632 2018-06-13 05:53 ./slackware64/l
-rw-r--r-- 1 root root 388 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txt
-rw-r--r-- 1 root root 103500 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:26 ./slackware64/l/zlib-1.2.11-x86_64-2.txz.asc
-drwxr-xr-x 2 root root 32768 2018-06-12 05:27 ./slackware64/n
+drwxr-xr-x 2 root root 32768 2018-06-13 22:05 ./slackware64/n
-rw-r--r-- 1 root root 368 2018-06-05 04:17 ./slackware64/n/ModemManager-1.8.0-x86_64-1.txt
-rw-r--r-- 1 root root 1510328 2018-06-05 04:17 ./slackware64/n/ModemManager-1.8.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-06-05 04:17 ./slackware64/n/ModemManager-1.8.0-x86_64-1.txz.asc
@@ -3502,9 +3502,9 @@ drwxr-xr-x 2 root root 32768 2018-06-12 05:27 ./slackware64/n
-rw-r--r-- 1 root root 252 2018-04-13 15:38 ./slackware64/n/libassuan-2.5.1-x86_64-2.txt
-rw-r--r-- 1 root root 118760 2018-04-13 15:38 ./slackware64/n/libassuan-2.5.1-x86_64-2.txz
-rw-r--r-- 1 root root 163 2018-04-13 15:38 ./slackware64/n/libassuan-2.5.1-x86_64-2.txz.asc
--rw-r--r-- 1 root root 245 2018-04-13 15:39 ./slackware64/n/libgcrypt-1.8.2-x86_64-2.txt
--rw-r--r-- 1 root root 535092 2018-04-13 15:39 ./slackware64/n/libgcrypt-1.8.2-x86_64-2.txz
--rw-r--r-- 1 root root 163 2018-04-13 15:39 ./slackware64/n/libgcrypt-1.8.2-x86_64-2.txz.asc
+-rw-r--r-- 1 root root 245 2018-06-13 20:29 ./slackware64/n/libgcrypt-1.8.3-x86_64-1.txt
+-rw-r--r-- 1 root root 538244 2018-06-13 20:29 ./slackware64/n/libgcrypt-1.8.3-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2018-06-13 20:29 ./slackware64/n/libgcrypt-1.8.3-x86_64-1.txz.asc
-rw-r--r-- 1 root root 392 2018-05-09 04:14 ./slackware64/n/libgpg-error-1.31-x86_64-1.txt
-rw-r--r-- 1 root root 217144 2018-05-09 04:14 ./slackware64/n/libgpg-error-1.31-x86_64-1.txz
-rw-r--r-- 1 root root 163 2018-05-09 04:14 ./slackware64/n/libgpg-error-1.31-x86_64-1.txz.asc
@@ -4933,13 +4933,13 @@ drwxr-xr-x 2 root root 4096 2018-04-18 08:35 ./slackware64/y
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag
-rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez
-rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile
-drwxr-xr-x 19 root root 4096 2018-06-13 05:57 ./source
--rw-r--r-- 1 root root 452321 2018-06-13 05:57 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 163 2018-06-13 05:57 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 640210 2018-06-13 05:57 ./source/FILE_LIST
--rw-r--r-- 1 root root 14770881 2018-06-13 05:57 ./source/MANIFEST.bz2
+drwxr-xr-x 19 root root 4096 2018-06-13 22:09 ./source
+-rw-r--r-- 1 root root 452534 2018-06-13 22:09 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 163 2018-06-13 22:09 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 640495 2018-06-13 22:09 ./source/FILE_LIST
+-rw-r--r-- 1 root root 14760208 2018-06-13 22:09 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT
-drwxr-xr-x 110 root root 4096 2018-06-13 04:38 ./source/a
+drwxr-xr-x 110 root root 4096 2018-06-13 20:14 ./source/a
-rw-r--r-- 1 root root 567 2018-03-13 18:43 ./source/a/FTBFSlog
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/aaa_base
-rw-r--r-- 1 root root 11180 2016-05-20 20:17 ./source/a/aaa_base/_aaa_base.tar.gz
@@ -5158,10 +5158,14 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/elvis
-rw-r--r-- 1 root root 1584 2003-10-21 02:32 ./source/a/elvis/elvis.clr.orig
-rw-r--r-- 1 root root 673 2010-01-27 18:31 ./source/a/elvis/elvis.ref.c.getline.diff.gz
-rw-r--r-- 1 root root 840 2018-02-27 06:13 ./source/a/elvis/slack-desc
-drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/a/etc
--rw-r--r-- 1 root root 31732 2018-03-27 22:38 ./source/a/etc/_etc.tar.gz
--rwxr-xr-x 1 root root 2329 2018-04-23 17:20 ./source/a/etc/etc.SlackBuild
+drwxr-xr-x 2 root root 4096 2018-06-13 20:12 ./source/a/etc
+-rw-r--r-- 1 root root 28879 2018-06-13 18:49 ./source/a/etc/_etc.tar.gz
+-rw-r--r-- 1 root root 1090 2018-06-13 20:12 ./source/a/etc/doinst.sh.gz
+-rwxr-xr-x 1 root root 3109 2018-06-13 20:06 ./source/a/etc/etc.SlackBuild
+-rw-r--r-- 1 root root 763 2018-03-27 21:09 ./source/a/etc/group.new
-rw-r--r-- 1 root root 536 2002-10-11 20:17 ./source/a/etc/nsswitch.conf.gz
+-rw-r--r-- 1 root root 1476 2018-03-27 21:08 ./source/a/etc/passwd.new
+-rw-r--r-- 1 root root 665 2018-06-13 18:54 ./source/a/etc/shadow.new
-rw-r--r-- 1 root root 653 2018-02-27 06:13 ./source/a/etc/slack-desc
drwxr-xr-x 3 root root 4096 2018-05-01 15:37 ./source/a/eudev
-rw-r--r-- 1 root root 526 2015-10-24 11:05 ./source/a/eudev/60-cdrom_id.rules.diff.gz
@@ -5680,8 +5684,8 @@ drwxr-xr-x 2 root root 4096 2017-11-03 00:51 ./source/a/sysvinit-scripts/s
-rw-r--r-- 1 root root 1642 2017-05-23 23:57 ./source/a/sysvinit-scripts/scripts/rc.4
-rw-r--r-- 1 root root 8849 2018-06-12 21:29 ./source/a/sysvinit-scripts/scripts/rc.6
-rw-r--r-- 1 root root 3133 2018-06-12 21:28 ./source/a/sysvinit-scripts/scripts/rc.K
--rw-r--r-- 1 root root 11885 2018-06-13 04:40 ./source/a/sysvinit-scripts/scripts/rc.M
--rw-r--r-- 1 root root 16269 2018-06-12 21:26 ./source/a/sysvinit-scripts/scripts/rc.S
+-rw-r--r-- 1 root root 12088 2018-06-13 21:42 ./source/a/sysvinit-scripts/scripts/rc.M
+-rw-r--r-- 1 root root 16162 2018-06-13 21:42 ./source/a/sysvinit-scripts/scripts/rc.S
-rw-r--r-- 1 root root 2702 2017-07-09 18:47 ./source/a/sysvinit-scripts/scripts/rc.cpufreq
-rw-r--r-- 1 root root 272 2006-08-12 02:07 ./source/a/sysvinit-scripts/scripts/rc.local
-rw-r--r-- 1 root root 168 2011-04-23 19:40 ./source/a/sysvinit-scripts/scripts/rc.loop
@@ -5691,9 +5695,9 @@ drwxr-xr-x 2 root root 4096 2017-11-03 00:51 ./source/a/sysvinit-scripts/s
-rw-r--r-- 1 root root 22473 2012-09-07 17:51 ./source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh
-rw-r--r-- 1 root root 645 2012-09-07 17:52 ./source/a/sysvinit-scripts/scripts/rescan-scsi-bus.sh.diff
-rw-r--r-- 1 root root 842 2018-02-27 06:13 ./source/a/sysvinit-scripts/slack-desc
--rwxr-xr-x 1 root root 2558 2018-06-12 21:27 ./source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
--rw-r--r-- 1 root root 23 2015-08-06 22:54 ./source/a/sysvinit/CHANGES
--rw-r--r-- 1 root root 668 2015-08-06 22:54 ./source/a/sysvinit/doinst.sh.gz
+-rwxr-xr-x 1 root root 2558 2018-06-13 21:23 ./source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+-rw-r--r-- 1 root root 23 2015-08-06 22:54 ./source/a/sysvinit/CHANGES
+-rw-r--r-- 1 root root 668 2015-08-06 22:54 ./source/a/sysvinit/doinst.sh.gz
-rw-r--r-- 1 root root 967 2018-02-27 06:13 ./source/a/sysvinit/slack-desc
-rw-r--r-- 1 root root 105184 2010-04-14 07:14 ./source/a/sysvinit/sysvinit-2.88dsf.tar.xz
-rwxr-xr-x 1 root root 3936 2018-04-23 17:20 ./source/a/sysvinit/sysvinit.SlackBuild
@@ -5843,10 +5847,10 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/amp
-rw-r--r-- 1 root root 725 2018-02-27 06:12 ./source/ap/amp/slack-desc
drwxr-xr-x 2 root root 4096 2018-06-13 04:31 ./source/ap/at
-rw-r--r-- 1 root root 101472 2016-06-30 09:14 ./source/ap/at/at-3.1.20.tar.lz
--rwxr-xr-x 1 root root 3926 2018-06-13 04:31 ./source/ap/at/at.SlackBuild
+-rwxr-xr-x 1 root root 3926 2018-06-13 20:20 ./source/ap/at/at.SlackBuild
-rw-r--r-- 1 root root 178 2018-06-13 02:53 ./source/ap/at/atd.default
-rw-r--r-- 1 root root 428 2018-06-13 02:51 ./source/ap/at/doinst.sh.gz
--rw-r--r-- 1 root root 627 2018-06-13 03:58 ./source/ap/at/rc.atd
+-rw-r--r-- 1 root root 625 2018-06-13 20:20 ./source/ap/at/rc.atd
-rw-r--r-- 1 root root 788 2018-06-13 00:11 ./source/ap/at/slack-desc
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/ap/bc
-rw-r--r-- 1 root root 304964 2017-04-10 02:14 ./source/ap/bc/bc-1.07.1.tar.xz
@@ -9941,10 +9945,10 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/libassuan
-rw-r--r-- 1 root root 310 2017-12-07 14:57 ./source/n/libassuan/libassuan-2.5.1.tar.bz2.sig
-rwxr-xr-x 1 root root 3837 2018-04-23 17:20 ./source/n/libassuan/libassuan.SlackBuild
-rw-r--r-- 1 root root 709 2018-02-27 06:13 ./source/n/libassuan/slack-desc
-drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/libgcrypt
--rw-r--r-- 1 root root 2966534 2017-12-13 13:55 ./source/n/libgcrypt/libgcrypt-1.8.2.tar.bz2
--rw-r--r-- 1 root root 310 2017-12-13 13:57 ./source/n/libgcrypt/libgcrypt-1.8.2.tar.bz2.sig
--rwxr-xr-x 1 root root 4293 2018-04-23 17:20 ./source/n/libgcrypt/libgcrypt.SlackBuild
+drwxr-xr-x 2 root root 4096 2018-06-13 20:28 ./source/n/libgcrypt
+-rw-r--r-- 1 root root 2989166 2018-06-13 07:42 ./source/n/libgcrypt/libgcrypt-1.8.3.tar.bz2
+-rw-r--r-- 1 root root 310 2018-06-13 07:56 ./source/n/libgcrypt/libgcrypt-1.8.3.tar.bz2.sig
+-rwxr-xr-x 1 root root 4293 2018-06-13 20:28 ./source/n/libgcrypt/libgcrypt.SlackBuild
-rw-r--r-- 1 root root 702 2018-02-27 06:13 ./source/n/libgcrypt/slack-desc
drwxr-xr-x 2 root root 4096 2018-05-09 04:14 ./source/n/libgpg-error
-rw-r--r-- 1 root root 901728 2018-05-02 18:32 ./source/n/libgpg-error/libgpg-error-1.31.tar.bz2
@@ -12455,9 +12459,9 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/orage
-rw-r--r-- 1 root root 625 2018-02-27 06:13 ./source/xfce/orage/slack-desc
drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/xfce/thunar-volman
-rw-r--r-- 1 root root 835 2015-03-22 04:39 ./source/xfce/thunar-volman/0001-Fix-return-with-no-value-in-function-returning-non-v.patch
--rw-r--r-- 1 root root 800 2018-02-27 06:13 ./source/xfce/thunar-volman/slack-desc
--rw-r--r-- 1 root root 387076 2015-02-28 18:01 ./source/xfce/thunar-volman/thunar-volman-0.8.1.tar.xz
--rwxr-xr-x 1 root root 3531 2018-04-23 17:20 ./source/xfce/thunar-volman/thunar-volman.SlackBuild
+-rw-r--r-- 1 root root 800 2018-02-27 06:13 ./source/xfce/thunar-volman/slack-desc
+-rw-r--r-- 1 root root 387076 2015-02-28 18:01 ./source/xfce/thunar-volman/thunar-volman-0.8.1.tar.xz
+-rwxr-xr-x 1 root root 3531 2018-04-23 17:20 ./source/xfce/thunar-volman/thunar-volman.SlackBuild
drwxr-xr-x 2 root root 4096 2018-05-22 03:57 ./source/xfce/tumbler
-rw-r--r-- 1 root root 964 2018-02-27 06:13 ./source/xfce/tumbler/slack-desc
-rw-r--r-- 1 root root 456661 2018-03-31 07:34 ./source/xfce/tumbler/tumbler-0.2.1.tar.lz
diff --git a/recompress.sh b/recompress.sh
index 28a8c4f4c..d0408af29 100755
--- a/recompress.sh
+++ b/recompress.sh
@@ -900,6 +900,7 @@ gzip ./source/a/unarj/Makefile
gzip ./source/a/lrzip/doinst.sh
gzip ./source/a/patch/0001-Refuse-to-apply-ed-scripts-by-default.patch
gzip ./source/a/pciutils/pciutils.dontcompress.diff
+gzip ./source/a/etc/doinst.sh
gzip ./source/a/etc/nsswitch.conf
gzip ./source/a/procps-ng/psmisc.3638cc55b4d08851faba46635d737b24d016665b.diff
gzip ./source/a/bzip2/bzip2.saneso.diff
diff --git a/source/a/etc/doinst.sh b/source/a/etc/doinst.sh
new file mode 100644
index 000000000..83376f57f
--- /dev/null
+++ b/source/a/etc/doinst.sh
@@ -0,0 +1,114 @@
+#!/bin/sh
+config() {
+ NEW="$1"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+# First, make sure any new entries in passwd/shadow/group are added:
+if [ -r etc/passwd -a -r etc/passwd.new ]; then
+ cat etc/passwd.new | while read line ; do
+ if ! grep -q "^$(echo $line | cut -f 1 -d :):" etc/passwd ; then
+ echo $line >> etc/passwd
+ fi
+ done
+fi
+if [ -r etc/shadow -a -r etc/shadow.new ]; then
+ cat etc/shadow.new | while read line ; do
+ if ! grep -q "^$(echo $line | cut -f 1 -d :):" etc/shadow ; then
+ echo $line >> etc/shadow
+ fi
+ done
+fi
+if [ -r etc/group -a -r etc/group.new ]; then
+ cat etc/group.new | while read line ; do
+ if ! grep -q "^$(echo $line | cut -f 1 -d :):" etc/group ; then
+ echo $line >> etc/group
+ fi
+ done
+fi
+
+config etc/mtab.new
+config etc/motd.new
+config etc/group.new
+config etc/csh.login.new
+config etc/ld.so.conf.new
+config etc/profile.new
+config etc/hosts.new
+config etc/inputrc.new
+config etc/shadow.new
+config etc/passwd.new
+config etc/printcap.new
+config etc/networks.new
+config etc/HOSTNAME.new
+config etc/gshadow.new
+config etc/issue.new
+config etc/securetty.new
+config etc/shells.new
+config etc/services.new
+config etc/issue.net.new
+config etc/nsswitch.conf.new
+config etc/profile.d/lang.csh.new
+config etc/profile.d/lang.sh.new
+config etc/profile.d/z-dot-in-non-root-path.csh.new
+config etc/profile.d/z-dot-in-non-root-path.sh.new
+config var/log/lastlog.new
+config var/log/wtmp.new
+config var/run/utmp.new
+
+if [ -r etc/ld.so.conf.new -a -r etc/ld.so.conf ]; then
+ # Ensure that ld.so.conf contains the minimal set of paths:
+ cat etc/ld.so.conf | while read pathline ; do
+ if ! grep "^${pathline}$" etc/ld.so.conf.new 1> /dev/null 2> /dev/null ; then
+ echo "$pathline" >> etc/ld.so.conf.new
+ fi
+ done
+ cp etc/ld.so.conf.new etc/ld.so.conf
+fi
+
+# Clean up useless non-examples:
+rm -f etc/mtab.new
+rm -f etc/motd.new
+rm -f etc/ld.so.conf.new
+rm -f etc/hosts.new
+#rm -f etc/shadow.new
+rm -f etc/networks.new
+rm -f etc/HOSTNAME.new
+#rm -f etc/gshadow.new
+rm -f etc/shells.new
+rm -f etc/printcap.new
+rm -f etc/issue.new
+rm -f etc/issue.net.new
+#rm -f etc/profile.d/lang.csh.new
+#rm -f etc/profile.d/lang.sh.new
+rm -f var/run/utmp.new
+rm -f var/log/lastlog.new
+rm -f var/log/wtmp.new
+
+# Make sure $HOME is correct for user sddm:
+chroot . /usr/sbin/usermod -d /var/lib/sddm sddm > /dev/null 2> /dev/null
+# Make sure that sddm is a member of group video:
+chroot . /usr/sbin/usermod --groups video sddm > /dev/null 2> /dev/null
+
+# Also ensure ownerships/perms:
+chown root.utmp var/run/utmp var/log/wtmp
+chmod 664 var/run/utmp var/log/wtmp
+chown root.shadow etc/shadow etc/gshadow
+chmod 640 etc/shadow etc/gshadow
+
+# Match permissions on any leftover config z-dot-in-non-root-path scripts
+# to prevent anyone who turned them on from accidentally losing that setting
+# by moving the .new script into place:
+if [ -r etc/profile.d/z-dot-in-non-root-path.csh.new ]; then
+ touch -r etc/profile.d/z-dot-in-non-root-path.csh etc/profile.d/z-dot-in-non-root-path.csh.new
+fi
+if [ -r etc/profile.d/z-dot-in-non-root-path.sh.new ]; then
+ touch -r etc/profile.d/z-dot-in-non-root-path.sh etc/profile.d/z-dot-in-non-root-path.sh.new
+fi
+
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index 98bc581e6..72c1f02c7 100755
--- a/source/a/etc/etc.SlackBuild
+++ b/source/a/etc/etc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=etc
VERSION=15.0
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -60,8 +60,22 @@ if [ "$ARCH" = "x86_64" ]; then
fi
zcat $CWD/nsswitch.conf.gz > $PKG/etc/nsswitch.conf.new
+# Check to make sure that shadow has the same number of entries
+# as passwd:
+if [ ! "$(cat $CWD/passwd.new | wc -l)" = "$(cat $CWD/shadow.new | wc -l)" ]; then
+ echo "#######################################################################################"
+ echo "# WARNING: /etc/passwd.new and /etc/shadow.new don't have the same number of entries. #"
+ echo "#######################################################################################"
+ sleep 60
+fi
+# Install default passwd/shadow/group (sorted):
+sort -n -t ':' -k3 $CWD/passwd.new > $PKG/etc/passwd.new
+awk -F':' 'NR==FNR{z[$1]=$0;next}{print z[$1]}' $CWD/shadow.new $PKG/etc/passwd.new > $PKG/etc/shadow.new
+sort -n -t ':' -k3 $CWD/group.new > $PKG/etc/group.new
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
# Build the package:
cd $PKG
diff --git a/source/a/etc/group.new b/source/a/etc/group.new
new file mode 100644
index 000000000..1fb3242c4
--- /dev/null
+++ b/source/a/etc/group.new
@@ -0,0 +1,54 @@
+root:x:0:root
+bin:x:1:root,bin
+daemon:x:2:root,bin,daemon
+sys:x:3:root,bin,adm
+adm:x:4:root,adm,daemon
+tty:x:5:
+disk:x:6:root,adm
+lp:x:7:lp
+mem:x:8:
+kmem:x:9:
+wheel:x:10:root
+floppy:x:11:
+mail:x:12:mail
+news:x:13:news
+uucp:x:14:uucp
+man:x:15:
+dialout:x:16:uucp
+audio:x:17:root,pulse
+video:x:18:sddm
+cdrom:x:19:
+games:x:20:
+slocate:x:21:
+utmp:x:22:
+smmsp:x:25:smmsp
+tape:x:26:
+mysql:x:27:
+rpc:x:32:
+sshd:x:33:sshd
+cgred:x:41:
+gdm:x:42:
+shadow:x:43:
+ntp:x:44:
+ftp:x:50:
+oprofile:x:51:
+sddm:x:64:
+pulse:x:65:
+input:x:71:
+apache:x:80:
+messagebus:x:81:
+haldaemon:x:82:
+plugdev:x:83:
+power:x:84:
+netdev:x:86:
+polkitd:x:87:
+pop:x:90:pop
+postfix:x:91:
+postdrop:x:92:
+scanner:x:93:
+dovecot:x:94:
+dovenull:x:95:
+nobody:x:98:nobody
+nogroup:x:99:
+users:x:100:
+console:x:101:
diff --git a/source/a/etc/passwd.new b/source/a/etc/passwd.new
new file mode 100644
index 000000000..e25220170
--- /dev/null
+++ b/source/a/etc/passwd.new
@@ -0,0 +1,33 @@
+root:x:0:0::/root:/bin/bash
+bin:x:1:1:bin:/bin:/bin/false
+daemon:x:2:2:daemon:/sbin:/bin/false
+adm:x:3:4:adm:/var/log:/bin/false
+lp:x:4:7:lp:/var/spool/lpd:/bin/false
+sync:x:5:0:sync:/sbin:/bin/sync
+shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown
+halt:x:7:0:halt:/sbin:/sbin/halt
+mail:x:8:12:mail:/:/bin/false
+news:x:9:13:news:/usr/lib/news:/bin/false
+uucp:x:10:14:uucp:/var/spool/uucppublic:/bin/false
+operator:x:11:0:operator:/root:/bin/bash
+games:x:12:100:games:/usr/games:/bin/false
+ftp:x:14:50::/home/ftp:/bin/false
+smmsp:x:25:25:smmsp:/var/spool/clientmqueue:/bin/false
+mysql:x:27:27:MySQL:/var/lib/mysql:/bin/false
+rpc:x:32:32:RPC portmap user:/:/bin/false
+sshd:x:33:33:sshd:/:/bin/false
+gdm:x:42:42:GDM:/var/lib/gdm:/sbin/nologin
+ntp:x:44:44:User for NTP:/:/bin/false
+oprofile:x:51:51:oprofile:/:/bin/false
+usbmux:x:52:83:User for usbmux daemon:/var/empty:/bin/false
+sddm:x:64:64:User for SDDM:/var/lib/sddm:/bin/false
+pulse:x:65:65:User for PulseAudio:/var/run/pulse:/bin/false
+apache:x:80:80:User for Apache:/srv/httpd:/bin/false
+messagebus:x:81:81:User for D-BUS:/var/run/dbus:/bin/false
+haldaemon:x:82:82:User for HAL:/var/run/hald:/bin/false
+polkitd:x:87:87:PolicyKit daemon owner:/var/lib/polkit:/bin/false
+pop:x:90:90:POP:/:/bin/false
+postfix:x:91:91:User for Postfix MTA:/dev/null:/bin/false
+dovecot:x:94:94:User for Dovecot processes:/dev/null:/bin/false
+dovenull:x:95:95:User for Dovecot login processing:/dev/null:/bin/false
+nobody:x:99:99:nobody:/:/bin/false
diff --git a/source/a/etc/shadow.new b/source/a/etc/shadow.new
new file mode 100644
index 000000000..fd3a87cca
--- /dev/null
+++ b/source/a/etc/shadow.new
@@ -0,0 +1,33 @@
+root::9804:0:::::
+bin:*:9797:0:::::
+daemon:*:9797:0:::::
+adm:*:9797:0:::::
+lp:*:9797:0:::::
+sync:*:9797:0:::::
+shutdown:*:9797:0:::::
+halt:*:9797:0:::::
+mail:*:9797:0:::::
+news:*:9797:0:::::
+uucp:*:9797:0:::::
+operator:*:9797:0:::::
+games:*:9797:0:::::
+ftp:*:9797:0:::::
+smmsp:*:9797:0:::::
+mysql:*:9797:0:::::
+rpc:*:9797:0:::::
+sshd:*:9797:0:::::
+gdm:*:9797:0:::::
+ntp:*:9797:0:::::
+oprofile:*:9797:0:::::
+usbmux:*:9797:0:::::
+sddm:*:9797:0:::::
+pulse:*:9797:0:::::
+apache:*:9797:0:::::
+messagebus:*:9797:0:::::
+haldaemon:*:9797:0:::::
+polkitd:*:9797:0:::::
+pop:*:9797:0:::::
+postfix:*:9797:0:::::
+dovecot:*:9797:0:::::
+dovenull:*:9797:0:::::
+nobody:*:9797:0:::::
diff --git a/source/a/sysvinit-scripts/scripts/rc.M b/source/a/sysvinit-scripts/scripts/rc.M
index 6bd667c56..30c852958 100644
--- a/source/a/sysvinit-scripts/scripts/rc.M
+++ b/source/a/sysvinit-scripts/scripts/rc.M
@@ -94,6 +94,16 @@ if grep -wq sysfs /proc/mounts && grep -q devtmpfs /proc/filesystems ; then
fi
fi
+# Start the haveged entropy daemon:
+if [ -x /etc/rc.d/rc.haveged ]; then
+ /etc/rc.d/rc.haveged start
+fi
+
+# Start the rngd entropy daemon:
+if [ -x /etc/rc.d/rc.rngd ]; then
+ /etc/rc.d/rc.rngd start
+fi
+
# Initialize the networking hardware.
if [ -x /etc/rc.d/rc.inet1 ]; then
/etc/rc.d/rc.inet1
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S
index c53548f4a..793d95852 100644
--- a/source/a/sysvinit-scripts/scripts/rc.S
+++ b/source/a/sysvinit-scripts/scripts/rc.S
@@ -73,11 +73,6 @@ if grep -wq cgroup /proc/filesystems ; then
fi
fi
-# Start the haveged entropy daemon:
-if [ -x /etc/rc.d/rc.haveged ]; then
- /etc/rc.d/rc.haveged start
-fi
-
# Initialize the Logical Volume Manager.
# This won't start unless we find /etc/lvmtab (LVM1) or
# /etc/lvm/backup/ (LVM2). This is created by /sbin/vgscan, so to
@@ -446,4 +441,3 @@ else
dd if=/dev/urandom of=/etc/random-seed count=1 bs=512 2> /dev/null
fi
chmod 600 /etc/random-seed
-
diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
index 6e47bc031..34ef07a74 100755
--- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
+++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sysvinit-scripts
VERSION=${VERSION:-2.1}
ARCH=noarch
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-11}
# 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/ap/at/at.SlackBuild b/source/ap/at/at.SlackBuild
index 6d8af5580..dac04f7fd 100755
--- a/source/ap/at/at.SlackBuild
+++ b/source/ap/at/at.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=at
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/ap/at/rc.atd b/source/ap/at/rc.atd
index 2e06f1695..fdc42d70b 100644
--- a/source/ap/at/rc.atd
+++ b/source/ap/at/rc.atd
@@ -9,7 +9,7 @@ fi
start_atd() {
if ! /usr/bin/pgrep --ns $$ --exact atd 1> /dev/null 2> /dev/null ; then
echo "Starting atd: /usr/sbin/atd $ATD_OPTS"
- /usr/sbin/atd $CROND_OPTS
+ /usr/sbin/atd $ATD_OPTS
fi
}
diff --git a/source/n/libgcrypt/libgcrypt.SlackBuild b/source/n/libgcrypt/libgcrypt.SlackBuild
index 9441d67b1..d78103cc7 100755
--- a/source/n/libgcrypt/libgcrypt.SlackBuild
+++ b/source/n/libgcrypt/libgcrypt.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libgcrypt
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.bz2 | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then