Olivier Sallou pushed to branch master at Debian Med / emboss
Commits: b6513f67 by Olivier Sallou at 2021-12-23T08:19:57+00:00 remove com.sun.net calls Closes #982036 - - - - - 4 changed files: - debian/changelog - + debian/patches/com_sun_net_deprecation.patch - debian/patches/no_makejar.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +emboss (6.6.0+dfsg-10) unstable; urgency=medium + + * Remove com.sun.net.ssl calls, removed from jdk17 (Closes: #982036) + + -- Olivier Sallou <[email protected]> Thu, 23 Dec 2021 08:18:17 +0000 + emboss (6.6.0+dfsg-9) unstable; urgency=medium 7a121b7 Remove quotes in mailcap entries. ===================================== debian/patches/com_sun_net_deprecation.patch ===================================== @@ -0,0 +1,107 @@ +Subject: remove deprecated calls to com.sun.net +Description: com.sun should not be called directly + and now have been removed from JDK. + Upstream author has been contacted about issue +Forwarded: yes +Last-Update: 2021-12-23 +Author: Olivier Sallou <[email protected]> +--- a/jemboss/org/emboss/jemboss/FileManager.java ++++ b/jemboss/org/emboss/jemboss/FileManager.java +@@ -42,22 +42,7 @@ + if(mysettings.getPublicSoapURL().startsWith("https")) + { + //SSL settings +- com.sun.net.ssl.internal.ssl.Provider p = +- new com.sun.net.ssl.internal.ssl.Provider(); +- Security.addProvider(p); + +- //have to do it this way to work with JNLP +- URL.setURLStreamHandlerFactory( new URLStreamHandlerFactory() +- { +- public URLStreamHandler createURLStreamHandler(final String protocol) +- { +- if(protocol != null && protocol.compareTo("https") == 0) +- { +- return new com.sun.net.ssl.internal.www.protocol.https.Handler(); +- } +- return null; +- } +- }); + //location of keystore + System.setProperty("javax.net.ssl.trustStore", + "resources/client.keystore"); +--- a/jemboss/org/emboss/jemboss/Jemboss.java ++++ b/jemboss/org/emboss/jemboss/Jemboss.java +@@ -113,22 +113,7 @@ + //SSL settings + + // System.setProperty ("javax.net.debug", "all"); +- com.sun.net.ssl.internal.ssl.Provider p = +- new com.sun.net.ssl.internal.ssl.Provider(); +- Security.addProvider(p); + +- //have to do it this way to work with JNLP +- URL.setURLStreamHandlerFactory( new URLStreamHandlerFactory() +- { +- public URLStreamHandler createURLStreamHandler(final String protocol) +- { +- if(protocol != null && protocol.compareTo("https") == 0) +- { +- return new com.sun.net.ssl.internal.www.protocol.https.Handler(); +- } +- return null; +- } +- }); + // System.setProperty("java.protocol.handler.pkgs", + // "com.sun.net.ssl.internal.www.protocol"); + +--- a/jemboss/org/emboss/jemboss/server/TestPrivateServer.java ++++ b/jemboss/org/emboss/jemboss/server/TestPrivateServer.java +@@ -61,22 +61,6 @@ + { + //SSL settings + // System.setProperty ("javax.net.debug", "all"); +- com.sun.net.ssl.internal.ssl.Provider p = +- new com.sun.net.ssl.internal.ssl.Provider(); +- Security.addProvider(p); +- +- //have to do it this way to work with JNLP +- URL.setURLStreamHandlerFactory( new URLStreamHandlerFactory() +- { +- public URLStreamHandler createURLStreamHandler(final String protocol) +- { +- if(protocol != null && protocol.compareTo("https") == 0) +- { +- return new com.sun.net.ssl.internal.www.protocol.https.Handler(); +- } +- return null; +- } +- }); + + //location of keystore + System.setProperty("javax.net.ssl.trustStore", +--- a/jemboss/org/emboss/jemboss/server/TestPublicServer.java ++++ b/jemboss/org/emboss/jemboss/server/TestPublicServer.java +@@ -56,22 +56,7 @@ + { + //SSL settings + // System.setProperty ("javax.net.debug", "all"); +- com.sun.net.ssl.internal.ssl.Provider p = +- new com.sun.net.ssl.internal.ssl.Provider(); +- Security.addProvider(p); + +- //have to do it this way to work with JNLP +- URL.setURLStreamHandlerFactory( new URLStreamHandlerFactory() +- { +- public URLStreamHandler createURLStreamHandler(final String protocol) +- { +- if(protocol != null && protocol.compareTo("https") == 0) +- { +- return new com.sun.net.ssl.internal.www.protocol.https.Handler(); +- } +- return null; +- } +- }); + // System.setProperty("java.protocol.handler.pkgs", + // "com.sun.net.ssl.internal.www.protocol"); + ===================================== debian/patches/no_makejar.patch ===================================== @@ -33,8 +33,8 @@ TIM jakarta-regexp-1.2.jar \ mail.jar \ jalviewApplet.jar \ ---- a/jemboss/runJemboss.sh -+++ b/jemboss/runJemboss.sh +--- a/jemboss/runJemboss.sh.in ++++ b/jemboss/runJemboss.sh.in @@ -11,7 +11,7 @@ export CLASSPATH=""; ===================================== debian/patches/series ===================================== @@ -7,3 +7,4 @@ plplotP-correct-padding.patch remove_non-free_doc.patch path_max.patch no_makejar.patch +com_sun_net_deprecation.patch View it on GitLab: https://salsa.debian.org/med-team/emboss/-/commit/b6513f67155365345bb22b9b195ee0b140b1d804 -- View it on GitLab: https://salsa.debian.org/med-team/emboss/-/commit/b6513f67155365345bb22b9b195ee0b140b1d804 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
