[Pkg-erlang-commits] r2007 - in erlang/trunk/debian: . patches
sgolovan at alioth.debian.org
sgolovan at alioth.debian.org
Thu Feb 15 13:32:17 UTC 2018
Author: sgolovan
Date: 2018-02-15 13:32:17 +0000 (Thu, 15 Feb 2018)
New Revision: 2007
Removed:
erlang/trunk/debian/patches/cve-2016-10253.patch
Modified:
erlang/trunk/debian/changelog
erlang/trunk/debian/control
erlang/trunk/debian/patches/gnu.patch
erlang/trunk/debian/patches/man.patch
erlang/trunk/debian/patches/sparc.patch
erlang/trunk/debian/rules
Log:
[erlang]
* New upstream bugfix release.
* Refresh patches.
* Bumped standards version to 4.1.3.
Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog 2017-12-25 05:57:20 UTC (rev 2006)
+++ erlang/trunk/debian/changelog 2018-02-15 13:32:17 UTC (rev 2007)
@@ -1,8 +1,10 @@
-erlang (1:20.2.2+dfsg-2) UNRELEASED; urgency=medium
+erlang (1:20.2.3+dfsg-1) unstable; urgency=medium
- * NOT RELEASED YET
+ * New upstream bugfix release.
+ * Refresh patches.
+ * Bumped standards version to 4.1.3.
- -- Sergei Golovan <sgolovan at debian.org> Mon, 25 Dec 2017 08:57:19 +0300
+ -- Sergei Golovan <sgolovan at debian.org> Thu, 15 Feb 2018 16:00:15 +0300
erlang (1:20.2.2+dfsg-1) unstable; urgency=medium
Modified: erlang/trunk/debian/control
===================================================================
--- erlang/trunk/debian/control 2017-12-25 05:57:20 UTC (rev 2006)
+++ erlang/trunk/debian/control 2018-02-15 13:32:17 UTC (rev 2007)
@@ -3,7 +3,7 @@
Uploaders: Sergei Golovan <sgolovan at debian.org>
Section: interpreters
Priority: optional
-Standards-Version: 4.1.2
+Standards-Version: 4.1.3
Build-Depends: debhelper (>= 10.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4,
libncurses5-dev, unixodbc-dev, bison, flex, ed,
libwxgtk3.0-dev, dctrl-tools, xsltproc,
Deleted: erlang/trunk/debian/patches/cve-2016-10253.patch
===================================================================
--- erlang/trunk/debian/patches/cve-2016-10253.patch 2017-12-25 05:57:20 UTC (rev 2006)
+++ erlang/trunk/debian/patches/cve-2016-10253.patch 2018-02-15 13:32:17 UTC (rev 2007)
@@ -1,116 +0,0 @@
-Author: PCRE upstream
-Description: A fix for CVE-2016-10253 which is the heap overflow during
- a regular expression compile phase. The offending regexp could be
- "(?<=((?2))((?1)))".
- The patch was found at https://github.com/erlang/otp/pull/1108 and
- the original version from https://vcs.pcre.org/pcre?view=revision&revision=1542
- and https://vcs.pcre.org/pcre?view=revision&revision=1560 and
- https://vcs.pcre.org/pcre?view=revision&revision=1571
- has been adapted.
-Last-Modified: Wed, 22 Mar 2017 15:35:07 +0300
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=858313
-Bug-Upstream: https://bugs.erlang.org/browse/ERL-208
-
---- a/erts/emulator/pcre/pcre_compile.c
-+++ b/erts/emulator/pcre/pcre_compile.c
-@@ -649,6 +649,14 @@
- #endif
-
-
-+/* Structure for mutual recursion detection. */
-+
-+typedef struct recurse_check {
-+ struct recurse_check *prev;
-+ const pcre_uchar *group;
-+} recurse_check;
-+
-+
-
- /*************************************************
- * Find an error text *
-@@ -1734,6 +1742,7 @@
- utf TRUE in UTF-8 / UTF-16 / UTF-32 mode
- atend TRUE if called when the pattern is complete
- cd the "compile data" structure
-+ recurses chain of recurse_check to catch mutual recursion
-
- Returns: the fixed length,
- or -1 if there is no fixed length,
-@@ -1743,10 +1752,11 @@
- */
-
- static int
--find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd)
-+find_fixedlength(pcre_uchar *code, BOOL utf, BOOL atend, compile_data *cd,
-+ recurse_check *recurses)
- {
- int length = -1;
--
-+recurse_check this_recurse;
- register int branchlength = 0;
- register pcre_uchar *cc = code + 1 + LINK_SIZE;
-
-@@ -1771,7 +1781,8 @@
- case OP_ONCE:
- case OP_ONCE_NC:
- case OP_COND:
-- d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd);
-+ d = find_fixedlength(cc + ((op == OP_CBRA)? IMM2_SIZE : 0), utf, atend, cd,
-+ recurses);
- if (d < 0) return d;
- branchlength += d;
- do cc += GET(cc, 1); while (*cc == OP_ALT);
-@@ -1805,7 +1816,16 @@
- cs = ce = (pcre_uchar *)cd->start_code + GET(cc, 1); /* Start subpattern */
- do ce += GET(ce, 1); while (*ce == OP_ALT); /* End subpattern */
- if (cc > cs && cc < ce) return -1; /* Recursion */
-- d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd);
-+ else /* Check for mutual recursion */
-+ {
-+ recurse_check *r = recurses;
-+ for (r = recurses; r != NULL; r = r->prev) if (r->group == cs) break;
-+ if (r != NULL) return -1; /* Mutual recursion */
-+ }
-+ this_recurse.prev = recurses;
-+ this_recurse.group = cs;
-+ d = find_fixedlength(cs + IMM2_SIZE, utf, atend, cd, &this_recurse);
-+
- if (d < 0) return d;
- branchlength += d;
- cc += 1 + LINK_SIZE;
-@@ -1818,7 +1838,7 @@
- case OP_ASSERTBACK:
- case OP_ASSERTBACK_NOT:
- do cc += GET(cc, 1); while (*cc == OP_ALT);
-- cc += PRIV(OP_lengths)[*cc];
-+ cc += 1 + LINK_SIZE;
- break;
-
- /* Skip over things that don't match chars */
-@@ -7255,7 +7275,7 @@
- int fixed_length;
- *code = OP_END;
- fixed_length = find_fixedlength(last_branch, (options & PCRE_UTF8) != 0,
-- FALSE, cd);
-+ FALSE, cd, NULL);
- DPRINTF(("fixed length = %d\n", fixed_length));
- if (fixed_length == -3)
- {
-@@ -8249,7 +8269,7 @@
- exceptional ones forgo this. We scan the pattern to check that they are fixed
- length, and set their lengths. */
-
--if (cd->check_lookbehind)
-+if (errorcode == 0 && cd->check_lookbehind)
- {
- pcre_uchar *cc = (pcre_uchar *)codestart;
-
-@@ -8269,7 +8289,7 @@
- int end_op = *be;
- *be = OP_END;
- fixed_length = find_fixedlength(cc, (re->options & PCRE_UTF8) != 0, TRUE,
-- cd);
-+ cd, NULL);
- *be = end_op;
- DPRINTF(("fixed length = %d\n", fixed_length));
- if (fixed_length < 0)
Modified: erlang/trunk/debian/patches/gnu.patch
===================================================================
--- erlang/trunk/debian/patches/gnu.patch 2017-12-25 05:57:20 UTC (rev 2006)
+++ erlang/trunk/debian/patches/gnu.patch 2018-02-15 13:32:17 UTC (rev 2007)
@@ -61,7 +61,7 @@
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -1582,7 +1582,7 @@
+@@ -1584,7 +1584,7 @@
if (!bindir) {
/* Determine bindir from absolute path to executable */
char *p;
@@ -70,7 +70,7 @@
strncpy(buffer, argv[0], sizeof(buffer));
buffer[sizeof(buffer)-1] = '\0';
-@@ -1596,7 +1596,7 @@
+@@ -1598,7 +1598,7 @@
if (!rootdir) {
/* Determine rootdir from absolute path to bindir */
char *p;
Modified: erlang/trunk/debian/patches/man.patch
===================================================================
--- erlang/trunk/debian/patches/man.patch 2017-12-25 05:57:20 UTC (rev 2006)
+++ erlang/trunk/debian/patches/man.patch 2018-02-15 13:32:17 UTC (rev 2007)
@@ -1,12 +1,12 @@
man.patch by Francois-Denis Gonthier <neumann at lostwebsite.net>
-Patch allows to use standard man path with erl -man command.
+Patch allows one to use standard man path with erl -man command.
(Erlang manual pages are placed to /usr/share/man/ hierarchy
as required by Debian policy.)
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
-@@ -710,8 +710,10 @@
+@@ -712,8 +712,10 @@
error("-man not supported on Windows");
#else
argv[i] = "man";
Modified: erlang/trunk/debian/patches/sparc.patch
===================================================================
--- erlang/trunk/debian/patches/sparc.patch 2017-12-25 05:57:20 UTC (rev 2006)
+++ erlang/trunk/debian/patches/sparc.patch 2018-02-15 13:32:17 UTC (rev 2007)
@@ -1,7 +1,7 @@
sparc.patch by Jurij Smakov <jurij at wooyd.org>
(1) Defines ARCH=ultrasparc for any sparc* architecture. This allows
- to build HiPE enabled package for sparc in Debian.
+ one to build HiPE enabled package for sparc in Debian.
(2) Fixes FTBFS(see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=328031).
Modified: erlang/trunk/debian/rules
===================================================================
--- erlang/trunk/debian/rules 2017-12-25 05:57:20 UTC (rev 2006)
+++ erlang/trunk/debian/rules 2018-02-15 13:32:17 UTC (rev 2007)
@@ -501,7 +501,7 @@
binary: binary-indep binary-arch
-REL=20.2.2
+REL=20.2.3
DEB_REL=$(REL)+dfsg
get-orig-source:
More information about the Pkg-erlang-commits
mailing list