summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-09-18 19:02:14 +0000
committer Eric Hameleers <alien@slackware.com>2022-09-19 07:00:16 +0200
commit7de9181e0d4848ae4bb93be7cf8f21660a4e8752 (patch)
tree476e5657e260128d5e49803e39eaa5296c522a63 /source
parent74ad1fc784683f5733bbce69213f0c72a4e10267 (diff)
downloadcurrent-7de9181e0d4848ae4bb93be7cf8f21660a4e8752.tar.gz
current-7de9181e0d4848ae4bb93be7cf8f21660a4e8752.tar.xz
Sun Sep 18 19:02:14 UTC 202220220918190214
ap/slackpkg-15.0.10-noarch-2.txz: Rebuilt. fix: egrep and fgrep commands have been deprecated since 2007 fix: grep warning: stray \ before / Thanks to shamilbi. ap/vim-9.0.0500-x86_64-1.txz: Upgraded. Fixed heap-based buffer overflow. Thanks to marav for the heads-up. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2022-3234 (* Security fix *) x/ibus-m17n-1.4.17-x86_64-1.txz: Upgraded. xap/vim-gvim-9.0.0500-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
-rw-r--r--source/ap/slackpkg/files/core-functions.sh4
-rw-r--r--source/ap/slackpkg/files/slackpkg2
-rwxr-xr-xsource/ap/slackpkg/slackpkg.SlackBuild2
3 files changed, 4 insertions, 4 deletions
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index 56314e990..824547867 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -639,7 +639,7 @@ function mkregex_blacklist() {
s,^, ,
s,$, ,
s,^ (extra|pasture|patches|slackware(|64)|testing)/ $,^\1 ,
- s,^ ([^/]+)/ $, \\\.\\\/$PKGMAIN\\\/\1\$,
+ s,^ ([^/]+)/ $, \\\./$PKGMAIN/\1\$,
" ${CONF}/blacklist > ${TMPDIR}/blacklist.tmp
# Filter server and local package lists through blacklist
@@ -1276,7 +1276,7 @@ function sanity_check() {
[ "$SPINNING" = "off" ] || spinning ${TMPDIR}/waiting &
for i in $(ls -1 $ROOT/var/log/packages/ | \
- egrep -- "^.*-(${ARCH}|fw|noarch)-[^-]+-upgraded"); do
+ grep -E -- "^.*-(${ARCH}|fw|noarch)-[^-]+-upgraded"); do
REVNAME=$(echo ${i} | awk -F'-upgraded' '{ print $1 }')
mv $ROOT/var/log/packages/${i} $ROOT/var/log/packages/${REVNAME}
mv $ROOT/var/log/scripts/${i} $ROOT/var/log/scripts/${REVNAME}
diff --git a/source/ap/slackpkg/files/slackpkg b/source/ap/slackpkg/files/slackpkg
index 9fc7f5d4e..cc95bb08f 100644
--- a/source/ap/slackpkg/files/slackpkg
+++ b/source/ap/slackpkg/files/slackpkg
@@ -222,7 +222,7 @@ while [ -n "$1" ] ; do
CMD=$1
shift
if [ -n "$1" ]; then
- if echo $1 | egrep -q "^\.{0,2}/" ; then
+ if echo $1 | grep -Eq "^\.{0,2}/" ; then
if [ -e $1 ]; then
INPUTLIST=$(cat $1 | tr "\n" " ")
else
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index 4f630c485..78c1ab0d9 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=slackpkg
VERSION=${VERSION:-15.0.10}
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