summaryrefslogtreecommitdiff
path: root/source/a/aaa_elflibs
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-05-28 19:12:29 +0000
committerEric Hameleers <alien@slackware.com>2018-05-31 23:39:35 +0200
commit646a5c1cbfd95873950a87b5f75d52073a967023 (patch)
treeb8b8d2ab3b0d432ea69ad1a64d1c789649d65020 /source/a/aaa_elflibs
parentd31c50870d0bee042ce660e445c9294a59a3a65b (diff)
downloadcurrent-646a5c1cbfd95873950a87b5f75d52073a967023.tar.gz
Mon May 28 19:12:29 UTC 201820180528191229
a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/aaa_elflibs')
-rwxr-xr-xsource/a/aaa_elflibs/aaa_elflibs.SlackBuild23
-rw-r--r--source/a/aaa_elflibs/slack-desc8
-rw-r--r--source/a/aaa_elflibs/symlinks-to-tracked-libs26
-rw-r--r--source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp3
4 files changed, 40 insertions, 20 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
index f71a2374..b233ca9b 100755
--- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
+++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild
@@ -1,5 +1,5 @@
-#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA
+#!/bin/bash
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -19,10 +19,11 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=aaa_elflibs
VERSION=${VERSION:-14.2}
-BUILD=${BUILD:-23}
+BUILD=${BUILD:-39}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -34,13 +35,20 @@ if [ -z "$ARCH" ]; then
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
if [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
else
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-${PKGNAM}
rm -rf $PKG
@@ -111,6 +119,13 @@ cat $CWD/tracked-files-tmp \
)
done
+# Make sure shared libraries are executable:
+chmod 755 $PKG/lib${LIBDIRSUFFIX}/lib*.so.* $PKG/usr/lib${LIBDIRSUFFIX}/lib*.so.*
+
+# Don't ship symlinks in aaa_elflibs... it's just asking for trouble.
+# installpkg will create them if needed by running ldconfig.
+find $PKG -type l -exec rm --verbose "{}" \;
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/a/aaa_elflibs/slack-desc b/source/a/aaa_elflibs/slack-desc
index 86996375..37adbdb4 100644
--- a/source/a/aaa_elflibs/slack-desc
+++ b/source/a/aaa_elflibs/slack-desc
@@ -1,8 +1,8 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# 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
+# 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------------------------------------------------------|
@@ -10,7 +10,7 @@ aaa_elflibs: aaa_elflibs (shared libraries needed by many programs)
aaa_elflibs:
aaa_elflibs: This is a collection of shared libraries needed to run Linux programs.
aaa_elflibs: ELF (Executable and Linking Format) is the standard Linux binary
-aaa_elflibs: format. These libraries are gathered from other Slackware packages
+aaa_elflibs: format. These libraries are gathered from other Slackware packages
aaa_elflibs: and are intended to give a fairly complete initial set of libraries.
aaa_elflibs:
aaa_elflibs:
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs
index a8ac5e2f..0db451aa 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs
@@ -7,24 +7,30 @@
/lib/libbz2.so.1.0
/lib/libcap.so.2
/lib/libdm.so.0
+/lib/libelf.so.1
/lib/libfuse.so.2
/lib/libgpm.so.2
/lib/liblzma.so.5
/lib/libncurses.so.5
+/lib/libncurses.so.6
/lib/libncursesw.so.5
+/lib/libncursesw.so.6
/lib/libpcre.so.1
/lib/libpcreposix.so.0
/lib/libpopt.so.0
/lib/libsysfs.so.2
/lib/libtermcap.so.2
+/lib/libtinfo.so.6
+/lib/libudev.so.1
/lib/libz.so.1
/usr/lib/libasound.so.2
+/usr/lib/libatomic.so.1
/usr/lib/libcurl.so.4
-/usr/lib/libelf.so.1
/usr/lib/libexpat.so.1
/usr/lib/libform.so.5
+/usr/lib/libform.so.6
/usr/lib/libformw.so.5
-/usr/lib/libgdbm.so.3
+/usr/lib/libformw.so.6
/usr/lib/libgdbm.so.4
/usr/lib/libglib-2.0.so.0
/usr/lib/libgmodule-2.0.so.0
@@ -32,26 +38,30 @@
/usr/lib/libgmpxx.so.4
/usr/lib/libgobject-2.0.so.0
/usr/lib/libgthread-2.0.so.0
-/usr/lib/libhistory.so.5
/usr/lib/libhistory.so.6
-/usr/lib/libidn.so.11
+/usr/lib/libhistory.so.7
+/usr/lib/libidn.so.12
+/usr/lib/libidn2.so.0
/usr/lib/libjpeg.so.62
/usr/lib/libturbojpeg.so.0
-/usr/lib/libjpeg.so.8
/usr/lib/liblber-2.4.so.2
/usr/lib/libldap-2.4.so.2
/usr/lib/libltdl.so.7
/usr/lib/libmenu.so.5
+/usr/lib/libmenu.so.6
/usr/lib/libmenuw.so.5
+/usr/lib/libmenuw.so.6
/usr/lib/libmm.so.14
-/usr/lib/libmpfr.so.4
+/usr/lib/libmpfr.so.6
/usr/lib/libpanel.so.5
+/usr/lib/libpanel.so.6
/usr/lib/libpanelw.so.5
+/usr/lib/libpanelw.so.6
/usr/lib/libpng.so.14
/usr/lib/libpng14.so.14
/usr/lib/libpng16.so.16
-/usr/lib/libreadline.so.5
/usr/lib/libreadline.so.6
+/usr/lib/libreadline.so.7
/usr/lib/libsigsegv.so.2
/usr/lib/libslang.so.1
/usr/lib/libslang.so.2
@@ -59,8 +69,6 @@
/usr/lib/libstdc++.so.5
/usr/lib/libstdc++.so.6
/usr/lib/libtdb.so.1
-/usr/lib/libtiff.so.3
-/usr/lib/libtiffxx.so.3
/usr/lib/libtiffxx.so.5
/usr/lib/libtiff.so.5
/usr/lib/libusb-0.1.so.4
diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
index 13323985..2e0d3083 100644
--- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
+++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp
@@ -2,6 +2,3 @@
# like to keep copies of temporarily until we can recompile
# everything that's still using them. Once that happens, they'll
# be dropped from this package.
-
-/lib/libudev.so.0
-/lib/libudev.so.1