XScreenSaver-5.43.diff

diff -U3 -r b/xscreensaver-5.43/driver/XScreenSaver.ad.in a/xscreensaver-5.43/driver/XScreenSaver.ad.in
--- b/xscreensaver-5.43/driver/XScreenSaver.ad.in	2019-07-01 23:02:58.000000000 +0200
+++ a/xscreensaver-5.43/driver/XScreenSaver.ad.in	2019-07-10 05:31:26.000000000 +0200
@@ -5,7 +5,7 @@
 !                            by Jamie Zawinski
 !
 !                              version 5.43
-!                              01-Jul-2019
+!                              09-Jul-2019
 !
 ! See "man xscreensaver" for more info.  The latest version is always
 ! available at https://www.jwz.org/xscreensaver/
diff -U3 -r b/xscreensaver-5.43/hacks/config/README a/xscreensaver-5.43/hacks/config/README
--- b/xscreensaver-5.43/hacks/config/README	2019-07-01 23:02:58.000000000 +0200
+++ a/xscreensaver-5.43/hacks/config/README	2019-07-10 05:31:26.000000000 +0200
@@ -5,7 +5,7 @@
                             by Jamie Zawinski
 
                               version 5.43
-                               01-Jul-2019
+                               09-Jul-2019
 
                      https://www.jwz.org/xscreensaver/
 
Only in a/xscreensaver-5.43/hacks/glx: deepstars.c
Only in a/xscreensaver-5.43/hacks/glx: deepstars.man
diff -U3 -r b/xscreensaver-5.43/hacks/glx/Makefile.in a/xscreensaver-5.43/hacks/glx/Makefile.in
--- b/xscreensaver-5.43/hacks/glx/Makefile.in	2019-07-01 23:17:52.000000000 +0200
+++ a/xscreensaver-5.43/hacks/glx/Makefile.in	2019-07-10 05:31:26.000000000 +0200
@@ -137,7 +137,7 @@
 		  raverhoop.c hydrostat.c discoball.c cubetwist.c cubestack.c \
 		  splodesic.c hexstrut.c vigilance.c seccam.c esper.c \
 		  razzledazzle.c ships.c peepers.c crumbler.c quickhull.c \
-		  maze3d.c handsy.c handsy_model.c gravitywell.c
+		  maze3d.c handsy.c handsy_model.c gravitywell.c deepstars.c
 
 OBJS		= xscreensaver-gl-helper.o normals.o erase-gl.o fps-gl.o \
 		  atlantis.o b_draw.o b_lockglue.o b_sphere.o bubble3d.o \
@@ -184,7 +184,7 @@
 		  raverhoop.o hydrostat.o discoball.o cubetwist.o cubestack.o \
 		  splodesic.o hexstrut.o vigilance.o seccam.o esper.o \
 		  razzledazzle.o ships.o peepers.o crumbler.o quickhull.o \
-		  maze3d.o handsy.o handsy_model.o gravitywell.o
+		  maze3d.o handsy.o handsy_model.o gravitywell.o deepstars.o
 
 GL_EXES		= cage gears moebius pipes sproingies stairs superquadrics \
 		  morph3d rubik atlantis lament bubble3d glplanet pulsar \
@@ -205,7 +205,7 @@
 		  splitflap dymaxionmap unicrud energystream raverhoop \
 		  hydrostat discoball cubetwist cubestack splodesic \
 		  hexstrut vigilance esper razzledazzle peepers crumbler \
-		  maze3d handsy gravitywell
+		  maze3d handsy gravitywell deepstars
 GLE_EXES	= extrusion
 SUID_EXES	= sonar
 SETCAP_EXES	= sonar
@@ -273,7 +273,7 @@
 		  discoball.man cubetwist.man cubestack.man splodesic.man \
 		  hexstrut.man vigilance.man esper.man razzledazzle.man \
 		  peepers.man crumbler.man maze3d.man handsy.man \
-		  gravitywell.man
+		  gravitywell.man deepstars.man
 MEN		= @GL_MEN@
 RETIRED_MEN	= glforestfire.man
 EXTRAS		= README Makefile.in dxf2gl.pl vrml2gl.pl wfront2gl.pl \
@@ -1030,6 +1030,9 @@
 gravitywell:	gravitywell.o	$(HACK_TRACK_OBJS)
 	$(CC_HACK) -o $@ [email protected]	$(HACK_TRACK_OBJS) $(HACK_LIBS)
 
