[Pkg-xfce-commits] r7371 - in goodies/trunk/lightdm: . debian debian/patches

Yves-Alexis Perez corsac at alioth.debian.org
Sun May 5 11:49:00 UTC 2013


Author: corsac
Date: 2013-05-05 11:49:00 +0000 (Sun, 05 May 2013)
New Revision: 7371

Added:
   goodies/trunk/lightdm/debian/docs
   goodies/trunk/lightdm/debian/gir1.2-lightdm-1.install
   goodies/trunk/lightdm/debian/patches/05_debianize-pam-files.patch
Removed:
   goodies/trunk/lightdm/debian/lightdm.lightdm-autologin.pam
   goodies/trunk/lightdm/debian/lightdm.pam
Modified:
   goodies/trunk/lightdm/
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/control
   goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install
   goodies/trunk/lightdm/debian/lightdm.install
   goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
   goodies/trunk/lightdm/debian/patches/02_default-config.patch
   goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch
   goodies/trunk/lightdm/debian/patches/04_dont-add-pkglibexecdir-path.patch
   goodies/trunk/lightdm/debian/patches/series
   goodies/trunk/lightdm/debian/rules
   goodies/trunk/lightdm/debian/watch
Log:
merge changes from experimental branch



Property changes on: goodies/trunk/lightdm
___________________________________________________________________
Added: svn:mergeinfo
   + /goodies/branches/experimental/lightdm:7168-7370

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/changelog	2013-05-05 11:49:00 UTC (rev 7371)
@@ -1,29 +1,61 @@
-lightdm (1.2.3-1) unstable; urgency=low
+lightdm (1.6.0-2) UNRELEASED; urgency=low
 
+  [ Niv Sardi ]
+  * Build with GIR
+
   [ Yves-Alexis Perez ]
+  * Upload to unstable.
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 24 Apr 2013 21:53:09 +0200
+
+lightdm (1.6.0-1) experimental; urgency=low
+
   * New upstream release.
-   - correctly set utmp records.                                closes: #648604
-   - fix autologin timeouts.                                    closes: #682473
+
+ -- Yves-Alexis Perez <corsac at debian.org>  Wed, 17 Apr 2013 22:06:36 +0200
+
+lightdm (1.5.3-1) experimental; urgency=low
+
+  * New upstream unstable release.
+  * debian/docs: ship NEWS file.                                closes: #689870
+  * debian/watch:
+    - support .xz tarballs.
   * debian/patches:
-    - 02_default-config updated, use Xorg as default X command. closes: #688756
-    - 01_set-default-path and 04_dont-add-pkglibexecdir-path refreshed.
-  * debian/watch updated to track 1.2 branch.
+    - 01_set-default-path, 03_quit-plymouth, 04_dont-add-pkglibexecdir-path
+      and 05_debianize-pam-files refreshed.
+  * debian/control:
+    - add build-dep on libgcrypt11-dev.
+  * debian/rules:
+    - disable pie hardening flags for now, it segfaults at startup.
+    - fix gdmflexiserver removal
+    - fix permissions on apparmor profiles.
+  * debian/lightdm.install:
+    - install apparmor profiles.
 
-  [ Daniel Echeverry ]
-  * Upstream changelog is bogus.                                closes: #689870
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Apr 2013 14:30:05 +0200
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 02 Feb 2013 11:21:58 +0100
+lightdm (1.4.0-1) experimental; urgency=low
 
-lightdm (1.2.2-4) unstable; urgency=low
-
+  * New upstream release.
+  * debian/patches:
+    - 01_set-default-path, 02_default-config and
+      04_dont-add-pkglibexecdir-path refreshed for new release.
+    - 05_debianize-pam-files added, Debianize the lightdm and
+      lightdm-autologin pam config files.
   * debian/control:
     - suggests upower.                                          closes: #679538
     - make lightdm depends on lightdm-gtk-greeter | lightdm-greeter, thanks
       Ralf Jung for the report.                                 closes: #684714
