diffstat for erlang_14.b.4-dfsg-1 erlang_14.b.4-dfsg-1ubuntu1 debian/patches/fix-pointer-converstion.patch | 25 +++++ debian/patches/native.patch | 18 ---- debian/patches/pcre-crash.patch | 68 +++++++++++++++ debian/patches/ssl_cacertfile_fix.patch | 62 +++++++++++++ erlang-14.b.4-dfsg/debian/changelog | 120 +++++++++++++++++++++++++++ erlang-14.b.4-dfsg/debian/control | 29 ++---- erlang-14.b.4-dfsg/debian/patches/series | 2 erlang-14.b.4-dfsg/debian/rules | 4 8 files changed, 290 insertions(+), 38 deletions(-) diff -u erlang-14.b.4-dfsg/debian/rules erlang-14.b.4-dfsg/debian/rules --- erlang-14.b.4-dfsg/debian/rules +++ erlang-14.b.4-dfsg/debian/rules @@ -78,10 +78,12 @@ CFLAGS=-g -O2 -fno-strict-aliasing GEN_OPT_FLGS=-O2 -fno-strict-aliasing TYPE=debug +ERL_COMPILE_FLAGS="+debug_info" else CFLAGS=-g -O2 -fno-strict-aliasing GEN_OPT_FLGS=-O2 -fno-strict-aliasing TYPE= +ERL_COMPILE_FLAGS="" endif unpatch: patch-stamp @@ -197,6 +199,7 @@ [ ! -f Makefile ] || ${MAKE} clean rm -f lib/dialyzer/SKIP # + ERL_COMPILE_FLAGS="$(ERL_COMPILE_FLAGS)" \ CFLAGS="$(CFLAGS)" \ ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ @@ -226,6 +229,7 @@ [ ! -f Makefile ] || ${MAKE} clean rm -f lib/dialyzer/SKIP # + ERL_COMPILE_FLAGS="$(ERL_COMPILE_FLAGS)" \ CFLAGS="$(CFLAGS)" \ ./configure --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ diff -u erlang-14.b.4-dfsg/debian/changelog erlang-14.b.4-dfsg/debian/changelog --- erlang-14.b.4-dfsg/debian/changelog +++ erlang-14.b.4-dfsg/debian/changelog @@ -1,3 +1,20 @@ +erlang (1:14.b.4-dfsg-1ubuntu1) precise; urgency=low + + * Merge from Debian testing. Remaining changes: + - debian/patches/fix-pointer-conversion.patch: Remove implicit + integer to pointer conversion (patch refreshed) + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + * Dropped changes: + debian/patches/tcp.patch: applied upstream + + -- Clint Byrum Thu, 15 Dec 2011 16:41:11 -0800 + erlang (1:14.b.4-dfsg-1) unstable; urgency=low * New upstream release (closes: #636678). @@ -20,6 +37,40 @@ -- Sergei Golovan Wed, 08 Jun 2011 08:39:43 +0400 +erlang (1:14.b.2-dfsg-3ubuntu2) oneiric; urgency=low + + * debian/patches/fix-pointer-conversion.patch: Remove implicit + integer to pointer conversion (LP: #778474) + + -- Clint Byrum Fri, 06 May 2011 06:10:07 -0700 + +erlang (1:14.b.2-dfsg-3ubuntu1) oneiric; urgency=low + + * Merge from debian unstable. Remaining changes: + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + - debian/patches/series: Do what I meant, and enable build-options.patch + instead. + * Additional changes: + - Drop erlang-wx from -et + * Dropped Changes: + - patches/pcre-crash.patch: CVE-2008-2371: outer level option with + alternatives caused crash. (Applied Upstream) + - fix for ssl certificate verification in newSSL: + ssl_cacertfile_fix.patch (Applied Upstream) + - debian/patches/series: Enable native.patch again, to get stripped beam + files and reduce the package size again. (build-options is what + actually accomplished this) + - Remove build-options.patch on advice from upstream and because it caused + odd build failures. + + -- Clint Byrum Thu, 05 May 2011 15:48:43 -0700 + erlang (1:14.b.2-dfsg-3) unstable; urgency=low * Enabled pre-Pentium-4 compatibility in the ethread library @@ -197,6 +248,33 @@ -- Sergei Golovan Sun, 07 Feb 2010 15:01:16 +0300 +erlang (1:13.b.3-dfsg-2ubuntu3) maverick; urgency=low + + * fix for ssl certificate verification in newSSL: ssl_cacertfile_fix.patch + (LP: #643787) + + -- Samuele Pedroni (Canonical Services Ltd.) Fri, 24 Sep 2010 09:35:12 +0200 + +erlang (1:13.b.3-dfsg-2ubuntu2) lucid; urgency=low + + * CVE-2008-2371: outer level option with alternatives caused crash. + (LP: #535090). + + -- Ralf Doering Thu, 11 Mar 2010 15:20:06 +0100 + +erlang (1:13.b.3-dfsg-2ubuntu1) lucid; urgency=low + + * Merge with Debian testing; remaining Ubuntu changes: + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. (LP #438365) + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + + -- Elliot Murphy Mon, 21 Dec 2009 21:54:16 -0500 + erlang (1:13.b.3-dfsg-2) unstable; urgency=low * Fixed dialyzer(1) manpage which was placed into section 3 and conflicted @@ -215,6 +293,34 @@ -- Sergei Golovan Sat, 19 Dec 2009 19:44:54 +0300 +erlang (1:13.b.2.1-dfsg-1ubuntu3) lucid; urgency=low + + * build-options.patch: Fix to apply to current version. + * debian/patches/series: Do what I meant, and enable build-options.patch + instead. + + -- Martin Pitt Mon, 07 Dec 2009 10:28:47 +0100 + +erlang (1:13.b.2.1-dfsg-1ubuntu2) lucid; urgency=low + + * debian/patches/series: Enable native.patch again, to get stripped beam + files and reduce the package size again. (LP: #493278) + + -- Martin Pitt Mon, 07 Dec 2009 09:02:37 +0100 + +erlang (1:13.b.2.1-dfsg-1ubuntu1) lucid; urgency=low + + * Merge with Debian testing; remaining Ubuntu changes: + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. (LP #438365) + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + + -- Martin Pitt Fri, 06 Nov 2009 18:54:42 +0100 + erlang (1:13.b.2.1-dfsg-1) unstable; urgency=low * New upstream release (closes: #539269). @@ -271,6 +377,19 @@ -- Sergei Golovan Tue, 30 Jun 2009 14:13:14 +0400 +erlang (1:13.b.1-dfsg-2ubuntu1) karmic; urgency=low + + * debian/control: + - Drop libwxgtk2.8-dev build dependency. Wx isn't in main, and not + supposed to. (LP: #438365) + - Drop erlang-wx binary. + - Drop erlang-wx dependency from -megaco, -common-test, and -reltool, they + do not really need wx. Also drop it from -debugger; the GUI needs wx, + but it apparently has CLI bits as well, and is also needed by -megaco, + so let's keep the package for now. + + -- Martin Pitt Fri, 16 Oct 2009 09:40:16 +0200 + erlang (1:13.b.1-dfsg-2) unstable; urgency=low * Updated manpages for section 1. @@ -1533,0 +1653 @@ + diff -u erlang-14.b.4-dfsg/debian/control erlang-14.b.4-dfsg/debian/control --- erlang-14.b.4-dfsg/debian/control +++ erlang-14.b.4-dfsg/debian/control @@ -1,12 +1,13 @@ Source: erlang -Maintainer: Debian Erlang Packagers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Erlang Packagers Uploaders: Sergei Golovan Section: interpreters Priority: optional Standards-Version: 3.9.2 Build-Depends: debhelper (>= 5.0.0), autoconf (>= 2.50), openssl, libssl-dev, m4, libncurses5-dev, quilt, autotools-dev, unixodbc-dev, bison, flex, ed, - libwxgtk2.8-dev, dctrl-tools, xsltproc, + dctrl-tools, xsltproc, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libsctp-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !solaris-i386], kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64] @@ -138,7 +139,7 @@ Package: erlang-debugger Architecture: any -Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends} +Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), ${misc:Depends} Suggests: erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) Description: Erlang/OTP application for debugging and testing @@ -151,7 +152,7 @@ Package: erlang-dialyzer Architecture: any Depends: ${erlang-base}, erlang-syntax-tools (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Suggests: erlang-gs (= ${binary:Version}), erlang-wx (= ${binary:Version}), erlang, erlang-manpages, erlang-doc +Suggests: erlang-gs (= ${binary:Version}), erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) Description: Erlang/OTP discrepancy analyzer application Dialyzer is a static analysis tool that identifies software @@ -218,7 +219,7 @@ Package: erlang-et Architecture: any -Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends} +Depends: ${erlang-base}, erlang-gs (= ${binary:Version}), erlang-runtime-tools (= ${binary:Version}), ${misc:Depends} Suggests: erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) Description: Erlang/OTP event tracer application @@ -406,7 +407,7 @@ Package: erlang-reltool Architecture: any -Depends: ${erlang-base}, erlang-syntax-tools (= ${binary:Version}), erlang-tools (= ${binary:Version}), erlang-wx (= ${binary:Version}), ${misc:Depends} +Depends: ${erlang-base}, erlang-syntax-tools (= ${binary:Version}), erlang-tools (= ${binary:Version}), ${misc:Depends} Suggests: erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) Description: Erlang/OTP release management tool @@ -556,16 +557,6 @@ It configures and starts a web server as well as all available tools. -Package: erlang-wx -Architecture: any -Depends: ${erlang-base}, ${shlibs:Depends}, ${misc:Depends} -Suggests: erlang, erlang-manpages, erlang-doc -Replaces: erlang (<< ${source:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${source:Version}), erlang-x11 (<< ${binary:Version}), erlang-src (<< ${source:Version}), erlang-dev (<< ${binary:Version}), erlang-examples (<< ${source:Version}), erlang-mode (<< 1:12.b.1-dfsg-2), erlang-doc (<< ${source:Upstream-Version}), erlang-doc (>> ${source:Upstream-Version}-999), erlang-manpages (<= 1:11.b.1-2) -Description: Erlang/OTP bindings to wxWidgets - The wxErlang application is an API for writing graphical user - interfaces with wxWidgets. - - Package: erlang-xmerl Architecture: any Depends: ${erlang-base}, ${misc:Depends} @@ -600,7 +591,7 @@ Package: erlang-examples Architecture: all Depends: erlang-base (>= ${binary:Version}) | erlang-base-hipe (>= ${binary:Version}), erlang-base (<< ${binary:Version}.0) | erlang-base-hipe (<< ${binary:Version}.0), ${misc:Depends} -Recommends: erlang-asn1, erlang-crypto, erlang-gs, erlang-inets, erlang-megaco, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-wx +Recommends: erlang-asn1, erlang-crypto, erlang-gs, erlang-inets, erlang-megaco, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools Suggests: erlang, erlang-manpages, erlang-doc Replaces: erlang (<< ${binary:Version}), erlang-base (<< ${binary:Version}), erlang-base-hipe (<< ${binary:Version}), erlang-nox (<< ${binary:Version}), erlang-x11 (<< ${binary:Version}), erlang-dev (<< ${binary:Version}), erlang-src (<< ${binary:Version}), erlang-mode (<< 1:12.b.1-dfsg-2) Description: Erlang/OTP application examples @@ -647,7 +638,7 @@ Depends: erlang-base | erlang-base-hipe, erlang-nox, erlang-appmon, erlang-common-test, erlang-debugger, erlang-dialyzer, erlang-et, erlang-gs, erlang-megaco, erlang-observer, erlang-pman, erlang-reltool, - erlang-test-server, erlang-toolbar, erlang-tv, erlang-typer, erlang-wx, + erlang-test-server, erlang-toolbar, erlang-tv, erlang-typer, ${misc:Depends} Suggests: erlang, erlang-manpages, erlang-doc Description: Erlang/OTP applications that require X Window System @@ -667,7 +658,7 @@ erlang-public-key, erlang-reltool, erlang-runtime-tools, erlang-snmp, erlang-ssh, erlang-ssl, erlang-syntax-tools, erlang-test-server, erlang-toolbar, erlang-tools, erlang-tv, erlang-typer, erlang-webtool, - erlang-wx, erlang-xmerl, ${misc:Depends} + erlang-xmerl, ${misc:Depends} Recommends: erlang-jinterface, erlang-ic-java, erlang-mode, erlang-src, erlang-examples Suggests: erlang-manpages, erlang-doc diff -u erlang-14.b.4-dfsg/debian/patches/series erlang-14.b.4-dfsg/debian/patches/series --- erlang-14.b.4-dfsg/debian/patches/series +++ erlang-14.b.4-dfsg/debian/patches/series @@ -13 +13 @@ -#native.patch +fix-pointer-converstion.patch reverted: --- erlang-14.b.4-dfsg/debian/patches/native.patch +++ erlang-14.b.4-dfsg.orig/debian/patches/native.patch @@ -1,18 +0,0 @@ -native.patch by Sergei Golovan - -Adds native code to all Erlang binaries if HiPE is enabled. - ---- erlang_14.b.3-dfsg.orig/make/otp.mk.in -+++ erlang_14.b.3-dfsg/make/otp.mk.in -@@ -89,6 +89,11 @@ - ERL_COMPILE_FLAGS += +slim - else - ERL_COMPILE_FLAGS += +debug_info -+ ifeq ($(HIPE_ENABLED),yes) -+ ifeq ($(BUILD_ALL),true) -+ ERL_COMPILE_FLAGS += +native -+ endif -+ endif - endif - endif - endif only in patch2: unchanged: --- erlang-14.b.4-dfsg.orig/debian/patches/ssl_cacertfile_fix.patch +++ erlang-14.b.4-dfsg/debian/patches/ssl_cacertfile_fix.patch @@ -0,0 +1,62 @@ +Index: erlang-13.b.3-dfsg/lib/public_key/src/pubkey_cert.erl +=================================================================== +--- erlang-13.b.3-dfsg.orig/lib/public_key/src/pubkey_cert.erl 2010-09-24 09:34:23.136278790 +0200 ++++ erlang-13.b.3-dfsg/lib/public_key/src/pubkey_cert.erl 2010-09-24 09:34:32.848278799 +0200 +@@ -176,9 +176,15 @@ + + validate_extensions(OtpCert, ValidationState, Verify, AccErr) -> + TBSCert = OtpCert#'OTPCertificate'.tbsCertificate, +- Extensions = TBSCert#'OTPTBSCertificate'.extensions, +- validate_extensions(Extensions, ValidationState, no_basic_constraint, +- is_self_signed(OtpCert), [], Verify, AccErr). ++ case TBSCert#'OTPTBSCertificate'.version of ++ N when N >= 3 -> ++ Extensions = TBSCert#'OTPTBSCertificate'.extensions, ++ validate_extensions(Extensions, ValidationState, ++ no_basic_constraint, is_self_signed(OtpCert), ++ [], Verify, AccErr); ++ _ -> %% Extensions not present in versions 1 & 2 ++ {ValidationState, [], AccErr} ++ end. + + validate_unknown_extensions([], AccErr, _Verify) -> + AccErr; +Index: erlang-13.b.3-dfsg/lib/ssl/src/ssl_certificate_db.erl +=================================================================== +--- erlang-13.b.3-dfsg.orig/lib/ssl/src/ssl_certificate_db.erl 2010-09-24 09:34:23.160278794 +0200 ++++ erlang-13.b.3-dfsg/lib/ssl/src/ssl_certificate_db.erl 2010-09-24 09:34:32.848278799 +0200 +@@ -206,14 +206,24 @@ + ets:match_delete(CertsDb, {{Ref, '_', '_'}, '_'}). + + add_certs_from_file(File, Ref, CertsDb) -> +- Decode = fun(Cert) -> +- {ok, ErlCert} = public_key:pkix_decode_cert(Cert, otp), +- TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate, +- SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber, +- Issuer = public_key:pkix_normalize_general_name( +- TBSCertificate#'OTPTBSCertificate'.issuer), +- insert({Ref, SerialNumber, Issuer}, {Cert,ErlCert}, CertsDb) +- end, +- {ok,Der} = public_key:pem_to_der(File), +- [Decode(Cert) || {cert, Cert, not_encrypted} <- Der]. ++ {ok, Der} = public_key:pem_to_der(File), ++ lists:reverse(lists:foldl( ++ fun({cert, Cert, not_encrypted}, Acc) -> ++ try ++ {ok, ErlCert} = public_key:pkix_decode_cert(Cert, otp), ++ TBSCertificate = ErlCert#'OTPCertificate'.tbsCertificate, ++ SerialNumber = TBSCertificate#'OTPTBSCertificate'.serialNumber, ++ Issuer = public_key:pkix_normalize_general_name( ++ TBSCertificate#'OTPTBSCertificate'.issuer), ++ [insert({Ref, SerialNumber, Issuer}, {Cert, ErlCert}, CertsDb) | Acc] ++ catch ++ error:Reason -> ++ Report = io_lib:format("SSL WARNING: Ignoring CA cert: ~p" ++ "~n Due to decoding error:~p ~n", [Cert, Reason]), ++ error_logger:info_report(Report), ++ Acc ++ end; ++ (_, Acc) -> ++ Acc ++ end, [], Der)). + only in patch2: unchanged: --- erlang-14.b.4-dfsg.orig/debian/patches/pcre-crash.patch +++ erlang-14.b.4-dfsg/debian/patches/pcre-crash.patch @@ -0,0 +1,68 @@ +Origin: upstream http://github.com/erlang/otp/commit/bb6370a20be07e6bd0c9f6e89a3cd9719dccbfd3 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/535090 +Author: Michael Santos +Date: Wed Feb 10 15:19:48 2010 -0500 + + Fix CVE-2008-2371 (outer level option with alternatives caused crash). + + The patch is from: + http://vcs.pcre.org/viewvc?revision=360&view=revision + + Test case: + re:compile(<<"(?i)[\xc3\xa9\xc3\xbd]|[\xc3\xa9\xc3\xbdA]">>, [unicode]). + + An option change at the start of a pattern that had top-level + alternatives could cause overwriting and/or a crash. + + This potential security problem was recorded as CVE-2008-2371. + +diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c +index 235617f..2974336 100644 +--- a/erts/emulator/pcre/pcre_compile.c ++++ b/erts/emulator/pcre/pcre_compile.c +@@ -4820,10 +4820,8 @@ we set the flag only if there is a literal "\r" or "\n" in the class. */ + both phases. + + If we are not at the pattern start, compile code to change the ims +- options if this setting actually changes any of them. We also pass the +- new setting back so that it can be put at the start of any following +- branches, and when this group ends (if we are in a group), a resetting +- item can be compiled. */ ++ options if this setting actually changes any of them, and reset the ++ greedy defaults and the case value for firstbyte and reqbyte. */ + + if (*ptr == ')') + { +@@ -4831,7 +4829,6 @@ we set the flag only if there is a literal "\r" or "\n" in the class. */ + (lengthptr == NULL || *lengthptr == 2 + 2*LINK_SIZE)) + { + cd->external_options = newoptions; +- options = newoptions; + } + else + { +@@ -4840,17 +4837,17 @@ we set the flag only if there is a literal "\r" or "\n" in the class. */ + *code++ = OP_OPT; + *code++ = newoptions & PCRE_IMS; + } +- +- /* Change options at this level, and pass them back for use +- in subsequent branches. Reset the greedy defaults and the case +- value for firstbyte and reqbyte. */ +- +- *optionsptr = options = newoptions; + greedy_default = ((newoptions & PCRE_UNGREEDY) != 0); + greedy_non_default = greedy_default ^ 1; +- req_caseopt = ((options & PCRE_CASELESS) != 0)? REQ_CASELESS : 0; ++ req_caseopt = ((newoptions & PCRE_CASELESS) != 0)? REQ_CASELESS : 0; + } + ++ /* Change options at this level, and pass them back for use ++ in subsequent branches. When not at the start of the pattern, this ++ information is also necessary so that a resetting item can be ++ compiled at the end of a group (if we are in a group). */ ++ ++ *optionsptr = options = newoptions; + previous = NULL; /* This item can't be repeated */ + continue; /* It is complete */ + } only in patch2: unchanged: --- erlang-14.b.4-dfsg.orig/debian/patches/fix-pointer-converstion.patch +++ erlang-14.b.4-dfsg/debian/patches/fix-pointer-converstion.patch @@ -0,0 +1,25 @@ +From: Clint Byrum +Subject: resolve buildd failure "Function `erl_malloc' implicitly converted to pointer at legacy/erl_timeout.c:77" +Bug-Ubuntu: https://launchpad.net/bugs/778484 + +Index: erlang-14.b.4-dfsg-1ubuntu1/lib/erl_interface/src/legacy/erl_timeout.c +=================================================================== +--- erlang-14.b.4-dfsg-1ubuntu1.orig/lib/erl_interface/src/legacy/erl_timeout.c 2011-12-15 16:39:50.958344893 -0800 ++++ erlang-14.b.4-dfsg-1ubuntu1/lib/erl_interface/src/legacy/erl_timeout.c 2011-12-15 16:40:45.183171477 -0800 +@@ -45,6 +45,7 @@ + + #include "erl_interface.h" + #include "erl_timeout.h" ++#include "erl_interface.h" + + typedef struct jmp_s { + jmp_buf jmpbuf; +@@ -75,7 +76,7 @@ + t.it_value.tv_usec = (ms % 1000) * 1000; + + /* get a jump buffer and save it */ +- j = erl_malloc(sizeof(*j)); ++ j = (jmp_t)erl_malloc(sizeof(*j)); + j->siginfo = s; + push(j); +