diff --git a/u_xdm-sig11-bug-598422.diff b/u_xdm-sig11-bug-598422.diff deleted file mode 100644 index b0c343f..0000000 --- a/u_xdm-sig11-bug-598422.diff +++ /dev/null @@ -1,95 +0,0 @@ -Index: xdm-1.1.10/dm.h -=================================================================== ---- xdm-1.1.10.orig/dm.h -+++ xdm-1.1.10/dm.h -@@ -434,6 +434,7 @@ extern void DeleteXloginResources (struc - extern void LoadXloginResources (struct display *d); - extern void ManageSession (struct display *d); - extern void SecureDisplay (struct display *d, Display *dpy); -+extern void PamCloseSession(void); - extern void SessionExit (struct display *d, int status, int removeAuth); - extern void SessionPingFailed (struct display *d); - extern void SetupDisplay (struct display *d); -Index: xdm-1.1.10/session.c -=================================================================== ---- xdm-1.1.10.orig/session.c -+++ xdm-1.1.10/session.c -@@ -290,6 +290,8 @@ SessionPingFailed (struct display *d) - AbortClient (clientPid); - source (verify.systemEnviron, d->reset); - } -+ -+ PamCloseSession(); - SessionExit (d, RESERVER_DISPLAY, TRUE); - } - -@@ -417,6 +419,7 @@ ManageSession (struct display *d) - */ - Debug ("Source reset program %s\n", d->reset); - source (verify.systemEnviron, d->reset); -+ PamCloseSession(); - SessionExit (d, OBEYSESS_DISPLAY, TRUE); - } - -@@ -480,6 +483,7 @@ SecureDisplay (struct display *d, Displa - if (Setjmp (syncJump)) { - LogError ("WARNING: display %s could not be secured\n", - d->name); -+ PamCloseSession(); - SessionExit (d, RESERVER_DISPLAY, FALSE); - } - (void) alarm ((unsigned) d->grabTimeout); -@@ -491,6 +495,7 @@ SecureDisplay (struct display *d, Displa - (void) Signal (SIGALRM, SIG_DFL); - LogError ("WARNING: keyboard on display %s could not be secured\n", - d->name); -+ PamCloseSession(); - SessionExit (d, RESERVER_DISPLAY, FALSE); - } - Debug ("XGrabKeyboard succeeded %s\n", d->name); -@@ -516,7 +521,6 @@ UnsecureDisplay (struct display *d, Disp - - void --SessionExit (struct display *d, int status, int removeAuth) --{ -+PamCloseSession(void) { - #ifdef USE_PAM - pam_handle_t *pamh = thepamh(); - -@@ -530,4 +534,8 @@ SessionExit (struct display *d, int stat -+} - -+void -+SessionExit (struct display *d, int status, int removeAuth) -+{ - /* make sure the server gets reset after the session is over */ - if (d->serverPid >= 2 && d->resetSignal) - kill (d->serverPid, d->resetSignal); -Index: xdm-1.1.10/greeter/greet.c -=================================================================== ---- xdm-1.1.10.orig/greeter/greet.c -+++ xdm-1.1.10/greeter/greet.c -@@ -582,6 +582,7 @@ greet_user_rtn GreetUser( - pam_done: - if (code != 0) - { -+ PamCloseSession(); - CloseGreet (d); - SessionExit (d, code, FALSE); - } -@@ -610,6 +611,7 @@ greet_user_rtn GreetUser( - code = Greet (d, greet); - if (code != 0) - { -+ PamCloseSession(); - CloseGreet (d); - SessionExit (d, code, FALSE); - } -@@ -632,6 +634,7 @@ greet_user_rtn GreetUser( - { - Debug ("Startup program %s exited with non-zero status\n", - d->startup); -+ PamCloseSession(); - SessionExit (d, OBEYSESS_DISPLAY, FALSE); - } - /* diff --git a/xdm.changes b/xdm.changes index 73e7573..b1c82da 100644 --- a/xdm.changes +++ b/xdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 2 11:08:39 UTC 2013 - sndirsch@suse.com + +- removed u_xdm-sig11-bug-598422.diff + * problem has been resolved differently + ------------------------------------------------------------------- Fri Oct 18 09:34:08 CEST 2013 - ferenc.gm@gmail.com diff --git a/xdm.spec b/xdm.spec index 194c463..eecfdfd 100644 --- a/xdm.spec +++ b/xdm.spec @@ -48,7 +48,6 @@ Patch1: xdm-tolerant-hostname-changes.diff Patch2: U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch Patch3: U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch Patch4: U_xdm_Fix-missing-linking-dependency-on-ldl.patch -Patch5: u_xdm-sig11-bug-598422.diff %if 0%{?suse_version} >= 01140 # Needed to create the man page symlink to init.d BuildRequires: aaa_base-extras @@ -96,7 +95,6 @@ cp %{SOURCE2} . %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 # needed for patch0, patch2, patch3, patch4 autoreconf -fi