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

Yves-Alexis Perez corsac at alioth.debian.org
Sat Jan 14 12:24:46 UTC 2012


Author: corsac
Date: 2012-01-14 12:24:45 +0000 (Sat, 14 Jan 2012)
New Revision: 6317

Removed:
   goodies/trunk/lightdm/debian/patches/07_CVE-2011-4105.patch
Modified:
   goodies/trunk/lightdm/debian/changelog
   goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
   goodies/trunk/lightdm/debian/patches/06_move-progs-to-pkglibexecdir.patch
   goodies/trunk/lightdm/debian/patches/series
   goodies/trunk/lightdm/debian/watch
Log:
* New upstream release.
* debian/patches:
  - 01_set-default-path refreshed.
  - 06_move-progs-to-pkglibexecdir refreshed, only needed for
    lightdm-guest-session-wrapper now
  - 07_CVE-2011-4105 dropped, code doesn't exist anymore.

Modified: goodies/trunk/lightdm/debian/changelog
===================================================================
--- goodies/trunk/lightdm/debian/changelog	2012-01-14 12:22:22 UTC (rev 6316)
+++ goodies/trunk/lightdm/debian/changelog	2012-01-14 12:24:45 UTC (rev 6317)
@@ -1,5 +1,6 @@
-lightdm (1.0.6-4) UNRELEASED; urgency=low
+lightdm (1.1.0-1) UNRELEASED; urgency=low
 
+  * New upstream release.
   * debian/po:
     - da.po updated, thanks to “Joe Dalton”.                    closes: #650946
   * debian/control:
@@ -7,8 +8,13 @@
     - liblightdm-gobject-dev requires libdbus-glib-1-dev and libxklavier-dev
       so add dependencies.
   * 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
+    - 07_CVE-2011-4105 dropped, code doesn't exist anymore.
 
- -- Yves-Alexis Perez <corsac at debian.org>  Sun, 04 Dec 2011 15:07:43 +0100
+ -- Yves-Alexis Perez <corsac at debian.org>  Sat, 14 Jan 2012 12:55:03 +0100
 
 lightdm (1.0.6-3) unstable; urgency=low
 

Modified: goodies/trunk/lightdm/debian/patches/01_set-default-path.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2012-01-14 12:22:22 UTC (rev 6316)
+++ goodies/trunk/lightdm/debian/patches/01_set-default-path.patch	2012-01-14 12:24:45 UTC (rev 6317)
@@ -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.0.4/src/session.c
+Index: lightdm-1.1.0/src/session.c
 ===================================================================
---- lightdm-1.0.4.orig/src/session.c	2011-10-25 16:42:33.000000000 +0200
-+++ lightdm-1.0.4/src/session.c	2011-10-25 23:29:10.621918357 +0200
-@@ -251,7 +251,10 @@
+--- 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");
+ 
      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, "USERNAME", user_get_name (user)); // FIXME: Is this required?
      session_set_env (session, "HOME", user_get_home_directory (user));

Modified: 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 12:22:22 UTC (rev 6316)
+++ goodies/trunk/lightdm/debian/patches/06_move-progs-to-pkglibexecdir.patch	2012-01-14 12:24:45 UTC (rev 6317)
@@ -1,14 +1,3 @@
-Index: lightdm-1.0.3/utils/Makefile.am
-===================================================================
---- lightdm-1.0.3.orig/utils/Makefile.am	2011-10-06 03:16:14.000000000 +0200
-+++ lightdm-1.0.3/utils/Makefile.am	2011-10-08 13:30:03.382740381 +0200
-@@ -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 = \
 Index: lightdm-1.0.3/src/Makefile.am
 ===================================================================
 --- lightdm-1.0.3.orig/src/Makefile.am	2011-10-08 01:04:12.000000000 +0200

