rpms/kdelibs/F-8 kdelibs-3.5.10-proc.patch, NONE, 1.1 kdelibs.spec, 1.253, 1.254

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18800

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.10-proc.patch 
Log Message:
* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-2
- upstream patch to fix hang on login (for older kernels)


kdelibs-3.5.10-proc.patch:

--- NEW FILE kdelibs-3.5.10-proc.patch ---
diff -up kdelibs-3.5.10/kinit/start_kdeinit.c.proc kdelibs-3.5.10/kinit/start_kdeinit.c
--- kdelibs-3.5.10/kinit/start_kdeinit.c.proc	2008-08-19 13:18:12.000000000 -0500
+++ kdelibs-3.5.10/kinit/start_kdeinit.c	2008-11-20 15:54:54.000000000 -0600
@@ -44,7 +44,7 @@ static int set_protection( pid_t pid, in
 {
    char buf[ 1024 ];
    int procfile;
-   sprintf( buf, "/proc/%d/oom_adj", pid );
+   sprintf( buf, "/proc/%d/stat", pid );
    if( !enable ) {
        /* Be paranoid and check that the pid we got from the pipe
           belongs to this user. */
@@ -52,6 +52,7 @@ static int set_protection( pid_t pid, in
        if( lstat( buf, &st ) < 0 || st.st_uid != getuid())
            return 0;
    }
+   sprintf( buf, "/proc/%d/oom_adj", pid );
    procfile = open( buf, O_WRONLY );
    if( procfile >= 0 ) {
       if( enable )


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/F-8/kdelibs.spec,v
retrieving revision 1.253
retrieving revision 1.254
diff -u -r1.253 -r1.254
--- kdelibs.spec	2 Sep 2008 17:17:04 -0000	1.253
+++ kdelibs.spec	20 Nov 2008 21:58:30 -0000	1.254
@@ -36,7 +36,7 @@
 
 Summary: K Desktop Environment 3 - Libraries
 Version: 3.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs3
@@ -93,6 +93,8 @@
 Patch100: kdelibs-3.5.5-kstandarddirs.patch
 # http://bugs.kde.org/93359, alternative to export libltdl_cv_shlibext=".so" hack.
 Patch101: kde-3.5-libtool-shlibext.patch
+# fix for old kernels, prevents hang on login
+Patch102: kdelibs-3.5.10-proc.patch
 # kget ignores simultaneous download limit (kde #101956)
 Patch103: kdelibs-3.5.0-101956.patch
 
@@ -273,6 +275,7 @@
 %patch101 -p1 -b .libtool-shlibext
 
 # upstream patches
+%patch102 -p1 -b .proc
 
 sed -i -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
@@ -625,6 +628,9 @@
 
 
 %changelog
+* Thu Nov 20 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-2
+- upstream patch to fix hang on login (for older kernels)
+
 * Tue Aug 26 2008 Rex Dieter <rdieter at fedoraproject.org> 3.5.10-1
 - kde-3.5.10