netbird/FreeBSD-ports
0
0
Fork 0
mirror of https://github.com/netbirdio/FreeBSD-ports.git synced 2026-05-22 18:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

x11/xscreensaver: Update to 6.04

Browse Source 
Any code for calling an external helper for PAM was removed in 6.03,
therefore replace pam_helper by unix-selfauth-helper that's called by
pam_exec.so

Also fix line length in USES.

Approved by:		x11 (manu), tcberner (mentor)
Differential Revision:	https://reviews.freebsd.org/D35348
This commit is contained in:
Felix Palmen
2022-09-15 18:44:51 +00:00
committed by Brad Davis
parent 12a0dabb97
commit bd1c7b41e8
9 changed files with 42 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/xscreensaver/Makefile
+10 -9
View File
@@ -1,6 +1,5 @@
PORTNAME= xscreensaver
PORTVERSION= 6.02
PORTREVISION= 2
PORTVERSION= 6.04
CATEGORIES= x11
MASTER_SITES= http://www.jwz.org/xscreensaver/
@@ -10,14 +9,15 @@ COMMENT= Save your screen while you entertain your cat
LICENSE= MIT
RUN_DEPENDS= giftopnm:graphics/netpbm \
p5-libwww>0:www/p5-libwww
p5-libwww>0:www/p5-libwww \
p5-LWP-Protocol-https>0:www/p5-LWP-Protocol-https
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
USES= autoreconf cpe gettext gl gmake gnome jpeg localbase:ldflags \
perl5 pkgconfig xorg
USE_GL= gl glu
USE_GNOME= cairo gdkpixbuf2 gdkpixbuf2xlib gtk20 intltool libglade2 libxml2
USE_PERL5= run
@@ -52,8 +52,8 @@ OPTIONS_DEFINE= FIREF NLS NSFW PAM SETUID_HACKS XAOS1 XDALI XEARTH \
OPTIONS_DEFAULT= PAM
OPTIONS_SUB= yes
PAM_CONFIGURE_WITH= passwd-helper=${PREFIX}/bin/pam_helper
PAM_RUN_DEPENDS= pam_helper:security/pam_helper
PAM_CONFIGURE_WITH= pam
PAM_RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper
SETUID_HACKS_DESC= Install sonar hack suid so it can ping
SETUID_HACKS_CONFIGURE_WITH= setuid-hacks
@@ -85,7 +85,8 @@ 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
xscreensaver-start.desktop xscreensaver-stop.desktop \
xscreensaver.pam
post-patch:
${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
@@ -105,6 +106,6 @@ post-install:
${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam
post-install-PAM-on:
${INSTALL_DATA} ${FILESDIR}/xscreensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver
${INSTALL_DATA} ${WRKDIR}/xscreensaver.pam ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver
.include <bsd.port.mk>
x11/xscreensaver/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1635508283
SHA256 (xscreensaver-6.02.tar.gz) = 5e6d6cb09033ad562cfe6d46bf9312e4451f7946bed8a4671aa9344df9193184
SIZE (xscreensaver-6.02.tar.gz) = 22672643
TIMESTAMP = 1655112914
SHA256 (xscreensaver-6.04.tar.gz) = 787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152
SIZE (xscreensaver-6.04.tar.gz) = 26112437
x11/xscreensaver/files/patch-config.h.in
+2 -2
View File
@@ -1,6 +1,6 @@
--- config.h.in.orig 2021-05-08 15:22:06 UTC
--- config.h.in.orig 2022-02-20 19:12:54 UTC
+++ config.h.in
@@ -315,6 +315,9 @@
@@ -311,6 +311,9 @@
/* Define to 1 if you have the <util.h> header file. */
#undef HAVE_UTIL_H
x11/xscreensaver/files/patch-configure.ac
+2 -82
View File
@@ -1,71 +1,6 @@
--- configure.ac.orig 2021-10-04 22:18:28 UTC
--- configure.ac.orig 2022-02-20 21:05:40 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
@@ -3986,7 +3986,7 @@ fi
###############################################################################
PTY_LIBS=
@@ -74,18 +9,3 @@
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)"
x11/xscreensaver/files/patch-driver_passwd-helper.c
-11
View File
@@ -1,11 +0,0 @@
--- 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
x11/xscreensaver/files/xscreensaver-start.desktop.in
+1 -1
View File
@@ -3,7 +3,7 @@ Version=1.0
Type=Application
Name=XScreenSaver Start
Comment=Start XScreenSaver daemon
Icon=%%PREFIX%%/share/pixmaps/xscreensaver.xpm
Icon=%%PREFIX%%/share/pixmaps/xscreensaver.png
Exec=%%PREFIX%%/bin/xscreensaver
Categories=Settings;DesktopSettings;Security;X-XFCE;XScreenSaver;
Terminal=false
x11/xscreensaver/files/xscreensaver.pam
-2
View File
@@ -1,2 +0,0 @@
auth include system
account include system
x11/xscreensaver/files/xscreensaver.pam.in
+4
View File
@@ -0,0 +1,4 @@
auth sufficient pam_exec.so return_prog_exit_status \
expose_authtok %%LOCALBASE%%/libexec/unix-selfauth-helper
auth include system
account include system
x11/xscreensaver/pkg-plist
+20 -5
View File
@@ -33,6 +33,7 @@ bin/xscreensaver-hacks/cage
bin/xscreensaver-hacks/carousel
bin/xscreensaver-hacks/ccurve
bin/xscreensaver-hacks/celtic
bin/xscreensaver-hacks/chompytower
bin/xscreensaver-hacks/circuit
bin/xscreensaver-hacks/cityflow
bin/xscreensaver-hacks/cloudlife
@@ -138,6 +139,8 @@ bin/xscreensaver-hacks/lcdscrub
bin/xscreensaver-hacks/lockward
bin/xscreensaver-hacks/loop
bin/xscreensaver-hacks/m6502
bin/xscreensaver-hacks/mapscroller
bin/xscreensaver-hacks/mapscroller.pl
bin/xscreensaver-hacks/marbling
bin/xscreensaver-hacks/maze
bin/xscreensaver-hacks/maze3d
@@ -153,6 +156,7 @@ bin/xscreensaver-hacks/molecule
bin/xscreensaver-hacks/morph3d
bin/xscreensaver-hacks/mountain
bin/xscreensaver-hacks/munch
bin/xscreensaver-hacks/nakagin
bin/xscreensaver-hacks/nerverot
bin/xscreensaver-hacks/noof
bin/xscreensaver-hacks/noseguy
@@ -181,7 +185,7 @@ bin/xscreensaver-hacks/quasicrystal
bin/xscreensaver-hacks/queens
bin/xscreensaver-hacks/raverhoop
bin/xscreensaver-hacks/razzledazzle
bin/xscreensaver-hacks/rd-bomb
bin/xscreensaver-hacks/rdbomb
bin/xscreensaver-hacks/ripples
bin/xscreensaver-hacks/rocks
bin/xscreensaver-hacks/romanboy
@@ -197,6 +201,7 @@ bin/xscreensaver-hacks/sierpinski3d
bin/xscreensaver-hacks/skytentacles
bin/xscreensaver-hacks/slidescreen
bin/xscreensaver-hacks/slip
bin/xscreensaver-hacks/squirtorus
bin/xscreensaver-hacks/xscreensaver-auth
bin/xscreensaver-hacks/xscreensaver-getimage
bin/xscreensaver-hacks/xscreensaver-getimage-file
@@ -299,6 +304,7 @@ man/man6/cage.6.gz
man/man6/carousel.6.gz
man/man6/ccurve.6.gz
man/man6/celtic.6.gz
man/man6/chompytower.6.gz
man/man6/circuit.6.gz
man/man6/cityflow.6.gz
man/man6/cloudlife.6.gz
@@ -403,6 +409,7 @@ man/man6/lavalite.6.gz
man/man6/lcdscrub.6.gz
man/man6/lockward.6.gz
man/man6/loop.6.gz
man/man6/mapscroller.6.gz
man/man6/marbling.6.gz
man/man6/maze.6.gz
man/man6/maze3d.6.gz
@@ -418,6 +425,7 @@ man/man6/molecule.6.gz
man/man6/morph3d.6.gz
man/man6/mountain.6.gz
man/man6/munch.6.gz
man/man6/nakagin.6.gz
man/man6/nerverot.6.gz
man/man6/noof.6.gz
man/man6/noseguy.6.gz
@@ -445,7 +453,7 @@ man/man6/quasicrystal.6.gz
man/man6/queens.6.gz
man/man6/raverhoop.6.gz
man/man6/razzledazzle.6.gz
man/man6/rd-bomb.6.gz
man/man6/rdbomb.6.gz
man/man6/ripples.6.gz
man/man6/rocks.6.gz
man/man6/romanboy.6.gz
@@ -470,6 +478,7 @@ man/man6/splodesic.6.gz
man/man6/spotlight.6.gz
man/man6/sproingies.6.gz
man/man6/squiral.6.gz
man/man6/squirtorus.6.gz
man/man6/stairs.6.gz
man/man6/starfish.6.gz
man/man6/starwars.6.gz
@@ -510,9 +519,10 @@ man/man6/xspirograph.6.gz
man/man6/zoom.6.gz
share/applications/xscreensaver-blank.desktop
share/applications/xscreensaver-lock.desktop
share/applications/xscreensaver-properties.desktop
share/applications/xscreensaver-settings.desktop
share/applications/xscreensaver-start.desktop
share/applications/xscreensaver-stop.desktop
share/applications/xscreensaver.desktop
share/fonts/xscreensaver/OCRAStd.otf
share/fonts/xscreensaver/SpecialElite.ttf
share/fonts/xscreensaver/clacon.ttf
@@ -540,7 +550,7 @@ share/fonts/xscreensaver/luximr.ttf
%%NLS%%share/locale/wa/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/xscreensaver.mo
%%NLS%%share/locale/zh_TW/LC_MESSAGES/xscreensaver.mo
share/pixmaps/xscreensaver.xpm
share/pixmaps/xscreensaver.png
%%DATADIR%%/config/README
%%DATADIR%%/ui/xscreensaver.ui
%%DATADIR%%/config/abstractile.xml
@@ -575,6 +585,7 @@ share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/carousel.xml
%%DATADIR%%/config/ccurve.xml
%%DATADIR%%/config/celtic.xml
%%DATADIR%%/config/chompytower.xml
%%DATADIR%%/config/circuit.xml
%%DATADIR%%/config/cityflow.xml
%%DATADIR%%/config/cloudlife.xml
@@ -680,6 +691,7 @@ share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/lockward.xml
%%DATADIR%%/config/loop.xml
%%DATADIR%%/config/m6502.xml
%%DATADIR%%/config/mapscroller.xml
%%DATADIR%%/config/marbling.xml
%%DATADIR%%/config/maze.xml
%%DATADIR%%/config/maze3d.xml
@@ -695,6 +707,7 @@ share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/morph3d.xml
%%DATADIR%%/config/mountain.xml
%%DATADIR%%/config/munch.xml
%%DATADIR%%/config/nakagin.xml
%%DATADIR%%/config/nerverot.xml
%%DATADIR%%/config/noof.xml
%%DATADIR%%/config/noseguy.xml
@@ -723,7 +736,7 @@ share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/queens.xml
%%DATADIR%%/config/raverhoop.xml
%%DATADIR%%/config/razzledazzle.xml
%%DATADIR%%/config/rd-bomb.xml
%%DATADIR%%/config/rdbomb.xml
%%DATADIR%%/config/ripples.xml
%%DATADIR%%/config/rocks.xml
%%DATADIR%%/config/romanboy.xml
@@ -748,6 +761,7 @@ share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/spotlight.xml
%%DATADIR%%/config/sproingies.xml
%%DATADIR%%/config/squiral.xml
%%DATADIR%%/config/squirtorus.xml
%%DATADIR%%/config/stairs.xml
%%DATADIR%%/config/starfish.xml
%%DATADIR%%/config/starwars.xml
@@ -792,6 +806,7 @@ share/pixmaps/xscreensaver.xpm
%%DATADIR%%/config/xsnow.xml
%%DATADIR%%/config/xspirograph.xml
%%DATADIR%%/config/zoom.xml
%%DATADIR%%/xscreensaver.service
%%DATADIR%%/ui/screensaver-cmndln.png
%%DATADIR%%/ui/screensaver-colorselector.png
%%DATADIR%%/ui/screensaver-diagnostic.png