diff options
Diffstat (limited to 'source')
41 files changed, 66 insertions, 57 deletions
diff --git a/source/a/mkinitrd/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch b/source/a/mkinitrd/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch new file mode 100644 index 000000000..1f2382895 --- /dev/null +++ b/source/a/mkinitrd/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch @@ -0,0 +1,23 @@ +--- ./mkinitrd_command_generator.sh.orig 2023-02-28 15:19:08.085991698 -0600 ++++ ./mkinitrd_command_generator.sh 2023-02-28 15:22:03.264982008 -0600 +@@ -308,11 +308,15 @@ + USING_RAID=1 + break + fi +- done +- # Additional check in case $BASEDEV is a partition of /dev/$MD: +- for BLK in $(sfdisk -ld /dev/$MD 2> /dev/null | grep "^/dev" | cut -d " " -f 1); do +- if [ "$BASEDEV" = "$BLK" ]; then +- USING_RAID=1 ++ # Additional check in case $BASEDEV is a partition of /dev/$MD: ++ for BLK in $(sfdisk -ld /dev/$MD 2> /dev/null | grep "^/dev" | cut -d " " -f 1); do ++ if [ "$BASEDEV" = "$BLK" ]; then ++ USING_RAID=1 ++ break ++ fi ++ done ++ # Break out of outer loop if needed. ++ if [ "$USING_RAID" = "1" ]; then + break + fi + done diff --git a/source/a/mkinitrd/mkinitrd.SlackBuild b/source/a/mkinitrd/mkinitrd.SlackBuild index d23adbc95..4042d355c 100755 --- a/source/a/mkinitrd/mkinitrd.SlackBuild +++ b/source/a/mkinitrd/mkinitrd.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2016, 2017, 2018, 2021, 2022, 2023 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mkinitrd VERSION=${VERSION:-1.4.11} BB=1.32.1 -BUILD=${BUILD:-30} +BUILD=${BUILD:-31} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -134,6 +134,8 @@ rm -f $PKG/sbin/mkinitrd.orig rm -f $PKG/usr/share/mkinitrd/mkinitrd_command_generator.sh.orig # Fix for kmod-30: ( cd $PKG/sbin ; zcat $CWD/0007-kmod30.patch.gz | patch -p1 --verbose || exit 1) || exit 1 +# Bugfix for previous RAID partition patch: +( cd $PKG/usr/share/mkinitrd ; zcat $CWD/0008-fix-check-if-BASEDEV-is-a-partition-of-a-RAID-volume.patch.gz | patch -p1 --verbose || exit 1) || exit 1 rm -f $PKG/sbin/mkinitrd.orig mkdir -p $PKG/usr/man/man{5,8} diff --git a/source/ap/vim/vim-gvim.SlackBuild b/source/ap/vim/vim-gvim.SlackBuild index 5308006f6..0c9462b41 100755 --- a/source/ap/vim/vim-gvim.SlackBuild +++ b/source/ap/vim/vim-gvim.SlackBuild @@ -111,9 +111,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix sh syntax highlighting: -zcat $CWD/vim-sh-syntax.patch.gz | patch -p1 --verbose || exit 1 - config_vim --with-x --enable-gui=gtk3 || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/ap/vim/vim-sh-syntax.patch b/source/ap/vim/vim-sh-syntax.patch deleted file mode 100644 index 9cd337333..000000000 --- a/source/ap/vim/vim-sh-syntax.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim -index 13d74db..4f7fafb 100644 ---- a/runtime/syntax/sh.vim -+++ b/runtime/syntax/sh.vim -@@ -335,7 +335,7 @@ syn match shEscape contained '\%(^\)\@!\%(\\\\\)*\\.' nextgroup=shComment - " systems too, however, so the following syntax will flag $(..) as - " an Error under /bin/sh. By consensus of vimdev'ers! - if exists("b:is_kornshell") || exists("b:is_bash") || exists("b:is_posix") -- syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]\|$" skip='\\\\\|\\.' end=")" contains=@shCommandSubList -+ syn region shCommandSub matchgroup=shCmdSubRegion start="\$(\ze[^(]" skip='\\\\\|\\.' end=")" contains=@shCommandSubList - syn region shArithmetic matchgroup=shArithRegion start="\$((" skip='\\\\\|\\.' end="))" contains=@shArithList - syn region shArithmetic matchgroup=shArithRegion start="\$\[" skip='\\\\\|\\.' end="\]" contains=@shArithList - syn match shSkipInitWS contained "^\s\+" diff --git a/source/ap/vim/vim.SlackBuild b/source/ap/vim/vim.SlackBuild index 2a75d4c36..580b44a24 100755 --- a/source/ap/vim/vim.SlackBuild +++ b/source/ap/vim/vim.SlackBuild @@ -152,9 +152,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix sh syntax highlighting: -zcat $CWD/vim-sh-syntax.patch.gz | patch -p1 --verbose || exit 1 - config_vim --without-x --disable-gui || exit 1 make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/source/n/whois/whois.SlackBuild b/source/n/whois/whois.SlackBuild index 0b76257f8..2cd391f12 100755 --- a/source/n/whois/whois.SlackBuild +++ b/source/n/whois/whois.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2010, 2011, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2008, 2009, 2010, 2011, 2017, 2018, 2019, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -59,6 +59,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Put bash completions in the system directory: +sed -i "s|/etc/bash_completion.d|/usr/share/bash-completion/completions|g" Makefile + make HAVE_LIBIDN2=y || exit make install install-pos BASEDIR=$PKG || exit 1 diff --git a/source/x/x11/build/font-adobe-100dpi b/source/x/x11/build/font-adobe-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-100dpi +++ b/source/x/x11/build/font-adobe-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-adobe-75dpi b/source/x/x11/build/font-adobe-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-75dpi +++ b/source/x/x11/build/font-adobe-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-adobe-utopia-100dpi b/source/x/x11/build/font-adobe-utopia-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-utopia-100dpi +++ b/source/x/x11/build/font-adobe-utopia-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-adobe-utopia-75dpi b/source/x/x11/build/font-adobe-utopia-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-utopia-75dpi +++ b/source/x/x11/build/font-adobe-utopia-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-adobe-utopia-type1 b/source/x/x11/build/font-adobe-utopia-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-adobe-utopia-type1 +++ b/source/x/x11/build/font-adobe-utopia-type1 @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-alias b/source/x/x11/build/font-alias index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/font-alias +++ b/source/x/x11/build/font-alias @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/font-arabic-misc b/source/x/x11/build/font-arabic-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-arabic-misc +++ b/source/x/x11/build/font-arabic-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-100dpi b/source/x/x11/build/font-bh-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-100dpi +++ b/source/x/x11/build/font-bh-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-75dpi b/source/x/x11/build/font-bh-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-75dpi +++ b/source/x/x11/build/font-bh-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-lucidatypewriter-100dpi b/source/x/x11/build/font-bh-lucidatypewriter-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-lucidatypewriter-100dpi +++ b/source/x/x11/build/font-bh-lucidatypewriter-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-lucidatypewriter-75dpi b/source/x/x11/build/font-bh-lucidatypewriter-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-lucidatypewriter-75dpi +++ b/source/x/x11/build/font-bh-lucidatypewriter-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-ttf b/source/x/x11/build/font-bh-ttf index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-ttf +++ b/source/x/x11/build/font-bh-ttf @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bh-type1 b/source/x/x11/build/font-bh-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bh-type1 +++ b/source/x/x11/build/font-bh-type1 @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bitstream-100dpi b/source/x/x11/build/font-bitstream-100dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bitstream-100dpi +++ b/source/x/x11/build/font-bitstream-100dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bitstream-75dpi b/source/x/x11/build/font-bitstream-75dpi index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bitstream-75dpi +++ b/source/x/x11/build/font-bitstream-75dpi @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-bitstream-type1 b/source/x/x11/build/font-bitstream-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-bitstream-type1 +++ b/source/x/x11/build/font-bitstream-type1 @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-cronyx-cyrillic b/source/x/x11/build/font-cronyx-cyrillic index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-cronyx-cyrillic +++ b/source/x/x11/build/font-cronyx-cyrillic @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-cursor-misc b/source/x/x11/build/font-cursor-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-cursor-misc +++ b/source/x/x11/build/font-cursor-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-daewoo-misc b/source/x/x11/build/font-daewoo-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-daewoo-misc +++ b/source/x/x11/build/font-daewoo-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-dec-misc b/source/x/x11/build/font-dec-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-dec-misc +++ b/source/x/x11/build/font-dec-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-ibm-type1 b/source/x/x11/build/font-ibm-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-ibm-type1 +++ b/source/x/x11/build/font-ibm-type1 @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-isas-misc b/source/x/x11/build/font-isas-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-isas-misc +++ b/source/x/x11/build/font-isas-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-jis-misc b/source/x/x11/build/font-jis-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-jis-misc +++ b/source/x/x11/build/font-jis-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-micro-misc b/source/x/x11/build/font-micro-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-micro-misc +++ b/source/x/x11/build/font-micro-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-misc-cyrillic b/source/x/x11/build/font-misc-cyrillic index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-misc-cyrillic +++ b/source/x/x11/build/font-misc-cyrillic @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-misc-ethiopic b/source/x/x11/build/font-misc-ethiopic index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/font-misc-ethiopic +++ b/source/x/x11/build/font-misc-ethiopic @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/font-misc-meltho b/source/x/x11/build/font-misc-meltho index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-misc-meltho +++ b/source/x/x11/build/font-misc-meltho @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-misc-misc b/source/x/x11/build/font-misc-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-misc-misc +++ b/source/x/x11/build/font-misc-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-mutt-misc b/source/x/x11/build/font-mutt-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-mutt-misc +++ b/source/x/x11/build/font-mutt-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-schumacher-misc b/source/x/x11/build/font-schumacher-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-schumacher-misc +++ b/source/x/x11/build/font-schumacher-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-screen-cyrillic b/source/x/x11/build/font-screen-cyrillic index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-screen-cyrillic +++ b/source/x/x11/build/font-screen-cyrillic @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-sony-misc b/source/x/x11/build/font-sony-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-sony-misc +++ b/source/x/x11/build/font-sony-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-sun-misc b/source/x/x11/build/font-sun-misc index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-sun-misc +++ b/source/x/x11/build/font-sun-misc @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-winitzki-cyrillic b/source/x/x11/build/font-winitzki-cyrillic index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-winitzki-cyrillic +++ b/source/x/x11/build/font-winitzki-cyrillic @@ -1 +1 @@ -5 +1 diff --git a/source/x/x11/build/font-xfree86-type1 b/source/x/x11/build/font-xfree86-type1 index 7ed6ff82d..d00491fd7 100644 --- a/source/x/x11/build/font-xfree86-type1 +++ b/source/x/x11/build/font-xfree86-type1 @@ -1 +1 @@ -5 +1 |