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

Yves-Alexis Perez corsac at alioth.debian.org
Tue Jan 17 08:46:58 UTC 2012 

Author: corsac
Date: 2012-01-17 20:46:58 +0000 (Tue, 17 Jan 2012)
New Revision: 6328

Added:
   goodies/trunk/lightdm/debian/liblightdm-qt-2-0.install
Removed:
   goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install
   goodies/trunk/lightdm/debian/lightdm-gtk-greeter.config
   goodies/trunk/lightdm/debian/lightdm-gtk-greeter.install
   goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst
   goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm
   goodies/trunk/lightdm/debian/lightdm-gtk-greeter.templates
   goodies/trunk/lightdm/debian/lightdm-qt-greeter.config
   goodies/trunk/lightdm/debian/lightdm-qt-greeter.install
   goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst
   goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm
   goodies/trunk/lightdm/debian/lightdm-qt-greeter.templates
   goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch
   goodies/trunk/lightdm/debian/patches/06_move-progs-to-pkglibexecdir.patch
   goodies/trunk/lightdm/debian/patches/07_fix-test-missing-lightdm-session.patch
   goodies/trunk/lightdm/debian/patches/08_CVE-2011-3153.patch
   goodies/trunk/lightdm/debian/patches/09_add-gio-to-pkg-config.patch
Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/control
   goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
   goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
   goodies/trunk/lightdm/debian/patches/series
Log:
* New upstream development release.
  - drop lightdm-{gtk,qt}-greeter packages since they have been moved to
    standalone packages.
  - rename lightdm-qt-1-0 package to -2-0 to follow soname bump.
  - 04_default-gtk-greeter-config dropped since lightm-gtk-greeter has been
    moved to standalone package.
  - 05_dont-add-pkglibexecdir-path refreshed.
  - 06_move-progs-to-pkglibexecdir dropped, included upstream.
  - 08_CVE-2011-3153 dropped, included upstream.
* debian/lightdm-{gtk,qt}-greeter.{config.install.templates,postinst,prerm}
  dropped.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/changelog	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,26 +1,30 @@
-lightdm (1.1.0-1) UNRELEASED; urgency=low
+lightdm (1.1.1-1) UNRELEASED; urgency=low
 
-  * New upstream release.
+  * New upstream development release.
   * debian/po:
     - da.po updated, thanks to “Joe Dalton”.                    closes: #650946
   * debian/control:
     - add Provides: on x-display-manager.                       closes: #654343
     - liblightdm-gobject-dev requires libdbus-glib-1-dev and libxklavier-dev
       so add dependencies.
+    - drop lightdm-{gtk,qt}-greeter packages since they have been moved to
+      standalone packages.
+    - rename lightdm-qt-1-0 package to -2-0 to follow soname bump.
   * debian/watch updated for new tarballs location.
   * debian/patches:
     - 01_set-default-path refreshed.
-    - 06_move-progs-to-pkglibexecdir refreshed, only needed for
-      lightdm-guest-session-wrapper now
+    - 04_default-gtk-greeter-config dropped since lightm-gtk-greeter has been
+      moved to standalone package.
+    - 05_dont-add-pkglibexecdir-path refreshed.
+    - 06_move-progs-to-pkglibexecdir dropped, included upstream.
     - 07_CVE-2011-4105 dropped, code doesn't exist anymore.
-    - 07_fix-test-missing-lightdm-session added, remove lightdm-session from
-      test targets.
-    - 09_add-gio-to-pkg-config added, add gio-2.0 to libs
-      liblightdm-gobject-1.pc.
+    - 08_CVE-2011-3153 dropped, included upstream.
   * debian/rules:
     - don't install libsystem as it's only useful for tests.
+  * debian/lightdm-{gtk,qt}-greeter.{config.install.templates,postinst,prerm}
+    dropped.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sat, 14 Jan 2012 12:55:03 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Tue, 17 Jan 2012 09:48:10 +0100
 
 lightdm (1.0.6-3) unstable; urgency=low
 

Modified: goodies/trunk/lightdm/debian/control
===================================================================
--- goodies/trunk/lightdm/debian/control	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/control	2012-01-17 20:46:58 UTC (rev 6328)
@@ -31,28 +31,6 @@
   * Fully themeable
   * Cross-desktop (greeters can be written in any toolkit)
 
