Debian: Add libjson-simple-java dependency

LICENSE.txt

@@ -86,8 +86,7 @@ Public domain except as listed below:
    From Apache HttpClient 4.4.1 and HttpCore 4.4.1
    See licenses/LICENSE-Apache2.0.txt
 
-   json-smart-v1 1.3.1+
+   json-simple 1.1.1
-   Copyright 2011 JSON-SMART authors
    See licenses/LICENSE-Apache2.0.txt
 
 

apps/routerconsole/java/build.xml

@@ -81,6 +81,7 @@
 
                 <!-- following jars only present for debian builds -->
                 <pathelement location="../../jetty/jettylib/tomcat-api.jar" />
+                <pathelement location="../../../core/java/build/json-simple.jar" />
             </classpath>
         </javac>
     </target>

build.properties

@@ -164,6 +164,8 @@ javac.version=1.7
 #with-libgetopt-java=true
 # Don't bundle flags, we will use famfamfam-flag-png package
 #with-famfamfam-flag-png=true
+# Don't include json-simple library, we will use libjson-simple-java package
+#with-libjson-simple-java=true
 # Don't compile org.apache.http classes, we will use libhttpclient-java and libhttpcore-java packages
 # 2 MB of dependencies vs. 20 KB of copied source
 # Requires 4.4 or higher.

build.xml

@@ -825,7 +825,7 @@
             additionalparam="-notimestamp"
             doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
             windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
-            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:net.minidev.json:net.minidev.json.*" />
+            <group title="Core SDK (i2p.jar)" packages="net.i2p:net.i2p.*:net.i2p.client:net.i2p.client.*:net.i2p.internal:net.i2p.internal.*:freenet.support.CPUInformation:org.bouncycastle.oldcrypto:org.bouncycastle.oldcrypto.*:gnu.crypto.*:gnu.getopt:gnu.gettext:com.nettgryppa.security:org.apache.http.conn.ssl:org.apache.http.conn.util:org.apache.http.util:org.json.simple:org.json.simple.*" />
             <group title="Streaming Library" packages="net.i2p.client.streaming:net.i2p.client.streaming.impl" />
             <group title="Router" packages="net.i2p.router:net.i2p.router.*:net.i2p.data.i2np:net.i2p.data.router:org.cybergarage:org.cybergarage.*:org.freenetproject:org.xlattice.crypto.filters:com.maxmind.geoip:com.southernstorm.noise.*" />
             <group title="Router Console" packages="net.i2p.router.web:net.i2p.router.web.*:net.i2p.router.update:edu.internet2.ndt:net.i2p.router.news:com.vuze.*" />
@@ -888,6 +888,7 @@
                 <!-- following are only for debian builds -->
                 <pathelement location="core/java/build/libintl.jar" />
                 <pathelement location="core/java/build/gnu-getopt.jar" />
+                <pathelement location="core/java/build/json-simple.jar" />
             </classpath>
             <!-- These variables are stored in build.properties.
                   End-users can override by creating the file override.properties -->
@@ -2457,6 +2458,8 @@
             <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
             <!-- libgetopt-java -->
             <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
+            <!-- libjson-simple-java -->
+            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/json" />
             <!-- libhttpclient-java and libhttpcore-java -->
           <!--
             <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
@@ -2622,6 +2625,7 @@
             <file name="../i2p-${Extended.Version}/settings.gradle" />
             <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
             <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
+            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/json" />
           <!--
             <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
            -->
@@ -2695,6 +2699,7 @@
             <file name="../i2p-${Extended.Version}/settings.gradle" />
             <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/gettext" />
             <fileset dir="../i2p-${Extended.Version}/core/java/src/gnu/getopt" />
+            <fileset dir="../i2p-${Extended.Version}/core/java/src/org/json" />
           <!--
             <fileset dir="../i2p-${Extended.Version}/core/java/src/org/apache/http" />
            -->

core/java/build.xml

@@ -46,7 +46,14 @@
     <condition property="javac.classpath.mod3" value="build/httpclient.jar:build/httpcore.jar:" else="" >
         <istrue value="${with-libhttpclient-java}" />
     </condition>
