xscreensaver 5.44-1 (znver1;i686;x86_64) 2021-13500
0

Submitter benbullard79 [@T] cox.net
Platform 4.1
Repository main
URL https://abf.openmandriva.org/build_lists/942176
Packages
xscreensaver-5.44-1.znver1.binary
xscreensaver-5.44-1.znver1.source
xscreensaver-base-5.44-1.znver1.binary
xscreensaver-base-debuginfo-5.44-1.znver1.debuginfo
xscreensaver-common-5.44-1.znver1.binary
xscreensaver-common-debuginfo-5.44-1.znver1.debuginfo
xscreensaver-debuginfo-5.44-1.znver1.debuginfo
xscreensaver-gl-5.44-1.znver1.binary
xscreensaver-gl-debuginfo-5.44-1.znver1.debuginfo
xscreensaver-5.44-1.i686.binary
xscreensaver-5.44-1.i686.source
xscreensaver-base-5.44-1.i686.binary
xscreensaver-base-debuginfo-5.44-1.i686.debuginfo
xscreensaver-common-5.44-1.i686.binary
xscreensaver-common-debuginfo-5.44-1.i686.debuginfo
xscreensaver-debuginfo-5.44-1.i686.debuginfo
xscreensaver-gl-5.44-1.i686.binary
xscreensaver-gl-debuginfo-5.44-1.i686.debuginfo
xscreensaver-5.44-1.x86_64.binary
xscreensaver-5.44-1.x86_64.source
xscreensaver-base-5.44-1.x86_64.binary
xscreensaver-base-debuginfo-5.44-1.x86_64.debuginfo
xscreensaver-common-5.44-1.x86_64.binary
xscreensaver-common-debuginfo-5.44-1.x86_64.debuginfo
xscreensaver-debuginfo-5.44-1.x86_64.debuginfo
xscreensaver-gl-5.44-1.x86_64.binary
xscreensaver-gl-debuginfo-5.44-1.x86_64.debuginfo
Build Date 2021-01-11 21:34:02 +0000 UTC
Last Updated 2021-01-23 17:47:46.689727142 +0000 UTC
$ git show --format=fuller --patch-with-stat --summary a7ed09373ee3fc27f0629d3cd2680d6727da9484

commit a7ed09373ee3fc27f0629d3cd2680d6727da9484
Author:     Crispin Boylan <crisb@mandriva.org>
AuthorDate: Tue Jul 21 10:33:22 2020 +0100
Commit:     Crispin Boylan <crisb@mandriva.org>
CommitDate: Tue Jul 21 10:33:22 2020 +0100

    5.44
---
 .abf.yml                                           |   2 +-
 xscreensaver-5.12-test-passwd-segv-tty.patch       |  11 --
 xscreensaver-5.12-tests-miscfix.patch              |  21 ----
 ....patch => xscreensaver-5.44-defaultconfig.patch | 140 ++++++++++-----------
 ...patch => xscreensaver-5.44-sanitize-hacks.patch | 122 +++++++++---------
 xscreensaver.spec                                  |  15 +--
 6 files changed, 137 insertions(+), 174 deletions(-)
 delete mode 100644 xscreensaver-5.12-test-passwd-segv-tty.patch
 delete mode 100644 xscreensaver-5.12-tests-miscfix.patch
 rename xscreensaver-5.32-defaultconfig.patch => xscreensaver-5.44-defaultconfig.patch (90%)
 rename xscreensaver-5.26-sanitize-hacks.patch => xscreensaver-5.44-sanitize-hacks.patch (87%)

diff --git a/.abf.yml b/.abf.yml
index 3dc9c40..b1fccbc 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
-  xscreensaver-5.42.tar.gz: b8eb08e258a70924aa0e644e4930164baf505ee6
+  xscreensaver-5.44.tar.gz: 3e93aa745aa986cf521de31b6e731f990302c920
   xscreensaver-capplet.png: c3d157c9a1ffea30a8250ee6eab69243e2a66226
