[Git][java-team/icedtea-web][master] 4 commits: Removed pack200 support to build with Java 17 (Closes: #1011532)
Emmanuel Bourg (@ebourg)
gitlab at salsa.debian.org
Wed Nov 2 09:54:23 GMT 2022
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / icedtea-web
Commits:
184c05ab by Emmanuel Bourg at 2022-11-02T10:52:11+01:00
Removed pack200 support to build with Java 17 (Closes: #1011532)
- - - - -
5c373503 by Emmanuel Bourg at 2022-11-02T10:52:19+01:00
Standards-Version updated to 4.6.1
- - - - -
4bd4e065 by Emmanuel Bourg at 2022-11-02T10:52:19+01:00
Updated the Homepage field
- - - - -
1727784d by Emmanuel Bourg at 2022-11-02T10:52:35+01:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- + debian/patches/build-with-java17.diff
- + debian/patches/remove-pack200-support.patch
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+icedtea-web (1.8.8-2) unstable; urgency=medium
+
+ * Team upload.
+ * Removed pack200 support to build with Java 17 (Closes: #1011532)
+ * Standards-Version updated to 4.6.1
+ * Updated the Homepage field
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 02 Nov 2022 10:52:30 +0100
+
icedtea-web (1.8.8-1) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -11,10 +11,10 @@ Build-Depends:
libtagsoup-java,
pkg-config,
zip
-Standards-Version: 4.6.0.1
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/icedtea-web.git
Vcs-Browser: https://salsa.debian.org/java-team/icedtea-web
-Homepage: http://icedtea.classpath.org/wiki/IcedTea-Web
+Homepage: https://github.com/AdoptOpenJDK/IcedTea-Web
Package: icedtea-netx
Architecture: all
=====================================
debian/patches/build-with-java17.diff
=====================================
@@ -0,0 +1,13 @@
+Descriptions: No longer check if com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager is available to build with Java 17
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/configure.ac
++++ b/configure.ac
+@@ -172,7 +172,6 @@
+ IT_CHECK_FOR_CLASS(SUN_MISC_LAUNCHER, [sun.misc.Launcher], [some.pkg], [$JAVA_BASE])
+ fi
+ IT_CHECK_FOR_CLASS(SUN_SECURITY_VALIDATOR_VALIDATOREXCEPTION, [sun.security.validator.ValidatorException], [some.pkg], [$JAVA_BASE])
+-IT_CHECK_FOR_CLASS(COM_SUN_NET_SSL_INTERNAL_SSL_X509EXTENDEDTRUSTMANAGER, [com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager], [some.pkg], [$JAVA_BASE])
+ IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILE, [sun.net.www.protocol.jar.URLJarFile], [some.pkg], [$JAVA_BASE])
+ IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_JAR_URLJARFILECALLBACK, [sun.net.www.protocol.jar.URLJarFileCallBack], [some.pkg], [$JAVA_BASE])
+ if test "x$build_linux" = xyes ; then
=====================================
debian/patches/remove-pack200-support.patch
=====================================
@@ -0,0 +1,81 @@
+Descriptions: Removes pack200 support to build with Java 17
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/configure.ac
++++ b/configure.ac
+@@ -131,7 +131,6 @@
+ IT_FIND_JAVADOC
+ IT_FIND_KEYTOOL
+ IT_FIND_JARSIGNER
+-IT_FIND_PACK200
+
+ IT_SET_VERSION
+ IT_CHECK_XULRUNNER_VERSION
+@@ -155,7 +154,6 @@
+ JAVA_DESKTOP=java.desktop
+ JAVA_NAMING=java.naming
+ fi
+-IT_CHECK_FOR_CLASS(JAVA_UTIL_JAR_PACK200, [java.util.jar.Pack200], [some.pkg], [])
+ IT_CHECK_FOR_CLASS(JAVA_NET_COOKIEMANAGER, [java.net.CookieManager], [some.pkg], [])
+ IT_CHECK_FOR_CLASS(JAVA_NET_HTTPCOOKIE, [java.net.HttpCookie], [some.pkg], [])
+ IT_CHECK_FOR_CLASS(JAVA_NET_COOKIEHANDLER, [java.net.CookieHandler], [some.pkg], [])
+--- a/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java
++++ b/netx/net/sourceforge/jnlp/cache/ResourceDownloader.java
+@@ -25,7 +25,6 @@
+ import java.util.List;
+ import java.util.Map;
+ import java.util.jar.JarOutputStream;
+-import java.util.jar.Pack200;
+ import java.util.zip.GZIPInputStream;
+
+ import net.sourceforge.jnlp.DownloadOptions;
+@@ -151,7 +150,7 @@
+ try {
+ resource.setDownloadLocation(location.URL);
+ URLConnection connection = ConnectionFactory.getConnectionFactory().openConnection(location.URL); // this won't change so should be okay not-synchronized
+- connection.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip");
++ connection.addRequestProperty("Accept-Encoding", "gzip");
+
+ File localFile = null;
+ if (resource.getRequestVersion() == resource.getDownloadVersion()) {
+@@ -293,7 +292,7 @@
+ URL url = urls.get(i);
+ try {
+ Map<String, String> requestProperties = new HashMap<>();
+- requestProperties.put("Accept-Encoding", "pack200-gzip, gzip");
++ requestProperties.put("Accept-Encoding", "gzip");
+
+ UrlRequestResult response = getUrlResponseCodeWithRedirectonResult(url, requestProperties, requestMethod);
+ if (response.result == 511) {
+@@ -390,7 +389,7 @@
+
+ private URLConnection getDownloadConnection(URL location) throws IOException {
+ URLConnection con = ConnectionFactory.getConnectionFactory().openConnection(location);
+- con.addRequestProperty("Accept-Encoding", "pack200-gzip, gzip");
++ con.addRequestProperty("Accept-Encoding", "gzip");
+ con.connect();
+ return con;
+ }
+@@ -500,21 +499,7 @@
+ }
+
+ private void uncompressPackGz(URL compressedLocation, URL uncompressedLocation, Version version) throws IOException {
+- OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "Extracting packgz: " + compressedLocation + " to " + uncompressedLocation);
+-
+- try (GZIPInputStream gzInputStream = new GZIPInputStream(new FileInputStream(CacheUtil
+- .getCacheFile(compressedLocation, version)))) {
+- InputStream inputStream = new BufferedInputStream(gzInputStream);
+-
+- JarOutputStream outputStream = new JarOutputStream(new FileOutputStream(CacheUtil
+- .getCacheFile(uncompressedLocation, version)));
+-
+- Pack200.Unpacker unpacker = Pack200.newUnpacker();
+- unpacker.unpack(inputStream, outputStream);
+-
+- outputStream.close();
+- inputStream.close();
+- }
++ throw new UnsupportedOperationException("Pack200 compression is no longer supported, cannot unpack " + compressedLocation);
+ }
+
+ /**
=====================================
debian/patches/series
=====================================
@@ -4,3 +4,5 @@ doc-english-only.diff
disable-applet-support.diff
java11-compatibility.diff
reproducible-documentation.patch
+remove-pack200-support.patch
+build-with-java17.diff
=====================================
debian/rules
=====================================
@@ -22,7 +22,7 @@ override_dh_auto_configure:
--with-jdk-home=/usr/lib/jvm/default-java
override_dh_auto_build:
- rm -Rf netx/sun netx/net/sourceforge/jnlp/NetxPanel.java
+ rm -Rf netx/sun netx/net/sourceforge/jnlp/NetxPanel.java netx/sun/applet/AppletViewerPanelAccess.java netx/sun/applet/package-info.java
MODULARJDK_ARGS_DIR=/usr/share/icedtea-web/bin/itw-modularjdk.args \
$(MAKE) -C build VERSION_DEFS='-DHAVE_JAVA9'
View it on GitLab: https://salsa.debian.org/java-team/icedtea-web/-/compare/533d1b1559a575742f318e04a8cbe10fb40c4abe...1727784deca6adcd694d16c4600d4319b470af51
--
View it on GitLab: https://salsa.debian.org/java-team/icedtea-web/-/compare/533d1b1559a575742f318e04a8cbe10fb40c4abe...1727784deca6adcd694d16c4600d4319b470af51
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/20221102/1073f2c4/attachment.htm>
More information about the pkg-java-commits
mailing list