-    <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath}" />
+    <!-- fixups if we're using json-simple.jar for org.json.simple classes -->
+    <condition property="source.exclude4" value="org/json/simple/**" else="NOTHING" >
+        <istrue value="${with-libjson-simple-java}" />
+    </condition>
+    <condition property="javac.classpath.mod4" value="build/json-simple.jar:" else="" >
+        <istrue value="${with-libjson-simple-java}" />
+    </condition>
+    <property name="javac.classpath.mod" value="${javac.classpath.mod1}${javac.classpath.mod2}${javac.classpath.mod3}${javac.classpath.mod4}${javac.classpath}" />
 
     <!-- jar classpath fixups -->
     <condition property="gettext.jar" value="/usr/share/java/libintl.jar" else="" >
@@ -58,6 +65,9 @@
     <condition property="httpclient.jar" value="/usr/share/java/httpclient.jar /usr/share/java/httpcore.jar" else="" >
         <istrue value="${with-libhttpclient-java}" />
     </condition>
+    <condition property="json-simple.jar" value="/usr/share/java/json-simple.jar" else="" >
+        <istrue value="${with-libjson-simple-java}" />
+    </condition>
 
     <target name="compile" depends="depend">
         <mkdir dir="./build" />
@@ -72,6 +82,7 @@
             <exclude name="${source.exclude1}" />
             <exclude name="${source.exclude2}" />
             <exclude name="${source.exclude3}" />
+            <exclude name="${source.exclude4}" />
         </javac>
     </target>
 

debian-alt/bionic/rules

@@ -154,6 +154,11 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: jessie+; ubuntu: trusty+
+	@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
+	@mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
+
 	@# debian: everywhere; ubuntu: trusty+
 	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
 

debian-alt/buster/control

@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 9.20160709)
  ,bash-completion
  ,gettext
  ,libgetopt-java
+ ,libjson-simple-java (< 3)
  ,libgmp-dev (>= 2:5.0.5)
  ,libservice-wrapper-java
  ,po-debconf
@@ -78,6 +79,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  geoip-database,
  gettext-base,
  libgetopt-java,
+ libjson-simple-java (< 3),
  libjetty9-java,
  libtaglibs-standard-jstlel-java,
  libtomcat8-java,

debian-alt/buster/rules

@@ -154,6 +154,11 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: jessie+; ubuntu: trusty+
+	@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
+	@mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
+
 	@# debian: everywhere; ubuntu: trusty+
 	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
 

debian-alt/doc/dependencies.txt

@@ -8,7 +8,7 @@ improve our official packages and support other packagers.
 Our packages are available at https://deb.i2p2.de/ and
 instructions are at https://geti2p.net/debian
 
-This document is current as of release 0.9.37, 2018-10-04.
+This document is current as of release 0.9.38, 2018-01-xx.
 
 
 Build-only Dependencies
@@ -46,6 +46,11 @@ Current Runtime Dependencies
   For /usr/share/java/gnu-getopt.jar.
   In non-Debian builds we bundle the source code; it's removed in the Debian source package.
 
+* libjson-simple-java (jessie and later, trusty and later only)
+  For /usr/share/java/json-simple.jar.
+  In non-Debian builds we bundle the 1.1.1 source code; it's removed in the Debian source package.
+  Compatible with 1.x and 2.x only; not compatible with 3.x.
+
 * libjetty9-java
   For /usr/share/java/jetty9-*.jar.
   In non-Debian builds we bundle the jars; it's removed in the Debian source package.

debian-alt/jessie/control

@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 7.0.50~)
  ,dh-apparmor
  ,gettext
  ,libgetopt-java
+ ,libjson-simple-java (< 3)
  ,libgmp-dev (>= 2:5.0.2)
  ,libservice-wrapper-java
  ,hardening-wrapper
@@ -78,6 +79,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  libtomcat8-java,
  geoip-database,
  gettext-base,
+ libjson-simple-java (< 3),
  libgetopt-java,
  famfamfam-flag-png
 Replaces: i2p ( << 0.8.6-5)

