diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2022-09-06 20:21:24 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2022-09-07 07:00:17 +0200 |
commit | 64fbcd92b6a53a19a394db7fe96fa16cb31c4928 (patch) | |
tree | 82a1a1a95e08dd5afdc4d96c9cffe92d516cee57 /source/a | |
parent | 9172af6de2cb4a9b201fb9deb198e116200ece88 (diff) | |
download | current-64fbcd92b6a53a19a394db7fe96fa16cb31c4928.tar.gz |
Tue Sep 6 20:21:24 UTC 202220220906202124
a/cracklib-2.9.8-x86_64-1.txz: Upgraded.
a/gawk-5.2.0-x86_64-1.txz: Upgraded.
a/grep-3.8-x86_64-1.txz: Upgraded.
a/kernel-firmware-20220902_2f2f018-noarch-1.txz: Upgraded.
a/kernel-generic-5.19.7-x86_64-1.txz: Upgraded.
a/kernel-huge-5.19.7-x86_64-1.txz: Upgraded.
a/kernel-modules-5.19.7-x86_64-1.txz: Upgraded.
a/pcmciautils-018-x86_64-5.txz: Rebuilt.
rc.pcmcia: change fgrep to grep -F.
a/pkgtools-15.1-noarch-1.txz: Upgraded.
removepkg: change fgrep to grep -F.
a/sysvinit-functions-8.53-x86_64-6.txz: Rebuilt.
/etc/rc.d/init.d/functions: change egrep to grep -E.
a/sysvinit-scripts-15.1-noarch-2.txz: Rebuilt.
rc.cpufreq: command-line choice should take priority
over /etc/default/cpufreq. Thanks to af7567.
rc.6: change egrep to grep -E.
ap/sqlite-3.39.3-x86_64-1.txz: Upgraded.
ap/vim-9.0.0396-x86_64-1.txz: Upgraded.
Fixed use after free.
Thanks to marav for the heads-up.
For more information, see:
https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-3099
(* Security fix *)
d/autoconf-2.71-noarch-2.txz: Rebuilt.
doinst.sh: change fgrep to grep -F.
d/autoconf-archive-2022.09.03-noarch-1.txz: Upgraded.
d/automake-1.16.5-noarch-2.txz: Rebuilt.
doinst.sh: change fgrep to grep -F.
d/kernel-headers-5.19.7-x86-1.txz: Upgraded.
d/libtool-2.4.7-x86_64-4.txz: Rebuilt.
doinst.sh: change fgrep to grep -F.
d/meson-0.63.2-x86_64-1.txz: Upgraded.
d/vala-0.56.3-x86_64-1.txz: Upgraded.
k/kernel-source-5.19.7-noarch-1.txz: Upgraded.
kde/bluedevil-5.25.5-x86_64-1.txz: Upgraded.
kde/breeze-5.25.5-x86_64-1.txz: Upgraded.
kde/breeze-grub-5.25.5-x86_64-1.txz: Upgraded.
kde/breeze-gtk-5.25.5-x86_64-1.txz: Upgraded.
kde/drkonqi-5.25.5-x86_64-1.txz: Upgraded.
kde/kactivitymanagerd-5.25.5-x86_64-1.txz: Upgraded.
kde/kde-cli-tools-5.25.5-x86_64-1.txz: Upgraded.
kde/kde-gtk-config-5.25.5-x86_64-1.txz: Upgraded.
kde/kdecoration-5.25.5-x86_64-1.txz: Upgraded.
kde/kdeplasma-addons-5.25.5-x86_64-1.txz: Upgraded.
kde/kgamma5-5.25.5-x86_64-1.txz: Upgraded.
kde/khotkeys-5.25.5-x86_64-1.txz: Upgraded.
kde/kinfocenter-5.25.5-x86_64-1.txz: Upgraded.
kde/kmenuedit-5.25.5-x86_64-1.txz: Upgraded.
kde/kscreen-5.25.5-x86_64-1.txz: Upgraded.
kde/kscreenlocker-5.25.5-x86_64-1.txz: Upgraded.
kde/ksshaskpass-5.25.5-x86_64-1.txz: Upgraded.
kde/ksystemstats-5.25.5-x86_64-1.txz: Upgraded.
kde/kwallet-pam-5.25.5-x86_64-1.txz: Upgraded.
kde/kwayland-integration-5.25.5-x86_64-1.txz: Upgraded.
kde/kwin-5.25.5-x86_64-1.txz: Upgraded.
kde/kwrited-5.25.5-x86_64-1.txz: Upgraded.
kde/layer-shell-qt-5.25.5-x86_64-1.txz: Upgraded.
kde/libkscreen-5.25.5-x86_64-1.txz: Upgraded.
kde/libksysguard-5.25.5-x86_64-1.txz: Upgraded.
kde/milou-5.25.5-x86_64-1.txz: Upgraded.
kde/oxygen-5.25.5-x86_64-1.txz: Upgraded.
kde/oxygen-sounds-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-browser-integration-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-desktop-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-disks-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-firewall-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-integration-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-nm-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-pa-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-sdk-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-systemmonitor-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-vault-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-wayland-protocols-1.8.0-x86_64-1.txz: Upgraded.
kde/plasma-workspace-5.25.5-x86_64-1.txz: Upgraded.
kde/plasma-workspace-wallpapers-5.25.5-x86_64-1.txz: Upgraded.
kde/polkit-kde-agent-1-5.25.5-x86_64-1.txz: Upgraded.
kde/powerdevil-5.25.5-x86_64-1.txz: Upgraded.
kde/qqc2-breeze-style-5.25.5-x86_64-1.txz: Upgraded.
kde/sddm-kcm-5.25.5-x86_64-1.txz: Upgraded.
kde/systemsettings-5.25.5-x86_64-1.txz: Upgraded.
kde/xdg-desktop-portal-kde-5.25.5-x86_64-1.txz: Upgraded.
l/fluidsynth-2.2.9-x86_64-1.txz: Upgraded.
l/libsoup3-3.0.8-x86_64-1.txz: Upgraded.
l/libssh-0.10.3-x86_64-1.txz: Upgraded.
l/neon-0.32.3-x86_64-1.txz: Upgraded.
l/slang-2.3.3-x86_64-1.txz: Upgraded.
n/nmap-7.93-x86_64-1.txz: Upgraded.
x/ibus-m17n-1.4.11-x86_64-1.txz: Upgraded.
x/libXft-2.3.5-x86_64-1.txz: Upgraded.
xap/mozilla-firefox-104.0.2-x86_64-1.txz: Upgraded.
This is a bugfix release.
For more information, see:
https://www.mozilla.org/en-US/firefox/104.0.2/releasenotes/
xap/vim-gvim-9.0.0396-x86_64-1.txz: Upgraded.
xfce/xfce4-pulseaudio-plugin-0.4.4-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/a')
39 files changed, 46 insertions, 46 deletions
diff --git a/source/a/cracklib/cracklib.SlackBuild b/source/a/cracklib/cracklib.SlackBuild index 8d2ea3ac..e58c28d7 100755 --- a/source/a/cracklib/cracklib.SlackBuild +++ b/source/a/cracklib/cracklib.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=cracklib VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/efibootmgr/efibootmgr.SlackBuild b/source/a/efibootmgr/efibootmgr.SlackBuild index 42e58797..dc61fea8 100755 --- a/source/a/efibootmgr/efibootmgr.SlackBuild +++ b/source/a/efibootmgr/efibootmgr.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/efivar/efivar.SlackBuild b/source/a/efivar/efivar.SlackBuild index 39b8a757..8d0c681a 100755 --- a/source/a/efivar/efivar.SlackBuild +++ b/source/a/efivar/efivar.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/elogind/elogind.SlackBuild b/source/a/elogind/elogind.SlackBuild index 9438d08b..2f8f042c 100755 --- a/source/a/elogind/elogind.SlackBuild +++ b/source/a/elogind/elogind.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/exfatprogs/exfatprogs.SlackBuild b/source/a/exfatprogs/exfatprogs.SlackBuild index f8390aa2..de966a19 100755 --- a/source/a/exfatprogs/exfatprogs.SlackBuild +++ b/source/a/exfatprogs/exfatprogs.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/f2fs-tools/f2fs-tools.SlackBuild b/source/a/f2fs-tools/f2fs-tools.SlackBuild index eb3b7ccc..def4c451 100755 --- a/source/a/f2fs-tools/f2fs-tools.SlackBuild +++ b/source/a/f2fs-tools/f2fs-tools.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild index 07df3be2..fbbf7143 100755 --- a/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild +++ b/source/a/glibc-zoneinfo/glibc-zoneinfo.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/grep/grep.SlackBuild b/source/a/grep/grep.SlackBuild index 16e50d5b..541ffc3f 100755 --- a/source/a/grep/grep.SlackBuild +++ b/source/a/grep/grep.SlackBuild @@ -99,7 +99,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mkdir -p $PKG/usr/bin ( cd $PKG/usr/bin ln -sf ../../bin/grep . - ln -sf ../../bin/egrep . + ln -sf ../../bin/grep -E . ln -sf ../../bin/fgrep . ) diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild index 56f0c0be..c75ca107 100755 --- a/source/a/grub/grub.SlackBuild +++ b/source/a/grub/grub.SlackBuild @@ -34,7 +34,7 @@ BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/gzip/gzip.SlackBuild b/source/a/gzip/gzip.SlackBuild index 8707648e..ec91bec3 100755 --- a/source/a/gzip/gzip.SlackBuild +++ b/source/a/gzip/gzip.SlackBuild @@ -118,8 +118,8 @@ rm -f $PKG/bin/uncompress #( cd usr/bin ; ln -sf ../../bin/zcat zcat ) #( cd usr/bin ; rm -rf zcmp ) #( cd usr/bin ; ln -sf zdiff zcmp ) - #( cd usr/bin ; rm -rf zegrep ) - #( cd usr/bin ; ln -sf zgrep zegrep ) + #( cd usr/bin ; rm -rf zgrep -E ) + #( cd usr/bin ; ln -sf zgrep zgrep -E ) #( cd usr/bin ; rm -rf zfgrep ) #( cd usr/bin ; ln -sf zgrep zfgrep ) #) diff --git a/source/a/hostname/hostname.SlackBuild b/source/a/hostname/hostname.SlackBuild index 83bd53b9..a13e43d0 100755 --- a/source/a/hostname/hostname.SlackBuild +++ b/source/a/hostname/hostname.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/inih/inih.SlackBuild b/source/a/inih/inih.SlackBuild index 85e808be..dabd7fcc 100755 --- a/source/a/inih/inih.SlackBuild +++ b/source/a/inih/inih.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/lbzip2/lbzip2.SlackBuild b/source/a/lbzip2/lbzip2.SlackBuild index 0a73dc79..a9b2a0f0 100755 --- a/source/a/lbzip2/lbzip2.SlackBuild +++ b/source/a/lbzip2/lbzip2.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/lhasa/lhasa.SlackBuild b/source/a/lhasa/lhasa.SlackBuild index 375947b8..c83a6afe 100755 --- a/source/a/lhasa/lhasa.SlackBuild +++ b/source/a/lhasa/lhasa.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/libblockdev/libblockdev.SlackBuild b/source/a/libblockdev/libblockdev.SlackBuild index 5f815f1d..68681eee 100755 --- a/source/a/libblockdev/libblockdev.SlackBuild +++ b/source/a/libblockdev/libblockdev.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/libbytesize/libbytesize.SlackBuild b/source/a/libbytesize/libbytesize.SlackBuild index 21765d4e..e5c8c6de 100755 --- a/source/a/libbytesize/libbytesize.SlackBuild +++ b/source/a/libbytesize/libbytesize.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/libpwquality/libpwquality.SlackBuild b/source/a/libpwquality/libpwquality.SlackBuild index 502d5ab4..76f7ab0d 100755 --- a/source/a/libpwquality/libpwquality.SlackBuild +++ b/source/a/libpwquality/libpwquality.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-6} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/lzip/lzip.SlackBuild b/source/a/lzip/lzip.SlackBuild index a81b0c7d..ad1174a8 100755 --- a/source/a/lzip/lzip.SlackBuild +++ b/source/a/lzip/lzip.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/lzlib/lzlib.SlackBuild b/source/a/lzlib/lzlib.SlackBuild index c59d70ca..e59333d9 100755 --- a/source/a/lzlib/lzlib.SlackBuild +++ b/source/a/lzlib/lzlib.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/mlocate/mlocate.SlackBuild b/source/a/mlocate/mlocate.SlackBuild index bbd3c34b..f6d3a85d 100755 --- a/source/a/mlocate/mlocate.SlackBuild +++ b/source/a/mlocate/mlocate.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/ndctl/ndctl.SlackBuild b/source/a/ndctl/ndctl.SlackBuild index 8faf65c2..d125ff98 100755 --- a/source/a/ndctl/ndctl.SlackBuild +++ b/source/a/ndctl/ndctl.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/nvi/nvi.SlackBuild b/source/a/nvi/nvi.SlackBuild index 2d9f4125..d752ab28 100755 --- a/source/a/nvi/nvi.SlackBuild +++ b/source/a/nvi/nvi.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/os-prober/os-prober.SlackBuild b/source/a/os-prober/os-prober.SlackBuild index 6706508b..b12e4bb6 100755 --- a/source/a/os-prober/os-prober.SlackBuild +++ b/source/a/os-prober/os-prober.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/pcmciautils/config/rc.pcmcia b/source/a/pcmciautils/config/rc.pcmcia index 1f21be84..46621da9 100755 --- a/source/a/pcmciautils/config/rc.pcmcia +++ b/source/a/pcmciautils/config/rc.pcmcia @@ -14,7 +14,7 @@ DRIVER_OPTS= case "$1" in start) echo "Starting PCMCIA services:" - fgrep -q pcmcia /proc/devices + grep -F -q pcmcia /proc/devices if [ $? -ne 0 ] ; then if [ "$DRIVER" = "probe" ]; then echo " <Probing for PCIC: edit /etc/rc.d/rc.pcmcia>" diff --git a/source/a/pcmciautils/pcmciautils.SlackBuild b/source/a/pcmciautils/pcmciautils.SlackBuild index 5d47054c..b67b3286 100755 --- a/source/a/pcmciautils/pcmciautils.SlackBuild +++ b/source/a/pcmciautils/pcmciautils.SlackBuild @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=pcmciautils VERSION=${VERSION:-018} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild index f9c031a0..de41b74d 100755 --- a/source/a/pkgtools/pkgtools.SlackBuild +++ b/source/a/pkgtools/pkgtools.SlackBuild @@ -28,9 +28,9 @@ PKG=$TMP/package-pkgtools PKGNAM=pkgtools # *** UPDATE THESE WITH EACH BUILD: -VERSION=15.0 +VERSION=15.1 ARCH=${ARCH:-noarch} -BUILD=${BUILD:-42} +BUILD=${BUILD:-1} # 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 diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg index cb7e9119..0113c0fd 100644 --- a/source/a/pkgtools/scripts/removepkg +++ b/source/a/pkgtools/scripts/removepkg @@ -351,7 +351,7 @@ remove_packages() { rm -f $TMP/$PKGNAME fi fi - if fgrep "./" $ADM_DIR/packages/$PKGNAME 1> /dev/null 2>&1; then + if grep -F "./" $ADM_DIR/packages/$PKGNAME 1> /dev/null 2>&1; then TRIGGER="^\.\/" else TRIGGER="FILE LIST:" @@ -360,7 +360,7 @@ remove_packages() { ! [ $TERSE ] && echo "Removing files:" fi sed -n "/$TRIGGER/,/^$/p" < $ADM_DIR/packages/$PKGNAME | \ - fgrep -v "FILE LIST:" | sort -u > $TMP/delete_list$$ + grep -F -v "FILE LIST:" | sort -u > $TMP/delete_list$$ # Pat's new-new && improved pre-removal routine. cat_except $ADM_DIR/packages $PKGNAME | sort -u > $TMP/required_list$$ if [ -r $ADM_DIR/scripts/$PKGNAME ]; then diff --git a/source/a/plzip/plzip.SlackBuild b/source/a/plzip/plzip.SlackBuild index 035d8d1d..29148dc3 100755 --- a/source/a/plzip/plzip.SlackBuild +++ b/source/a/plzip/plzip.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/quota/quota.SlackBuild b/source/a/quota/quota.SlackBuild index 0e22b88a..06885560 100755 --- a/source/a/quota/quota.SlackBuild +++ b/source/a/quota/quota.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/sysklogd/sysklogd.SlackBuild b/source/a/sysklogd/sysklogd.SlackBuild index 7f525b62..7423d386 100755 --- a/source/a/sysklogd/sysklogd.SlackBuild +++ b/source/a/sysklogd/sysklogd.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/sysvinit-functions/functions b/source/a/sysvinit-functions/functions index 580216d1..470240b0 100644 --- a/source/a/sysvinit-functions/functions +++ b/source/a/sysvinit-functions/functions @@ -548,7 +548,7 @@ resolve_dm_name() { name="$1" line=$(/sbin/dmraid -ay -t --ignorelocking | \ - egrep -iv "no block devices found|No RAID disks" | \ + grep -E -iv "no block devices found|No RAID disks" | \ awk -F ':' "{ if (\$1 ~ /^$name$/) { print \$2; }}") for x in $line ; do if [[ "$x" =~ "^/dev/" ]] ; then diff --git a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild index 35d576f9..cfd18bc5 100755 --- a/source/a/sysvinit-functions/sysvinit-functions.SlackBuild +++ b/source/a/sysvinit-functions/sysvinit-functions.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-functions VERSION=${VERSION:-8.53} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/a/sysvinit-scripts/scripts/rc.6 b/source/a/sysvinit-scripts/scripts/rc.6 index 41525c35..d63a77bf 100644 --- a/source/a/sysvinit-scripts/scripts/rc.6 +++ b/source/a/sysvinit-scripts/scripts/rc.6 @@ -326,7 +326,7 @@ wait if [ -x /sbin/genpowerd -a -z "$container" ]; then # See if this is a powerfail situation: - if egrep -q "FAIL|SCRAM" /etc/upsstatus 2> /dev/null ; then + if grep -E -q "FAIL|SCRAM" /etc/upsstatus 2> /dev/null ; then # Signal UPS to shut off the inverter: /sbin/genpowerd -k if [ ! $? = 0 ]; then diff --git a/source/a/sysvinit-scripts/scripts/rc.cpufreq b/source/a/sysvinit-scripts/scripts/rc.cpufreq index 10d713f0..739d99b8 100644 --- a/source/a/sysvinit-scripts/scripts/rc.cpufreq +++ b/source/a/sysvinit-scripts/scripts/rc.cpufreq @@ -37,17 +37,17 @@ if [ "$(cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_driver 2> /dev/null)" = SCALING_GOVERNOR="performance" fi -# If rc.cpufreq is given an option, use it for the CPU scaling governor instead: -if [ ! -z "$1" -a "$1" != "start" ]; then - SCALING_GOVERNOR=$1 -fi - # To force a particular option without having to edit this file, uncomment the # line in /etc/default/cpufreq and edit it to select the desired option: if [ -r /etc/default/cpufreq ]; then . /etc/default/cpufreq fi +# If rc.cpufreq is given an option, use it for the CPU scaling governor instead: +if [ ! -z "$1" -a "$1" != "start" ]; then + SCALING_GOVERNOR=$1 +fi + # If you need to load a specific CPUFreq driver, load it here. Most likely you don't. #/sbin/modprobe acpi-cpufreq diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index de8360c2..d81fb301 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-15.1} ARCH=noarch -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # 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 diff --git a/source/a/time/time.SlackBuild b/source/a/time/time.SlackBuild index 6b1a123e..b278e4a1 100755 --- a/source/a/time/time.SlackBuild +++ b/source/a/time/time.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-4} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/udisks2/udisks2.SlackBuild b/source/a/udisks2/udisks2.SlackBuild index cb9030be..1c7c8b25 100755 --- a/source/a/udisks2/udisks2.SlackBuild +++ b/source/a/udisks2/udisks2.SlackBuild @@ -32,7 +32,7 @@ BUILD=${BUILD:-1} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/volume_key/volume_key.SlackBuild b/source/a/volume_key/volume_key.SlackBuild index b9bff21d..97b30ecc 100755 --- a/source/a/volume_key/volume_key.SlackBuild +++ b/source/a/volume_key/volume_key.SlackBuild @@ -31,7 +31,7 @@ BUILD=${BUILD:-5} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac diff --git a/source/a/zerofree/zerofree.SlackBuild b/source/a/zerofree/zerofree.SlackBuild index 02311652..1bc920ba 100755 --- a/source/a/zerofree/zerofree.SlackBuild +++ b/source/a/zerofree/zerofree.SlackBuild @@ -30,7 +30,7 @@ BUILD=${BUILD:-3} if [ -z "$ARCH" ]; then case "$(uname -m)" in i?86) ARCH=i586 ;; - arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; + arm*) readelf /usr/bin/file -A | grep -E -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; esac |