-Package: lightdm-gtk-greeter
-Provides: lightdm-greeter
-Replaces: lightdm-gtk, lightdm (<< 0.9.2-1)
-Breaks: lightdm-gtk, lightdm (<< 0.9.2-1)
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: desktop-base, gnome-themes-standard, gnome-icon-theme, policykit-1
-Description: simple display manager (GTK+ greeter)
- A LightDM greeter that uses the GTK+ toolkit.
-
-Package: lightdm-qt-greeter
-Provides: lightdm-greeter
-Replaces: lightdm-qt
-Breaks: lightdm-qt
-Section: x11
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: policykit-1
-Description: simple display manager (Qt greeter)
- A LightDM greeter that uses the Qt toolkit.
-
 Package: lightdm-vala
 Section: x11
 Architecture: any
@@ -69,7 +47,7 @@
  This package contains the gobject library for lightdm, used by the GTK+
  greeter.
 
-Package: liblightdm-qt-1-0
+Package: liblightdm-qt-2-0
 Section: libdevel
 Architecture: any
 Pre-depends: ${misc:Pre-Depends}

Deleted: goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1 +0,0 @@
-usr/lib/*/liblightdm-qt-*.so.*

Copied: goodies/trunk/lightdm/debian/liblightdm-qt-2-0.install (from rev 6304, goodies/trunk/lightdm/debian/liblightdm-qt-1-0.install)
===================================================================
--- goodies/trunk/lightdm/debian/liblightdm-qt-2-0.install	                        (rev 0)
+++ goodies/trunk/lightdm/debian/liblightdm-qt-2-0.install	2012-01-17 20:46:58 UTC (rev 6328)
@@ -0,0 +1 @@
+usr/lib/*/liblightdm-qt-*.so.*

Deleted: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.config
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.config	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.config	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Debian lightdm package configuration script
-# based on xdm script
-# Copyright 2000-2001 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-set -e
-
-LIGHTDM_CONF=/etc/lightdm/lightdm.conf
-
-# source debconf library
-. /usr/share/debconf/confmodule
-
-OWNERS=
-if db_metaget shared/lightdm-greeter owners; then
-  OWNERS="$RET"
-fi
-
-CHOICES=
-if db_metaget shared/lightdm-greeter choices; then
-  CHOICES="$RET"
-fi
-
-if [ "$OWNERS" != "$CHOICES" ]; then
-  db_subst shared/lightdm-greeter choices "$OWNERS" || :
-  db_fset shared/lightdm-greeter seen false || :
-fi
-
-db_input high shared/lightdm-greeter || :
-db_go || :

Deleted: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.install	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.install	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,4 +0,0 @@
-usr/sbin/lightdm-gtk-greeter
-usr/share/lightdm-gtk-greeter
-usr/share/xgreeters/lightdm-gtk-greeter.desktop
-etc/lightdm/lightdm-gtk-greeter.conf

Deleted: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.postinst	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-# using this greeter?
-GREETER=
-if db_get shared/lightdm-greeter; then
-  GREETER="$RET"
-fi
-
-if [ -n "${GREETER}" ];
-then
-  LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
-  if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
-  then
-    "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"
-  fi
-fi
-db_stop || true
-
-#DEBHELPER#
-
-exit 0

