summaryrefslogtreecommitdiff
path: root/source/a/etc/etc.SlackBuild
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-06-13 21:55:19 +0000
committerEric Hameleers <alien@slackware.com>2018-06-14 08:58:07 +0200
commit11b00957be9f8661c4248d52bb20cdacdd442615 (patch)
treea72da2814f739ae52f52afbf34df4df751131901 /source/a/etc/etc.SlackBuild
parentd8095c1e90c817c5c1bd4cbb892be7218946279b (diff)
downloadcurrent-11b00957be9f8661c4248d52bb20cdacdd442615.tar.gz
Wed Jun 13 21:55:19 UTC 201820180613215519
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 *)
Diffstat (limited to 'source/a/etc/etc.SlackBuild')
-rwxr-xr-xsource/a/etc/etc.SlackBuild16
1 files changed, 15 insertions, 1 deletions
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index 98bc581e..72c1f02c 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