diff options
Diffstat (limited to 'source')
-rwxr-xr-x | source/a/tree/tree.SlackBuild | 2 | ||||
-rw-r--r-- | source/ap/ksh93/doinst.sh | 26 | ||||
-rwxr-xr-x | source/ap/ksh93/fetch-ksh.sh | 18 | ||||
-rw-r--r-- | source/ap/ksh93/ksh93-functions.sh | 24 | ||||
-rwxr-xr-x | source/ap/ksh93/ksh93.SlackBuild | 39 | ||||
-rw-r--r-- | source/n/nghttp2/nghttp2.url | 2 |
6 files changed, 100 insertions, 11 deletions
diff --git a/source/a/tree/tree.SlackBuild b/source/a/tree/tree.SlackBuild index 11780dcac..b30978246 100755 --- a/source/a/tree/tree.SlackBuild +++ b/source/a/tree/tree.SlackBuild @@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=tree -VERSION=2.1.0 +VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/source/ap/ksh93/doinst.sh b/source/ap/ksh93/doinst.sh index 97599b5e5..1532a8632 100644 --- a/source/ap/ksh93/doinst.sh +++ b/source/ap/ksh93/doinst.sh @@ -1,3 +1,29 @@ +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... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/profile.d/ksh93-functions.sh.new + # Backup the old copy if we find one, move the new one in place if [ -f bin/ksh ]; then mv bin/ksh bin/ksh.old diff --git a/source/ap/ksh93/fetch-ksh.sh b/source/ap/ksh93/fetch-ksh.sh index 626434b7b..27dc34a59 100755 --- a/source/ap/ksh93/fetch-ksh.sh +++ b/source/ap/ksh93/fetch-ksh.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2018, 2020, 2021, 2022 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -36,13 +36,17 @@ HEADISAT=$( cd ksh && git log -1 --format=%h ) DATE="$( cd ksh && git log -1 --format=%cd --date=format:%Y%m%d )" LONGDATE="$( cd ksh && git log -1 --format=%cd --date=format:%c )" VERSION=$(sed -n '/^#define SH_RELEASE_SVER/ { s/.*"\(.*\)".*/\1/; s/-/_/g; p; }' ksh/src/cmd/ksh93/include/version.h) +# Let's only include the numeric part of the version. Not trying to paper over +# using an alpha/beta/etc, but it doesn't seem like important information when +# the date and commit are listed in the tarball name anyway. +#VERSION=$(sed -n '/^#define SH_RELEASE_SVER/ { s/.*"\(.*\)".*/\1/; s/-/_/g; p; }' ksh/src/cmd/ksh93/include/version.h | cut -f 1 -d _) # Cleanup. We're not packing up the whole git repo. rm -rf ksh/.git* -mv ksh "ksh-${BRANCH}_${DATE}_${HEADISAT}" -tar cf "ksh-${BRANCH}_${DATE}_${HEADISAT}.tar" "ksh-${BRANCH}_${DATE}_${HEADISAT}" -plzip -9 -n 6 -f "ksh-${BRANCH}_${DATE}_${HEADISAT}.tar" -touch -d "$LONGDATE" ksh-${BRANCH}_${DATE}_${HEADISAT}.tar.lz -rm -rf "ksh-${BRANCH}_${DATE}_${HEADISAT}" +mv ksh "ksh-${VERSION}_${DATE}_${HEADISAT}" +tar cf "ksh-${VERSION}_${DATE}_${HEADISAT}.tar" "ksh-${VERSION}_${DATE}_${HEADISAT}" +plzip -9 -n 6 -f "ksh-${VERSION}_${DATE}_${HEADISAT}.tar" +touch -d "$LONGDATE" ksh-${VERSION}_${DATE}_${HEADISAT}.tar.lz +rm -rf "ksh-${VERSION}_${DATE}_${HEADISAT}" echo -echo "ksh branch $BRANCH with HEAD at $HEADISAT packaged as ksh-${BRANCH}_${DATE}_${HEADISAT}.tar.lz" +echo "ksh branch $BRANCH with HEAD at $HEADISAT packaged as ksh-${VERSION}_${DATE}_${HEADISAT}.tar.lz" echo diff --git a/source/ap/ksh93/ksh93-functions.sh b/source/ap/ksh93/ksh93-functions.sh new file mode 100644 index 000000000..3cb82bb2a --- /dev/null +++ b/source/ap/ksh93/ksh93-functions.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# If $SHELL is /bin/ksh and this script is executable, enable these functions: +# +# pushd Change directory and add to the top of the stack +# popd Remove the top directory from the stack and change to +# the previous directory in the stack +# dirs List directories in the stack +# +# In addition, the following functions can be enabled with autoload: +# +# mcd Menu-driven cd to directories in the stack +# cd cd with a number as the first argument changes to the +# directory in that position in the stack +# man ksh builtins with the --man option included (typeset, cd, +# etc.) can be looked up with man and fed through the pager +# autocd Change directories by typing in the directory name only +# +# Calling pushd, popd, dirs or (autoloaded) mcd in ksh will autoload the cd +# function, overriding the cd builtin. Use "command cd" for the cd builtin. + +if [ "$SHELL" = /bin/ksh ]; then + FPATH=/usr/share/ksh93-functions + export FPATH +fi diff --git a/source/ap/ksh93/ksh93.SlackBuild b/source/ap/ksh93/ksh93.SlackBuild index 60f5728d7..af5614be7 100755 --- a/source/ap/ksh93/ksh93.SlackBuild +++ b/source/ap/ksh93/ksh93.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2001 BSDi, Inc. Concord, CA, USA # Copyright 2004 Slackware Linux, Inc. Concord, CA, USA -# Copyright 2007, 2008, 2009, 2010, 2013, 2016, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2013, 2016, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -45,6 +45,26 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +elif [ "$ARCH" = "armv7hl" ]; then + SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16" + LIBDIRSUFFIX="" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -66,12 +86,27 @@ find . \ # ast uses its own architecture labels SARCH=$(bin/package host type) || exit +CCFLAGS="$SLKCFLAGS" \ bin/package make || exit mkdir -p $PKG/bin $PKG/usr/bin cp arch/$SARCH/bin/ksh $PKG/bin/ksh.new || exit cp arch/$SARCH/bin/shcomp $PKG/usr/bin/ || exit +# Install ksh93 extra functions: +mkdir -p $PKG/usr/share/ksh93-functions +cp -a arch/$SARCH/fun/* $PKG/usr/share/ksh93-functions +chown root:root $PKG/usr/share/ksh93-functions/* +chmod 755 $PKG/usr/share/ksh93-functions/* + +# Add a profile.d script to enable the above functions upon login. +# This will not be activated by default - to use it, make the script executable +# (and it will stay that way through future upgrades): +mkdir -p $PKG/etc/profile.d +cp -a $CWD/ksh93-functions.sh $PKG/etc/profile.d/ksh93-functions.sh.new +chown root:root $PKG/etc/profile.d/ksh93-functions.sh.new +chmod 644 $PKG/etc/profile.d/ksh93-functions.sh.new + # this may be re-enabled and updated someday when ksh 93u+m # regains the ability to build and use dynamic libraries... #cp arch/$SARCH/lib/libshell.so.1.1 /usr/lib @@ -123,7 +158,7 @@ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a COMPATIBILITY* DESIGN* OBSOLETE* README* RELEASE* TYPES* \ $PKG/usr/doc/$PKGNAM-$VERSION ) -cp -a ANNOUNCE* CHANGELOG* CONTRIBUTING* LICENSE* NEWS* README* \ +cp -a ANNOUNCE* CHANGELOG* CONTRIBUTING* COPYRIGHT* LICENSE* NEWS* README* \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/LICENSES cp -a lib/package/LICENSES/* $PKG/usr/doc/$PKGNAM-$VERSION/LICENSES diff --git a/source/n/nghttp2/nghttp2.url b/source/n/nghttp2/nghttp2.url index 55bbef97f..fbe03258e 100644 --- a/source/n/nghttp2/nghttp2.url +++ b/source/n/nghttp2/nghttp2.url @@ -1,2 +1,2 @@ https://github.com/nghttp2/nghttp2 -https://github.com/nghttp2/nghttp2/releases/download/v1.53.0/nghttp2-1.53.0.tar.xz +https://github.com/nghttp2/nghttp2/releases/download/v1.54.0/nghttp2-1.54.0.tar.xz |