+deepstars:	deepstars.o	$(HACK_TRACK_OBJS)
+	$(CC_HACK) -o $@ [email protected]	$(HACK_TRACK_OBJS) $(HACK_LIBS)
+
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
@@ -1541,6 +1544,23 @@
 dangerball.o: $(UTILS_SRC)/yarandom.h
 dangerball.o: $(HACK_SRC)/xlockmoreI.h
 dangerball.o: $(HACK_SRC)/xlockmore.h
+deepstars.o: ../../config.h
+deepstars.o: $(HACK_SRC)/fps.h
+deepstars.o: $(srcdir)/gltrackball.h
+deepstars.o: $(HACK_SRC)/recanim.h
+deepstars.o: $(HACK_SRC)/screenhackI.h
+deepstars.o: $(srcdir)/sphere.h
+deepstars.o: $(UTILS_SRC)/colors.h
+deepstars.o: $(UTILS_SRC)/erase.h
+deepstars.o: $(UTILS_SRC)/font-retry.h
+deepstars.o: $(UTILS_SRC)/grabscreen.h
+deepstars.o: $(UTILS_SRC)/hsv.h
+deepstars.o: $(UTILS_SRC)/resources.h
+deepstars.o: $(UTILS_SRC)/usleep.h
+deepstars.o: $(UTILS_SRC)/visual.h
+deepstars.o: $(UTILS_SRC)/yarandom.h
+deepstars.o: $(HACK_SRC)/xlockmoreI.h
+deepstars.o: $(HACK_SRC)/xlockmore.h
 discoball.o: ../../config.h
 discoball.o: $(HACK_SRC)/fps.h
 discoball.o: $(srcdir)/gltrackball.h
diff -U3 -r b/xscreensaver-5.43/Makefile.in a/xscreensaver-5.43/Makefile.in
--- b/xscreensaver-5.43/Makefile.in	2018-02-13 01:06:05.000000000 +0100
+++ a/xscreensaver-5.43/Makefile.in	2019-07-10 05:30:42.000000000 +0200
@@ -18,8 +18,11 @@
 
 TAR		= tar
 
-MAKE_SUBDIR  = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE) $@) || exit 5; done
-MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do (cd $$dir; $(MAKE) $@) || exit 5; done
+# Using $(MAKE) directly means the shell executes things even with "make -n"
+MAKE2 = $(MAKE)
+
+MAKE_SUBDIR  = for dir in $(SUBDIRS); do (cd $$dir; $(MAKE2) $@) || exit 5; done
+MAKE_SUBDIR2 = for dir in $(SUBDIRS2); do (cd $$dir; $(MAKE2) $@) || exit 5; done
 
 default::
 	@+$(MAKE_SUBDIR)
@@ -42,9 +45,9 @@
 depend::
 	@$(MAKE_SUBDIR)
 distdepend::
-	@$(MAKE) update_spec_version
+	@$(MAKE2) update_spec_version
 	@$(MAKE_SUBDIR2)
-	@cd po ; $(MAKE) update-po
+	@cd po ; $(MAKE2) update-po
 
 TAGS:: tags
 tags::
@@ -64,8 +67,8 @@
 	@								    \
   sh config.status ;							    \
   rm -f configure ;							    \
-  $(MAKE) configure ;							    \
-  $(MAKE) version-date distdepend ;					    \
+  $(MAKE2) configure ;							    \
+  $(MAKE2) version-date distdepend ;					    \
   VERS=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' utils/version.h` ;  \
   NAME="xscreensaver-$$VERS" ;						    \
   rm -rf $$NAME ; ln -s . $$NAME ;					    \
@@ -74,7 +77,7 @@
   for subdir in $(SUBDIRS2) ; do					    \
     d=`pwd` ;								    \
     cd $$subdir ;							    \
-    FILES="$$FILES `$(MAKE) echo_tarfiles				    \
+    FILES="$$FILES `$(MAKE2) echo_tarfiles				    \
       | grep -v '^.*make\['						    \
       | sed \"s|^|$$subdir/|g;s| | $$subdir/|g\"			    \
       ` ";								    \
@@ -231,9 +234,9 @@
   ls -lFG xscreensaver*-$$VERS-*.rpm
 
 dmg::
-	$(MAKE) -C OSX release dmg
+	$(MAKE2) -C OSX release dmg
 apk::
-	$(MAKE) -C android apk
+	$(MAKE2) -C android apk
 
 www::
 	@								    \
@@ -256,7 +259,7 @@
     exit 1 ;								    \
   fi ;									    \
 									    \
