From 98045b7b19ef150b864f97a1a987682d61e348a8 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Wed, 22 Mar 2023 20:22:25 +0000 Subject: Wed Mar 22 20:22:25 UTC 2023 a/coreutils-9.2-x86_64-2.txz: Rebuilt. Don't link with OpenSSL's libcrypto, as it creates problems on machines that don't yet have openssl3 installed when /bin/sort suddenly depends upon libcrypto.so.3. Worked fine without this previously, so it shouldn't really make any difference. There's also a configure option to use the kernel's crypto routines if available, but for now we'll skip this. Thanks to rahrah. a/kernel-firmware-20230320_bcdcfbc-noarch-1.txz: Upgraded. a/kernel-generic-6.1.21-x86_64-1.txz: Upgraded. a/kernel-huge-6.1.21-x86_64-1.txz: Upgraded. a/kernel-modules-6.1.21-x86_64-1.txz: Upgraded. d/kernel-headers-6.1.21-x86-1.txz: Upgraded. k/kernel-source-6.1.21-noarch-1.txz: Upgraded. l/adwaita-icon-theme-44.0-noarch-1.txz: Upgraded. n/gpgme-1.19.0-x86_64-1.txz: Upgraded. n/links-2.29-x86_64-1.txz: Upgraded. t/texlive-2023.230322-x86_64-1.txz: Upgraded. Thanks to Johannes Schoepfer. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt. --- source/t/texlive/prep/texmf_get.sh | 49 +++++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 19 deletions(-) (limited to 'source/t/texlive/prep/texmf_get.sh') diff --git a/source/t/texlive/prep/texmf_get.sh b/source/t/texlive/prep/texmf_get.sh index 4ad2d12b0..6876a4cb0 100644 --- a/source/t/texlive/prep/texmf_get.sh +++ b/source/t/texlive/prep/texmf_get.sh @@ -2,7 +2,7 @@ # texmf_get.sh # -# Copyright 2016 - 2022 Johannes Schoepfer, Germany, slackbuilds@schoepfer.info +# Copyright 2016 - 2023 Johannes Schoepfer, Germany, slackbuilds@schoepfer.info # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,12 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -# version 15.1.0 +# version 15.1.1 # # Prepare xz-compressed tarballs of texlive-texmf-trees based on texlive.tlpdb # This script takes care of dependencies(as far as these are present in texlive.tlpdb) # of collections and packages, and that every texlive-package is included only once. -# The editions(base/extra/docs) should contain no binaries(exception biber) +# The editions(base/extra/docs) should contain no binaries # -base: the most usefull stuff, most binaries/scripts, # manpages for binaries/scripts 65mb 2017-11-07 # -docs: -base documentation only, no manpages/GNU infofiles @@ -99,7 +99,7 @@ package_meta () { then # collection start linenumer start_n="$(grep -n ^"name ${1}"$ $db | cut -d':' -f1)" - [ -z "$start_n" ] && echo "$1 was not found in $db, bye." && exit 1 + [ -z "$start_n" ] && echo "ERROR: \"$1\" is no package in $db, edit $CWD/packages.texmf !" && exit 1 # find end of package/collection for emptyline in $emptylines do @@ -223,26 +223,36 @@ untar () { rm $link done - # keep only binaries of special packages + # keep only precompiled binaries of special packages, see packages.texmf, + # these should only be in -extra. # remove xindy.mem(gzip compresses data) to prevent overwriting # the one built from the source for bin in $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | \ grep -e "shared object" -e ELF -e "gzip compressed data" | cut -f 1 -d : ) do + binfile="$(echo $bin | rev | cut -d'/' -f1 | rev)" + remove_binary=yes + # for multiple binaries this extra loop is neccesary for binary in $keep_precompiled do - if [ "$(echo $bin | rev | cut -d'/' -f1 | rev)" != "$binary" ] + if [ "$(echo $bin | rev | cut -d'/' -f1 | rev)" = "$binary" ] then - #echo "Deleting binary $bin found in $texmf/texmf-dist/bin/$arch" - rm $bin - echo -n "$package:" >> $binary_removed.$edition - echo $bin | rev | cut -d'/' -f1 | rev >> $binary_removed.$edition - fi + remove_binary=no + fi done + if [ $remove_binary = yes ] + then + # might be already removed by a previous run + if [ -s "$bin" ] + then + #echo "Deleting binary \"$arch/$binfile\"" + rm $bin && echo "$package: $binfile" >> $binary_removed.$edition + fi + fi done # move scripts to linked-scripts for script in \ - $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + |\ + $(find $texmf/texmf-dist/bin/$arch -type f -exec file '{}' + | \ grep -wv ELF | cut -f 1 -d : ) do mv $script $texmf/texmf-dist/linked_scripts/ @@ -335,16 +345,17 @@ remove_cruft () { echo "Replace duplicate files by symlinks, this may take a while ..." - LASTSIZE=0 - find $texmf/texmf-dist/ \ - -type f -printf '%s %p\n' | sort -n | - while read SIZE FILE + LASTSIZE=x + find $texmf/texmf-dist/ -type f -printf '%s %p\n' | sort -n | + while read -r SIZE FILE do - if [ "$SIZE" -eq "$LASTSIZE" ] + # symlinks alse need some bytes, start linking above 10 bytes + if [ "$SIZE" -gt 10 -a "$SIZE" == "$LASTSIZE" ] then - if [ "$(md5sum $FILE | cut -d' ' -f1)" == "$(md5sum $LASTFILE | cut -d' ' -f1)" ] + if [ "$(sha512sum $FILE | cut -d' ' -f1)" \ + == "$(sha512sum $LASTFILE | cut -d' ' -f1)" ] then - echo "$FILE $LASTFILE" >> $duplicatelog + echo "$FILE $LASTFILE $SIZE" >> $duplicatelog ln -srf $FILE $LASTFILE fi fi -- cgit v1.2.3-79-gdb01