Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at Sat Oct 8 22:03:36 CEST 2011.
-------- --- openSUSE:Factory/lightdm/lightdm.changes 2011-10-06 16:43:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/lightdm/lightdm.changes 2011-10-08 16:03:29.000000000 +0200 @@ -1,0 +2,9 @@ +Sat Oct 8 11:24:00 UTC 2011 - [email protected] + +- update to version 1.0.3 + - fix reference counting issue in ConsoleKit code + - really add the lightdm-guest-session-wrapper +- added lightdm-use-pkglibexecdir.patch in order to use + pkglibexecdir instead of libexecdir for helper binaries/scripts + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- lightdm-1.0.2.tar.gz New: ---- lightdm-1.0.3.tar.gz lightdm-use-pkglibexecdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.xBBEum/_old 2011-10-08 22:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.xBBEum/_new 2011-10-08 22:03:27.000000000 +0200 @@ -23,7 +23,7 @@ %define qt_lib lib%{qt_libname}-0 Name: lightdm -Version: 1.0.2 +Version: 1.0.3 Release: 1 Summary: Lightweight, Cross-desktop Display Manager Group: System/X11/Displaymanagers @@ -34,6 +34,8 @@ Source2: %{name}-autologin.pamd Source3: X11-displaymanagers-%{name} Source100: %{name}-rpmlintrc +# PATCH-FEATURE-OPENSUSE lightdm-use-pkglibexecdir.patch [email protected] -- Use pkglibexecdir instead of libexecdir for helper binaries/scripts +Patch0: lightdm-use-pkglibexecdir.patch # PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch [email protected] -- Adds support for reading configuration options from /etc/sysconfig/displaymanager and /etc/sysconfig/windowmanager Patch1: lightdm-sysconfig-support.patch # PATCH-FEATURE-OPENSUSE lightdm-xauthlocalhostname-support.patch [email protected] -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes @@ -163,6 +165,7 @@ %prep %setup -q +%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 @@ -191,9 +194,6 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin install -D -m 644 %{SOURCE3} %{buildroot}%{_libexecdir}/X11/displaymanagers/lightdm -mv %{buildroot}%{_libexecdir}/lightdm-set-defaults \ - %{buildroot}%{_libexecdir}/lightdm/lightdm-set-defaults - install -d %{buildroot}%{_localstatedir}/log/lightdm install -d %{buildroot}%{_localstatedir}/run/lightdm install -d %{buildroot}%{_localstatedir}/lib/lightdm @@ -251,6 +251,7 @@ %dir %{_libexecdir}/lightdm/ %{_libexecdir}/%{name}/lightdm-set-defaults %{_libexecdir}/%{name}/gdmflexiserver +%{_libexecdir}/%{name}/lightdm-guest-session-wrapper %dir %{_sysconfdir}/lightdm/ %config %{_sysconfdir}/lightdm/lightdm.conf %config %{_sysconfdir}/lightdm/users.conf ++++++ lightdm-1.0.2.tar.gz -> lightdm-1.0.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/NEWS new/lightdm-1.0.3/NEWS --- old/lightdm-1.0.2/NEWS 2011-10-06 07:09:15.000000000 +0200 +++ new/lightdm-1.0.3/NEWS 2011-10-08 01:05:51.000000000 +0200 @@ -1,3 +1,8 @@ +Overview of changes in lightdm 1.0.3 + + * Fix reference counting issue in ConsoleKit code + * Really add the lightdm-guest-session-wrapper + Overview of changes in lightdm 1.0.2 * Fix daemon from blocking if Accounts Service does not exist diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/configure new/lightdm-1.0.3/configure --- old/lightdm-1.0.2/configure 2011-10-06 07:21:35.000000000 +0200 +++ new/lightdm-1.0.3/configure 2011-10-08 00:58:50.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for lightdm 1.0.2. +# Generated by GNU Autoconf 2.68 for lightdm 1.0.3. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ # Identity of this package. PACKAGE_NAME='lightdm' PACKAGE_TARNAME='lightdm' -PACKAGE_VERSION='1.0.2' -PACKAGE_STRING='lightdm 1.0.2' +PACKAGE_VERSION='1.0.3' +PACKAGE_STRING='lightdm 1.0.3' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1434,7 +1434,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lightdm 1.0.2 to adapt to many kinds of systems. +\`configure' configures lightdm 1.0.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1504,7 +1504,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lightdm 1.0.2:";; + short | recursive ) echo "Configuration of lightdm 1.0.3:";; esac cat <<\_ACEOF @@ -1677,7 +1677,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lightdm configure 1.0.2 +lightdm configure 1.0.3 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2163,7 +2163,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lightdm $as_me 1.0.2, which was +It was created by lightdm $as_me 1.0.3, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2981,7 +2981,7 @@ # Define the identity of the package. PACKAGE='lightdm' - VERSION='1.0.2' + VERSION='1.0.3' cat >>confdefs.h <<_ACEOF @@ -18986,7 +18986,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lightdm $as_me 1.0.2, which was +This file was extended by lightdm $as_me 1.0.3, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -19052,7 +19052,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lightdm config.status 1.0.2 +lightdm config.status 1.0.3 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/configure.ac new/lightdm-1.0.3/configure.ac --- old/lightdm-1.0.2/configure.ac 2011-10-06 07:21:01.000000000 +0200 +++ new/lightdm-1.0.3/configure.ac 2011-10-08 00:58:34.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.0.2) +AC_INIT(lightdm, 1.0.3) AC_CONFIG_MACRO_DIR(m4) AC_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/liblightdm-gobject/greeter.c new/lightdm-1.0.3/liblightdm-gobject/greeter.c --- old/lightdm-1.0.2/liblightdm-gobject/greeter.c 2011-10-06 00:56:17.000000000 +0200 +++ new/lightdm-1.0.3/liblightdm-gobject/greeter.c 2011-10-07 01:50:41.000000000 +0200 @@ -122,13 +122,15 @@ write_message (LightDMGreeter *greeter, guint8 *message, gsize message_length) { LightDMGreeterPrivate *priv = GET_PRIVATE (greeter); + GIOStatus status; GError *error = NULL; - if (g_io_channel_write_chars (priv->to_server_channel, (gchar *) message, message_length, NULL, NULL) != G_IO_STATUS_NORMAL) + status = g_io_channel_write_chars (priv->to_server_channel, (gchar *) message, message_length, NULL, &error); + if (error) g_warning ("Error writing to daemon: %s", error->message); - else - g_debug ("Wrote %zi bytes to daemon", message_length); g_clear_error (&error); + if (status == G_IO_STATUS_NORMAL) + g_debug ("Wrote %zi bytes to daemon", message_length); g_io_channel_flush (priv->to_server_channel, NULL); } @@ -373,7 +375,7 @@ n_to_read - priv->n_read, &n_read, &error); - if (status == G_IO_STATUS_ERROR) + if (error) g_warning ("Error reading from server: %s", error->message); g_clear_error (&error); if (status != G_IO_STATUS_NORMAL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/liblightdm-gobject/session.c new/lightdm-1.0.3/liblightdm-gobject/session.c --- old/lightdm-1.0.2/liblightdm-gobject/session.c 2011-09-28 09:11:35.000000000 +0200 +++ new/lightdm-1.0.3/liblightdm-gobject/session.c 2011-10-07 01:48:54.000000000 +0200 @@ -115,7 +115,7 @@ return; directory = g_dir_open (XSESSIONS_DIR, 0, &error); - if (!directory) + if (error) g_warning ("Failed to open sessions directory: %s", error->message); g_clear_error (&error); if (!directory) @@ -139,7 +139,7 @@ key_file = g_key_file_new (); result = g_key_file_load_from_file (key_file, path, G_KEY_FILE_NONE, &error); - if (!result) + if (error) g_warning ("Failed to load session file %s: %s:", path, error->message); g_clear_error (&error); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/liblightdm-gobject/user.c new/lightdm-1.0.3/liblightdm-gobject/user.c --- old/lightdm-1.0.2/liblightdm-gobject/user.c 2011-10-06 02:12:47.000000000 +0200 +++ new/lightdm-1.0.3/liblightdm-gobject/user.c 2011-10-07 01:48:27.000000000 +0200 @@ -203,8 +203,8 @@ g_debug ("Loading user config from %s", USER_CONFIG_FILE); config = g_key_file_new (); - if (!g_key_file_load_from_file (config, USER_CONFIG_FILE, G_KEY_FILE_NONE, &error) && - !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) + g_key_file_load_from_file (config, USER_CONFIG_FILE, G_KEY_FILE_NONE, &error); + if (error && !g_error_matches (error, G_FILE_ERROR, G_FILE_ERROR_NOENT)) g_warning ("Failed to load configuration from %s: %s", USER_CONFIG_FILE, error->message); // FIXME: Don't make warning on no file, just info g_clear_error (&error); @@ -393,7 +393,7 @@ -1, NULL, &error); - if (!result) + if (error) g_warning ("Error updating user %s: %s", g_dbus_proxy_get_object_path (object->proxy), error->message); g_clear_error (&error); if (!result) @@ -472,7 +472,7 @@ "org.freedesktop.Accounts.User", NULL, &error); - if (!proxy) + if (error) g_warning ("Error getting user %s: %s", path, error->message); g_clear_error (&error); if (!proxy) @@ -593,7 +593,7 @@ -1, NULL, &error); - if (!result) + if (error) g_warning ("Error getting UserName from org.freedesktop.DisplayManager.Session: %s", error->message); g_clear_error (&error); if (!result) @@ -686,7 +686,7 @@ "org.freedesktop.Accounts", NULL, &error); - if (!priv->accounts_service_proxy) + if (error) g_warning ("Error contacting org.freedesktop.Accounts: %s", error->message); g_clear_error (&error); @@ -718,7 +718,7 @@ -1, NULL, &error); - if (!result) + if (error) g_warning ("Error getting user list from org.freedesktop.Accounts: %s", error->message); g_clear_error (&error); if (!result) @@ -764,7 +764,7 @@ passwd_file = g_file_new_for_path (PASSWD_FILE); priv->passwd_monitor = g_file_monitor (passwd_file, G_FILE_MONITOR_NONE, NULL, &error); g_object_unref (passwd_file); - if (!priv->passwd_monitor) + if (error) g_warning ("Error monitoring %s: %s", PASSWD_FILE, error->message); else g_signal_connect (priv->passwd_monitor, "changed", G_CALLBACK (passwd_changed_cb), user_list); @@ -779,7 +779,7 @@ "org.freedesktop.DisplayManager", NULL, &error); - if (!priv->display_manager_proxy) + if (error) g_warning ("Error contacting org.freedesktop.DisplayManager: %s", error->message); g_clear_error (&error); @@ -800,7 +800,7 @@ -1, NULL, &error); - if (!result) + if (error) g_warning ("Error getting session list from org.freedesktop.DisplayManager: %s", error->message); g_clear_error (&error); if (!result) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/src/Makefile.am new/lightdm-1.0.3/src/Makefile.am --- old/lightdm-1.0.2/src/Makefile.am 2011-10-06 00:38:28.000000000 +0200 +++ new/lightdm-1.0.3/src/Makefile.am 2011-10-08 01:04:12.000000000 +0200 @@ -79,6 +79,7 @@ lightdm_CFLAGS = \ $(LIGHTDM_CFLAGS) \ $(WARN_CFLAGS) \ + -DLIBEXEC_DIR=\"$(libexecdir)\" \ -DPKGLIBEXEC_DIR=\"$(pkglibexecdir)\" \ -DSBIN_DIR=\"$(sbindir)\" \ -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \ @@ -92,6 +93,14 @@ $(LIGHTDM_LIBS) \ -lpam +libexec_PROGRAMS = lightdm-guest-session-wrapper + +lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c + +lightdm_guest_session_wrapper_CFLAGS = \ + $(LIGHTDM_CFLAGS) \ + $(WARN_CFLAGS) + EXTRA_DIST = ldm-marshal.list \ display-manager.xml diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/src/Makefile.in new/lightdm-1.0.3/src/Makefile.in --- old/lightdm-1.0.2/src/Makefile.in 2011-10-06 07:21:34.000000000 +0200 +++ new/lightdm-1.0.3/src/Makefile.in 2011-10-08 01:04:48.000000000 +0200 @@ -35,6 +35,7 @@ build_triplet = @build@ host_triplet = @host@ sbin_PROGRAMS = lightdm$(EXEEXT) +libexec_PROGRAMS = lightdm-guest-session-wrapper$(EXEEXT) subdir = src DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -45,8 +46,8 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(sbindir)" -PROGRAMS = $(sbin_PROGRAMS) +am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)" +PROGRAMS = $(libexec_PROGRAMS) $(sbin_PROGRAMS) am_lightdm_OBJECTS = lightdm-accounts.$(OBJEXT) \ lightdm-configuration.$(OBJEXT) lightdm-console-kit.$(OBJEXT) \ lightdm-display.$(OBJEXT) lightdm-display-manager.$(OBJEXT) \ @@ -74,6 +75,14 @@ lightdm_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(lightdm_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +am_lightdm_guest_session_wrapper_OBJECTS = lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.$(OBJEXT) +lightdm_guest_session_wrapper_OBJECTS = \ + $(am_lightdm_guest_session_wrapper_OBJECTS) +lightdm_guest_session_wrapper_LDADD = $(LDADD) +lightdm_guest_session_wrapper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(lightdm_guest_session_wrapper_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @@ -100,8 +109,9 @@ AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(lightdm_SOURCES) -DIST_SOURCES = $(lightdm_SOURCES) +SOURCES = $(lightdm_SOURCES) $(lightdm_guest_session_wrapper_SOURCES) +DIST_SOURCES = $(lightdm_SOURCES) \ + $(lightdm_guest_session_wrapper_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -353,6 +363,7 @@ lightdm_CFLAGS = \ $(LIGHTDM_CFLAGS) \ $(WARN_CFLAGS) \ + -DLIBEXEC_DIR=\"$(libexecdir)\" \ -DPKGLIBEXEC_DIR=\"$(pkglibexecdir)\" \ -DSBIN_DIR=\"$(sbindir)\" \ -DCONFIG_DIR=\"$(sysconfdir)/lightdm\" \ @@ -366,6 +377,11 @@ $(LIGHTDM_LIBS) \ -lpam +lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c +lightdm_guest_session_wrapper_CFLAGS = \ + $(LIGHTDM_CFLAGS) \ + $(WARN_CFLAGS) + EXTRA_DIST = ldm-marshal.list \ display-manager.xml @@ -410,6 +426,49 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) + test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)" + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-libexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + +clean-libexecPROGRAMS: + @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list install-sbinPROGRAMS: $(sbin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(sbindir)" || $(MKDIR_P) "$(DESTDIR)$(sbindir)" @@ -456,6 +515,9 @@ lightdm$(EXEEXT): $(lightdm_OBJECTS) $(lightdm_DEPENDENCIES) @rm -f lightdm$(EXEEXT) $(AM_V_CCLD)$(lightdm_LINK) $(lightdm_OBJECTS) $(lightdm_LDADD) $(LIBS) +lightdm-guest-session-wrapper$(EXEEXT): $(lightdm_guest_session_wrapper_OBJECTS) $(lightdm_guest_session_wrapper_DEPENDENCIES) + @rm -f lightdm-guest-session-wrapper$(EXEEXT) + $(AM_V_CCLD)$(lightdm_guest_session_wrapper_LINK) $(lightdm_guest_session_wrapper_OBJECTS) $(lightdm_guest_session_wrapper_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -495,6 +557,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lightdm-xserver-xvnc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lightdm-xserver.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lightdm-xsession.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1032,6 +1095,22 @@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lightdm_CFLAGS) $(CFLAGS) -c -o lightdm-xsession.obj `if test -f 'xsession.c'; then $(CYGPATH_W) 'xsession.c'; else $(CYGPATH_W) '$(srcdir)/xsession.c'; fi` +lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.o: lightdm-guest-session-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lightdm_guest_session_wrapper_CFLAGS) $(CFLAGS) -MT lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.o -MD -MP -MF $(DEPDIR)/lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.Tpo -c -o lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.o `test -f 'lightdm-guest-session-wrapper.c' || echo '$(srcdir)/'`lightdm-guest-session-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.Tpo $(DEPDIR)/lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lightdm-guest-session-wrapper.c' object='lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lightdm_guest_session_wrapper_CFLAGS) $(CFLAGS) -c -o lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.o `test -f 'lightdm-guest-session-wrapper.c' || echo '$(srcdir)/'`lightdm-guest-session-wrapper.c + +lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.obj: lightdm-guest-session-wrapper.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lightdm_guest_session_wrapper_CFLAGS) $(CFLAGS) -MT lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.obj -MD -MP -MF $(DEPDIR)/lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.Tpo -c -o lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.obj `if test -f 'lightdm-guest-session-wrapper.c'; then $(CYGPATH_W) 'lightdm-guest-session-wrapper.c'; else $(CYGPATH_W) '$(srcdir)/lightdm-guest-session-wrapper.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.Tpo $(DEPDIR)/lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.Po +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lightdm-guest-session-wrapper.c' object='lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lightdm_guest_session_wrapper_CFLAGS) $(CFLAGS) -c -o lightdm_guest_session_wrapper-lightdm-guest-session-wrapper.obj `if test -f 'lightdm-guest-session-wrapper.c'; then $(CYGPATH_W) 'lightdm-guest-session-wrapper.c'; else $(CYGPATH_W) '$(srcdir)/lightdm-guest-session-wrapper.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -1125,7 +1204,7 @@ $(MAKE) $(AM_MAKEFLAGS) check-am all-am: Makefile $(PROGRAMS) installdirs: - for dir in "$(DESTDIR)$(sbindir)"; do \ + for dir in "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(sbindir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -1159,8 +1238,8 @@ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) clean: clean-am -clean-am: clean-generic clean-libtool clean-sbinPROGRAMS \ - mostlyclean-am +clean-am: clean-generic clean-libexecPROGRAMS clean-libtool \ + clean-sbinPROGRAMS mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -1186,7 +1265,7 @@ install-dvi-am: -install-exec-am: install-sbinPROGRAMS +install-exec-am: install-libexecPROGRAMS install-sbinPROGRAMS install-html: install-html-am @@ -1226,23 +1305,25 @@ ps-am: -uninstall-am: uninstall-sbinPROGRAMS +uninstall-am: uninstall-libexecPROGRAMS uninstall-sbinPROGRAMS .MAKE: all check install install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-sbinPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ + clean-libexecPROGRAMS clean-libtool clean-sbinPROGRAMS ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libexecPROGRAMS install-man \ install-pdf install-pdf-am install-ps install-ps-am \ install-sbinPROGRAMS install-strip installcheck \ installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-sbinPROGRAMS + tags uninstall uninstall-am uninstall-libexecPROGRAMS \ + uninstall-sbinPROGRAMS ldm-marshal.c: ldm-marshal.list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/src/display.c new/lightdm-1.0.3/src/display.c --- old/lightdm-1.0.2/src/display.c 2011-10-06 05:55:06.000000000 +0200 +++ new/lightdm-1.0.3/src/display.c 2011-10-08 01:20:09.000000000 +0200 @@ -393,7 +393,7 @@ static Session * create_session (Display *display, PAMSession *authentication, const gchar *session_name, gboolean is_greeter) { - gchar *sessions_dir, *filename, *path, *command = NULL; + gchar *sessions_dir, *filename, *path, *command = NULL, *t; GKeyFile *session_desktop_file; Session *session; gboolean result; @@ -426,6 +426,11 @@ g_free (path); if (!command) return NULL; + + t = command; + command = g_find_program_in_path (command); + g_free (t); + if (display->priv->session_wrapper && !is_greeter) { gchar *wrapper; @@ -440,6 +445,15 @@ } } + /* for a guest session, run command through the wrapper covered by MAC */ + if (display->priv->autologin_guest) + { + gchar *t = command; + command = g_strdup_printf (LIBEXEC_DIR "/lightdm-guest-session-wrapper %s", command); + g_debug("Guest session, running session command through wrapper: %s", command); + g_free (t); + } + g_signal_emit (display, signals[CREATE_SESSION], 0, &session); g_return_val_if_fail (session != NULL, NULL); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/src/lightdm-guest-session-wrapper.c new/lightdm-1.0.3/src/lightdm-guest-session-wrapper.c --- old/lightdm-1.0.2/src/lightdm-guest-session-wrapper.c 1970-01-01 01:00:00.000000000 +0100 +++ new/lightdm-1.0.3/src/lightdm-guest-session-wrapper.c 2011-10-08 01:15:43.000000000 +0200 @@ -0,0 +1,37 @@ +/* -*- Mode: C; indent-tabs-mode: nil; tab-width: 4 -*- + * + * Copyright (C) 2011 Canonical Ltd. + * Author: Martin Pitt <[email protected]> + * + * This program is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by the Free Software + * Foundation, either version 3 of the License, or (at your option) any later + * version. See http://www.gnu.org/copyleft/gpl.html the full text of the + * license. + */ + +/* This is a simple wrapper which just re-execve()'s the program given as its + * arguments. This allows MAC systems like AppArmor or SELinux to apply a + * policy on this wrapper which applies to guest sessions only. */ + +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <unistd.h> + +int +main (int argc, char *argv[], char *envp[]) +{ + if (argc < 2) + { + fprintf (stderr, "Usage: %s COMMAND [ARGS]\n", argv[0]); + return EXIT_FAILURE; + } + + execve (argv[1], argv+1, envp); + + fprintf (stderr, "Failed to run guest session '%s': %s\n", argv[1], strerror (errno)); + + return EXIT_FAILURE; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.0.2/src/session.c new/lightdm-1.0.3/src/session.c --- old/lightdm-1.0.2/src/session.c 2011-10-06 05:48:24.000000000 +0200 +++ new/lightdm-1.0.3/src/session.c 2011-10-08 00:56:51.000000000 +0200 @@ -187,7 +187,8 @@ g_return_if_fail (session != NULL); g_return_if_fail (name != NULL); - g_hash_table_insert (session->priv->console_kit_parameters, g_strdup (name), value); + g_hash_table_insert (session->priv->console_kit_parameters, + g_strdup (name), g_variant_ref_sink (value)); } const gchar * ++++++ lightdm-desktop-session-env-pam.patch ++++++ --- /var/tmp/diff_new_pack.xBBEum/_old 2011-10-08 22:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.xBBEum/_new 2011-10-08 22:03:27.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 2f133e9167d2d88b1cc2ebd426998a3bc0a85b4b +# Parent db97db2821c84b9a5d51c4c42f3e69ae6f45ca10 pass a DESKTOP_SESSION environment variable with the name of the selected session into the PAM environment diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c -@@ -451,6 +451,8 @@ create_session (Display *display, PAMSes +@@ -465,6 +465,8 @@ create_session (Display *display, PAMSes session_set_authentication (session, authentication); session_set_command (session, command); g_free (command); @@ -88,7 +88,7 @@ void session_set_command (Session *session, const gchar *command) { -@@ -272,7 +290,7 @@ session_real_start (Session *session) +@@ -273,7 +291,7 @@ session_real_start (Session *session) process_set_command (PROCESS (session), absolute_command); g_free (absolute_command); ++++++ lightdm-lock-screen-before-switch.patch ++++++ --- /var/tmp/diff_new_pack.xBBEum/_old 2011-10-08 22:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.xBBEum/_new 2011-10-08 22:03:27.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent fd675abd75db28b06294f499e78a8635e23d69d9 +# Parent b329fa1badaa454239690c3feb93d53324134915 try to lock the screen before switching users diff --git a/utils/gdmflexiserver b/utils/gdmflexiserver ++++++ lightdm-set-gdmflexiserver-envvar.patch ++++++ --- /var/tmp/diff_new_pack.xBBEum/_old 2011-10-08 22:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.xBBEum/_new 2011-10-08 22:03:27.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 0c5f0515b177abed356af93d2b8f7f8db64d3be3 +# Parent 4efa36a96678139f52531e2309798ccad731be02 set the GDMFLEXISERVER environment variable for the gdmflexiserver wrapper diff --git a/src/session.c b/src/session.c --- a/src/session.c +++ b/src/session.c -@@ -271,6 +271,7 @@ session_start (Session *session) +@@ -272,6 +272,7 @@ session_start (Session *session) session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required? session_set_env (session, "HOME", user_get_home_directory (user)); session_set_env (session, "SHELL", user_get_shell (user)); @@ -13,7 +13,7 @@ return SESSION_GET_CLASS (session)->start (session); } -@@ -450,7 +451,7 @@ session_run (Process *process) +@@ -451,7 +452,7 @@ session_run (Process *process) pam_session_setup (session->priv->authentication); set_env_from_authentication (session, session->priv->authentication); set_locale (session); ++++++ lightdm-sysconfig-support.patch ++++++ --- /var/tmp/diff_new_pack.xBBEum/_old 2011-10-08 22:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.xBBEum/_new 2011-10-08 22:03:27.000000000 +0200 @@ -51,7 +51,7 @@ diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c -@@ -839,7 +839,10 @@ static void +@@ -853,7 +853,10 @@ static void display_init (Display *display) { display->priv = G_TYPE_INSTANCE_GET_PRIVATE (display, DISPLAY_TYPE, DisplayPrivate); ++++++ lightdm-use-pkglibexecdir.patch ++++++ # HG changeset patch # Parent c01a70c16eaab921742d9f62da32b6cd34bfa18d Use pkglibexecdir instead of libexecdir for helper binaries/scripts diff --git a/data/Makefile.am b/data/Makefile.am --- a/data/Makefile.am +++ b/data/Makefile.am @@ -12,7 +12,7 @@ apparmor_profiledir = $(sysconfdir)/appa install-data-hook: install -d $(DESTDIR)$(apparmor_profiledir) - sed 's!LIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \ + sed 's!PKGLIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \ > $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session dist_man1_MANS = lightdm.1 diff --git a/data/guest-session.apparmor b/data/guest-session.apparmor --- a/data/guest-session.apparmor +++ b/data/guest-session.apparmor @@ -4,7 +4,7 @@ #include <tunables/global> -LIBEXECDIR/lightdm-guest-session-wrapper { +PKGLIBEXECDIR/lightdm-guest-session-wrapper { #include <abstractions/authentication> #include <abstractions/nameservice> #include <abstractions/wutmp> diff --git a/src/Makefile.am b/src/Makefile.am --- a/src/Makefile.am +++ b/src/Makefile.am @@ -93,7 +93,7 @@ lightdm_LDADD = \ $(LIGHTDM_LIBS) \ -lpam -libexec_PROGRAMS = lightdm-guest-session-wrapper +pkglibexec_PROGRAMS = lightdm-guest-session-wrapper lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c diff --git a/src/display.c b/src/display.c --- a/src/display.c +++ b/src/display.c @@ -449,7 +449,7 @@ create_session (Display *display, PAMSes if (display->priv->autologin_guest) { gchar *t = command; - command = g_strdup_printf (LIBEXEC_DIR "/lightdm-guest-session-wrapper %s", command); + command = g_strdup_printf (PKGLIBEXEC_DIR "/lightdm-guest-session-wrapper %s", command); g_debug("Guest session, running session command through wrapper: %s", command); g_free (t); } diff --git a/utils/Makefile.am b/utils/Makefile.am --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -1,5 +1,5 @@ bin_PROGRAMS = dm-tool -libexec_PROGRAMS = lightdm-set-defaults +pkglibexec_PROGRAMS = lightdm-set-defaults dist_pkglibexec_SCRIPTS = gdmflexiserver dm_tool_SOURCES = \ continue with "q"... Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
