summaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorFlorian Franzmann2021-06-05 14:17:52 +0200
committerFlorian Franzmann2021-06-12 14:59:30 +0200
commitbcede715d777c883c847ca8461fb8bd16a4f27b5 (patch)
tree82dce5ac44db9e4dc9bafdd498346affe7490c36 /x11
parent333e11da1663984b8da6c62a455a43abfd4e18b0 (diff)
x11/xscreensaver: version 6.00, security update
Diffstat (limited to 'x11')
-rwxr-xr-xx11/xscreensaver/BUILD13
-rwxr-xr-xx11/xscreensaver/DEPENDS18
-rwxr-xr-xx11/xscreensaver/DETAILS5
-rw-r--r--x11/xscreensaver/HISTORY4
4 files changed, 27 insertions, 13 deletions
diff --git a/x11/xscreensaver/BUILD b/x11/xscreensaver/BUILD
index 7adc475e4b..c3db3299df 100755
--- a/x11/xscreensaver/BUILD
+++ b/x11/xscreensaver/BUILD
@@ -1,13 +1,16 @@
#sedit "6690s/Screensaver/Screensaver Properties/" po/es.po &&
-OPTS="--with-proc-interrupts $OPTS"
-OPTS="--with-readdisplay $OPTS"
-OPTS="--without-motif $OPTS"
+OPTS="--with-proc-interrupts $OPTS" &&
+OPTS="--with-proc-oom $OPTS" &&
+OPTS="--with-readdisplay $OPTS" &&
+OPTS="--without-motif $OPTS" &&
if ! (is_depends_enabled $SPELL WEB-BROWSER); then
OPTS="--without-browser $OPTS"
else
OPTS="--with-browser=$(get_spell_provider $SPELL WEB-BROWSER) $OPTS"
fi &&
-OPTS="$XSCSV_ROOT $XSCSV_LOCK $XSCSV_SETCAP $OPTS"
+OPTS="$XSCSV_ROOT $XSCSV_LOCK $XSCSV_SETCAP $OPTS" &&
-CFLAGS="$CFLAGS -std=c99" default_build
+message "${MESSAGE_COLOR}OPTS=$OPTS${DEFAULT_COLOR}" &&
+
+default_build
diff --git a/x11/xscreensaver/DEPENDS b/x11/xscreensaver/DEPENDS
index dc3bbad58b..103ceb92bc 100755
--- a/x11/xscreensaver/DEPENDS
+++ b/x11/xscreensaver/DEPENDS
@@ -2,12 +2,18 @@ depends bc &&
depends libice &&
depends libx11 &&
depends libxxf86misc &&
-depends libxxf86vm &&
+depends libxxf86vm "--with-xf86vmode-ext" &&
depends libxi &&
depends libxmu &&
depends libxrender &&
depends libxt &&
depends zlib &&
+depends freetype2 &&
+
+depends GTK2 "--with-gtk" &&
+depends gdk-pixbuf2 "--with-pixbuf" &&
+depends gdk-pixbuf-xlib &&
+
message "${MESSAGE_COLOR}The xscreensaver demo program allows you to" \
"browse among the different effects available in xscreensaver." \
@@ -54,11 +60,6 @@ optional_depends fortune \
"--without-fortune" \
"for fortune text messages" "games" &&
-optional_depends GTK2 \
- "--with-gtk --with-pixbuf" \
- "--without-gtk --without-pixbuf" \
- "for GDK-Pixbuf image support and a gtk interface" &&
-
optional_depends libpng \
"--with-png" \
"--without-png" \
@@ -89,6 +90,11 @@ optional_depends libxinerama \
"--without-xinerama-ext" \
"Enable Xinerama multihead support?" &&
+optional_depends xinput \
+ "--with-xinput-ext" \
+ "--without-xinput-ext" \
+ "Enable XInput2 support?" &&
+
suggest_depends xplanet \
"" \
"" \
diff --git a/x11/xscreensaver/DETAILS b/x11/xscreensaver/DETAILS
index 7bc8302ee0..ed488bfb21 100755
--- a/x11/xscreensaver/DETAILS
+++ b/x11/xscreensaver/DETAILS
@@ -1,11 +1,12 @@
SPELL=xscreensaver
- VERSION=5.45
+ VERSION=6.00
+ SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://www.jwz.org/$SPELL/$SOURCE
WEB_SITE=http://www.jwz.org/xscreensaver/
- SOURCE_HASH=sha512:1b21418c591fd99f3caaea9d31ca49abdb94b8e89f33e661c464299bc81bf4ff13fd99a187070fce19b3843c28a1f2a2a7b94bd6949d2b3b06bba730cae59f14
+ SOURCE_HASH=sha512:7292bacf633137b5c0eb2de9a99dc238b2012a113e62c86d4be19fc2fd4fea7133bd950253ca2d3a4ab27af4b4dc9a40a857e8d3dc714946ccfa7efcd043ded6
ENTERED=20010922
LICENSE[0]=BSD
KEYWORDS="x11"
diff --git a/x11/xscreensaver/HISTORY b/x11/xscreensaver/HISTORY
index 1f60157905..3dd9a63520 100644
--- a/x11/xscreensaver/HISTORY
+++ b/x11/xscreensaver/HISTORY
@@ -1,3 +1,7 @@
+2021-06-05 Florian Franzmann <bwlf@bandrate.org>
+ * BUILD, DEPENDS, DETAILS: version 6.00, SECURITY_PATCH++,
+ fixes https://seclists.org/oss-sec/2021/q2/181
+
2020-12-08 Florian Franzmann <bwlf@bandrate.org>
* DETAILS: version 5.45