From b7bf63dd53d49aec60ff2afe058280b13d491a39 Mon Sep 17 00:00:00 2001
From: corsac <corsac@0c9b3bff-18ee-0310-b944-d1aa2700132f>
Date: Fri, 25 Nov 2011 07:02:55 +0000
Subject: [PATCH] * debian/patches:   - 07_CVE-2011-4105 refreshed, use
 AC_USE_SYSTEM_EXTENSIONS in configure.ac     so GNU extensions are used even
 on kFreeBSD.              closes: #649633

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@6234 0c9b3bff-18ee-0310-b944-d1aa2700132f
---
 debian/changelog                      |  8 ++++++++
 debian/patches/07_CVE-2011-4105.patch | 26 +++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12868e4..cf8cc64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lightdm (1.0.6-3) UNRELEASED; urgency=low
+
+  * debian/patches:
+    - 07_CVE-2011-4105 refreshed, use AC_USE_SYSTEM_EXTENSIONS in configure.ac
+      so GNU extensions are used even on kFreeBSD.              closes: #649633
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 23 Nov 2011 22:10:59 +0100
+
 lightdm (1.0.6-2) unstable; urgency=high
 
   * urgency=high for security fixes.
diff --git a/debian/patches/07_CVE-2011-4105.patch b/debian/patches/07_CVE-2011-4105.patch
index 57ccc98..7efe435 100644
--- a/debian/patches/07_CVE-2011-4105.patch
+++ b/debian/patches/07_CVE-2011-4105.patch
@@ -3,9 +3,17 @@ Author: Marc Deslauriers <marc.deslauriers@canonical.com>
 
 Index: lightdm-1.0.6/src/xsession.c
 ===================================================================
---- lightdm-1.0.6.orig/src/xsession.c	2011-11-02 11:21:29.000000000 -0400
-+++ lightdm-1.0.6/src/xsession.c	2011-11-11 12:54:17.245116709 -0500
-@@ -104,10 +104,26 @@
+--- 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)
              {
@@ -34,3 +42,15 @@ Index: lightdm-1.0.6/src/xsession.c
              }
          }
  
+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
-- 
2.39.2