2 files changed, 25 insertions, 32 deletions
diff --git a/system/openscap/openscap.SlackBuild b/system/openscap/openscap.SlackBuild
index bcfa73981b49..1b3724f2b63b 100644
--- a/system/openscap/openscap.SlackBuild
+++ b/system/openscap/openscap.SlackBuild
@@ -22,10 +22,14 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220210 bkw: Modified by SlackBuilds.org: updated for v1.3.6,
+# as the old version wouldn't build on 15.0. This means switching to
+# cmake and adding xmlsec as a dependency.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=openscap
-VERSION=${VERSION:-1.2.9}
+VERSION=${VERSION:-1.3.6}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +42,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
@@ -75,31 +76,23 @@ 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 {} \;
-
-./autogen.sh
-
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
-make
-make install DESTDIR=$PKG
-
-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
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  -o -perm 440 -o -perm 400 \) -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_MANDIR=/usr/man \
+    -DCMAKE_BUILD_TYPE=Release ..
+  make
+  make install/strip DESTDIR=$PKG
+cd ..
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING NEWS README* $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/system/openscap/openscap.info b/system/openscap/openscap.info
index e21ce42556f0..fa95589c53fc 100644
--- a/system/openscap/openscap.info
+++ b/system/openscap/openscap.info
@@ -1,10 +1,10 @@
 PRGNAM="openscap"
-VERSION="1.2.9"
+VERSION="1.3.6"
 HOMEPAGE="https://www.open-scap.org/"
-DOWNLOAD="https://github.com/OpenSCAP/openscap/archive/1.2.9.tar.gz"
-MD5SUM="ba1274f75f82c8e8918aa2f2e2bf103b"
+DOWNLOAD="https://github.com/OpenSCAP/openscap/archive/1.3.6/openscap-1.3.6.tar.gz"
+MD5SUM="1b95ac653cb4487e01ac6bc959885364"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="xmlsec"
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"