[logback] 02/05: Comply with the servlet 3.1 API

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository logback.

commit 8c3b35fdacc5e8316dc4911b44e56150f57bee73
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Tue Feb 7 18:44:05 2017 +0200

    Comply with the servlet 3.1 API
    
    Partially backport upstream commit 9ad7cc6141.
---
 debian/patches/03-servlet-3.1.patch | 70 +++++++++++++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 71 insertions(+)

diff --git a/debian/patches/03-servlet-3.1.patch b/debian/patches/03-servlet-3.1.patch
new file mode 100644
index 0000000..79e3ee1
--- /dev/null
+++ b/debian/patches/03-servlet-3.1.patch
@@ -0,0 +1,70 @@
+Author: Apollon Oikonomopoulos <apoikos at debian.org>
+Description: Patch logback-access to comply with the servlet 3.1 API
+ This is a partial backport of upstream commit 9ad7cc6141.
+Forwarded: not-needed (fixed upstream)
+Last-Update: 2017-03-01
+--- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java
++++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletInputStream.java
+@@ -18,6 +18,7 @@
+ import java.io.IOException;
+ import java.io.InputStream;
+ 
++import javax.servlet.ReadListener;
+ import javax.servlet.ServletInputStream;
+ import javax.servlet.http.HttpServletRequest;
+ 
+@@ -71,4 +72,19 @@
+     byte[] getInputBuffer() {
+         return inputBuffer;
+     }
++
++    @Override
++    public boolean isFinished() {
++        throw new RuntimeException("Not yet implemented");
++    }
++
++    @Override
++    public boolean isReady() {
++        throw new RuntimeException("Not yet implemented");
++    }
++
++    @Override
++    public void setReadListener(ReadListener listener) {
++        throw new RuntimeException("Not yet implemented");
++    }
+ }
+--- a/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java
++++ b/logback-access/src/main/java/ch/qos/logback/access/servlet/TeeServletOutputStream.java
+@@ -16,6 +16,7 @@
+ import java.io.ByteArrayOutputStream;
+ import java.io.IOException;
+ 
++import javax.servlet.WriteListener;
+ import javax.servlet.ServletOutputStream;
+ import javax.servlet.ServletResponse;
+ 
+@@ -82,4 +83,14 @@
+         underlyingStream.flush();
+         baosCopy.flush();
+     }
++
++    @Override
++    public boolean isReady() {
++        throw new RuntimeException("Not yet implemented");
++    }
++
++    @Override
++    public void setWriteListener(WriteListener listener) {
++        throw new RuntimeException("Not yet implemented");
++    }
+ }
+--- a/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
++++ b/logback-access/src/main/java/ch/qos/logback/access/tomcat/LogbackValve.java
+@@ -328,7 +328,6 @@
+         return aai.detachAppender(name);
+     }
+ 
+-    @Override
+     public String getInfo() {
+         return "Logback's implementation of ValveBase";
+     }
diff --git a/debian/patches/series b/debian/patches/series
index 09720d1..79ca4a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-remove-google-ads.patch
 CVE-2017-5929.patch
 CVE-2017-5929-part2.patch
+03-servlet-3.1.patch

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