Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (6f04b8bea8a3299b24e3b70caeb0ed4ac74a15a0)

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 master grimoire by Vlad Glagolev (6f04b8bea8a3299b24e3b70caeb0ed4ac74a15a0)
  • Date: Fri, 6 Mar 2015 02:43:09 -0600

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

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

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

pcre: re-enabled build of static libraries

diff --git a/libs/pcre/BUILD b/libs/pcre/BUILD
index 5f9466f..f124548 100755
--- a/libs/pcre/BUILD
+++ b/libs/pcre/BUILD
@@ -1,4 +1,5 @@
-OPTS+=" --disable-static $JIT $PCRE8 $PCRE16" &&
+OPTS="$JIT $PCRE8 $PCRE16 $OPTS" &&
+
if [[ $BUILDUTF == y ]]; then
OPTS="$OPTS --enable-utf"
if [[ $UTFPROPERTIES == y ]]; then
diff --git a/libs/pcre/HISTORY b/libs/pcre/HISTORY
index a90e71b..9ab5a89 100644
--- a/libs/pcre/HISTORY
+++ b/libs/pcre/HISTORY
@@ -1,3 +1,7 @@
+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
+
2014-11-22 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 8.36
SECURITY_PATCH++, upstream patch
diff --git a/libs/pcre/PRE_BUILD b/libs/pcre/PRE_BUILD
index fe4a475..dccf52e 100755
--- a/libs/pcre/PRE_BUILD
+++ b/libs/pcre/PRE_BUILD
@@ -1,3 +1,3 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
-patch -p0 < $SPELL_DIRECTORY/cve-2014-8964
+patch -p0 < $SPELL_DIRECTORY/cve-2014-8964.patch
diff --git a/libs/pcre/cve-2014-8964 b/libs/pcre/cve-2014-8964
deleted file mode 100644
index e15e0b0..0000000
--- a/libs/pcre/cve-2014-8964
+++ /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];
diff --git a/libs/pcre/cve-2014-8964.patch b/libs/pcre/cve-2014-8964.patch
new file mode 100644
index 0000000..e15e0b0
--- /dev/null
+++ b/libs/pcre/cve-2014-8964.patch
@@ -0,0 +1,15 @@
++++ 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 Vlad Glagolev (6f04b8bea8a3299b24e3b70caeb0ed4ac74a15a0), Vlad Glagolev, 03/06/2015

Archive powered by MHonArc 2.6.24.

Top of Page