rpms/slim/F-7 slim.spec,1.3,1.4 slim-1.2.6-pam.patch,1.1,1.2
Anders F Björklund (afb)
fedora-extras-commits at redhat.com
Mon Sep 24 20:19:37 UTC 2007
Author: afb
Update of /cvs/pkgs/rpms/slim/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22353
Modified Files:
slim.spec slim-1.2.6-pam.patch
Log Message:
include another bugfix, while at it
Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- slim.spec 24 Sep 2007 19:52:58 -0000 1.3
+++ slim.spec 24 Sep 2007 20:19:04 -0000 1.4
@@ -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 @@
%changelog
+* Mon Sep 24 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-8
+- backport fix for segfault when calling XCloseDisplay(NULL);
+
* Mon Sep 24 2007 Anders F Bjorklund <afb at 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.
slim-1.2.6-pam.patch:
Index: slim-1.2.6-pam.patch
===================================================================
RCS file: /cvs/pkgs/rpms/slim/F-7/slim-1.2.6-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- slim-1.2.6-pam.patch 24 Sep 2007 19:52:58 -0000 1.1
+++ slim-1.2.6-pam.patch 24 Sep 2007 20:19:04 -0000 1.2
@@ -937,6 +937,26 @@
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
More information about the fedora-extras-commits
mailing list