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

« back to all changes in this revision

Viewing changes to lib/ssl/src/ssl.app.src

  • 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
               ssl_server,
8
8
               ssl_broker,
9
9
               ssl_broker_sup,
10
 
               ssl_base64,
11
 
               ssl_pem,
12
 
               ssl_pkix,
13
 
               ssl_pkix_oid,
14
10
               ssl_prim,
15
11
               inet_ssl_dist,
16
12
               ssl_tls1,
28
24
               ssl_cipher,
29
25
               ssl_certificate_db,
30
26
               ssl_certificate,
31
 
               ssl_alert,
32
 
               'OTP-PKIX'
 
27
               ssl_alert
33
28
               ]},
34
29
    {registered, [ssl_sup, ssl_server, ssl_broker_sup]},
35
 
    {applications, [kernel, stdlib]},
 
30
    {applications, [crypto, public_key, kernel, stdlib]},
36
31
    {env, []},
37
32
    {mod, {ssl_app, []}}]}.
38
33