summaryrefslogtreecommitdiffstats
path: root/source/a/shadow
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2020-01-02 21:15:46 +0000
committer Eric Hameleers <alien@slackware.com>2020-01-03 08:59:49 +0100
commite4325044a8839cd09f34e5fd73e7f0ce01fcd986 (patch)
tree7316a18584df9dad63e58ed83a38ca0c4c6bbb86 /source/a/shadow
parent28ca6fabe4f11e839f66810fb111ae094e9aa79c (diff)
downloadcurrent-e4325044a8839cd09f34e5fd73e7f0ce01fcd986.tar.gz
current-e4325044a8839cd09f34e5fd73e7f0ce01fcd986.tar.xz
Thu Jan 2 21:15:46 UTC 202020200102211546
a/dialog-1.3_20191210-x86_64-1.txz: Upgraded. a/shadow-4.8-x86_64-2.txz: Rebuilt. Don't ship /etc/environment.new since sudo is no longer complaining about it. ap/lxc-2.0.11_fad08f383-x86_64-4.txz: Rebuilt. Make sure all initial devices are properly created. Fix accidental handling of rc.lxc as a modified-for-lxc init script. Thanks to crts. d/python-setuptools-44.0.0-x86_64-1.txz: Upgraded. l/libedit-20191231_3.1-x86_64-1.txz: Upgraded. l/python-pillow-7.0.0-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/shadow')
-rw-r--r--source/a/shadow/doinst.sh2
-rw-r--r--source/a/shadow/environment6
-rwxr-xr-xsource/a/shadow/shadow.SlackBuild8
3 files changed, 2 insertions, 14 deletions
diff --git a/source/a/shadow/doinst.sh b/source/a/shadow/doinst.sh
index b5fcee426..a7bf2ee4a 100644
--- a/source/a/shadow/doinst.sh
+++ b/source/a/shadow/doinst.sh
@@ -11,9 +11,7 @@ config() {
}
config etc/default/useradd.new
-config etc/environment.new
config etc/login.access.new
config etc/login.defs.new
config var/log/faillog.new
rm -f var/log/faillog.new
-
diff --git a/source/a/shadow/environment b/source/a/shadow/environment
deleted file mode 100644
index 9e96a54ce..000000000
--- a/source/a/shadow/environment
+++ /dev/null
@@ -1,6 +0,0 @@
-# /etc/environment
-# This file may contain environment variable settings that should be used
-# system-wide. Please note that it is not a script file and should only
-# contain assignment expressions, one per line.
-# The environment variables in this file will be loaded before those in other
-# files such as: /etc/profile, /etc/profile.d/*, ~/.profile, etc.
diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild
index fd184bb94..d3fd6d14b 100755
--- a/source/a/shadow/shadow.SlackBuild
+++ b/source/a/shadow/shadow.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2005-2020 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=shadow
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | 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
@@ -137,10 +137,6 @@ find $PKG -name groups.1 -exec rm {} \+
rm -f $PKG/etc/login.defs
zcat $CWD/login.defs.gz > $PKG/etc/login.defs.new
-# Install /etc/environment (referenced in login.defs and used by sudo and
-# other utilities):
-zcat $CWD/environment.gz > $PKG/etc/environment.new
-
mv $PKG/etc/login.access $PKG/etc/login.access.new
# I don't think this works well enough to recommend it.