~ubuntu-branches/ubuntu/trusty/erlang/trusty

« back to all changes in this revision

Viewing changes to debian/patches/m68k.patch

  • Committer: Bazaar Package Importer
  • Author(s): Clint Byrum
  • Date: 2011-05-05 15:48:43 UTC
  • mfrom: (3.5.13 sid)
  • Revision ID: james.westby@ubuntu.com-20110505154843-0om6ekzg6m7ugj27
Tags: 1:14.b.2-dfsg-3ubuntu1
* 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.

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
 
8
8
(2) Non-working networking besause of blind conversion of long to a pointer.
9
9
 
10
 
--- erlang-13.b.3-dfsg.orig/erts/emulator/beam/binary.c
11
 
+++ erlang-13.b.3-dfsg/erts/emulator/beam/binary.c
 
10
--- erlang-14.b.2-dfsg.orig/erts/emulator/beam/binary.c
 
11
+++ erlang-14.b.2-dfsg/erts/emulator/beam/binary.c
12
12
@@ -31,6 +31,10 @@
13
13
 #include "erl_binary.h"
14
14
 #include "erl_bits.h"
20
20
 #ifdef DEBUG
21
21
 static int list_to_bitstr_buf(Eterm obj, char* buf, int len);
22
22
 #else
23
 
--- erlang-13.b.3-dfsg.orig/erts/emulator/beam/erl_driver.h
24
 
+++ erlang-13.b.3-dfsg/erts/emulator/beam/erl_driver.h
25
 
@@ -570,7 +570,7 @@
 
23
--- erlang-14.b.2-dfsg.orig/erts/emulator/beam/erl_driver.h
 
24
+++ erlang-14.b.2-dfsg/erts/emulator/beam/erl_driver.h
 
25
@@ -563,7 +563,7 @@
26
26
 EXTERN ErlDrvTermData driver_caller(ErlDrvPort);
27
27
 extern const ErlDrvTermData driver_term_nil;
28
28
 EXTERN ErlDrvTermData driver_mk_term_nil(void);