tempadrien/next-hardening

8 files changed, 58 insertions, 110 deletions

diff --git a/development/SDL2/SDL2.SlackBuild b/development/SDL2/SDL2.SlackBuild
index 446eb112d7..e0caf1f473 100644
--- a/development/SDL2/SDL2.SlackBuild
+++ b/development/SDL2/SDL2.SlackBuild
@@ -38,7 +38,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+yyextract "${CWD}" "${PRGNAM}-${VERSION}"
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -53,8 +53,9 @@ patch -p0 --verbose < "${CWD}/SDL2-fix-gcc-compatibility.patch"
 
 # NOTE: we cannot --disable-static because the build system needs static
 # versions of objects for its SDLmain() stuff.
-CFLAGS="-O2" \
-CXXFLAGS="-O2" \
+CFLAGS="$(yycflags)" \
+CXXFLAGS="$(yycxxflags)" \
+LDFLAGS="$(yyldflags)" \
 ./configure \
   --prefix=/${PREFIX} \
   --libdir=/${PREFIX}/lib${LIBDIRSUFFIX} \
@@ -62,26 +63,21 @@ CXXFLAGS="-O2" \
   --localstatedir=/${PREFIX}/var \
   --mandir=/${PREFIX}/man \
   --docdir=/${PREFIX}/doc/$PRGNAM-$VERSION \
+  --disable-dbus \
   --host=${HOST_TRIPLET} \
   --build=${BUILD_TRIPLET}
 
 make || make -j1
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | egrep -e "executable|shared object" \
-  | grep ${HOST_EXE_FORMAT} | cut -f 1 -d : \
-  | xargs ${HOST_STRIP} 2> /dev/null || true
+# We need libSDL2main.a because its functionality is not provided as a shared
+# library so we don't --disable-static; however, not doing so triggers the
+# creation of other static libraries which we don't want to package since we
+# already have .dll files for their functionality.
+(cd ${PKG}/${PREFIX}/lib${LIBDIRSUFFIX} && rm libSDL2.a libSDL2_test.a)
 
 mkdir -p $PKG/${PREFIX}/doc/$PRGNAM-$VERSION
 cp -a *.txt $PKG/${PREFIX}/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/${PREFIX}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-cat ${CWD}/${PRGNAM}.yypkg.script | sed \
-  -e "s/%{PKG}/${PRGNAM}/" \
-  -e "s/%{HST}/${HOST_TRIPLET}/" \
-  -e "s/%{TGT}//" \
-  -e "s/%{VER}/${VERSION}/" \
-  -e "s/%{BUILD}/${BUILD}/" \
-  -e "s/%{DESCR}/${DESCR:-"No description"}/" \
-  | yypkg --makepkg --output ${YYOUTPUT} --script - --directory "${PKG}/${PREFIX}"
-
+yymakepkg_split "${PRGNAM}" ""
diff --git a/development/check/check.SlackBuild b/development/check/check.SlackBuild
index b22ed47dde..e104172ba4 100644
--- a/development/check/check.SlackBuild
+++ b/development/check/check.SlackBuild
@@ -38,7 +38,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+yyextract "${CWD}" "${PRGNAM}-${VERSION}"
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -47,8 +47,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-CFLAGS="-O2" \
-CXXFLAGS="-O2" \
+CFLAGS="$(yycflags)" \
+CXXFLAGS="$(yycxxflags)" \
+LDFLAGS="$(yyldflags)" \
 ./configure \
   --prefix=/${PREFIX} \
   --libdir=/${PREFIX}/lib${LIBDIRSUFFIX} \
@@ -62,13 +63,10 @@ CXXFLAGS="-O2" \
   --build=${BUILD_TRIPLET} \
   --host=${HOST_TRIPLET}
 
-make -j4 docdir=/${PREFIX}/doc/$PRGNAM-$VERSION
+make docdir=/${PREFIX}/doc/$PRGNAM-$VERSION \
+  || make -j1 docdir=/${PREFIX}/doc/$PRGNAM-$VERSION
 make install docdir=/${PREFIX}/doc/$PRGNAM-$VERSION DESTDIR=$PKG
 
-find $PKG | xargs file | egrep -e "executable|shared object" \
-  | grep ${HOST_EXE_FORMAT} | cut -f 1 -d : \
-  | xargs ${HOST_STRIP} 2> /dev/null || true
-
 # No man page is provided
 
 rm -f $PKG/${PREFIX}/info/dir