Deleted: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.prerm	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,46 +0,0 @@
-#!/bin/bash
-# Debian lightdm package pre-removal script
-# © 2010 Yves-Alexis Perez, using lightdm script which is
-# Copyright 2001 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-set -e
-
-THIS_PACKAGE="lightdm-gtk-greeter"
-LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
-
-if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
-  if [ -e /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-    # disown this question
-    db_unregister shared/lightdm-greeter || true
-    # does the question still exist?
-    if db_get shared/lightdm-greeter; then
-      db_metaget shared/lightdm-greeter owners
-      db_subst shared/lightdm-greeter choices "$RET"
-      db_get shared/lightdm-greeter
-      # are we removing the currently selected lightdm greeter?
-      if [ "$THIS_PACKAGE" = "$RET" ]; then
-        # ask the user to choose a new default
-        db_fset shared/lightdm-greeter seen false
-        db_input critical shared/lightdm-greeter || true
-        db_go
-
-        GREETER=
-        if db_get shared/lightdm-greeter; then
-          GREETER="$RET"
-        fi
-        if [ -n "${GREETER}" ] && [ -x "${LIGHTDM_SET_DEFAULTS}" ];
-        then
-            "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"
-        fi
-      fi
-    fi
-  fi
-fi
-
-#DEBHELPER#
-
-exit 0

Deleted: goodies/trunk/lightdm/debian/lightdm-gtk-greeter.templates
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-gtk-greeter.templates	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-gtk-greeter.templates	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,11 +0,0 @@
-Template: lightdm-gtk-greeter/lightdm-greeter
-Type: string
-Default: lightdm-gtk-greeter
-Description: for internal use only
-
-Template: shared/lightdm-greeter
-Type: select
-Choices: ${choices}
-_Description: Default LightDM greeter
- LightDM can use multiple greeter fitting more or less with various Desktop
- environments. Select the one which fits best with your install.

Deleted: goodies/trunk/lightdm/debian/lightdm-qt-greeter.config
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.config	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.config	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,31 +0,0 @@
-#!/bin/sh
-# Debian lightdm package configuration script
-# based on xdm script
-# Copyright 2000-2001 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-set -e
-
-LIGHTDM_CONF=/etc/lightdm/lightdm.conf
-
-# source debconf library
-. /usr/share/debconf/confmodule
-
-OWNERS=
-if db_metaget shared/lightdm-greeter owners; then
-  OWNERS="$RET"
-fi
-
-CHOICES=
-if db_metaget shared/lightdm-greeter choices; then
-  CHOICES="$RET"
-fi
-
-if [ "$OWNERS" != "$CHOICES" ]; then
-  db_subst shared/lightdm-greeter choices "$OWNERS" || :
-  db_fset shared/lightdm-greeter seen false || :
-fi
-
-db_input high shared/lightdm-greeter || :
-db_go || :

Deleted: goodies/trunk/lightdm/debian/lightdm-qt-greeter.install
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.install	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.install	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,2 +0,0 @@
-usr/sbin/lightdm-qt-greeter
-usr/share/xgreeters/lightdm-qt-greeter.desktop

Deleted: goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.postinst	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,25 +0,0 @@
-#!/bin/sh
-
-set -e
-
-. /usr/share/debconf/confmodule
-
-# using this greeter?
-GREETER=
-if db_get shared/lightdm-greeter; then
-  GREETER="$RET"
-fi
-
-if [ -n "${GREETER}" ];
-then
-  LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
-  if [ -x "${LIGHTDM_SET_DEFAULTS}" ];
-  then
-    "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"
-  fi
-fi
-db_stop || true
-
-#DEBHELPER#
-
-exit 0

Deleted: goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.prerm	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,46 +0,0 @@
-#!/bin/bash
-# Debian lightdm package pre-removal script
-# © 2010 Yves-Alexis Perez, using lightdm script which is
-# Copyright 2001 Branden Robinson.
-# Licensed under the GNU General Public License, version 2.  See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-# Acknowlegements to Stephen Early, Mark Eichin, and Manoj Srivastava.
-
-set -e
-
-THIS_PACKAGE="lightdm-qt-greeter"
-LIGHTDM_SET_DEFAULTS=/usr/lib/*/lightdm/lightdm-set-defaults
-
-if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then
-  if [ -e /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-    # disown this question
-    db_unregister shared/lightdm-greeter || true
-    # does the question still exist?
-    if db_get shared/lightdm-greeter; then
-      db_metaget shared/lightdm-greeter owners
-      db_subst shared/lightdm-greeter choices "$RET"
-      db_get shared/lightdm-greeter
-      # are we removing the currently selected lightdm greeter?
-      if [ "$THIS_PACKAGE" = "$RET" ]; then
-        # ask the user to choose a new default
-        db_fset shared/lightdm-greeter seen false
-        db_input critical shared/lightdm-greeter || true
-        db_go
-
-        GREETER=
-        if db_get shared/lightdm-greeter; then
-          GREETER="$RET"
-        fi
-        if [ -n "${GREETER}" ] && [ -x "${LIGHTDM_SET_DEFAULTS}" ];
-        then
-            "${LIGHTDM_SET_DEFAULTS}" --greeter "${GREETER}"
-        fi
-      fi
-    fi
-  fi
-fi
-
-#DEBHELPER#
-
-exit 0

Deleted: goodies/trunk/lightdm/debian/lightdm-qt-greeter.templates
===================================================================
--- goodies/trunk/lightdm/debian/lightdm-qt-greeter.templates	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/lightdm-qt-greeter.templates	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,11 +0,0 @@
-Template: lightdm-qt-greeter/lightdm-greeter
-Type: string
-Default: qt-greeter
-Description: for internal use only
-
-Template: shared/lightdm-greeter
-Type: select
-Choices: ${choices}
-_Description: Default LightDM greeter
- LightDM can use multiple greeter fitting more or less with various Desktop
- environments. Select the one which fits best with your install.

Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2012-01-17 20:46:58 UTC (rev 6328)
@@ -2,19 +2,19 @@
 Author: Lionel Le Folgoc <mrpouit at gmail.com>
 Bug: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/798277
 Description: Fix default PATH environment variable
-Index: lightdm-1.1.0/src/session.c
+Index: lightdm-1.1.1/src/session.c
 ===================================================================
---- lightdm-1.1.0.orig/src/session.c	2011-10-08 00:55:28.000000000 +0200
-+++ lightdm-1.1.0/src/session.c	2012-01-14 12:57:35.408008397 +0100
-@@ -249,7 +249,10 @@
-     g_debug ("Launching session");
- 
+--- lightdm-1.1.1.orig/src/session.c
++++ lightdm-1.1.1/src/session.c
+@@ -251,7 +251,10 @@
      user = pam_session_get_user (session->priv->authentication);
+   
+     /* Set POSIX variables */
 -    session_set_env (session, "PATH", "/usr/local/bin:/usr/bin:/bin");
 +    if (user_get_uid (user) == 0)
 +      session_set_env (session, "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
 +    else
 +      session_set_env (session, "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
      session_set_env (session, "USER", user_get_name (user));
-     session_set_env (session, "USERNAME", user_get_name (user)); // FIXME: Is this required?
+     session_set_env (session, "LOGNAME", user_get_name (user));
      session_set_env (session, "HOME", user_get_home_directory (user));

Deleted: goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/patches/04_default-gtk-greeter-config.patch	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,29 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Author: Lionel Le Folgoc <mrpouit at gmail.com>
-Description: adapt GTK+ greeter config to Debian
-Especially:
-
-* use background from desktop-base
-* force the use of default GTK+ 3 theme (Adwaita)
-* use some hinting
-Index: lightdm-1.0.1/greeters/gtk/lightdm-gtk-greeter.conf
-===================================================================
---- lightdm-1.0.1.orig/greeters/gtk/lightdm-gtk-greeter.conf	2011-09-28 09:11:35.000000000 +0200
-+++ lightdm-1.0.1/greeters/gtk/lightdm-gtk-greeter.conf	2011-10-05 22:15:20.128559666 +0200
-@@ -8,11 +8,11 @@
- # xft-rgba = Type of subpixel antialiasing (none, rgb, bgr, vrgb or vbgr)
- #
- [greeter]
--#background=
-+background=/usr/share/images/desktop-base/desktop-background
- #show-language-selector=false
--#theme-name=
-+theme-name=Adwaita
- #font-name=
--#xft-antialias=
-+xft-antialias=true
- #xft-dpi=
--#xft-hintstyle=
--#xft-rgba=
-+xft-hintstyle=hintfull
-+xft-rgba=rgb

Modified: goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/patches/05_dont-add-pkglibexecdir-path.patch	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,9 +1,9 @@
 Author: Yves-Alexis Perez <corsac at debian.org>
 Description: don't add PKGLIBEXEC_DIR to the user PATH
-Index: lightdm-1.0.3/src/session.c
+Index: lightdm-1.1.1/src/session.c
 ===================================================================
---- lightdm-1.0.3.orig/src/session.c	2011-10-08 13:29:42.102575779 +0200
-+++ lightdm-1.0.3/src/session.c	2011-10-08 13:29:55.526679659 +0200
+--- lightdm-1.1.1.orig/src/session.c
++++ lightdm-1.1.1/src/session.c
 @@ -217,26 +217,6 @@
      }
  }
@@ -31,7 +31,7 @@
  gboolean
  session_start (Session *session)
  {
-@@ -436,7 +416,6 @@
+@@ -438,7 +418,6 @@
      pam_session_setup (session->priv->authentication);
      set_env_from_authentication (session, session->priv->authentication);
      set_locale (session);

Deleted: goodies/trunk/lightdm/debian/patches/06_move-progs-to-pkglibexecdir.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/06_move-progs-to-pkglibexecdir.patch	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/patches/06_move-progs-to-pkglibexecdir.patch	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,17 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Description: put programs in pkglibexecdir instead of libexecdir
-With debhelper 9, the package name is not added to libexecdir, so force the use of pkglibexecdir
-Bug: https://bugs.launchpad.net/lightdm/+bug/861371
-Index: lightdm-1.0.3/src/Makefile.am
-===================================================================
---- lightdm-1.0.3.orig/src/Makefile.am	2011-10-08 01:04:12.000000000 +0200
-+++ lightdm-1.0.3/src/Makefile.am	2011-10-08 13:31:00.779184624 +0200
-@@ -93,7 +93,7 @@
- 	$(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
- 

Deleted: goodies/trunk/lightdm/debian/patches/07_fix-test-missing-lightdm-session.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/07_fix-test-missing-lightdm-session.patch	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/patches/07_fix-test-missing-lightdm-session.patch	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,14 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Description: lightdm-session doesn't seem to be built by anything, so remove it
-frome targets or else lightdm FTBFS.
-Bug: https://bugs.launchpad.net/lightdm/+bug/916482
-Index: lightdm-1.1.0/tests/src/Makefile.am
-===================================================================
---- lightdm-1.1.0.orig/tests/src/Makefile.am	2012-01-14 13:30:41.415305420 +0100
-+++ lightdm-1.1.0/tests/src/Makefile.am	2012-01-14 13:30:50.579375996 +0100
-@@ -1,5 +1,4 @@
- noinst_PROGRAMS = test-runner X test-gobject-greeter test-session test-script-hook guest-account initctl plymouth
--noinst_SCRIPTS = lightdm-session
- lib_LTLIBRARIES = libsystem.la
- 
- libsystem_la_SOURCES = libsystem.c

Deleted: goodies/trunk/lightdm/debian/patches/08_CVE-2011-3153.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/08_CVE-2011-3153.patch	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/patches/08_CVE-2011-3153.patch	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,33 +0,0 @@
-Description: drop privileges before reading ~/.dmrc
-Author: Marc Deslauriers <marc.deslauriers at canonical.com>
-Origin: http://bazaar.launchpad.net/~lightdm-team/lightdm/trunk/revision/1299
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/lightdm/+bug/883865
-
-Index: lightdm-1.0.6/src/dmrc.c
-===================================================================
---- lightdm-1.0.6.orig/src/dmrc.c	2011-11-11 12:54:46.841116960 -0500
-+++ lightdm-1.0.6/src/dmrc.c	2011-11-11 12:58:38.877118919 -0500
-@@ -24,7 +24,7 @@
-     User *user;
-     GKeyFile *dmrc_file;
-     gchar *path;
--    gboolean have_dmrc;
-+    gboolean have_dmrc, drop_privileges;
- 
-     dmrc_file = g_key_file_new ();
- 
-@@ -38,7 +38,14 @@
-     /* Load from the user directory, if this fails (e.g. the user directory
-      * is not yet mounted) then load from the cache */
-     path = g_build_filename (user_get_home_directory (user), ".dmrc", NULL);
-+
-+    /* Guard against privilege escalation through symlinks, etc. */
-+    drop_privileges = geteuid () == 0;
-+    if (drop_privileges)
-+        privileges_drop (user);
-     have_dmrc = g_key_file_load_from_file (dmrc_file, path, G_KEY_FILE_KEEP_COMMENTS, NULL);
-+    if (drop_privileges)
-+        privileges_reclaim ();
-     g_free (path);
- 
-     /* If no ~/.dmrc, then load from the cache */  

Deleted: goodies/trunk/lightdm/debian/patches/09_add-gio-to-pkg-config.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/09_add-gio-to-pkg-config.patch	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/patches/09_add-gio-to-pkg-config.patch	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,15 +0,0 @@
-Author: Yves-Alexis Perez <corsac at debian.org>
-Description: Add gio-2.0 to linker flags of lightdm-gobject
-Bug: https://bugs.launchpad.net/lightdm/+bug/916477
-Index: lightdm-1.1.0/liblightdm-gobject/liblightdm-gobject-1.pc.in
-===================================================================
---- lightdm-1.1.0.orig/liblightdm-gobject/liblightdm-gobject-1.pc.in	2011-07-19 02:16:28.000000000 +0200
-+++ lightdm-1.1.0/liblightdm-gobject/liblightdm-gobject-1.pc.in	2012-01-14 14:32:57.788085233 +0100
-@@ -6,6 +6,6 @@
- Name: liblightdm-gobject
- Description: LightDM client library
- Version: @VERSION@
--Requires: glib-2.0 dbus-glib-1 libxklavier
-+Requires: gio-2.0 glib-2.0 dbus-glib-1 libxklavier 
- Libs: -L${libdir} -llightdm-gobject-1
- Cflags: -I${includedir}/lightdm-gobject-1

Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series	2012-01-14 21:10:02 UTC (rev 6327)
+++ goodies/trunk/lightdm/debian/patches/series	2012-01-17 20:46:58 UTC (rev 6328)
@@ -1,9 +1,4 @@
 01_set-default-path.patch
 02_default-config.patch
 03_quit-plymouth.patch
-04_default-gtk-greeter-config.patch
 05_dont-add-pkglibexecdir-path.patch
-06_move-progs-to-pkglibexecdir.patch
-07_fix-test-missing-lightdm-session.patch
-08_CVE-2011-3153.patch
-09_add-gio-to-pkg-config.patch

More information about the Pkg-xfce-commits mailing list