+    - add build-dep on itstool.
   * debian/lightdm.install:
     - stop installing lightdm upstart script since it's broken. closes: #679409
+    - install /u/s/help.* 
+    - install PAM files
+  * debian/rules:
+    - stop installing own PAM files.
+  * debian/*.pam: drop obsolete PAM files.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Thu, 11 Oct 2012 12:44:37 +0200
+ -- Yves-Alexis Perez <corsac at debian.org>  Sun, 07 Oct 2012 09:16:34 +0200
 
 lightdm (1.2.2-3) unstable; urgency=low
 

Modified: goodies/trunk/lightdm/debian/control
===================================================================
--- goodies/trunk/lightdm/debian/control	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/control	2013-05-05 11:49:00 UTC (rev 7371)
@@ -8,8 +8,8 @@
 Build-Depends: debhelper (>= 9), intltool, pkg-config, libglib2.0-dev, 
  libdbus-glib-1-dev, libxcb1-dev, libxdmcp-dev, libpam-dev, libxklavier-dev, 
  libgtk-3-dev, libck-connector-dev, gnome-doc-utils, libqt4-dev,
- valac, gobject-introspection, dpkg-dev (>= 1.16.1),
- gtk-doc-tools
+ valac-0.18 | valac, gobject-introspection, dpkg-dev (>= 1.16.1),
+ gtk-doc-tools, itstool, libgcrypt11-dev, libgirepository1.0-dev
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/lightdm
 Vcs-Svn: svn://svn.debian.org/pkg-xfce/goodies/trunk/lightdm
@@ -72,3 +72,14 @@
 Description: simple display manager (Qt development files)
  This package contains the development files for lightdm.
  They can be used to build new greeters applications Qt based.
+
+Package: gir1.2-lightdm-1
+Section: libs
+Architecture: any
+Depends: ${misc:Depends},
+         liblightdm-gobject-1-0 (= ${binary:Version})
+Description: Typelib file for liblightdm-1
+ liblightdm provides a library for building LightDM greeters and applications.
+ .
+ This package can be used by other packages using the GIRepository format to
+ generate dynamic bindings for liblightdm.

Copied: goodies/trunk/lightdm/debian/docs (from rev 7370, goodies/branches/experimental/lightdm/debian/docs)
===================================================================
--- goodies/trunk/lightdm/debian/docs	                        (rev 0)
+++ goodies/trunk/lightdm/debian/docs	2013-05-05 11:49:00 UTC (rev 7371)
@@ -0,0 +1 @@
+NEWS

Copied: goodies/trunk/lightdm/debian/gir1.2-lightdm-1.install (from rev 7370, goodies/branches/experimental/lightdm/debian/gir1.2-lightdm-1.install)
===================================================================
--- goodies/trunk/lightdm/debian/gir1.2-lightdm-1.install	                        (rev 0)
+++ goodies/trunk/lightdm/debian/gir1.2-lightdm-1.install	2013-05-05 11:49:00 UTC (rev 7371)
@@ -0,0 +1 @@
+usr/lib/*/girepository-1.0 /usr/lib/

Modified: goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/liblightdm-gobject-dev.install	2013-05-05 11:49:00 UTC (rev 7371)
@@ -3,3 +3,4 @@
 usr/lib/*/liblightdm-gobject-*.a
 usr/lib/*/liblightdm-gobject-*.so
 usr/share/gtk-doc
