[Pkg-ocaml-maint-commits] [SCM] ocaml-ssl packaging branch, master, updated. debian/0.4.4-3-5-g2ad0a3f

[Stephane Glondu]

The following commit has been merged in the master branch:
commit 0d01aa7aa400799c36ef470ff01f2dfc20035534
Author: Stephane Glondu <steph at glondu.net>
Date:   Mon Apr 18 22:42:36 2011 +0200

    New upstream release, refresh patch

diff --git a/debian/changelog b/debian/changelog
index f6e2354..88ef63a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ocaml-ssl (0.4.5-1) UNRELEASED; urgency=low
+
+  * New upstream release
+
+ -- Stéphane Glondu <glondu at debian.org>  Mon, 18 Apr 2011 22:42:08 +0200
+
 ocaml-ssl (0.4.4-3) unstable; urgency=low
 
   * Drop SSLv2 constructor from Ssl interface (follows fix to #622144)
diff --git a/debian/patches/0001-Drop-SSLv2-support.patch b/debian/patches/0001-Drop-SSLv2-support.patch
index 60cee8a..50fe422 100644
--- a/debian/patches/0001-Drop-SSLv2-support.patch
+++ b/debian/patches/0001-Drop-SSLv2-support.patch
@@ -11,11 +11,11 @@ Signed-off-by: Stephane Glondu <steph at glondu.net>
  3 files changed, 2 insertions(+), 21 deletions(-)
 
 diff --git a/src/ssl.ml b/src/ssl.ml
-index b5fa287..eea852e 100644
+index ff4b2af..dc2e790 100644
 --- a/src/ssl.ml
 +++ b/src/ssl.ml
 @@ -21,7 +21,6 @@
- (* $Id: ssl.ml 2683 2006-08-28 14:53:19Z smimram $ *)
+ (* $Id: ssl.ml 7933 2010-11-09 17:38:05Z smimram $ *)
  
  type protocol =
 -  | SSLv2
@@ -23,10 +23,10 @@ index b5fa287..eea852e 100644
    | SSLv3
    | TLSv1
 diff --git a/src/ssl.mli b/src/ssl.mli
-index 6a3ddd9..d1f7557 100644
+index 2596f3c..354c9af 100644
 --- a/src/ssl.mli
 +++ b/src/ssl.mli
-@@ -122,7 +122,6 @@ val get_error_string : unit -> string
+@@ -125,7 +125,6 @@ val get_error_string : unit -> string
  
  (** Protocol used by SSL. *)
  type protocol =
@@ -35,10 +35,10 @@ index 6a3ddd9..d1f7557 100644
    | SSLv3 (** SSL v3 protocol *)
    | TLSv1 (** TLS v1 protocol *)
 diff --git a/src/ssl_stubs.c b/src/ssl_stubs.c
-index 995ca99..bf59232 100644
+index f4c8206..afc1e7f 100644
 --- a/src/ssl_stubs.c
 +++ b/src/ssl_stubs.c
-@@ -161,23 +161,6 @@ static SSL_METHOD *get_method(int protocol, int type)
+@@ -193,23 +193,6 @@ static SSL_METHOD *get_method(int protocol, int type)
        switch (type)
        {
          case 0:
@@ -62,7 +62,7 @@ index 995ca99..bf59232 100644
            method = SSLv23_client_method();
            break;
  
-@@ -191,7 +174,7 @@ static SSL_METHOD *get_method(int protocol, int type)
+@@ -223,7 +206,7 @@ static SSL_METHOD *get_method(int protocol, int type)
        }
        break;
  
@@ -71,7 +71,7 @@ index 995ca99..bf59232 100644
        switch (type)
        {
          case 0:
-@@ -208,7 +191,7 @@ static SSL_METHOD *get_method(int protocol, int type)
+@@ -240,7 +223,7 @@ static SSL_METHOD *get_method(int protocol, int type)
        }
        break;
  

-- 
ocaml-ssl packaging