Diff below seems to work for me as well as 5.45 does; that is to say,
it's working properly on my laptop if I only display on the internal
LCD, fails completely if I only display on the external display, and if
I have both displays active with the desktop extended to the external
display it locks ok, but only the internal LCD runs the blanker.
It would be helpful if others can confirm that this doesn't break
anything for them.
gid auth isn't working for me, so this is still setuid root, but at
least it's just the auth module in a separate process now.
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- Makefile 11 Mar 2022 20:18:09 -0000 1.109
+++ Makefile 1 Apr 2022 11:42:16 -0000
@@ -1,6 +1,6 @@
COMMENT= screen saver and locker for the X Window System
-DISTNAME= xscreensaver-5.45
+DISTNAME= xscreensaver-6.03
CATEGORIES= x11
@@ -9,9 +9,9 @@ HOMEPAGE= https://www.jwz.org/xscreensav
# BSD
PERMIT_PACKAGE= Yes
-WANTLIB += GL GLU ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
-WANTLIB += Xft Xi Xinerama Xmu Xrandr Xrender Xt Xxf86vm atk-1.0
-WANTLIB += c cairo fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB = EGL GL GLU ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
+WANTLIB += Xft Xi Xinerama Xrandr Xrender Xt Xxf86vm atk-1.0 c cairo
+WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gdk_pixbuf_xlib-2.0 gio-2.0 gle glib-2.0 gmodule-2.0
WANTLIB += gobject-2.0 gtk-x11-2.0 harfbuzz intl jpeg m pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pthread util xml2 z
@@ -39,8 +39,7 @@ USE_GMAKE= Yes
NO_TEST= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= --with-hackdir="${PREFIX}/libexec/xscreensaver" \
- --with-x-app-defaults="${PREFIX}/lib/X11/app-defaults" \
+CONFIGURE_ARGS= --with-app-defaults="${PREFIX}/lib/X11/app-defaults" \
--without-pam
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/distinfo,v
retrieving revision 1.41
diff -u -p -r1.41 distinfo
--- distinfo 10 Jan 2021 21:32:12 -0000 1.41
+++ distinfo 1 Apr 2022 11:42:16 -0000
@@ -1,2 +1,2 @@
-SHA256 (xscreensaver-5.45.tar.gz) = cBbfZza6ASamjB81q89BGmlf6TvAGhjr2d9Gyan01Q0=
-SIZE (xscreensaver-5.45.tar.gz) = 27729147
+SHA256 (xscreensaver-6.03.tar.gz) = Mo1ReXNSrPWMpbq0nnb78mA058rXhfZR6hHOe0P7olo=
+SIZE (xscreensaver-6.03.tar.gz) = 25703584
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 1 Apr 2022 11:42:16 -0000
@@ -0,0 +1,13 @@
+Permit building if security/openpam is installed.
+
+Index: configure
+--- configure.orig
++++ configure
+@@ -21135,7 +21135,6 @@ elif test "$have_pam" = no ; then
+ if test -d /etc/pam.d -o -f /etc/pam.conf ; then
+ warn "Your system seems to have PAM, but PAM is not being used."
+ warn2 "That is probably not going to work out well."
+- CONF_STATUS=1
+ fi
+ fi
+
Index: patches/patch-driver_XScreenSaver_ad_in
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/patches/patch-driver_XScreenSaver_ad_in,v
retrieving revision 1.17
diff -u -p -r1.17 patch-driver_XScreenSaver_ad_in
--- patches/patch-driver_XScreenSaver_ad_in 11 Mar 2022 20:18:09 -0000 1.17
+++ patches/patch-driver_XScreenSaver_ad_in 1 Apr 2022 11:42:16 -0000
@@ -1,16 +1,16 @@
-Don't hardcode gnome-terminal, fallback to xterm
+OpenBSD doesn't have x-terminal-emulator.
Index: driver/XScreenSaver.ad.in
--- driver/XScreenSaver.ad.in.orig
+++ driver/XScreenSaver.ad.in
-@@ -101,8 +101,8 @@
- ! Gnome 2.4, 2.6: (yelp can't display man pages, as of 2.6.3)
+@@ -80,8 +80,8 @@
!
@GNOME24@*loadURL: @WITH_BROWSER@ '%s'
--@GNOME24@*manualCommand: gnome-terminal --title '%s manual' \
--@GNOME24@ --command '/bin/sh -c "man %s; read foo"'
-+@GNOME24@*manualCommand: xterm -sb -fg black -bg gray75 -T '%s manual' \
-+@GNOME24@ -e /bin/sh -c 'man "%s" ; read foo'
+ @GNOME24@*manualCommand: yelp man:%s || \
+-@GNOME24@ x-terminal-emulator -t '%s manual' \
+-@GNOME24@ -e /bin/sh -c "man %s; read foo"
++@GNOME24@ xterm -sb -fg black -bg gray75 -T '%s manual' \
++@GNOME24@ -e /bin/sh -c 'man "%s" ; read foo'
+
!
! Gnome 2.2:
- !
Index: patches/patch-driver_passwd-pwent_c
===================================================================
RCS file: /cvs/ports/x11/xscreensaver/patches/patch-driver_passwd-pwent_c,v
retrieving revision 1.5
diff -u -p -r1.5 patch-driver_passwd-pwent_c
--- patches/patch-driver_passwd-pwent_c 11 Mar 2022 20:18:10 -0000 1.5
+++ patches/patch-driver_passwd-pwent_c 1 Apr 2022 11:42:16 -0000
@@ -1,7 +1,7 @@
Index: driver/passwd-pwent.c
--- driver/passwd-pwent.c.orig
+++ driver/passwd-pwent.c
-@@ -133,7 +133,7 @@ user_name (void)
+@@ -121,7 +121,7 @@ user_name (void)
still work. Right?) */
if (!u || !*u)
{
@@ -10,12 +10,12 @@ Index: driver/passwd-pwent.c
u = (p ? p->pw_name : 0);
}
-@@ -177,7 +177,7 @@ get_encrypted_passwd(const char *user)
+@@ -158,7 +158,7 @@ get_encrypted_passwd (const char *user)
if (user && *user && !result)
{ /* Check non-shadow passwords too. */
- struct passwd *p = getpwnam(user);
+ struct passwd *p = getpwnam_shadow(user);
if (p && passwd_known_p (p->pw_passwd))
- result = strdup(p->pw_passwd);
+ result = strdup(p->pw_passwd);
}
Index: patches/patch-hacks_glx_crumbler_c
===================================================================
RCS file: patches/patch-hacks_glx_crumbler_c
diff -N patches/patch-hacks_glx_crumbler_c
--- patches/patch-hacks_glx_crumbler_c 11 Mar 2022 20:18:10 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-Index: hacks/glx/crumbler.c
---- hacks/glx/crumbler.c.orig
-+++ hacks/glx/crumbler.c
-@@ -676,6 +676,9 @@ init_crumbler (ModeInfo *mi)
- # undef R
- }
-
-+# ifdef __OpenBSD__
-+ density *= 0.5;
-+
No comments:
Post a Comment