@@ -77,12 +75,4 @@ gzip -9 $PKG/${PREFIX}/info/*
 cp -a AUTHORS INSTALL THANKS TODO $PKG/${PREFIX}/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/${PREFIX}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-cat ${CWD}/${PRGNAM}.yypkg.script | sed \
-  -e "s/%{PKG}/${PRGNAM}/" \
-  -e "s/%{HST}/${HOST_TRIPLET}/" \
-  -e "s/%{TGT}//" \
-  -e "s/%{VER}/${VERSION}/" \
-  -e "s/%{BUILD}/${BUILD}/" \
-  -e "s/%{DESCR}/${DESCR:-"No description"}/" \
-  | yypkg --makepkg --output ${YYOUTPUT} --script - --directory "${PKG}/${PREFIX}"
-
+yymakepkg_split "${PRGNAM}" ""
diff --git a/development/luajit/luajit.SlackBuild b/development/luajit/luajit.SlackBuild
index b5cb64ffbb..e966880385 100644
--- a/development/luajit/luajit.SlackBuild
+++ b/development/luajit/luajit.SlackBuild
@@ -63,7 +63,8 @@ case "${HOST_TRIPLET}" in
     export REALGCC="gcc" # musl's gcc-musl wrapper is a bit broken
     CROSS="CROSS=${HOST_TRIPLET}-"
     TARGET_SYS="TARGET_SYS=Windows"
-    CFLAGS="CFLAGS=-Wa,--${m}"
+    CFLAGS="-Wa,--${m} $(yycflags)"
+    LDFLAGS="$(yyldflags)"
 
     sed -i \
       -e '/^FILE_T= luajit$/ s/$/.exe/' \
@@ -77,6 +78,10 @@ case "${HOST_TRIPLET}" in
       -e '/^  TARGET_XSHLDFLAGS= -shared$/ s/$/ -Wl,--out-implib=$(@:=.a)/' \
       src/Makefile
     ;;
+  *)
+    CFLAGS="$(yycflags)"
+    LDFLAGS="$(yyldflags)"
+    ;;
 esac
 
 invoke_make() {
@@ -87,7 +92,8 @@ invoke_make() {
     Q= \
     LDCONFIG=':' \
     ${HOST_CC:+"${HOST_CC}"} \
-    ${CFLAGS} \
+    CFLAGS="${CFLAGS}" \
+    TARGET_LDFLAGS="${LDFLAGS}" \
     ${CROSS} \
     ${TARGET_SYS} \
     "$@"
@@ -101,12 +107,12 @@ case "${HOST_TRIPLET}" in
     cp src/libluajit-*.dll "${PKG}/${PREFIX}/bin/"
     cp src/libluajit-*.dll.a "${PKG}/${PREFIX}/lib${LIBDIRSUFFIX}/"
     ;;
+  *)
+    (cd "${PKG}/${PREFIX}/lib${LIBDIRSUFFIX}" && \
+      ln -s "libluajit-5.1.so" "libluajit-5.1.so.2")
+    ;;
 esac
 
-# Strip everything for good measure:
-find $PKG | xargs file | egrep "executable|shared object" \
-  | grep ${HOST_EXE_FORMAT} | cut -f 1 -d : | xargs ${HOST_STRIP} --strip-debug 2> /dev/null
-
 find $PKG/${PREFIX}/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/${PREFIX}/doc/$PRGNAM-$VERSION
@@ -115,11 +121,4 @@ cp -a \
   $PKG/${PREFIX}/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/${PREFIX}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-cat ${CWD}/${PRGNAM}.yypkg.script | sed \
-  -e "s/%{PKG}/${PRGNAM}/" \
-  -e "s/%{HST}/${HOST_TRIPLET}/" \
-  -e "s/%{TGT}//" \
-  -e "s/%{VER}/${VERSION}/" \
-  -e "s/%{BUILD}/${BUILD}/" \
-  -e "s/%{DESCR}/${DESCR:-"No description"}/" \
-  | yypkg --makepkg --output ${YYOUTPUT} --script - --directory "${PKG}/${PREFIX}"
+yymakepkg_split "${PRGNAM}" ""
diff --git a/libraries/bullet/bullet.SlackBuild b/libraries/bullet/bullet.SlackBuild
index 8112fd8135..6aad866f77 100644
--- a/libraries/bullet/bullet.SlackBuild
+++ b/libraries/bullet/bullet.SlackBuild
@@ -39,7 +39,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf ${PRGNAM}3-$VERSION
-tar xvf $CWD/${PRGNAM}-$VERSION.tar.gz || tar xvf $CWD/${PRGNAM}-$VERSION.tar.gz
+yyextract "${CWD}" "${PRGNAM}-${VERSION}"
 cd ${PRGNAM}3-$VERSION
 chown -R root:root .
 find -L . \
@@ -51,8 +51,9 @@ find -L . \
 mkdir -p build
 cd build
   cmake \
-    -DCMAKE_C_FLAGS="-O2" \
-    -DCMAKE_CXX_FLAGS="-O2" \
+    -DCMAKE_C_FLAGS="$(yycflags)" \
+    -DCMAKE_CXX_FLAGS="$(yycxxflags)" \
+    -DCMAKE_LD_FLAGS="$(yyldflags)" \
     -DCMAKE_INSTALL_PREFIX=/${PREFIX} \
     -DCMAKE_VERBOSE_MAKEFILE=TRUE \
     -DCMAKE_SYSTEM_NAME="Windows" \
@@ -71,23 +72,12 @@ cd build
     -DCMAKE_BUILD_TYPE=Release \
     -LAH \
     ..
-  make
+  make || make -j1
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | egrep -e "executable|shared object" \
-  | grep ${HOST_EXE_FORMAT} | cut -f 1 -d : \
-  | xargs ${HOST_STRIP} 2> /dev/null || true
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS.txt LICENSE.txt README.md VERSION docs/*.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-cat ${CWD}/${PRGNAM}.yypkg.script | sed \
-  -e "s/%{PKG}/${PRGNAM}/" \
-  -e "s/%{HST}/${HOST_TRIPLET}/" \
-  -e "s/%{TGT}//" \
-  -e "s/%{VER}/${VERSION}/" \
-  -e "s/%{BUILD}/${BUILD}/" \
-  -e "s/%{DESCR}/${DESCR:-"No description"}/" \
-  | yypkg --makepkg --output ${YYOUTPUT} --script - --directory "${PKG}/${PREFIX}"
+yymakepkg_split "${PRGNAM}" ""
diff --git a/libraries/c-ares/c-ares.SlackBuild b/libraries/c-ares/c-ares.SlackBuild
index 94795cbf9d..c9b1473d7e 100644
--- a/libraries/c-ares/c-ares.SlackBuild
+++ b/libraries/c-ares/c-ares.SlackBuild
@@ -21,7 +21,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+yyextract "${CWD}" "${PRGNAM}-${VERSION}"
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -38,9 +38,9 @@ sed -i \
   -e "/for recvfrom_arg1 in/ s/'int' 'ssize_t' \('SOCKET'\);/\1;/" \
   configure
 
-CFLAGS="-O2" \
-CXXFLAGS="-O2" \
-LDFLAGS="-L/${PREFIX}/lib${LIBDIRSUFFIX}" \
+CFLAGS="$(yycflags)" \
+CXXFLAGS="$(yycxxflags)" \
+LDFLAGS="$(yyldflags)" \
 ./configure \
   --prefix=/${PREFIX} \
   --libdir=/${PREFIX}/lib${LIBDIRSUFFIX} \
@@ -50,13 +50,9 @@ LDFLAGS="-L/${PREFIX}/lib${LIBDIRSUFFIX}" \
   --host=${HOST_TRIPLET} \
   --build=${BUILD_TRIPLET}
 
-make -j7
+make || make -j1
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | egrep -e "executable|shared object" \
-  | grep ${HOST_EXE_FORMAT} | cut -f 1 -d : \
-  | xargs ${HOST_STRIP} 2> /dev/null || true
-
 find $PKG/${PREFIX}/man -type f -exec gzip -9 {} \;
 
 cat ares.h | head -15 | tail -14 | sed -e 's|^.\*.||' -e 's| \*||' > LICENSE
@@ -66,12 +62,4 @@ cp -a \
     $PKG/${PREFIX}/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/${PREFIX}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-cat ${CWD}/${PRGNAM}.yypkg.script | sed \
-  -e "s/%{PKG}/${PRGNAM}/" \
-  -e "s/%{HST}/${HOST_TRIPLET}/" \
-  -e "s/%{TGT}//" \
-  -e "s/%{VER}/${VERSION}/" \
-  -e "s/%{BUILD}/${BUILD}/" \
-  -e "s/%{DESCR}/${DESCR:-"No description"}/" \
-  | yypkg --makepkg --output ${YYOUTPUT} --script - --directory "${PKG}/${PREFIX}"
-
+yymakepkg_split "${PRGNAM}" ""
diff --git a/libraries/efl/efl.SlackBuild b/libraries/efl/efl.SlackBuild
index 2a06d253c6..c1769e3f22 100644
--- a/libraries/efl/efl.SlackBuild
+++ b/libraries/efl/efl.SlackBuild
@@ -103,9 +103,9 @@ sed -i \
   '/^EAPI int efreet_cache_update = 1;$/ s/1/0/' \
   src/lib/efreet/efreet.c
 
-CFLAGS="-O2 -g" \
-CXXFLAGS="-O2 -g" \
-LDFLAGS="-L/${PREFIX}/lib${LIBDIRSUFFIX}" \
+CFLAGS="$(yycflags)" \
+CXXFLAGS="$(yycxxflags)" \
+LDFLAGS="$(yyldflags)" \
 LIBS="${LIBS}" \
 ./configure \
   --prefix=/${PREFIX} \
diff --git a/libraries/elementary/elementary.SlackBuild b/libraries/elementary/elementary.SlackBuild
index d6d92f3a6f..93db6fcc3b 100755
--- a/libraries/elementary/elementary.SlackBuild
+++ b/libraries/elementary/elementary.SlackBuild
@@ -21,7 +21,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
+yyextract "${CWD}" "${PRGNAM}-${VERSION}"
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -63,9 +63,9 @@ sed -i 's/\${EXEEXT}//' Makefile_Eolian_Helper.am
 
 autoreconf -fiv
 
-CFLAGS="-O2" \
-CXXFLAGS="-O2" \
-LDFLAGS="-L/${PREFIX}/lib${LIBDIRSUFFIXl}" \
+CFLAGS="$(yycflags)" \
+CXXFLAGS="$(yycxxflags)" \
+LDFLAGS="$(yyldflags)" \
 LIBS="${LIBS}" \
 ./configure \
   --prefix=/${PREFIX} \
@@ -91,16 +91,14 @@ LIBS="${LIBS}" \
 make || make -j1 V=1
 make install DESTDIR=$PKG
 
-find $PKG | xargs file | egrep -e "executable|shared object" \
-  | grep ${HOST_EXE_FORMAT} | cut -f 1 -d : \
-  | xargs ${HOST_STRIP} 2> /dev/null || true
-
 mkdir -p $PKG/${PREFIX}/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING ChangeLog INSTALL NEWS README \
   $PKG/${PREFIX}/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/${PREFIX}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+yymakepkg_split "${PRGNAM}" ""
+
 cat ${CWD}/${PRGNAM}.yypkg.script | sed \
   -e "s/%{PKG}/${PRGNAM}/" \
   -e "s/%{HST}/${HOST_TRIPLET}/" \
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index 93b3946a89..a2912c1488 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -35,8 +35,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SLKCFLAGS="-O2"
-
 # environment sanity checks
 TEXI2HTML=$(which texi2html 2>/dev/null)
 
@@ -107,7 +105,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+yyextract "${CWD}" "${PRGNAM}-${VERSION}"
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -122,9 +120,9 @@ sed -i \
   -e '/pkg_config_default="\${cross_prefix}\${pkg_config_default}"/ d' \
   ./configure
 
-CFLAGS="${SLKCFLAGS}" \
-CXXFLAGS="${SLKCFLAGS}" \
-LDFLAGS="-L/${PREFIX}/lib${LIBDIRSUFFIX}" \
+CFLAGS="$(yycflags)" \
+CXXFLAGS="$(yycxxflags)" \
+LDFLAGS="$(yyldflags)" \
 ./configure \
   --prefix=/${PREFIX} \
   --libdir=/${PREFIX}/lib${LIBDIRSUFFIX} \
@@ -182,16 +180,12 @@ LDFLAGS="-L/${PREFIX}/lib${LIBDIRSUFFIX}" \
   $decklink \
   $ssl
 
-make
+make || make -j1
 make install DESTDIR=$PKG
 make install-man DESTDIR=$PKG
 
 mv $PKG/${PREFIX}/lib${LIBDIRSUFFIX}/*.dll $PKG/${PREFIX}/bin
 
-find $PKG | xargs file | egrep -e "executable|shared object" \
-  | grep ${HOST_EXE_FORMAT} | cut -f 1 -d : \
-  | xargs ${HOST_STRIP} 2> /dev/null || true
-
 mkdir -p $PKG/${PREFIX}/doc/$PRGNAM-$VERSION/txt
 cp -a Changelog COPYING* CREDITS INSTALL* LICENSE* MAINTAINERS README* RELEASE \
   VERSION $PKG/${PREFIX}/doc/$PRGNAM-$VERSION
@@ -201,11 +195,4 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/${PREFIX}/doc/$PRGNAM-$VERSION/$PRGNAM.SlackB
 
 find $PKG/${PREFIX}/man -type f -exec gzip -9 {} \;
 
-cat ${CWD}/${PRGNAM}.yypkg.script | sed \
-  -e "s/%{PKG}/${PRGNAM}/" \
-  -e "s/%{HST}/${HOST_TRIPLET}/" \
-  -e "s/%{TGT}//" \
-  -e "s/%{VER}/${VERSION}/" \
-  -e "s/%{BUILD}/${BUILD}/" \
-  -e "s/%{DESCR}/${DESCR:-"No description"}/" \
-  | yypkg --makepkg --output ${YYOUTPUT} --script - --directory "${PKG}/${PREFIX}"
+yymakepkg_split "${PRGNAM}" ""