+usr/share/gir-1.0/*.gir
\ No newline at end of file

Modified: goodies/trunk/lightdm/debian/lightdm.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.install	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/lightdm.install	2013-05-05 11:49:00 UTC (rev 7371)
@@ -2,11 +2,15 @@
 usr/sbin/lightdm
 usr/share/man
 usr/share/locale
+usr/share/help
+etc/apparmor.d/abstractions/lightdm
+etc/apparmor.d/abstractions/lightdm_chromium-browser
 etc/dbus-1
 etc/lightdm/users.conf
 etc/lightdm/lightdm.conf
 etc/lightdm/keys.conf
 etc/apparmor.d/lightdm-guest-session
+etc/pam.d
 debian/lightdm-xsession.desktop /usr/share/xsessions
 usr/lib/*/lightdm/lightdm-set-defaults
 usr/lib/*/lightdm/lightdm-guest-session-wrapper

Deleted: goodies/trunk/lightdm/debian/lightdm.lightdm-autologin.pam
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.lightdm-autologin.pam	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/lightdm.lightdm-autologin.pam	2013-05-05 11:49:00 UTC (rev 7371)
@@ -1,23 +0,0 @@
-#%PAM-1.0
-auth    requisite       pam_nologin.so
-auth    required        pam_env.so readenv=1
-auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
-#auth    sufficient      pam_thinkfinger.so
-auth    required        pam_permit.so
- at include common-account
-# SELinux needs to be the first session rule. This ensures that any 
-# lingering context has been cleared. Without out this it is possible 
-# that a module could execute code in the wrong domain.
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
-session required        pam_limits.so
-session required        pam_loginuid.so
- at include common-session
-# SELinux needs to intervene at login time to ensure that the process
-# starts in the proper default security context. Only sessions which are
-# intended to run in the user's context should be run after this.
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
- at include common-password

Deleted: goodies/trunk/lightdm/debian/lightdm.pam
===================================================================
--- goodies/trunk/lightdm/debian/lightdm.pam	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/lightdm.pam	2013-05-05 11:49:00 UTC (rev 7371)
@@ -1,25 +0,0 @@
-#%PAM-1.0
-auth    requisite       pam_nologin.so
-auth    required        pam_env.so readenv=1
-auth    required        pam_env.so readenv=1 envfile=/etc/default/locale
-#auth    sufficient      pam_thinkfinger.so
- at include common-auth
-auth    optional        pam_gnome_keyring.so
- at include common-account
-# SELinux needs to be the first session rule. This ensures that any 
-# lingering context has been cleared. Without out this it is possible 
-# that a module could execute code in the wrong domain.
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
-session required        pam_limits.so
-session required        pam_loginuid.so
- at include common-session
-# SELinux needs to intervene at login time to ensure that the process
-# starts in the proper default security context. Only sessions which are
-# intended to run in the user's context should be run after this.
-session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
-# When the module is present, "required" would be sufficient (When SELinux
-# is disabled, this returns success.)
-session optional        pam_gnome_keyring.so auto_start
- at include common-password

Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2013-05-05 11:49:00 UTC (rev 7371)
@@ -18,7 +18,7 @@
      {
 --- a/src/session-child.c
 +++ b/src/session-child.c
-@@ -307,7 +307,10 @@ session_child_run (int argc, char **argv
+@@ -329,7 +329,10 @@ session_child_run (int argc, char **argv
          else
          {
              /* Set POSIX variables */

Modified: goodies/trunk/lightdm/debian/patches/02_default-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/02_default-config.patch	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/patches/02_default-config.patch	2013-05-05 11:49:00 UTC (rev 7371)
@@ -12,12 +12,8 @@
 === modified file 'data/lightdm.conf'
 --- a/data/lightdm.conf
 +++ b/data/lightdm.conf
-@@ -55,21 +55,21 @@
- # exit-on-failure = True if the daemon should exit if this seat fails
- #
- [SeatDefaults]
--#xserver-command=X
-+xserver-command=Xorg
+@@ -65,19 +65,19 @@
+ #xserver-command=X
  #xserver-layout=
  #xserver-config=
 -#xserver-allow-tcp=false
@@ -31,6 +27,7 @@
 +greeter-hide-users=true
  #greeter-allow-guest=true
  #greeter-show-manual-login=false