Deleted: goodies/trunk/lightdm/debian/patches/07_CVE-2011-4105.patch
===================================================================
--- goodies/trunk/lightdm/debian/patches/07_CVE-2011-4105.patch	2012-01-14 12:22:22 UTC (rev 6316)
+++ goodies/trunk/lightdm/debian/patches/07_CVE-2011-4105.patch	2012-01-14 12:24:45 UTC (rev 6317)
@@ -1,56 +0,0 @@
-Description: ensure we don't chown links
-Author: Marc Deslauriers <marc.deslauriers at canonical.com>
-
-Index: lightdm-1.0.6/src/xsession.c
-===================================================================
---- lightdm-1.0.6.orig/src/xsession.c	2011-11-25 07:22:24.509683804 +0100
-+++ lightdm-1.0.6/src/xsession.c	2011-11-25 07:22:47.773863861 +0100
-@@ -9,6 +9,7 @@
-  * license.
-  */
- 
-+#include <config.h>
- #include <errno.h>
- #include <string.h>
- #include <fcntl.h>
-@@ -104,10 +105,26 @@
-              * incorrectly written as root in a buggy version of LightDM */
-             if (getuid () == 0)
-             {
-+                int fd = -1;
-                 int result;
--                result = lchown (path, user_get_uid (session_get_user (session)), user_get_gid (session_get_user (session)));
-+                struct stat st_buf;
-+
-+                fd = open (path, O_RDONLY|O_NOFOLLOW);
-+                if (fd == -1)
-+                    goto out;
-+
-+                if (fstat (fd, &st_buf) != 0)
-+                    goto out;
-+
-+                if ((!S_ISREG (st_buf.st_mode)) || (st_buf.st_nlink > 1))
-+                    goto out;
-+
-+                result = fchown (fd, user_get_uid (session_get_user (session)), user_get_gid (session_get_user (session)));
-                 if (result < 0 && errno != ENOENT)
--                    g_warning ("Failed to correct ownership of %s: %s", path, strerror (errno));                
-+                    g_warning ("Failed to correct ownership of %s: %s", path, strerror (errno));
-+out:
-+                if (fd > 0)
-+                    close(fd);
-             }
-         }
- 
-Index: lightdm-1.0.6/configure.ac
-===================================================================
---- lightdm-1.0.6.orig/configure.ac	2011-11-25 07:22:24.525683929 +0100
-+++ lightdm-1.0.6/configure.ac	2011-11-25 07:22:27.489706870 +0100
-@@ -1,6 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
- 
- AC_INIT(lightdm, 1.0.6)
-+AC_USE_SYSTEM_EXTENSIONS
- AC_CONFIG_MACRO_DIR(m4)
- AC_CONFIG_HEADER(config.h)
- AM_INIT_AUTOMAKE

Modified: goodies/trunk/lightdm/debian/patches/series
===================================================================
--- goodies/trunk/lightdm/debian/patches/series	2012-01-14 12:22:22 UTC (rev 6316)
+++ goodies/trunk/lightdm/debian/patches/series	2012-01-14 12:24:45 UTC (rev 6317)
@@ -4,5 +4,4 @@
 04_default-gtk-greeter-config.patch
 05_dont-add-pkglibexecdir-path.patch
 06_move-progs-to-pkglibexecdir.patch
-07_CVE-2011-4105.patch
 08_CVE-2011-3153.patch

Modified: goodies/trunk/lightdm/debian/watch
===================================================================
--- goodies/trunk/lightdm/debian/watch	2012-01-14 12:22:22 UTC (rev 6316)
+++ goodies/trunk/lightdm/debian/watch	2012-01-14 12:24:45 UTC (rev 6317)
@@ -1,3 +1,3 @@
 version=3
 https://launchpad.net/lightdm/+download \
-http://launchpad.net/lightdm/.*/lightdm-(\d\.[02468]\.\d)\.tar\.(?:gz|bz2)
+http://launchpad.net/lightdm/.*/lightdm-(\d\.\d\.\d)\.tar\.(?:gz|bz2)




More information about the Pkg-xfce-commits mailing list