This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository taglibs-standard.
commit 319376c87f885a83d27be33d5da0ec5b1ff023ca Author: Emmanuel Bourg <[email protected]> Date: Wed Jul 20 18:05:35 2016 +0200 Refreshed 02-servlet-api-compatibility.patch --- debian/changelog | 1 + debian/patches/02-servlet-api-compatibility.patch | 34 ++++++----------------- 2 files changed, 9 insertions(+), 26 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0732a73..4dad600 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ taglibs-standard (1.2.5-1) UNRELEASED; urgency=medium * New upstream release - Removed 01-jdbc-compatibility.patch (fixed upstream) - Removed CVE-2015-0254.patch (fixed upstream) + - Refreshed 02-servlet-api-compatibility.patch * Renamed the package to taglibs-standard * Standards-Version updated to 3.9.8 * Updated debian/watch to track the releases >= 1.2 diff --git a/debian/patches/02-servlet-api-compatibility.patch b/debian/patches/02-servlet-api-compatibility.patch index 6ef0fbb..6e576da 100644 --- a/debian/patches/02-servlet-api-compatibility.patch +++ b/debian/patches/02-servlet-api-compatibility.patch @@ -1,35 +1,17 @@ Description: Fix the compatibility with the latest Servlet API Forwarded: no ---- a/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java -+++ b/standard/src/org/apache/taglibs/standard/tag/common/core/ImportSupport.java -@@ -409,6 +409,12 @@ - public void write(int b) throws IOException { - bos.write(b); - } +--- a/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java ++++ b/impl/src/main/java/org/apache/taglibs/standard/tag/common/core/ImportSupport.java +@@ -430,6 +430,12 @@ + public void write(int b) throws IOException { + bos.write(b); + } + + public boolean isReady() { + return true; + } + + public void setWriteListener(javax.servlet.WriteListener listener) {} - }; + }; - /** 'True' if getWriter() was called; false otherwise. */ ---- a/standard/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java -+++ b/standard/src/org/apache/taglibs/standard/lang/jstl/test/PageContextImpl.java -@@ -21,6 +21,7 @@ - import java.util.HashMap; - import java.util.Map; - -+import javax.el.ELContext; - import javax.servlet.Servlet; - import javax.servlet.ServletConfig; - import javax.servlet.ServletContext; -@@ -297,5 +298,7 @@ - public void include(java.lang.String relativeUrlPath, boolean flush) {} - public ExpressionEvaluator getExpressionEvaluator() { return null; } - public VariableResolver getVariableResolver() { return null; } -+ -+ public ELContext getELContext() { return null; } - - } + /** -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/taglibs-standard.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
