[SM-Commit] GIT changes to stable-0.4 grimoire by Jaka Kranjc (bffdcfafff605dd7f8ed7bc7ad16da72ede987ea)

Jaka Kranjc scm at mail.sourcemage.org
Mon Jan 1 16:01:17 EST 2007


GIT changes to stable-0.4 grimoire by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 kde-core/kdebase/DETAILS                     |    2 +-
 kde-core/kdebase/HISTORY                     |    6 ++++++
 kde-core/kdebase/PRE_BUILD                   |    5 +++++
 kde-core/kdebase/post-3.5.0-kdebase-kdm.diff |   19 +++++++++++++++++++
 4 files changed, 31 insertions(+), 1 deletion(-)

New commits:
commit bffdcfafff605dd7f8ed7bc7ad16da72ede987ea
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    kdebase - security update CVE-2006-2449
    
    Conflicts:
    
    	kde-core/kdebase/HISTORY
    	kde-core/kdebase/PRE_BUILD

diff --git a/kde-core/kdebase/DETAILS b/kde-core/kdebase/DETAILS
index 4bf7f62..1ca01d9 100755
--- a/kde-core/kdebase/DETAILS
+++ b/kde-core/kdebase/DETAILS
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
        BUILD_API=2
         WEB_SITE=http://www.kde.org
          ENTERED=20010912
-         UPDATED=20051202
+  SECURITY_PATCH=1
       PATCHLEVEL=1
       LICENSE[0]=GPL
            SHORT="Base applications that form the core of KDE."
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index 5b2c7d8..267fec7 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,9 @@
+2006-06-14 Treeve Jelbert <treeve01 at pi.be>
+	* DETAILS: SECURITY_PATCH
+	* PRE_BUILD, post-3.5.0-kdebase-kdm.diff: add
+	  see <http://www.kde.org/info/security/advisory-20060614-1.txt>
+	  CVE-2006-2449
+
 2006-02-01 Treeve Jelbert <treeve01 at pi.be>
 	* DETAILS: version 3.5.1
 
diff --git a/kde-core/kdebase/PRE_BUILD b/kde-core/kdebase/PRE_BUILD
new file mode 100755
index 0000000..3d9dafc
--- /dev/null
+++ b/kde-core/kdebase/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build          &&
+cd $SOURCE_DIRECTORY      &&
+# security patch
+patch  -p0 < $SPELL_DIRECTORY/post-3.5.0-kdebase-kdm.diff
+
diff --git a/kde-core/kdebase/post-3.5.0-kdebase-kdm.diff b/kde-core/kdebase/post-3.5.0-kdebase-kdm.diff
new file mode 100644
index 0000000..b411d91
--- /dev/null
+++ b/kde-core/kdebase/post-3.5.0-kdebase-kdm.diff
@@ -0,0 +1,19 @@
+--- kdm/backend/client.c	(revision 547560)
++++ kdm/backend/client.c	(working copy)
+@@ -1537,16 +1542,6 @@ ReadDmrc()
+ 
+ 	if (!StrApp( &fname, p->pw_dir, "/.dmrc", (char *)0 ))
+ 		return GE_Error;
+-	if ((curdmrc = iniLoad( fname ))) {
+-		free( fname );
+-		return GE_Ok;
+-	}
+-
+-	if (errno != EACCES) {
+-		free( fname );
+-		return GE_NoFile;
+-	}
+-
+ 	if (pipe( pfd ))
+ 		return GE_Error;
+ 	if ((pid = Fork()) < 0) {



More information about the SM-Commit mailing list