+ #greeter-show-remote-login=true
  #user-session=default
  #allow-guest=true
  #guest-session=UNIMPLEMENTED

Modified: goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/patches/03_quit-plymouth.patch	2013-05-05 11:49:00 UTC (rev 7371)
@@ -4,11 +4,9 @@
 plymouth has been deactivated before, so just quit it for now.
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632737
 Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/799069
-Index: lightdm-1.0.1/src/xserver-local.c
-===================================================================
---- lightdm-1.0.1.orig/src/xserver-local.c	2011-10-04 10:31:50.000000000 +0200
-+++ lightdm-1.0.1/src/xserver-local.c	2011-10-05 22:15:18.216522949 +0200
-@@ -139,7 +139,7 @@
+--- a/src/xserver-local.c
++++ b/src/xserver-local.c
+@@ -142,7 +142,7 @@ xserver_local_new (void)
              g_debug ("X server %s will replace Plymouth", xserver_get_address (XSERVER (self)));
              self->priv->replacing_plymouth = TRUE;
              self->priv->vt = active_vt;

Modified: goodies/trunk/lightdm/debian/patches/04_dont-add-pkglibexecdir-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/04_dont-add-pkglibexecdir-path.patch	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/patches/04_dont-add-pkglibexecdir-path.patch	2013-05-05 11:49:00 UTC (rev 7371)
@@ -2,7 +2,7 @@
 Description: don't add PKGLIBEXEC_DIR to the user PATH
 --- a/src/session-child.c
 +++ b/src/session-child.c
