[apache-directory-server] 01/03: Fixed the compatibility with Mina 2.0.9 (Closes: #798877)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository apache-directory-server.

commit dd313cf9186b53b99621de3286a9eb83d5fe75f4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Sep 13 22:56:11 2015 +0200

    Fixed the compatibility with Mina 2.0.9 (Closes: #798877)
---
 debian/changelog                           |  6 ++++
 debian/patches/02-mina-compatibility.patch | 49 ++++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 56 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index bf333b4..71cf285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apache-directory-server (2.0.0~M15-2) UNRELEASED; urgency=medium
+
+  * Fixed the compatibility with Mina 2.0.9 (Closes: #798877)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Sun, 13 Sep 2015 22:06:49 +0200
+
 apache-directory-server (2.0.0~M15-1) unstable; urgency=medium
 
   * Initial release (Closes: #790648)
diff --git a/debian/patches/02-mina-compatibility.patch b/debian/patches/02-mina-compatibility.patch
new file mode 100644
index 0000000..b5b9bcf
--- /dev/null
+++ b/debian/patches/02-mina-compatibility.patch
@@ -0,0 +1,49 @@
+Description: Fix the compatibility with the latest version of Mina
+Origin: backport, https://svn.apache.org/r1636310
+--- a/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
++++ b/protocol-dhcp/src/main/java/org/apache/directory/server/dhcp/protocol/DhcpProtocolHandler.java
+@@ -217,4 +217,8 @@
+                 session.getLocalAddress() );
+         }
+     }
++    
++    public void inputClosed( IoSession session )
++    {
++    }
+ }
+--- a/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
++++ b/protocol-dns/src/main/java/org/apache/directory/server/dns/protocol/DnsProtocolHandler.java
+@@ -168,4 +168,9 @@
+     {
+         return ( this.contextKey );
+     }
++
++    
++    public void inputClosed( IoSession session )
++    {
++    }
+ }
+--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java
++++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/changepwd/protocol/ChangePasswordProtocolHandler.java
+@@ -223,4 +223,9 @@
+ 
+         return byteBuffer.array();
+     }
++
++    
++    public void inputClosed( IoSession session )
++    {
++    }
+ }
+--- a/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
++++ b/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolHandler.java
+@@ -331,4 +331,9 @@
+             LOG_KRB.error( I18n.err( I18n.ERR_155 ), e );
+         }
+     }
++
++    
++    public void inputClosed( IoSession session )
++    {
++    }
+ }
diff --git a/debian/patches/series b/debian/patches/series
index da693f0..1bfc8e5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-jar-packaging.patch
+02-mina-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/apache-directory-server.git