[SM-Commit] GIT changes to master grimoire by Vlad Glagolev (ab75567f521ef45b4c8a4808c70a83ad41de44f2)

Vlad Glagolev scm at sourcemage.org
Tue Mar 13 07:14:09 EDT 2012


GIT changes to master grimoire by Vlad Glagolev <stealth at sourcemage.org>:

 collab/openldap/DETAILS                                       |    8 +++----
 collab/openldap/HISTORY                                       |    4 +++
 kernels/linux/HISTORY                                         |    3 ++
 kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24 |    5 ++++
 libs/libxslt/DETAILS                                          |    4 +--
 libs/libxslt/HISTORY                                          |    5 ++++
 libs/libxslt/PRE_BUILD                                        |    4 +++
 libs/libxslt/pattern.patch                                    |   11 ++++++++++
 8 files changed, 38 insertions(+), 6 deletions(-)

New commits:
commit ab75567f521ef45b4c8a4808c70a83ad41de44f2
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    libxslt: security update

commit 0abf61e24714fada600ffebe8b312a575e0413ce
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    linux: => 3.0.24 (lts)

commit c0ae79bd2189acd1d203f16b3ec134af825f85bb
Author: Vlad Glagolev <stealth at sourcemage.org>
Commit: Vlad Glagolev <stealth at sourcemage.org>

    openldap: => 2.4.30 (stable) [security]

diff --git a/collab/openldap/DETAILS b/collab/openldap/DETAILS
index 894dc7e..e26f484 100755
--- a/collab/openldap/DETAILS
+++ b/collab/openldap/DETAILS
@@ -1,9 +1,9 @@
            SPELL=openldap
 if [[ $OPENLDAP_BRANCH == stable ]]; then
-         VERSION=2.4.23
-        XVERSION=20100719
+         VERSION=2.4.30
+        XVERSION=20120311
           SOURCE=$SPELL-stable-$XVERSION.tgz
-     SOURCE_HASH=sha512:cca9c32ab319cbe6fb851c0244a25d9e372f34f780a939b75cfe35fb77995918669b7d4e815bb7a7941a844f5b55b886caccc769180bfe87b20d66e4441008e2
+     SOURCE_HASH=sha512:89f032b069dc54cfe0c3149b85c5fedaf89b6b706c368da22852fed51c2574cb703823db1f4c52a9422d5274d4e70497f270fd558985675ab274d6025678c6f3
 else
          VERSION=2.4.30
           SOURCE=$SPELL-$VERSION.tgz
@@ -18,7 +18,7 @@ SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
          ENTERED=20010922
       LICENSE[0]=http://www.openldap.org/software/release/license.html
         KEYWORDS="ldap collab"
-  SECURITY_PATCH=1
+  SECURITY_PATCH=2
            SHORT="fully featured open source LDAP software suite"
 cat << EOF
 The OpenLDAP Project is a collaborative effort to provide a robust,
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index 3df7cd5..3581166 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,3 +1,7 @@
+2012-03-13 Vlad Glagolev <stealth at sourcemage.org>
+	* DETAILS: updated spell to 2.4.30 (stable); 2.4.30 was a security update
+	  (CVE-2012-1164) => SECURITY_PATCH++
+
 2012-03-01 Arjan Bouter <abouter at sourcemage.org>
 	* DEPENDS: ldbm support was removed upstream,
 	  allow shell backend, added comments on several backends,
diff --git a/kernels/linux/HISTORY b/kernels/linux/HISTORY
index ae6c2c6..33cf53a 100644
--- a/kernels/linux/HISTORY
+++ b/kernels/linux/HISTORY
@@ -1,3 +1,6 @@
+2012-03-13 Vlad Glagolev <stealth at sourcemage.org>
+	* info/patches/maintenance_patches_3/patch-3.0.24: added
+
 2012-03-12 Ladislav Hagara <hgr at vabo.cz>
 	* latest.defaults: LATEST_maintenance_patches_3=patch-3.2.10
 	* info/patches/maintenance_patches_3/patch-3.2.10: added
diff --git a/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24 b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24
new file mode 100755
index 0000000..f9f9cc1
--- /dev/null
+++ b/kernels/linux/info/patches/maintenance_patches_3/patch-3.0.24
@@ -0,0 +1,5 @@
+appliedkernels="3.0"
+patchversion="${appliedkernels}.24"
+source="patch-${patchversion}.bz2"
+source_url="${KERNEL_URL}/pub/linux/kernel/v3.0/${source}"
+sha1sum="7b59963afe3f978fe71a7cb7c31e6a9087a51ea2"
diff --git a/libs/libxslt/DETAILS b/libs/libxslt/DETAILS
index 7b3038e..1708421 100755
--- a/libs/libxslt/DETAILS
+++ b/libs/libxslt/DETAILS
@@ -1,8 +1,8 @@
            SPELL=libxslt
          VERSION=1.1.26
-  SECURITY_PATCH=1
+  SECURITY_PATCH=2
           SOURCE=$SPELL-$VERSION.tar.gz
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
    SOURCE_URL[0]=ftp://xmlsoft.org/$SPELL/$SOURCE
       SOURCE_GPG=gurus.gpg:$SOURCE.sig
       LICENSE[0]=BSD
diff --git a/libs/libxslt/HISTORY b/libs/libxslt/HISTORY
index 5265f3f..8a00e45 100644
--- a/libs/libxslt/HISTORY
+++ b/libs/libxslt/HISTORY
@@ -1,3 +1,8 @@
+2012-03-13 Vlad Glagolev <stealth at sourcemage.org>
+	* SECURITY_PATCH++
+	* PRE_BUILD: apply the patch
+	* pattern.patch: added, to fix security issue (CVE-2011-3970)
+
 2009-09-25 Vlad Glagolev <stealth at sourcemage.org>
 	* DETAILS: updated spell to 1.1.26
 	* PRE_BUILD, locking.patch: removed, :-(
diff --git a/libs/libxslt/PRE_BUILD b/libs/libxslt/PRE_BUILD
new file mode 100755
index 0000000..fdcf12f
--- /dev/null
+++ b/libs/libxslt/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p0 < "$SPELL_DIRECTORY/pattern.patch"
diff --git a/libs/libxslt/pattern.patch b/libs/libxslt/pattern.patch
new file mode 100644
index 0000000..924425d
--- /dev/null
+++ b/libs/libxslt/pattern.patch
@@ -0,0 +1,11 @@
+--- libxslt/pattern.c.orig
++++ libxslt/pattern.c
+@@ -1867,6 +1867,8 @@ xsltCompilePatternInternal(const xmlChar *pattern, xmlDocPtr doc,
+ 		while ((pattern[end] != 0) && (pattern[end] != '"'))
+ 		    end++;
+ 	    }
++	    if (pattern[end] == 0)
++	        break;
+ 	    end++;
+ 	}
+ 	if (current == end) {


More information about the SM-Commit mailing list