[Pkg-ocaml-maint-commits] [SCM] ocaml-ssl packaging branch, master, updated. debian/0.4.5-1-5-gfc35580

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 6e257e049253fdadd144f20b198c3dd846b0c1d7
Author: Stephane Glondu <steph at glondu.net>
Date:   Sun Nov 13 12:37:58 2011 +0100

    SSLv2 support dropped upstream

diff --git a/debian/patches/0001-Drop-SSLv2-support.patch b/debian/patches/0001-Drop-SSLv2-support.patch
deleted file mode 100644
index 50fe422..0000000
--- a/debian/patches/0001-Drop-SSLv2-support.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Stephane Glondu <steph at glondu.net>
-Date: Mon, 11 Apr 2011 23:01:54 +0200
-Subject: Drop SSLv2 support
-
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=622144
-Signed-off-by: Stephane Glondu <steph at glondu.net>
----
- src/ssl.ml      |    1 -
- src/ssl.mli     |    1 -
- src/ssl_stubs.c |   21 ++-------------------
- 3 files changed, 2 insertions(+), 21 deletions(-)
-
-diff --git a/src/ssl.ml b/src/ssl.ml
-index ff4b2af..dc2e790 100644
---- a/src/ssl.ml
-+++ b/src/ssl.ml
-@@ -21,7 +21,6 @@
- (* $Id: ssl.ml 7933 2010-11-09 17:38:05Z smimram $ *)
- 
- type protocol =
--  | SSLv2
-   | SSLv23
-   | SSLv3
-   | TLSv1
-diff --git a/src/ssl.mli b/src/ssl.mli
-index 2596f3c..354c9af 100644
---- a/src/ssl.mli
-+++ b/src/ssl.mli
-@@ -125,7 +125,6 @@ val get_error_string : unit -> string
- 
- (** Protocol used by SSL. *)
- type protocol =
--  | SSLv2 (** SSL v2 protocol *)
-   | SSLv23 (** SSL v3 protocol but can rollback to v2 *)
-   | SSLv3 (** SSL v3 protocol *)
-   | TLSv1 (** TLS v1 protocol *)
-diff --git a/src/ssl_stubs.c b/src/ssl_stubs.c
-index f4c8206..afc1e7f 100644
---- a/src/ssl_stubs.c
-+++ b/src/ssl_stubs.c
-@@ -193,23 +193,6 @@ static SSL_METHOD *get_method(int protocol, int type)
-       switch (type)
-       {
-         case 0:
--          method = SSLv2_client_method();
--          break;
--
--        case 1:
--          method = SSLv2_server_method();
--          break;
--
--        case 2:
--          method = SSLv2_method();
--          break;
--      }
--      break;
--
--    case 1:
--      switch (type)
--      {
--        case 0:
-           method = SSLv23_client_method();
-           break;
- 
-@@ -223,7 +206,7 @@ static SSL_METHOD *get_method(int protocol, int type)
-       }
-       break;
- 
--    case 2:
-+    case 1:
-       switch (type)
-       {
-         case 0:
-@@ -240,7 +223,7 @@ static SSL_METHOD *get_method(int protocol, int type)
-       }
-       break;
- 
--    case 3:
-+    case 2:
-       switch (type)
-       {
-         case 0:
--- 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 202e83a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Drop-SSLv2-support.patch

-- 
ocaml-ssl packaging