1 files changed, 43 insertions, 19 deletions
diff --git a/accessibility/xdotool/xdotool.SlackBuild b/accessibility/xdotool/xdotool.SlackBuild
index 3625f5e739..22c2082077 100644
--- a/accessibility/xdotool/xdotool.SlackBuild
+++ b/accessibility/xdotool/xdotool.SlackBuild
@@ -6,6 +6,17 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20200329 bkw:
+# - BUILD=3
+# - Stop including references to the build and $PKG dirs in the binary. This
+#   was a potential security risk. Thanks to Leonardo Citrolo for reporting
+#   this (along with a solution).
+# - Actually install the binary stripped.
+
+# 20191219 bkw:
+# - BUILD=2
+# - install API (doxygen) docs.
+
 # 20170618 bkw:
 # - stop running ldconfig during 'make install'. this is really just me being
 #   nitpicky, but build scripts should never affect anything outside of $TMP.
@@ -37,10 +48,9 @@
 # - make & install HTML doc instead of raw POD doc
 # - fix permissions in examples/
 
-
 PRGNAM=xdotool
 VERSION=${VERSION:-3.20160805.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-3}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -79,27 +89,41 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 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 \
- \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-
-mkdir -p $PKG/usr/lib$LIBDIRSUFFIX
-make WARNFLAGS="$SLKCFLAGS" PREFIX=/usr INSTALLLIB=/usr/lib$LIBDIRSUFFIX
-strip $PRGNAM libxdo.so
-make install PREFIX=$PKG/usr INSTALLLIB=$PKG/usr/lib$LIBDIRSUFFIX LDCONFIG=true
-make $PRGNAM.html
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
-gzip -9 $PKG/usr/man/man1/$PRGNAM.1
+# 20200329 bkw: make this section a bit more readable I hope.
+# The LDCONFIG=true is counter-intuitive: it means "run the 'true'
+# command instead of the 'ldconfig' command". In other words, do
+# NOT run ldconfig (opposite of what it seems to mean in English).
+COMMON="WITHOUT_RPATH_FIX=1 LDCONFIG=true"
+LIBDIR=/usr/lib$LIBDIRSUFFIX
+
+mkdir -p $PKG/$LIBDIR
 
-chmod 755 examples/*.sh
-chmod 644 $PKG/usr/include/*.h
+make \
+  WARNFLAGS="$SLKCFLAGS" \
+  PREFIX=/usr \
+  INSTALLLIB=$LIBDIR \
+  $COMMON
+
+make install \
+  PREFIX=$PKG/usr \
+  INSTALLLIB=$PKG/$LIBDIR \
+  $COMMON
+
+# 20200329 bkw: strip binary *after* installing, since 'make install' is
+# relinking it.
+strip $PKG/usr/bin/$PRGNAM $PKG/usr/lib$LIBDIRSUFFIX/libxdo.so.?
+
+make docs $PRGNAM.html
+
+gzip -9 $PKG/usr/man/man1/$PRGNAM.1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-chmod 0644 examples/*.sh
-cp -a CHANGELIST README COPYRIGHT examples $PRGNAM.html \
-     $PKG/usr/doc/$PRGNAM-$VERSION
+chmod 0644 examples/*.sh $PKG/usr/include/*.h
+cp -a CHANGELIST README COPYRIGHT examples $PRGNAM.html docs/html \
+      $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install