Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (6c8bda61337964dc602c92d208102173d3c1158e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (6c8bda61337964dc602c92d208102173d3c1158e)
  • Date: Sun, 24 May 2015 03:15:46 -0500

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

libs/pcre/DETAILS | 5 ++---
libs/pcre/HISTORY | 9 ++++++++-
libs/pcre/PRE_BUILD | 3 ---
libs/pcre/cve-2014-8964.patch | 15 ---------------
4 files changed, 10 insertions(+), 22 deletions(-)

New commits:
commit 6c8bda61337964dc602c92d208102173d3c1158e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pcre: that was a security update

(cherry picked from commit 8270b6889dd674e105566ed296bb1f4f6a06fae8)

commit 888bf2829ef2d911f8a59612e28b612135b69712
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

libs/pcre: switched to gcc with CXX in *SUB_DEPENDS

(cherry picked from commit 7acd0608c607a9e11a978511fd02cf1c1a52f377)

commit 415a53b02f6751cfd98dce2d4e56564aa6301e44
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

pcre: => 8.37

(cherry picked from commit 8dbb341ab16f41497869f3eaecd5ef3dfa3f226b)

commit a92597569d447017c3498be9830719f97c7a04e0
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

Revert "libs/pcre: switched to gcc with CXX in *SUB_DEPENDS"

This reverts commit c7fb40603c42fdb8667bb5f2114672c7ea401e7e.

Reason: non-effective merge path

diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 0581903..5a46d1f 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,7 +1,6 @@
SPELL=pcre
- VERSION=8.36
- PATCHLEVEL=1
- SECURITY_PATCH=1
+ VERSION=8.37
+ SECURITY_PATCH=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 722ba6c..9dfe197 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,5 +1,12 @@
+2015-05-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: SECURITY_PATCH++ (CVE-2015-2325, CVE-2015-2326)
+
2015-05-04 Pavel Vinogradov <public AT sourcemage.org>
- * *SUB_DEPENDS: g++ -> gcc with CXX
+ * SUB_DEPENDS: g++ -> gcc with CXX
+
+2015-05-03 Treeve Jelbert <treeve AT sourcemage.org>
+ * DETAILS: version 8.37
+ * PRE_BUILD, cve-2014-8964.patch: deleted, already included

2015-03-06 Vlad Glagolev <stealth AT sourcemage.org>
* BUILD: re-enabled build of static libraries
diff --git a/libs/pcre/PRE_BUILD b/libs/pcre/PRE_BUILD
deleted file mode 100755
index dccf52e..0000000
--- a/libs/pcre/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/cve-2014-8964.patch
diff --git a/libs/pcre/cve-2014-8964.patch b/libs/pcre/cve-2014-8964.patch
deleted file mode 100644
index e15e0b0..0000000
--- a/libs/pcre/cve-2014-8964.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-+++ pcre_exec.c (working copy)
-@@ -1404,8 +1404,11 @@
- condition = TRUE;
-
- /* Advance ecode past the assertion to the start of the first
branch,
-- but adjust it so that the general choosing code below works. */
--
-+ but adjust it so that the general choosing code below works. If the
-+ assertion has a quantifier that allows zero repeats we must skip
over
-+ the BRAZERO. This is a lunatic thing to do, but somebody did! */
-+
-+ if (*ecode == OP_BRAZERO) ecode++;
- ecode += GET(ecode, 1);
- while (*ecode == OP_ALT) ecode += GET(ecode, 1);
- ecode += 1 + LINK_SIZE - PRIV(OP_lengths)[condcode];



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (6c8bda61337964dc602c92d208102173d3c1158e), Vlad Glagolev, 05/24/2015

Archive powered by MHonArc 2.6.24.

Top of Page