From f58aff2430624d43f64162ea66101f0ed804755f Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 9 Sep 2019 05:10:25 +0000 Subject: Mon Sep 9 05:10:25 UTC 2019 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. --- source/a/etc/doinst.sh | 3 ++- source/a/etc/etc.SlackBuild | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source/a/etc') diff --git a/source/a/etc/doinst.sh b/source/a/etc/doinst.sh index 17571d3cf..cd4ed6a1f 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 ac74c0a9e..219443c8d 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 -- cgit v1.2.3