summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-10-08 19:23:31 +0000
committer Eric Hameleers <alien@slackware.com>2022-10-09 07:00:16 +0200
commitbe4ce9e049b2e9e456da6a279d08ededc705b936 (patch)
tree6c664d59d839aa49ae2392a929731f32beb8c37b /source/x
parent893f157269b80aeb3921eb64150cfeb554abfbff (diff)
downloadcurrent-be4ce9e049b2e9e456da6a279d08ededc705b936.tar.gz
current-be4ce9e049b2e9e456da6a279d08ededc705b936.tar.xz
Sat Oct 8 19:23:31 UTC 202220221008192331
ap/inxi-3.3.22_1-noarch-1.txz: Upgraded. n/conntrack-tools-1.4.7-x86_64-1.txz: Upgraded. n/libgpg-error-1.46-x86_64-1.txz: Upgraded. n/libksba-1.6.2-x86_64-1.txz: Upgraded. Detect a possible overflow directly in the TLV parser. This patch detects possible integer overflows immmediately when creating the TI object. Reported-by: ZDI-CAN-18927, ZDI-CAN-18928, ZDI-CAN-18929 (* Security fix *) n/postfix-3.7.3-x86_64-1.txz: Upgraded. x/freeglut-3.4.0-x86_64-1.txz: Upgraded. x/fstobdf-1.0.7-x86_64-1.txz: Upgraded. xap/mozilla-firefox-105.0.3-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/firefox/105.0.3/releasenotes/
Diffstat (limited to 'source/x')
-rwxr-xr-xsource/x/freeglut/freeglut.SlackBuild29
-rw-r--r--source/x/x11/build/fstobdf2
2 files changed, 20 insertions, 11 deletions
diff --git a/source/x/freeglut/freeglut.SlackBuild b/source/x/freeglut/freeglut.SlackBuild
index 5b8d89213..4de47d9fb 100755
--- a/source/x/freeglut/freeglut.SlackBuild
+++ b/source/x/freeglut/freeglut.SlackBuild
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 2012 Robby Workman, Northport, Alabama, USA
-# Copyright 2016, 2018, 2019, 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016, 2018, 2019, 2021, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -79,15 +79,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
-cp -a \
- AUTHORS COPYING* INSTALL NEWS README TODO \
- $PKG/usr/doc/$PKGNAM-$VERSION
-cp -a doc/*.{html,png} $PKG/usr/doc/$PKGNAM-$VERSION/html
-find $PKG/usr/doc -type f -exec chmod 0644 {} \+
-# In case this is empty:
-rmdir $PKG/usr/doc/$PKGNAM-$VERSION/html 2> /dev/null
-
mkdir -p build
cd build
CFLAGS="$SLKCFLAGS" \
@@ -121,6 +112,24 @@ make install DESTDIR=$PKG || exit 1
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
+cd ..
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/html
+cp -a \
+ AUTHORS* COPYING* ChangeLog INSTALL* NEWS* README* TODO* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a doc/*.{html,png} $PKG/usr/doc/$PKGNAM-$VERSION/html
+find $PKG/usr/doc -type f -exec chmod 0644 {} \+
+# In case this is empty:
+rmdir $PKG/usr/doc/$PKGNAM-$VERSION/html 2> /dev/null
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/x/x11/build/fstobdf b/source/x/x11/build/fstobdf
index 7ed6ff82d..d00491fd7 100644
--- a/source/x/x11/build/fstobdf
+++ b/source/x/x11/build/fstobdf
@@ -1 +1 @@
-5
+1