Hello community, here is the log from the commit of package lightdm for openSUSE:Factory checked in at 2012-04-23 09:15:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lightdm (Old) and /work/SRC/openSUSE:Factory/.lightdm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lightdm", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/lightdm/lightdm.changes 2012-04-12 13:25:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lightdm.new/lightdm.changes 2012-04-23 09:15:21.000000000 +0200 @@ -1,0 +2,11 @@ +Thu Apr 19 09:14:12 UTC 2012 - gber@opensuse.org + +- update to version 1.2.2 + - fix wrapper path in AppArmor profile (broken since 1.1.1) + - add show-manual-login and allow-guest options to + lightdm-set-defaults + - add missing regression test script +- dropped lightdm-use-pkglibexecdir.patch which has been + incorporated upstream + +------------------------------------------------------------------- Old: ---- lightdm-1.2.0.tar.gz lightdm-use-pkglibexecdir.patch New: ---- lightdm-1.2.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lightdm.spec ++++++ --- /var/tmp/diff_new_pack.FYOyuL/_old 2012-04-23 09:15:23.000000000 +0200 +++ /var/tmp/diff_new_pack.FYOyuL/_new 2012-04-23 09:15:23.000000000 +0200 @@ -23,7 +23,7 @@ %define qt_lib lib%{qt_libname}-0 Name: lightdm -Version: 1.2.0 +Version: 1.2.2 Release: 0 Summary: Lightweight, Cross-desktop Display Manager License: GPL-3.0+ @@ -34,8 +34,6 @@ Source2: %{name}-autologin.pamd Source3: X11-displaymanagers-%{name} Source100: %{name}-rpmlintrc -# PATCH-FEATURE-OPENSUSE lightdm-use-pkglibexecdir.patch gber@opensuse.org -- Use pkglibexecdir instead of libexecdir for helper binaries/scripts -Patch0: lightdm-use-pkglibexecdir.patch # PATCH-FEATURE-OPENSUSE lightdm-sysconfig-support.patch gber@opensuse.org -- 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 gber@opensuse.org -- Set XAUTHLOCALHOSTNAME to localhost for local logins to avoid issues in the session in case the hostname changes @@ -117,13 +115,11 @@ %prep %setup -q -%patch0 -p1 %patch1 -p1 %patch2 -p1 %patch4 -p1 %patch5 -p1 %patch7 -p1 -#rm -f liblightdm-qt/*_moc.cpp greeters/qt/*_moc.cpp tests/src/*_moc.cpp %build ./autogen.sh ++++++ lightdm-1.2.0.tar.gz -> lightdm-1.2.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/INSTALL new/lightdm-1.2.2/INSTALL --- old/lightdm-1.2.0/INSTALL 2012-01-17 07:49:04.000000000 +0100 +++ new/lightdm-1.2.2/INSTALL 2012-04-19 01:39:27.000000000 +0200 @@ -1,8 +1,8 @@ Installation Instructions ************************* -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006, 2007, 2008, 2009 Free Software Foundation, Inc. +Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation, +Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -226,6 +226,11 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. + HP-UX `make' updates targets which have the same time stamps as +their prerequisites, which makes it generally unusable when shipped +generated files such as `configure' are involved. Use GNU `make' +instead. + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot parse its `<wchar.h>' header file. The option `-nodtk' can be used as a workaround. If GNU CC is not installed, it is therefore recommended diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/Makefile.in new/lightdm-1.2.2/Makefile.in --- old/lightdm-1.2.0/Makefile.in 2012-04-04 08:51:11.000000000 +0200 +++ new/lightdm-1.2.2/Makefile.in 2012-04-19 02:45:22.000000000 +0200 @@ -40,8 +40,8 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \ - TODO compile config.guess config.sub depcomp install-sh \ - ltmain.sh missing + compile config.guess config.sub depcomp install-sh ltmain.sh \ + missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/NEWS new/lightdm-1.2.2/NEWS --- old/lightdm-1.2.0/NEWS 2012-04-05 09:07:05.000000000 +0200 +++ new/lightdm-1.2.2/NEWS 2012-04-19 02:45:06.000000000 +0200 @@ -1,3 +1,12 @@ +Overview of changes in lightdm 1.2.2 + + * Add missing regression test script + +Overview of changes in lightdm 1.2.1 + + * Fix wrapper path in AppArmor profile (broken since 1.1.1) + * Add show-manual-login and allow-guest options to lightdm-set-defaults + Overview of changes in lightdm 1.2.0 * Backup .xsession-errors on login diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/TODO new/lightdm-1.2.2/TODO --- old/lightdm-1.2.0/TODO 2012-02-29 10:57:24.000000000 +0100 +++ new/lightdm-1.2.2/TODO 1970-01-01 01:00:00.000000000 +0100 @@ -1,19 +0,0 @@ -LightDM crashes when quitting after have XDMCP connection in PAMSession? -Stop being able to log into users on other seats -Add VNC support -Test XDMCP client seat -Per seat guest enable -Close FDs on starting session (but keep greeter pipe open) -Merge tests .script and .config -Rename XAuthorization to XAuthority? And merge in authentication? -Failsafe X and exponential backoff? -GET ALL HINTS WORKING -Always load dmrc from cache -Make liblightdm-qt use AccountsService -Fix XDM-AUTHENTICATION-KEY decode, add regression test - -*** -Fix guest accounts being created but the session doesn't start -Add tests to check guest accounts are being created and destroyed - -add regression test to check XDG_SESSION_COOKIE is set \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/config.guess new/lightdm-1.2.2/config.guess --- old/lightdm-1.2.0/config.guess 2012-02-15 10:00:36.000000000 +0100 +++ new/lightdm-1.2.2/config.guess 2012-04-19 01:39:26.000000000 +0200 @@ -2,9 +2,9 @@ # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-05-11' +timestamp='2012-02-10' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -57,8 +55,8 @@ Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -145,7 +143,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, + # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward @@ -792,13 +790,12 @@ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + UNAME_PROCESSOR=`/usr/bin/uname -p` + case ${UNAME_PROCESSOR} in amd64) echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; + echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; i*:CYGWIN*:*) @@ -807,6 +804,9 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; + i*:MSYS*:*) + echo ${UNAME_MACHINE}-pc-msys + exit ;; i*:windows32*:*) # uname -m includes "-pc" on this system. echo ${UNAME_MACHINE}-mingw32 @@ -861,6 +861,13 @@ i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit ;; + aarch64:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + aarch64_be:Linux:*:*) + UNAME_MACHINE=aarch64_be + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -895,13 +902,16 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; cris:Linux:*:*) - echo cris-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu + echo ${UNAME_MACHINE}-axis-linux-gnu exit ;; frv:Linux:*:*) - echo frv-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit ;; + hexagon:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; i*86:Linux:*:*) LIBC=gnu @@ -943,7 +953,7 @@ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu @@ -978,13 +988,13 @@ echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; tile*:Linux:*:*) - echo ${UNAME_MACHINE}-tilera-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; vax:Linux:*:*) echo ${UNAME_MACHINE}-dec-linux-gnu exit ;; x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu + echo ${UNAME_MACHINE}-unknown-linux-gnu exit ;; xtensa*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu @@ -1315,6 +1325,9 @@ i*86:AROS:*:*) echo ${UNAME_MACHINE}-pc-aros exit ;; + x86_64:VMkernel:*:*) + echo ${UNAME_MACHINE}-unknown-esx + exit ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/config.sub new/lightdm-1.2.2/config.sub --- old/lightdm-1.2.0/config.sub 2012-02-15 10:00:36.000000000 +0100 +++ new/lightdm-1.2.2/config.sub 2012-04-19 01:39:26.000000000 +0200 @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -# 2011 Free Software Foundation, Inc. +# 2011, 2012 Free Software Foundation, Inc. -timestamp='2011-03-23' +timestamp='2012-02-10' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -21,9 +21,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program; if not, see <http://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -76,8 +74,8 @@ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -132,6 +130,10 @@ os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; + android-linux) + os=-linux-android + basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; *) basic_machine=`echo $1 | sed 's/-[^-]*$//'` if [ $basic_machine != $1 ] @@ -247,17 +249,22 @@ # Some are omitted here because they have special meanings below. 1750a | 580 \ | a29k \ + | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ + | be32 | be64 \ | bfin \ | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ + | epiphany \ | fido | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ | i370 | i860 | i960 | ia64 \ | ip2k | iq2000 \ + | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | mcore | mep | metag \ @@ -291,7 +298,7 @@ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ - | rx \ + | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ @@ -300,7 +307,7 @@ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ - | v850 | v850e \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | we32k \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) @@ -315,8 +322,7 @@ c6x) basic_machine=tic6x-unknown ;; - m6811 | m68hc11 | m6812 | m68hc12 | picochip) - # Motorola 68HC11/12. + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) basic_machine=$basic_machine-unknown os=-none ;; @@ -329,7 +335,10 @@ strongarm | thumb | xscale) basic_machine=arm-unknown ;; - + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; xscaleeb) basic_machine=armeb-unknown ;; @@ -352,11 +361,13 @@ # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ + | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ + | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | clipper-* | craynv-* | cydra-* \ @@ -365,8 +376,10 @@ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ | i*86-* | i860-* | i960-* | ia64-* \ | ip2k-* | iq2000-* \ + | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ @@ -400,7 +413,7 @@ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ - | romp-* | rs6000-* | rx-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ @@ -408,10 +421,11 @@ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile-* | tilegx-* \ + | tile*-* \ | tron-* \ | ubicom32-* \ - | v850-* | v850e-* | vax-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ @@ -711,7 +725,6 @@ i370-ibm* | ibm*) basic_machine=i370-ibm ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? i*86v32) basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` os=-sysv32 @@ -808,10 +821,18 @@ ms1-*) basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` ;; + msys) + basic_machine=i386-pc + os=-msys + ;; mvs) basic_machine=i370-ibm os=-mvs ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; ncr3000) basic_machine=i486-ncr os=-sysv4 @@ -1120,13 +1141,8 @@ basic_machine=t90-cray os=-unicos ;; - # This must be matched before tile*. - tilegx*) - basic_machine=tilegx-unknown - os=-linux-gnu - ;; tile*) - basic_machine=tile-unknown + basic_machine=$basic_machine-unknown os=-linux-gnu ;; tx39) @@ -1336,7 +1352,7 @@ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* \ @@ -1548,9 +1564,6 @@ ;; m68000-sun) os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 ;; m68*-cisco) os=-aout diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/configure new/lightdm-1.2.2/configure --- old/lightdm-1.2.0/configure 2012-04-04 08:51:12.000000000 +0200 +++ new/lightdm-1.2.2/configure 2012-04-19 02:45:23.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.2.0. +# Generated by GNU Autoconf 2.68 for lightdm 1.2.2. # # # 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.2.0' -PACKAGE_STRING='lightdm 1.2.0' +PACKAGE_VERSION='1.2.2' +PACKAGE_STRING='lightdm 1.2.2' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1433,7 +1433,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.2.0 to adapt to many kinds of systems. +\`configure' configures lightdm 1.2.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1503,7 +1503,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lightdm 1.2.0:";; + short | recursive ) echo "Configuration of lightdm 1.2.2:";; esac cat <<\_ACEOF @@ -1667,7 +1667,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lightdm configure 1.2.0 +lightdm configure 1.2.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2153,7 +2153,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.2.0, which was +It was created by lightdm $as_me 1.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2971,7 +2971,7 @@ # Define the identity of the package. PACKAGE='lightdm' - VERSION='1.2.0' + VERSION='1.2.2' cat >>confdefs.h <<_ACEOF @@ -18766,7 +18766,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.2.0, which was +This file was extended by lightdm $as_me 1.2.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18832,7 +18832,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.2.0 +lightdm config.status 1.2.2 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.2.0/configure.ac new/lightdm-1.2.2/configure.ac --- old/lightdm-1.2.0/configure.ac 2012-04-04 08:50:53.000000000 +0200 +++ new/lightdm-1.2.2/configure.ac 2012-04-19 02:44:45.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(lightdm, 1.2.0) +AC_INIT(lightdm, 1.2.2) 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.2.0/data/Makefile.am new/lightdm-1.2.2/data/Makefile.am --- old/lightdm-1.2.0/data/Makefile.am 2011-12-09 02:51:23.000000000 +0100 +++ new/lightdm-1.2.2/data/Makefile.am 2012-04-19 01:33:26.000000000 +0200 @@ -12,7 +12,7 @@ install-data-hook: install -d $(DESTDIR)$(apparmor_profiledir) - sed 's!LIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \ + sed 's!PKGLIBEXECDIR!$(pkglibexecdir)!g' < $(srcdir)/guest-session.apparmor \ > $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session dist_man1_MANS = lightdm.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/data/Makefile.in new/lightdm-1.2.2/data/Makefile.in --- old/lightdm-1.2.0/data/Makefile.in 2012-04-04 08:51:10.000000000 +0200 +++ new/lightdm-1.2.2/data/Makefile.in 2012-04-19 02:45:21.000000000 +0200 @@ -763,7 +763,7 @@ install-data-hook: install -d $(DESTDIR)$(apparmor_profiledir) - sed 's!LIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \ + sed 's!PKGLIBEXECDIR!$(pkglibexecdir)!g' < $(srcdir)/guest-session.apparmor \ > $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/data/guest-session.apparmor new/lightdm-1.2.2/data/guest-session.apparmor --- old/lightdm-1.2.0/data/guest-session.apparmor 2011-12-09 02:51:23.000000000 +0100 +++ new/lightdm-1.2.2/data/guest-session.apparmor 2012-04-19 01:33:26.000000000 +0200 @@ -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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/doc/html/lightdm-gobject-1-Greeter-Interface.html new/lightdm-1.2.2/doc/html/lightdm-gobject-1-Greeter-Interface.html --- old/lightdm-1.2.0/doc/html/lightdm-gobject-1-Greeter-Interface.html 2012-04-05 09:07:32.000000000 +0200 +++ new/lightdm-1.2.2/doc/html/lightdm-gobject-1-Greeter-Interface.html 2012-04-19 02:45:32.000000000 +0200 @@ -98,7 +98,7 @@ <p> </p> <div class="example"> -<a name="idp6889520"></a><p class="title"><b>Example 1. Example Greeter</b></p> +<a name="idp6834256"></a><p class="title"><b>Example 1. Example Greeter</b></p> <div class="example-contents"><pre class="programlisting"> int main () { @@ -342,7 +342,14 @@ <a name="lightdm-greeter-get-hide-users-hint"></a><h3>lightdm_greeter_get_hide_users_hint ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> lightdm_greeter_get_hide_users_hint (<em class="parameter"><code><span class="type">LightDMGreeter</span> *greeter</code></em>);</pre> <p> -Check if user accounts should be shown. +Check if user accounts should be shown. If this is TRUE then the list of +accounts should be taken from <span class="type">LightDMUserList</span> and displayed in the greeter +for the user to choose from. Note that this list can be empty and it is +recommended you show a method for the user to enter a username manually. +</p> +<p> +If this option is shown the greeter should only allow these users to be +chosen for login unless the manual login hint is set. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/liblightdm-qt/usersmodel.cpp new/lightdm-1.2.2/liblightdm-qt/usersmodel.cpp --- old/lightdm-1.2.0/liblightdm-qt/usersmodel.cpp 2012-02-23 07:39:49.000000000 +0100 +++ new/lightdm-1.2.2/liblightdm-qt/usersmodel.cpp 2012-04-19 01:29:23.000000000 +0200 @@ -13,7 +13,7 @@ #include <QtCore/QString> #include <QtCore/QDebug> -#include <QtGui/QPixmap> +#include <QtGui/QIcon> #include <lightdm.h> @@ -218,7 +218,7 @@ case Qt::DisplayRole: return d->users[row].displayName(); case Qt::DecorationRole: - return QPixmap(d->users[row].image); + return QIcon(d->users[row].image); case UsersModel::NameRole: return d->users[row].name; case UsersModel::RealNameRole: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lightdm-1.2.0/utils/lightdm-set-defaults.c new/lightdm-1.2.2/utils/lightdm-set-defaults.c --- old/lightdm-1.2.0/utils/lightdm-set-defaults.c 2012-03-16 01:06:50.000000000 +0100 +++ new/lightdm-1.2.2/utils/lightdm-set-defaults.c 2012-04-19 01:34:28.000000000 +0200 @@ -24,6 +24,8 @@ #define GREETER_KEY_NAME "greeter-session" #define AUTOLOGIN_KEY_NAME "autologin-user" #define HIDE_USERS_KEY_NAME "greeter-hide-users" +#define MANUAL_LOGIN_KEY_NAME "greeter-show-manual-login" +#define ALLOW_GUEST_KEY_NAME "allow-guest" #define IS_STRING_EMPTY(x) ((x)==NULL||(x)[0]=='\0') @@ -31,11 +33,15 @@ static gboolean keep_old = FALSE; static gboolean remove = FALSE; static gboolean hide_users = FALSE; -static gboolean show_users = FALSE; +static gboolean show_manual_login = FALSE; +static gboolean allow_guest = FALSE; static char *session = NULL; static char *greeter = NULL; static char *autologin = NULL; +static char *str_hide_users = NULL; +static char *str_show_manual_login = NULL; +static char *str_allow_guest = NULL; static GOptionEntry entries[] = { @@ -45,8 +51,9 @@ { "session", 's', 0, G_OPTION_ARG_STRING, &session, N_("Set default session"), NULL }, { "greeter", 'g', 0, G_OPTION_ARG_STRING, &greeter, N_("Set default greeter"), NULL }, { "autologin",'a', 0, G_OPTION_ARG_STRING, &autologin, N_("Set autologin user"), NULL }, - { "hide-users",'i', 0, G_OPTION_ARG_NONE, &hide_users, N_("Hide user list in greeter (exclusive to show-users)"), NULL }, - { "show-users",'w', 0, G_OPTION_ARG_NONE, &show_users, N_("Show user list in greeter (exclusive to hide-users)"), NULL }, + { "hide-users",'i', 0, G_OPTION_ARG_STRING, &str_hide_users, N_("Set greeter-hide-users to true or false"), NULL }, + { "show-manual-login",'m', 0, G_OPTION_ARG_STRING, &str_show_manual_login, N_("Set show-manual-login to true or false"), NULL }, + { "allow-guest",'l', 0, G_OPTION_ARG_STRING, &str_allow_guest, N_("Set allow-guest to true or false"), NULL }, { NULL } }; @@ -119,6 +126,25 @@ } int +str_to_bool(const gchar *str, gboolean *bool_out) +{ + if (IS_STRING_EMPTY(str)) { + return -1; + } + else if (strncasecmp(str, "true", 4)==0) { + *bool_out = TRUE; + return 0; + } + else if (strncasecmp(str, "false", 5)==0) { + *bool_out = FALSE; + return 0; + } + else { + return -2; + } +} + +int main (int argc, char *argv[]) { GOptionContext *context = NULL; @@ -149,12 +175,7 @@ g_error_free (error); return 1; } - if (show_users && hide_users) { - g_printerr (N_("show-users and hide-users are mutually exclusive\n")); - g_option_context_free (context); - return 1; - } - if (IS_STRING_EMPTY (session) && IS_STRING_EMPTY (greeter) && IS_STRING_EMPTY (autologin) && !show_users && !hide_users) { + if (IS_STRING_EMPTY (session) && IS_STRING_EMPTY (greeter) && IS_STRING_EMPTY (autologin) && IS_STRING_EMPTY(str_hide_users) && IS_STRING_EMPTY(str_show_manual_login) && IS_STRING_EMPTY(str_allow_guest)) { g_printerr (N_("Wrong usage of the command\n%s"), g_option_context_get_help (context, FALSE, NULL)); g_option_context_free (context); return 1; @@ -183,10 +204,35 @@ return_code = update_string (default_greeter, greeter, keep_old, remove, SEATDEFAULT_KEY_GROUP, GREETER_KEY_NAME, keyfile); if (!(IS_STRING_EMPTY (autologin)) && (return_code == 0)) return_code = update_string (default_autologin, autologin, keep_old, remove, SEATDEFAULT_KEY_GROUP, AUTOLOGIN_KEY_NAME, keyfile); - if ((show_users || hide_users) && (return_code == 0)) - return_code = update_boolean (hide_users, keep_old, SEATDEFAULT_KEY_GROUP, HIDE_USERS_KEY_NAME, keyfile); + if (!(IS_STRING_EMPTY(str_hide_users)) && (return_code == 0)) { + if (str_to_bool(str_hide_users, &hide_users) == 0) { + return_code = update_boolean (hide_users, keep_old, SEATDEFAULT_KEY_GROUP, HIDE_USERS_KEY_NAME, keyfile); + } + else { + g_printerr (N_("true and false are the only valid choices for hide-users\n")); + return 1; + } + } + if (!(IS_STRING_EMPTY(str_allow_guest)) && (return_code == 0)) { + if (str_to_bool(str_allow_guest, &allow_guest) == 0) { + return_code = update_boolean (allow_guest, keep_old, SEATDEFAULT_KEY_GROUP, ALLOW_GUEST_KEY_NAME, keyfile); + } + else { + g_printerr (N_("true and false are the only valid choices for allow-guest\n")); + return 1; + } + } + if (!(IS_STRING_EMPTY(str_show_manual_login)) && (return_code == 0)) { + if (str_to_bool(str_show_manual_login, &show_manual_login) == 0) { + return_code = update_boolean (show_manual_login, keep_old, SEATDEFAULT_KEY_GROUP, MANUAL_LOGIN_KEY_NAME, keyfile); + } + else { + g_printerr (N_("true and false are the only valid choices for show-manual-login\n")); + return 1; + } + } - if(return_code == 0) { + if (return_code == 0) { s_data = g_key_file_to_data (keyfile, &size, &error); if (!s_data) { g_debug ("Can't convert data to string: %s", error->message); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org