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

Yves-Alexis Perez corsac at alioth.debian.org
Fri Mar 2 10:32:14 UTC 2012


Author: corsac
Date: 2012-03-02 10:32:13 +0000 (Fri, 02 Mar 2012)
New Revision: 6460

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/series
   goodies/trunk/lightdm/debian/watch
Log:
  - 05_dont-add-pkglibexecdir-path dropped.
  - update debhelper build-dep to 9 for compat mode v9.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2012-02-26 06:28:55 UTC (rev 6459)
+++ goodies/trunk/lightdm/debian/changelog	2012-03-02 10:32:13 UTC (rev 6460)
@@ -1,4 +1,4 @@
-lightdm (1.1.3-1) UNRELEASED; urgency=low
+lightdm (1.1.4-1) UNRELEASED; urgency=low
 
   [ Yves-Alexis Perez ]
   * New upstream development release.
@@ -18,7 +18,7 @@
     - 01_set-default-path refreshed.
     - 04_default-gtk-greeter-config dropped since lightm-gtk-greeter has been
       moved to standalone package.
-    - 05_dont-add-pkglibexecdir-path refreshed.
+    - 05_dont-add-pkglibexecdir-path dropped.
     - 06_move-progs-to-pkglibexecdir dropped, included upstream.
     - 07_CVE-2011-4105 dropped, code doesn't exist anymore.
     - 08_CVE-2011-3153 dropped, included upstream.
@@ -136,7 +136,7 @@
   * debian/control:
     - added build-deb on dpkg-dev (>= 1.16.1) for hardening support.
     - dropped hardening-includes from build-depends, now superseded
-    - update debhelper build-dep to 8.9.4 for compat mode v9.
+    - update debhelper build-dep to 9 for compat mode v9.
     - add Pre-Depends: ${misc:Pre-Depends} to the lib packages.
     - add Recommends: on gnome-icon-theme to gtk greeter.       closes: #643291
   * debian/liblightdm-gobject-1-0.install,

Modified: goodies/trunk/lightdm/debian/control
===================================================================
--- goodies/trunk/lightdm/debian/control	2012-02-26 06:28:55 UTC (rev 6459)
+++ goodies/trunk/lightdm/debian/control	2012-03-02 10:32:13 UTC (rev 6460)
@@ -5,7 +5,7 @@
 Uploaders: Evgeni Golov <evgeni at debian.org>, 
  Yves-Alexis Perez <corsac at debian.org>, Emanuele Rocca <ema at debian.org>, 
  Simon Huggins <huggie at earth.li>          
-Build-Depends: debhelper (>= 8.9.4), intltool, pkg-config, libglib2.0-dev, 
+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),

Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2012-02-26 06:28:55 UTC (rev 6459)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2012-03-02 10:32:13 UTC (rev 6460)
@@ -2,19 +2,35 @@
 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.1/src/session.c
+Index: lightdm-1.1.4/src/seat.c
 ===================================================================
---- 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, "LOGNAME", user_get_name (user));
-     session_set_env (session, "HOME", user_get_home_directory (user));
+--- lightdm-1.1.4.orig/src/seat.c	2012-03-01 08:05:25.960438014 +0100
++++ lightdm-1.1.4/src/seat.c	2012-03-01 08:05:50.092580678 +0100
+@@ -257,7 +257,10 @@
+         process_set_env (script, "PATH", g_getenv ("PATH"));
+     }
+     else
+-        process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin");
++        if (user_get_uid (user) == 0)
++          process_set_env (script, "PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
++        else
++          process_set_env (script, "PATH", "/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
+ 
+     if (user)
+     {
+Index: lightdm-1.1.4/src/session-child.c
+===================================================================
+--- lightdm-1.1.4.orig/src/session-child.c	2012-03-01 08:05:25.984438155 +0100
++++ lightdm-1.1.4/src/session-child.c	2012-03-01 08:06:03.660660891 +0100
+@@ -290,7 +290,10 @@
+         else
+         {
+             /* Set POSIX variables */
+-            pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin");
++            if (user_get_uid (user) == 0)
++              pam_putenv (pam_handle, "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin");
++            else
++              pam_putenv (pam_handle, "PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/games:/usr/games");
+             pam_putenv (pam_handle, g_strdup_printf ("USER=%s", username));
+             pam_putenv (pam_handle, g_strdup_printf ("LOGNAME=%s", username));
+             pam_putenv (pam_handle, g_strdup_printf ("HOME=%s", user_get_home_directory (user)));

Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series	2012-02-26 06:28:55 UTC (rev 6459)
+++ goodies/trunk/lightdm/debian/patches/series	2012-03-02 10:32:13 UTC (rev 6460)
@@ -1,4 +1,3 @@
 01_set-default-path.patch
 02_default-config.patch
 03_quit-plymouth.patch
-05_dont-add-pkglibexecdir-path.patch

Modified: goodies/trunk/lightdm/debian/watch
===================================================================
--- goodies/trunk/lightdm/debian/watch	2012-02-26 06:28:55 UTC (rev 6459)
+++ goodies/trunk/lightdm/debian/watch	2012-03-02 10:32:13 UTC (rev 6460)
@@ -1,3 +1,3 @@
 version=3
 https://launchpad.net/lightdm/+download \
-http://launchpad.net/lightdm/.*/lightdm-(\d\.\d\.\d)\.tar\.(?:gz|bz2)
+https://launchpad.net/lightdm/.*/lightdm-(\d\.\d\.\d)\.tar\.(?:gz|bz2)




More information about the Pkg-xfce-commits mailing list