Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8dbb341ab16f41497869f3eaecd5ef3dfa3f226b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Treeve Jelbert <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Treeve Jelbert (8dbb341ab16f41497869f3eaecd5ef3dfa3f226b)
  • Date: Sun, 3 May 2015 07:30:29 -0500

GIT changes to master grimoire by Treeve Jelbert <treeve AT sourcemage.org>:

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

New commits:
commit 8dbb341ab16f41497869f3eaecd5ef3dfa3f226b
Author: Treeve Jelbert <treeve AT sourcemage.org>
Commit: Treeve Jelbert <treeve AT sourcemage.org>

pcre: => 8.37

diff --git a/libs/pcre/DETAILS b/libs/pcre/DETAILS
index 0581903..1993673 100755
--- a/libs/pcre/DETAILS
+++ b/libs/pcre/DETAILS
@@ -1,6 +1,5 @@
SPELL=pcre
- VERSION=8.36
- PATCHLEVEL=1
+ VERSION=8.37
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index 9ab5a89..80a3f21 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,7 @@
+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
* cve-2014-8964: renamed to cve-2014-8964.patch
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 master grimoire by Treeve Jelbert (8dbb341ab16f41497869f3eaecd5ef3dfa3f226b), Treeve Jelbert, 05/03/2015

Archive powered by MHonArc 2.6.24.

Top of Page