1 files changed, 9 insertions, 13 deletions
diff --git a/network/dublin-traceroute/dublin-traceroute.SlackBuild b/network/dublin-traceroute/dublin-traceroute.SlackBuild
index 531bc56ac2..b204aef358 100644
--- a/network/dublin-traceroute/dublin-traceroute.SlackBuild
+++ b/network/dublin-traceroute/dublin-traceroute.SlackBuild
@@ -23,6 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # 07/Apr/2018 * First version
+# 20230530 bkw: modified by SlackBuilds.org: do not write to $CWD.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
@@ -40,9 +41,6 @@ if [ -z "$ARCH" ]; then
   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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -77,9 +75,9 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} + -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
 mkdir -p build
 cd build
@@ -91,16 +89,9 @@ cd build
     -DSETCAP_EXECUTABLE=FALSE \
     -DCMAKE_BUILD_TYPE=Release ..
   make
-  make install DESTDIR=$PKG
+  make install/strip DESTDIR=$PKG
 cd ..
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-if [ "${SETCAP:-yes}" = "yes" ]; then
-  sed -i -e 's/^## //' $CWD/doinst.sh
-fi
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp COPYING README.md contributors.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
@@ -109,5 +100,10 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
+# 20230530 bkw: modify the installed file, not the one in $CWD
+if [ "${SETCAP:-yes}" = "yes" ]; then
+  sed -i -e 's/^## //' $PKG/install/doinst.sh
+fi
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE