diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2023-06-07 21:12:41 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2023-06-08 13:30:33 +0200 |
commit | da0323f6ebb6a948cc7699dffcc537eea161d19c (patch) | |
tree | 2ff37bc70928b15cc84abf4bf6cc7e9641d3ea50 /patches/source | |
parent | 372badc1d4a3a2e01e1aa9fdc262da9abd692cd6 (diff) | |
download | current-da0323f6ebb6a948cc7699dffcc537eea161d19c.tar.gz current-da0323f6ebb6a948cc7699dffcc537eea161d19c.tar.xz |
Wed Jun 7 21:12:41 UTC 202320230607211241_15.0
patches/packages/cups-2.4.4-x86_64-1_slack15.0.txz: Upgraded.
This update is a hotfix for a segfault in cupsGetNamedDest(), when caller
tries to find the default destination and the default destination is not set
on the machine.
patches/packages/ksh93-1.0.5_20230607_9b251344-x86_64-1_slack15.0.txz: Upgraded.
This is a bugfix and robustness enhancement release.
Thanks to McDutchie for the great work!
Thanks to pghvlaans for improvements to the build script.
Diffstat (limited to 'patches/source')
-rw-r--r-- | patches/source/ksh93/doinst.sh | 44 | ||||
-rwxr-xr-x | patches/source/ksh93/fetch-ksh.sh | 52 | ||||
-rw-r--r-- | patches/source/ksh93/ksh93-functions.sh | 24 | ||||
-rwxr-xr-x | patches/source/ksh93/ksh93.SlackBuild | 183 | ||||
-rw-r--r-- | patches/source/ksh93/slack-desc | 19 |
5 files changed, 322 insertions, 0 deletions
diff --git a/patches/source/ksh93/doinst.sh b/patches/source/ksh93/doinst.sh new file mode 100644 index 000000000..1532a8632 --- /dev/null +++ b/patches/source/ksh93/doinst.sh @@ -0,0 +1,44 @@ +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 +fi +mv bin/ksh.new bin/ksh +if [ -f bin/ksh.old ]; then + rm -f bin/ksh.old +fi + +# Add entries to /etc/shells if we need them +if [ ! -r etc/shells ] ; then + touch etc/shells + chmod 644 etc/shells +fi + +if ! grep -q "/bin/ksh" etc/shells ; then + echo "/bin/ksh" >> etc/shells +fi diff --git a/patches/source/ksh93/fetch-ksh.sh b/patches/source/ksh93/fetch-ksh.sh new file mode 100755 index 000000000..27dc34a59 --- /dev/null +++ b/patches/source/ksh93/fetch-ksh.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +# 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 +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +set -o errexit + +# Use 1.0 (ksh93u+m) branch. Verify first that there's no better branch with +# "git branch -a" in the unpruned repo. +BRANCH=${1:-1.0} + +# Clear download area: +rm -rf ksh + +# Clone repository and check out $BRANCH: +git clone -b "$BRANCH" https://github.com/ksh93/ksh + +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-${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-${VERSION}_${DATE}_${HEADISAT}.tar.lz" +echo diff --git a/patches/source/ksh93/ksh93-functions.sh b/patches/source/ksh93/ksh93-functions.sh new file mode 100644 index 000000000..3cb82bb2a --- /dev/null +++ b/patches/source/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/patches/source/ksh93/ksh93.SlackBuild b/patches/source/ksh93/ksh93.SlackBuild new file mode 100755 index 000000000..5bd70a96a --- /dev/null +++ b/patches/source/ksh93/ksh93.SlackBuild @@ -0,0 +1,183 @@ +#!/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, 2023 Patrick J. Volkerding, Sebeka, MN, USA +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# 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=ksh93 +VERSION=${VERSION:-$(echo ksh-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +BUILD=${BUILD:-1_slack15.0} + +# Automatically determine the architecture we're building on: +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) export ARCH=i586 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$( uname -m ) ;; + 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" = "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 + +rm -rf $PKG +mkdir -p $TMP $PKG +cd $TMP + +rm -rf ksh-$VERSION +tar xvf $CWD/ksh-$VERSION.tar.?z || exit 1 +cd ksh-$VERSION || exit 1 + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \+ -o \ + \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ + -exec chmod 644 {} \+ + +# 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 +#cp arch/$SARCH/lib/libshell.a /usr/lib +#cp arch/$SARCH/lib/libast.so.5.4 /usr/lib +#cp arch/$SARCH/lib/libast.a /usr/lib +#cp arch/$SARCH/src/cmd/ksh93/cc-g,-fpic/libshell.so.1.1 /usr/lib +#cp arch/$SARCH/src/cmd/ksh93/cc-g,-fpic/libshell.a /usr/lib +#cp arch/$SARCH/src/lib/libast/libast.so.5.4 /usr/lib +#cp arch/$SARCH/src/cmd/ksh93/cc-g,-fpic/libast.a /usr/lib + +mkdir -p $PKG/usr/man/man1 +cp src/cmd/ksh93/sh.1 $PKG/usr/man/man1/ksh.1 +LD_LIBRARY_PATH=$PKG/lib $PKG/usr/bin/shcomp --nroff 2> $PKG/usr/man/man1/shcomp.1 || : +#mkdir -p $PKG/usr/man/man3 +#cp src/cmd/ksh93/shell.3 $PKG/usr/man/man3/ +#cp src/cmd/ksh93/nval.3 $PKG/usr/man/man3/ +( cd $PKG/usr/man/man1 ; ln -sf ksh.1 rksh.1 ) + +# Compress manual pages: +find $PKG/usr/man -type f -exec gzip -9 {} \+ +for i in $( find $PKG/usr/man -type l ) ; do + ln -s $( readlink $i ).gz $i.gz + rm $i +done + +## Install locale files: +#mkdir -p $PKG/usr/share +#cp -a share/lib/locale $PKG/usr/share +#chown -R root:root $PKG/usr/share +#( cd $PKG/usr/share +# find . -type d -exec chmod 755 {} \; +# find . -type f -exec chmod 644 {} \; +#) + +#cp src/cmd/ksh93/include/shell.h /usr/include + +# If anyone is actually using the ksh libraries, drop me some mail +# and explain which libs you use and what they're for. As it is, I +# don't see a compeling reason to include them, as ksh itself doesn't +# use them. +#( cd /usr/lib ; ln -sf libshell.so.1.1 libshell.so ) +#( cd /usr/lib rm -rf libast.so ; ln -sf libast.so.5.4 libast.so ) + +( cd $PKG/bin ; ln -sf ksh rksh ) + +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +( cd src/cmd/ksh93 + cp -a COMPATIBILITY* DESIGN* OBSOLETE* README* RELEASE* TYPES* \ + $PKG/usr/doc/$PKGNAM-$VERSION +) +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 +find . -name "*.def" -exec cp -a "{}" $PKG/usr/doc/$PKGNAM-$VERSION/LICENSES \; +find . -name "*.lic" -exec cp -a "{}" $PKG/usr/doc/$PKGNAM-$VERSION/LICENSES \; +rmdir $PKG/usr/doc/$PKGNAM-$VERSION/LICENSES 2> /dev/null +chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION +find $PKG/usr/doc/$PKGNAM-$VERSION -type f -exec chmod 644 "{}" \; +find $PKG/usr/doc/$PKGNAM-$VERSION -type d -exec chmod 755 "{}" \; + +#chmod 755 $PKG/usr/lib/libshell.so.1.1 +#chmod 755 $PKG/usr/lib/libast.so.5.4 + +# Strip binaries: +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + +mkdir -p $PKG/install +zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz diff --git a/patches/source/ksh93/slack-desc b/patches/source/ksh93/slack-desc new file mode 100644 index 000000000..637775a21 --- /dev/null +++ b/patches/source/ksh93/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# 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 +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +ksh93: ksh93 (KornShell 93u+m) +ksh93: +ksh93: The KornShell language and interactive shell were designed by +ksh93: David G. Korn at AT&T Bell Laboratories. Besides offering a powerful +ksh93: interactive shell, it also offers a robust programming language with +ksh93: such features as associative arrays and built in integer math +ksh93: operations. ksh is an excellent choice for system administration +ksh93: scripts and for everyday interactive use. +ksh93: +ksh93: The site for KornShell 93u+m is https://github.com/ksh93/ksh +ksh93: |