From nobody Mon May 02 18:42:30 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 16F5D1ABEBC3; Mon, 2 May 2022 18:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KsX5M07c9z3vyt; Mon, 2 May 2022 18:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651516951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J9kG8gpptqt5cFaCXu6VEg3A0pXlhLBoeTjkQQecZmg=; b=gxOgYiMbetKMlWPEZFWrkboreP9VgCg+X7qtN8ocmr85U1/EADQOELhYqIk92DW03S9ppL 07mzZv9CugLCUI13/6jvQQ4DpkXnkHlaFX88F1znP4KvxOlk1gxeAfHOZlDK+jh2Ihy06E C4x4eLUn2RHI5mO5GonkhOSxrfgngNaSO6Y9f3RQBH2UxIGtysCwcNcZM9GgoD0DKCWDpW VmLi71DSOZdGzLvIOF8yqScEDYMJowWXK5K0T69W5LVQimCPErO023VHkNOWtOq7OgyN3b v0Xypo7JTBKrXN/Ofnn6xyvKB4CFvsXiYCDZS+uKjXveWoV70TcdV0t3Pnoyag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D8C5E760F; Mon, 2 May 2022 18:42:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 242IgUTv013577; Mon, 2 May 2022 18:42:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 242IgUZn013576; Mon, 2 May 2022 18:42:30 GMT (envelope-from git) Date: Mon, 2 May 2022 18:42:30 GMT Message-Id: <202205021842.242IgUZn013576@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 979995168c2f - main - x11/xscreensaver: update to 6.02 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 979995168c2f4dec4dd67cd617639c1abf67f16e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651516951; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J9kG8gpptqt5cFaCXu6VEg3A0pXlhLBoeTjkQQecZmg=; b=n4XCVvy8+ea9J1yjXHCtYReVTL8LsAJUHpOFjEFcmgLyseUjve5FUx65N4DINb6jUICna7 XDQg1aTewl05hfusTHKVWL19AI0hmyFHk6VoCQ7NyYfpctkov3ppO2M94QBE9hB33pmVbV grz+5r1j0fUPKquC1mhwO960YQembfE7wkPEJ60cs2/TstoKNavk06/IuYjNGT/LGcZXTp IEbhppxffZAhTZncdtfxeGH/dlosQYHKmEFOIJ/TkKGSubeKSPyGOheCVxc0iXWqWBotOX NDzYqhQjHLf57Jvo39ipCZNbLSuEkZeonTh1WWLGxoEjwaJP8WNKRo9ETmrtGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651516951; a=rsa-sha256; cv=none; b=kWyqcJY23xlrqOcOGKWdVV5mJ4WJCIsgYcMFJbYW/BXFe1BXbpcWEi1mBDmSY7mPah+D4U rxLOC7JouB4I2u3Z/oNA0irghe6nA2thewc90dc+dnxhiPRexETQ0GWeq5yCuMC10Xx9cA 7QHTR37FGNs803IH50DQ426k7+g1h11I1RIzbHW/+16dVRZc7rv5NsU4yzH28JrUEkfqYN 96iremI08Ag5GBYmEVelsVm87l/THKX8sC9n4iB8TfdvmmNIwHXE4DC9A7xGF7AV/+Tt87 k7YRnzkeJHHkl39RWP8/479Zrj3fZMr5lNWz5BhBtClxatW8bJw0820D/yyCWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=979995168c2f4dec4dd67cd617639c1abf67f16e commit 979995168c2f4dec4dd67cd617639c1abf67f16e Author: Felix Palmen AuthorDate: 2021-10-13 11:23:08 +0000 Commit: Charlie Li CommitDate: 2022-05-02 18:41:08 +0000 x11/xscreensaver: update to 6.02 Only install xscreensaver suid root if option PAM is disabled. In this case, add an extra patch, so xscreensaver-gfx drops privileges (otherwise it doesn't show any screensaver). Fix setuid installs in the Makefile and remove extra patch. Respect upstream's USE_CSTD=gnu89. Remove now-unknown configure option and associated dependency. Remove old CONFLICTS. Use security/pam_helper for PAM support. This is the last release to support pam_unix as the next release removes external helper calling code. PR: 254178 Co-authored-by: swills, vishwin Approved by: arrowd (mentor), maintainer-timeout, maintainer-reset --- x11/xscreensaver/Makefile | 103 +++++++++++---------- x11/xscreensaver/distinfo | 6 +- x11/xscreensaver/files/patch-config.h.in | 10 +- x11/xscreensaver/files/patch-configure.ac | 91 ++++++++++++++++++ x11/xscreensaver/files/patch-configure.in | 11 --- x11/xscreensaver/files/patch-driver_Makefile.in | 28 +++--- .../files/patch-driver_XScreenSaver.ad.in | 34 +++---- .../files/patch-driver_passwd-helper.c | 11 +++ x11/xscreensaver/files/patch-hacks_glx_Makefile.in | 11 +++ x11/xscreensaver/pkg-plist | 75 ++++++++++----- 10 files changed, 257 insertions(+), 123 deletions(-) diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 913f07c9ed99..1dfc19010e84 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,8 +1,7 @@ # Created by: dom@myrddin.demon.co.uk PORTNAME= xscreensaver -PORTVERSION= 5.44 -PORTREVISION= 3 +PORTVERSION= 6.02 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ @@ -11,73 +10,82 @@ COMMENT= Save your screen while you entertain your cat LICENSE= MIT -RUN_DEPENDS= p5-libwww>0:www/p5-libwww \ - giftopnm:graphics/netpbm -LIB_DEPENDS= libgle.so:graphics/gle \ - libfontconfig.so:x11-fonts/fontconfig \ - libfreetype.so:print/freetype2 - -CONFLICTS= xscreensaver-gnome xscreensaver-gnome-hacks +RUN_DEPENDS= giftopnm:graphics/netpbm \ + p5-libwww>0:www/p5-libwww +LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgle.so:graphics/gle \ + libharfbuzz.so:print/harfbuzz USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags perl5 \ pkgconfig xorg USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2 USE_PERL5= run -USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xpm xt xxf86vm -USE_CSTD= gnu99 +USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xt xxf86vm CPE_VENDOR= xscreensaver_project GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL="${PERL}" -CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \ - --with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \ - --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ +CONFIGURE_ARGS= --enable-locking \ + --with-app-defaults=${PREFIX}/lib/X11/app-defaults/ \ --with-configdir=${PREFIX}/share/xscreensaver/config/ \ - --with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \ - --with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \ - --with-xf86gamma-ext --with-randr-ext --without-kerberos \ - --without-setuid-hacks --enable-locking + --with-dpms-ext \ + --with-gl \ + --with-gle \ + --with-gtk \ + --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ + --with-jpeg=${LOCALBASE} \ + --with-pixbuf \ + --with-randr-ext \ + --with-xdbe-ext \ + --with-xf86gamma-ext \ + --with-xf86vmode-ext \ + --with-xinerama-ext \ + --with-xshm-ext \ + --without-kerberos MAKE_ARGS+= install_prefix=${STAGEDIR} -MAKE_JOBS_UNSAFE=yes +MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= PAM SETUID_HACKS FIREF NLS NSFW XAOS1 XDALI XEARTH \ - XFT XMOUN XPLANET XSNOW -OPTIONS_DEFAULT=PAM XFT -OPTIONS_SUB= yes +OPTIONS_DEFINE= FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH XFT \ + XMOUN XPLANET XSNOW +OPTIONS_DEFAULT= PAM XFT +OPTIONS_SUB= yes -PAM_CONFIGURE_WITH= pam +PAM_CONFIGURE_WITH= passwd-helper=${PREFIX}/bin/pam_helper +PAM_RUN_DEPENDS= pam_helper:security/pam_helper -SETUID_HACKS_DESC= Install sonar hack suid so it can ping +SETUID_HACKS_DESC= Install sonar hack suid so it can ping +SETUID_HACKS_CONFIGURE_WITH= setuid-hacks -FIREF_DESC= Add extra port x11/fireflies -FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies +FIREF_DESC= Add extra port x11/fireflies +FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies -NLS_USES= gettext-runtime -NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls -NSFW_DESC= Include material that is Not Safe For Work +NSFW_DESC= Include material that is Not Safe For Work -XAOS1_DESC= Add extra port graphics/xaos -XAOS1_RUN_DEPENDS= xaos:graphics/xaos +XAOS1_DESC= Add extra port graphics/xaos +XAOS1_RUN_DEPENDS= xaos:graphics/xaos -XDALI_DESC= Add extra port x11-clocks/xdaliclock -XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock +XDALI_DESC= Add extra port x11-clocks/xdaliclock +XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock -XFT_CONFIGURE_WITH= xft -XFT_USE= XORG=xft +XFT_CONFIGURE_WITH= xft +XFT_USE= XORG=xft -XEARTH_DESC= Add extra port astro/xearth -XEARTH_RUN_DEPENDS= xearth:astro/xearth +XEARTH_DESC= Add extra port astro/xearth +XEARTH_RUN_DEPENDS= xearth:astro/xearth -XMOUN_DESC= Add extra port graphics/xmountains -XMOUN_RUN_DEPENDS= xmountains:graphics/xmountains +XMOUN_DESC= Add extra port graphics/xmountains +XMOUN_RUN_DEPENDS= xmountains:graphics/xmountains -XPLANET_DESC= Add extra port astro/xplanet -XPLANET_RUN_DEPENDS= xplanet:astro/xplanet +XPLANET_DESC= Add extra port astro/xplanet +XPLANET_RUN_DEPENDS= xplanet:astro/xplanet -XSNOW_DESC= Add extra port x11/xsnow -XSNOW_RUN_DEPENDS= xsnow:x11/xsnow +XSNOW_DESC= Add extra port x11/xsnow +XSNOW_RUN_DEPENDS= xsnow:x11/xsnow SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \ xscreensaver-start.desktop xscreensaver-stop.desktop @@ -85,12 +93,10 @@ SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \ post-patch: ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|pkg_config --list-all|pkg_config --help|' \ - ${WRKSRC}/configure.in + ${WRKSRC}/configure.ac ${REINPLACE_CMD} -e "s|/etc/pam.d|${PREFIX}/etc/pam.d|g" \ ${WRKSRC}/driver/passwd-pam.c \ ${WRKSRC}/driver/xscreensaver.man - ${CP} ${FILESDIR}/xscreensaver.pam \ - ${WRKSRC}/driver/xscreensaver.pam.in post-patch-NSFW-off: ${REINPLACE_CMD} -e 's|Dick Pix|Stuff|' ${WRKSRC}/hacks/bsod.c @@ -101,4 +107,7 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam +post-install-PAM-on: + ${INSTALL_DATA} ${FILESDIR}/xscreensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver + .include diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index 9f0a3eaf1c97..daa7cfc60c5b 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1585756235 -SHA256 (xscreensaver-5.44.tar.gz) = 73d8089cfc7d7363b5dac99b5b01dffb3429d0a855e6af16ce9a4b7777017b95 -SIZE (xscreensaver-5.44.tar.gz) = 27001826 +TIMESTAMP = 1635508283 +SHA256 (xscreensaver-6.02.tar.gz) = 5e6d6cb09033ad562cfe6d46bf9312e4451f7946bed8a4671aa9344df9193184 +SIZE (xscreensaver-6.02.tar.gz) = 22672643 diff --git a/x11/xscreensaver/files/patch-config.h.in b/x11/xscreensaver/files/patch-config.h.in index 33809541adb1..d0198a01b3b9 100644 --- a/x11/xscreensaver/files/patch-config.h.in +++ b/x11/xscreensaver/files/patch-config.h.in @@ -1,12 +1,12 @@ ---- config.h.in.orig 2016-04-03 20:07:59 UTC +--- config.h.in.orig 2021-05-08 15:22:06 UTC +++ config.h.in -@@ -307,6 +307,9 @@ +@@ -315,6 +315,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UTIL_H +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBUTIL_H + - /* Define this if you have the XF86MiscSetGrabKeysState function (which allows - the Ctrl-Alt-KP_star and Ctrl-Alt-KP_slash key sequences to be temporarily - disabled. Sadly, it doesn't affect Ctrl-Alt-BS or Ctrl-Alt-F1.) */ + /* Define this if you have XF86VidModeGetViewPort, for virtual desktops. */ + #undef HAVE_XF86VMODE + diff --git a/x11/xscreensaver/files/patch-configure.ac b/x11/xscreensaver/files/patch-configure.ac new file mode 100644 index 000000000000..ab62b27def40 --- /dev/null +++ b/x11/xscreensaver/files/patch-configure.ac @@ -0,0 +1,91 @@ +--- configure.ac.orig 2021-10-04 22:18:28 UTC ++++ configure.ac +@@ -274,8 +274,8 @@ AH_TEMPLATE([HAVE_ADJUNCT_PASSWD], + AH_TEMPLATE([HAVE_HPUX_PASSWD], + [Define this for HPUX so-called "Secure Passwords".]) + +-#AH_TEMPLATE([PASSWD_HELPER_PROGRAM], +-# [Define this to use a third-party password helper program.]) ++AH_TEMPLATE([PASSWD_HELPER_PROGRAM], ++ [Define this to use a third-party password helper program.]) + + AH_TEMPLATE([HAVE_SYSLOG], + [Define this if you have openlog/syslog/closelog.]) +@@ -2725,31 +2725,31 @@ fi + # + ############################################################################### + +-#have_passwd_helper=no +-#with_passwd_helper_req=unspecified +-# +-#AC_ARG_WITH(passwd-helper, +-#[ --with-passwd-helper Include support for external password verification.], +-# [with_passwd_helper="$withval"; with_passwd_helper_req="$withval"],[with_passwd_helper=no]) +-## no HANDLE_X_PATH_ARG for this one +-# +-#if test "$enable_locking" = no ; then +-# with_passwd_helper_req=no +-# with_passwd_helper=no +-#fi +-# +-#case "$with_passwd_helper" in +-# ""|no) : ;; +-# /*) +-# AC_DEFINE_UNQUOTED(PASSWD_HELPER_PROGRAM, "$with_passwd_helper") +-# have_passwd_helper=yes;; +-# *) +-# echo "error: --with-passwd-helper needs full pathname of helper (not '$with_passwd_helper')." >&2 +-# exit 1 +-#esac ++have_passwd_helper=no ++with_passwd_helper_req=unspecified + ++AC_ARG_WITH(passwd-helper, ++[ --with-passwd-helper Include support for external password verification.], ++ [with_passwd_helper="$withval"; with_passwd_helper_req="$withval"],[with_passwd_helper=no]) ++# no HANDLE_X_PATH_ARG for this one + ++if test "$enable_locking" = no ; then ++ with_passwd_helper_req=no ++ with_passwd_helper=no ++fi + ++case "$with_passwd_helper" in ++ ""|no) : ;; ++ /*) ++ AC_DEFINE_UNQUOTED(PASSWD_HELPER_PROGRAM, "$with_passwd_helper") ++ have_passwd_helper=yes;; ++ *) ++ echo "error: --with-passwd-helper needs full pathname of helper (not '$with_passwd_helper')." >&2 ++ exit 1 ++esac ++ ++ ++ + # Most of the above shadow mechanisms will have set setuid_auth to yes, + # if they were found. But, on some systems, we need setuid even when + # using plain old vanilla passwords. +@@ -4011,7 +4011,7 @@ fi + ############################################################################### + + PTY_LIBS= +-AC_CHECK_HEADERS(pty.h util.h sys/termios.h) ++AC_CHECK_HEADERS(pty.h util.h libutil.h sys/termios.h) + AC_CHECK_X_LIB(util, forkpty, + [PTY_LIBS="-lutil" + ac_have_forkpty=yes +@@ -4174,10 +4174,10 @@ if test "$enable_pam_check_account_type" = yes; then + else + COMMENT_PAM_CHECK_ACCOUNT="#" + fi +-#if test "$have_passwd_helper" = yes; then +-# PASSWD_SRCS="$PASSWD_SRCS \$(PWHELPER_SRCS)" +-# PASSWD_OBJS="$PASSWD_OBJS \$(PWHELPER_OBJS)" +-#fi ++if test "$have_passwd_helper" = yes; then ++ PASSWD_SRCS="$PASSWD_SRCS \$(PWHELPER_SRCS)" ++ PASSWD_OBJS="$PASSWD_OBJS \$(PWHELPER_OBJS)" ++fi + PASSWD_SRCS="$PASSWD_SRCS \$(PWENT_SRCS)" + PASSWD_OBJS="$PASSWD_OBJS \$(PWENT_OBJS)" + diff --git a/x11/xscreensaver/files/patch-configure.in b/x11/xscreensaver/files/patch-configure.in deleted file mode 100644 index 61093d526436..000000000000 --- a/x11/xscreensaver/files/patch-configure.in +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.in.orig 2016-05-19 17:59:17 UTC -+++ configure.in -@@ -3538,7 +3538,7 @@ fi - ############################################################################### - - PTY_LIBS= --AC_CHECK_HEADERS(pty.h util.h sys/termios.h) -+AC_CHECK_HEADERS(pty.h util.h libutil.h sys/termios.h) - AC_CHECK_X_LIB(util, forkpty, - [PTY_LIBS="-lutil" - ac_have_forkpty=yes diff --git a/x11/xscreensaver/files/patch-driver_Makefile.in b/x11/xscreensaver/files/patch-driver_Makefile.in index dfa6c6bfe195..828a4f48818a 100644 --- a/x11/xscreensaver/files/patch-driver_Makefile.in +++ b/x11/xscreensaver/files/patch-driver_Makefile.in @@ -1,22 +1,20 @@ ---- driver/Makefile.in.orig 2016-05-24 18:02:30 UTC +--- driver/Makefile.in.orig 2021-10-12 01:04:31 UTC +++ driver/Makefile.in -@@ -51,7 +51,7 @@ DEPEND_DEFINES = @DEPEND_DEFINES@ +@@ -46,7 +46,7 @@ DEPEND_FLAGS = @DEPEND_FLAGS@ + DEPEND_DEFINES = @DEPEND_DEFINES@ - SHELL = /bin/sh INSTALL = @INSTALL@ -SUID_FLAGS = -o root -m 4755 -+SUID_FLAGS = -m 755 ++SUID_FLAGS = -m 4555 INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_SETUID = @INSTALL_SETUID@ -@@ -81,8 +81,8 @@ XPM_LIBS = @XPM_LIBS@ - - + INSTALL_SETUID = $(INSTALL_PROGRAM) $(SUID_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ +@@ -76,7 +76,7 @@ INTL_LIBS = @INTLLIBS@ AD_DIR = @APPDEFAULTS@ --PAM_DIR = /etc/pam.d --PAM_CONF = /etc/pam.conf -+PAM_DIR = ${prefix}/etc/pam.d -+PAM_CONF = ${prefix}/etc/pam.conf - UTILS_SRC = $(srcdir)/../utils - UTILS_BIN = ../utils + # $(sysconfdir) is either /usr/local/etc or /usr/etc but this must be /etc. +-PAM_ROOT = /etc ++PAM_ROOT = ${prefix}/etc + PAM_DIR = $(PAM_ROOT)/pam.d + PAM_CONF = $(PAM_ROOT)/pam.conf + diff --git a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in index 3266ab3e29ad..9a5f1ed4b211 100644 --- a/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in +++ b/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in @@ -1,6 +1,6 @@ ---- driver/XScreenSaver.ad.in.orig 2019-07-10 03:31:26 UTC +--- driver/XScreenSaver.ad.in.orig 2021-06-09 15:47:14 UTC +++ driver/XScreenSaver.ad.in -@@ -56,7 +56,7 @@ +@@ -55,7 +55,7 @@ *splashDuration: 0:00:05 *visualID: default *installColormap: True @@ -9,16 +9,16 @@ *authWarningSlack: 20 *textMode: file -@@ -124,7 +124,7 @@ +@@ -103,7 +103,7 @@ - ! The format used for printing the date and time in the password dialog box - ! (see the strftime(3) manual page for details.) --*dateFormat: %d-%b-%y (%a); %I:%M %p + + ! The strftime(3) format string for printing the time on the password dialog. +-*dateFormat: %I:%M %p, %a %b %e +*dateFormat: %Y-%m-%d %H:%M:%S - ! For day month date: - ! *dateFormat: %a %b %d, %I:%M %p - ! To show the time only: -@@ -343,6 +343,18 @@ XScreenSaver.bourneShell: /bin/sh + ! DD MMM: + ! *dateFormat: %I:%M %p, %e %b (%a) + ! 12 hour time only: +@@ -324,6 +324,18 @@ XScreenSaver.bourneShell: /bin/sh !============================================================================= *programs: \ @@ -37,11 +37,11 @@ maze -root \n\ @GL_KLUDGE@ GL: superquadrics -root \n\ attraction -root \n\ -@@ -610,7 +622,6 @@ XScreenSaver.bourneShell: /bin/sh - *hacks.dangerball.name: DangerBall - *hacks.decayscreen.name: DecayScreen - *hacks.deepstars.name: DeepStars +@@ -602,7 +614,6 @@ XScreenSaver.bourneShell: /bin/sh + *hacks.dangerball.name: Danger Ball + *hacks.decayscreen.name: Decay Screen + *hacks.deepstars.name: Deep Stars -*hacks.dnalogo.name: DNA Logo - *hacks.dymaxionmap.name: DymaxionMap - *hacks.energystream.name: EnergyStream - *hacks.euler2d.name: Euler2D + *hacks.dymaxionmap.name: Dymaxion Map + *hacks.energystream.name: Energy Stream + *hacks.etruscanvenus.name: Etruscan Venus diff --git a/x11/xscreensaver/files/patch-driver_passwd-helper.c b/x11/xscreensaver/files/patch-driver_passwd-helper.c new file mode 100644 index 000000000000..69524d4195ac --- /dev/null +++ b/x11/xscreensaver/files/patch-driver_passwd-helper.c @@ -0,0 +1,11 @@ +--- driver/passwd-helper.c.orig 2021-10-04 22:18:28 UTC ++++ driver/passwd-helper.c +@@ -20,8 +20,6 @@ + + *****************************************************************************/ + +-#error "email jwz@jwz.org about passwd-helper.c" +- + + /* The idea here is to be able to run xscreensaver without any setuid bits. + * Password verification happens through an external program that you feed diff --git a/x11/xscreensaver/files/patch-hacks_glx_Makefile.in b/x11/xscreensaver/files/patch-hacks_glx_Makefile.in new file mode 100644 index 000000000000..20cd80fae6cb --- /dev/null +++ b/x11/xscreensaver/files/patch-hacks_glx_Makefile.in @@ -0,0 +1,11 @@ +--- hacks/glx/Makefile.in.orig 2021-10-12 01:04:30 UTC ++++ hacks/glx/Makefile.in +@@ -40,7 +40,7 @@ DEPEND_DEFINES = @DEPEND_DEFINES@ + + SHELL = /bin/sh + INSTALL = @INSTALL@ +-SUID_FLAGS = -o root -m 4755 ++SUID_FLAGS = -m 4555 + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SETUID = $(INSTALL_PROGRAM) $(SUID_FLAGS) + INSTALL_DATA = @INSTALL_DATA@ diff --git a/x11/xscreensaver/pkg-plist b/x11/xscreensaver/pkg-plist index 73f6964b9286..f0239b7d2518 100644 --- a/x11/xscreensaver/pkg-plist +++ b/x11/xscreensaver/pkg-plist @@ -1,10 +1,6 @@ -@(,,4755) bin/xscreensaver +bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-demo -bin/xscreensaver-getimage -bin/xscreensaver-getimage-file -bin/xscreensaver-getimage-video -bin/xscreensaver-gl-helper bin/xscreensaver-hacks/abstractile bin/xscreensaver-hacks/anemone bin/xscreensaver-hacks/anemotaxis @@ -17,6 +13,8 @@ bin/xscreensaver-hacks/atlantis bin/xscreensaver-hacks/attraction bin/xscreensaver-hacks/atunnel bin/xscreensaver-hacks/barcode +bin/xscreensaver-hacks/beats +bin/xscreensaver-hacks/binaryhorizon bin/xscreensaver-hacks/binaryring bin/xscreensaver-hacks/blaster bin/xscreensaver-hacks/blinkbox @@ -41,6 +39,7 @@ bin/xscreensaver-hacks/cloudlife bin/xscreensaver-hacks/companioncube bin/xscreensaver-hacks/compass bin/xscreensaver-hacks/coral +bin/xscreensaver-hacks/covid19 bin/xscreensaver-hacks/crackberg bin/xscreensaver-hacks/crumbler bin/xscreensaver-hacks/crystal @@ -90,8 +89,8 @@ bin/xscreensaver-hacks/galaxy bin/xscreensaver-hacks/gears bin/xscreensaver-hacks/geodesic bin/xscreensaver-hacks/geodesicgears -bin/xscreensaver-hacks/gibson bin/xscreensaver-hacks/gflux +bin/xscreensaver-hacks/gibson bin/xscreensaver-hacks/glblur bin/xscreensaver-hacks/glcells bin/xscreensaver-hacks/gleidescope @@ -111,6 +110,7 @@ bin/xscreensaver-hacks/greynetic bin/xscreensaver-hacks/halftone bin/xscreensaver-hacks/halo bin/xscreensaver-hacks/handsy +bin/xscreensaver-hacks/headroom bin/xscreensaver-hacks/helix bin/xscreensaver-hacks/hexadrop bin/xscreensaver-hacks/hexstrut @@ -135,10 +135,10 @@ bin/xscreensaver-hacks/kumppa bin/xscreensaver-hacks/lament bin/xscreensaver-hacks/lavalite bin/xscreensaver-hacks/lcdscrub -bin/xscreensaver-hacks/ljlatest bin/xscreensaver-hacks/lockward bin/xscreensaver-hacks/loop bin/xscreensaver-hacks/m6502 +bin/xscreensaver-hacks/marbling bin/xscreensaver-hacks/maze bin/xscreensaver-hacks/maze3d bin/xscreensaver-hacks/memscroller @@ -197,10 +197,16 @@ bin/xscreensaver-hacks/sierpinski3d bin/xscreensaver-hacks/skytentacles bin/xscreensaver-hacks/slidescreen bin/xscreensaver-hacks/slip -%%SETUID_HACKS%%@mode 4755 +bin/xscreensaver-hacks/xscreensaver-auth +bin/xscreensaver-hacks/xscreensaver-getimage +bin/xscreensaver-hacks/xscreensaver-getimage-file +bin/xscreensaver-hacks/xscreensaver-getimage-video +bin/xscreensaver-hacks/xscreensaver-gfx +bin/xscreensaver-hacks/xscreensaver-gl-visual +bin/xscreensaver-hacks/xscreensaver-text bin/xscreensaver-hacks/sonar -%%SETUID_HACKS%%@mode bin/xscreensaver-hacks/speedmine +bin/xscreensaver-hacks/sphereeversion bin/xscreensaver-hacks/spheremonics bin/xscreensaver-hacks/splitflap bin/xscreensaver-hacks/splodesic @@ -246,16 +252,11 @@ bin/xscreensaver-hacks/xmatrix bin/xscreensaver-hacks/xrayswarm bin/xscreensaver-hacks/xspirograph bin/xscreensaver-hacks/zoom -bin/xscreensaver-text +bin/xscreensaver-settings %%PAM%%etc/pam.d/xscreensaver lib/X11/app-defaults/XScreenSaver man/man1/xscreensaver-command.1.gz man/man1/xscreensaver-demo.1.gz -man/man1/xscreensaver-getimage-file.1.gz -man/man1/xscreensaver-getimage-video.1.gz -man/man1/xscreensaver-getimage.1.gz -man/man1/xscreensaver-systemd.1.gz -man/man1/xscreensaver-text.1.gz man/man1/xscreensaver.1.gz man/man6/abstractile.6.gz man/man6/anemone.6.gz @@ -265,10 +266,21 @@ man/man6/antmaze.6.gz man/man6/antspotlight.6.gz man/man6/apollonian.6.gz man/man6/apple2.6.gz +man/man1/xscreensaver-settings.1.gz +man/man6/xscreensaver-auth.6.gz +man/man6/xscreensaver-getimage-file.6.gz +man/man6/xscreensaver-getimage-video.6.gz +man/man6/xscreensaver-getimage.6.gz +man/man6/xscreensaver-gfx.6.gz +man/man6/xscreensaver-gl-visual.6.gz +man/man6/xscreensaver-systemd.6.gz +man/man6/xscreensaver-text.6.gz man/man6/atlantis.6.gz man/man6/attraction.6.gz man/man6/atunnel.6.gz man/man6/barcode.6.gz +man/man6/beats.6.gz +man/man6/binaryhorizon.6.gz man/man6/binaryring.6.gz man/man6/blaster.6.gz man/man6/blinkbox.6.gz @@ -293,6 +305,7 @@ man/man6/cloudlife.6.gz man/man6/companioncube.6.gz man/man6/compass.6.gz man/man6/coral.6.gz +man/man6/covid19.6.gz man/man6/crackberg.6.gz man/man6/crumbler.6.gz man/man6/crystal.6.gz @@ -363,6 +376,7 @@ man/man6/greynetic.6.gz man/man6/halftone.6.gz man/man6/halo.6.gz man/man6/handsy.6.gz +man/man6/headroom.6.gz man/man6/helix.6.gz man/man6/hexadrop.6.gz man/man6/hexstrut.6.gz @@ -387,9 +401,9 @@ man/man6/kumppa.6.gz man/man6/lament.6.gz man/man6/lavalite.6.gz man/man6/lcdscrub.6.gz -man/man6/ljlatest.6.gz man/man6/lockward.6.gz man/man6/loop.6.gz +man/man6/marbling.6.gz man/man6/maze.6.gz man/man6/maze3d.6.gz man/man6/memscroller.6.gz @@ -449,6 +463,7 @@ man/man6/slidescreen.6.gz man/man6/slip.6.gz man/man6/sonar.6.gz man/man6/speedmine.6.gz +man/man6/sphereeversion.6.gz man/man6/spheremonics.6.gz man/man6/splitflap.6.gz man/man6/splodesic.6.gz @@ -491,7 +506,6 @@ man/man6/xjack.6.gz man/man6/xlyap.6.gz man/man6/xmatrix.6.gz man/man6/xrayswarm.6.gz -man/man6/xscreensaver-gl-helper.6.gz man/man6/xspirograph.6.gz man/man6/zoom.6.gz share/applications/xscreensaver-blank.desktop @@ -499,6 +513,11 @@ share/applications/xscreensaver-lock.desktop share/applications/xscreensaver-properties.desktop share/applications/xscreensaver-start.desktop share/applications/xscreensaver-stop.desktop +share/fonts/xscreensaver/OCRAStd.otf +share/fonts/xscreensaver/SpecialElite.ttf +share/fonts/xscreensaver/clacon.ttf +share/fonts/xscreensaver/gallant12x22.ttf +share/fonts/xscreensaver/luximr.ttf %%NLS%%share/locale/da/LC_MESSAGES/xscreensaver.mo %%NLS%%share/locale/de/LC_MESSAGES/xscreensaver.mo %%NLS%%share/locale/es/LC_MESSAGES/xscreensaver.mo @@ -523,6 +542,7 @@ share/applications/xscreensaver-stop.desktop %%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/README +%%DATADIR%%/ui/xscreensaver.ui %%DATADIR%%/config/abstractile.xml %%DATADIR%%/config/anemone.xml %%DATADIR%%/config/anemotaxis.xml @@ -535,6 +555,8 @@ share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/attraction.xml %%DATADIR%%/config/atunnel.xml %%DATADIR%%/config/barcode.xml +%%DATADIR%%/config/beats.xml +%%DATADIR%%/config/binaryhorizon.xml %%DATADIR%%/config/binaryring.xml %%DATADIR%%/config/blaster.xml %%DATADIR%%/config/blinkbox.xml @@ -559,6 +581,7 @@ share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/companioncube.xml %%DATADIR%%/config/compass.xml %%DATADIR%%/config/coral.xml +%%DATADIR%%/config/covid19.xml %%DATADIR%%/config/crackberg.xml %%DATADIR%%/config/crumbler.xml %%DATADIR%%/config/crystal.xml @@ -608,8 +631,8 @@ share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/gears.xml %%DATADIR%%/config/geodesic.xml %%DATADIR%%/config/geodesicgears.xml -%%DATADIR%%/config/gibson.xml %%DATADIR%%/config/gflux.xml +%%DATADIR%%/config/gibson.xml %%DATADIR%%/config/glblur.xml %%DATADIR%%/config/glcells.xml %%DATADIR%%/config/gleidescope.xml @@ -629,6 +652,7 @@ share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/halftone.xml %%DATADIR%%/config/halo.xml %%DATADIR%%/config/handsy.xml +%%DATADIR%%/config/headroom.xml %%DATADIR%%/config/helix.xml %%DATADIR%%/config/hexadrop.xml %%DATADIR%%/config/hexstrut.xml @@ -656,6 +680,7 @@ share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/lockward.xml %%DATADIR%%/config/loop.xml %%DATADIR%%/config/m6502.xml +%%DATADIR%%/config/marbling.xml %%DATADIR%%/config/maze.xml %%DATADIR%%/config/maze3d.xml %%DATADIR%%/config/memscroller.xml @@ -716,6 +741,7 @@ share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/slip.xml %%DATADIR%%/config/sonar.xml %%DATADIR%%/config/speedmine.xml +%%DATADIR%%/config/sphereeversion.xml %%DATADIR%%/config/spheremonics.xml %%DATADIR%%/config/splitflap.xml %%DATADIR%%/config/splodesic.xml @@ -766,10 +792,9 @@ share/pixmaps/xscreensaver.xpm %%DATADIR%%/config/xsnow.xml %%DATADIR%%/config/xspirograph.xml %%DATADIR%%/config/zoom.xml -%%DATADIR%%/glade/screensaver-cmndln.png -%%DATADIR%%/glade/screensaver-colorselector.png -%%DATADIR%%/glade/screensaver-diagnostic.png -%%DATADIR%%/glade/screensaver-locking.png -%%DATADIR%%/glade/screensaver-power.png -%%DATADIR%%/glade/screensaver-snap.png -%%DATADIR%%/glade/xscreensaver-demo.glade2 +%%DATADIR%%/ui/screensaver-cmndln.png +%%DATADIR%%/ui/screensaver-colorselector.png +%%DATADIR%%/ui/screensaver-diagnostic.png +%%DATADIR%%/ui/screensaver-locking.png +%%DATADIR%%/ui/screensaver-power.png +%%DATADIR%%/ui/screensaver-snap.png