[Pkg-erlang-commits] r1223 - in erlang/trunk/debian: . patches scripts

[sgolovan at alioth.debian.org]

Author: sgolovan
Date: 2010-03-20 12:36:27 +0000 (Sat, 20 Mar 2010)
New Revision: 1223

Added:
   erlang/trunk/debian/patches/pcre.patch
Modified:
   erlang/trunk/debian/changelog
   erlang/trunk/debian/patches/emacs.patch
   erlang/trunk/debian/patches/series
   erlang/trunk/debian/scripts/analyse
   erlang/trunk/debian/scripts/erlang-depends.in
Log:
[erlang]
  * Fixed generation of ${erlang-base:Depends} and ${erlang-x11:Depends}
    substitution variables.
  * Added a fix for a re:compile/2 crash on a long regular expression.
  * Changed urgency to medium as the change fixes a security bug.


Modified: erlang/trunk/debian/changelog
===================================================================
--- erlang/trunk/debian/changelog	2010-03-18 13:14:02 UTC (rev 1222)
+++ erlang/trunk/debian/changelog	2010-03-20 12:36:27 UTC (rev 1223)
@@ -1,8 +1,11 @@
-erlang (1:13.b.4-dfsg-4) UNRELEASED; urgency=low
+erlang (1:13.b.4-dfsg-4~lenny1) unstable; urgency=medium
 
-  * NOT RELEASED YET
+  * Fixed generation of ${erlang-base:Depends} and ${erlang-x11:Depends}
+    substitution variables.
+  * Added a fix for a re:compile/2 crash on a long regular expression.
+  * Changed urgency to medium as the change fixes a security bug.
 
- -- Sergei Golovan <sgolovan at debian.org>  Tue, 09 Mar 2010 19:24:50 +0300
+ -- Sergei Golovan <sgolovan at debian.org>  Sat, 20 Mar 2010 09:02:05 +0300
 
 erlang (1:13.b.4-dfsg-3) unstable; urgency=low
 

Modified: erlang/trunk/debian/patches/emacs.patch
===================================================================
--- erlang/trunk/debian/patches/emacs.patch	2010-03-18 13:14:02 UTC (rev 1222)
+++ erlang/trunk/debian/patches/emacs.patch	2010-03-20 12:36:27 UTC (rev 1223)
@@ -5,7 +5,7 @@
 
 --- erlang-13.b.4-dfsg.orig/lib/tools/emacs/erlang.el
 +++ erlang-13.b.4-dfsg/lib/tools/emacs/erlang.el
