9 files changed, 29 insertions, 203 deletions
diff --git a/source/l/elfutils/elfutils.SlackBuild b/source/l/elfutils/elfutils.SlackBuild
index 4b1a4654..138ed639 100755
--- a/source/l/elfutils/elfutils.SlackBuild
+++ b/source/l/elfutils/elfutils.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=elfutils
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/l/glibc/doinst.sh-aa_glibc-solibs b/source/l/glibc/doinst.sh-aaa_glibc-solibs
index d5fea2e5..d5fea2e5 100644
--- a/source/l/glibc/doinst.sh-aa_glibc-solibs
+++ b/source/l/glibc/doinst.sh-aaa_glibc-solibs
diff --git a/source/l/glibc/doinst.sh-glibc-solibs b/source/l/glibc/doinst.sh-glibc-solibs
deleted file mode 100644
index d5fea2e5..00000000
--- a/source/l/glibc/doinst.sh-glibc-solibs
+++ /dev/null
@@ -1,155 +0,0 @@
-#!/bin/sh
-# Copyright (C) 2002, 2005  Slackware Linux, Inc.
-# Copyright 2005, 2006, 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, Minnesota, USA
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# Swap glibc on the fly.
-#
-# If we're on a running system we have to handle this _very_ carefully.  :-)
-# The tricks involved here get trickier every time...
-
-# OK, now we have to be sure of a few things.  First, you do have a 2.6
-# kernel running, right?
-
-if [ -r /proc/ksyms ]; then
-  echo "FATAL: you need to be running a 2.6.x kernel in order to upgrade"
-  echo "to this version of glibc."
-  echo
-  sleep 999
-  exit 1
-fi
-
-# Next, stop using the /lib/ntpl libraries.  These are now obsolete and
-# will break the installation if present:
-if [ -d lib/tls ]; then
-  mkdir -p lib/obsolete
-  mv lib/tls lib/obsolete
-fi
-if [ -x sbin/ldconfig ]; then
-  sbin/ldconfig -r . 2> /dev/null
-fi
-
-# Install NPTL glibc libraries:
-if [ -x /sbin/ldconfig -a -d lib/incoming ]; then # swap on the fly
-  # Try to protect with flock against another installpkg/removepkg running
-  # ldconfig while we're doing the on-the-fly install:
-  mkdir -p run/lock/pkgtools
-  ( flock 9 || exit 11
-    # First create copies of the incoming libraries:
-    ( cd lib/incoming
-      for file in * ; do
-        if [ ! -r ../${file}.incoming ]; then
-          cp -a $file ../${file}.incoming
-        fi
-      done
-    )
-    # Then switch to them all at once:
-    /sbin/ldconfig -l lib/*.incoming 2> /dev/null
-    # Remove old versions of the glibc libraries. If you really don't want to
-    # do this for some reason, create a file /etc/glibc-nowipe.
-    if [ ! -r etc/glibc-nowipe ]; then
-      ( cd lib
-        for INCOMING in incoming/*-* ; do
-          LIBPREFIX=$(basename $INCOMING | cut -f 1 -d -)
-          for LIBRARY in ${LIBPREFIX}-* ; do
-            # Don't remove the library if it ends in .incoming:
-            if [ "$(echo $LIBRARY | rev | cut -f 1 -d .)" = "gnimocni" ]; then
-              continue
-            fi
-            # Don't remove symlinks:
-            if [ -L $LIBRARY ]; then
-              continue
-            fi
-            rm -f $LIBRARY
-          done
-        done
-      )
-    fi
-    # Finally, rename them and clean up:
-    ( cd lib
-      for file in *.incoming ; do
-        rm -f `basename $file .incoming`
-        cp -a $file `basename $file .incoming`
-        /sbin/ldconfig -l `basename $file .incoming` 2> /dev/null
-        rm -f $file
-      done
-    )
-  ) 9> run/lock/pkgtools/ldconfig.lock
-else # no ldconfig? This is a broken situation, but we will do what we can:
-  ( cd lib/incoming
-    for file in * ; do
-      cp -a $file ..
-    done
-  )
-fi
-# Now, get rid of the temporary directory:
-rm -rf lib/incoming
-# Done installing NPTL glibc libraries.
-
-# Handle config files:
-config() {
-  NEW="$1"
-  OLD="$(dirname $NEW)/$(basename $NEW .new)"
-  # If there's no config file by that name, mv it over:
-  if [ ! -r $OLD ]; then
-    mv $NEW $OLD
-  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then # toss the redundant copy
-    rm $NEW
-  fi
-  # Otherwise, we leave the .new copy for the admin to consider...
-}
-config etc/profile.d/glibc.csh.new
-config etc/profile.d/glibc.sh.new
-# Clearly you already decided this issue.  :-)
-rm -f etc/profile.d/glibc.csh.new
-rm -f etc/profile.d/glibc.sh.new
-
-# This block below *should* be dead code, but it's probably safer to leave it
-# here as a fallback. It no longer has complete coverage of all the links
-# that would be needed in /lib${LIBDIRSUFFIX}, but it covers enough that if
-# we did fall back on this the machine would boot until it reached the boot
-# time call to ldconfig, which would then take care of any missing links.
-if [ ! -x /sbin/ldconfig ]; then
-( cd lib ; rm -rf libm.so.6 )
-( cd lib ; ln -sf libm-@@VERSION@@.so libm.so.6 )
-( cd lib ; rm -rf libnss_files.so.2 )
-( cd lib ; ln -sf libnss_files-@@VERSION@@.so libnss_files.so.2 )
-( cd lib ; rm -rf libresolv.so.2 )
-( cd lib ; ln -sf libresolv-@@VERSION@@.so libresolv.so.2 )
-( cd lib ; rm -rf libutil.so.1 )
-( cd lib ; ln -sf libutil-@@VERSION@@.so libutil.so.1 )
-( cd lib ; rm -rf libnss_compat.so.2 )
-( cd lib ; ln -sf libnss_compat-@@VERSION@@.so libnss_compat.so.2 )
-( cd lib ; rm -rf libthread_db.so.1 )
-( cd lib ; ln -sf libthread_db-1.0.so libthread_db.so.1 )
-( cd lib ; rm -rf libnss_hesiod.so.2 )
-( cd lib ; ln -sf libnss_hesiod-@@VERSION@@.so libnss_hesiod.so.2 )
-( cd lib ; rm -rf libanl.so.1 )
-( cd lib ; ln -sf libanl-@@VERSION@@.so libanl.so.1 )
-( cd lib ; rm -rf libcrypt.so.1 )
-( cd lib ; ln -sf libcrypt-@@VERSION@@.so libcrypt.so.1 )
-( cd lib ; rm -rf libBrokenLocale.so.1 )
-( cd lib ; ln -sf libBrokenLocale-@@VERSION@@.so libBrokenLocale.so.1 )
-( cd lib ; rm -rf ld-linux.so.2 )
-( cd lib ; ln -sf ld-@@VERSION@@.so ld-linux.so.2 )
-( cd lib ; rm -rf libdl.so.2 )
-( cd lib ; ln -sf libdl-@@VERSION@@.so libdl.so.2 )
-( cd lib ; rm -rf libnss_dns.so.2 )
-( cd lib ; ln -sf libnss_dns-@@VERSION@@.so libnss_dns.so.2 )
-( cd lib ; rm -rf libpthread.so.0 )
-( cd lib ; ln -sf libpthread-@@VERSION@@.so libpthread.so.0 )
-( cd lib ; rm -rf libc.so.6 )
-( cd lib ; ln -sf libc-@@VERSION@@.so libc.so.6 )
-( cd lib ; rm -rf librt.so.1 )
-( cd lib ; ln -sf librt-@@VERSION@@.so librt.so.1 )
-fi
-
diff --git a/source/l/glibc/glibc.SlackBuild b/source/l/glibc/glibc.SlackBuild
index 7c5fcc7a..4c15cdb3 100755
--- a/source/l/glibc/glibc.SlackBuild
+++ b/source/l/glibc/glibc.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 PKGNAM=glibc
 VERSION=${VERSION:-$(echo glibc-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 CHECKOUT=${CHECKOUT:-""}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 # I was considering disabling NSCD, but MoZes talked me out of it.  :)
 #DISABLE_NSCD=" --disable-nscd "
@@ -48,7 +48,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "glibc-$VERSION-$ARCH-$BUILD.txz"
   echo "glibc-i18n-$VERSION-$ARCH-$BUILD.txz"
   echo "glibc-profile-$VERSION-$ARCH-$BUILD.txz"
-  echo "glibc-solibs-$VERSION-$ARCH-$BUILD.txz"
+  echo "aaa_glibc-solibs-$VERSION-$ARCH-$BUILD.txz"
   exit 0
 fi
 
@@ -164,7 +164,7 @@ apply_patches() {
 # This is going to be the initial $DESTDIR:
 export PKG=$TMP/package-glibc-incoming-tree
 PGLIBC=$TMP/package-glibc
-PSOLIBS=$TMP/package-glibc-solibs
+PSOLIBS=$TMP/package-aaa_glibc-solibs
 PI18N=$TMP/package-glibc-i18n
 PPROFILE=$TMP/package-glibc-profile
 PDEBUG=$TMP/package-glibc-debug
@@ -388,7 +388,7 @@ mkdir install
 cp -a $CWD/slack-desc.glibc-i18n install/slack-desc
 makepkg -l y -c n $TMP/glibc-i18n-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
 
-# glibc-solibs:
+# aaa_glibc-solibs:
 cd $PSOLIBS
 mkdir -p etc/profile.d
 cp -a $CWD/profile.d/* etc/profile.d
@@ -418,8 +418,8 @@ mv sbin/ldconfig .
 rm sbin/*
 mv ldconfig sbin
 mkdir install
-cp -a $CWD/slack-desc.glibc-solibs install/slack-desc
-cp -a $CWD/doinst.sh-glibc-solibs install/doinst.sh
+cp -a $CWD/slack-desc.aaa_glibc-solibs install/slack-desc
+cp -a $CWD/doinst.sh-aaa_glibc-solibs install/doinst.sh
 # Fix specific versioning for the symlink creation script. This part of the
 # script would only be used in the case where there is no ldconfig on the
 # running system that's used to install the package. That should never be the
@@ -430,7 +430,7 @@ fix_doinst
 # Only scrub the links in /lib{,64} that will be created by ldconfig:
 find lib${LIBDIRSUFFIX} -type l -exec rm {} \+
 # Build the package:
-makepkg -l y -c n $TMP/glibc-solibs-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
+makepkg -l y -c n $TMP/aaa_glibc-solibs-$VERSION-$SLACKWARE_ARCH-$BUILD.txz
 
 # And finally, the complete "all-in-one" glibc package is created
 # from whatever was leftover:
diff --git a/source/l/glibc/slack-desc.aa_glibc-solibs b/source/l/glibc/slack-desc.aa_glibc-solibs
deleted file mode 100644
index 09ee8630..00000000
--- a/source/l/glibc/slack-desc.aa_glibc-solibs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-               |-----handy-ruler------------------------------------------------------|
-aa_glibc-solibs: aa_glibc-solibs (shared GNU C libraries)
-aa_glibc-solibs:
-aa_glibc-solibs: This package contains the shared libraries, binaries, and support
-aa_glibc-solibs: files required to run most Linux applications linked with glibc.
-aa_glibc-solibs:
-aa_glibc-solibs:
-aa_glibc-solibs:
-aa_glibc-solibs:
-aa_glibc-solibs:
-aa_glibc-solibs:
-aa_glibc-solibs:
diff --git a/source/l/glibc/slack-desc.aaa_glibc-solibs b/source/l/glibc/slack-desc.aaa_glibc-solibs
new file mode 100644
index 00000000..1604bace
--- /dev/null
+++ b/source/l/glibc/slack-desc.aaa_glibc-solibs
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
+# leave one space after the ':'.
+
+                |-----handy-ruler------------------------------------------------------|
+aaa_glibc-solibs: aaa_glibc-solibs (shared GNU C libraries)
+aaa_glibc-solibs:
+aaa_glibc-solibs: This package contains the shared libraries, binaries, and support
+aaa_glibc-solibs: files required to run most Linux applications linked with glibc.
+aaa_glibc-solibs:
+aaa_glibc-solibs:
+aaa_glibc-solibs:
+aaa_glibc-solibs:
+aaa_glibc-solibs:
+aaa_glibc-solibs:
+aaa_glibc-solibs:
diff --git a/source/l/glibc/slack-desc.glibc-solibs b/source/l/glibc/slack-desc.glibc-solibs
deleted file mode 100644
index a538452f..00000000
--- a/source/l/glibc/slack-desc.glibc-solibs
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
-            |-----handy-ruler------------------------------------------------------|
-glibc-solibs: glibc-solibs (shared GNU C libraries)
-glibc-solibs:
-glibc-solibs: This package contains the shared libraries, binaries, and support
-glibc-solibs: files required to run most Linux applications linked with glibc.
-glibc-solibs:
-glibc-solibs:
-glibc-solibs:
-glibc-solibs:
-glibc-solibs:
-glibc-solibs:
-glibc-solibs:
diff --git a/source/l/lcms2/lcms2.SlackBuild b/source/l/lcms2/lcms2.SlackBuild
index 64a22a5f..c6c082fd 100755
--- a/source/l/lcms2/lcms2.SlackBuild
+++ b/source/l/lcms2/lcms2.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=lcms2
 VERSION=${VERSION:-$(echo Little-CMS-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
diff --git a/source/l/libburn/libburn.SlackBuild b/source/l/libburn/libburn.SlackBuild
index ceccec52..52a80555 100755
--- a/source/l/libburn/libburn.SlackBuild
+++ b/source/l/libburn/libburn.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libburn
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then