From c17dbf1d43b97eae1e39f0643ad46706e83e80d8 Mon Sep 17 00:00:00 2001
From: afb <afb@fedoraproject.org>
Date: Sep 24 2007 20:19:04 +0000
Subject: include another bugfix, while at it


---

diff --git a/slim-1.2.6-pam.patch b/slim-1.2.6-pam.patch
index 68e7e8e..23d7116 100644
--- a/slim-1.2.6-pam.patch
+++ b/slim-1.2.6-pam.patch
@@ -937,6 +937,26 @@ diff -uNbr --exclude=.svn release-1.2.6/app.cpp slim-pam/app.cpp
          StopServer(); 
          RemoveLock();
          Run();
+diff -ur slim-pam/app.cpp slim-1.3.0/app.cpp
+--- slim-pam/app.cpp	2007-06-07 04:18:21.000000000 +0200
++++ slim-1.3.0/app.cpp	2007-07-15 16:09:28.000000000 +0200
+@@ -135,6 +135,7 @@
+     ServerPID = -1;
+     testing = false;
+     mcookie = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
++    Dpy = NULL;
+ 
+     // Parse command line
+     while((tmp = getopt(argc, argv, "vhp:d?")) != EOF) {
+@@ -930,7 +931,7 @@
+ 
+     // Catch X error
+     XSetIOErrorHandler(IgnoreXIO);
+-    if(!setjmp(CloseEnv))
++    if(!setjmp(CloseEnv) && Dpy)
+         XCloseDisplay(Dpy);
+ 
+     // Send HUP to process group
 diff -uNbr --exclude=.svn release-1.2.6/app.h slim-pam/app.h
 --- release-1.2.6/app.h	2006-09-10 12:05:34.000000000 +0200
 +++ slim-pam/app.h	2007-05-19 21:26:29.000000000 +0200
diff --git a/slim.spec b/slim.spec
index 87f4e50..845cda4 100644
--- a/slim.spec
+++ b/slim.spec
@@ -1,6 +1,6 @@
 Name:           slim
 Version:        1.2.6
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -98,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Sep 24 2007 Anders F Bjorklund <afb@users.sourceforge.net> 1.2.6-8
+- backport fix for segfault when calling XCloseDisplay(NULL);
+
 * Mon Sep 24 2007 Anders F Bjorklund <afb@users.sourceforge.net> 1.2.6-7
 - backport PAM support from "slim-pam" branch, USE_PAM=1
 - backport fix for segfault on exit when testing themes.