debian-alt/jessie/i2p-router.links

@@ -76,6 +76,11 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
 
 
+# comment out if not building with libjson-simple-java
+# ubuntu: trusty+; debian: jessie+
+usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
+
+
 # comment out if not building with famfamfam-flag-png
 # ubuntu: trusty+
 # debian: everywhere

debian-alt/jessie/rules

@@ -143,6 +143,11 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: jessie+; ubuntu: trusty+
+	@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
+	@mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
+
 	@# debian: everywhere; ubuntu: trusty+
 	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
 

debian-alt/trusty/control

@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 7.0.50~)
  ,bash-completion
  ,gettext
  ,libgetopt-java
+ ,libjson-simple-java (< 3)
  ,libgmp-dev (>= 2:5.0.2)
  ,libservice-wrapper-java
  ,hardening-wrapper
@@ -80,6 +81,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  geoip-database,
  gettext-base,
  libgetopt-java,
+ libjson-simple-java (< 3),
  glassfish-javaee,
  famfamfam-flag-png
 Replaces: i2p ( << 0.8.6-5)

debian-alt/trusty/i2p-router.links

@@ -76,6 +76,11 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
 
 
+# comment out if not building with libjson-simple-java
+# ubuntu: trusty+; debian: jessie+
+usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
+
+
 # comment out if not building with famfamfam-flag-png
 # ubuntu: trusty+
 # debian: everywhere

debian-alt/trusty/rules

@@ -143,6 +143,11 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: jessie+; ubuntu: trusty+
+	@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
+	@mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
+
 	@# debian: everywhere; ubuntu: trusty+
 	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
 

debian-alt/xenial/control

@@ -17,6 +17,7 @@ Build-Depends: debhelper (>= 7.0.50~)
  ,bash-completion
  ,gettext
  ,libgetopt-java
+ ,libjson-simple-java (< 3);
  ,libgmp-dev (>= 2:5.0.2)
  ,libservice-wrapper-java
  ,hardening-wrapper
@@ -82,6 +83,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  geoip-database,
  gettext-base,
  libgetopt-java,
+ libjson-simple-java (< 3),
  famfamfam-flag-png
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)

debian-alt/xenial/i2p-router.links

@@ -76,6 +76,11 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
 
 
+# comment out if not building with libjson-simple-java
+# ubuntu: trusty+; debian: jessie+
+usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
+
+
 # comment out if not building with famfamfam-flag-png
 # ubuntu: trusty+
 # debian: everywhere

debian-alt/xenial/rules

@@ -142,6 +142,11 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: jessie+; ubuntu: trusty+
+	@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
+	@mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
+
 	@# debian: everywhere; ubuntu: trusty+
 	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
 

debian/control

@@ -16,6 +16,7 @@ Build-Depends: debhelper (>= 9.20160709)
  ,bash-completion
  ,gettext
  ,libgetopt-java
+ ,libjson-simple-java (< 3)
  ,libgmp-dev (>= 2:5.0.5)
  ,libservice-wrapper-java
  ,po-debconf
@@ -77,6 +78,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
  geoip-database,
  gettext-base,
  libgetopt-java,
+ libjson-simple-java (< 3),
  libjetty9-java,
  libtaglibs-standard-jstlel-java,
  libtomcat8-java,

debian/i2p-router.links

@@ -82,6 +82,11 @@ usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar
 usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar
 
 
+# comment out if not building with libjson-simple-java
+# ubuntu: trusty+; debian: jessie+
+usr/share/java/json-simple.jar usr/share/i2p/lib/json-simple.jar
+
+
 # comment out if not building with famfamfam-flag-png
 # ubuntu: trusty+
 # debian: everywhere

debian/rules

@@ -152,6 +152,11 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar
 
+	@# debian: jessie+; ubuntu: trusty+
+	@/bin/echo -e "with-libjson-simple-java=true" >> $(CURDIR)/override.properties
+	@mkdir -p $(CURDIR)/core/java/build
+	ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar
+
 	@# debian: everywhere; ubuntu: trusty+
 	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties