diff --git a/2.0.tar.gz b/2.0.tar.gz new file mode 100644 index 0000000..0e43f70 Binary files /dev/null and b/2.0.tar.gz differ diff --git a/velocity-tools-2.0-servlet.patch b/velocity-tools-2.0-servlet.patch index 5bc83dc..60a1242 100644 --- a/velocity-tools-2.0-servlet.patch +++ b/velocity-tools-2.0-servlet.patch @@ -2,28 +2,28 @@ diff -Nru velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/Im --- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ImportSupport.java 2007-12-12 18:04:38.000000000 +0100 +++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ImportSupport.java 2015-06-19 15:50:41.054584752 +0200 @@ -36,6 +36,7 @@ - import javax.servlet.RequestDispatcher; - import javax.servlet.ServletContext; - import javax.servlet.ServletOutputStream; -+import javax.servlet.WriteListener; - import javax.servlet.http.HttpServletRequest; - import javax.servlet.http.HttpServletResponse; - import javax.servlet.http.HttpServletResponseWrapper; + import javax.servlet.RequestDispatcher; + import javax.servlet.ServletContext; + import javax.servlet.ServletOutputStream; ++import javax.servlet.WriteListener; + import javax.servlet.http.HttpServletRequest; + import javax.servlet.http.HttpServletResponse; + import javax.servlet.http.HttpServletResponseWrapper; @@ -510,6 +511,14 @@ - { - bos.write(b); - } -+ -+ public void setWriteListener(WriteListener listener) { -+ throw new UnsupportedOperationException("Not implemented yet."); -+ } -+ -+ public boolean isReady() { -+ return false; -+ } - }; - return sos; - } + { + bos.write(b); + } ++ ++ public void setWriteListener(WriteListener listener) { ++ throw new UnsupportedOperationException("Not implemented yet."); ++ } ++ ++ public boolean isReady() { ++ return false; ++ } + }; + return sos; + } diff -Nru velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ParameterTool.java velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ParameterTool.java --- velocity-tools-2.0-src/src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2009-05-12 00:24:53.000000000 +0200 +++ velocity-tools-2.0-src.servlet/src/main/java/org/apache/velocity/tools/view/ParameterTool.java 2015-06-19 15:45:11.950303234 +0200 diff --git a/velocity-tools-2.0-src.tar.gz b/velocity-tools-2.0-src.tar.gz deleted file mode 100644 index aa25efc..0000000 Binary files a/velocity-tools-2.0-src.tar.gz and /dev/null differ diff --git a/velocity-tools.spec b/velocity-tools.spec index 15cf00e..beafeb8 100644 --- a/velocity-tools.spec +++ b/velocity-tools.spec @@ -1,10 +1,10 @@ Name: velocity-tools Version: 2.0 -Release: 3 +Release: 4 Summary: Collection of useful tools for Velocity template engine -License: ASL 2.0 +License: Apache-2.0 Url: http://velocity.apache.org/tools/releases/2.0/ -Source0: http://www.apache.org/dist/velocity/tools/%{version}/%{name}-%{version}-src.tar.gz +Source0: https://github.com/apache/velocity-tools/archive/refs/tags/2.0.tar.gz Patch0: %{name}-%{version}-junit4.patch Patch1: %{name}-%{version}-dont_copy_test_lib.patch Patch2: %{name}-%{version}-servlet.patch @@ -42,7 +42,7 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n %{name}-%{version}-src +%setup -q -n %{name}-%{version} find . -name "SecureLinkTool.java" -delete find . -name "*.jar" -delete find . -name "*.class" -delete @@ -80,6 +80,9 @@ sed -i 's/\r//' LICENSE NOTICE WHY_THREE_JARS.txt %license LICENSE NOTICE %changelog +* Wed Nov 16 2022 Ge Wang - 2.0-4 +- bring source file into correspondence with described in spec file + * Sat Mar 20 2021 zhanghua - 2.0-3 - fix CVE-2020-13959