From bd9266d121f0b40660dc33e0b04256ddaee0d222 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 18 Oct 2019 21:00:50 +0000
Subject: Fri Oct 18 21:00:50 UTC 2019

a/getty-ps-2.1.0b-x86_64-4.txz:  Removed.
a/lha-114i-x86_64-2.txz:  Removed.
  Removed due to vague licensing terms.
a/lhasa-0.3.1-x86_64-1.txz:  Added.
  This is an extraction-only LHA utility with an OSI approved license.
a/shadow-4.7-x86_64-2.txz:  Rebuilt.
  Added /etc/environment.new to fix "sudo -i" noise.
ap/lm_sensors-3.6.0-x86_64-1.txz:  Upgraded.
ap/vim-8.1.2174-x86_64-1.txz:  Upgraded.
l/netpbm-10.88.00-x86_64-1.txz:  Upgraded.
n/ca-certificates-20191018-noarch-1.txz:  Upgraded.
n/samba-4.11.1-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.2174-x86_64-1.txz:  Upgraded.
xap/xfractint-20.04p13-x86_64-2.txz:  Removed.
xap/xv-3.10a-x86_64-9.txz:  Removed.
extra/getty-ps/getty-ps-2.1.0b-x86_64-4.txz:  Rebuilt.
  Moved here from the A series due to commercial use restrictions.
extra/xfractint/xfractint-20.04p14-x86_64-1.txz:  Upgraded.
  Moved here from the XAP series due to commercial use restrictions.
extra/xv/xv-3.10a-x86_64-9.txz:  Rebuilt.
  Moved here from the XAP series due to non-commercial use shareware license.
---
 source/a/shadow/doinst.sh         | 1 +
 source/a/shadow/environment       | 6 ++++++
 source/a/shadow/shadow.SlackBuild | 6 +++++-
 3 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 source/a/shadow/environment

(limited to 'source/a/shadow')

diff --git a/source/a/shadow/doinst.sh b/source/a/shadow/doinst.sh
index 2bc40e545..b5fcee426 100644
--- a/source/a/shadow/doinst.sh
+++ b/source/a/shadow/doinst.sh
@@ -11,6 +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
diff --git a/source/a/shadow/environment b/source/a/shadow/environment
new file mode 100644
index 000000000..9e96a54ce
--- /dev/null
+++ b/source/a/shadow/environment
@@ -0,0 +1,6 @@
+# /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 51ffb2313..b99ad869e 100755
--- a/source/a/shadow/shadow.SlackBuild
+++ b/source/a/shadow/shadow.SlackBuild
@@ -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
@@ -122,6 +122,10 @@ 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.
-- 
cgit v1.2.3-65-gdbad