summaryrefslogtreecommitdiff
path: root/source/a/etc
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-09-09 05:10:25 +0000
committerEric Hameleers <alien@slackware.com>2019-09-09 17:59:48 +0200
commitf58aff2430624d43f64162ea66101f0ed804755f (patch)
treec8f7b3c57c5060a52f3cd5579b61f028f9d3bb7a /source/a/etc
parent6a5556564a6558988a6df36b6523fc0f864b2528 (diff)
downloadcurrent-f58aff2430624d43f64162ea66101f0ed804755f.tar.gz
Mon Sep 9 05:10:25 UTC 201920190909051025
a/etc-15.0-x86_64-10.txz: Rebuilt. Fix "include /etc/ld.so.conf.d/*.conf" repeats in /etc/ld.so.conf. l/imagemagick-6.9.10_64-x86_64-1.txz: Upgraded. l/seamonkey-solibs-2.49.5-x86_64-1.txz: Removed. This package was included years ago to support a few things that needed nss/nspr, but we've since included that in the mozilla-nss package. Nothing should be using this anymore. xap/seamonkey-2.49.5-x86_64-2.txz: Rebuilt. Added additional options to more closely match the official build: --enable-rust --enable-js-shell --enable-elf-hack --enable-release --enable-calendar Thanks to ljb643 for the bug report. Removed /usr/lib{,64}/seamonkey from /etc/ld.so.conf.
Diffstat (limited to 'source/a/etc')
-rw-r--r--source/a/etc/doinst.sh3
-rwxr-xr-xsource/a/etc/etc.SlackBuild2
2 files changed, 3 insertions, 2 deletions
diff --git a/source/a/etc/doinst.sh b/source/a/etc/doinst.sh
index 17571d3c..cd4ed6a1 100644
--- a/source/a/etc/doinst.sh
+++ b/source/a/etc/doinst.sh
@@ -64,7 +64,8 @@ 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
+ # (eliminate ld.so.conf.d line when adding paths to avoid repeats)
+ cat etc/ld.so.conf | grep -v ld.so.conf.d | 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
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index ac74c0a9..219443c8 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:-9}
+BUILD=${BUILD:-10}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then