summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-03-22 20:22:25 +0000
committer Eric Hameleers <alien@slackware.com>2023-03-22 22:37:07 +0100
commit98045b7b19ef150b864f97a1a987682d61e348a8 (patch)
tree8e40e18b027f2bf9abbc5d2666f6a2df565d7bb5 /source
parent6b6caf66ba2adca3cda2fb7b9a739fbf08d5aeba (diff)
downloadcurrent-98045b7b19ef150b864f97a1a987682d61e348a8.tar.gz
current-98045b7b19ef150b864f97a1a987682d61e348a8.tar.xz
Wed Mar 22 20:22:25 UTC 202320230322202225
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.
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/coreutils/coreutils.SlackBuild10
-rw-r--r--source/k/kernel-configs/config-generic-6.1.21 (renamed from source/k/kernel-configs/config-generic-6.1.20)4
-rw-r--r--source/k/kernel-configs/config-generic-6.1.21.x64 (renamed from source/k/kernel-configs/config-generic-6.1.20.x64)3
-rw-r--r--source/k/kernel-configs/config-generic-smp-6.1.21-smp (renamed from source/k/kernel-configs/config-generic-smp-6.1.20-smp)4
-rw-r--r--source/k/kernel-configs/config-huge-6.1.21 (renamed from source/k/kernel-configs/config-huge-6.1.20)4
-rw-r--r--source/k/kernel-configs/config-huge-6.1.21.x64 (renamed from source/k/kernel-configs/config-huge-6.1.20.x64)3
-rw-r--r--source/k/kernel-configs/config-huge-smp-6.1.21-smp (renamed from source/k/kernel-configs/config-huge-smp-6.1.20-smp)4
-rw-r--r--source/n/gpgme/gpgme.url1
-rwxr-xr-xsource/n/links/links.SlackBuild2
-rw-r--r--source/t/texlive/doinst.sh1
-rw-r--r--source/t/texlive/douninst.sh4
-rwxr-xr-xsource/t/texlive/dump.unused.internal.libraries.from.sources.sh4
-rw-r--r--source/t/texlive/prep/packages.texmf24
-rw-r--r--source/t/texlive/prep/texmf_get.sh49
-rwxr-xr-xsource/t/texlive/texlive.SlackBuild21
-rw-r--r--source/t/texlive/texlive.url4
16 files changed, 87 insertions, 55 deletions
diff --git a/source/a/coreutils/coreutils.SlackBuild b/source/a/coreutils/coreutils.SlackBuild
index 728c30248..5bb5f909e 100755
--- a/source/a/coreutils/coreutils.SlackBuild
+++ b/source/a/coreutils/coreutils.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2005-2023 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=coreutils
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -101,6 +101,11 @@ zcat $CWD/no_ls_quoting.patch.gz | patch -p1 --verbose --backup --suffix=.orig |
# too commonly used to disregard them. Better to stick with the older more
# widely accepted standards until things begin to demand the new way.
+# Don't use the openssl crypto library, otherwise /bin/sort ends up linked
+# against openssl's libcrypto which creates problems for upgradepkg.
+# It is also possible to use --with-linux-crypto to enable the Linux kernel
+# crypto routines, but we'll skip this for now.
+
FORCE_UNSAFE_CONFIGURE=1 \
CFLAGS="$SLKCFLAGS" \
DEFAULT_POSIX2_VERSION=199209 \
@@ -112,6 +117,7 @@ DEFAULT_POSIX2_VERSION=199209 \
--sysconfdir=/etc \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--enable-install-program=arch \
+ --with-openssl=no \
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
diff --git a/source/k/kernel-configs/config-generic-6.1.20 b/source/k/kernel-configs/config-generic-6.1.21
index e6bd8ead1..667e579ba 100644
--- a/source/k/kernel-configs/config-generic-6.1.20
+++ b/source/k/kernel-configs/config-generic-6.1.21
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.20 Kernel Configuration
+# Linux/x86 6.1.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
@@ -11,6 +11,7 @@ CONFIG_AS_VERSION=24000
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24000
CONFIG_LLD_VERSION=0
+CONFIG_RUST_IS_AVAILABLE=y
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -4338,7 +4339,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_SERIAL_FSL_LPUART_CONSOLE is not set
# CONFIG_SERIAL_FSL_LINFLEXUART is not set
# CONFIG_SERIAL_SPRD is not set
# end of Serial drivers
diff --git a/source/k/kernel-configs/config-generic-6.1.20.x64 b/source/k/kernel-configs/config-generic-6.1.21.x64
index 93be2e4aa..ecdb3d259 100644
--- a/source/k/kernel-configs/config-generic-6.1.20.x64
+++ b/source/k/kernel-configs/config-generic-6.1.21.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.20 Kernel Configuration
+# Linux/x86 6.1.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
@@ -4399,7 +4399,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_SERIAL_FSL_LPUART_CONSOLE is not set
# CONFIG_SERIAL_FSL_LINFLEXUART is not set
# CONFIG_SERIAL_SPRD is not set
# end of Serial drivers
diff --git a/source/k/kernel-configs/config-generic-smp-6.1.20-smp b/source/k/kernel-configs/config-generic-smp-6.1.21-smp
index da71c79ef..ea63b8fb7 100644
--- a/source/k/kernel-configs/config-generic-smp-6.1.20-smp
+++ b/source/k/kernel-configs/config-generic-smp-6.1.21-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.20 Kernel Configuration
+# Linux/x86 6.1.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
@@ -11,6 +11,7 @@ CONFIG_AS_VERSION=24000
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24000
CONFIG_LLD_VERSION=0
+CONFIG_RUST_IS_AVAILABLE=y
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -4383,7 +4384,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_SERIAL_FSL_LPUART_CONSOLE is not set
# CONFIG_SERIAL_FSL_LINFLEXUART is not set
# CONFIG_SERIAL_SPRD is not set
# end of Serial drivers
diff --git a/source/k/kernel-configs/config-huge-6.1.20 b/source/k/kernel-configs/config-huge-6.1.21
index 2dbd6b156..fd9a9be62 100644
--- a/source/k/kernel-configs/config-huge-6.1.20
+++ b/source/k/kernel-configs/config-huge-6.1.21
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.20 Kernel Configuration
+# Linux/x86 6.1.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
@@ -11,6 +11,7 @@ CONFIG_AS_VERSION=24000
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24000
CONFIG_LLD_VERSION=0
+CONFIG_RUST_IS_AVAILABLE=y
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -4338,7 +4339,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_SERIAL_FSL_LPUART_CONSOLE is not set
# CONFIG_SERIAL_FSL_LINFLEXUART is not set
# CONFIG_SERIAL_SPRD is not set
# end of Serial drivers
diff --git a/source/k/kernel-configs/config-huge-6.1.20.x64 b/source/k/kernel-configs/config-huge-6.1.21.x64
index fe90688bc..6fa9c463d 100644
--- a/source/k/kernel-configs/config-huge-6.1.20.x64
+++ b/source/k/kernel-configs/config-huge-6.1.21.x64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.20 Kernel Configuration
+# Linux/x86 6.1.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
@@ -4399,7 +4399,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_SERIAL_FSL_LPUART_CONSOLE is not set
# CONFIG_SERIAL_FSL_LINFLEXUART is not set
# CONFIG_SERIAL_SPRD is not set
# end of Serial drivers
diff --git a/source/k/kernel-configs/config-huge-smp-6.1.20-smp b/source/k/kernel-configs/config-huge-smp-6.1.21-smp
index 7f51cb830..ecf0b51e1 100644
--- a/source/k/kernel-configs/config-huge-smp-6.1.20-smp
+++ b/source/k/kernel-configs/config-huge-smp-6.1.21-smp
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.1.20 Kernel Configuration
+# Linux/x86 6.1.21 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0"
CONFIG_CC_IS_GCC=y
@@ -11,6 +11,7 @@ CONFIG_AS_VERSION=24000
CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=24000
CONFIG_LLD_VERSION=0
+CONFIG_RUST_IS_AVAILABLE=y
CONFIG_CC_CAN_LINK=y
CONFIG_CC_CAN_LINK_STATIC=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -4383,7 +4384,6 @@ CONFIG_SERIAL_ARC_NR_PORTS=1
CONFIG_SERIAL_RP2=m
CONFIG_SERIAL_RP2_NR_UARTS=32
CONFIG_SERIAL_FSL_LPUART=m
-# CONFIG_SERIAL_FSL_LPUART_CONSOLE is not set
# CONFIG_SERIAL_FSL_LINFLEXUART is not set
# CONFIG_SERIAL_SPRD is not set
# end of Serial drivers
diff --git a/source/n/gpgme/gpgme.url b/source/n/gpgme/gpgme.url
new file mode 100644
index 000000000..27f6c7da1
--- /dev/null
+++ b/source/n/gpgme/gpgme.url
@@ -0,0 +1 @@
+https://gnupg.org/ftp/gcrypt/gpgme
diff --git a/source/n/links/links.SlackBuild b/source/n/links/links.SlackBuild
index ce9ac21a6..2d51626a9 100755
--- a/source/n/links/links.SlackBuild
+++ b/source/n/links/links.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=links
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/t/texlive/doinst.sh b/source/t/texlive/doinst.sh
index f864e767d..cd1c7fe63 100644
--- a/source/t/texlive/doinst.sh
+++ b/source/t/texlive/doinst.sh
@@ -2,4 +2,3 @@ chroot . /usr/bin/mktexlsr 1>/dev/null 2>/dev/null
printf "y\n" | chroot . /usr/bin/updmap-sys --syncwithtrees 1>/dev/null 2>/dev/null
chroot . /usr/bin/updmap-sys 1>/dev/null 2>/dev/null
chroot . /usr/bin/fmtutil-sys --all 1>/dev/null 2>/dev/null
-chroot . /usr/bin/mtxrun --generate 1>/dev/null 2>/dev/null
diff --git a/source/t/texlive/douninst.sh b/source/t/texlive/douninst.sh
new file mode 100644
index 000000000..27d51c4ae
--- /dev/null
+++ b/source/t/texlive/douninst.sh
@@ -0,0 +1,4 @@
+# Remove directories/data generated by doinst.sh
+rm -rf usr/share/texmf-config
+rm -rf usr/share/texmf-local
+rm -rf usr/share/texmf-var
diff --git a/source/t/texlive/dump.unused.internal.libraries.from.sources.sh b/source/t/texlive/dump.unused.internal.libraries.from.sources.sh
index 10261cf18..79027a199 100755
--- a/source/t/texlive/dump.unused.internal.libraries.from.sources.sh
+++ b/source/t/texlive/dump.unused.internal.libraries.from.sources.sh
@@ -5,8 +5,10 @@ VERSION=${VERSION:-$(echo texlive-*source.tar.?z* | rev | cut -f 2 -d - | cut -f
tar xf texlive-${VERSION}-source.tar.xz || exit 1
mv texlive-${VERSION}-source.tar.xz texlive-${VERSION}-source.tar.xz.orig
-( cd texlive-${VERSION}-source/libs && rm -rf cairo freetype2 gd gmp graphite2 harfbuzz mpfr icu libpng pixman potrace zlib )
+( cd texlive-${VERSION}-source/libs && rm -rf cairo freetype2 gd gmp graphite2 harfbuzz mpfr icu libpng pixman zlib )
( cd texlive-${VERSION}-source/utils && rm -rf asymptote )
+( cd texlive-${VERSION}-source/utils && rm -rf texdoctk )
+( cd texlive-${VERSION}-source/utils && rm -rf m-tx )
( cd texlive-${VERSION}-source/texk/texlive && rm -rf w*_wrapper )
tar cf texlive-${VERSION}-source.tar texlive-${VERSION}-source
rm -r texlive-${VERSION}-source
diff --git a/source/t/texlive/prep/packages.texmf b/source/t/texlive/prep/packages.texmf
index 35d847d9a..adadc069b 100644
--- a/source/t/texlive/prep/packages.texmf
+++ b/source/t/texlive/prep/packages.texmf
@@ -3,9 +3,12 @@ special_packages="
koma-script
"
-# keep precompiled binaries, list binary, not package name
+# keep precompiled binaries not shipped as source by TL upstream,
+# corresponding package should be in -extra, keep an eye on that ;-)
+# list binary, not package name
keep_precompiled="
biber
+ luametatex
"
# Packages for -base, remaining packages are going to -extra
@@ -16,7 +19,6 @@ collection-latexrecommended
caption
koma-script
collection-metapost
-collection-context
collection-humanities
collection-langenglish
collection-langitalian
@@ -132,17 +134,22 @@ adjustbox
bigfoot
collectbox
comment
+coolfn
csquotes
datatool
datetime2
$(grep ^"name datetime2-.*" $db | cut -d' ' -f2 )
+darkmode
+docshots
doublestroke
enumitem
etoc
frame
framed
+gensymb
glossaries
$(grep ^"name glossaries-.*" $db | cut -d' ' -f2 )
+gradient-text
imakeidx
lipsum
mfirstuc
@@ -152,10 +159,15 @@ moreverb
multirow
nfssext-cfr
nomencl
+opencolor
+pangram
+resmes
sectsty
splitindex
stackengine
supertabular
+swungdash
+termcal
tocloft
ucs
wrapfig2
@@ -221,6 +233,7 @@ beamertheme-light
beamertheme-phnompenh
beamertheme-saintpetersburg
beamertheme-simpledarkblue
+beamertheme-simpleplus
beamertheme-upenn-bc
beamerthemejltree
beamerthemelalic
@@ -861,7 +874,6 @@ smartunits
snaptodo
snotez
soulpos
-soulutf8
spacingtricks
sparklines
sphack
@@ -898,7 +910,6 @@ tabbing
tabfigures
tableaux
tableof
-tablestyles
tablists
tabls
tablvar
@@ -1039,6 +1050,7 @@ l2tabu
milog
r_und_s
schulmathematik
+termcal-de
uhrzeit
umlaute
voss-mathcol
@@ -1051,6 +1063,7 @@ arabtex
$(collection_by_size langchinese 4999 || exit 1)
# collection-langjapanese
+asternote
luatexja
$(collection_by_size langcjk 2999 || exit 1)
@@ -1201,8 +1214,11 @@ xindy
xpdfopen
# collection-publishers
+chifoot
ebook
+inkpaper
revtex
+scrjrnl
# collection-bibtexextra
aaai-named
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
diff --git a/source/t/texlive/texlive.SlackBuild b/source/t/texlive/texlive.SlackBuild
index 2125c4427..5d68dd061 100755
--- a/source/t/texlive/texlive.SlackBuild
+++ b/source/t/texlive/texlive.SlackBuild
@@ -2,7 +2,7 @@
# TeXLive build script for Slackware
-# Copyright 2009, 2017 - 2022 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2017 - 2023 Patrick J. Volkerding, Sebeka, MN, USA
# Copyright 2009 - 2014 Robby Workman, Northport, AL, USA
# Copyright 2016 - 2017 Johannes Schoepfer, Germany
# All rights reserved.
@@ -26,15 +26,15 @@
# URL: ftp://tug.org/historic/systems/texlive/
# Testrelease: https://tug.org/texlive/Images/test/
-# Upstream stable fixes: svn://tug.org/texlive/branches/branch2022/Build/source
+# Upstream stable fixes: svn://tug.org/texlive/branches/branch2023/Build/source
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=texlive
-SOURCEVERSION=${SOURCEVERSION:-20220321}
-TEXMFVERSION=${TEXMFVERSION:-220801}
-VERSION=${VERSION:-2022.$TEXMFVERSION}
-BUILD=${BUILD:-3}
+SOURCEVERSION=${SOURCEVERSION:-20230311}
+TEXMFVERSION=${TEXMFVERSION:-230322}
+VERSION=${VERSION:-2023.$TEXMFVERSION}
+BUILD=${BUILD:-1}
TMP=${TMP:-/tmp}
PKG=$TMP/package-texlive
@@ -121,7 +121,7 @@ cd build
--build=$ARCH-slackware-linux || exit 1
make $NUMJOBS || make || exit 1
- make check || exit 1
+ #make check || exit 1
make install-strip DESTDIR=$PKG || exit 1
cd ..
@@ -151,12 +151,6 @@ sed -i \
-e "s|^OSFONTDIR.*|OSFONTDIR = ~/.fonts:/usr/share/fonts|" \
$PKG$TEXMFROOT/texmf-dist/web2c/texmf.cnf
-# make ConTeXt work
-sed -i \
- -e "s|selfautoparent:|$TEXMFROOT/|g" \
- -e "s|\(TEXMFLOCAL[ ]*=[ ]*\)[^,]*|\1\"$TEXMFROOT/texmf-local\"|" \
- $PKG$TEXMFROOT/texmf-dist/web2c/texmfcnf.lua
-
# provide texlive fonts optionally for other system apps
mkdir -p $PKG/etc/fonts/conf.avail
cat > $PKG/etc/fonts/conf.avail/09-texlive.conf << EOF
@@ -209,6 +203,7 @@ mkdir -p $PKG/install
echo "# This install script should not collide with any other script's activities," > $PKG/install/doinst.sh
echo "# so don't demand a lock by installpkg: NOLOCK" >> $PKG/install/doinst.sh
zcat $CWD/doinst.sh.gz >> $PKG/install/doinst.sh
+cat $CWD/douninst.sh > $PKG/install/douninst.sh
cat $CWD/slack-desc > $PKG/install/slack-desc
cd $PKG
diff --git a/source/t/texlive/texlive.url b/source/t/texlive/texlive.url
index 02450bb16..03c1a6e30 100644
--- a/source/t/texlive/texlive.url
+++ b/source/t/texlive/texlive.url
@@ -1,2 +1,2 @@
-https://ctan.net/systems/texlive/Source/texlive-20220321-source.tar.xz
-http://slackware.schoepfer.info/slackbuilds/texlive/texlive-base-220801.tar.xz
+https://ctan.net/systems/texlive/Source/texlive-20230311-source.tar.xz
+http://slackware.schoepfer.info/slackbuilds/texlive/texlive-base-230322.tar.xz