[Git][java-team/netbeans][master] 2 commits: Import Debian changes 10.0-1

[Markus Koschany]

Markus Koschany pushed to branch master at Debian Java Maintainers / netbeans


Commits:
d27d84d6 by Markus Koschany at 2019-01-26T15:44:58Z
Import Debian changes 10.0-1

netbeans (10.0-1) unstable; urgency=medium

  * New upstream version 10.0.
     - Fixes CVE-2016-5537. (Closes: #852029)
     - Fix Netbeans is not starting. (Closes: #894715)
     - Fix broken symlinks. (Closes: #857955)
  * Declare compliance with Debian Policy 4.3.0.
  * Use canonical VCS URI.
  * Remove w3c-sgm-lib and libpostgresql-jdbc-java dependencies.
  * Drop libmysql-java dependency. (Closes: #913362)

- - - - -
293cac81 by Markus Koschany at 2019-01-26T16:04:46Z
Add Unsafe.patch

- - - - -


3 changed files:

- − debian/patches/NoJavacHelper.patch
- + debian/patches/Unsafe.patch
- debian/patches/series


Changes:

=====================================
debian/patches/NoJavacHelper.patch deleted
=====================================
@@ -1,34 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Wed, 16 Jan 2019 15:27:51 +0100
-Subject: NoJavacHelper
-
-Java 11 work around.
----
- .../org/netbeans/modules/java/source/NoJavacHelper.java    | 14 +-------------
- 1 file changed, 1 insertion(+), 13 deletions(-)
-
-diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java b/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
-index d60f6a8..a6ccdd1 100644
---- a/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
-+++ b/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
-@@ -58,19 +58,7 @@ public class NoJavacHelper {
-         @Override
-         public void run() {
-             if (!hasWorkingJavac()) {
--                ClassWriter w = new ClassWriter(0);
--                w.visit(Opcodes.V1_8, Opcodes.ACC_ABSTRACT | Opcodes.ACC_PUBLIC, "com/sun/tools/javac/code/Scope$WriteableScope", null, "com/sun/tools/javac/code/Scope", null);
--                byte[] classData = w.toByteArray();
--                try {
--                    Field theUnsafe = Unsafe.class.getDeclaredField("theUnsafe");
--                    theUnsafe.setAccessible(true);
--                    Unsafe unsafe = (Unsafe) theUnsafe.get(null);
--                    Class scopeClass = Class.forName("com.sun.tools.javac.code.Scope");
--                    unsafe.defineClass("com.sun.tools.javac.code.Scope$WriteableScope", classData, 0, classData.length, scopeClass.getClassLoader(), scopeClass.getProtectionDomain());
--                } catch (Throwable t) {
--                    //ignore...
--                    Logger.getLogger(NoJavacHelper.class.getName()).log(Level.FINE, null, t);
--                }
-+                throw new UnsupportedOperationException("ClassDefinitionUtils.defineClass() relies on com.sun.misc.Unsafe.defineClass() which was removed in Java 11");
-             }
-         }
- 


=====================================
debian/patches/Unsafe.patch
=====================================
@@ -0,0 +1,25 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 26 Jan 2019 16:56:30 +0100
+Subject: Unsafe
+
+Fix FTBFS with Java 11.
+---
+ .../src/org/netbeans/modules/java/source/NoJavacHelper.java             | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java b/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
+index d60f6a8..ab7234b 100644
+--- a/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
++++ b/java/java.source.base/src/org/netbeans/modules/java/source/NoJavacHelper.java
+@@ -21,10 +21,10 @@ package org.netbeans.modules.java.source;
+ import java.lang.reflect.Field;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
++import jdk.internal.misc.Unsafe;
+ import org.objectweb.asm.ClassWriter;
+ import org.objectweb.asm.Opcodes;
+ import org.openide.modules.OnStart;
+-import sun.misc.Unsafe;
+ 
+ /**
+  *


=====================================
debian/patches/series
=====================================
@@ -22,7 +22,6 @@ netbeans-extexecution.patch
 netbeans-libs.jaxb.patch
 javaewah-version.patch
 xml.wsdl.model.patch
-NoJavacHelper.patch
 netbeans-CommandLineParser.patch
 osgi-update.patch
 netbeans-empty-binaries-list.patch
@@ -35,3 +34,4 @@ netbeans-slf4j.dummy.patch
 disable-Git-support.patch
 disable-nativeexecution-module.patch
 o.apache.commons.io.patch
+Unsafe.patch



View it on GitLab: https://salsa.debian.org/java-team/netbeans/compare/43489199e2e5fba16c0e3586a7b306f2cb3e3686...293cac81b3a7a1bc507dbc816be2523065e9e7f0

-- 
View it on GitLab: https://salsa.debian.org/java-team/netbeans/compare/43489199e2e5fba16c0e3586a7b306f2cb3e3686...293cac81b3a7a1bc507dbc816be2523065e9e7f0
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/20190126/581388b4/attachment.html>