4 files changed, 38 insertions, 40 deletions
diff --git a/system/unshield/README b/system/unshield/README
index d184f5fa92..72d9cbadb4 100644
--- a/system/unshield/README
+++ b/system/unshield/README
@@ -1 +1,12 @@
 unshield (extractor for Microsoft InstallShield cabinet files)
+
+Unshield extracts CAB files from InstallShield installers, used to
+install software on Microsoft Windows based machines. The goals of
+this implementation are:
+
+- Use a well known open source license (MIT)
+- Work on both little-endian and big-endian systems
+- Separate the implementation into a tool and a library
+- Support InstallShield versions 5 and later
+- Be able to list contents of InstallShield Cabinet Files
+- Be able to extract files from InstallShield Cabinet Files
diff --git a/system/unshield/slack-desc b/system/unshield/slack-desc
index fe46b7bdae..0b009c8716 100644
--- a/system/unshield/slack-desc
+++ b/system/unshield/slack-desc
@@ -8,8 +8,8 @@
         |-----handy-ruler------------------------------------------------------|
 unshield: unshield (extractor for Microsoft InstallShield cabinet files)
 unshield:
-unshield:
-unshield:
+unshield: Unshield extracts CAB files from InstallShield installers, used to
+unshield: install software on Microsoft Windows based machines.
 unshield:
 unshield:
 unshield:
diff --git a/system/unshield/unshield.SlackBuild b/system/unshield/unshield.SlackBuild
index f730216c7b..d2c9614433 100644
--- a/system/unshield/unshield.SlackBuild
+++ b/system/unshield/unshield.SlackBuild
@@ -6,10 +6,13 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210819 bkw: replace 2009 version from sourceforge with 2018 github
+# release. Expand README and slack-desc a bit, too.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=unshield
-VERSION=${VERSION:-0.6}
+VERSION=${VERSION:-1.4.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -22,9 +25,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
@@ -57,39 +57,26 @@ 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 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --disable-static \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install-strip DESTDIR=$PKG
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DCMAKE_INSTALL_DATAROOTDIR=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
 gzip -9 $PKG/usr/man/man?/*.?
 
+# 1.4.3 has a ChangeLog, but it's ancient, don't include.
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  README LICENSE TODO \
-  $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README LICENSE TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README* LICENSE $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/unshield/unshield.info b/system/unshield/unshield.info
index f879824f7f..bbc24521a4 100644
--- a/system/unshield/unshield.info
+++ b/system/unshield/unshield.info
@@ -1,8 +1,8 @@
 PRGNAM="unshield"
-VERSION="0.6"
-HOMEPAGE="https://sourceforge.net/projects/synce"
-DOWNLOAD="https://downloads.sourceforge.net/project/synce/Unshield/0.6/unshield-0.6.tar.gz"
-MD5SUM="31a829192a255160d1f71cda4c865c9c"
+VERSION="1.4.3"
+HOMEPAGE="https://github.com/twogood/unshield"
+DOWNLOAD="https://github.com/twogood/unshield/archive/1.4.3/unshield-1.4.3.tar.gz"
+MD5SUM="ba0759866923a62be5ca799232c2b480"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""