rpms/kdelibs/devel kdelibs-3.5.3-khtml-regression.patch, NONE, 1.1 kdelibs-3.5.3-konqueror-khtml.patch, NONE, 1.1 kdelibs-3.5.3.diff, NONE, 1.1 kdelibs.spec, 1.146, 1.147

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdelibs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6525

Modified Files:
	kdelibs.spec 
Added Files:
	kdelibs-3.5.3-khtml-regression.patch 
	kdelibs-3.5.3-konqueror-khtml.patch kdelibs-3.5.3.diff 
Log Message:
apply upstream patches


kdelibs-3.5.3-khtml-regression.patch:
 htmltokenizer.cpp |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE kdelibs-3.5.3-khtml-regression.patch ---
--- kdelibs-3.5.3/khtml/html/htmltokenizer.cpp.orig	2006-06-24 15:12:38.000000000 +0200
+++ kdelibs-3.5.3/khtml/html/htmltokenizer.cpp	2006-06-24 15:14:08.000000000 +0200
@@ -388,9 +388,10 @@
 
     // Scripts following a frameset element should not be executed or even loaded in the case of extern scripts.
     bool followingFrameset = (parser->doc()->body() && parser->doc()->body()->id() == ID_FRAMESET);
+    bool effectiveScript = !parser->skipMode() && !followingFrameset; 
     bool deferredScript = false;
 
-    if ( !parser->skipMode() && !followingFrameset) {
+    if ( effectiveScript ) { 
         CachedScript* cs = 0;
 
         // forget what we just got, load from src url instead
@@ -419,7 +420,7 @@
     script = false;
     scriptCodeSize = scriptCodeResync = 0;
 
-    if (parser->skipMode() || followingFrameset)
+    if ( !effectiveScript )
         return;
 
     if ( !m_executingScript && cachedScript.isEmpty() ) {

kdelibs-3.5.3-konqueror-khtml.patch:
 dom_stringimpl.cpp |    5 +++++
 1 files changed, 5 insertions(+)

--- NEW FILE kdelibs-3.5.3-konqueror-khtml.patch ---
--- kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp.orig	2006-06-14 11:47:06.000000000 +0200
+++ kdelibs-3.5.3/khtml/xml/dom_stringimpl.cpp	2006-06-14 11:49:01.000000000 +0200
@@ -308,6 +308,11 @@
     str = str.simplifyWhiteSpace();
 
     len = str.contains(',') + 1;
+
+    // If we have no commas, we have no array. 
+    if( len == 1 ) 
+        return 0L; 
+ 
     khtml::Length* r = new khtml::Length[len];
 
     int i = 0;

kdelibs-3.5.3.diff:
 kcrash.cpp   |    7 +++++--
 kprocess.cpp |    5 ++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

--- NEW FILE kdelibs-3.5.3.diff ---
Patch102: kdelibs-3.5.3.diff
------------------------------------------------------------------------
r549079 | mueller | 2006-06-07 13:18:16 +0200 (Wed, 07 Jun 2006) | 2 lines

add safety checks for set*uid return values

------------------------------------------------------------------------
Index: kdecore/kprocess.cpp
===================================================================
--- kdecore/kprocess.cpp	(revision 549078)
+++ kdecore/kprocess.cpp	(revision 549079)
@@ -387,7 +387,10 @@ bool KProcess::start(RunMode runmode, Co
            if (pw)
               initgroups(pw->pw_name, pw->pw_gid);
 #endif
-           setuid(getuid());
+	   if (geteuid() != getuid())
+	       setuid(getuid());
+	   if (geteuid() != getuid())
+	       _exit(1);
         }
 
         setupEnvironment();
Index: kdecore/kcrash.cpp

===================================================================
--- kdecore/kcrash.cpp	(revision 549078)
+++ kdecore/kcrash.cpp	(revision 549079)
 com
iapply upstream patches
  kdlel	.s	
  pid_t pid = fork();
   - apply upstream patches
if (pid <= 0)
   {
-    setgid(getgid());
-    setuid(getuid());
+    if(!geteuid() && setgid(getgid()) < 0)
+      _exit(253);
+    if(!geteuid() && setuid(getuid()) < 0)
+      _exit(253);
     execvp("drkonqi", const_cast< char** >( argv ));
+    _exit(errno);
   }
   else
   {ireturn-check


Index: kdelibs.spec
===================================================================
RCS file: /cvs/dist/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- kdelibs.spec	24 Jun 2006 07:57:03 -0000	1.146
+++ kdelibs.spec	24 Jun 2006 13:47:58 -0000	1.147
@@ -50,6 +50,11 @@
 Patch37: kdelibs-3.5.2-kdebug-kmail-quiet.patch
 Patch38: kdelibs-3.5.2-cupsdconf2-group.patch
 
+# upstream patches
+Patch100: kdelibs-3.5.3-konqueror-khtml.patch
+Patch101: kdelibs-3.5.3-khtml-regression.patch
+Patch102: kdelibs-3.5.3.diff
+
 %if %{arts}
 Requires: arts >= %{arts_epoch}:%{arts_version}
 %endif
@@ -177,10 +182,16 @@
 %patch37 -p1 -b .kdebug-kmail-quiet
 %patch38 -p1 -b .cupsdconf2-group
 
+# upstream patches
+%patch100 -p1 -b .konqueror-khtml
+%patch101 -p1 -b .khtml-regression
+%patch102 -p0 -b .return-check
+
 perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} %{distname}\"," kdecore/kdeversion.h
 
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
+
 export QTDOC=%{qtdocdir}
 export libltdl_cv_shlibext=".so"
 export PATH=/usr/kerberos/bin:${PATH}
@@ -403,6 +414,7 @@
 * Sat Jun 24 2006 Than Ngo <than at redhat.com> 6:3.5.3-5
 - fix #196013, mark kde.sh/kde.csh as config file
 - fix #178323 #196225, typo in kde.sh
+- apply upstream patches
 
 * Thu Jun 08 2006 Than Ngo <than at redhat.com> 6:3.5.3-4
 - enable --enable-new-ldflags again since ld bug fixed