Debian

Available patches from Ubuntu

To see Ubuntu differences wrt. to Debian, write down a grep-dctrl query identifying the packages you're interested in:
grep-dctrl -n -sPackage Sources.Debian
(e.g. -FPackage linux-ntfs or linux-ntfs)

Modified packages are listed below:

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: ca-certificates-java

ca-certificates-java (20190405ubuntu1) disco; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/control: bump javahelper build dependency to require a version that supports the '--release' flag. - debian/rules: replace javac arguments '-source 1.7 -target 1.7' with '--release 7' as, per JEP-247, it also takes care of setting the right -bootclasspath argument. -- Tiago Stürmer Daitx <tiago.daitx@ubuntu.com> Thu, 11 Apr 2019 16:21:52 +0000

Modifications :
  1. Download patch debian/rules

    --- 20190405/debian/rules 2019-04-05 12:49:31.000000000 +0000 +++ 20190405ubuntu1/debian/rules 2019-04-05 16:11:35.000000000 +0000 @@ -16,7 +16,7 @@ endif JAVA_HOME := /usr/lib/jvm/default-java export JAVA_HOME -OPTS := --no-javadoc --main=org.debian.security.UpdateCertificates --javacopts="-source 1.7 -target 1.7" +OPTS := --no-javadoc --main=org.debian.security.UpdateCertificates --javacopts="--release 7" CLASSPATH := /usr/share/java/junit4.jar export CLASSPATH @@ -32,7 +32,7 @@ build-stamp: mkdir target jh_build $(OPTS) target/ca-certificates-java.jar src/main/java ifeq ($(do_junit),yes) - jh_build --no-javadoc --javacopts="-source 1.7 -target 1.7 -cp target/ca-certificates-java.jar:${CLASSPATH}" \ + jh_build --no-javadoc --javacopts="--release 7 -cp target/ca-certificates-java.jar:${CLASSPATH}" \ target/ca-certificates-java-tests.jar src/test/java mkdir target/test-classes cp -R src/test/resources/* target/test-classes
  2. Download patch debian/control

    --- 20190405/debian/control 2019-04-05 12:49:31.000000000 +0000 +++ 20190405ubuntu1/debian/control 2019-04-11 15:27:52.000000000 +0000 @@ -1,10 +1,11 @@ Source: ca-certificates-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Matthias Klose <doko@ubuntu.com>, James Page <james.page@ubuntu.com> -Build-Depends: debhelper (>= 11), default-jdk, javahelper, junit4 +Build-Depends: debhelper (>= 11), default-jdk, javahelper (>= 0.63ubuntu1), junit4 Standards-Version: 4.3.0 Vcs-Git: https://salsa.debian.org/java-team/ca-certificates-java.git Vcs-Browser: https://salsa.debian.org/java-team/ca-certificates-java

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: geronimo-jacc-1.1-spec

geronimo-jacc-1.1-spec (1.0.1-2fakesync1ubuntu1) yakkety; urgency=medium * Fake sync due to mismatching tarball. -- Matthias Klose <doko@ubuntu.com> Wed, 05 Oct 2016 11:12:00 +0200

Modifications :
  1. Download patch src/main/java/javax/security/jacc/WebResourcePermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/WebResourcePermission.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/WebResourcePermission.java 2008-01-23 08:45:36.000000000 +0000 @@ -36,7 +36,7 @@ import java.util.Enumeration; import javax.servlet.http.HttpServletRequest; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public final class WebResourcePermission extends Permission implements Serializable { private transient int cachedHashCode = 0;
  2. Download patch src/test/java/javax/security/jacc/WebRoleRefPermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/WebRoleRefPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/WebRoleRefPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 @@ -28,7 +28,7 @@ package javax.security.jacc; import junit.framework.TestCase; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class WebRoleRefPermissionTest extends TestCase {
  3. Download patch .pc/02-servlet-3.1-compatibility.patch/src/test/java/javax/security/jacc/MockHttpServletRequest.java

    --- 1.0.1-2/.pc/02-servlet-3.1-compatibility.patch/src/test/java/javax/security/jacc/MockHttpServletRequest.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/.pc/02-servlet-3.1-compatibility.patch/src/test/java/javax/security/jacc/MockHttpServletRequest.java 2008-01-23 08:45:36.000000000 +0000 @@ -33,7 +33,7 @@ import javax.servlet.http.HttpServletReq import javax.servlet.http.HttpSession; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public class MockHttpServletRequest implements HttpServletRequest {
  4. Download patch src/test/java/javax/security/jacc/MockHttpServletRequest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/MockHttpServletRequest.java 2016-10-05 12:39:28.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/MockHttpServletRequest.java 2016-10-05 12:39:28.000000000 +0000 @@ -43,7 +43,7 @@ import javax.servlet.http.HttpUpgradeHan import javax.servlet.http.Part; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public class MockHttpServletRequest implements HttpServletRequest {
  5. Download patch src/test/java/javax/security/jacc/WebResourcePermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/WebResourcePermissionTest.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/WebResourcePermissionTest.java 2008-01-23 08:45:36.000000000 +0000 @@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletReq import junit.framework.TestCase; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public class WebResourcePermissionTest extends TestCase {
  6. Download patch debian/control

    --- 1.0.1-2/debian/control 2016-05-30 10:33:54.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/debian/control 2016-10-05 09:12:00.000000000 +0000 @@ -1,7 +1,8 @@ Source: geronimo-jacc-1.1-spec Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Chris Grzegorczyk <grze@eucalyptus.com>, Graziano Obertelli <graziano@eucalyptus.com>, Kyo Lee <kyo.lee@eucalyptus.com> Build-Depends: default-jdk, debhelper (>= 9), maven-debian-helper, libservlet3.1-java, junit Standards-Version: 3.9.8
  7. Download patch src/main/java/javax/security/jacc/PolicyContextException.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyContextException.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyContextException.java 2006-10-25 04:01:51.000000000 +0000 @@ -26,7 +26,7 @@ package javax.security.jacc; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class PolicyContextException extends Exception {
  8. Download patch src/main/java/javax/security/jacc/PolicyContextHandler.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyContextHandler.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyContextHandler.java 2006-10-25 04:01:51.000000000 +0000 @@ -36,7 +36,7 @@ package javax.security.jacc; * activated via the <code>PolicyContext</code> class must implement the * <code>PolicyContextHandler</code> interface. * - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public interface PolicyContextHandler {
  9. Download patch src/main/java/javax/security/jacc/WebRoleRefPermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/WebRoleRefPermission.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/WebRoleRefPermission.java 2006-10-25 04:01:51.000000000 +0000 @@ -29,7 +29,7 @@ import java.io.Serializable; import java.security.Permission; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public final class WebRoleRefPermission extends Permission implements Serializable { private transient int cachedHashCode = 0;
  10. Download patch src/main/java/javax/security/jacc/PolicyConfigurationFactory.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyConfigurationFactory.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyConfigurationFactory.java 2006-10-25 04:01:51.000000000 +0000 @@ -43,7 +43,7 @@ import java.security.SecurityPermission; * @see PolicyConfiguration * @see PolicyContextException * - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public abstract class PolicyConfigurationFactory {
  11. Download patch src/main/java/javax/security/jacc/WebUserDataPermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/WebUserDataPermission.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/WebUserDataPermission.java 2008-01-23 08:45:36.000000000 +0000 @@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletReq * The name of a WebUserDataPermission (also referred to as the target name) * identifies a Web resource by its context path relative URL pattern. * - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ * * @see java.security.Permission */
  12. Download patch debian/patches/02-servlet-3.1-compatibility.patch

    --- 1.0.1-2/debian/patches/02-servlet-3.1-compatibility.patch 2016-05-30 10:54:32.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/debian/patches/02-servlet-3.1-compatibility.patch 2016-10-05 09:12:00.000000000 +0000 @@ -1,9 +1,11 @@ Description: Fix the compatibility with the Servlet API 3.1 Author: Emmanuel Bourg <ebourg@apache.org> Forwarded: no +Index: b/src/test/java/javax/security/jacc/MockHttpServletRequest.java +=================================================================== --- a/src/test/java/javax/security/jacc/MockHttpServletRequest.java +++ b/src/test/java/javax/security/jacc/MockHttpServletRequest.java -@@ -23,14 +23,24 @@ +@@ -23,14 +23,24 @@ import java.io.BufferedReader; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.security.Principal; @@ -27,8 +29,8 @@ Forwarded: no +import javax.servlet.http.Part; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ -@@ -268,4 +278,64 @@ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ +@@ -268,4 +278,64 @@ public class MockHttpServletRequest impl public int getLocalPort() { return 0; }
  13. Download patch src/test/java/javax/security/jacc/EJBMethodPermissionCollectionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/EJBMethodPermissionCollectionTest.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/EJBMethodPermissionCollectionTest.java 2006-10-25 04:01:51.000000000 +0000 @@ -31,7 +31,7 @@ import java.security.PermissionCollectio /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class EJBMethodPermissionCollectionTest extends TestCase {
  14. Download patch src/test/java/javax/security/jacc/WebUserDataPermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/WebUserDataPermissionTest.java 2008-01-23 08:45:36.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/WebUserDataPermissionTest.java 2008-01-23 08:45:36.000000000 +0000 @@ -35,7 +35,7 @@ import java.security.Permission; import junit.framework.TestCase; /** - * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (Mi, 23 Jan 2008) $ + * @version $Rev: 614454 $ $Date: 2008-01-23 09:45:36 +0100 (mer. 23 janv. 2008) $ */ public class WebUserDataPermissionTest extends TestCase {
  15. Download patch src/main/java/javax/security/jacc/URLPatternSpec.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/URLPatternSpec.java 2007-01-20 19:29:22.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/URLPatternSpec.java 2007-01-20 19:29:22.000000000 +0000 @@ -31,7 +31,7 @@ import java.util.LinkedList; import javax.servlet.http.HttpServletRequest; /** - * @version $Rev: 498156 $ $Date: 2007-01-20 20:29:22 +0100 (Sa, 20 Jan 2007) $ + * @version $Rev: 498156 $ $Date: 2007-01-20 20:29:22 +0100 (sam. 20 janv. 2007) $ */ final class URLPatternSpec {
  16. Download patch .pc/01-missing-dependencies.patch/pom.xml

    --- 1.0.1-2/.pc/01-missing-dependencies.patch/pom.xml 2008-02-01 10:32:54.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/.pc/01-missing-dependencies.patch/pom.xml 2008-02-01 10:32:54.000000000 +0000 @@ -18,7 +18,7 @@ under the License. --> -<!-- $Rev: 617430 $ $Date: 2008-02-01 11:32:54 +0100 (Fr, 01 Feb 2008) $ --> +<!-- $Rev: 617430 $ $Date: 2008-02-01 11:32:54 +0100 (ven. 01 févr. 2008) $ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  17. Download patch src/test/java/javax/security/jacc/EJBMethodPermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/EJBMethodPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/EJBMethodPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 @@ -34,7 +34,7 @@ import java.io.ByteArrayInputStream; import java.io.ObjectInputStream; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class EJBMethodPermissionTest extends TestCase { protected Method method;
  18. Download patch src/site/site.xml

    --- 1.0.1-2/src/site/site.xml 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/site/site.xml 2006-10-25 04:01:51.000000000 +0000 @@ -18,7 +18,7 @@ under the License. --> -<!-- $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ --> +<!-- $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ --> <project name="${project.name}">
  19. Download patch pom.xml

    --- 1.0.1-2/pom.xml 2016-10-05 12:39:28.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/pom.xml 2016-10-05 12:39:28.000000000 +0000 @@ -18,7 +18,7 @@ under the License. --> -<!-- $Rev: 617430 $ $Date: 2008-02-01 11:32:54 +0100 (Fr, 01 Feb 2008) $ --> +<!-- $Rev: 617430 $ $Date: 2008-02-01 11:32:54 +0100 (ven. 01 févr. 2008) $ --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  20. Download patch src/test/java/javax/security/jacc/EJBRoleRefPermissionTest.java

    --- 1.0.1-2/src/test/java/javax/security/jacc/EJBRoleRefPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/test/java/javax/security/jacc/EJBRoleRefPermissionTest.java 2006-10-25 04:01:51.000000000 +0000 @@ -28,7 +28,7 @@ package javax.security.jacc; import junit.framework.TestCase; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public class EJBRoleRefPermissionTest extends TestCase {
  21. Download patch src/main/java/javax/security/jacc/PolicyConfiguration.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyConfiguration.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyConfiguration.java 2006-10-25 04:01:51.000000000 +0000 @@ -29,7 +29,7 @@ import java.security.Permission; import java.security.PermissionCollection; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public interface PolicyConfiguration {
  22. Download patch src/main/java/javax/security/jacc/EJBMethodPermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/EJBMethodPermission.java 2007-03-23 09:18:38.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/EJBMethodPermission.java 2007-03-23 09:18:38.000000000 +0000 @@ -40,7 +40,7 @@ import java.util.Enumeration; import java.util.Collections; /** - * @version $Rev: 521639 $ $Date: 2007-03-23 10:18:38 +0100 (Fr, 23 Mär 2007) $ + * @version $Rev: 521639 $ $Date: 2007-03-23 10:18:38 +0100 (ven. 23 mars 2007) $ */ public final class EJBMethodPermission extends Permission implements Serializable {
  23. Download patch src/main/java/javax/security/jacc/EJBRoleRefPermission.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/EJBRoleRefPermission.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/EJBRoleRefPermission.java 2006-10-25 04:01:51.000000000 +0000 @@ -40,7 +40,7 @@ import java.security.Permission; * which the permission applies. An EJBRoleRefPermission is checked to * determine if the subject is a member of the role identified by the reference. * - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public final class EJBRoleRefPermission extends Permission implements Serializable {
  24. Download patch src/main/java/javax/security/jacc/PolicyContext.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/PolicyContext.java 2006-10-25 04:01:51.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/PolicyContext.java 2006-10-25 04:01:51.000000000 +0000 @@ -31,7 +31,7 @@ import java.util.Set; /** - * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (Mi, 25 Okt 2006) $ + * @version $Rev: 467553 $ $Date: 2006-10-25 06:01:51 +0200 (mer. 25 oct. 2006) $ */ public final class PolicyContext {
  25. Download patch src/main/java/javax/security/jacc/HTTPMethodSpec.java

    --- 1.0.1-2/src/main/java/javax/security/jacc/HTTPMethodSpec.java 2006-12-01 00:37:43.000000000 +0000 +++ 1.0.1-2fakesync1ubuntu1/src/main/java/javax/security/jacc/HTTPMethodSpec.java 2006-12-01 00:37:43.000000000 +0000 @@ -33,7 +33,7 @@ import java.util.regex.Pattern; /** - * @version $Rev: 481119 $ $Date: 2006-12-01 01:37:43 +0100 (Fr, 01 Dez 2006) $ + * @version $Rev: 481119 $ $Date: 2006-12-01 01:37:43 +0100 (ven. 01 déc. 2006) $ */ final class HTTPMethodSpec {

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: groovy

groovy (2.4.17-4ubuntu1) focal; urgency=medium * Merge with Debian unstable (LP: #1842928). Remaining changes: - debian/patches/exclude_groovydoc.patch: exclude EncodingGroovyMethodsSupport.java from groovydoc - without it, the archive builder fails with no log. -- Logan Rosen <logan@ubuntu.com> Thu, 13 Feb 2020 23:26:03 -0500

Modifications :
  1. Download patch debian/control

    --- 2.4.17-4/debian/control 2019-12-05 22:58:57.000000000 +0000 +++ 2.4.17-4ubuntu1/debian/control 2020-02-14 04:26:03.000000000 +0000 @@ -1,7 +1,8 @@ Source: groovy Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Felix Natter <fnatter@gmx.net> Build-Depends: ant,
  2. Download patch debian/patches/series

    --- 2.4.17-4/debian/patches/series 2019-12-05 23:56:06.000000000 +0000 +++ 2.4.17-4ubuntu1/debian/patches/series 2020-02-14 04:26:03.000000000 +0000 @@ -12,5 +12,6 @@ transition_Gradle_3.1.patch 10_fix_javadoc_links.patch 11_language_level.patch 12_java11_compatibility.patch +exclude_groovydoc.patch failOnError.patch 13_GROOVY_8253.patch
  3. Download patch debian/patches/exclude_groovydoc.patch

    --- 2.4.17-4/debian/patches/exclude_groovydoc.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2.4.17-4ubuntu1/debian/patches/exclude_groovydoc.patch 2020-02-14 04:26:03.000000000 +0000 @@ -0,0 +1,18 @@ +Description: exclude file from groovydoc + Exclude file org/codehaus/groovy/runtime/EncodingGroovyMethodsSupport.java + from groovydoc because groovydoc complains about a NUL char and throws + it to the build log, this causes the archive builders to fail. +Author: Tiago Stürmer Daitx <tdaitx@gmail.com> +Last-Update: 2018-12-20 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/gradle/docs.gradle ++++ b/gradle/docs.gradle +@@ -52,6 +52,7 @@ + } else { + overviewText = resources.text.fromFile(rootProject.file('src/main/overview.html')) + } ++ exclude 'org/codehaus/groovy/runtime/EncodingGroovyMethodsSupport.java' + includePrivate = false + link 'file:///usr/share/doc/libservlet3.1-java-doc/api', 'javax.servlet.', 'javax.management.' + link 'file:///usr/share/doc/default-jdk/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.'

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: icedtea-web

icedtea-web (1.8-0ubuntu8) disco; urgency=medium * Provide a compatibility symlink netx.jar -> javaws.jar. -- Matthias Klose <doko@ubuntu.com> Sun, 17 Mar 2019 14:02:43 +0100 icedtea-web (1.8-0ubuntu7) disco; urgency=medium * Merge changes from Debian 1.7.2-1: - Added the missing dependency on a Java runtime (Closes: #912464) - icedtea-netx now provides icedtea-netx-common (Closes: #911995) -- Matthias Klose <doko@ubuntu.com> Sat, 16 Mar 2019 13:30:24 +0100 icedtea-web (1.8-0ubuntu6) disco; urgency=medium * New upstream version. * Add JDK 11 support (Michael R. Crusoe). Closes: #912549. * Launchers now written in rust, architecture: all -> any. -- Matthias Klose <doko@ubuntu.com> Wed, 13 Mar 2019 17:20:57 +0100

Modifications :
  1. Download patch rust-launcher/src/os_access.rs
  2. Download patch rust-launcher/src/utils.rs
  3. Download patch debian/patches/doc-english-only.diff

    --- 1.7.2-2/debian/patches/doc-english-only.diff 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/patches/doc-english-only.diff 2018-05-08 09:58:34.000000000 +0000 @@ -1,6 +1,8 @@ +Index: b/Makefile.am +=================================================================== --- a/Makefile.am +++ b/Makefile.am -@@ -859,7 +859,7 @@ +@@ -565,7 +565,7 @@ stamps/generate-docs.stamp: stamps/netx. LANG_BACKUP=$$LANG ; \ echo "<html><head><title>$(PLUGIN_VERSION)</title></head>" > "$$HTML_DOCS_INDEX" ; \ echo "<body><h3>$(PLUGIN_VERSION) docs:</h3>" >> "$$HTML_DOCS_INDEX" ; \
  4. Download patch launcher/launchers.bat.in

    --- 1.7.2-2/launcher/launchers.bat.in 2019-03-11 19:48:28.490360703 +0000 +++ 1.8-0ubuntu8/launcher/launchers.bat.in 1970-01-01 00:00:00.000000000 +0000 @@ -1,188 +0,0 @@ -@echo off -setLocal EnableDelayedExpansion - -rem use JAVAWS_J_OPTIONS to pass java arguments, instead of -J opts for this script. This will be fixed in next releases -rem use ITW_HOME to set location where ITW can be found. From there all binaries and jars and other resources are found -rem use JAVA_HOME to set path to JRE -rem any redistribution/installer can replace INST_ITW_HOME and INST_JAVA_HOME to create better defaults -rem if not set, following defaults are used -set "INST_ITW_HOME=" -set "INST_JAVA_HOME=" - -rem Warning for linux users: when you put VAR="value" also quotes are stored in VAR! -rem maybe set "VAR=value" is working better? -rem Warning for if blocks: variables using %my_var% do not work (interpreter), use !my_var! with ENABLEDELAYEDEXPANSION instead -rem convention to use for temporary variables use '_' prefix - -set "NASHORN=lib/ext/nashorn.jar" -set "JRE=@JRE@" -set "JAVA=%JRE%/bin/java" -set "LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@" -set "LAUNCHER_FLAGS=-Xms8m" -set "CLASSNAME=@MAIN_CLASS@" -set "BINARY_LOCATION=@BIN_LOCATION@.bat" -set "SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@" -set "RUN_ARGS_LOCATION=@MODULARJDK_ARGS_LOCATION@" -set "PROGRAM_NAME=@PROGRAM_NAME@" -set "CP=%JRE%/lib/rt.jar;%JRE%/lib/jfxrt.jar" - -rem individual parts of bootclasspath for more easy processing -set "NETX_JAR=@NETX_JAR@" -set "PLUGIN_JAR=@PLUGIN_JAR@" -set "JSOBJECT_JAR=@JSOBJECT_JAR@" -set "TAGSOUP_JAR=@TAGSOUP_JAR@" -set "RHINO_JAR=@RHINO_JAR@" -set "MSLINKS_JAR=@MSLINKS_JAR@" - - -rem resolve folder of this script: -if "%ITW_HOME%" == "" ( - set "_BAD_SLASH_SCRIPT_DIR=%~dp0" - set "_SCRIPT_DIR=!_BAD_SLASH_SCRIPT_DIR:\=/!" - set "ITW_HOME=!_SCRIPT_DIR!../" - set "_BAD_SLASH_SCRIPT_DIR=" & set "_SCRIPT_DIR=" -) - -rem resolve custom JRE: -set "CUSTOM_JRE=" -if not "%JAVA_HOME%" == "" ( - "%JAVA_HOME%/bin/java.exe" -version > nul 2>&1 - if errorlevel 0 if not errorlevel 1 ( - set "CUSTOM_JRE=%JAVA_HOME%" - ) else ( - echo "Your custom JRE [%JAVA_HOME%] read from JAVA_HOME is not valid. Please fix this." - ) -) -if "%CUSTOM_JRE%" == "" ( - if not "%INST_JAVA_HOME%" == "" ( - "%INST_JAVA_HOME%/bin/java.exe" -version > nul 2>&1 - if errorlevel 0 if not errorlevel 1 ( - set "CUSTOM_JRE=%INST_JAVA_HOME%" - ) else ( - echo "Your custom JRE [%INST_JAVA_HOME%] read from INST_JAVA_HOME is not valid. Please fix this." - ) - ) -) -if "%CUSTOM_JRE%" == "" ( - rem the following is for testing-only and not intended to be robust - rem will not work from 32-bit firefox - for /f "tokens=*" %%a in ('%windir%\System32\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit"') do set "_version_key=%%a" - set "_version=!_version_key:~58!" - for /f "tokens=*" %%a in ('%windir%\System32\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\!_version!" /v JavaHome') do set "_jh_key=%%a" - set "_BAD_SLASH_JAVA_HOME=!_jh_key:~22!" - set "_REG_JAVA_HOME=!_BAD_SLASH_JAVA_HOME:\=/!" - "!_REG_JAVA_HOME!/bin/java.exe" -version > nul 2>&1 - if errorlevel 0 if not errorlevel 1 ( - set "CUSTOM_JRE=!_REG_JAVA_HOME!" - ) else ( - echo "Your custom JRE [!_REG_JAVA_HOME!] read from Registry HKLM\SOFTWARE\JavaSoft\Java Development Kit is not valid. Please fix this." - ) - set "_version_key=" & set "_version=" & set "_jh_key=" & set "_BAD_SLASH_JAVA_HOME=" & set "_REG_JAVA_HOME=" -) - - -rem Support portable ITW: -if "%ITW_HOME%" == "" if not "%INST_ITW_HOME%" == "" ( - set "ITW_HOME=%INST_ITW_HOME%" -) -if not "%ITW_HOME%" == "" ( - set "BINARY_LOCATION=%ITW_HOME%/bin/%PROGRAM_NAME%.bat" - set "SPLASH_LOCATION=%ITW_HOME%/share/icedtea-web/javaws_splash.png" - set "RUN_ARGS_LOCATION=%ITW_HOME%/bin/itw-modularjdk.args" - set "NETX_JAR=%ITW_HOME%/share/icedtea-web/netx.jar" - set "PLUGIN_JAR=%ITW_HOME%/share/icedtea-web/plugin.jar" - set "JSOBJECT_JAR=%ITW_HOME%/share/icedtea-web/jsobject.jar" - set "LAUNCHER_BOOTCLASSPATH=-Xbootclasspath/a:!NETX_JAR!;!PLUGIN_JAR!;!JSOBJECT_JAR!;%ITW_HOME%/win-deps-runtime/tagsoup.jar;%ITW_HOME%/win-deps-runtime/js.jar;%ITW_HOME%/win-deps-runtime/mslinks.jar" -) - - -rem Fix classpaths for custom JRE: -if not "%CUSTOM_JRE%" == "" ( - set "JAVA=%CUSTOM_JRE%/bin/java" - set "CP=%CUSTOM_JRE%/lib/rt.jar;%CUSTOM_JRE%/lib/jfxrt.jar" - set "LAUNCHER_BOOTCLASSPATH=%LAUNCHER_BOOTCLASSPATH%;%CUSTOM_JRE%/%NASHORN%" -) else ( - set "LAUNCHER_BOOTCLASSPATH=%LAUNCHER_BOOTCLASSPATH%;%JRE%/%NASHORN%" -) - - -rem Support Modular JDK (jigsaw): -set "MODULAR_JDK=NO" - -rem Parse Java Version -set "fullversion=" -rem capture stderr with 2^>^&1 1^>con: -for /f "tokens=*" %%a in ('"%JAVA%" -version 2^>^&1 1^>con:') do ( - set "_versionLine=%%a" - echo !_versionLine! - if "!fullversion!" == "" ( - set "_unquoted=!_versionLine:"=@!" - for /f "tokens=2,3 delims=@.-" %%b in ("!_unquoted!") do ( - set "fullversion=%%b" - rem get second digit for "1.x.y" - if !fullversion! EQU 1 ( - set "fullversion=%%c" - ) - ) - ) -) -if %fullversion% GEQ 9 ( - set "MODULAR_JDK=YES" -) -set "_versionLine=" & set "_unquoted=" & set "fullversion=" - -set "MODULAR_ARGS=" -if "%MODULAR_JDK%" == "YES" ( - rem warning extra escaping - set "MODULAR_ARGS=--patch-module "java.desktop=%NETX_JAR%;%PLUGIN_JAR%"" - rem jsobject must be patched separately from plugin - rem otherwise netscape pkg would be shared by two modules, which is forbiden - rem plugin jar may not be built - if not "%JSOBJECT_JAR%" == "" ( - set "MODULAR_ARGS=!MODULAR_ARGS! --patch-module "jdk.jsobject=%JSOBJECT_JAR%"" - ) - rem add JDK9+ arg file: - set "MODULAR_ARGS=!MODULAR_ARGS! "@%RUN_ARGS_LOCATION%"" -) - - -rem Filter script args: -set "SPLASH=false" -if "%ICEDTEA_WEB_SPLASH%" == "" ( - set "SPLASH=true" -) - -set "JAVA_ARGS=" -set "ARGS=" - -for %%a IN (%*) do ( - set "_arg=%%a" - set "_beg=!_arg:~0,2!" - if "!_beg!" == "-J" ( - set "JAVA_ARGS=!JAVA_ARGS! !_arg:~2!" - ) else ( - set "ARGS=!ARGS! !_arg!" - if "!_arg:~0,1!" == "-" if not "x!_arg:headless=!" == "x!_arg!" ( - set "SPLASH=false" - ) - ) -) -set "_arg=" & set "_beg=" - - -rem Build Java command line: - -if "%SPLASH%" == "true" ( - set "SPLASH="-splash:%SPLASH_LOCATION%"" -) else ( - set "SPLASH=" -) - -"%JAVA%" %SPLASH% "%LAUNCHER_BOOTCLASSPATH%" %LAUNCHER_FLAGS% %MODULAR_ARGS% %JAVAWS_J_OPTIONS% %JAVA_ARGS% -classpath "%CP%" "-Dicedtea-web.bin.name=%PROGRAM_NAME%" "-Dicedtea-web.bin.location=%BINARY_LOCATION%" "%CLASSNAME%" %ARGS% - -SET "errno=%ERRORLEVEL%" - -echo Please press any key to close this window/get back prompt -pause > nul -EXIT /B %errno% -
  5. Download patch netx/net/sourceforge/jnlp/controlpanel/ClassFinder.java

    --- 1.7.2-2/netx/net/sourceforge/jnlp/controlpanel/ClassFinder.java 2019-03-11 19:48:28.507360684 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/controlpanel/ClassFinder.java 2019-03-12 14:44:53.027832847 +0000 @@ -74,7 +74,7 @@ public class ClassFinder extends JDialog for (String classpathEntry : classPathRoots) { //need to avoid base jdk jars/modules if (classpathEntry.toLowerCase().contains("icedtea-web") - || classpathEntry.toLowerCase().contains("netx") + || classpathEntry.toLowerCase().contains("javaws") || classpathEntry.toLowerCase().contains("plugin")) { File f = new File(classpathEntry); if (!f.exists()) {
  6. Download patch netx/net/sourceforge/jnlp/cache/CacheUtil.java

    --- 1.7.2-2/netx/net/sourceforge/jnlp/cache/CacheUtil.java 2019-03-11 19:48:28.517360673 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/cache/CacheUtil.java 2019-03-12 14:44:53.026832850 +0000 @@ -380,10 +380,10 @@ public class CacheUtil { FileChannel channel = fis.getChannel(); locking = channel.tryLock(); if (locking == null) { - OutputController.getLogger().log("Other instances of netx are running"); + OutputController.getLogger().log("Other instances of javaws are running"); return false; } - OutputController.getLogger().log("No other instances of netx are running"); + OutputController.getLogger().log("No other instances of javaws are running"); return true; } else {
  7. Download patch debian/rules

    --- 1.7.2-2/debian/rules 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/rules 2019-03-16 12:47:25.000000000 +0000 @@ -10,9 +10,10 @@ buildflags := CXXFLAGS='$(CPPFLAGS) $(CF override_dh_auto_configure: mkdir -p build/completion cd build && $(buildflags) ../configure --prefix=/usr \ - --bindir=/usr/share/icedtea-web/bin/ \ - --mandir=/usr/share/icedtea-web/man/ \ + --bindir=/usr/lib/icedtea-web/bin/ \ + --mandir=/usr/lib/icedtea-web/man/ \ --with-pkgversion="$(DEB_VERSION_UPSTREAM)" \ + --with-itw-libs=DISTRIBUTION \ --disable-docs \ --disable-pluginjar \ --disable-native_plugin \ @@ -20,12 +21,10 @@ 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 - MODULARJDK_ARGS_DIR=/usr/share/icedtea-web/bin/itw-modularjdk.args \ - $(MAKE) -C build VERSION_DEFS='-DHAVE_JAVA9' + HOME=$(CURDIR) dh_auto_build override_dh_auto_install: - $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp + HOME=$(CURDIR) $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp # compress manpages - find debian/tmp/usr/share/icedtea-web/man/man1/ -type f ! -type l | xargs gzip -9v -n + find debian/tmp/usr/lib/icedtea-web/man/man1/ -type f ! -type l | xargs gzip -9v -n
  8. Download patch debian/patches/no-dunce.diff

    --- 1.7.2-2/debian/patches/no-dunce.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0ubuntu8/debian/patches/no-dunce.diff 2019-03-13 16:20:57.000000000 +0000 @@ -0,0 +1,10 @@ +--- a/rust-launcher/Cargo.toml ++++ b/rust-launcher/Cargo.toml +@@ -2,7 +2,3 @@ + name = "launcher" + version = "1.8.0" + authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"] +- +-[dependencies] +-[target.'cfg(windows)'.dependencies] +-dunce = "0.1.1"
  9. Download patch rust-launcher/src/property_from_file.rs
  10. Download patch netx/net/sourceforge/jnlp/resources/Messages_ru.properties

    --- 1.7.2-2/netx/net/sourceforge/jnlp/resources/Messages_ru.properties 2019-03-11 19:48:28.505360686 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/resources/Messages_ru.properties 2019-03-12 14:44:53.032832837 +0000 @@ -113,8 +113,8 @@ LCantRead=\u041d\u0435 \u0443\u0434\u043 LCantReadInfo=\u041c\u043e\u0436\u043d\u043e \u043f\u043e\u043f\u0440\u043e\u0431\u043e\u0432\u0430\u0442\u044c \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0444\u0430\u0439\u043b \u0432\u0440\u0443\u0447\u043d\u0443\u044e \u0438 \u043e\u0442\u043f\u0440\u0430\u0432\u0438\u0442\u044c \u0435\u0433\u043e \u0432 \u043e\u0442\u0447\u0451\u0442\u0435 \u043e\u0431 \u043e\u0448\u0438\u0431\u043a\u0435 \u043a\u043e\u043c\u0430\u043d\u0434\u0435 IcedTea-Web. LNullLocation=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0444\u0430\u0439\u043b\u0430 .jnlp. LNullLocationInfo=\u0411\u044b\u043b\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0444\u0430\u0439\u043b\u0430 JNLP \u043d\u0430 \u0434\u0440\u0443\u0433\u043e\u0439 JVM, \u043d\u043e \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0444\u0430\u0439\u043b. \u0427\u0442\u043e\u0431\u044b \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0432\u043d\u0435\u0448\u043d\u044e\u044e JVM, \u0441\u0440\u0435\u0434\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u043e\u043b\u0436\u043d\u0430 \u0438\u043c\u0435\u0442\u044c \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043d\u0430\u0439\u0442\u0438 \u0444\u0430\u0439\u043b .jnlp \u043b\u0438\u0431\u043e \u0432 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u043e\u0439 \u0444\u0430\u0439\u043b\u043e\u0432\u043e\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u0435, \u043b\u0438\u0431\u043e \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435. -LNetxJarMissing=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0444\u0430\u0439\u043b netx.jar. -LNetxJarMissingInfo=\u0411\u044b\u043b\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0444\u0430\u0439\u043b\u0430 JNLP \u043d\u0430 \u0434\u0440\u0443\u0433\u043e\u0439 JVM, \u043d\u043e \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0444\u0430\u0439\u043b netx.jar. \u0427\u0442\u043e\u0431\u044b \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0432\u043d\u0435\u0448\u043d\u044e\u044e JVM, \u0441\u0440\u0435\u0434\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u043e\u043b\u0436\u043d\u0430 \u0438\u043c\u0435\u0442\u044c \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043d\u0430\u0439\u0442\u0438 \u0444\u0430\u0439\u043b netx.jar. +LNetxJarMissing=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0444\u0430\u0439\u043b javaws.jar. +LNetxJarMissingInfo=\u0411\u044b\u043b\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 \u043f\u043e\u043f\u044b\u0442\u043a\u0430 \u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0444\u0430\u0439\u043b\u0430 JNLP \u043d\u0430 \u0434\u0440\u0443\u0433\u043e\u0439 JVM, \u043d\u043e \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043d\u0430\u0439\u0442\u0438 \u0444\u0430\u0439\u043b javaws.jar. \u0427\u0442\u043e\u0431\u044b \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0432\u043d\u0435\u0448\u043d\u044e\u044e JVM, \u0441\u0440\u0435\u0434\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u0434\u043e\u043b\u0436\u043d\u0430 \u0438\u043c\u0435\u0442\u044c \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043d\u0430\u0439\u0442\u0438 \u0444\u0430\u0439\u043b javaws.jar. LNotToSpec=\u0424\u0430\u0439\u043b JNLP \u043d\u0435 \u043f\u043e\u043b\u043d\u043e\u0441\u0442\u044c\u044e \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0441\u043f\u0435\u0446\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f\u043c. LNotToSpecInfo=\u0424\u0430\u0439\u043b JNLP \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0434\u0430\u043d\u043d\u044b\u0435, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043d\u0435 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u044b \u0441\u043f\u0435\u0446\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0435\u0439 JNLP. \u0421\u0440\u0435\u0434\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u043f\u043e\u043f\u044b\u0442\u043a\u0443 \u0438\u0433\u043d\u043e\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043d\u0435\u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u043e\u0439 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u0438 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0437\u0430\u043f\u0443\u0441\u043a \u0444\u0430\u0439\u043b\u0430. LNotApplication=\u041d\u0435 \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0444\u0430\u0439\u043b\u043e\u043c \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f.
  11. Download patch debian/patches/javaws_change_java_policy.diff

    --- 1.7.2-2/debian/patches/javaws_change_java_policy.diff 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/patches/javaws_change_java_policy.diff 2019-03-13 16:20:57.000000000 +0000 @@ -8,9 +8,9 @@ Description: Prepend -Djava.security.man Author: Damien Raude-Morvan <drazzib@debian.org> Last-Update: 2011-09-21 Forwarded: no ---- a/launcher/launchers.sh.in -+++ b/launcher/launchers.sh.in -@@ -188,6 +188,10 @@ +--- a/shell-launcher/launchers.sh.in ++++ b/shell-launcher/launchers.sh.in +@@ -188,6 +188,11 @@ k=$((k+1)) COMMAND[k]="-Dicedtea-web.bin.location=${BINARY_LOCATION}" k=$((k+1)) @@ -18,6 +18,7 @@ Forwarded: no +k=$((k+1)) +COMMAND[k]="-Djava.security.policy=/etc/icedtea-web/javaws.policy" +k=$((k+1)) ++ COMMAND[k]="${CLASSNAME}" k=$((k+1)) j=0
  12. Download patch debian/control

    --- 1.7.2-2/debian/control 2019-03-17 21:37:59.000000000 +0000 +++ 1.8-0ubuntu8/debian/control 2019-03-16 12:35:06.000000000 +0000 @@ -7,17 +7,19 @@ Build-Depends: debhelper (>= 11), default-jdk, dh-exec, - librhino-java, - libtagsoup-java, pkg-config, - zip + zip, + libtagsoup-java, + librhino-java, + rustc, cargo, + bc Standards-Version: 4.2.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 Package: icedtea-netx -Architecture: all +Architecture: any Depends: ${misc:Depends}, default-jre, librhino-java, libtagsoup-java Breaks: icedtea-netx-common (<< 1.7.1-1~), @@ -28,13 +30,11 @@ Replaces: openjdk-6-jre (<< 6b18-1.8.7-3), openjdk-6-jre-headless (<< 6b18-1.8.7-3) Provides: icedtea-netx-common -Description: Implementation of the Java Network Launching Protocol (JNLP) +Description: NetX - implementation of the Java Network Launching Protocol (JNLP) NetX provides a drop-in replacement for javaws (Java Web Start). Since - upstream NetX is dead, the IcedTea Web project is hosting a fork of the - original code. However, as icedtea-web has evolved to complex set of tools, - extensions and tests, it has now only a few lines of code shared with the - original implementation. + upstream NetX is dormant, IcedTea is hosting and modifying the sources + in the IcedTea-Web directory. . IcedTea's NetX currently supports verification of signed jars, trusted certificate storing, system certificate store checking, and provides - the services specified by the JNLP API. + the services specified by the jnlp API.
  13. Download patch netx/net/sourceforge/jnlp/resources/Messages.properties

    --- 1.7.2-2/netx/net/sourceforge/jnlp/resources/Messages.properties 2019-03-11 19:48:28.503360689 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/resources/Messages.properties 2019-03-12 14:44:53.038832825 +0000 @@ -133,8 +133,8 @@ LCantRead=Could not read or parse the JN LCantReadInfo=You can try to download this file manually and send it as bug report to IcedTea-Web team. LNullLocation=Could not determine .jnlp file location. LNullLocationInfo=An attempt was made to launch a JNLP file in another JVM, but the file could not be located. In order to launch in an external JVM, the runtime must be able to locate the .jnlp file either in the local file system or on a server. -LNetxJarMissing=Could not determine location of netx.jar. -LNetxJarMissingInfo=An attempt was made to launch a JNLP file in another JVM, but the netx.jar could not be located. In order to launch in an external JVM, the runtime must be able to locate the netx.jar file. +LNetxJarMissing=Could not determine location of javaws.jar. +LNetxJarMissingInfo=An attempt was made to launch a JNLP file in another JVM, but the javaws.jar could not be located. In order to launch in an external JVM, the runtime must be able to locate the javaws.jar file. LNotToSpec=JNLP file not strictly to specifications. LNotToSpecInfo=The JNLP file contains data that is prohibited by the JNLP specification. The runtime can attempt to ignore the invalid information and continue launching the file. LNotApplication=Not an application file. @@ -586,6 +586,7 @@ DCmaindircheckNotdir=Your configuration DCmaindircheckRwproblem=Your configuration directory {0} cannot be read/written properly. # Value Validator messages. Messages should follow "Possible values ..." +VVRustCpModifiers=Rust native launchers only! CP and XBootCP properties are space separated members of bootcp/cp to be removed or added. eg `...cp.add=/usr/java/rhino.jar /usr/java/scary.jar` will add those two jars to cp. Eg: `...bootcp.remove=rhino.jar tagsoup.jar` will remove those two jars no meter of path. Removal is done first. VVPossibleValues=Possible values {0} VVPossibleBooleanValues=are {0} or {1} VVPossibleFileValues=include an absolute path to a file or directory
  14. Download patch debian/icedtea-netx.links
  15. Download patch ChangeLog
  16. Download patch configure.ac

    --- 1.7.2-2/configure.ac 2019-03-11 19:48:28.489360705 +0000 +++ 1.8-0ubuntu8/configure.ac 2019-03-12 14:44:53.019832864 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea-web],[1.7.2],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web]) +AC_INIT([icedtea-web],[1.8],[distro-pkg-dev@openjdk.java.net], [icedtea-web], [http://icedtea.classpath.org/wiki/IcedTea-Web]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile netx.manifest]) AM_MAINTAINER_MODE([enable]) @@ -41,10 +41,32 @@ fi IT_CHECK_MODULARJDK_ARGS -#shell launchers are only opinion for 1.7 -AM_CONDITIONAL([ENABLE_SHELL_LAUNCHERS], [true]) -#native launchers do not exists in 1.7 -AM_CONDITIONAL([ENABLE_NATIVE_LAUNCHERS], [false]) +AC_MSG_CHECKING([whether build legacy shell launchers]) +AC_ARG_ENABLE([shell-launchers], + [AS_HELP_STRING([--enable-shell-launchers], + [Enable build of legacy shell launchers])], + [ENABLE_SHELL_LAUNCHERS="${enableval}"], [ENABLE_SHELL_LAUNCHERS='no']) +AM_CONDITIONAL([ENABLE_SHELL_LAUNCHERS], [test x$ENABLE_SHELL_LAUNCHERS = xyes]) +AC_MSG_RESULT(${ENABLE_SHELL_LAUNCHERS}) + +AC_PATH_PROG([RUSTC], [rustc],,) +if test x"$RUSTC" = x ; then + if test x${ENABLE_SHELL_LAUNCHERS} = xno ; then + AC_MSG_ERROR([rust is used to compile launchers. No go]) + else + echo "rust is used to compile launchers, is missing but you have enable-shell-launchers as yes, continuing with UNMAINTAINED shell launchers only" + fi +else + AC_PATH_PROG([CARGO], [cargo],,) + if test x"$CARGO" = x ; then + if test x${ENABLE_SHELL_LAUNCHERS} = xno ; then + AC_MSG_ERROR([cargo is used to call rustc for launchers. No go]) + else + echo "cargo is used to manage launchers sources, is missing but you have enable-shell-launchers as yes, continuing with UNMAINTAINED shell launchers only" + fi + fi +fi +AM_CONDITIONAL([ENABLE_NATIVE_LAUNCHERS], [test ! x"$RUSTC" = x -a ! x"$CARGO" = x]) build_linux=no build_windows=no @@ -71,6 +93,28 @@ AC_ARG_ENABLE([bats-on-linux], AM_CONDITIONAL([WINDOWS_OR_INCLUDE_BATS], [test "x$WINDOWS_OR_INCLUDE_BATS" = "xyes" -o "$build_windows" = "yes" ]) AC_MSG_RESULT(${WINDOWS_OR_INCLUDE_BATS}) +IT_CHECK_WITH_KCOV + +AC_MSG_CHECKING([how to search for libraries in native launchers]) +AC_ARG_WITH([itw-libs], + [AS_HELP_STRING([--with-itw-libs], + [set way of searching system for jar depndencies - BUNDLED, for portable build (in application space); DISTRIBUTION, for linux (in installed path); BOTH, for both usages (should be for testing only])], [ITW_LIBS="${withval}"], [ITW_LIBS='none']) +if test "x$build_windows" = xyes ; then + if test x"$ITW_LIBS" = xnone -o x"$ITW_LIBS" = x; then + ITW_LIBS="BUNDLED" + echo -n "On Windows, presetting missing --with-itw-libs ITW_LIBS to $ITW_LIBS. " + echo -n "On Windows, DISTRIBUTION nor BOTH do not have much sense... " + fi +fi +AC_MSG_RESULT(${ITW_LIBS}) +AC_SUBST(ITW_LIBS) +if test x"$ITW_LIBS" = xnone -o x"$ITW_LIBS" = x; then + AC_MSG_ERROR([missing --with-itw-libs; mandatory on linux. Use BUNDLED, DISTRIBUTION or BOTH. use BOTH with care. ]) +fi +if test ! "$ITW_LIBS" = BUNDLED -a ! "$ITW_LIBS" = DISTRIBUTION -a ! "$ITW_LIBS" = BOTH; then + AC_MSG_ERROR([incorrect --with-itw-libs; mandatory are BUNDLED, DISTRIBUTION or BOTH ]) +fi + IT_CHECK_WITH_GCJ FIND_TOOL([ZIP], [zip]) FIND_JAVAC
  17. Download patch netx/net/sourceforge/jnlp/resources/Messages_pl.properties

    --- 1.7.2-2/netx/net/sourceforge/jnlp/resources/Messages_pl.properties 2019-03-11 19:48:28.515360675 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/resources/Messages_pl.properties 2019-03-12 14:44:53.031832839 +0000 @@ -110,8 +110,8 @@ LCantRead=Nie mo\u017cna odczyta\u0107 l LCantReadInfo=Mo\u017cesz spr\u00f3bowa\u0107 r\u0119cznie pobra\u0107 ten plik i wys\u0142a\u0107 go razem ze zg\u0142oszeniem b\u0142\u0119du do zespo\u0142u IcedTea-Web. LNullLocation=Nie mo\u017cna ustali\u0107 lokalizacj\u0119 pliku .jnlp. LNullLocationInfo=Podj\u0119to pr\u00f3b\u0119 wystartowania pliku JNLP w innej JVM, lecz nie mo\u017cna by\u0142o zlokalizowa\u0107 plik. Aby wystartowa\u0107 w zewn\u0119trznej JVM, uruchomienie programowe musi by\u0107 w stanie zlokalizowa\u0107 plik .jnlp albo w lokalnym systemie plik\u00f3w czy na serwerze. -LNetxJarMissing=Nie mo\u017cna ustali\u0107 lokalizacj\u0119 netx.jar. -LNetxJarMissingInfo=Podj\u0119to pr\u00f3b\u0119 wystartowania pliku JNLP w innej JVM, lecz nie mo\u017cna by\u0142o zlokalizowa\u0107 netx.jar. Aby wystartowa\u0107 w zewn\u0119trznej JVM, uruchomienie programowe musi by\u0107 w stanie zlokalizowa\u0107 plik netx.jar. +LNetxJarMissing=Nie mo\u017cna ustali\u0107 lokalizacj\u0119 javaws.jar. +LNetxJarMissingInfo=Podj\u0119to pr\u00f3b\u0119 wystartowania pliku JNLP w innej JVM, lecz nie mo\u017cna by\u0142o zlokalizowa\u0107 javaws.jar. Aby wystartowa\u0107 w zewn\u0119trznej JVM, uruchomienie programowe musi by\u0107 w stanie zlokalizowa\u0107 plik javaws.jar. LNotToSpec=Plik JNLP nie spe\u0142nia \u015bci\u015ble specyfikacji. LNotToSpecInfo=Plik JNLP zawiera dane, kt\u00f3re s\u0105 zabronione wed\u0142ug specyfikacji JNLP. Uruchomienie programowe mo\u017ce pr\u00f3bowa\u0107 ignorowa\u0107 niepoprawne informacje i kontynuowa\u0107 startowanie pliku. LNotApplication=Brak pliku applet-owego.
  18. Download patch debian/patches/jdk11.diff
  19. Download patch rust-launcher/src/main.rs
  20. Download patch rust-launcher/src/log_helper.rs

    --- 1.7.2-2/rust-launcher/src/log_helper.rs 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0ubuntu8/rust-launcher/src/log_helper.rs 2019-03-12 14:44:53.055832789 +0000 @@ -0,0 +1,95 @@ +//this module was created as std::io::Write; and std::fmt::Write; hcat be imoted together +//adn still, there are different methods. Notably writeln is only in io version. but format! is only in fmt version +use os_access; +use std::fs::OpenOptions; +use std::io::Write; +use std::time::SystemTime; +use std::time::UNIX_EPOCH; +use std::fs::File; +use property_from_files_resolver; + +static mut FIRST: bool = true; + +//0 critical +//1 info +//2 debug only +pub fn log_impl(level: i32, os: &os_access::Os, s: &str) { + if level == 0 { + if os.advanced_logging().log_to_stdstreams { + println!("{}", s); + } + if os.advanced_logging().log_to_system { + let mut info2 = String::from("IcedTea-Web nativerustlauncher error. Consult - https://icedtea.classpath.org/wiki/IcedTea-Web\n"); + info2.push_str(s); + os.system_log(&info2); + } + } else if level == 1 { + if os.advanced_logging().log_to_stdstreams { + println!("{}", s); + } + } else if level == 2 { + if os.is_verbose() { + if os.advanced_logging().log_to_stdstreams { + println!("{}", s); + } + } + } + if os.advanced_logging().log_to_file { + unsafe { + if FIRST { + FIRST = false; + std::fs::create_dir_all(os.advanced_logging().log_target_file.parent().expect("hard to imagine log file without parent")); + let start = SystemTime::now(); + let t = start.duration_since(UNIX_EPOCH).expect("time should be measureable"); + let mut file = File::create(&os.advanced_logging().log_target_file).expect("failed to create file log"); + let allsec = t.as_secs(); + let sec = allsec % 60; + let min = (allsec / 60) % 60; + let h = allsec / (60 * 60); + if let Err(e) = write!(&mut file, "itw-rust-debug: file log started: {}:{}:{}\n", h, min, sec) { + println!("Couldn't write to file: {}", e); + } + file.sync_all(); + } + } + let mut file = OpenOptions::new() + .write(true) + .append(true) + .open(&os.advanced_logging().log_target_file) + .expect("failed to append to file log"); + + if let Err(e) = writeln!(&mut file, "{}", s) { + println!("Couldn't write to file: {}", e); + } + file.sync_all(); + } +} + +pub struct AdvancedLogging { + pub log_to_file: bool, + pub log_target_file: std::path::PathBuf, + pub log_to_stdstreams: bool, + pub log_to_system: bool, +} + +impl Default for AdvancedLogging { + fn default() -> AdvancedLogging { + AdvancedLogging { + log_to_file: false, + log_target_file: std::path::PathBuf::from("undeffined"), + log_to_stdstreams: true, + log_to_system: true, + } + } +} + +impl AdvancedLogging { + pub fn load(os: &os_access::Os) -> AdvancedLogging { + AdvancedLogging { + log_to_file: property_from_files_resolver::try_log_to_file_from_properties(os), + log_to_stdstreams: property_from_files_resolver::try_log_to_streams_from_properties(os), + log_to_system: property_from_files_resolver::try_log_to_system_from_properties(os), + log_target_file: property_from_files_resolver::try_logtarget_from_properties(os), + } + } +} \ No newline at end of file
  21. Download patch configure
  22. Download patch rust-launcher/src/hardcoded_paths.rs

    --- 1.7.2-2/rust-launcher/src/hardcoded_paths.rs 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0ubuntu8/rust-launcher/src/hardcoded_paths.rs 2019-03-12 14:44:53.058832783 +0000 @@ -0,0 +1,190 @@ +use os_access; +use env; +use std::string::String; +use std::fmt::Write; +use std::str::FromStr; + +/*legacy variables*/ +const PROGRAM_NAME: Option<&'static str> = option_env!("PROGRAM_NAME"); +const LAUNCHER_BOOTCLASSPATH: Option<&'static str> = option_env!("LAUNCHER_BOOTCLASSPATH"); +const SPLASH_PNG: Option<&'static str> = option_env!("SPLASH_PNG"); +const JAVA: Option<&'static str> = option_env!("JAVA"); +const JRE: Option<&'static str> = option_env!("JRE"); +const MAIN_CLASS: Option<&'static str> = option_env!("MAIN_CLASS"); +const BIN_LOCATION: Option<&'static str> = option_env!("BIN_LOCATION"); +const NETX_JAR: Option<&'static str> = option_env!("NETX_JAR"); +const PLUGIN_JAR: Option<&'static str> = option_env!("PLUGIN_JAR"); +const JSOBJECT_JAR: Option<&'static str> = option_env!("JSOBJECT_JAR"); +const TAGSOUP_JAR: Option<&'static str> = option_env!("TAGSOUP_JAR"); +const RHINO_JAR: Option<&'static str> = option_env!("RHINO_JAR"); +const ITW_LIBS: Option<&'static str> = option_env!("ITW_LIBS"); +const MODULARJDK_ARGS_LOCATION: Option<&'static str> = option_env!("MODULARJDK_ARGS_LOCATION"); +const MSLINKS_JAR: Option<&'static str> = option_env!("MSLINKS_JAR"); + + +pub fn get_jre() -> &'static str { + JRE.unwrap_or("JRE-dev-unspecified") +} + +pub fn get_java() -> &'static str { + JAVA.unwrap_or("JAVA-dev-unspecified") +} + +pub fn get_main() -> &'static str { + MAIN_CLASS.unwrap_or("MAIN_CLASS-dev-unspecified") +} + +pub fn get_name() -> &'static str { + PROGRAM_NAME.unwrap_or("PROGRAM_NAME-dev-unspecified") +} + +pub fn get_bin() -> &'static str { + BIN_LOCATION.unwrap_or("BIN_LOCATION-dev-unspecified") +} + +pub fn get_splash() -> &'static str { + SPLASH_PNG.unwrap_or("SPLASH_PNG-dev-unspecified") +} + +pub fn get_netx() -> &'static str { NETX_JAR.unwrap_or("NETX_JAR-dev-unspecified") } + +fn get_itwlibsearch() -> &'static str { + ITW_LIBS.unwrap_or("ITW_LIBS-dev-unspecified") +} + +pub fn get_bootcp() -> &'static str {LAUNCHER_BOOTCLASSPATH.unwrap_or("LAUNCHER_BOOTCLASSPATH-dev-unspecified") } + +// optional deps +pub fn get_plugin() -> Option<&'static str> { sanitize(PLUGIN_JAR) } + +pub fn get_jsobject() -> Option<&'static str> { sanitize(JSOBJECT_JAR) } + +pub fn get_tagsoup() -> Option<&'static str> { sanitize(TAGSOUP_JAR) } + +pub fn get_rhino() -> Option<&'static str> { sanitize(RHINO_JAR) } + +pub fn get_mslinks() -> Option<&'static str> { sanitize(MSLINKS_JAR) } + +pub fn get_argsfile() -> &'static str { + MODULARJDK_ARGS_LOCATION.unwrap_or("MODULARJDK_ARGS_LOCATION-dev-unspecified") +} + +//unluckily, option_env can go wild and retunr Some("") isntead of None. Fixing here. +fn sanitize(candidate: Option<&'static str>) -> Option<&'static str> { + match candidate { + Some(s) => { + if !String::from(String::from(s).trim()).is_empty() { + return candidate; + } else { + return None; + } + } + _none => { + return None; + } + } +} + + +#[derive(PartialEq)] +pub enum ItwLibSearch { + BUNDLED, + DISTRIBUTION, + BOTH, +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct ParseItwLibSearch { _priv: () } + +impl FromStr for ItwLibSearch { + + type Err = ParseItwLibSearch; + + fn from_str(sstr: &str) -> Result<ItwLibSearch, ParseItwLibSearch> { + if sstr == "BOTH" { + return Ok(ItwLibSearch::BOTH); + } + if sstr == "BUNDLED" { + return Ok(ItwLibSearch::BUNDLED); + } + if sstr == "DISTRIBUTION" { + return Ok(ItwLibSearch::DISTRIBUTION); + } + return Err(ParseItwLibSearch { _priv: () }) + } +} + +pub fn get_libsearch(logger: &os_access::Os) -> ItwLibSearch { + let itw_libs_override = env::var("ITW_LIBS"); + match itw_libs_override { + Ok(result_of_override_var) => match ItwLibSearch::from_str(&result_of_override_var) { + Ok(result_of_override_to_enum) => { + return result_of_override_to_enum; + } + _err => { + let mut info = String::new(); + write!(&mut info, "ITW-LIBS provided, but have invalid value of {}. Use BUNDLED, DISTRIBUTION or BOTH", result_of_override_var); + logger.important(&info); + } + } + _error => { + //no op, continuing via get_itwlibsearch + } + } + match ItwLibSearch::from_str(get_itwlibsearch()) { + Ok(v) => { + return v + } + _err=> { + panic!("itw-lib search out of range"); + } + } +} + + +/*new variables*/ + +/*tests*/ +#[cfg(test)] +mod tests { + use std::str::FromStr; + + #[test] + fn variables_non_default() { + assert_ne!(String::from(super::get_jre()).trim(), String::from("JRE-dev-unspecified")); + assert_ne!(String::from(super::get_java()).trim(), String::from("JAVA-dev-unspecified")); + assert_ne!(String::from(super::get_main()).trim(), String::from("MAIN_CLASS-dev-unspecified")); + assert_ne!(String::from(super::get_name()).trim(), String::from("PROGRAM_NAME-dev-unspecified")); + assert_ne!(String::from(super::get_bin()).trim(), String::from("BIN_LOCATION-dev-unspecified")); + assert_ne!(String::from(super::get_splash()).trim(), String::from("SPLASH_PNG-dev-unspecified")); + assert_ne!(String::from(super::get_netx()).trim(), String::from("NETX_JAR-dev-unspecified")); + assert_ne!(String::from(super::get_itwlibsearch()).trim(), String::from("ITW_LIBS-dev-unspecified")); + assert_ne!(String::from(super::get_argsfile()).trim(), String::from("MODULARJDK_ARGS_LOCATION-dev-unspecified")); + } + + #[test] + fn variables_non_empty() { + assert_ne!(String::from(super::get_jre()).trim(), String::from("")); + assert_ne!(String::from(super::get_java()).trim(), String::from("")); + assert_ne!(String::from(super::get_main()).trim(), String::from("")); + assert_ne!(String::from(super::get_name()).trim(), String::from("")); + assert_ne!(String::from(super::get_bin()).trim(), String::from("")); + assert_ne!(String::from(super::get_splash()).trim(), String::from("")); + assert_ne!(String::from(super::get_netx()).trim(), String::from("")); + assert_ne!(String::from(super::get_itwlibsearch()).trim(), String::from("")); + assert_ne!(String::from(super::get_argsfile()).trim(), String::from("")); + } + + #[test] + fn get_itwlibsearch_in_enumeration() { + assert_eq!(super::get_itwlibsearch() == "BOTH" || super::get_itwlibsearch() == "BUNDLED" || super::get_itwlibsearch() == "DISTRIBUTION", true); + } + + #[test] + fn itw_libsearch_to_enum_test() { + assert!(super::ItwLibSearch::from_str("BUNDLED") == Ok(super::ItwLibSearch::BUNDLED)); + assert!(super::ItwLibSearch::from_str("BOTH") == Ok(super::ItwLibSearch::BOTH)); + assert!(super::ItwLibSearch::from_str("DISTRIBUTION") == Ok(super::ItwLibSearch::DISTRIBUTION)); + assert!(super::ItwLibSearch::from_str("") == Err(super::ParseItwLibSearch { _priv: () })); + } +}
  23. Download patch netx/net/sourceforge/jnlp/resources/Messages_de.properties

    --- 1.7.2-2/netx/net/sourceforge/jnlp/resources/Messages_de.properties 2019-03-11 19:48:28.502360690 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/resources/Messages_de.properties 2019-03-12 14:44:53.034832833 +0000 @@ -129,8 +129,8 @@ LCantRead=Konnte die JNLP-Datei nicht le LCantReadInfo=Die Datei kann m\u00f6glicherweise manuell heruntergeladen und als Fehlerbericht an das IcedTea-Web Team gesendet werden. LNullLocation=Konnte den Ort der .jnlp Datei nicht bestimmen. LNullLocationInfo=Es wurde versucht eine JNLP-Datei in einer anderen JVM zu starten, aber die Datei konnte am Ort nicht ermittelt werden. Um in einer externen JVM zu starten, muss die Laufzeitumgebung in der Lage sein die .jnlp Datei entweder auf dem lokalen Dateisystem oder einem Server zu ermitteln. -LNetxJarMissing=Konnte den Ort von netx.jar nicht bestimmen. -LNetxJarMissingInfo=Ein wurde versucht eine JNLP-Datei in einer anderen JVM zu starten, aber das netx.jar konnte am Ort nicht ermittelt werden. Um in einer externen JVM zu starten, muss die Laufzeitumgebung in der Lage sein das netx.jar zu ermitteln. +LNetxJarMissing=Konnte den Ort von javaws.jar nicht bestimmen. +LNetxJarMissingInfo=Ein wurde versucht eine JNLP-Datei in einer anderen JVM zu starten, aber das javaws.jar konnte am Ort nicht ermittelt werden. Um in einer externen JVM zu starten, muss die Laufzeitumgebung in der Lage sein das javaws.jar zu ermitteln. LNotToSpec=JNLP-Datei nicht strikt nach Spezifikation. LNotToSpecInfo=Die JNLP-Datei enth\u00e4lt Daten, die nach JNLP Spezifikation verboten sind. Die Laufzeitumgebung kann versuchen die ung\u00fcltigen Information zu ignorieren und die Datei zu starten fortfahren. LNotApplication=Keine Anwendungsdatei.
  24. Download patch debian/icedtea-netx.mime

    --- 1.7.2-2/debian/icedtea-netx.mime 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/icedtea-netx.mime 2019-03-13 16:20:57.000000000 +0000 @@ -1 +1 @@ -application/x-java-jnlp-file; /usr/share/icedtea-web/bin/javaws %s +application/x-java-jnlp-file; /usr/lib/icedtea-web/bin/javaws %s
  25. Download patch NEWS

    --- 1.7.2-2/NEWS 2019-03-11 19:48:28.489360705 +0000 +++ 1.8-0ubuntu8/NEWS 2019-03-12 14:44:53.019832864 +0000 @@ -8,7 +8,7 @@ GX - http://bugs.gentoo.org/show_bug.cg CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY -New in release 1.7.2 (2019-03-11): +New in release 1.8 (2019-03-12): * added support for javafx-desc and so allwong run of pure-javafx only applications * --nosecurity enhanced for possibility to skip invalid signatures * enhanced to allow resources to be read also from j2se/java element (OmegaT) @@ -17,13 +17,9 @@ New in release 1.7.2 (2019-03-11): * Added support for windows desktop shortcuts via https://github.com/DmitriiShamrikov/mslinks * cache can now be operated by groups, list by -Xcacheids (details via -verbose, can filter by regex), Xclearcache now can clear only selected id. There is also gui to operate cache via id in itweb-settings now. * desktop shortcut name get shortened to title or file if title is missing. +* shared native launchers * scripted launchers rework: Windows bat launchers rewritten to be feature complete, Linux shell launchers made portable, build enhanced to produce platform independent image -New in release 1.7.1 (2017-12-15): -* better work with authors file -* better work with jdk9 -* Added possibility to turn off https preference via deployment properties - New in release 1.7 (2017-07-19): * PR3366 - bash completion file was split to three, and is setup-able by bashcompdir environment variable * added experimental support for windows
  26. Download patch launcher/launchers.sh.in
  27. Download patch debian/icedtea-netx.install

    --- 1.7.2-2/debian/icedtea-netx.install 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/icedtea-netx.install 2019-03-13 16:20:57.000000000 +0000 @@ -5,7 +5,8 @@ debian/*.desktop debian/icedtea-netx-web-start.applications /usr/share/application-registry/ debian/icedtea-netx-web-start.keys /usr/share/mime-info/ debian/icedtea-netx-web-start.mime /usr/share/mime-info/ -debian/tmp/usr/share/icedtea-web/* /usr/share/icedtea-web/ +debian/tmp/usr/lib/icedtea-web/* /usr/lib/icedtea-web/ +debian/tmp/usr/share/icedtea-web/* /usr/share/icedtea-web/ debian/tmp/usr/share/pixmaps/javaws.png /usr/share/pixmaps/ # Icons
  28. Download patch netx/net/sourceforge/jnlp/config/Defaults.java

    --- 1.7.2-2/netx/net/sourceforge/jnlp/config/Defaults.java 2019-03-11 19:48:28.518360672 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/config/Defaults.java 2019-03-12 14:44:53.027832847 +0000 @@ -465,7 +465,33 @@ public class Defaults { DeploymentConfiguration.KEY_SMALL_SIZE_OVERRIDE_TRESHOLD, BasicValueValidators.getRangedIntegerValidator(0, 1000), String.valueOf(10)// treshold when applet is considered as too small + }, + //************** + //* Native (rust) only - beggin + //************** + { + "deployment.launcher.rust.cp.add", + new BasicValueValidators.RustCpValidator(), + "" + }, + { + "deployment.launcher.rust.cp.remove", + new BasicValueValidators.RustCpValidator(), + "" + }, + { + "deployment.launcher.rust.bootcp.add", + new BasicValueValidators.RustCpValidator(), + null + }, + { + "deployment.launcher.rust.bootcp.remove", + new BasicValueValidators.RustCpValidator(), + "" } + //************** + //* Native (rust) only - end + //************** }; HashMap<String, Setting<String>> result = new HashMap<>();
  29. Download patch debian/patches/series

    --- 1.7.2-2/debian/patches/series 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/patches/series 2019-03-16 12:45:17.000000000 +0000 @@ -1,5 +1,6 @@ am-maintainer-mode.diff javaws_change_java_policy.diff doc-english-only.diff -disable-applet-support.diff -java11-compatibility.diff +jdk11.diff +no-dunce.diff +destdir-autoconf.diff
  30. Download patch debian/patches/am-maintainer-mode.diff

    --- 1.7.2-2/debian/patches/am-maintainer-mode.diff 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/patches/am-maintainer-mode.diff 2019-03-13 16:20:57.000000000 +0000 @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -12,6 +12,8 @@ +@@ -12,6 +12,8 @@ abs_top_srcdir=`pwd` cd $abs_top_builddir AC_SUBST(abs_top_srcdir)
  31. Download patch acinclude.m4

    --- 1.7.2-2/acinclude.m4 2019-03-11 19:48:28.491360702 +0000 +++ 1.8-0ubuntu8/acinclude.m4 2019-03-12 14:44:53.024832854 +0000 @@ -1165,6 +1165,27 @@ AC_DEFUN_ONCE([IT_CHECK_FOR_WIX], fi ]) + +AC_DEFUN([IT_CHECK_WITH_KCOV], +[ + AC_MSG_CHECKING([whether enable rust code coverage]) + AC_ARG_WITH([kcov], + [AS_HELP_STRING(--with-kcov,location of kcov directory)], + [ + KCOV="${withval}" + ], + [ + KCOV="no" + ]) + AC_MSG_RESULT([${KCOV}]) + if ! test "x${KCOV}" = "xno" ; then + if ! test -d "${KCOV}" ; then + AC_MSG_ERROR("kcov schould point to direcotry or - default - no") + fi + fi + AC_SUBST([KCOV]) +]) + AC_DEFUN([IT_CHECK_MODULARJDK_ARGS], [ AC_MSG_CHECKING([where to place file with modular switches])
  32. Download patch rust-launcher/src/dirs_paths_helper.rs
  33. Download patch debian/patches/disable-applet-support.diff

    --- 1.7.2-2/debian/patches/disable-applet-support.diff 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/patches/disable-applet-support.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -Description: Don't build the applet related code -Author: Emmanuel Bourg <ebourg@apache.org> -Forwarded: no ---- a/configure.ac -+++ b/configure.ac -@@ -136,7 +136,6 @@ - fi - IT_CHECK_FOR_CLASS(COM_SUN_JNDI_TOOLKIT_URL_URLUTIL, [com.sun.jndi.toolkit.url.UrlUtil], [some.pkg], [$JAVA_NAMING]) - IT_CHECK_FOR_CLASS(SUN_NET_WWW_PROTOCOL_HTTP_HANDLER, [sun.net.www.protocol.http.Handler], [some.pkg], [$JAVA_BASE]) --IT_CHECK_FOR_CLASS(SUN_APPLET_APPLETIMAGEREF, [sun.applet.AppletImageRef], [sun.applet], [$JAVA_DESKTOP]) - - IT_CHECK_FOR_SUN_APPLET_ACCESSIBILITY - IT_CHECK_GLIB_VERSION ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1048,6 +1048,7 @@ - else - it_cv_applet_hole=no; - fi -+it_cv_applet_hole=yes; - ]) - rm -f $CLASS *.class - cd .. ---- a/Makefile.am -+++ b/Makefile.am -@@ -916,11 +916,11 @@ - (cd $(NETX_DIR) ; \ - mkdir -p lib ; \ - $(SYSTEM_JDK_DIR)/bin/jar cfm lib/classes.jar \ -- $(TOP_BUILD_DIR)/netx.manifest javax/jnlp net sun; \ -+ $(TOP_BUILD_DIR)/netx.manifest javax/jnlp net; \ - cp -pPR $(SRC_DIR_LINK) $(NETX_SRCDIR) src; \ - find src -type f -exec chmod 640 '{}' ';' -o -type d -exec chmod 750 '{}' ';'; \ - cd src ; \ -- $(ZIP) -qr $(NETX_DIR)/lib/src.zip javax net sun) -+ $(ZIP) -qr $(NETX_DIR)/lib/src.zip javax net) - mkdir -p stamps - touch $@ -
  34. Download patch debian/patches/java11-compatibility.diff

    --- 1.7.2-2/debian/patches/java11-compatibility.diff 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/patches/java11-compatibility.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -Description: Fixes the compatibility with Java 11 -Author: Emmanuel Bourg <ebourg@apache.org> -Forwarded: no ---- a/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java -+++ b/netx/net/sourceforge/jnlp/runtime/JNLPSecurityManager.java -@@ -340,33 +340,6 @@ - } - - /** -- * Checks whether the window can be displayed without an applet -- * warning banner, and adds the window to the list of windows to -- * be disposed when the calling application exits. -- */ -- @Override -- public boolean checkTopLevelWindow(Object window) { -- ApplicationInstance app = getApplication(); -- -- // remember window -> application mapping for focus, close on exit -- if (app != null && window instanceof Window) { -- Window w = (Window) window; -- -- OutputController.getLogger().log(OutputController.Level.ERROR_DEBUG, "SM: app: " + app.getTitle() + " is adding a window: " + window + " with appContext " + AppContext.getAppContext()); -- -- weakWindows.add(w); // for mapping window -> app -- weakApplications.add(app); -- -- app.addWindow(w); -- } -- -- // todo: set awt.appletWarning to custom message -- // todo: logo on with glass pane on JFrame/JWindow? -- -- return super.checkTopLevelWindow(window); -- } -- -- /** - * Checks whether the caller can exit the system. This method - * identifies whether the caller is a real call to Runtime.exec - * and has special behavior when returning from this method -@@ -449,33 +422,4 @@ - } - - } -- -- /** -- * Tests if a client can get access to the AWT event queue. This version allows -- * complete access to the EventQueue for its own AppContext-specific EventQueue. -- * -- * FIXME there are probably huge security implications for this. Eg: -- * http://hg.openjdk.java.net/jdk7/awt/jdk/rev/8022709a306d -- * -- * @exception SecurityException if the caller does not have -- * permission to accesss the AWT event queue. -- */ -- @Override -- public void checkAwtEventQueueAccess() { -- /* -- * this is the templace of the code that should allow applets access to -- * eventqueues -- */ -- -- // AppContext appContext = AppContext.getAppContext(); -- // ApplicationInstance instance = getApplication(); -- -- // if ((appContext == mainAppContext) && (instance != null)) { -- // If we're about to allow access to the main EventQueue, -- // and anything untrusted is on the class context stack, -- // disallow access. -- super.checkAwtEventQueueAccess(); -- // } -- } -- - }
  35. Download patch debian/patches/destdir-autoconf.diff

    --- 1.7.2-2/debian/patches/destdir-autoconf.diff 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0ubuntu8/debian/patches/destdir-autoconf.diff 2019-03-15 10:07:58.000000000 +0000 @@ -0,0 +1,20 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -175,7 +175,7 @@ endif + + NETX_JAR=$(datadir)/$(PACKAGE_NAME)/javaws.jar + SPLASH_PNG=$(datadir)/$(PACKAGE_NAME)/javaws_splash.png +-MODULARJDK_ARGS_LOCATION=$(DESTDIR)$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS_FILE) ++MODULARJDK_ARGS_LOCATION=$(MODULARJDK_ARGS_DIR)/$(MODULARJDK_ARGS_FILE) + + + # Conditional defintions +@@ -393,7 +393,7 @@ endif + ${INSTALL_DATA} $(NETX_SRCDIR)/javaws_splash.png $(DESTDIR)$(SPLASH_PNG) + ${INSTALL_DATA} $(TOP_SRC_DIR)/javaws.png $(ICONS_DEST_DIR)/ + mkdir -p $(DESTDIR)$(MODULARJDK_ARGS_DIR) +- cp launcher.build/$(MODULARJDK_ARGS_FILE) $(MODULARJDK_ARGS_LOCATION) ++ cp launcher.build/$(MODULARJDK_ARGS_FILE) $(DESTDIR)/$(MODULARJDK_ARGS_LOCATION) + if ENABLE_NATIVE_LAUNCHERS + ${INSTALL_PROGRAM} launcher.build/$(javaws) $(DESTDIR)$(bindir) + ${INSTALL_PROGRAM} launcher.build/$(itweb_settings) $(DESTDIR)$(bindir)
  36. Download patch netx/net/sourceforge/jnlp/config/BasicValueValidators.java

    --- 1.7.2-2/netx/net/sourceforge/jnlp/config/BasicValueValidators.java 2019-03-11 19:48:28.506360685 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/config/BasicValueValidators.java 2019-03-12 14:44:53.026832850 +0000 @@ -267,6 +267,24 @@ public class BasicValueValidators { } } + + + public static class RustCpValidator implements ValueValidator { + + + @Override + public void validate(Object value) throws IllegalArgumentException { + //cant be wrong... + //but we need that getPossibleValues description + } + + + @Override + public String getPossibleValues() { + return R("VVRustCpModifiers"); + } + + } private final static String DELIMITER = ",";
  37. Download patch Makefile.am
  38. Download patch netx/net/sourceforge/jnlp/resources/Messages_cs.properties

    --- 1.7.2-2/netx/net/sourceforge/jnlp/resources/Messages_cs.properties 2019-03-11 19:48:28.502360690 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/resources/Messages_cs.properties 2019-03-12 14:44:53.029832844 +0000 @@ -113,8 +113,8 @@ LCantRead=Nelze \u010d\u00edst nebo anal LCantReadInfo=M\u016f\u017eete zkusit st\u00e1hnout tento soubor ru\u010dn\u011b a zaslat ho prost\u0159ednictv\u00edm hl\u00e1\u0161en\u00ed o chyb\u011b t\u00fdmu IcedTea-Web. LNullLocation=Nelze ur\u010dit um\u00edst\u011bn\u00ed souboru JNLP. LNullLocationInfo=Byl u\u010din\u011bn pokus o spu\u0161t\u011bn\u00ed souboru JNLP v jin\u00e9m prost\u0159ed\u00ed JVM, av\u0161ak soubor nebyl nalezen. Chcete-li spustit extern\u00ed prost\u0159ed\u00ed JVM, modul runtime mus\u00ed b\u00fdt schopen nal\u00e9zt soubor .jnlp v lok\u00e1ln\u00edm souborov\u00e9m syst\u00e9mu nebo na serveru. -LNetxJarMissing=Nelze ur\u010dit um\u00edst\u011bn\u00ed souboru netx.jar. -LNetxJarMissingInfo=Byl u\u010din\u011bn pokus o spu\u0161t\u011bn\u00ed souboru JNLP v jin\u00e9m prost\u0159ed\u00ed JVM, av\u0161ak soubor netx.jar nebyl nalezen. Chcete-li spustit extern\u00ed prost\u0159ed\u00ed JVM, modul runtime mus\u00ed b\u00fdt schopen nal\u00e9zt soubor netx.jar. +LNetxJarMissing=Nelze ur\u010dit um\u00edst\u011bn\u00ed souboru javaws.jar. +LNetxJarMissingInfo=Byl u\u010din\u011bn pokus o spu\u0161t\u011bn\u00ed souboru JNLP v jin\u00e9m prost\u0159ed\u00ed JVM, av\u0161ak soubor javaws.jar nebyl nalezen. Chcete-li spustit extern\u00ed prost\u0159ed\u00ed JVM, modul runtime mus\u00ed b\u00fdt schopen nal\u00e9zt soubor javaws.jar. LNotToSpec=Soubor JNLP p\u0159esn\u011b neodpov\u00edd\u00e1 specifikaci. LNotToSpecInfo=Soubor JNLP obsahuje data, kter\u00e1 jsou zak\u00e1z\u00e1na v r\u00e1mci specifikace JNLP. Modul runtime se m\u016f\u017ee pokusit ignorovat neplatn\u00e9 informace a pokra\u010dovat ve spou\u0161t\u011bn\u00ed souboru. LNotApplication=Nejedn\u00e1 se o soubor aplikace.
  39. Download patch debian/icedtea-netx.prerm

    --- 1.7.2-2/debian/icedtea-netx.prerm 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/icedtea-netx.prerm 2019-03-13 16:20:57.000000000 +0000 @@ -6,7 +6,7 @@ tools='javaws itweb-settings policyedito if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then for tool in $tools; do - update-alternatives --remove $tool /usr/share/icedtea-web/bin/$tool.sh + update-alternatives --remove $tool /usr/lib/icedtea-web/bin/$tool done fi
  40. Download patch debian/icedtea-netx.postinst

    --- 1.7.2-2/debian/icedtea-netx.postinst 2019-03-17 21:13:49.000000000 +0000 +++ 1.8-0ubuntu8/debian/icedtea-netx.postinst 2019-03-13 16:20:57.000000000 +0000 @@ -3,7 +3,7 @@ set -e priority=1101 -basedir=/usr/share/icedtea-web +basedir=/usr/lib/icedtea-web tools='javaws itweb-settings policyeditor' case "$1" in @@ -21,14 +21,14 @@ configure) fi if [ "$update_alternatives" = y ]; then - if [ -f $basedir/bin/javaws.sh ]; then + if [ -f $basedir/bin/javaws ]; then for tool in $tools; do unset slave1 || true if [ -e $basedir/man/man1/$tool.1.gz ]; then slave1="--slave /usr/share/man/man1/$tool.1.gz $tool.1.gz $basedir/man/man1/$tool.1.gz" fi - update-alternatives --install /usr/bin/$tool $tool $basedir/bin/$tool.sh $priority $slave1 - update-alternatives --set $tool $basedir/bin/$tool.sh + update-alternatives --install /usr/bin/$tool $tool $basedir/bin/$tool $priority $slave1 + update-alternatives --set $tool $basedir/bin/$tool done fi fi # update_alternatives
  41. Download patch shell-launcher/launchers.bat.in

    --- 1.7.2-2/shell-launcher/launchers.bat.in 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0ubuntu8/shell-launcher/launchers.bat.in 2019-03-12 14:44:53.057832785 +0000 @@ -0,0 +1,188 @@ +@echo off +setLocal EnableDelayedExpansion + +rem use JAVAWS_J_OPTIONS to pass java arguments, instead of -J opts for this script. This will be fixed in next releases +rem use ITW_HOME to set location where ITW can be found. From there all binaries and jars and other resources are found +rem use JAVA_HOME to set path to JRE +rem any redistribution/installer can replace INST_ITW_HOME and INST_JAVA_HOME to create better defaults +rem if not set, following defaults are used +set "INST_ITW_HOME=" +set "INST_JAVA_HOME=" + +rem Warning for linux users: when you put VAR="value" also quotes are stored in VAR! +rem maybe set "VAR=value" is working better? +rem Warning for if blocks: variables using %my_var% do not work (interpreter), use !my_var! with ENABLEDELAYEDEXPANSION instead +rem convention to use for temporary variables use '_' prefix + +set "NASHORN=lib/ext/nashorn.jar" +set "JRE=@JRE@" +set "JAVA=%JRE%/bin/java" +set "LAUNCHER_BOOTCLASSPATH=@LAUNCHER_BOOTCLASSPATH@" +set "LAUNCHER_FLAGS=-Xms8m" +set "CLASSNAME=@MAIN_CLASS@" +set "BINARY_LOCATION=@BIN_LOCATION@.bat" +set "SPLASH_LOCATION=@JAVAWS_SPLASH_LOCATION@" +set "RUN_ARGS_LOCATION=@MODULARJDK_ARGS_LOCATION@" +set "PROGRAM_NAME=@PROGRAM_NAME@" +set "CP=%JRE%/lib/rt.jar;%JRE%/lib/ext/jfxrt.jar" + +rem individual parts of bootclasspath for more easy processing +set "NETX_JAR=@NETX_JAR@" +set "PLUGIN_JAR=@PLUGIN_JAR@" +set "JSOBJECT_JAR=@JSOBJECT_JAR@" +set "TAGSOUP_JAR=@TAGSOUP_JAR@" +set "RHINO_JAR=@RHINO_JAR@" +set "MSLINKS_JAR=@MSLINKS_JAR@" + + +rem resolve folder of this script: +if "%ITW_HOME%" == "" ( + set "_BAD_SLASH_SCRIPT_DIR=%~dp0" + set "_SCRIPT_DIR=!_BAD_SLASH_SCRIPT_DIR:\=/!" + set "ITW_HOME=!_SCRIPT_DIR!../" + set "_BAD_SLASH_SCRIPT_DIR=" & set "_SCRIPT_DIR=" +) + +rem resolve custom JRE: +set "CUSTOM_JRE=" +if not "%JAVA_HOME%" == "" ( + "%JAVA_HOME%/bin/java.exe" -version > nul 2>&1 + if errorlevel 0 if not errorlevel 1 ( + set "CUSTOM_JRE=%JAVA_HOME%" + ) else ( + echo "Your custom JRE [%JAVA_HOME%] read from JAVA_HOME is not valid. Please fix this." + ) +) +if "%CUSTOM_JRE%" == "" ( + if not "%INST_JAVA_HOME%" == "" ( + "%INST_JAVA_HOME%/bin/java.exe" -version > nul 2>&1 + if errorlevel 0 if not errorlevel 1 ( + set "CUSTOM_JRE=%INST_JAVA_HOME%" + ) else ( + echo "Your custom JRE [%INST_JAVA_HOME%] read from INST_JAVA_HOME is not valid. Please fix this." + ) + ) +) +if "%CUSTOM_JRE%" == "" ( + rem the following is for testing-only and not intended to be robust + rem will not work from 32-bit firefox + for /f "tokens=*" %%a in ('%windir%\System32\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit"') do set "_version_key=%%a" + set "_version=!_version_key:~58!" + for /f "tokens=*" %%a in ('%windir%\System32\reg query "HKLM\SOFTWARE\JavaSoft\Java Development Kit\!_version!" /v JavaHome') do set "_jh_key=%%a" + set "_BAD_SLASH_JAVA_HOME=!_jh_key:~22!" + set "_REG_JAVA_HOME=!_BAD_SLASH_JAVA_HOME:\=/!" + "!_REG_JAVA_HOME!/bin/java.exe" -version > nul 2>&1 + if errorlevel 0 if not errorlevel 1 ( + set "CUSTOM_JRE=!_REG_JAVA_HOME!" + ) else ( + echo "Your custom JRE [!_REG_JAVA_HOME!] read from Registry HKLM\SOFTWARE\JavaSoft\Java Development Kit is not valid. Please fix this." + ) + set "_version_key=" & set "_version=" & set "_jh_key=" & set "_BAD_SLASH_JAVA_HOME=" & set "_REG_JAVA_HOME=" +) + + +rem Support portable ITW: +if "%ITW_HOME%" == "" if not "%INST_ITW_HOME%" == "" ( + set "ITW_HOME=%INST_ITW_HOME%" +) +if not "%ITW_HOME%" == "" ( + set "BINARY_LOCATION=%ITW_HOME%/bin/%PROGRAM_NAME%.bat" + set "SPLASH_LOCATION=%ITW_HOME%/share/icedtea-web/javaws_splash.png" + set "RUN_ARGS_LOCATION=%ITW_HOME%/bin/itw-modularjdk.args" + set "NETX_JAR=%ITW_HOME%/share/icedtea-web/javaws.jar" + set "PLUGIN_JAR=%ITW_HOME%/share/icedtea-web/plugin.jar" + set "JSOBJECT_JAR=%ITW_HOME%/share/icedtea-web/jsobject.jar" + set "LAUNCHER_BOOTCLASSPATH=-Xbootclasspath/a:!NETX_JAR!;!PLUGIN_JAR!;!JSOBJECT_JAR!;%ITW_HOME%/win-deps-runtime/tagsoup.jar;%ITW_HOME%/win-deps-runtime/js.jar;%ITW_HOME%/win-deps-runtime/mslinks.jar" +) + + +rem Fix classpaths for custom JRE: +if not "%CUSTOM_JRE%" == "" ( + set "JAVA=%CUSTOM_JRE%/bin/java" + set "CP=%CUSTOM_JRE%/lib/rt.jar;%CUSTOM_JRE%/lib/ext/jfxrt.jar" + set "LAUNCHER_BOOTCLASSPATH=%LAUNCHER_BOOTCLASSPATH%;%CUSTOM_JRE%/%NASHORN%" +) else ( + set "LAUNCHER_BOOTCLASSPATH=%LAUNCHER_BOOTCLASSPATH%;%JRE%/%NASHORN%" +) + + +rem Support Modular JDK (jigsaw): +set "MODULAR_JDK=NO" + +rem Parse Java Version +set "fullversion=" +rem capture stderr with 2^>^&1 1^>con: +for /f "tokens=*" %%a in ('"%JAVA%" -version 2^>^&1 1^>con:') do ( + set "_versionLine=%%a" + echo !_versionLine! + if "!fullversion!" == "" ( + set "_unquoted=!_versionLine:"=@!" + for /f "tokens=2,3 delims=@.-" %%b in ("!_unquoted!") do ( + set "fullversion=%%b" + rem get second digit for "1.x.y" + if !fullversion! EQU 1 ( + set "fullversion=%%c" + ) + ) + ) +) +if %fullversion% GEQ 9 ( + set "MODULAR_JDK=YES" +) +set "_versionLine=" & set "_unquoted=" & set "fullversion=" + +set "MODULAR_ARGS=" +if "%MODULAR_JDK%" == "YES" ( + rem warning extra escaping + set "MODULAR_ARGS=--patch-module "java.desktop=%NETX_JAR%;%PLUGIN_JAR%"" + rem jsobject must be patched separately from plugin + rem otherwise netscape pkg would be shared by two modules, which is forbiden + rem plugin jar may not be built + if not "%JSOBJECT_JAR%" == "" ( + set "MODULAR_ARGS=!MODULAR_ARGS! --patch-module "jdk.jsobject=%JSOBJECT_JAR%"" + ) + rem add JDK9+ arg file: + set "MODULAR_ARGS=!MODULAR_ARGS! "@%RUN_ARGS_LOCATION%"" +) + + +rem Filter script args: +set "SPLASH=false" +if "%ICEDTEA_WEB_SPLASH%" == "" ( + set "SPLASH=true" +) + +set "JAVA_ARGS=" +set "ARGS=" + +for %%a IN (%*) do ( + set "_arg=%%a" + set "_beg=!_arg:~0,2!" + if "!_beg!" == "-J" ( + set "JAVA_ARGS=!JAVA_ARGS! !_arg:~2!" + ) else ( + set "ARGS=!ARGS! !_arg!" + if "!_arg:~0,1!" == "-" if not "x!_arg:headless=!" == "x!_arg!" ( + set "SPLASH=false" + ) + ) +) +set "_arg=" & set "_beg=" + + +rem Build Java command line: + +if "%SPLASH%" == "true" ( + set "SPLASH="-splash:%SPLASH_LOCATION%"" +) else ( + set "SPLASH=" +) + +"%JAVA%" %SPLASH% "%LAUNCHER_BOOTCLASSPATH%" %LAUNCHER_FLAGS% %MODULAR_ARGS% %JAVAWS_J_OPTIONS% %JAVA_ARGS% -classpath "%CP%" "-Dicedtea-web.bin.name=%PROGRAM_NAME%" "-Dicedtea-web.bin.location=%BINARY_LOCATION%" "%CLASSNAME%" %ARGS% + +SET "errno=%ERRORLEVEL%" + +echo Please press any key to close this window/get back prompt +pause > nul +EXIT /B %errno% +
  42. Download patch netx/net/sourceforge/jnlp/runtime/Translator.java

    --- 1.7.2-2/netx/net/sourceforge/jnlp/runtime/Translator.java 2019-03-11 19:48:28.518360672 +0000 +++ 1.8-0ubuntu8/netx/net/sourceforge/jnlp/runtime/Translator.java 2019-03-12 14:44:53.034832833 +0000 @@ -52,7 +52,7 @@ public class Translator { resources = ResourceBundle.getBundle(s); } catch (Exception ex) { throw new IllegalStateException("No bundles found for Locale: " + Locale.getDefault().toString() - + "and missing base resource bundle in netx.jar:net/sourceforge/jnlp/resource/Messages.properties"); + + "and missing base resource bundle in javaws.jar:net/sourceforge/jnlp/resource/Messages.properties"); } }
  43. Download patch shell-launcher/launchers.sh.in
  44. Download patch rust-launcher/src/property.rs
  45. Download patch rust-launcher/src/jars_helper.rs
  46. Download patch rust-launcher/src/property_from_files_resolver.rs
  47. Download patch rust-launcher/Cargo.toml

    --- 1.7.2-2/rust-launcher/Cargo.toml 1970-01-01 00:00:00.000000000 +0000 +++ 1.8-0ubuntu8/rust-launcher/Cargo.toml 2019-03-12 14:44:53.056832787 +0000 @@ -0,0 +1,8 @@ +[package] +name = "launcher" +version = "1.8.0" +authors = ["https://icedtea.classpath.org/wiki/IcedTea-Web"] + +[dependencies] +[target.'cfg(windows)'.dependencies] +dunce = "0.1.1"
  48. Download patch Makefile.in

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: java-gnome

java-gnome (4.1.3-8ubuntu1) focal; urgency=medium * Build using python2. -- Matthias Klose <doko@ubuntu.com> Tue, 31 Mar 2020 15:05:10 +0200

Modifications :
  1. Download patch debian/control

    --- 4.1.3-8/debian/control 2018-05-16 13:52:41.000000000 +0000 +++ 4.1.3-8ubuntu1/debian/control 2020-03-31 13:05:10.000000000 +0000 @@ -22,7 +22,7 @@ Build-Depends: libpango1.0-dev (>= 1.28), librsvg2-dev (>= 2.32), metacity, - python, + python2, xfonts-base, xvfb Standards-Version: 4.1.4
  2. Download patch debian/patches/series

    --- 4.1.3-8/debian/patches/series 2018-05-08 20:57:01.000000000 +0000 +++ 4.1.3-8ubuntu1/debian/patches/series 2020-03-31 13:05:07.000000000 +0000 @@ -1,5 +1,5 @@ 01_take_screenshots.diff -02_build_python.diff +#02_build_python.diff 03_build_doc_snapshots.diff 04_translations.patch 05_ppc64el_configure.patch

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: jsch-agent-proxy

jsch-agent-proxy (0.0.8-2ubuntu1) xenial; urgency=medium * Switch to using maven-ant-helper to avoid maven in main: - d/rules,modules: Switch maven->ant; add targets for jar installs - d/build.xml: Wrapper for maven-ant-helper build.xml to support multi-module projects. - d/control: Update BD's to drop maven related dependencies, add maven-ant-helper and maven-repo-helper. -- James Page <james.page@ubuntu.com> Wed, 17 Feb 2016 15:00:47 +0000

Modifications :
  1. Download patch debian/modules

    --- 0.0.8-2/debian/modules 1970-01-01 00:00:00.000000000 +0000 +++ 0.0.8-2ubuntu1/debian/modules 2016-02-17 14:33:12.000000000 +0000 @@ -0,0 +1,7 @@ +jsch-agent-proxy-core +jsch-agent-proxy-jsch +jsch-agent-proxy-pageant +jsch-agent-proxy-sshagent +jsch-agent-proxy-usocket-jna +jsch-agent-proxy-usocket-nc +jsch-agent-proxy-connector-factory
  2. Download patch debian/rules

    --- 0.0.8-2/debian/rules 2015-06-15 21:17:13.000000000 +0000 +++ 0.0.8-2ubuntu1/debian/rules 2016-02-17 14:52:10.000000000 +0000 @@ -1,10 +1,21 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk +include /usr/share/cdbs/1/class/ant.mk -JAVA_HOME := /usr/lib/jvm/default-java -DEB_MAVEN_DOC_TARGET := javadoc:javadoc javadoc:aggregate +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-nodeps ant-junit jsch jna-platform jna +DEB_ANT_BUILDFILE := debian/build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) +binary-post-install/lib$(PACKAGE)-java:: + mh_installpoms -plib$(PACKAGE)-java + set -e; \ + for module in `cat debian/modules`; do \ + jar=`echo $$module | sed -e "s/jsch-agent-proxy-/jsch.agentproxy./g"`; \ + mh_installjar -plib$(PACKAGE)-java -l $$module/pom.xml $$module/build/$$jar-$(VERSION).jar; \ + done get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  3. Download patch debian/control

    --- 0.0.8-2/debian/control 2015-09-02 21:32:39.000000000 +0000 +++ 0.0.8-2ubuntu1/debian/control 2016-02-17 12:24:13.000000000 +0000 @@ -1,10 +1,11 @@ Source: jsch-agent-proxy Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Emmanuel Bourg <ebourg@apache.org> -Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.5), libjna-platform-java -Build-Depends-Indep: libmaven-bundle-plugin-java, libjsch-java +Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-ant-helper, maven-repo-helper, libjna-platform-java, ant, ant-optional +Build-Depends-Indep: libjsch-java Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/jsch-agent-proxy.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jsch-agent-proxy.git
  4. Download patch debian/build.xml

    --- 0.0.8-2/debian/build.xml 1970-01-01 00:00:00.000000000 +0000 +++ 0.0.8-2ubuntu1/debian/build.xml 2016-02-17 15:00:45.000000000 +0000 @@ -0,0 +1,86 @@ +<?xml version="1.0"?> +<project name="jsch.agent" default="build-all" basedir="."> + <property name="build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/> + <target name="build-all"> + <antcall target="component"> + <param name="component" value="."/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-core"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-jsch"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-pageant"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-sshagent"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-usocket-jna"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-usocket-nc"/> + <param name="target" value="package"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-connector-factory"/> + <param name="target" value="package"/> + </antcall> + </target> + + <target name="clean"> + <antcall target="component"> + <param name="component" value="."/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-core"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-jsch"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-pageant"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-sshagent"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-usocket-jna"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-usocket-nc"/> + <param name="target" value="clean"/> + </antcall> + <antcall target="component"> + <param name="component" value="jsch-agent-proxy-connector-factory"/> + <param name="target" value="clean"/> + </antcall> + </target> + + <target name="component"> + <!-- Ensure any jar files already built in this project are used for compilation --> + <path id="local.path.ref"> + <fileset dir="${basedir}" includes="**/*.jar"/> + </path> + <ant antfile="${build.xml}" dir="${basedir}/${component}" target="${target}"> + <property name="package" value="${package}"/> + <property name="version" value="${version}"/> + <property name="debian.dir" value="${basedir}/debian"/> + <property name="classpath.compile" value="${toString:local.path.ref}"/> + </ant> + </target> +</project>

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: jython

jython (2.7.2~b2+repack1-1ubuntu1) focal; urgency=medium * Build-depend on python2. -- Matthias Klose <doko@ubuntu.com> Sun, 12 Jan 2020 09:32:17 +0100

Modifications :
  1. Download patch debian/control

    --- 2.7.2~b2+repack1-1/debian/control 2019-11-23 14:00:02.000000000 +0000 +++ 2.7.2~b2+repack1-1ubuntu1/debian/control 2020-01-12 08:31:33.000000000 +0000 @@ -3,7 +3,7 @@ Section: python Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Jakub Adam <jakub.adam@ktknet.cz>, Gilles Filippini <pini@debian.org> -Build-Depends: debhelper (>= 10), dh-exec, ant, gawk, maven-repo-helper, javahelper, python, libjaxb-api-java, dh-strip-nondeterminism +Build-Depends: debhelper (>= 10), dh-exec, ant, gawk, maven-repo-helper, javahelper, python2, libjaxb-api-java, dh-strip-nondeterminism Build-Depends-Indep: default-jdk, dh-python, junit4,

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libcommons-discovery-java

libcommons-discovery-java (0.5-3ubuntu1) quantal; urgency=low * Merge from Debian testing. Remaining changes: - d/control: Switch Build-Deps from maven to ant, fix Depends on binary packages. - d/rules: Switch from maven to ant cdbs build and ensure that junit4 is used to execute unit tests. - d/ant.properties: Specify build overrides for upstream build.xml to support use of system Java libraries. - d/libcommons-discovery-java-doc.install: install API docs from ant build output. - d/patches/fix_junit4_tests.diff: fix build process to execute tests using the junit ant task rather than executing junit directly in order to support use of JUnit4 annotations. -- James Page <james.page@ubuntu.com> Mon, 28 May 2012 17:18:46 +0100

Modifications :
  1. Download patch debian/rules

    --- 0.5-3/debian/rules 2011-11-14 23:12:27.000000000 +0000 +++ 0.5-3ubuntu1/debian/rules 2012-05-22 09:44:00.000000000 +0000 @@ -1,10 +1,20 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/maven.mk include /usr/share/cdbs/1/class/javahelper.mk +include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java +DEB_JARS := ant-junit4 ant-junit +DEB_ANT_BUILD_TARGET := dist test.discovery +LIBRARY := commons-discovery + +install/lib$(LIBRARY)-java:: + mh_installpoms -plib$(LIBRARY)-java + mh_installjar -plib$(LIBRARY)-java -l pom.xml dist/$(LIBRARY).jar + +clean:: + -rm -rf debian/tmp get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
  2. Download patch debian/control

    --- 0.5-3/debian/control 2012-03-08 16:08:49.000000000 +0000 +++ 0.5-3ubuntu1/debian/control 2012-05-28 16:19:24.000000000 +0000 @@ -1,13 +1,14 @@ Source: libcommons-discovery-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Damien Raude-Morvan <drazzib@debian.org>, Kumar Appaiah <akumar@debian.org>, Varun Hiremath <varun@debian.org>, Jakub Adam <jakub.adam@ktknet.cz> -Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: libcommons-logging-java, junit4, default-jdk-doc, libcommons-logging-java-doc, - libmaven-javadoc-plugin-java, javahelper +Build-Depends: debhelper (>= 7), cdbs, ant, default-jdk +Build-Depends-Indep: ant-optional, libcommons-logging-java, junit4, default-jdk-doc, + libcommons-logging-java-doc, maven-repo-helper, javahelper Standards-Version: 3.9.3 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-discovery-java/ Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-discovery-java/ @@ -15,8 +16,7 @@ Homepage: http://commons.apache.org/disc Package: libcommons-discovery-java Architecture: all -Depends: ${misc:Depends}, ${maven:Depends} -Recommends: ${maven:OptionalDepends} +Depends: ${misc:Depends}, libcommons-logging-java Suggests: libcommons-discovery-java-doc Description: locates classes that implement a given Java interface The Discovery Component is about discovering, or finding, @@ -39,8 +39,7 @@ Description: locates classes that implem Package: libcommons-discovery-java-doc Section: doc Architecture: all -Depends: ${misc:Depends}, ${maven:DocDepends} -Recommends: ${maven:DocOptionalDepends} +Depends: ${misc:Depends}, libcommons-logging-java-doc Suggests: libcommons-discovery-java Description: locates classes that implement a given Java interface (documentation) The Discovery Component is about discovering, or finding,
  3. Download patch .pc/applied-patches

    --- 0.5-3/.pc/applied-patches 2012-05-28 17:36:07.931191460 +0000 +++ 0.5-3ubuntu1/.pc/applied-patches 2012-05-28 17:36:08.135196371 +0000 @@ -1,2 +1,3 @@ java6_incompatible_types.diff java6_incompatible_types_tests.diff +fix_junit4_tests.diff
  4. Download patch debian/patches/series

    --- 0.5-3/debian/patches/series 2011-11-01 14:41:14.000000000 +0000 +++ 0.5-3ubuntu1/debian/patches/series 2012-05-22 09:44:00.000000000 +0000 @@ -1,2 +1,3 @@ java6_incompatible_types.diff java6_incompatible_types_tests.diff +fix_junit4_tests.diff
  5. Download patch .pc/fix_junit4_tests.diff/build.xml
  6. Download patch build.xml

    --- 0.5-3/build.xml 2008-07-14 22:44:17.000000000 +0000 +++ 0.5-3ubuntu1/build.xml 2012-05-28 17:36:08.000000000 +0000 @@ -221,11 +221,20 @@ <target name="test.discovery" depends="compile.tests" description="Run basic Service unit tests ..."> <echo message="Running basic Service tests ..."/> - <java classname="${test.runner}" fork="yes" + <!-- java classname="${test.runner}" fork="yes" failonerror="${test.failonerror}"> <arg value="org.apache.commons.discovery.test.TestAll"/> <classpath refid="test.classpath"/> - </java> + </java --> + <junit printsummary="yes" haltonfailure="yes"> + <classpath refid="test.classpath"/> + <formatter type="plain"/> + <batchtest fork="yes"> + <fileset dir="${test.home}"> + <include name="**/TestAll.java"/> + </fileset> + </batchtest> + </junit> </target>
  7. Download patch debian/libcommons-discovery-java-doc.install

    --- 0.5-3/debian/libcommons-discovery-java-doc.install 2011-09-19 21:29:37.000000000 +0000 +++ 0.5-3ubuntu1/debian/libcommons-discovery-java-doc.install 2012-05-22 09:44:00.000000000 +0000 @@ -1,2 +1,2 @@ -target/apidocs/* usr/share/doc/libcommons-discovery-java/api +dist/docs/api/* usr/share/doc/libcommons-discovery-java/api
  8. Download patch debian/ant.properties

    --- 0.5-3/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 +++ 0.5-3ubuntu1/debian/ant.properties 2011-11-23 11:06:21.000000000 +0000 @@ -0,0 +1,4 @@ +junit.jar=/usr/share/java/junit4.jar +logger.jar=/usr/share/java/commons-logging.jar +ant.build.javac.source=1.5 +ant.build.javac.target=1.5
  9. Download patch debian/patches/fix_junit4_tests.diff

    --- 0.5-3/debian/patches/fix_junit4_tests.diff 1970-01-01 00:00:00.000000000 +0000 +++ 0.5-3ubuntu1/debian/patches/fix_junit4_tests.diff 2011-11-23 11:47:23.000000000 +0000 @@ -0,0 +1,35 @@ +Description: Execute JUnit tests using Ant junit task instead of executing + junit directory using java as this does not support JUnit4 test annotations. + . + Upstream have switched build system to maven so this patch will not be + forwarded either to Debian or to upstream. +Author: James Page <james.page@ubuntu.com> +Forwarded: not-needed + +Index: libcommons-discovery-java-0.5/build.xml +=================================================================== +--- libcommons-discovery-java-0.5.orig/build.xml 2011-11-23 11:13:50.206722656 +0000 ++++ libcommons-discovery-java-0.5/build.xml 2011-11-23 11:16:25.095112101 +0000 +@@ -221,11 +221,20 @@ + <target name="test.discovery" depends="compile.tests" + description="Run basic Service unit tests ..."> + <echo message="Running basic Service tests ..."/> +- <java classname="${test.runner}" fork="yes" ++ <!-- java classname="${test.runner}" fork="yes" + failonerror="${test.failonerror}"> + <arg value="org.apache.commons.discovery.test.TestAll"/> + <classpath refid="test.classpath"/> +- </java> ++ </java --> ++ <junit printsummary="yes" haltonfailure="yes"> ++ <classpath refid="test.classpath"/> ++ <formatter type="plain"/> ++ <batchtest fork="yes"> ++ <fileset dir="${test.home}"> ++ <include name="**/TestAll.java"/> ++ </fileset> ++ </batchtest> ++ </junit> + </target> + +

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: libphonenumber

libphonenumber (7.1.0-5ubuntu12) groovy; urgency=medium * No-change rebuild against latest protobuf -- Jeremy Bicha <jbicha@ubuntu.com> Tue, 28 Apr 2020 18:35:29 -0400 libphonenumber (7.1.0-5ubuntu11) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Tue, 03 Mar 2020 21:33:14 +0100 libphonenumber (7.1.0-5ubuntu10) focal; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Thu, 13 Feb 2020 09:00:10 +0100 libphonenumber (7.1.0-5ubuntu9) focal; urgency=medium * No change rebuild against new boost1.71 ABI -- Dimitri John Ledkov <xnox@ubuntu.com> Mon, 03 Feb 2020 20:45:19 +0000 libphonenumber (7.1.0-5ubuntu8) disco; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Tue, 13 Nov 2018 19:10:28 +0100 libphonenumber (7.1.0-5ubuntu7) disco; urgency=medium * No-change rebuild against latest protobuf -- Jeremy Bicha <jbicha@ubuntu.com> Sat, 10 Nov 2018 15:08:35 -0500 libphonenumber (7.1.0-5ubuntu6) cosmic; urgency=medium * No-change rebuild for boost soname change. -- Matthias Klose <doko@ubuntu.com> Tue, 17 Jul 2018 12:58:00 +0000 libphonenumber (7.1.0-5ubuntu5) bionic; urgency=medium * No-change rebuild for icu soname change. -- Matthias Klose <doko@ubuntu.com> Tue, 07 Nov 2017 08:53:25 +0000 libphonenumber (7.1.0-5ubuntu4) bionic; urgency=medium * No-change rebuild for boost soname change. -- Matthias Klose <doko@ubuntu.com> Thu, 26 Oct 2017 19:49:43 +0000 libphonenumber (7.1.0-5ubuntu3) bionic; urgency=medium * No-change rebuild for libicu soname change. -- Matthias Klose <doko@ubuntu.com> Wed, 25 Oct 2017 15:41:45 +0000 libphonenumber (7.1.0-5ubuntu2) zesty; urgency=high * No change rebuild against boost1.62. -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 01 Nov 2016 16:26:52 +0000 libphonenumber (7.1.0-5ubuntu1) yakkety; urgency=medium [ Ken VanDine ] * Sync from debian unstable * Remaining changes: - debian/patches/hash_as_diallable_char.patch -- Ken VanDine <ken.vandine@canonical.com> Wed, 21 Sep 2016 10:18:53 -0400

Modifications :
  1. Download patch debian/control

    --- 7.1.0-5/debian/control 2016-09-13 21:13:45.000000000 +0000 +++ 7.1.0-5ubuntu12/debian/control 2016-11-01 16:26:52.000000000 +0000 @@ -1,6 +1,7 @@ Source: libphonenumber Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Daniel Pocock <daniel@pocock.pro>, Fredrik Roubert <roubert@google.com> Build-Depends: cdbs, cmake,
  2. Download patch debian/patches/readdir_r-is-deprecated.patch

    --- 7.1.0-5/debian/patches/readdir_r-is-deprecated.patch 2016-09-13 21:13:45.000000000 +0000 +++ 7.1.0-5ubuntu12/debian/patches/readdir_r-is-deprecated.patch 2016-09-21 14:20:13.000000000 +0000 @@ -13,11 +13,11 @@ Origin: https://github.com/googlei18n/li tools/cpp/src/cpp-build/generate_geocoding_data.cc | 53 +++++++++------------- 3 files changed, 27 insertions(+), 35 deletions(-) -diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt -index 9a3adb0..4d95238 100644 ---- a/cpp/CMakeLists.txt -+++ b/cpp/CMakeLists.txt -@@ -82,14 +82,14 @@ if (${USE_ALTERNATE_FORMATS} STREQUAL "ON") +Index: libphonenumber-7.1.0-4ubuntu1/cpp/CMakeLists.txt +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/cpp/CMakeLists.txt ++++ libphonenumber-7.1.0-4ubuntu1/cpp/CMakeLists.txt +@@ -82,14 +82,14 @@ if (${USE_ALTERNATE_FORMATS} STREQUAL "O endif () # Find all the required libraries and programs. @@ -35,10 +35,10 @@ index 9a3adb0..4d95238 100644 endif () include_directories (${Boost_INCLUDE_DIRS}) endif () -diff --git a/tools/cpp/CMakeLists.txt b/tools/cpp/CMakeLists.txt -index fafa846..1dcf285 100644 ---- a/tools/cpp/CMakeLists.txt -+++ b/tools/cpp/CMakeLists.txt +Index: libphonenumber-7.1.0-4ubuntu1/tools/cpp/CMakeLists.txt +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/tools/cpp/CMakeLists.txt ++++ libphonenumber-7.1.0-4ubuntu1/tools/cpp/CMakeLists.txt @@ -38,6 +38,7 @@ endif () include_directories ("src") @@ -53,10 +53,10 @@ index fafa846..1dcf285 100644 add_executable (generate_geocoding_data_test ${TEST_SOURCES}) -target_link_libraries (generate_geocoding_data_test ${TEST_LIBS}) +target_link_libraries (generate_geocoding_data_test ${TEST_LIBS} ${Boost_LIBRARIES}) -diff --git a/tools/cpp/src/cpp-build/generate_geocoding_data.cc b/tools/cpp/src/cpp-build/generate_geocoding_data.cc -index 132a917..ec03298 100644 ---- a/tools/cpp/src/cpp-build/generate_geocoding_data.cc -+++ b/tools/cpp/src/cpp-build/generate_geocoding_data.cc +Index: libphonenumber-7.1.0-4ubuntu1/tools/cpp/src/cpp-build/generate_geocoding_data.cc +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/tools/cpp/src/cpp-build/generate_geocoding_data.cc ++++ libphonenumber-7.1.0-4ubuntu1/tools/cpp/src/cpp-build/generate_geocoding_data.cc @@ -16,7 +16,6 @@ #include "cpp-build/generate_geocoding_data.h"
  3. Download patch debian/patches/series

    --- 7.1.0-5/debian/patches/series 2016-09-13 21:13:45.000000000 +0000 +++ 7.1.0-5ubuntu12/debian/patches/series 2016-09-21 14:18:27.000000000 +0000 @@ -7,3 +7,4 @@ 0010-reproducible-build.patch gcc-6-ftbfs.patch readdir_r-is-deprecated.patch +hash_as_diallable_char.patch
  4. Download patch debian/patches/hash_as_diallable_char.patch

    --- 7.1.0-5/debian/patches/hash_as_diallable_char.patch 1970-01-01 00:00:00.000000000 +0000 +++ 7.1.0-5ubuntu12/debian/patches/hash_as_diallable_char.patch 2016-09-08 17:56:08.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Added hash as a diallable char +Forwarded: https://github.com/googlei18n/libphonenumber/pull/1312 +Author: Tiago Salem Herrmann <tiago.herrmann@canonical.com> +Index: libphonenumber-7.1.0-4ubuntu1/cpp/src/phonenumbers/phonenumberutil.cc +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/cpp/src/phonenumbers/phonenumberutil.cc ++++ libphonenumber-7.1.0-4ubuntu1/cpp/src/phonenumbers/phonenumberutil.cc +@@ -288,6 +288,7 @@ class PhoneNumberRegExpsAndMappings { + void InitializeMapsAndSets() { + diallable_char_mappings_.insert(std::make_pair('+', '+')); + diallable_char_mappings_.insert(std::make_pair('*', '*')); ++ diallable_char_mappings_.insert(std::make_pair('#', '#')); + // Here we insert all punctuation symbols that we wish to respect when + // formatting alpha numbers, as they show the intended number groupings. + all_plus_number_grouping_symbols_.insert( +Index: libphonenumber-7.1.0-4ubuntu1/cpp/test/phonenumbers/phonenumberutil_test.cc +=================================================================== +--- libphonenumber-7.1.0-4ubuntu1.orig/cpp/test/phonenumbers/phonenumberutil_test.cc ++++ libphonenumber-7.1.0-4ubuntu1/cpp/test/phonenumbers/phonenumberutil_test.cc +@@ -2411,9 +2411,9 @@ TEST_F(PhoneNumberUtilTest, NormaliseStr + } + + TEST_F(PhoneNumberUtilTest, NormaliseStripNonDiallableCharacters) { +- string input_number("03*4-56&+a#234"); ++ string input_number("03*4-56&+1a#234"); + NormalizeDiallableCharsOnly(&input_number); +- static const string kExpectedOutput("03*456+234"); ++ static const string kExpectedOutput("03*456+1#234"); + EXPECT_EQ(kExpectedOutput, input_number) + << "Conversion did not correctly remove non-diallable characters"; + }

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: netbeans

netbeans (10.0-3ubuntu3) eoan; urgency=medium * No-change upload with strops.h and sys/strops.h removed in glibc. -- Matthias Klose <doko@ubuntu.com> Thu, 05 Sep 2019 11:03:28 +0000 netbeans (10.0-3ubuntu2) eoan; urgency=medium * Backport upstream patch to remove old javadoc api and implementation usage to make it work with OpenJDK 11 and later. (Closes: #925509, LP: #1828427) * Depend on java11-sdk instead of java8-sdk as Netbeans is now configured to run with openjdk-11. (LP: #1825604) -- Tiago Stürmer Daitx <tiago.daitx@ubuntu.com> Tue, 21 May 2019 20:22:04 +0000

Modifications :
  1. Download patch debian/control

    --- 10.0-3/debian/control 2019-02-28 22:16:52.000000000 +0000 +++ 10.0-3ubuntu3/debian/control 2019-05-21 18:56:01.000000000 +0000 @@ -1,7 +1,8 @@ Source: netbeans Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Andrew Ross <ubuntu@rossfamily.co.uk>, Markus Koschany <apo@debian.org> @@ -179,7 +180,7 @@ Description: Common Java Related Librari Package: netbeans Architecture: all Depends: - default-jdk | java8-sdk, + default-jdk | java11-sdk, libnb-apisupport3-java (= ${binary:Version}), libnb-ide14-java (= ${binary:Version}), libnb-java5-java (= ${binary:Version}),
  2. Download patch debian/patches/nb-remove-javadoc-api.patch
  3. Download patch debian/patches/series

    --- 10.0-3/debian/patches/series 2019-02-26 13:06:19.000000000 +0000 +++ 10.0-3ubuntu3/debian/patches/series 2019-05-21 18:47:06.000000000 +0000 @@ -34,3 +34,4 @@ disable-nativeexecution-module.patch o.apache.commons.io.patch Unsafe.patch nb-javac.patch +nb-remove-javadoc-api.patch

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: openjfx

openjfx (11.0.7+0-2ubuntu1) focal; urgency=medium * Merge with Debian; remaining changes: - Build using python2. -- Matthias Klose <doko@ubuntu.com> Tue, 14 Apr 2020 14:30:56 +0200

Modifications :
  1. Download patch debian/bin/python-config

    --- 11.0.7+0-2/debian/bin/python-config 1970-01-01 00:00:00.000000000 +0000 +++ 11.0.7+0-2ubuntu1/debian/bin/python-config 2020-04-14 12:30:56.000000000 +0000 @@ -0,0 +1,2 @@ +#! /bin/sh +exec python2-config "$@"
  2. Download patch debian/rules

    --- 11.0.7+0-2/debian/rules 2020-04-13 17:09:28.000000000 +0000 +++ 11.0.7+0-2ubuntu1/debian/rules 2020-04-14 12:30:56.000000000 +0000 @@ -1,5 +1,8 @@ #!/usr/bin/make -f +PATH := $(PATH):$(CURDIR)/debian/bin +export PATH + DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  3. Download patch debian/control

    --- 11.0.7+0-2/debian/control 2020-04-10 14:49:46.000000000 +0000 +++ 11.0.7+0-2ubuntu1/debian/control 2020-04-14 12:30:56.000000000 +0000 @@ -35,7 +35,7 @@ Build-Depends: antlr4, libxxf86vm-dev, maven-repo-helper, pkg-config, - python, + python2, qtbase5-dev, qtchooser, qt5-qmake,
  4. Download patch debian/bin/python

    --- 11.0.7+0-2/debian/bin/python 1970-01-01 00:00:00.000000000 +0000 +++ 11.0.7+0-2ubuntu1/debian/bin/python 2020-04-14 12:30:56.000000000 +0000 @@ -0,0 +1,2 @@ +#! /bin/sh +exec python2 "$@"
  5. Download patch debian/jsmin-noop.py

    --- 11.0.7+0-2/debian/jsmin-noop.py 2020-04-10 14:39:47.000000000 +0000 +++ 11.0.7+0-2ubuntu1/debian/jsmin-noop.py 2020-04-14 12:30:56.000000000 +0000 @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python2 # This is a reimplementation of the JavaScript minifier included in OpenJFX # which was derived from the non-free jsmin code by Douglas Crockford. This

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | txt | LP | Bugs ) | Diff from Ubuntu

Source: service-wrapper-java

service-wrapper-java (3.5.30-1ubuntu1) artful; urgency=medium * Fix as-needed linking in ppc64el and s390x per-arch Makefiles too. -- Dimitri John Ledkov <xnox@ubuntu.com> Tue, 20 Jun 2017 11:23:08 +0100

Modifications :
  1. Download patch src/c/Makefile-linux-s390x-64.make

    --- 3.5.30-1/src/c/Makefile-linux-s390x-64.make 2017-06-20 12:42:23.000000000 +0000 +++ 3.5.30-1ubuntu1/src/c/Makefile-linux-s390x-64.make 2017-06-20 12:42:23.000000000 +0000 @@ -34,7 +34,7 @@ init: if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -lm -pthread $(wrapper_SOURCE) $(LDFLAGS) -o $(BIN)/wrapper + $(COMPILE) -pthread $(wrapper_SOURCE) $(LDFLAGS) -lm -o $(BIN)/wrapper libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o $(LIB)/libwrapper.so
  2. Download patch debian/control

    --- 3.5.30-1/debian/control 2016-12-19 12:28:39.000000000 +0000 +++ 3.5.30-1ubuntu1/debian/control 2017-06-20 10:23:46.000000000 +0000 @@ -1,7 +1,8 @@ Source: service-wrapper-java Section: java Priority: optional -Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: tony mancill <tmancill@debian.org>, Rémi Debay <debay.remi@gmail.com>
  3. Download patch .pc/fix-as-needed-ppc.patch/src/c/Makefile-linux-ppcle-64.make

    --- 3.5.30-1/.pc/fix-as-needed-ppc.patch/src/c/Makefile-linux-ppcle-64.make 1970-01-01 00:00:00.000000000 +0000 +++ 3.5.30-1ubuntu1/.pc/fix-as-needed-ppc.patch/src/c/Makefile-linux-ppcle-64.make 2016-07-12 02:15:19.000000000 +0000 @@ -0,0 +1,48 @@ +# Copyright (c) 1999, 2016 Tanuki Software, Ltd. +# http://www.tanukisoftware.com +# All rights reserved. +# +# This software is the proprietary information of Tanuki Software. +# You shall use it only in accordance with the terms of the +# license agreement you entered into with Tanuki Software. +# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html + +COMPILE = gcc -O3 -m64 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE + +INCLUDE=$(JAVA_HOME)/include + +DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux + +wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o + +BIN = ../../bin +LIB = ../../lib + +all: init wrapper libwrapper.so + +clean: + rm -f *.o + +cleanall: clean + rm -rf *~ .deps + rm -f $(BIN)/wrapper $(LIB)/libwrapper.so + +init: + if test ! -d .deps; then mkdir .deps; fi + +wrapper: $(wrapper_SOURCE) + $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + +libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp
  4. Download patch .pc/fix-as-needed-ppc.patch/src/c/Makefile-linux-s390x-64.make

    --- 3.5.30-1/.pc/fix-as-needed-ppc.patch/src/c/Makefile-linux-s390x-64.make 1970-01-01 00:00:00.000000000 +0000 +++ 3.5.30-1ubuntu1/.pc/fix-as-needed-ppc.patch/src/c/Makefile-linux-s390x-64.make 2017-06-20 12:42:23.000000000 +0000 @@ -0,0 +1,49 @@ + +# Copyright (c) 1999, 2013 Tanuki Software, Ltd. +# http://www.tanukisoftware.com +# All rights reserved. +# +# This software is the proprietary information of Tanuki Software. +# You shall use it only in accordance with the terms of the +# license agreement you entered into with Tanuki Software. +# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html + +COMPILE = gcc -O3 -m64 -fPIC -Wall --pedantic -DLINUX -DJSW64 -D_FILE_OFFSET_BITS=64 -fpic -D_GNU_SOURCE -DUNICODE -D_UNICODE + +INCLUDE=$(JAVA_HOME)/include + +DEFS = -I$(INCLUDE) -I$(INCLUDE)/linux + +wrapper_SOURCE = wrapper.c wrapperinfo.c wrappereventloop.c wrapper_unix.c property.c logger.c logger_file.c wrapper_file.c wrapper_i18n.c wrapper_hashmap.c + +libwrapper_so_OBJECTS = wrapper_i18n.o wrapperjni_unix.o wrapperinfo.o wrapperjni.o loggerjni.o + +BIN = ../../bin +LIB = ../../lib + +all: init wrapper libwrapper.so + +clean: + rm -f *.o + +cleanall: clean + rm -rf *~ .deps + rm -f $(BIN)/wrapper $(LIB)/libwrapper.so + +init: + if test ! -d .deps; then mkdir .deps; fi + +wrapper: $(wrapper_SOURCE) + $(COMPILE) -lm -pthread $(wrapper_SOURCE) $(LDFLAGS) -o $(BIN)/wrapper + +libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o $(LIB)/libwrapper.so + +%.o: %.c + @echo '$(COMPILE) -c $<'; \ + $(COMPILE) $(DEFS) -Wp,-MD,.deps/$(*F).pp -c $< + @-cp .deps/$(*F).pp .deps/$(*F).P; \ + tr ' ' '\012' < .deps/$(*F).pp \ + | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \ + >> .deps/$(*F).P; \ + rm .deps/$(*F).pp
  5. Download patch debian/patches/fix-as-needed-ppc.patch

    --- 3.5.30-1/debian/patches/fix-as-needed-ppc.patch 2016-12-19 12:17:55.000000000 +0000 +++ 3.5.30-1ubuntu1/debian/patches/fix-as-needed-ppc.patch 2017-06-20 10:22:53.000000000 +0000 @@ -3,10 +3,9 @@ Description: Fix FTBFS on ppc: Author: Andreas Moog <amoog@ubuntu.com> Bug: https://sourceforge.net/p/wrapper/bugs/285/ -diff -pruN -x '*~' wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-32.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make ---- wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-32.make 2015-01-04 01:21:32.915068936 +0100 -+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-32.make 2015-01-04 01:23:18.271591362 +0100 -@@ -33,7 +33,7 @@ init: +--- a/src/c/Makefile-linux-ppc-32.make ++++ b/src/c/Makefile-linux-ppc-32.make +@@ -33,7 +33,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) @@ -15,10 +14,9 @@ diff -pruN -x '*~' wrapper_3.5.25_src.or libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(LDFLAGS) $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so -diff -pruN -x '*~' wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-64.make wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make ---- wrapper_3.5.25_src.orig/src/c/Makefile-linux-ppc-64.make 2015-01-04 01:21:32.915068936 +0100 -+++ wrapper_3.5.25_src/src/c/Makefile-linux-ppc-64.make 2015-01-04 01:23:02.287512123 +0100 -@@ -33,7 +33,7 @@ init: +--- a/src/c/Makefile-linux-ppc-64.make ++++ b/src/c/Makefile-linux-ppc-64.make +@@ -33,7 +33,7 @@ if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) @@ -27,3 +25,25 @@ diff -pruN -x '*~' wrapper_3.5.25_src.or libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(LDFLAGS) $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so +--- a/src/c/Makefile-linux-ppcle-64.make ++++ b/src/c/Makefile-linux-ppcle-64.make +@@ -33,7 +33,7 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper ++ $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so +--- a/src/c/Makefile-linux-s390x-64.make ++++ b/src/c/Makefile-linux-s390x-64.make +@@ -34,7 +34,7 @@ + if test ! -d .deps; then mkdir .deps; fi + + wrapper: $(wrapper_SOURCE) +- $(COMPILE) -lm -pthread $(wrapper_SOURCE) $(LDFLAGS) -o $(BIN)/wrapper ++ $(COMPILE) -pthread $(wrapper_SOURCE) $(LDFLAGS) -lm -o $(BIN)/wrapper + + libwrapper.so: $(libwrapper_so_OBJECTS) + ${COMPILE} -shared $(libwrapper_so_OBJECTS) $(LDFLAGS) -o $(LIB)/libwrapper.so
  6. Download patch src/c/Makefile-linux-ppcle-64.make

    --- 3.5.30-1/src/c/Makefile-linux-ppcle-64.make 2016-07-12 02:15:19.000000000 +0000 +++ 3.5.30-1ubuntu1/src/c/Makefile-linux-ppcle-64.make 2017-06-20 12:42:23.000000000 +0000 @@ -33,7 +33,7 @@ init: if test ! -d .deps; then mkdir .deps; fi wrapper: $(wrapper_SOURCE) - $(COMPILE) -lm -pthread $(wrapper_SOURCE) -o $(BIN)/wrapper + $(COMPILE) -pthread $(wrapper_SOURCE) -lm -o $(BIN)/wrapper libwrapper.so: $(libwrapper_so_OBJECTS) ${COMPILE} -shared $(libwrapper_so_OBJECTS) -o $(LIB)/libwrapper.so
  1. ca-certificates-java
  2. geronimo-jacc-1.1-spec
  3. groovy
  4. icedtea-web
  5. java-gnome
  6. jsch-agent-proxy
  7. jython
  8. libcommons-discovery-java
  9. libphonenumber
  10. netbeans
  11. openjfx
  12. service-wrapper-java