-@@ -457,11 +457,6 @@ session_child_run (int argc, char **argv
+@@ -479,11 +479,6 @@ session_child_run (int argc, char **argv
          g_free (value);
      }
  

Copied: goodies/trunk/lightdm/debian/patches/05_debianize-pam-files.patch (from rev 7370, goodies/branches/experimental/lightdm/debian/patches/05_debianize-pam-files.patch)
===================================================================
--- goodies/trunk/lightdm/debian/patches/05_debianize-pam-files.patch	                        (rev 0)
+++ goodies/trunk/lightdm/debian/patches/05_debianize-pam-files.patch	2013-05-05 11:49:00 UTC (rev 7371)
@@ -0,0 +1,103 @@
+--- a/data/pam/lightdm
++++ b/data/pam/lightdm
+@@ -1,19 +1,35 @@
+ #%PAM-1.0
+ 
+ # Block login if they are globally disabled
+-auth      required pam_nologin.so
++auth      requisite pam_nologin.so
+ 
+ # Load environment from /etc/environment and ~/.pam_environment
+-auth      required pam_env.so
++auth      required pam_env.so envfile=/etc/default/locale
+ 
+-# Use /etc/passwd and /etc/shadow for passwords
+-auth      required pam_unix.so
++ at include common-auth
+ 
+-# Check account is active, change password if required
+-account   required pam_unix.so
++auth  optional pam_gnome_keyring.so
+ 
+-# Allow password to be changed
+-password  required pam_unix.so
++ at include common-account
+ 
+-# Setup session
+-session   required pam_unix.so
++# SELinux needs to be the first session rule. This ensures that any
++# lingering context has been cleared. Without out this it is possible
++# that a module could execute code in the wrong domain.
++# When the module is present, "required" would be sufficient (When SELinux
++# is disabled, this returns success.)
++session  [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
++
++session  required        pam_limits.so
++session  required        pam_loginuid.so
++ at include common-session
++
++# SELinux needs to intervene at login time to ensure that the process
++# starts in the proper default security context. Only sessions which are
++# intended to run in the user's context should be run after this.
++session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
++# When the module is present, "required" would be sufficient (When SELinux
++# is disabled, this returns success.)
++
++session optional        pam_gnome_keyring.so auto_start
++
++ at include common-password
+--- a/data/pam/lightdm-autologin
++++ b/data/pam/lightdm-autologin
+@@ -1,19 +1,35 @@
+ #%PAM-1.0
+ 
+ # Block login if they are globally disabled
+-auth      required pam_nologin.so
++auth      requisite pam_nologin.so
+ 
+ # Load environment from /etc/environment and ~/.pam_environment
+-auth      required pam_env.so
++auth      required pam_env.so envfile=/etc/default/locale
+ 
+ # Allow access without authentication
+ auth      required pam_permit.so
+ 
+-# Stop autologin if account requires action
+-account   required pam_unix.so
++ at include common-account
++
++# SELinux needs to be the first session rule. This ensures that any
++# lingering context has been cleared. Without out this it is possible
++# that a module could execute code in the wrong domain.
++# When the module is present, "required" would be sufficient (When SELinux
++# is disabled, this returns success.)
++session  [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so close
++
++session  required        pam_limits.so
++session  required        pam_loginuid.so
++ at include common-session
++
++# SELinux needs to intervene at login time to ensure that the process
++# starts in the proper default security context. Only sessions which are
++# intended to run in the user's context should be run after this.
++session [success=ok ignore=ignore module_unknown=ignore default=bad] pam_selinux.so open
++# When the module is present, "required" would be sufficient (When SELinux
++# is disabled, this returns success.)
+ 
+ # Can't change password
+ password  required pam_deny.so
+ 
+-# Setup session
+-session   required pam_unix.so
++ at include common-password
+--- a/data/pam/lightdm-greeter
++++ b/data/pam/lightdm-greeter
+@@ -1,7 +1,7 @@
+ #%PAM-1.0
+ 
+ # Load environment from /etc/environment and ~/.pam_environment
+-auth      required pam_env.so
++auth      required pam_env.so envfile=/etc/default/locale
+ 
+ # Always let the greeter start without authentication
+ auth      required pam_permit.so

Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/patches/series	2013-05-05 11:49:00 UTC (rev 7371)
@@ -2,3 +2,4 @@
 02_default-config.patch
 03_quit-plymouth.patch
 04_dont-add-pkglibexecdir-path.patch
+05_debianize-pam-files.patch

Modified: goodies/trunk/lightdm/debian/rules
===================================================================
--- goodies/trunk/lightdm/debian/rules	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/rules	2013-05-05 11:49:00 UTC (rev 7371)
@@ -1,12 +1,12 @@
 #!/usr/bin/make -f
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+#export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession --enable-introspection=no --disable-silent-rules
+	dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession --enable-introspection=yes --disable-silent-rules
 
 override_dh_installchangelogs:
 	dh_installchangelogs -- NEWS
@@ -16,13 +16,10 @@
 
 override_dh_install:
 	find debian/tmp -name '*.la' -delete
-	rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/gdmflexiserver
+	find debian/tmp/usr/lib/ -name gdmflexiserver -delete
+	find debian/tmp/etc/apparmor.d -type f -exec chmod 0644 '{}' \;
 	dh_install --fail-missing -X etc/init/lightdm.conf
 
-override_dh_installpam:
-		dh_installpam
-		dh_installpam --name=lightdm-autologin
-
 %:
 	dh $@ --parallel
 

Modified: goodies/trunk/lightdm/debian/watch
===================================================================
--- goodies/trunk/lightdm/debian/watch	2013-04-24 20:04:08 UTC (rev 7370)
+++ goodies/trunk/lightdm/debian/watch	2013-05-05 11:49:00 UTC (rev 7371)
@@ -1,3 +1,3 @@
 version=3
 https://launchpad.net/lightdm/+download \
-https://launchpad.net/lightdm/1.2/.*/lightdm-(\d\.\d\.\d)\.tar\.(?:gz|bz2)
+https://launchpad.net/lightdm/.*/lightdm-(\d\.\d\.\d)\.tar\.(?:gz|bz2|xz)




More information about the Pkg-xfce-commits mailing list