-  $(MAKE) -C OSX updates.xml ;						    \
+  $(MAKE2) -C OSX updates.xml ;						    \
 									    \
   if [ ! -f $$NAME ]; then						    \
     echo "$$NAME does not exist!  Did you forget to \`make tar'?" ;	    \
@@ -331,7 +334,7 @@
 									    \
   git add $$BNAME $$BNAME2 $$BNAME3 ;					    \
 									    \
-  $(MAKE) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
+  $(MAKE2) -C ../ xscreensaver/changelog.html xscreensaver/screenshots/index.html; \
   git diff changelog.html ;						    \
   set +x ;								    \
 									    \
diff -U3 -r b/xscreensaver-5.43/OSX/bindist.rtf a/xscreensaver-5.43/OSX/bindist.rtf
--- b/xscreensaver-5.43/OSX/bindist.rtf	2019-07-01 23:02:58.000000000 +0200
+++ a/xscreensaver-5.43/OSX/bindist.rtf	2019-07-10 05:31:26.000000000 +0200
@@ -17,7 +17,7 @@
 and many others\
 \
 version 5.43\
-01-Jul-2019\
+09-Jul-2019\
 \
 {\field{\*\fldinst{HYPERLINK "https://www.jwz.org/xscreensaver/"}}{\fldrslt \cf2 \ul \ulc2 https://www.jwz.org/xscreensaver/}}\
 \pard\pardeftab720
diff -U3 -r b/xscreensaver-5.43/OSX/Makefile a/xscreensaver-5.43/OSX/Makefile
--- b/xscreensaver-5.43/OSX/Makefile	2018-12-29 07:14:41.000000000 +0100
+++ a/xscreensaver-5.43/OSX/Makefile	2019-07-02 00:51:41.000000000 +0200
@@ -228,7 +228,7 @@
 
 updates.xml::
 	./updates.pl xscreensaver ../README ../archive ~/www/xscreensaver
-	@$(MAKE) test_sig
+	@$(MAKE) $(MAKEFLAGS) test_sig
 
 test_sig::
 	@								    \
@@ -243,6 +243,9 @@
   SIGB=/tmp/$$NN.sig ;							    \
   HASH=/tmp/$$NN.hash ;							    \
   rm -f "$$SIGB" "$$HASH" ;						    \
+  if ( echo "$$SIG" | grep -qi ERROR ); then				    \
+    echo "No signature in updates.xml" >&2 ; exit 1 ;			    \
+  fi ;									    \
   echo "$$SIG " | base64 -D  > "$$SIGB" ;				    \
   set -e ;								    \
   for OPENSSL in /usr/bin/openssl /opt/local/bin/openssl ; do		    \
@@ -375,6 +378,8 @@
 									      \
   hdiutil makehybrid -quiet -ov -hfs -hfs-volume-name "$$VOLNAME"	      \
     -hfs-openfolder "$$STAGE" "$$STAGE" -o "$$TMPDMG" ;			      \
+  echo "Chowning back and deleting..." ;				      \
+  sudo chown -R `whoami` "$$STAGE/"* ;					      \
   rm -rf "$$STAGE" ;							      \
 									      \
   hdiutil convert -quiet -ov -format UDBZ -imagekey zlib-level=9	      \
@@ -386,7 +391,7 @@
   spctl --assess --type install "$$DMG" ;				      \
 									      \
   ls -ldhgF "$$DMG" ;							      \
-  $(MAKE) notarize ;							      \
+  $(MAKE) $(MAKEFLAGS) notarize ;					      \
 
 
 # To set up notarization:
@@ -420,12 +425,16 @@
     --file "$$DMG" $(NOTARGS) ;						      \
   echo "" ;								      \
   sleep 3 ;								      \
-  $(MAKE) notarize_wait staple updates.xml
+  $(MAKE) $(MAKEFLAGS) notarize_wait staple updates.xml
 
 notarize_wait::
-	@while ( xcrun altool --notarization-history 0 $(NOTARGS) |	      \
+	@TODAY=`date +%Y-%m-%d` ;					      \
+	 while ( xcrun altool --notarization-history 0 $(NOTARGS) |	      \
+		 grep "$$TODAY" |					      \
 		 grep -q 'in progress' ); do				      \
 	  echo `date +%I:%M:` "waiting for notarization..." ;		      \
+	  xcrun altool --notarization-history 0 $(NOTARGS) |		      \
+		 grep "$$TODAY" ;					      \
 	  sleep 15 ;							      \
 	done ;								      \
 	echo '' ;							      \
diff -U3 -r b/xscreensaver-5.43/OSX/updates.pl a/xscreensaver-5.43/OSX/updates.pl
--- b/xscreensaver-5.43/OSX/updates.pl	2018-12-26 05:24:01.000000000 +0100
+++ a/xscreensaver-5.43/OSX/updates.pl	2019-07-02 00:35:44.000000000 +0200
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2013-2018 Jamie Zawinski 
+# Copyright © 2013-2019 Jamie Zawinski 
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -21,7 +21,7 @@
 use POSIX;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my ($version) = ('$Revision: 1.5 $' =~ m/\s(\d[.\d]+)\s/s);
+my ($version) = ('$Revision: 1.6 $' =~ m/\s(\d[.\d]+)\s/s);
 
 my $verbose = 0;
 my $debug_p = 0;
@@ -54,6 +54,8 @@
       my ($sig2) = ($item =~ m/edSignature="(.*?)"/si);
       my ($date) = ($item =~ m/(.*?) 1);
+      $sig1 = `$cmd`;
       $sig1 =~ s/\s+//gs;
     }
 
     if (!$sig2 && $zip) {	# New-style sigs
       local %ENV = %ENV;
       $ENV{PATH} = "/usr/bin:$ENV{PATH}";
-      my $xml = `$edddsa_sign_update "$archive_dir/$zip"`;
+      my $cmd = "$edddsa_sign_update \"$archive_dir/$zip\"";
+      print STDERR "$progname: exec: $cmd\n" if ($verbose > 1);
+      my $xml = `$cmd`;
       ($sig2) = ($xml =~ m/sparkle:edSignature=\"([^\"<>\s]+)\"/si);
       error ("unparsable: $edddsa_sign_update: $xml") unless $sig2;
     }
diff -U3 -r b/xscreensaver-5.43/OSX/updates.xml a/xscreensaver-5.43/OSX/updates.xml
--- b/xscreensaver-5.43/OSX/updates.xml	2018-12-29 01:21:03.000000000 +0100
+++ a/xscreensaver-5.43/OSX/updates.xml	2019-07-02 00:58:23.000000000 +0200
@@ -8,6 +8,18 @@
   Updates to xscreensaver.
   en
   
+   
+   https://www.jwz.org/xscreensaver/xscreensaver-5.43.dmg
+   • GLPlanet now supports the Mercator projection. 
• Bouncing Cow has mathematically ideal cows (spherical, frictionless). 
• Foggy toasters. 
• Unknown Pleasures can now use an image file as a clip mask. 
• Updated `webcollage' for recent changes. 
• macOS: Fixed BSOD fonts on UWQHD+ displays. 
• X11: Added some sample unlock dialog color schemes to the .ad file. 
• X11: On systemd systems, closing your laptop lid might actually lock your screen now, maybe. 
• X11: 'sonar' can ping without being setuid by using setcap.]]>
+   Mon, 01 Jul 2019 15:58:08 -0700
+   
+  
+  
    
    https://www.jwz.org/xscreensaver/xscreensaver-5.42.dmg
    
diff -U3 -r b/xscreensaver-5.43/po/POTFILES.in a/xscreensaver-5.43/po/POTFILES.in
--- b/xscreensaver-5.43/po/POTFILES.in	2019-07-01 23:17:56.000000000 +0200
+++ a/xscreensaver-5.43/po/POTFILES.in	2019-07-10 05:31:29.000000000 +0200
@@ -1,4 +1,4 @@
-# Auto-generated: Mon Jul  1 14:17:56 PDT 2019
+# Auto-generated: Tue Jul  9 20:31:29 PDT 2019
 driver/demo-Gtk-conf.c
 driver/demo-Gtk.c
 driver/screensaver-properties.desktop.in
diff -U3 -r b/xscreensaver-5.43/utils/version.h a/xscreensaver-5.43/utils/version.h
--- b/xscreensaver-5.43/utils/version.h	2019-07-01 21:11:25.000000000 +0200
+++ a/xscreensaver-5.43/utils/version.h	2019-07-10 05:31:24.000000000 +0200
@@ -1,2 +1,2 @@
 static const char screensaver_id[] =
-	"@(#)xscreensaver 5.43 (01-Jul-2019), by Jamie Zawinski ([email protected])";
+	"@(#)xscreensaver 5.43 (09-Jul-2019), by Jamie Zawinski ([email protected])";