components/desktop/xscreensaver/Makefile
@@ -18,13 +18,12 @@ include ../../../make-rules/shared-macros.mk COMPONENT_NAME= xscreensaver COMPONENT_VERSION= 6.4 HUMAN_VERSION= 6.04 COMPONENT_REVISION = 3 COMPONENT_VERSION= 6.8 HUMAN_VERSION= 6.08 COMPONENT_PROJECT_URL= https://www.jwz.org/xscreensaver/ COMPONENT_SRC= $(COMPONENT_NAME)-$(HUMAN_VERSION) COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= sha256:787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152 COMPONENT_ARCHIVE_HASH= sha256:5cf52ba525ceecf94b2f2bd63485ebdf318e12fcc0f2adad7d4c106d855e76a3 COMPONENT_ARCHIVE_URL= https://www.jwz.org/xscreensaver/$(COMPONENT_ARCHIVE) COMPONENT_FMRI= desktop/xscreensaver @@ -88,22 +87,21 @@ ) # Build dependencies REQUIRED_PACKAGES += image/library/$(JPEG_IMPLEM) PERL_REQUIRED_PACKAGES += library/perl-5/xml-parser REQUIRED_PACKAGES += image/library/libpng16 REQUIRED_PACKAGES += library/c++/harfbuzz REQUIRED_PACKAGES += library/perl-5/xml-parser REQUIRED_PACKAGES += library/desktop/pango REQUIRED_PACKAGES += x11/library/mesa REQUIRED_PACKAGES += service/opengl/ogl-select # Auto-generated dependencies PERL_REQUIRED_PACKAGES += runtime/perl REQUIRED_PACKAGES += $(JPEG_IMPLEM_PKG) REQUIRED_PACKAGES += library/desktop/atk REQUIRED_PACKAGES += library/desktop/gdk-pixbuf REQUIRED_PACKAGES += library/desktop/gtk2 REQUIRED_PACKAGES += library/desktop/pango REQUIRED_PACKAGES += library/desktop/gtk3 REQUIRED_PACKAGES += library/glib2 REQUIRED_PACKAGES += library/libxml2 REQUIRED_PACKAGES += runtime/perl REQUIRED_PACKAGES += system/library REQUIRED_PACKAGES += system/library/math REQUIRED_PACKAGES += x11/library/glu components/desktop/xscreensaver/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@ # # # Copyright 2022 <contributor> # Copyright 2023 <contributor> # set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -78,6 +78,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/cubestorm.xml file path=usr/lib/xscreensaver/config/control-center-2.0/cubetwist.xml file path=usr/lib/xscreensaver/config/control-center-2.0/cubicgrid.xml file path=usr/lib/xscreensaver/config/control-center-2.0/cubocteversion.xml file path=usr/lib/xscreensaver/config/control-center-2.0/cwaves.xml file path=usr/lib/xscreensaver/config/control-center-2.0/cynosure.xml file path=usr/lib/xscreensaver/config/control-center-2.0/dangerball.xml @@ -90,6 +91,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/discrete.xml file path=usr/lib/xscreensaver/config/control-center-2.0/distort.xml file path=usr/lib/xscreensaver/config/control-center-2.0/drift.xml file path=usr/lib/xscreensaver/config/control-center-2.0/droste.xml file path=usr/lib/xscreensaver/config/control-center-2.0/dymaxionmap.xml file path=usr/lib/xscreensaver/config/control-center-2.0/endgame.xml file path=usr/lib/xscreensaver/config/control-center-2.0/energystream.xml @@ -142,6 +144,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/helix.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hexadrop.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hexstrut.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hextrail.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hilbert.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hopalong.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hydrostat.xml @@ -187,6 +190,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/noof.xml file path=usr/lib/xscreensaver/config/control-center-2.0/noseguy.xml file path=usr/lib/xscreensaver/config/control-center-2.0/pacman.xml file path=usr/lib/xscreensaver/config/control-center-2.0/papercube.xml file path=usr/lib/xscreensaver/config/control-center-2.0/pedal.xml file path=usr/lib/xscreensaver/config/control-center-2.0/peepers.xml file path=usr/lib/xscreensaver/config/control-center-2.0/penetrate.xml @@ -224,6 +228,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/shadebobs.xml file path=usr/lib/xscreensaver/config/control-center-2.0/sierpinski.xml file path=usr/lib/xscreensaver/config/control-center-2.0/sierpinski3d.xml file path=usr/lib/xscreensaver/config/control-center-2.0/skulloop.xml file path=usr/lib/xscreensaver/config/control-center-2.0/skytentacles.xml file path=usr/lib/xscreensaver/config/control-center-2.0/slidescreen.xml file path=usr/lib/xscreensaver/config/control-center-2.0/slip.xml @@ -248,7 +253,6 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/swirl.xml file path=usr/lib/xscreensaver/config/control-center-2.0/tangram.xml file path=usr/lib/xscreensaver/config/control-center-2.0/tessellimage.xml file path=usr/lib/xscreensaver/config/control-center-2.0/thornbird.xml file path=usr/lib/xscreensaver/config/control-center-2.0/timetunnel.xml file path=usr/lib/xscreensaver/config/control-center-2.0/topblock.xml file path=usr/lib/xscreensaver/config/control-center-2.0/triangle.xml @@ -324,6 +328,7 @@ file path=usr/lib/xscreensaver/hacks/cubestorm file path=usr/lib/xscreensaver/hacks/cubetwist file path=usr/lib/xscreensaver/hacks/cubicgrid file path=usr/lib/xscreensaver/hacks/cubocteversion file path=usr/lib/xscreensaver/hacks/cwaves file path=usr/lib/xscreensaver/hacks/cynosure file path=usr/lib/xscreensaver/hacks/dangerball @@ -336,6 +341,7 @@ file path=usr/lib/xscreensaver/hacks/discrete file path=usr/lib/xscreensaver/hacks/distort file path=usr/lib/xscreensaver/hacks/drift file path=usr/lib/xscreensaver/hacks/droste file path=usr/lib/xscreensaver/hacks/dymaxionmap file path=usr/lib/xscreensaver/hacks/endgame file path=usr/lib/xscreensaver/hacks/energystream @@ -388,6 +394,7 @@ file path=usr/lib/xscreensaver/hacks/helix file path=usr/lib/xscreensaver/hacks/hexadrop file path=usr/lib/xscreensaver/hacks/hexstrut file path=usr/lib/xscreensaver/hacks/hextrail file path=usr/lib/xscreensaver/hacks/hilbert file path=usr/lib/xscreensaver/hacks/hopalong file path=usr/lib/xscreensaver/hacks/hydrostat @@ -434,6 +441,7 @@ file path=usr/lib/xscreensaver/hacks/noof file path=usr/lib/xscreensaver/hacks/noseguy file path=usr/lib/xscreensaver/hacks/pacman file path=usr/lib/xscreensaver/hacks/papercube file path=usr/lib/xscreensaver/hacks/pedal file path=usr/lib/xscreensaver/hacks/peepers file path=usr/lib/xscreensaver/hacks/penetrate @@ -471,6 +479,7 @@ file path=usr/lib/xscreensaver/hacks/shadebobs file path=usr/lib/xscreensaver/hacks/sierpinski file path=usr/lib/xscreensaver/hacks/sierpinski3d file path=usr/lib/xscreensaver/hacks/skulloop file path=usr/lib/xscreensaver/hacks/skytentacles file path=usr/lib/xscreensaver/hacks/slidescreen file path=usr/lib/xscreensaver/hacks/slip @@ -495,7 +504,6 @@ file path=usr/lib/xscreensaver/hacks/swirl file path=usr/lib/xscreensaver/hacks/tangram file path=usr/lib/xscreensaver/hacks/tessellimage file path=usr/lib/xscreensaver/hacks/thornbird file path=usr/lib/xscreensaver/hacks/timetunnel file path=usr/lib/xscreensaver/hacks/topblock file path=usr/lib/xscreensaver/hacks/triangle @@ -533,7 +541,7 @@ file path=usr/share/X11/app-defaults/XScreenSaver file path=usr/share/applications/xscreensaver-settings.desktop file path=usr/share/applications/xscreensaver.desktop file path=usr/share/fonts/xscreensaver/OCRAStd.otf file path=usr/share/fonts/xscreensaver/OCRA.ttf file path=usr/share/fonts/xscreensaver/SpecialElite.ttf file path=usr/share/fonts/xscreensaver/clacon.ttf file path=usr/share/fonts/xscreensaver/gallant12x22.ttf @@ -613,6 +621,7 @@ file path=usr/share/man/man6/cubestorm.6 file path=usr/share/man/man6/cubetwist.6 file path=usr/share/man/man6/cubicgrid.6 file path=usr/share/man/man6/cubocteversion.6 file path=usr/share/man/man6/cwaves.6 file path=usr/share/man/man6/cynosure.6 file path=usr/share/man/man6/dangerball.6 @@ -625,6 +634,7 @@ file path=usr/share/man/man6/discrete.6 file path=usr/share/man/man6/distort.6 file path=usr/share/man/man6/drift.6 file path=usr/share/man/man6/droste.6 file path=usr/share/man/man6/dymaxionmap.6 file path=usr/share/man/man6/endgame.6 file path=usr/share/man/man6/energystream.6 @@ -678,6 +688,7 @@ file path=usr/share/man/man6/helix.6 file path=usr/share/man/man6/hexadrop.6 file path=usr/share/man/man6/hexstrut.6 file path=usr/share/man/man6/hextrail.6 file path=usr/share/man/man6/hilbert.6 file path=usr/share/man/man6/hopalong.6 file path=usr/share/man/man6/hydrostat.6 @@ -722,6 +733,7 @@ file path=usr/share/man/man6/noof.6 file path=usr/share/man/man6/noseguy.6 file path=usr/share/man/man6/pacman.6 file path=usr/share/man/man6/papercube.6 file path=usr/share/man/man6/pedal.6 file path=usr/share/man/man6/peepers.6 file path=usr/share/man/man6/penetrate.6 @@ -758,6 +770,7 @@ file path=usr/share/man/man6/shadebobs.6 file path=usr/share/man/man6/sierpinski.6 file path=usr/share/man/man6/sierpinski3d.6 file path=usr/share/man/man6/skulloop.6 file path=usr/share/man/man6/skytentacles.6 file path=usr/share/man/man6/slidescreen.6 file path=usr/share/man/man6/slip.6 @@ -782,7 +795,6 @@ file path=usr/share/man/man6/swirl.6 file path=usr/share/man/man6/tangram.6 file path=usr/share/man/man6/tessellimage.6 file path=usr/share/man/man6/thornbird.6 file path=usr/share/man/man6/timetunnel.6 file path=usr/share/man/man6/topblock.6 file path=usr/share/man/man6/triangle.6 @@ -818,11 +830,4 @@ file path=usr/share/man/man6/xspirograph.6 file path=usr/share/man/man6/zoom.6 file path=usr/share/pixmaps/xscreensaver.png file path=usr/share/xscreensaver/ui/screensaver-cmndln.png file path=usr/share/xscreensaver/ui/screensaver-colorselector.png file path=usr/share/xscreensaver/ui/screensaver-diagnostic.png file path=usr/share/xscreensaver/ui/screensaver-locking.png file path=usr/share/xscreensaver/ui/screensaver-power.png file path=usr/share/xscreensaver/ui/screensaver-snap.png file path=usr/share/xscreensaver/ui/xscreensaver.ui file path=usr/share/xscreensaver/xscreensaver.service components/desktop/xscreensaver/patches/03-XScreenSaver.ad-defaults.patch
@@ -1,17 +1,12 @@ --- a/driver/XScreenSaver.ad.in Sun May 29 19:41:47 2022 +++ b/driver/XScreenSaver.ad.in Tue Aug 2 11:18:02 2022 @@ -28,30 +28,30 @@ ! /* (xrdb prevention kludge: whole file) -*mode: random +*mode: blank --- xscreensaver-6.08/driver/XScreenSaver.ad.in.orig 2023-10-11 02:24:06.551773885 +0200 +++ xscreensaver-6.08/driver/XScreenSaver.ad.in 2023-10-26 22:50:42.014240432 +0200 @@ -32,36 +32,36 @@ *timeout: 0:10:00 *cycle: 0:10:00 *lockTimeout: 0:00:00 -*passwdTimeout: 0:00:30 -*dpmsEnabled: False +*passwdTimeout: 0:02:00 +*passwdTimeout: 0:00:02 +*dpmsEnabled: True *dpmsQuickoffEnabled: False -*dpmsStandby: 2:00:00 @@ -41,7 +36,6 @@ *splashDuration: 0:00:05 *visualID: default *installColormap: True @@ -58,10 +58,10 @@ *ignoreUninstalledPrograms: False *authWarningSlack: 20 @@ -54,128 +48,128 @@ *textURL: https://en.wikipedia.org/w/index.php?title=Special:NewPages&feed=rss ! This is what the "Settings" button on the splash screen runs. @@ -347,23 +347,23 @@ @GL_KLUDGE@ GL: superquadrics -root \n\ attraction -root \n\ blitspin -root \n\ - greynetic -root \n\ - helix -root \n\ +- greynetic -root \n\ +- helix -root \n\ hopalong -root \n\ imsmap -root \n\ - noseguy -root \n\ - pyro -root \n\ qix -root \n\ - rocks -root \n\ - rorschach -root \n\ +- rorschach -root \n\ decayscreen -root \n\ - flame -root \n\ +- flame -root \n\ halo -root \n\ slidescreen -root \n\ - pedal -root \n\ +- pedal -root \n\ bouboule -root \n\ - braid -root \n\ - coral -root \n\ +- coral -root \n\ deco -root \n\ drift -root \n\ - fadeplot -root \n\ @@ -372,13 +372,13 @@ grav -root \n\ ifs -root \n\ @GL_KLUDGE@ GL: jigsaw -root \n\ - julia -root \n\ +- julia -root \n\ - kaleidescope -root \n\ @GL_KLUDGE@ GL: moebius -root \n\ - moire -root \n\ +- moire -root \n\ @GL_KLUDGE@ GL: morph3d -root \n\ mountain -root \n\ - munch -root \n\ +- munch -root \n\ penrose -root \n\ @GL_KLUDGE@ GL: pipes -root \n\ rd-bomb -root \n\ @@ -393,7 +393,7 @@ xjack -root \n\ xlyap -root \n\ @GL_KLUDGE@ GL: atlantis -root \n\ - bsod -root \n\ +- bsod -root \n\ @GL_KLUDGE@ GL: bubble3d -root \n\ @GL_KLUDGE@ GL: cage -root \n\ - crystal -root \n\ @@ -406,7 +406,7 @@ interference -root \n\ kumppa -root \n\ @GL_KLUDGE@ GL: lament -root \n\ - moire2 -root \n\ +- moire2 -root \n\ @GL_KLUDGE@ GL: sonar -root \n\ @GL_KLUDGE@ GL: stairs -root \n\ truchet -root \n\ @@ -414,9 +414,9 @@ blaster -root \n\ bumps -root \n\ ccurve -root \n\ - compass -root \n\ +- compass -root \n\ deluxe -root \n\ -- demon -root \n\ + demon -root \n\ @GLE_KLUDGE@ GL: extrusion -root \n\ - loop -root \n\ penetrate -root \n\ @@ -430,7 +430,7 @@ squiral -root \n\ wander -root \n\ - webcollage -root \n\ - xflame -root \n\ + xflame -root -bitmap /usr/lib/xscreensaver/config/unlock-logo.png \n\ xmatrix -root \n\ @GL_KLUDGE@ GL: gflux -root \n\ - nerverot -root \n\ @@ -446,14 +446,14 @@ @GL_KLUDGE@ GL: molecule -root \n\ rotzoomer -root \n\ scooter -root \n\ - speedmine -root \n\ +- speedmine -root \n\ @GL_KLUDGE@ GL: starwars -root \n\ @GL_KLUDGE@ GL: stonerview -root \n\ vermiculate -root \n\ whirlwindwarp -root \n\ zoom -root \n\ anemone -root \n\ - apollonian -root \n\ +- apollonian -root \n\ @GL_KLUDGE@ GL: boxed -root \n\ @GL_KLUDGE@ GL: cubenetic -root \n\ @GL_KLUDGE@ GL: endgame -root \n\ @@ -482,12 +482,11 @@ @GL_KLUDGE@ GL: cubestorm -root \n\ eruption -root \n\ @GL_KLUDGE@ GL: flipflop -root \n\ -@GL_KLUDGE@ GL: flyingtoasters -root \n\ fontglide -root \n\ @GL_KLUDGE@ GL: gleidescope -root \n\ @GL_KLUDGE@ GL: glknots -root \n\ @GL_KLUDGE@ GL: glmatrix -root \n\ -- GL: glslideshow -root \n\ +@GL_KLUDGE@ GL: glslideshow -root \n\ @GL_KLUDGE@ GL: hypertorus -root \n\ - GL: jigglypuff -root \n\ metaballs -root \n\ @@ -507,7 +506,6 @@ intermomentary -root \n\ memscroller -root \n\ @GL_KLUDGE@ GL: noof -root \n\ - pacman -root \n\ @GL_KLUDGE@ GL: pinion -root \n\ @GL_KLUDGE@ GL: polyhedra -root \n\ - GL: providence -root \n\ @@ -328,23 +328,23 @@ @GL_KLUDGE@ GL: superquadrics --root \n\ attraction --root \n\ blitspin --root \n\ - greynetic --root \n\ - helix --root \n\ +- greynetic --root \n\ +- helix --root \n\ hopalong --root \n\ imsmap --root \n\ - noseguy --root \n\ - pyro --root \n\ qix --root \n\ - rocks --root \n\ - rorschach --root \n\ +- rorschach --root \n\ decayscreen --root \n\ - flame --root \n\ +- flame --root \n\ halo --root \n\ slidescreen --root \n\ - pedal --root \n\ +- pedal --root \n\ bouboule --root \n\ - braid --root \n\ - coral --root \n\ +- coral --root \n\ deco --root \n\ drift --root \n\ - fadeplot --root \n\ @@ -353,13 +353,13 @@ grav --root \n\ ifs --root \n\ @GL_KLUDGE@ GL: jigsaw --root \n\ - julia --root \n\ +- julia --root \n\ - kaleidescope --root \n\ @GL_KLUDGE@ GL: moebius --root \n\ - moire --root \n\ +- moire --root \n\ @GL_KLUDGE@ GL: morph3d --root \n\ mountain --root \n\ - munch --root \n\ +- munch --root \n\ penrose --root \n\ @GL_KLUDGE@ GL: pipes --root \n\ rdbomb --root \n\ @@ -374,7 +374,7 @@ xjack --root \n\ xlyap --root \n\ @GL_KLUDGE@ GL: atlantis --root \n\ - bsod --root \n\ +- bsod --root \n\ @GL_KLUDGE@ GL: bubble3d --root \n\ @GL_KLUDGE@ GL: cage --root \n\ - crystal --root \n\ @@ -387,7 +387,7 @@ interference --root \n\ kumppa --root \n\ @GL_KLUDGE@ GL: lament --root \n\ - moire2 --root \n\ +- moire2 --root \n\ @GL_KLUDGE@ GL: sonar --root \n\ @GL_KLUDGE@ GL: stairs --root \n\ truchet --root \n\ @@ -396,9 +396,9 @@ blaster --root \n\ bumps --root \n\ ccurve --root \n\ - compass --root \n\ +- compass --root \n\ deluxe --root \n\ -- demon --root \n\ + demon --root \n\ @GLE_KLUDGE@ GL: extrusion --root \n\ - loop --root \n\ penetrate --root \n\ @@ -411,7 +411,7 @@ spotlight --root \n\ squiral --root \n\ wander --root \n\ - xflame --root \n\ + xflame -root -bitmap /usr/lib/xscreensaver/config/unlock-logo.png \n\^ xmatrix --root \n\ @GL_KLUDGE@ GL: gflux --root \n\ - nerverot --root \n\ @@ -427,14 +427,14 @@ @GL_KLUDGE@ GL: molecule --root \n\ rotzoomer --root \n\ scooter --root \n\ - speedmine --root \n\ +- speedmine --root \n\ @GL_KLUDGE@ GL: starwars --root \n\ @GL_KLUDGE@ GL: stonerview --root \n\ vermiculate --root \n\ whirlwindwarp --root \n\ zoom --root \n\ anemone --root \n\ - apollonian --root \n\ +- apollonian --root \n\ @GL_KLUDGE@ GL: boxed --root \n\ @GL_KLUDGE@ GL: cubenetic --root \n\ @GL_KLUDGE@ GL: endgame --root \n\ @@ -462,12 +462,11 @@ @GL_KLUDGE@ GL: cubestorm --root \n\ eruption --root \n\ @GL_KLUDGE@ GL: flipflop --root \n\ -@GL_KLUDGE@ GL: flyingtoasters --root \n\ fontglide --root \n\ @GL_KLUDGE@ GL: gleidescope --root \n\ @GL_KLUDGE@ GL: glknots --root \n\ @GL_KLUDGE@ GL: glmatrix --root \n\ -- GL: glslideshow --root \n\ +@GL_KLUDGE@ GL: glslideshow --root \n\ @GL_KLUDGE@ GL: hypertorus --root \n\ - GL: jigglypuff --root \n\ metaballs --root \n\ @@ -487,7 +486,6 @@ intermomentary --root \n\ memscroller --root \n\ @GL_KLUDGE@ GL: noof --root \n\ - pacman --root \n\ @GL_KLUDGE@ GL: pinion --root \n\ @GL_KLUDGE@ GL: polyhedra --root \n\ - GL: providence --root \n\ components/desktop/xscreensaver/patches/08-passwdTimeout-pref.patch
File was deleted components/desktop/xscreensaver/patches/14-papercube.patch
New file @@ -0,0 +1,36 @@ --- xscreensaver-6.08/hacks/glx/papercube.c.orig 2023-08-02 20:45:42.291318997 +0200 +++ xscreensaver-6.08/hacks/glx/papercube.c 2023-10-26 22:08:16.913136092 +0200 @@ -858,7 +858,7 @@ double angle = 90.0; double fold = FOLD_DURATION / speed; double pause = PAUSE_DURATION / speed; - double sun = SUN_DURATION / speed; + double xxxsun = SUN_DURATION / speed; double spin = SPIN_DURATION / speed; double spin_rps = SPIN_RPS; double time = 0; @@ -866,7 +866,7 @@ struct field_move *field_move; int i; - set_move(&moves->sunrise, time, sun, 0.0, brightness); + set_move(&moves->sunrise, time, xxxsun, 0.0, brightness); time = moves->sunrise.stop + pause; @@ -901,12 +901,12 @@ time = field_move->move.stop + pause; - set_move(&moves->spin, time, time + spin + sun, - 0.0, (spin + sun) * spin_rps * 360); + set_move(&moves->spin, time, time + spin + xxxsun, + 0.0, (spin + xxxsun) * spin_rps * 360); time += spin; - set_move(&moves->sunset, time, time + sun, brightness, 0.0); + set_move(&moves->sunset, time, time + xxxsun, brightness, 0.0); moves->stage = Sunrise; set_move_time_big_bang(&moves->move_time); components/desktop/xscreensaver/patches/90-xscreensaver-auth-keep-setuid.patch
@@ -1,14 +1,12 @@ --- b/driver/xscreensaver-auth.c Sat Feb 19 18:16:50 2022 +++ a/driver/xscreensaver-auth.c Mon Aug 8 20:39:57 2022 @@ -275,9 +275,9 @@ if (!splash_p && init_p) exit (0); +// Unable to complete the pam conversation unless we're setuid the whole time +// disavow_privileges (); --- xscreensaver-6.08/driver/xscreensaver-auth.c.orig 2022-09-12 04:33:40.607094356 +0200 +++ xscreensaver-6.08/driver/xscreensaver-auth.c 2023-10-26 21:32:25.594969717 +0200 @@ -340,7 +340,8 @@ if (!splash_p && !init_p) lock_priv_init (); - disavow_privileges (); - if (!splash_p) lock_init (); + // Unable to complete the pam conversation unless we're setuid the whole time + // disavow_privileges (); if (!splash_p && !init_p) lock_init (); components/desktop/xscreensaver/pkg5
@@ -5,12 +5,12 @@ "library/c++/harfbuzz", "library/desktop/atk", "library/desktop/gdk-pixbuf", "library/desktop/gtk2", "library/desktop/gtk3", "library/desktop/pango", "library/glib2", "library/libxml2", "library/perl-5/xml-parser", "runtime/perl", "library/perl-5/xml-parser-538", "runtime/perl-538", "service/opengl/ogl-select", "system/library", "system/library/math", @@ -26,9 +26,9 @@ "x11/library/toolkit/libxt" ], "fmris": [ "desktop/xscreensaver", "desktop/xscreensaver/hacks/hacks-gl", "desktop/xscreensaver/hacks", "desktop/xscreensaver/hacks/hacks-gl" "desktop/xscreensaver" ], "name": "xscreensaver" } components/desktop/xscreensaver/xscreensaver.p5m
@@ -59,15 +59,13 @@ file path=usr/bin/xscreensaver-command link path=usr/bin/xscreensaver-demo target=xscreensaver-settings file path=usr/bin/xscreensaver-settings file path=usr/share/xscreensaver/ui/screensaver-cmndln.png file path=usr/share/xscreensaver/ui/screensaver-colorselector.png file path=usr/share/xscreensaver/ui/screensaver-diagnostic.png file path=usr/share/xscreensaver/ui/screensaver-locking.png file path=usr/share/xscreensaver/ui/screensaver-power.png file path=usr/share/xscreensaver/ui/screensaver-snap.png file path=usr/share/xscreensaver/ui/xscreensaver.ui file path=usr/share/X11/app-defaults/XScreenSaver file path=usr/share/applications/xscreensaver-settings.desktop file path=usr/share/fonts/xscreensaver/OCRA.ttf file path=usr/share/fonts/xscreensaver/SpecialElite.ttf file path=usr/share/fonts/xscreensaver/clacon.ttf file path=usr/share/fonts/xscreensaver/gallant12x22.ttf file path=usr/share/fonts/xscreensaver/luximr.ttf file path=usr/share/locale/da/LC_MESSAGES/xscreensaver.mo file path=usr/share/locale/de/LC_MESSAGES/xscreensaver.mo file path=usr/share/locale/es/LC_MESSAGES/xscreensaver.mo components/desktop/xscreensaver/xscreensaver_hacks.p5m
@@ -90,6 +90,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/discrete.xml file path=usr/lib/xscreensaver/config/control-center-2.0/distort.xml file path=usr/lib/xscreensaver/config/control-center-2.0/drift.xml file path=usr/lib/xscreensaver/config/control-center-2.0/droste.xml file path=usr/lib/xscreensaver/config/control-center-2.0/epicycle.xml file path=usr/lib/xscreensaver/config/control-center-2.0/eruption.xml file path=usr/lib/xscreensaver/config/control-center-2.0/euler2d.xml @@ -161,7 +162,6 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/substrate.xml file path=usr/lib/xscreensaver/config/control-center-2.0/swirl.xml file path=usr/lib/xscreensaver/config/control-center-2.0/tessellimage.xml file path=usr/lib/xscreensaver/config/control-center-2.0/thornbird.xml file path=usr/lib/xscreensaver/config/control-center-2.0/triangle.xml file path=usr/lib/xscreensaver/config/control-center-2.0/truchet.xml file path=usr/lib/xscreensaver/config/control-center-2.0/twang.xml @@ -209,6 +209,7 @@ file path=usr/lib/xscreensaver/hacks/discrete file path=usr/lib/xscreensaver/hacks/distort file path=usr/lib/xscreensaver/hacks/drift file path=usr/lib/xscreensaver/hacks/droste file path=usr/lib/xscreensaver/hacks/epicycle file path=usr/lib/xscreensaver/hacks/eruption file path=usr/lib/xscreensaver/hacks/euler2d @@ -279,7 +280,6 @@ file path=usr/lib/xscreensaver/hacks/strange file path=usr/lib/xscreensaver/hacks/substrate file path=usr/lib/xscreensaver/hacks/swirl file path=usr/lib/xscreensaver/hacks/thornbird file path=usr/lib/xscreensaver/hacks/tessellimage file path=usr/lib/xscreensaver/hacks/triangle file path=usr/lib/xscreensaver/hacks/truchet @@ -328,6 +328,7 @@ file path=usr/share/man/man6/discrete.6 file path=usr/share/man/man6/distort.6 file path=usr/share/man/man6/drift.6 file path=usr/share/man/man6/droste.6 file path=usr/share/man/man6/epicycle.6 file path=usr/share/man/man6/eruption.6 file path=usr/share/man/man6/euler2d.6 @@ -397,7 +398,6 @@ file path=usr/share/man/man6/substrate.6 file path=usr/share/man/man6/swirl.6 file path=usr/share/man/man6/tessellimage.6 file path=usr/share/man/man6/thornbird.6 file path=usr/share/man/man6/triangle.6 file path=usr/share/man/man6/truchet.6 file path=usr/share/man/man6/twang.6 components/desktop/xscreensaver/xscreensaver_hacks_gl.p5m
@@ -131,6 +131,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/cubestorm.xml file path=usr/lib/xscreensaver/config/control-center-2.0/cubetwist.xml file path=usr/lib/xscreensaver/config/control-center-2.0/cubicgrid.xml file path=usr/lib/xscreensaver/config/control-center-2.0/cubocteversion.xml file path=usr/lib/xscreensaver/config/control-center-2.0/dangerball.xml file path=usr/lib/xscreensaver/config/control-center-2.0/deepstars.xml file path=usr/lib/xscreensaver/config/control-center-2.0/discoball.xml @@ -161,6 +162,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/gravitywell.xml file path=usr/lib/xscreensaver/config/control-center-2.0/handsy.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hexstrut.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hextrail.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hydrostat.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hypertorus.xml file path=usr/lib/xscreensaver/config/control-center-2.0/hypnowheel.xml @@ -178,6 +180,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/molecule.xml file path=usr/lib/xscreensaver/config/control-center-2.0/morph3d.xml file path=usr/lib/xscreensaver/config/control-center-2.0/noof.xml file path=usr/lib/xscreensaver/config/control-center-2.0/papercube.xml file path=usr/lib/xscreensaver/config/control-center-2.0/photopile.xml file path=usr/lib/xscreensaver/config/control-center-2.0/pinion.xml file path=usr/lib/xscreensaver/config/control-center-2.0/pipes.xml @@ -193,6 +196,7 @@ file path=usr/lib/xscreensaver/config/control-center-2.0/rubikblocks.xml file path=usr/lib/xscreensaver/config/control-center-2.0/sballs.xml file path=usr/lib/xscreensaver/config/control-center-2.0/sierpinski3d.xml file path=usr/lib/xscreensaver/config/control-center-2.0/skulloop.xml file path=usr/lib/xscreensaver/config/control-center-2.0/skytentacles.xml file path=usr/lib/xscreensaver/config/control-center-2.0/spheremonics.xml file path=usr/lib/xscreensaver/config/control-center-2.0/splitflap.xml @@ -233,6 +237,7 @@ file path=usr/lib/xscreensaver/hacks/cubestorm file path=usr/lib/xscreensaver/hacks/cubetwist file path=usr/lib/xscreensaver/hacks/cubicgrid file path=usr/lib/xscreensaver/hacks/cubocteversion file path=usr/lib/xscreensaver/hacks/dangerball file path=usr/lib/xscreensaver/hacks/deepstars file path=usr/lib/xscreensaver/hacks/discoball @@ -263,6 +268,7 @@ file path=usr/lib/xscreensaver/hacks/gravitywell file path=usr/lib/xscreensaver/hacks/handsy file path=usr/lib/xscreensaver/hacks/hexstrut file path=usr/lib/xscreensaver/hacks/hextrail file path=usr/lib/xscreensaver/hacks/hydrostat file path=usr/lib/xscreensaver/hacks/hypertorus file path=usr/lib/xscreensaver/hacks/hypnowheel @@ -280,6 +286,7 @@ file path=usr/lib/xscreensaver/hacks/molecule file path=usr/lib/xscreensaver/hacks/morph3d file path=usr/lib/xscreensaver/hacks/noof file path=usr/lib/xscreensaver/hacks/papercube file path=usr/lib/xscreensaver/hacks/photopile file path=usr/lib/xscreensaver/hacks/pinion file path=usr/lib/xscreensaver/hacks/pipes @@ -295,6 +302,7 @@ file path=usr/lib/xscreensaver/hacks/rubikblocks file path=usr/lib/xscreensaver/hacks/sballs file path=usr/lib/xscreensaver/hacks/sierpinski3d file path=usr/lib/xscreensaver/hacks/skulloop file path=usr/lib/xscreensaver/hacks/skytentacles file path=usr/lib/xscreensaver/hacks/spheremonics file path=usr/lib/xscreensaver/hacks/splitflap @@ -334,6 +342,7 @@ file path=usr/share/man/man6/cubestack.6 file path=usr/share/man/man6/cubestorm.6 file path=usr/share/man/man6/cubicgrid.6 file path=usr/share/man/man6/cubocteversion.6 file path=usr/share/man/man6/dangerball.6 file path=usr/share/man/man6/deepstars.6 file path=usr/share/man/man6/discoball.6 @@ -364,6 +373,7 @@ file path=usr/share/man/man6/gravitywell.6 file path=usr/share/man/man6/handsy.6 file path=usr/share/man/man6/hexstrut.6 file path=usr/share/man/man6/hextrail.6 file path=usr/share/man/man6/hydrostat.6 file path=usr/share/man/man6/hypertorus.6 file path=usr/share/man/man6/hypnowheel.6 @@ -381,6 +391,7 @@ file path=usr/share/man/man6/molecule.6 file path=usr/share/man/man6/morph3d.6 file path=usr/share/man/man6/noof.6 file path=usr/share/man/man6/papercube.6 file path=usr/share/man/man6/photopile.6 file path=usr/share/man/man6/pinion.6 file path=usr/share/man/man6/pipes.6 @@ -396,6 +407,7 @@ file path=usr/share/man/man6/rubikblocks.6 file path=usr/share/man/man6/sballs.6 file path=usr/share/man/man6/sierpinski3d.6 file path=usr/share/man/man6/skulloop.6 file path=usr/share/man/man6/skytentacles.6 file path=usr/share/man/man6/spheremonics.6 file path=usr/share/man/man6/splitflap.6
