Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

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

 mail/exim/DETAILS              |    2 +-
 mail/exim/HISTORY              |    5 +++++
 mail/exim/PRE_BUILD            |    1 +
 mail/exim/cve-2019-15846.patch |   32 ++++++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 1 deletion(-)

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

    exim: security update

diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS
index 286adbf..f9225fa 100755
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -1,6 +1,6 @@
            SPELL=exim
          VERSION=4.91
-  SECURITY_PATCH=13
+  SECURITY_PATCH=14
           SOURCE=$SPELL-$VERSION.tar.bz2
          SOURCE2=$SOURCE.asc
       SOURCE_GPG="exim.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 078e308..3800246 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,8 @@
+2019-09-06 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: SECURITY_PATCH++
+       * PRE_BUILD: apply patch
+       * cve-2019-15846.patch: added, to fix CVE-2019-15846
+
 2019-07-27 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: SECURITY_PATCH++
        * PRE_BUILD: apply patch
diff --git a/mail/exim/PRE_BUILD b/mail/exim/PRE_BUILD
index 79ab1cc..928954c 100755
--- a/mail/exim/PRE_BUILD
+++ b/mail/exim/PRE_BUILD
@@ -4,6 +4,7 @@ cd "${SOURCE_DIRECTORY}" &&
 patch -p0 < "${SPELL_DIRECTORY}/config.patch" &&
 patch -p1 < "${SPELL_DIRECTORY}/cve-2019-10149.patch" &&
 patch -p0 < "${SPELL_DIRECTORY}/cve-2019-13917.patch" &&
+patch -p0 < "${SPELL_DIRECTORY}/cve-2019-15846.patch" &&
 
 sed -i "/SYSTEM_ALIASES_FILE/ s'SYSTEM_ALIASES_FILE'/etc/aliases'" \
        src/configure.default
diff --git a/mail/exim/cve-2019-15846.patch b/mail/exim/cve-2019-15846.patch
new file mode 100644
index 0000000..5c834b4
--- /dev/null
+++ b/mail/exim/cve-2019-15846.patch
@@ -0,0 +1,32 @@
+$OpenBSD$
+Index: src/string.c
+--- src/string.c.orig
++++ src/string.c
+@@ -223,6 +223,8 @@ interpreted in strings.
+ Arguments:
+   pp       points a pointer to the initiating "\" in the string;
+            the pointer gets updated to point to the final character
++           If the backslash is the last character in the string, it
++           is not interpreted.
+ Returns:   the value of the character escape
+ */
+ 
+@@ -235,6 +237,7 @@ const uschar *hex_digits= CUS"0123456789abcdef";
+ int ch;
+ const uschar *p = *pp;
+ ch = *(++p);
++if (ch == '\0') return **pp;
+ if (isdigit(ch) && ch != '8' && ch != '9')
+   {
+   ch -= '0';
+@@ -1158,8 +1161,8 @@ memcpy(g->s + p, s, count);
+ g->ptr = p + count;
+ return g;
+ }
+- 
+- 
++
++
+ gstring *
+ string_cat(gstring *string, const uschar *s)
+ {