summaryrefslogtreecommitdiffstats
path: root/source/a
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-11-23 20:34:16 +0000
committer Eric Hameleers <alien@slackware.com>2019-11-24 08:59:50 +0100
commit211e104a467e569d010f15e79732d3a43306a707 (patch)
tree448ee8bf88663f504d01776e1ea1460ae6d3a52d /source/a
parentbdd7acee1ce88958c9a3975d3a6f6e960d77afe5 (diff)
downloadcurrent-211e104a467e569d010f15e79732d3a43306a707.tar.gz
current-211e104a467e569d010f15e79732d3a43306a707.tar.xz
Sat Nov 23 20:34:16 UTC 201920191123203416
a/pkgtools-15.0-noarch-27.txz: Rebuilt. Escape some shell characters in symlink filenames. Thanks to GazL. d/parallel-20191122-noarch-1.txz: Upgraded. x/xorg-server-1.20.6-x86_64-1.txz: Upgraded. x/xorg-server-xephyr-1.20.6-x86_64-1.txz: Upgraded. x/xorg-server-xnest-1.20.6-x86_64-1.txz: Upgraded. x/xorg-server-xvfb-1.20.6-x86_64-1.txz: Upgraded. extra/tigervnc/tigervnc-1.10.0-x86_64-2.txz: Rebuilt. Recompiled against xorg-server-1.20.6.
Diffstat (limited to 'source/a')
-rwxr-xr-xsource/a/pkgtools/pkgtools.SlackBuild2
-rw-r--r--source/a/pkgtools/scripts/makepkg5
2 files changed, 4 insertions, 3 deletions
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index da23c76d5..5e647f514 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
# *** UPDATE THESE WITH EACH BUILD:
VERSION=15.0
ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-26}
+BUILD=${BUILD:-27}
# 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/makepkg b/source/a/pkgtools/scripts/makepkg
index d6b2e1863..9030d1f55 100644
--- a/source/a/pkgtools/scripts/makepkg
+++ b/source/a/pkgtools/scripts/makepkg
@@ -1,7 +1,7 @@
#!/bin/sh
# Copyright 1994, 1998, 2008 Patrick Volkerding, Moorhead, Minnesota USA
# Copyright 2003 Slackware Linux, Inc. Concord, CA USA
-# Copyright 2009, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -298,7 +298,8 @@ echo
echo "Searching for symbolic links:"
# Get rid of possible pre-existing trouble:
INST=$(mktemp $TMP/makepkg.XXXXXX)
-find . -type l -printf "%p\t%l\n" | LC_COLLATE=C sort | sed 's,^\./,, ; s, ,\\ ,g' | tee $INST
+# Escape some characters in symlink names. Current escape list is (space at the end): ;!#$\&*<>
+find . -type l -printf "%p\t%l\n" | LC_COLLATE=C sort | sed 's,^\./,, ; s,\([;!#$\&*<> ]\),\\\1,g' | tee $INST
if [ ! "$(cat $INST)" = "" ]; then
echo
echo "Making symbolic link creation script:"