Hello community, here is the log from the commit of package gnome-screensaver for openSUSE:Factory checked in at 2012-02-16 12:21:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-screensaver (Old) and /work/SRC/openSUSE:Factory/.gnome-screensaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-screensaver", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-screensaver/gnome-screensaver.changes 2011-10-16 12:49:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-screensaver.new/gnome-screensaver.changes 2012-02-16 12:21:52.000000000 +0100 @@ -1,0 +2,24 @@ +Fri Feb 10 08:05:26 UTC 2012 - [email protected] + +- Update to version 3.2.1: + + Optionally use systemd instead of ConsoleKit + + Always lock when asked + + Fade out quickly on explicit locks + + Allow arbitrary long idle times + + Fix background scaling on multi-monitor setups + + Implement OpenBSD authentication + + Updated translations. +- Rebase gnome-screensaver-helper.patch: the configure.ac part had + to be completely rewritten after the addition of support for + OpenBSD authentication. +- Rebase gnome-screensaver-finger-print.patch. +- Enable support for systemd session tracking: + + Note that it will fall back to ConsoleKit at runtime, so it's + fine to build it. + + Add pkgconfig() BuildRequires: libsystemd-login, + libsystemd-daemon. + + Pass --with-systemd to configure. +- Pass --with-console-kit to configure to make sure we also build + ConsoleKit support. + +------------------------------------------------------------------- Old: ---- gnome-screensaver-3.2.0.tar.bz2 New: ---- gnome-screensaver-3.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-screensaver.spec ++++++ --- /var/tmp/diff_new_pack.ca2xzv/_old 2012-02-16 12:21:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ca2xzv/_new 2012-02-16 12:21:54.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package gnome-screensaver # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,17 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - - Name: gnome-screensaver -Version: 3.2.0 -Release: 1 +Version: 3.2.1 +Release: 0 Url: http://www.gnome.org/ -Group: System/GUI/GNOME -License: GPL-2.0+ Summary: GNOME Screen Saver and Locker -Source: http://download.gnome.org/sources/gnome-screensaver/3.2/%{name}-%{version}.tar.bz2 +License: GPL-2.0+ +Group: System/GUI/GNOME +Source: http://download.gnome.org/sources/gnome-screensaver/3.2/%{name}-%{version}.tar.xz # PATCH-FEATURE-OPENSUSE gnome-screensaver-suse-pam.diff Patch: gnome-screensaver-suse-pam.diff # PATCH-FIX-UPSTREAM gnome-screensaver-helper.patch bgo#640647 [email protected] -- Put back helper authentication, removed by upstream @@ -52,6 +49,8 @@ # Needed by gnome-screensaver-finger-print.patch BuildRequires: pkgconfig(libfprint) BuildRequires: pkgconfig(libgnomekbdui) +BuildRequires: pkgconfig(libsystemd-daemon) +BuildRequires: pkgconfig(libsystemd-login) BuildRequires: pkgconfig(x11) >= 1.0 Requires: /sbin/unix2_chkpwd Recommends: %{name}-lang @@ -92,6 +91,8 @@ --with-pam-prefix=/etc\ --enable-authentication-scheme=helper\ --with-passwd-helper="/sbin/unix2_chkpwd"\ + --with-console-kit\ + --with-systemd\ --disable-docbook-docs %__make %{?jobs:-j%jobs} ++++++ gnome-screensaver-finger-print.patch ++++++ --- /var/tmp/diff_new_pack.ca2xzv/_old 2012-02-16 12:21:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ca2xzv/_new 2012-02-16 12:21:54.000000000 +0100 @@ -2,7 +2,7 @@ =================================================================== --- configure.ac.orig +++ configure.ac -@@ -916,6 +916,21 @@ if test "x$have_libnotify" = "xyes"; the +@@ -677,6 +677,21 @@ if test "x$have_libgnomekbdui" = "xyes"; fi dnl --------------------------------------------------------------------------- @@ -40,7 +40,7 @@ #include <glib/gi18n.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> -@@ -70,6 +75,12 @@ static GOptionEntry entries [] = { +@@ -74,6 +79,12 @@ static GOptionEntry entries [] = { { NULL } }; @@ -53,7 +53,7 @@ static char * get_id_string (GtkWidget *widget) { -@@ -352,12 +363,118 @@ quit_timeout_cb (gpointer data) +@@ -360,12 +371,118 @@ quit_timeout_cb (gpointer data) return FALSE; } @@ -172,7 +172,7 @@ again = TRUE; res = do_auth_check (plug); -@@ -552,6 +669,22 @@ lock_initialization (int *argc, +@@ -568,6 +685,22 @@ lock_initialization (int *argc, return TRUE; } @@ -195,7 +195,7 @@ int main (int argc, char **argv) -@@ -571,6 +704,34 @@ main (int argc, +@@ -587,6 +720,34 @@ main (int argc, g_thread_init (NULL); } @@ -230,7 +230,7 @@ g_type_init (); gs_profile_start (NULL); -@@ -583,7 +744,7 @@ main (int argc, +@@ -599,7 +760,7 @@ main (int argc, error = NULL; if (! gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error)) { if (error != NULL) { @@ -239,7 +239,7 @@ g_error_free (error); } exit (1); -@@ -626,6 +787,14 @@ main (int argc, +@@ -644,6 +805,14 @@ main (int argc, if (xvkbd_running) kill (xvkbd_pid, 9); @@ -258,15 +258,15 @@ =================================================================== --- src/Makefile.am.orig +++ src/Makefile.am -@@ -31,6 +31,7 @@ INCLUDES = \ - $(DBUS_CFLAGS) \ +@@ -29,6 +29,7 @@ INCLUDES = \ $(LIBGNOMEKBDUI_CFLAGS) \ $(LIBNOTIFY_CFLAGS) \ + $(SYSTEMD_CFLAGS) \ + $(LIBFPRINT_CFLAGS) \ $(NULL) bin_PROGRAMS = \ -@@ -155,6 +156,7 @@ gnome_screensaver_dialog_LDADD = \ +@@ -154,6 +155,7 @@ gnome_screensaver_dialog_LDADD = \ $(AUTH_LIBS) \ $(LIBGNOMEKBDUI_LIBS) \ $(LIBNOTIFY_LIBS) \ ++++++ gnome-screensaver-helper.patch ++++++ --- /var/tmp/diff_new_pack.ca2xzv/_old 2012-02-16 12:21:54.000000000 +0100 +++ /var/tmp/diff_new_pack.ca2xzv/_new 2012-02-16 12:21:54.000000000 +0100 @@ -1,13 +1,25 @@ reverted: -Index: gnome-screensaver-2.91.91/configure.ac +Index: gnome-screensaver-3.2.1/configure.ac =================================================================== ---- gnome-screensaver-2.91.91.orig/configure.ac -+++ gnome-screensaver-2.91.91/configure.ac -@@ -555,6 +555,75 @@ if test "x$have_pam" = "xyes"; then +--- gnome-screensaver-3.2.1.orig/configure.ac ++++ gnome-screensaver-3.2.1/configure.ac +@@ -448,6 +448,55 @@ if test "$ac_macosx" = yes; then fi - -+# Check for external password helper + dnl --------------------------------------------------------------------------- ++dnl Authentication scheme ++dnl --------------------------------------------------------------------------- ++ ++AC_ARG_ENABLE(authentication-scheme, ++ AS_HELP_STRING([--enable-authentication-scheme=@<:@auto/pam/helper@:>@], ++ [Choose a specific authentication scheme @<:@default=auto@:>@]), ++ , [enable_authentication_scheme=auto]) ++ ++AUTH_SCHEME=$enable_authentication_scheme ++ ++dnl --------------------------------------------------------------------------- ++dnl - Check for external password helper (SUSE) ++dnl --------------------------------------------------------------------------- +# On SuSE, instead of having xscreensaver be a setuid program, they +# fork an external program that takes the password on stdin, and +# returns true if that password is a valid one. Then only that @@ -16,126 +28,148 @@ +# (Note that this external program is not a GUI: the GUI is still +# all in xscreensaver itself; the external program just does auth.) + -+have_passwd_helper=no -+with_passwd_helper_req=unspecified -+ +AC_ARG_WITH(passwd-helper, -+[ --with-passwd-helper Include support for an external password -+ verification helper program.], -+ [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 ++ AS_HELP_STRING([--with-passwd-helper], ++ [Include support for an external password verification helper program.]), ++ [with_passwd_helper="$withval"], ++ [with_passwd_helper=no]) + -+case "$with_passwd_helper" in -+ ""|no) : ;; -+ /*) -+ AC_DEFINE_UNQUOTED(PASSWD_HELPER_PROGRAM, "$with_passwd_helper", [Full pathname of password helper application]) -+ have_passwd_helper=yes;; -+ *) -+ echo "error: --with-passwd-helper needs full pathname of helper (not '$with_passwd_helper')." >&2 -+ exit 1 -+esac -+AM_CONDITIONAL(HAVE_PASSWD_HELPER, test x$have_passwd_helper = xyes) -+AC_SUBST(HAVE_PASSWD_HELPER) -+ -+dnl --------------------------------------------------------------------------- -+dnl Authentication scheme -+dnl --------------------------------------------------------------------------- -+ -+AC_ARG_ENABLE(authentication-scheme, -+ [ --enable-authentication-scheme=[auto/pam/helper] Choose a specific -+ authentication scheme [default=auto]],, -+ enable_authentication_scheme=auto) -+ -+AUTH_SCHEME="auth-pam" -+ -+if test x$enable_authentication_scheme = xpam -a x$have_pam = xno ; then -+ AC_MSG_ERROR(PAM support requested but not available) -+fi -+if test x$enable_authentication_scheme = xhelper -a x$have_passwd_helper = xno ; then -+ AC_MSG_ERROR(Password helper support requested but not available) -+fi ++have_passwd_helper=no + -+if test x$enable_authentication_scheme = xpam ; then -+ AUTH_SCHEME="pam" -+elif test x$enable_authentication_scheme = xhelper ; then -+ AUTH_SCHEME="helper" -+elif test x$enable_authentication_scheme = xauto ; then -+ if test x$have_pam != xno ; then -+ AUTH_SCHEME="pam" -+ elif test x$have_passwd_helper != xno ; then -+ AUTH_SCHEME="helper" -+ fi -+else -+ AC_MSG_ERROR(Unknown authentication scheme) ++if test "x$AUTH_SCHEME" = "xhelper" -o "x$AUTH_SCHEME" = "xauto"; then ++ if test "$enable_locking" = no ; then ++ with_passwd_helper=no ++ fi ++ ++ case "$with_passwd_helper" in ++ ""|no) ++ if test "x$AUTH_SCHEME" = "xhelper"; then ++ AC_MSG_ERROR([Password helper support requested --with-passwd-helper not used]) ++ fi;; ++ /*) ++ AC_DEFINE_UNQUOTED(PASSWD_HELPER_PROGRAM, "$with_passwd_helper", [Full pathname of password helper application]) ++ have_passwd_helper=yes ++ AUTH_SCHEME=helper;; ++ *) ++ AC_MSG_ERROR(["--with-passwd-helper needs full pathname of helper, not '$with_passwd_helper'"]);; ++ esac +fi + -+AC_SUBST(AUTH_SCHEME) -+ - dnl --------------------------------------------------------------------------- - dnl libgnomekbd ++dnl --------------------------------------------------------------------------- + dnl - Check for bsd_auth(3) (OpenBSD) dnl --------------------------------------------------------------------------- -@@ -731,6 +800,9 @@ echo " - Screen locking enabled: ${enable_locking} - Show keyboard indicator: ${with_kbd_layout_indicator} - PAM prefix: ${PAM_PREFIX} -+ Have password helper: ${have_passwd_helper} -+ Authentication scheme: ${AUTH_SCHEME}" -+ +@@ -455,28 +504,30 @@ have_bsdauth=no + with_bsdauth_req=unspecified + NEED_SETUID=no + +-case "$host" in +- *-openbsd*) +- with_bsdauth=yes +- AUTH_SCHEME=bsdauth +- NEED_SETUID=no +- if test "x$enable_locking" = "xyes"; then +- with_bsdauth_req=yes +- NEED_SETUID=yes ++if test "x$AUTH_SCHEME" = "xbsdauth" -o "x$AUTH_SCHEME" = "xauto"; then ++ case "$host" in ++ *-openbsd*) ++ with_bsdauth=yes ++ AUTH_SCHEME=bsdauth ++ NEED_SETUID=no ++ if test "x$enable_locking" = "xyes"; then ++ with_bsdauth_req=yes ++ NEED_SETUID=yes ++ fi ++ esac ++ ++ if test "$with_bsdauth" = yes ; then ++ AC_CACHE_CHECK([for BSD Authentication], ac_cv_bsdauth, ++ [AC_TRY_X_COMPILE([#include <stdlib.h> ++ #include <unistd.h> ++ #include <sys/types.h> ++ #include <bsd_auth.h>], ++ [int ok = auth_userokay("x", 0, "x", "x");], ++ [ac_cv_bsdauth=yes], ++ [ac_cv_bsdauth=no])]) ++ if test "$ac_cv_bsdauth" = yes; then ++ have_bsdauth=yes + fi +-esac +- +-if test "$with_bsdauth" = yes ; then +- AC_CACHE_CHECK([for BSD Authentication], ac_cv_bsdauth, +- [AC_TRY_X_COMPILE([#include <stdlib.h> +- #include <unistd.h> +- #include <sys/types.h> +- #include <bsd_auth.h>], +- [int ok = auth_userokay("x", 0, "x", "x");], +- [ac_cv_bsdauth=yes], +- [ac_cv_bsdauth=no])]) +- if test "$ac_cv_bsdauth" = yes; then +- have_bsdauth=yes + fi + fi + +@@ -506,7 +557,7 @@ fi + AC_SUBST(PAM_PREFIX) + + have_pam=no +-if test "x$enable_locking" = "xyes" -a "x$have_bsdauth" = "xno"; then ++if test "x$enable_locking" = "xyes" -a "x$have_bsdauth" != "xyes" -a "x$have_passwd_helper" != "xyes"; then + AC_CHECK_LIB(pam, pam_start, have_pam=yes) + fi + +@@ -546,7 +597,7 @@ if test "x$have_pam" = "xyes"; then + AC_MSG_RESULT(unknown) + fi + +-elif test "x$have_bsdauth" = "xno"; then ++elif test "x$have_bsdauth" != "xyes" -a "x$have_passwd_helper" != "xyes"; then + AC_MSG_ERROR("PAM libraries not found") + fi + AC_SUBST(HAVE_PAM) +@@ -776,7 +827,8 @@ echo " + + systemd: ${use_systemd} + ConsoleKit: ${use_console_kit} -" ++ ++ Authentication scheme: ${AUTH_SCHEME}" + + if test "x$have_pam" = "xyes" ; then + echo "\ +@@ -785,3 +837,9 @@ echo "\ + " + fi -+echo "" -Index: gnome-screensaver-2.91.91/src/Makefile.am ++if test "x$have_passwd_helper" = "xyes" ; then ++echo "\ ++ Password helper: ${with_passwd_helper} ++ ++" ++fi +Index: gnome-screensaver-3.2.1/src/Makefile.am =================================================================== ---- gnome-screensaver-2.91.91.orig/src/Makefile.am -+++ gnome-screensaver-2.91.91/src/Makefile.am -@@ -63,6 +63,11 @@ gnome_screensaver_command_LDADD = \ - $(GNOME_SCREENSAVER_COMMAND_LIBS) \ +--- gnome-screensaver-3.2.1.orig/src/Makefile.am ++++ gnome-screensaver-3.2.1/src/Makefile.am +@@ -142,6 +142,12 @@ gnome_screensaver_dialog_SOURCES = \ + $(AUTH_SOURCES) \ $(NULL) -+AUTH_SOURCES = \ -+ gs-auth.h \ -+ gs-auth-@[email protected] \ -+ $(NULL) -+ - test_fade_SOURCES = \ - test-fade.c \ - gs-fade.c \ -@@ -78,8 +83,7 @@ test_fade_LDADD = \ - - test_passwd_SOURCES = \ - test-passwd.c \ -- gs-auth.h \ -- gs-auth-pam.c \ -+ $(AUTH_SOURCES) \ - setuid.c \ - setuid.h \ - subprocs.c \ -@@ -136,8 +140,13 @@ gnome_screensaver_dialog_SOURCES = \ - setuid.h \ - subprocs.c \ - subprocs.h \ -- gs-auth.h \ -- gs-auth-pam.c \ -+ $(AUTH_SOURCES) \ -+ $(NULL) -+ +EXTRA_gnome_screensaver_dialog_SOURCES = \ + gs-auth-pam.c \ + gs-auth-helper.c \ -+ gs-auth-pwent.c \ - $(NULL) - ++ gs-auth-bsdauth.c \ ++ $(NULL) ++ gnome_screensaver_dialog_LDADD = \ -Index: gnome-screensaver-2.91.91/src/gs-auth-helper.c + $(GNOME_SCREENSAVER_DIALOG_LIBS)\ + $(SAVER_LIBS) \ +Index: gnome-screensaver-3.2.1/src/gs-auth-helper.c =================================================================== --- /dev/null -+++ gnome-screensaver-2.91.91/src/gs-auth-helper.c ++++ gnome-screensaver-3.2.1/src/gs-auth-helper.c @@ -0,0 +1,198 @@ +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- + * -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