diff --git a/xscreensaver-5.12-test-passwd-segv-tty.patch b/xscreensaver-5.12-test-passwd-segv-tty.patch
deleted file mode 100644
index 73ced5d..0000000
--- a/xscreensaver-5.12-test-passwd-segv-tty.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xscreensaver-5.12/driver/passwd.c.debug2	2008-12-27 19:17:26.000000000 +0900
-+++ xscreensaver-5.12/driver/passwd.c	2011-04-03 21:55:26.000000000 +0900
-@@ -205,7 +205,7 @@
- {
- # ifdef HAVE_SYSLOG
-   struct passwd *pw = getpwuid (getuid ());
--  char *d = DisplayString (si->dpy);
-+  char *d = (si->dpy ? DisplayString (si->dpy) : 0);
-   char *u = (pw && pw->pw_name ? pw->pw_name : "???");
-   int opt = 0;
-   int fac = 0;
diff --git a/xscreensaver-5.12-tests-miscfix.patch b/xscreensaver-5.12-tests-miscfix.patch
deleted file mode 100644
index 7ec1f48..0000000
--- a/xscreensaver-5.12-tests-miscfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xscreensaver-5.12/driver/test-xdpms.c.extra	2002-03-19 08:57:42.000000000 +0900
-+++ xscreensaver-5.12/driver/test-xdpms.c	2011-04-03 22:05:01.000000000 +0900
-@@ -29,7 +29,6 @@
- 
- #include <X11/Xproto.h>
- #include <X11/extensions/dpms.h>
--#include <X11/extensions/dpmsstr.h>
- 
- extern Bool DPMSQueryExtension (Display *dpy, int *event_ret, int *error_ret);
- extern Bool DPMSCapable (Display *dpy);
---- xscreensaver-5.12/driver/Makefile.in	2011-04-03 22:49:32.000000000 +0900
-+++ xscreensaver-5.12/driver/Makefile.in.save	2011-04-03 22:49:32.000000000 +0900
-@@ -850,7 +850,7 @@
- test-mlstring: test-mlstring.o
- 	$(CC) -DTEST $(LDFLAGS) -o $@ test-mlstring.o $(SAVER_LIBS)
- 
--TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS)
-+TEST_FADE_OBJS = test-fade.o $(UTILS_BIN)/fade.o $(DEMO_UTIL_OBJS)
- test-fade: test-fade.o $(UTILS_BIN)/fade.o
- 	$(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS)
- 
diff --git a/xscreensaver-5.32-defaultconfig.patch b/xscreensaver-5.44-defaultconfig.patch
similarity index 90%
rename from xscreensaver-5.32-defaultconfig.patch
rename to xscreensaver-5.44-defaultconfig.patch
index 7d16b3a..20f0916 100644
--- a/xscreensaver-5.32-defaultconfig.patch
+++ b/xscreensaver-5.44-defaultconfig.patch
@@ -1,6 +1,61 @@
-diff -Naur xscreensaver-5.32/driver/XScreenSaver.ad.in xscreensaver-5.32.tpg/driver/XScreenSaver.ad.in
---- xscreensaver-5.32/driver/XScreenSaver.ad.in	2014-11-18 22:54:02.000000000 +0000
-+++ xscreensaver-5.32.tpg/driver/XScreenSaver.ad.in	2015-04-23 02:06:37.161886903 +0000
+diff -Naur xscreensaver-5.32/hacks/Makefile.in xscreensaver-5.32.tpg/hacks/Makefile.in
+--- xscreensaver-5.32/hacks/Makefile.in	2014-11-19 07:24:01.000000000 +0000
++++ xscreensaver-5.32.tpg/hacks/Makefile.in	2015-04-23 02:06:37.162886930 +0000
+@@ -128,7 +128,7 @@
+ # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
+ # but that are not shipped with xscreensaver itself.
+ #
+-EXTERNALS	= cosmos electricsheep fireflies goban \
++EXTERNALS	= cosmos electricsheep fireflies OpenMandriva goban \
+ 		  sphereeversion ssystem xaos xdaliclock xearth xfishtank \
+ 		  xmountains xplanet xsnow
+ 
+diff -Naur xscreensaver-5.32/hacks/config/OpenMandriva.xml xscreensaver-5.32.tpg/hacks/config/OpenMandriva.xml
+--- xscreensaver-5.32/hacks/config/OpenMandriva.xml	1970-01-01 00:00:00.000000000 +0000
++++ xscreensaver-5.32.tpg/hacks/config/OpenMandriva.xml	2015-04-23 02:06:37.162886930 +0000
+@@ -0,0 +1,13 @@
++<?xml version="1.0" encoding="ISO-8859-1"?>
++
++<screensaver name="chbg" _label="OpenMandriva">
++
++  <command arg="-xscreensaver -mode smart -bg "#000000" -interval 0.16 -effect 1 -speed 500 -R /usr/share/mdk/screensaver/"/>
++
++  <_description>
++This is the official OpenMandriva screensaver.
++Visit www.openmandriva.org
++
++Written by OpenMandriva Association; 2015.
++  </_description>
++</screensaver>
+diff -Naur xscreensaver-5.32/hacks/config/OpenMandriva.xml.h xscreensaver-5.32.tpg/hacks/config/OpenMandriva.xml.h
+--- xscreensaver-5.32/hacks/config/OpenMandriva.xml.h	1970-01-01 00:00:00.000000000 +0000
++++ xscreensaver-5.32.tpg/hacks/config/OpenMandriva.xml.h	2015-04-23 02:07:29.264270448 +0000
+@@ -0,0 +1 @@
++
+diff -Naur xscreensaver-5.32/hacks/munge-ad.pl xscreensaver-5.32.tpg/hacks/munge-ad.pl
+--- xscreensaver-5.32/hacks/munge-ad.pl	2014-11-15 03:14:58.000000000 +0000
++++ xscreensaver-5.32.tpg/hacks/munge-ad.pl	2015-04-23 02:06:37.162886930 +0000
+@@ -151,6 +151,7 @@
+     if (-f "$hack.c" || -f "$hack") { $glp = 0; }
+     elsif (-f "glx/$hack.c") { $glp = 1; }
+     elsif ($hack eq 'companioncube') { $glp = 1; }  # kludge
++    elsif ($hack eq 'OpenMandriva') { $glp = 1; }  # kludge
+     elsif ($dis != 2) { error ("is $hack X or GL?"); }
+ 
+     $counts[($disable{$hack} || 0)]++;
+diff -Naur xscreensaver-5.32/po/POTFILES.in xscreensaver-5.32.tpg/po/POTFILES.in
+--- xscreensaver-5.32/po/POTFILES.in	2014-11-19 07:24:06.000000000 +0000
++++ xscreensaver-5.32.tpg/po/POTFILES.in	2015-04-23 02:06:37.162886930 +0000
+@@ -3,6 +3,7 @@
+ driver/demo-Gtk.c
+ driver/screensaver-properties.desktop.in
+ driver/xscreensaver-demo.glade2.in
++hacks/config/OpenMandriva.xml
+ hacks/config/abstractile.xml
+ hacks/config/anemone.xml
+ hacks/config/anemotaxis.xml
+--- xscreensaver-5.44/driver/XScreenSaver.ad.in.defaultconfig	2020-03-20 23:52:58.000000000 +0000
++++ xscreensaver-5.44/driver/XScreenSaver.ad.in	2020-07-21 10:18:58.776827810 +0100
 @@ -29,23 +29,23 @@
  ! /* (xrdb prevention kludge: whole file)
  
@@ -36,28 +91,28 @@ diff -Naur xscreensaver-5.32/driver/XScreenSaver.ad.in xscreensaver-5.32.tpg/dri
 @@ -56,10 +56,10 @@
  *splashDuration:	0:00:05
  *visualID:		default
- *captureStderr: 	True
+ *installColormap:	True
 -*ignoreUninstalledPrograms: False
 +*ignoreUninstalledPrograms: True
  *authWarningSlack:	20
  
 -*textMode:		file
-+*textMode:		date
++*textMode:		data
  *textLiteral:		XScreenSaver
  *textFile:		@DEFAULT_TEXT_FILE@
  *textProgram:		fortune
-@@ -82,6 +82,10 @@
+@@ -86,6 +86,10 @@
  ! (xscreensaver not covering the whole screen)
- GetViewPortIsFullOfLies: False
+ *GetViewPortIsFullOfLies: False
  
 +! default mode is one screensaver
 +*mode:                  one
 +*selected:              0
 +
- ! This is what the "Demo" button on the splash screen runs (/bin/sh syntax.)
+ ! This is what the "Settings" button on the splash screen runs.
  *demoCommand: xscreensaver-demo
  
-@@ -100,13 +104,13 @@
+@@ -101,13 +105,13 @@
  !   Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
  !
  @GNOME24@*loadURL: @WITH_BROWSER@ '%s'
@@ -73,7 +128,7 @@ diff -Naur xscreensaver-5.32/driver/XScreenSaver.ad.in xscreensaver-5.32.tpg/dri
  @GNOME22@		--command '/bin/sh -c "man %s; read foo"'
  !
  !   Gnome 1.4:
-@@ -116,8 +120,8 @@
+@@ -117,8 +121,8 @@
  !
  !   non-Gnome systems:
  !
@@ -84,18 +139,17 @@ diff -Naur xscreensaver-5.32/driver/XScreenSaver.ad.in xscreensaver-5.32.tpg/dri
  @NOGNOME@		    -e /bin/sh -c 'man "%s" ; read foo'
  
  
-@@ -157,7 +161,9 @@
- ! screen savers interactively.
- !
+@@ -344,6 +348,9 @@
+ 
  *programs:								      \
--				maze -root				    \n\
+ 				maze -root				    \n\
 +default-n:             "OpenMandriva" chbg -xscreensaver -mode smart -bg "#000000"  \
 +                         -interval 0.16 -effect 1 -speed 500                  \
 +                         -R `/bin/ls /usr/share/mdk/screensaver/*`          \n\
  @GL_KLUDGE@ GL: 				superquadrics -root			    \n\
  				attraction -root			    \n\
  				blitspin -root				    \n\
-@@ -487,6 +493,7 @@
+@@ -650,6 +657,7 @@
  *hacks.morph3d.name:        Morph3D
  *hacks.nerverot.name:       NerveRot
  *hacks.noseguy.name:        NoseGuy
@@ -103,59 +157,3 @@ diff -Naur xscreensaver-5.32/driver/XScreenSaver.ad.in xscreensaver-5.32.tpg/dri
  *hacks.popsquares.name:     PopSquares
  *hacks.projectiveplane.name:ProjectivePlane
  *hacks.quasicrystal.name:   QuasiCrystal
-diff -Naur xscreensaver-5.32/hacks/Makefile.in xscreensaver-5.32.tpg/hacks/Makefile.in
---- xscreensaver-5.32/hacks/Makefile.in	2014-11-19 07:24:01.000000000 +0000
-+++ xscreensaver-5.32.tpg/hacks/Makefile.in	2015-04-23 02:06:37.162886930 +0000
-@@ -128,7 +128,7 @@
- # Programs that are mentioned in XScreenSaver.ad, and that have XML files,
- # but that are not shipped with xscreensaver itself.
- #
--EXTERNALS	= cosmos electricsheep fireflies goban \
-+EXTERNALS	= cosmos electricsheep fireflies OpenMandriva goban \
- 		  sphereeversion ssystem xaos xdaliclock xearth xfishtank \
- 		  xmountains xplanet xsnow
- 
-diff -Naur xscreensaver-5.32/hacks/config/OpenMandriva.xml xscreensaver-5.32.tpg/hacks/config/OpenMandriva.xml
---- xscreensaver-5.32/hacks/config/OpenMandriva.xml	1970-01-01 00:00:00.000000000 +0000
-+++ xscreensaver-5.32.tpg/hacks/config/OpenMandriva.xml	2015-04-23 02:06:37.162886930 +0000
-@@ -0,0 +1,13 @@
-+<?xml version="1.0" encoding="ISO-8859-1"?>
-+
-+<screensaver name="chbg" _label="OpenMandriva">
-+
-+  <command arg="-xscreensaver -mode smart -bg "#000000" -interval 0.16 -effect 1 -speed 500 -R /usr/share/mdk/screensaver/"/>
-+
-+  <_description>
-+This is the official OpenMandriva screensaver.
-+Visit www.openmandriva.org
-+
-+Written by OpenMandriva Association; 2015.
-+  </_description>
-+</screensaver>
-diff -Naur xscreensaver-5.32/hacks/config/OpenMandriva.xml.h xscreensaver-5.32.tpg/hacks/config/OpenMandriva.xml.h
---- xscreensaver-5.32/hacks/config/OpenMandriva.xml.h	1970-01-01 00:00:00.000000000 +0000
-+++ xscreensaver-5.32.tpg/hacks/config/OpenMandriva.xml.h	2015-04-23 02:07:29.264270448 +0000
-@@ -0,0 +1 @@
-+
-diff -Naur xscreensaver-5.32/hacks/munge-ad.pl xscreensaver-5.32.tpg/hacks/munge-ad.pl
---- xscreensaver-5.32/hacks/munge-ad.pl	2014-11-15 03:14:58.000000000 +0000
-+++ xscreensaver-5.32.tpg/hacks/munge-ad.pl	2015-04-23 02:06:37.162886930 +0000
-@@ -151,6 +151,7 @@
-     if (-f "$hack.c" || -f "$hack") { $glp = 0; }
-     elsif (-f "glx/$hack.c") { $glp = 1; }
-     elsif ($hack eq 'companioncube') { $glp = 1; }  # kludge
-+    elsif ($hack eq 'OpenMandriva') { $glp = 1; }  # kludge
-     elsif ($dis != 2) { error ("is $hack X or GL?"); }
- 
-     $counts[($disable{$hack} || 0)]++;
-diff -Naur xscreensaver-5.32/po/POTFILES.in xscreensaver-5.32.tpg/po/POTFILES.in
---- xscreensaver-5.32/po/POTFILES.in	2014-11-19 07:24:06.000000000 +0000
-+++ xscreensaver-5.32.tpg/po/POTFILES.in	2015-04-23 02:06:37.162886930 +0000
-@@ -3,6 +3,7 @@
- driver/demo-Gtk.c
- driver/screensaver-properties.desktop.in
- driver/xscreensaver-demo.glade2.in
-+hacks/config/OpenMandriva.xml
- hacks/config/abstractile.xml
- hacks/config/anemone.xml
- hacks/config/anemotaxis.xml
diff --git a/xscreensaver-5.26-sanitize-hacks.patch b/xscreensaver-5.44-sanitize-hacks.patch
similarity index 87%
rename from xscreensaver-5.26-sanitize-hacks.patch
rename to xscreensaver-5.44-sanitize-hacks.patch
index f283425..64f666a 100644
--- a/xscreensaver-5.26-sanitize-hacks.patch
+++ b/xscreensaver-5.44-sanitize-hacks.patch
@@ -1,6 +1,53 @@
---- ./hacks/barcode.c.orig	2012-07-03 21:37:06.000000000 +0100
-+++ ./hacks/barcode.c	2014-04-17 16:24:39.551830745 +0100
-@@ -117,8 +117,6 @@
+--- ./hacks/glx/glsnake.c.orig	2012-06-03 22:23:44.000000000 +0100
++++ ./hacks/glx/glsnake.c	2014-04-17 16:24:39.552830745 +0100
+@@ -542,7 +542,7 @@
+ 	PIN, ZERO, RIGHT, RIGHT, ZERO, PIN, PIN, ZERO, PIN, PIN, ZERO,
+ 	RIGHT, ZERO }
+     },
+-    { "k's turd",
++    { "caterpillar",
+       { RIGHT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT,
+ 	RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN,
+ 	RIGHT, LEFT, RIGHT, PIN, ZERO }
+@@ -567,22 +567,22 @@
+ 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO, ZERO }
+     },
+-    { "kissy box",
++    { "ribbon",
+       { PIN, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, PIN, ZERO }
+     },
+-    { "erect penis",     /* thanks benno */
++    { "shuffle board",     /* thanks benno */
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "flaccid penis",
++    { "anchor",
+       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
+ 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
+ 	ZERO, ZERO }
+     },
+-    { "vagina",
++    { "engagement ring",
+       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
+ 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
+ 	PIN, RIGHT, ZERO }
+@@ -1002,7 +1002,7 @@
+     { "Parrot",
+         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
+     },
+-    { "Penis",
++    { "Shuttle",
+         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
+     },
+     { "PictureComingSoon",
+--- ./hacks/barcode.c.inappropriate	2019-08-22 04:11:07.000000000 +0100
++++ ./hacks/barcode.c	2020-07-21 10:21:54.721153917 +0100
+@@ -121,8 +121,6 @@
    "belly",
    "bliss",
    "bogosity",
@@ -8,24 +55,24 @@
 -  "boobs",
    "booty",
    "bread",
-   "bubba",
-@@ -131,7 +129,6 @@
-   "children",
+   "brogrammers",
+@@ -137,7 +135,6 @@
    "chocolate",
+   "chupacabra",
    "CLONE",
 -  "cock",
+   "congress",
    "constriction",
    "contrition",
-   "cop",
-@@ -171,7 +168,6 @@
+@@ -178,7 +175,6 @@
    "fear",
    "fever",
    "filth",
 -  "flatulence",
    "fluff",
    "fnord",
-   "freedom",
-@@ -188,9 +184,7 @@
+   "followers",
+@@ -196,9 +192,7 @@
    "happiness",
    "hate",
    "helplessness",
@@ -35,7 +82,7 @@
    "heroine",
    "hope",
    "hysteria",
-@@ -265,7 +259,6 @@
+@@ -280,7 +274,6 @@
    "punishment",
    "punk rock",
    "punk",
@@ -43,7 +90,7 @@
    "quagmire",
    "quarantine",
    "quartz",
-@@ -274,7 +267,6 @@
+@@ -289,7 +282,6 @@
    "rage",
    "readout",
    "reality",
@@ -51,59 +98,12 @@
    "reject",
    "rejection",
    "respect",
-@@ -333,8 +325,6 @@
-   "vegetarian",
+@@ -355,8 +347,6 @@
    "venom",
    "verifiability",
+   "very fine people",
 -  "viagra",
 -  "vibrator",
    "victim",
    "vignette",
    "villainy",
---- ./hacks/glx/glsnake.c.orig	2012-06-03 22:23:44.000000000 +0100
-+++ ./hacks/glx/glsnake.c	2014-04-17 16:24:39.552830745 +0100
-@@ -542,7 +542,7 @@
- 	PIN, ZERO, RIGHT, RIGHT, ZERO, PIN, PIN, ZERO, PIN, PIN, ZERO,
- 	RIGHT, ZERO }
-     },
--    { "k's turd",
-+    { "caterpillar",
-       { RIGHT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT,
- 	RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN, RIGHT, LEFT, RIGHT, PIN,
- 	RIGHT, LEFT, RIGHT, PIN, ZERO }
-@@ -567,22 +567,22 @@
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO, ZERO }
-     },
--    { "kissy box",
-+    { "ribbon",
-       { PIN, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO, ZERO, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, PIN, ZERO }
-     },
--    { "erect penis",     /* thanks benno */
-+    { "shuffle board",     /* thanks benno */
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "flaccid penis",
-+    { "anchor",
-       { PIN, ZERO, PIN, PIN, ZERO, ZERO, PIN, ZERO, ZERO, ZERO, PIN,
- 	PIN, ZERO, ZERO, ZERO, RIGHT, PIN, ZERO, ZERO, ZERO, ZERO, ZERO,
- 	ZERO, ZERO }
-     },
--    { "vagina",
-+    { "engagement ring",
-       { RIGHT, ZERO, ZERO, ZERO, RIGHT, ZERO, ZERO, PIN, ZERO, ZERO,
- 	LEFT, ZERO, ZERO, ZERO, LEFT, ZERO, LEFT, PIN, LEFT, PIN, RIGHT,
- 	PIN, RIGHT, ZERO }
-@@ -1002,7 +1002,7 @@
-     { "Parrot",
-         { ZERO, ZERO, ZERO, ZERO, RIGHT, RIGHT, ZERO, LEFT, PIN, RIGHT, ZERO, RIGHT, ZERO, RIGHT, ZERO, RIGHT, PIN, LEFT, ZERO, RIGHT, LEFT, ZERO, PIN, ZERO }
-     },
--    { "Penis",
-+    { "Shuttle",
-         { PIN, PIN, RIGHT, ZERO, PIN, PIN, ZERO, PIN, ZERO, ZERO, RIGHT, PIN, LEFT, ZERO, ZERO, PIN, ZERO, PIN, PIN, ZERO, LEFT, PIN, PIN, ZERO }
-     },
-     { "PictureComingSoon",
diff --git a/xscreensaver.spec b/xscreensaver.spec
index c118373..b9777da 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -2,7 +2,7 @@
 
 Summary:	A set of X Window System screensavers
 Name:		xscreensaver
-Version:	5.42
+Version:	5.44
 Release:	1
 License:	BSD
 Group:		Graphical desktop/Other
@@ -15,7 +15,7 @@ Patch0:		xscreensaver-5.05-mdv-alt-drop_setgid.patch
 # Don't check login manager in PATH because we use custom wrapper
 Patch1:		xscreensaver-5.15-lmcheck.patch
 # Only OpenMandriva should be enabled
-Patch9:		xscreensaver-5.32-defaultconfig.patch
+Patch9:		xscreensaver-5.44-defaultconfig.patch
 # (fc) 4.00-4mdk allow root to start xscreensaver
 Patch10:	xscreensaver-4.23-root.patch
 # (fc) 4.05-3mdk disable openGL hacks by default
@@ -24,7 +24,7 @@ Patch11:	xscreensaver-5.09-noGL.patch
 # fedora patches
 # bug 129335
 # sanitize the names of modes in barcode
-Patch1001:	xscreensaver-5.26-sanitize-hacks.patch
+Patch1001:	xscreensaver-5.44-sanitize-hacks.patch
 ## Patches already sent to the upsteam
 ## Patches which must be discussed with upstream
 #
@@ -32,10 +32,6 @@ Patch1001:	xscreensaver-5.26-sanitize-hacks.patch
 # Also see bug 472061
 Patch1021:	xscreensaver-5.35-webcollage-default-nonet.patch
 #
-# driver/test-passwd tty segfaults
-Patch1051:	xscreensaver-5.12-test-passwd-segv-tty.patch
-# patch to compile driver/test-xdpms
-Patch1052:	xscreensaver-5.12-tests-miscfix.patch
 
 Requires:	xscreensaver-common = %{version}-%{release}
 #Requires:	fortune-mod
@@ -52,6 +48,7 @@ BuildRequires:	pkgconfig(glu)
 BuildRequires:	pkgconfig(glut)
 BuildRequires:	pkgconfig(gdk-pixbuf-xlib-2.0)
 BuildRequires:	pkgconfig(libglade-2.0)
+BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:	pkgconfig(krb5)
 BuildRequires:	pkgconfig(x11)
 BuildRequires:	pkgconfig(xext)
@@ -125,8 +122,6 @@ use with the X Window System and you have OpenGL or Mesa installed.
 %endif
 
 %patch1021 -p1
-%patch1051 -p1
-%patch1052 -p1
 
 # Needed by patches 1 and 11
 autoreconf -fiv
@@ -240,10 +235,12 @@ sed -i -e '/\A\s*GL:/ and print "- $_" or print "$_"' %{_datadir}/X11/app-defaul
 %files -f %{name}.lang
 %doc README
 %config(noreplace) %{_sysconfdir}/pam.d/xscreensaver
+%{_mandir}/man1/xscreensaver-systemd.1*
 %{_mandir}/man1/xscreensaver-command.1*
 %{_mandir}/man1/xscreensaver-demo.1*
 %{_mandir}/man1/xscreensaver.1*
 %attr(755,root,shadow) %{_bindir}/xscreensaver
+%{_bindir}/xscreensaver-systemd
 %{_bindir}/xscreensaver-command
 %{_bindir}/xscreensaver-demo
 %{_bindir}/dmctl
Not Available
benbullard79 [@T] cox.netNo Comment.36d 14hrs