-@@ -496,8 +496,8 @@
+@@ -492,8 +492,8 @@
  (defvar erlang-man-dirs
    '(("Man - Commands" "/man/man1" t)
      ("Man - Modules" "/man/man3" t)

Added: erlang/trunk/debian/patches/pcre.patch
===================================================================
--- erlang/trunk/debian/patches/pcre.patch	                        (rev 0)
+++ erlang/trunk/debian/patches/pcre.patch	2010-03-20 12:36:27 UTC (rev 1223)
@@ -0,0 +1,39 @@
+Author: PCRE upstream
+Description: The patch fixes buffer overflow for the buffer used to hold the
+ compiled regexp. See http://www.erlang.org/cgi-bin/ezmlm-cgi/3/916 for
+ details.
+Forwarded: no, the bug is already known by upstream and fixed in git
+Last-Updated: Fri, 19 Mar 2010 21:49:21 +0300
+
+--- erlang-13.b.4-dfsg.orig/erts/emulator/pcre/pcre_compile.c
++++ erlang-13.b.4-dfsg/erts/emulator/pcre/pcre_compile.c
+@@ -92,6 +92,11 @@
+ 
+ #define COMPILE_WORK_SIZE (4096)
+ 
++/* The overrun tests check for a slightly smaller size so that they detect the 
++overrun before it actually does run off the end of the data block. */
++
++#define WORK_SIZE_CHECK (COMPILE_WORK_SIZE - 100)
++
+ 
+ /* Table for handling escaped characters in the range '0'-'z'. Positive returns
+ are simple data values; negative values are for special things like \d and so
+@@ -2445,7 +2450,7 @@
+ #ifdef DEBUG
+     if (code > cd->hwm) cd->hwm = code;                 /* High water info */
+ #endif
+-    if (code > cd->start_workspace + COMPILE_WORK_SIZE) /* Check for overrun */
++    if (code > cd->start_workspace + WORK_SIZE_CHECK)   /* Check for overrun */
+       {
+       *errorcodeptr = ERR52;
+       goto FAILED;
+@@ -2494,7 +2499,7 @@
+   /* In the real compile phase, just check the workspace used by the forward
+   reference list. */
+ 
+-  else if (cd->hwm > cd->start_workspace + COMPILE_WORK_SIZE)
++  else if (cd->hwm > cd->start_workspace + WORK_SIZE_CHECK)
+     {
+     *errorcodeptr = ERR52;
+     goto FAILED;

Modified: erlang/trunk/debian/patches/series
===================================================================
--- erlang/trunk/debian/patches/series	2010-03-18 13:14:02 UTC (rev 1222)
+++ erlang/trunk/debian/patches/series	2010-03-20 12:36:27 UTC (rev 1223)
@@ -10,5 +10,6 @@
 java.patch
 hppa.patch
 powerpc.patch
+pcre.patch
 #native.patch
 #build-options.patch

Modified: erlang/trunk/debian/scripts/analyse
===================================================================
--- erlang/trunk/debian/scripts/analyse	2010-03-18 13:14:02 UTC (rev 1222)
+++ erlang/trunk/debian/scripts/analyse	2010-03-20 12:36:27 UTC (rev 1223)
@@ -74,7 +74,7 @@
 do
     MODULES="$MODULES{\"$fn\", \"erlang-base\"},\n"
 done
-PACKAGES2="\"dev\", \"nox\", \"dev\""
+PACKAGES2="\"dev\", \"nox\", \"x11\""
 for pkg in $PACKAGES ; do
     echo erlang-$pkg
 

Modified: erlang/trunk/debian/scripts/erlang-depends.in
===================================================================
--- erlang/trunk/debian/scripts/erlang-depends.in	2010-03-18 13:14:02 UTC (rev 1222)
+++ erlang/trunk/debian/scripts/erlang-depends.in	2010-03-20 12:36:27 UTC (rev 1223)
@@ -69,11 +69,6 @@
 			 _ ->
 		    	     TmpDir
 		     end,
-	    deladdsubstvar(Verbosity, Package, Variables, "erlang-abi:Depends",
-			   "erlang-abi-" ++ ?ABI_VERSION),
-	    deladdsubstvar(Verbosity, Package, Variables, "erlang-base:Depends",
-			   "erlang-base (>= " ++ ?VERSION ++
-			   ") | erlang-base-hipe (>= " ++ ?VERSION ++ ")"),
 	    delsubstvar(Verbosity, Package, "erlang:Depends"),
 	    Variables2 = Variables ++
 		case lists:member("erlang:Depends", Variables) of
@@ -101,6 +96,11 @@
 		    _ ->
 			[]
 		end,
+	    deladdsubstvar(Verbosity, Package, Variables2, "erlang-abi:Depends",
+			   "erlang-abi-" ++ ?ABI_VERSION),
+	    deladdsubstvar(Verbosity, Package, Variables2, "erlang-base:Depends",
+			   "erlang-base (>= " ++ ?VERSION ++
+			   ") | erlang-base-hipe (>= " ++ ?VERSION ++ ")"),
 	    lists:foreach(
 	      fun(Pkg) ->
 		    deladdsubstvar(Verbosity, Package, Variables2, "erlang-" ++ Pkg ++ ":Depends",