[Git][java-team/tomcat9][master] d/p/0029-fix-regression-in-bz64540.patch: Re-export util.net.jsse and...

[Timo Aaltonen]

Timo Aaltonen pushed to branch master at Debian Java Maintainers / tomcat9


Commits:
1f139291 by Timo Aaltonen at 2020-07-28T12:24:49+03:00
d/p/0029-fix-regression-in-bz64540.patch: Re-export util.net.jsse and util.modeler.modules. (Closes: #964433)

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/0029-fix-regression-in-bz64540.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+tomcat9 (9.0.37-2) UNRELEASED; urgency=medium
+
+  * d/p/0029-fix-regression-in-bz64540.patch: Re-export util.net.jsse
+    and util.modeler.modules. (Closes: #964433)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Tue, 28 Jul 2020 12:24:09 +0300
+
 tomcat9 (9.0.37-1) unstable; urgency=medium
 
   * New upstream release


=====================================
debian/patches/0029-fix-regression-in-bz64540.patch
=====================================
@@ -0,0 +1,35 @@
+
+commit 13664621a2b4c9af09641a69438b2cf411238ca4
+Author: Mark Thomas <markt at apache.org>
+AuthorDate: Tue Jul 21 10:04:19 2020 +0100
+
+    Fix regression in fix for BZ 64540.
+    
+    Export additional packages,
+---
+ res/bnd/tomcat-coyote.jar.tmp.bnd |  6 +++---
+ webapps/docs/changelog.xml        | 10 ++++++++++
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+--- a/res/bnd/tomcat-coyote.jar.tmp.bnd
++++ b/res/bnd/tomcat-coyote.jar.tmp.bnd
+@@ -33,13 +33,14 @@ Export-Package: \
+     org.apache.tomcat.util.http.parser,\
+     org.apache.tomcat.util.log,\
+     org.apache.tomcat.util.modeler,\
++    org.apache.tomcat.util.modeler.modules,\
+     org.apache.tomcat.util.net,\
++    org.apache.tomcat.util.net.jsse,\
+     org.apache.tomcat.util.net.openssl,\
+     org.apache.tomcat.util.net.openssl.ciphers
+ 
+ -includepackage: \
+     org.apache.tomcat.util.bcel,\
+     org.apache.tomcat.util.http.fileupload.impl,\
+-    org.apache.tomcat.util.http.fileupload.util.mime,\
+-    org.apache.tomcat.util.modeler.modules,\
+-    org.apache.tomcat.util.net.jsse
+\ No newline at end of file
++    org.apache.tomcat.util.http.fileupload.util.mime
++ 
+\ No newline at end of file


=====================================
debian/patches/series
=====================================
@@ -12,3 +12,4 @@
 0026-easymock4-compatibility.patch
 0027-java11-compilation.patch
 0028-bnd-compatibility.patch
+0029-fix-regression-in-bz64540.patch



View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/commit/1f139291c3ca85b1354ddca336588977955abe78

-- 
View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/commit/1f139291c3ca85b1354ddca336588977955abe78
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200728/fd714a22/attachment.html>