[netty-tcnative] 02/04: Removed 805165_ssl.patch (fixed upstream)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository netty-tcnative.

commit bcf5fb5396b9ee373bedf2db616b4b8834157dd5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jan 31 15:33:29 2016 +0100

    Removed 805165_ssl.patch (fixed upstream)
---
 debian/changelog                |  7 +++++++
 debian/patches/805165_ssl.patch | 15 ---------------
 debian/patches/series           |  1 -
 3 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 136d090..4a7b334 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+netty-tcnative (1.1.33.Fork11-1) UNRELEASED; urgency=medium
+
+  * New upstream release:
+    - Removed 805165_ssl.patch (fixed upstream)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 31 Jan 2016 15:24:11 +0100
+
 netty-tcnative (1.1.33.Fork10-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/805165_ssl.patch b/debian/patches/805165_ssl.patch
deleted file mode 100644
index 032e683..0000000
--- a/debian/patches/805165_ssl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: tmancill at debian.org
-Bug-Debian: http://bugs.debian.org/805165
-Forwarded: no
-
---- a/src/main/c/ssl.c
-+++ b/src/main/c/ssl.c
-@@ -1067,7 +1067,7 @@
-     // TODO: Use BIO_s_secmem() once included in stable release
-     if ((bio = BIO_new(BIO_s_mem())) == NULL) {
-         tcn_ThrowException(e, "Create BIO failed");
--        return (jlong) NULL;
-+        return (jlong) 0;
-     }
-     return P2J(bio);
- }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ae0fda1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-805165_ssl.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/netty-tcnative.git