diff options
Diffstat (limited to 'source/a')
| -rwxr-xr-x | source/a/aaa_elflibs/aaa_elflibs.SlackBuild | 2 | ||||
| -rw-r--r-- | source/a/aaa_elflibs/symlinks-to-tracked-libs | 1 | ||||
| -rw-r--r-- | source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp | 2 | ||||
| -rw-r--r-- | source/a/file/file.PT_DYNAMIC.is.dynamically.linked.diff | 10 | ||||
| -rwxr-xr-x | source/a/file/file.SlackBuild | 8 |
5 files changed, 20 insertions, 3 deletions
diff --git a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild index ed7b839fc..643e7e0bc 100755 --- a/source/a/aaa_elflibs/aaa_elflibs.SlackBuild +++ b/source/a/aaa_elflibs/aaa_elflibs.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=aaa_elflibs VERSION=${VERSION:-15.0} -BUILD=${BUILD:-16} +BUILD=${BUILD:-17} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs b/source/a/aaa_elflibs/symlinks-to-tracked-libs index b123fb948..f2267dbed 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs @@ -29,6 +29,7 @@ /usr/lib/libatomic.so.1 /usr/lib/libcurl.so.4 /usr/lib/libexpat.so.1 +/usr/lib/libffi.so.7 /usr/lib/libform.so.5 /usr/lib/libform.so.6 /usr/lib/libformw.so.5 diff --git a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp index 90ac984a1..0c1cc6884 100644 --- a/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp +++ b/source/a/aaa_elflibs/symlinks-to-tracked-libs-tmp @@ -18,3 +18,5 @@ /usr/lib/libexiv2.so.26 /usr/lib/libraw.so.16 /usr/lib/libraw_r.so.16 +# We'll keep this one around for just a little bit: +/usr/lib/libffi.so.6 diff --git a/source/a/file/file.PT_DYNAMIC.is.dynamically.linked.diff b/source/a/file/file.PT_DYNAMIC.is.dynamically.linked.diff new file mode 100644 index 000000000..a0cd83b9b --- /dev/null +++ b/source/a/file/file.PT_DYNAMIC.is.dynamically.linked.diff @@ -0,0 +1,10 @@ +--- ./src/readelf.c.orig 2019-12-15 21:49:19.000000000 -0600 ++++ ./src/readelf.c 2019-12-20 13:14:15.377556623 -0600 +@@ -1638,6 +1638,7 @@ + /* Things we can determine before we seek */ + switch (xph_type) { + case PT_DYNAMIC: ++ linking_style = "dynamically"; + doread = 1; + break; + case PT_NOTE: diff --git a/source/a/file/file.SlackBuild b/source/a/file/file.SlackBuild index 78c07b374..fa6a4f6da 100755 --- a/source/a/file/file.SlackBuild +++ b/source/a/file/file.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2005-2008, 2009, 2010, 2013, 2015, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2005-2008, 2009, 2010, 2013, 2015, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=file VERSION=${VERSION:-$(echo file-*.tar.?z* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -92,6 +92,10 @@ autoreconf -vif || exit 1 # versions of file to avoid breaking existing scripts: zcat $CWD/file.short.diff.gz | patch -p1 -E --verbose || exit 1 +# Output on ELF objects should be "dynamically linked" for PT_DYNAMIC too, not +# just for PT_INTERP: +zcat $CWD/file.PT_DYNAMIC.is.dynamically.linked.diff.gz | patch -p1 -E --verbose || exit 1 + # Add zisofs and crda regulatory bin detection zcat $CWD/file.zisofs.magic.gz >> magic/Magdir/compress zcat $CWD/file.crdaregbin.magic.gz >> magic/Magdir/crdaregbin |