build bionic tarball

2023-03-14 21:46:54 +00:00 · 2023-03-14 21:27:27 +00:00 · 2023-03-14 20:58:20 +00:00
7 changed files with 109 additions and 332 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,130 +1,136 @@
-i2p (2.2.0-1ubuntu1) focal; urgency=medium
+i2p (2.2.0-2~bionic+1) bionic; urgency=medium

  * New upstream version 2.2.0

 -- eyedeekay <hankhill19580@gmail.com>  Wed, 14 Mar 2023 12:12:12 +0000

-i2p (2.1.0-1ubuntu1) focal; urgency=medium
+i2p (2.1.0-2~bionic+1) bionic; urgency=medium
+
+  * Fix build failure
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 11 Jan 2023 13:13:13 +0000
+
+i2p (2.1.0-1~bionic+1) bionic; urgency=medium

  * New upstream version 2.1.0

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 11 Jan 2023 12:12:12 +0000

-i2p (2.0.0-2ubuntu1) focal; urgency=medium
-
-  * Fix stray char in links file causing symlinks in /
-
- -- zzz on i2p (key signing) <zzz@i2pmail.org>  Fri, 02 Dec 2022 18:18:18 +0000
-
-i2p (2.0.0-1ubuntu1) focal; urgency=medium
+i2p (2.0.0-1~bionic+1) bionic; urgency=medium

  * New upstream version 2.0.0

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 22 Nov 2022 12:12:12 +0000

-i2p (1.9.0-1ubuntu1) focal; urgency=medium
+i2p (1.9.0-1~bionic+1) bionic; urgency=medium

  * New upstream version 1.9.0

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 23 Aug 2022 12:12:12 +0000

-i2p (1.8.0-1ubuntu1) focal; urgency=medium
+i2p (1.8.0-1~bionic+1) bionic; urgency=medium

  * New upstream version 1.8.0

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 24 May 2022 12:12:12 +0000

-i2p (1.7.0-1ubuntu1) focal; urgency=medium
+i2p (1.7.0-1~bionic+1) bionic; urgency=medium

  * New upstream version 1.7.0

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 22 Feb 2022 12:12:12 +0000

-i2p (1.6.1-1ubuntu1) focal; urgency=medium
+i2p (1.6.1-1~bionic+1) bionic; urgency=medium

  * New upstream version 1.6.1

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 30 Nov 2021 12:12:12 +0000

-i2p (1.5.0-2ubuntu1) focal; urgency=medium
+i2p (1.5.0-1~bionic+1) bionic; urgency=medium

  * New upstream version 1.5.0

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 25 Aug 2021 12:12:12 +0000

-i2p (0.9.50-1ubuntu1) focal; urgency=medium
+i2p (0.9.50-1~bionic+1) bionic; urgency=medium

  * New upstream version 0.9.50

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 19 May 2021 12:12:12 +0000

-i2p (0.9.49-1ubuntu1) focal; urgency=medium
+i2p (0.9.49-1~bionic+1) bionic; urgency=medium

  * New upstream version 0.9.49

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 17 Feb 2021 12:12:12 +0000

-i2p (0.9.48-1ubuntu1) focal; urgency=medium
+i2p (0.9.48-1~bionic+1) bionic; urgency=medium

  * New upstream version 0.9.48

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 02 Dec 2020 12:12:12 +0000

-i2p (0.9.47-1ubuntu1) focal; urgency=medium
+i2p (0.9.47-1~bionic+1) bionic; urgency=medium

  * New upstream version 0.9.47

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 25 Aug 2020 12:12:12 +0000

-i2p (0.9.46-1ubuntu1) eoan; urgency=medium
+i2p (0.9.46-1~bionic+1) bionic; urgency=medium

  * New upstream version 0.9.46

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 26 May 2020 12:12:12 +0000

-i2p (0.9.45-1~disco+1) disco; urgency=medium
+i2p (0.9.45-1ubuntu1) bionic; urgency=medium

  * New upstream version 0.9.45

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Mon, 24 Feb 2020 12:12:12 +0000

-i2p (0.9.44-1~disco+1) disco; urgency=medium
+i2p (0.9.44-1ubuntu1) bionic; urgency=medium

  * New upstream version 0.9.44

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Sun, 01 Dec 2019 12:12:12 +0000

-i2p (0.9.43-1~disco+1) disco; urgency=medium
+i2p (0.9.43-1ubuntu1) bionic; urgency=medium

  * New upstream version 0.9.43

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 22 Oct 2019 12:12:12 +0000

-[1;5A0.9.42-1~disco+1) disco; urgency=medium
+i2p (0.9.42-1ubuntu1) bionic; urgency=medium

  * New upstream version 0.9.42

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 28 Aug 2019 12:12:12 +0000

-i2p (0.9.41-1~disco+1) disco; urgency=medium
+i2p (0.9.41-1ubuntu1) bionic; urgency=medium

  * New upstream version 0.9.41

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 3 Jul 2019 12:12:12 +0000

-i2p (0.9.40-1~disco+1) disco; urgency=medium
+i2p (0.9.40-1ubuntu1) bionic; urgency=medium

  * New upstream version 0.9.40

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Wed, 8 May 2019 12:12:12 +0000

-i2p (0.9.39-1~disco+1) disco; urgency=medium
+i2p (0.9.39-2ubuntu1) bionic; urgency=medium
+
+  * Fix compatibility with Jetty 9.4
+
+ -- zzz on i2p (key signing) <zzz@i2pmail.org>  Fri, 19 Apr 2019 12:12:12 +0000
+
+i2p (0.9.39-1ubuntu1) bionic; urgency=medium

  * New upstream version 0.9.39

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Fri, 22 Mar 2019 12:12:12 +0000

-i2p (0.9.38-1~disco+1) disco; urgency=medium
+i2p (0.9.38-1ubuntu1) bionic; urgency=medium

  * New upstream version 0.9.38

@ -190,23 +196,29 @@ i2p (0.9.28-1ubuntu1) trusty; urgency=medium

 -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 13 Dec 2016 12:12:12 +0000

-i2p (0.9.27-1~deb8u+1) stable; urgency=medium
+i2p (0.9.27-1-1ubuntu1) trusty; urgency=medium

-  * Backport to Jessie
+  * New upstream version 0.9.27

- -- zzz on i2p <zzz@i2pmail.org>  Tue, 18 Oct 2016 12:12:12 +0000
+ -- zzz on i2p (key signing) <zzz@i2pmail.org>  Mon, 17 Oct 2016 12:12:12 +0000

-i2p (0.9.26-1~deb8u+1) stable; urgency=medium
+i2p (0.9.26-1ubuntu1) trusty; urgency=medium

-  * Backport to Jessie
+  * New upstream version 0.9.26

- -- zzz on i2p <zzz@i2pmail.org>  Tue, 08 Jun 2016 12:12:12 +0000
+ -- zzz on i2p (key signing) <zzz@i2pmail.org>  Tue, 07 Jun 2016 12:12:12 +0000

-i2p (0.9.25-1~deb8u+1) stable; urgency=medium
+i2p (0.9.25-1ubuntu1) trusty; urgency=medium

-  * Backport to Jessie
+  * New upstream version 0.9.25

- -- zzz on i2p <zzz@i2pmail.org>  Tue, 29 Mar 2016 18:12:12 +0000
+ -- zzz on i2p (key signing) <zzz@i2pmail.org>  Sat, 26 Mar 2016 12:12:12 +0000
+
+i2p (0.9.24-1ubuntu1) trusty; urgency=medium
+
+  * Upload to PPA
+
+ -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 30 Jan 2016 14:12:27 +0000

 i2p (0.9.24-1) unstable; urgency=medium

@ -316,7 +328,6 @@ i2p (0.9.20-3) unstable; urgency=medium
  * Add datagram exception to the apparmor profile

 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 20 Jun 2015 11:22:28 +0000
-
 i2p (0.9.20-2) unstable; urgency=medium

  [str4d]
@ -530,11 +541,9 @@ i2p (0.9.16-1) unstable; urgency=medium
    - Translation updates
    - Update GeoIP data

- -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 01 Nov 2014 23:34:28 +0000
-
 i2p (0.9.15-1) unstable; urgency=medium

-  * New Upstream Version
+  * New Upstream release
    - Add support for Ed25519 signatures
    - i2psnark move to separate config file for each torrent to better support
      per-torrent settings
@ -571,10 +580,14 @@ i2p (0.9.14.1-1) unstable; urgency=medium
    - Console:
      + Fix update buttons
      + Don't filter parameter names starting with "nofilter_"
-      + Re-allow configadvanced, news URL, and unsigned update URL if routerconsole.advanced=true
-      + Re-allow plugin install if routerconsole.advanced=true or routerconsole.enablePluginInstall=true
-      + Only allow whitelisted plugin signers, unless routerconsole.allowUntrustedPlugins=true
-      + Re-allow clients.config changes if routerconsole.advanced=true or routerconsole.enableClientChange=true
+      + Re-allow configadvanced, news URL, and unsigned update URL if
+        routerconsole.advanced=true
+      + Re-allow plugin install if routerconsole.advanced=true or
+        routerconsole.enablePluginInstall=true
+      + Only allow whitelisted plugin signers, unless
+        routerconsole.allowUntrustedPlugins=true
+      + Re-allow clients.config changes if routerconsole.advanced=true or
+        routerconsole.enableClientChange=true
      + More escaping
    - i2psnark: Fix add torrent form
    - ExecNamingService: Remove
@ -598,10 +611,12 @@ i2p (0.9.14-1) unstable; urgency=high
    - Several i2psnark improvements and fixes (GUI and DHT), including changes
      for better compatibility with Vuze
  * Other
-    - Reseeding now fetches a signed zip file containing router infos for security and speed
+    - Reseeding now fetches a signed zip file containing router infos for
+      security and speed
    - Use JVM's AES implementation if it is faster
    - More advanced options shown in the i2ptunnel edit pages
-    - Per-message reliabilitiy settings in I2CP and error propagation back from router to client
+    - Per-message reliabilitiy settings in I2CP and error propagation back
+      from router to client
    - Lots of findbugs fixes and cleanups
    - Support signature types in SAM, bump rev to 3.1
    - New event log page in console
@ -643,94 +658,46 @@ i2p (0.9.11-3) unstable; urgency=medium

 i2p (0.9.11-1) unstable; urgency=medium

-  * New Upstream Version
-  * Debconf: New Japanese and Korean translations
+  * New release
+  * Debconf: New Korean and Polish translations

- -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 08 Feb 2014 22:31:59 +0000
+ -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 09 Feb 2014 00:00:00 +0000

 i2p (0.9.10-1) unstable; urgency=medium

-  * New Upstream Version
+  * New release
  * Remove /var/lib/i2p when i2p package is purged.
  * Bump standards version to 3.9.5 (no changes needed)

 -- Kill Your TV <killyourtv@i2pmail.org>  Wed, 22 Jan 2014 16:00:24 +0000

-i2p (0.9.9-1deb8u1) unstable; urgency=medium
+i2p (0.9.9-1) unstable; urgency=medium

-  * New Upstream Version
-  * Drop from debian/patches (already in 0.9.9):
-    - 0006-allow-webapps-to-be-preseeded.patch
-    - 0007-geoipv6-fix.patch
-    - 0008-IPv6-categories-in-netdb.patch
-    - 0009-mark-ipv6-only-as-experimental.patch
-    - 0010-snark-start-torrent-by-default.patch
-    - 0011-fix-start-and-start-all-buttons.patch
-    - 0012-add-no.i2p-registrar.patch
-    - 0013-persistent-keying-for-SOCKS-tunnels.patch
-    - 0014-post-limiter.patch
-    - 0015-home-remove-config-when-restoring-default.patch
-    - 0016-new-netdb-categories.patch
-    - 0017-updated-trac-links.patch
+  * New Upstream release
  * debconf:
    - Updated French translation
    - New Romanian translation

 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 07 Dec 2013 18:17:24 +0000

-i2p (0.9.8.1-deb8u1) stable; urgency=low
-
-  * Change initscript to grant read/write permissions to members of the i2psvc
-    group.
-  * Postinst: Silence a misleading warning
-
- -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 07 Nov 2013 00:22:48 +0000
-
-i2p (0.9.8.1-1deb1) stable; urgency=low
-
-  * New upstream version 0.9.8.1. Initially I was not going to build 0.9.8.1
-    packages since 0.9.8.1 was a Windows-only point release but I thought it
-    would be good to have it in Tails. At the same time we may as well
-    cherry-pick some easy bugfixes/updates from mtn.
-  * debian/rules: Set the builddistribution specific versions
-  * use xz for the 'debian' quilt 3.0 tarball
-  * Cherry-picked fixes/updates:
-    - Allow webapps.config to be preseeded by distributions
-    - IPv6:
-      + GeoIPv6 fixes (ticket #1096)
-      + Add IPv6 NetDB categories
-      + Mark IPv6-only as experimental
-    - I2PSnark:
-      + Start torrent by default
-      + Fix start and start-all buttons on text browsers and Opera
-        (ticket #1093)
-    - I2PTunnel:
-      + Post limiter
-      + Persistent keying for SOCKS tunnels (ticket #1088)
-    - Add no.i2p registrar
-    - Remove config when restoring default settings
-    - Additional NetDB categories
-    - Change Trac links to HTTPS
-
- -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 05 Nov 2013 17:34:38 +0000
-
-i2p (0.9.8-1) stable; urgency=low
+i2p (0.9.8-1) unstable; urgency=low

  * New Upstream Version
  * Debconf: updated Swedish translation

 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 30 Sep 2013 16:14:40 +0000

-i2p (0.9.7.1-1) stable; urgency=low
+i2p (0.9.7.1-1) unstable; urgency=low

  * New upstream version 0.9.7.1
  * Compress packages with xz

- -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 10 Aug 2013 19:02:24 +0000
+ -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 10 Aug 2013 22:10:08 +0000

 i2p (0.9.7-2) unstable; urgency=low

  * Bugfix: Add missing ; to i2prouter script.
+  * Test scripts with "sh -n" in the build target

 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 16 Jul 2013 11:08:48 +0000

@ -746,15 +713,16 @@ i2p (0.9.7-1) unstable; urgency=low
 i2p (0.9.6-1) unstable; urgency=low

  * New upstream release
+  * i2prouter: allow overrides to be set in /etc/default/i2p

- -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 23:18:54 +0000
+ -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 00:00:00 +0000

 i2p (0.9.5-2) unstable; urgency=low

  * debian/i2p.postinst: Explicitly set permissions on /etc/i2p/wrapper.config
-    to compensate for stricter umasks. Fixes #906.
+    to compensate for stricter umasks.

- -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 31 Mar 2013 12:53:43 +0000
+ -- Kill Your TV <killyourtv@i2pmail.org>  Sun, 31 Mar 2013 12:50:17 +0000

 i2p (0.9.5-1) unstable; urgency=low

@ -765,19 +733,19 @@ i2p (0.9.5-1) unstable; urgency=low

 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 08 Mar 2013 23:04:51 +0000

-i2p (0.9.4+repack-3) unstable; urgency=low
+i2p (0.9.4-3) unstable; urgency=low

  * Backport fix from MTN for ticket #817

 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 22 Dec 2012 13:07:47 +0000

-i2p (0.9.4+repack-2) unstable; urgency=low
+i2p (0.9.4-2) unstable; urgency=low

  * Add missing build-dep on libservice-wrapper-java

 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 17 Dec 2012 20:40:07 +0000

-i2p (0.9.4+repack-1) unstable; urgency=low
+i2p (0.9.4-1) stable; urgency=low

  * explicitly prefer openjdk-*-headless over default-jre-headless. Debian
    Squeeze has default-jre-headless set to gij. Performance with gij is
@ -814,10 +782,10 @@ i2p (0.9.4+repack-1) unstable; urgency=low

 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 17 Dec 2012 23:59:59 +0000

-i2p (0.9.3+repack-1) unstable; urgency=low
+i2p (0.9.3-1) stable; urgency=low

  * New Upstream release
-  * Upstream changelog:
+  * Upstream changelog (full details in history.txt):
    - Active Queue Management
    - I2PSnark DHT: Several bug fixes, enable by default.
    - Priority queues
@ -848,19 +816,19 @@ i2p (0.9.3+repack-1) unstable; urgency=low

 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 27 Oct 2012 16:47:37 +0000

-i2p (0.9.2+repack-2) unstable; urgency=high
+i2p (0.9.2-2) stable; urgency=high

  * Fix stupid bug in i2prouter

 -- Kill Your TV <killyourtv@i2pmail.org>  Sat, 22 Sep 2012 13:57:39 +0000

-i2p (0.9.2+repack-1) stable; urgency=low
+i2p (0.9.2-1) stable; urgency=low

  * New upstream release (see history.txt for details)

 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 21 Sep 2012 18:13:32 +0000

-i2p (0.9.1+repack-1) unstable; urgency=low
+i2p (0.9.1-1) stable; urgency=low

  * New upstream version 0.9.1
  * Don't depend on Debian's/Ubuntu's version of Jetty. Jetty6 is going away
@ -875,13 +843,13 @@ i2p (0.9.1+repack-1) unstable; urgency=low

 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 30 Jul 2012 17:41:04 +0000

-i2p (0.9-1) unstable; urgency=low
+i2p (0.9-1) stable; urgency=low

  * New Upstream Version

 -- Kill Your TV <killyourtv@i2pmail.org>  Wed, 02 May 2012 16:33:11 +0000

-i2p (0.8.13-2) unstable; urgency=low
+i2p (0.8.13-2) stable; urgency=low

  * Fix bug in postinst cause by changes to adduser's behaviour.

@ -928,38 +896,38 @@ i2p (0.8.12-1) stable; urgency=low

 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 06 Jan 2012 02:49:03 +0000

-i2p (0.8.11+repack-2) stable; urgency=medium
+i2p (0.8.11-2) stable; urgency=medium

  * Fix STUPID bug running I2P with i2prouter. Thanks soundwave.

 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 08 Nov 2011 20:02:05 +0000

-i2p (0.8.11+repack-1) stable; urgency=low
+i2p (0.8.11-1) stable; urgency=low

  * New Upstream Version
  * sv and uk debconf translation updates

 -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 07 Nov 2011 19:20:15 +0000

-i2p (0.8.10+repack-1) stable; urgency=medium
+i2p (0.8.10-1) stable; urgency=medium

  * New upstream version

 -- Kill Your TV <killyourtv@i2pmail.org>  Thu, 20 Oct 2011 05:25:04 +0000

-i2p (0.8.9+repack-1) stable; urgency=medium
+i2p (0.8.9-1) stable; urgency=medium

  * New upstream version

 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 11 Oct 2011 19:55:08 +0000

-i2p (0.8.8+repack-3) UNRELEASED; urgency=low
+i2p (0.8.8-3) UNRELEASED; urgency=low

  * Add dump option to initscript

 -- Kill Your TV <killyourtv@i2pmail.org>  Tue, 06 Sep 2011 12:42:22 +0000

-i2p (0.8.8+repack-2) stable; urgency=medium
+i2p (0.8.8-2) stable; urgency=medium

  * Backport patch from mtn 04ec606 to fix trac #515
  * Fix trac ticket #514 ("debconf values are overwritten upon
@ -969,7 +937,7 @@ i2p (0.8.8+repack-2) stable; urgency=medium

 -- Kill Your TV <killyourtv@i2pmail.org>  Fri, 02 Sep 2011 23:32:32 +0000

-i2p (0.8.8+repack-1) stable; urgency=low
+i2p (0.8.8-1) stable; urgency=low

  * New Upstream Version

--- a/debian/compat
+++ b/debian/compat
@ -1 +1 @@
-10
+9
--- a/debian/control
+++ b/debian/control
@ -1,16 +1,14 @@
 Source: i2p
 Maintainer: zzz <zzz@i2pmail.org>
 Section: net
-Standards-Version: 4.3.0
+Standards-Version: 3.9.8
 Priority: optional
 Bugs: mailto:zzz@i2pmail.org
 Homepage: https://geti2p.net/
-Vcs-Browser: https://salsa.debian.org/debian/i2p
-Vcs-Git: https://salsa.debian.org/debian/i2p.git
 Build-Depends: debhelper (>= 9.20160709)
 ,ant (>= 1.9.8)
 ,debconf
- ,default-jdk
+ ,openjdk-8-jdk
 ,libjetty9-java (>= 9.4)
 ,libjsp-api-java
 ,libservlet-api-java
@ -31,13 +29,11 @@ Section: net
 Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
 adduser,
- apparmor,
 debconf,
 i2p-router (>= 0.8.6-5),
 libjbigi-jni,
 lsb-base,
- service-wrapper,
- ucf (>= 0.28)
+ service-wrapper
 Description: Invisible Internet Project (I2P) - anonymous network
 I2P is an anonymizing network, offering a simple layer that identity-sensitive
 applications can use to securely communicate. All data is wrapped with several
@ -80,7 +76,7 @@ Architecture: all
 Section: net
 Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
- openjdk-18-jre-headless | openjdk-17-jre-headless | openjdk-11-jre-headless | default-jre-headless | java18-runtime-headless | java17-runtime-headless | java11-runtime-headless,
+ openjdk-17-jre-headless | openjdk-11-jre-headless | openjdk-8-jre-headless | default-jre-headless | java17-runtime-headless | java11-runtime-headless | java8-runtime-headless,
 geoip-database,
 gettext-base,
 libgetopt-java,
@ -90,8 +86,7 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
 libservlet-api-java,
 libtaglibs-standard-jstlel-java,
 libtomcat9-java,
- famfamfam-flag-png,
- sensible-utils
+ famfamfam-flag-png
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@ -1,7 +1,3 @@
-#
-#  Note: Update apparmor/i2p after any changes
-#
-
 usr/share/common-licenses/GPL-2 usr/share/doc/i2p-router/licenses/LICENSE-GPLv2.txt
 usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGPLv2.1.txt
 usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
@ -49,12 +45,10 @@ usr/share/java/tomcat9-util.jar usr/share/i2p/lib/tomcat-util.jar
 usr/share/java/tomcat9-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
 # combined into commons-el.jar in non-package builds
 usr/share/java/tomcat9-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
-# following two are formerly from libservlet3.1-java, now in their own packages
 # legacy name in lib/
 usr/share/java/tomcat9-el-api.jar usr/share/i2p/lib/commons-el.jar
-# tomcat9 pulls in libeclipse-jdk-core-java, link to it for eepsite webapps needing a compiler
-usr/share/java/eclipse-jdt-core.jar usr/share/i2p/lib/ecj.jar
-
+# tomcat pulls in ecj, link to it for eepsite webapps needing a compiler
+usr/share/java/ecj.jar usr/share/i2p/lib/ecj.jar

 # comment out if not building with libtaglibs-standard
 usr/share/java/taglibs-standard-spec.jar usr/share/i2p/lib/jstl.jar
--- a/debian/patches/0003-json-simple-3.patch
+++ b/debian/patches/0003-json-simple-3.patch
@ -1,161 +0,0 @@
-Description: Migrate away from deprecated json-simple 1.x classes
- See json-simple 2.0.0 changelog:
- > * Deprecated JSONParse and JSONValue in favor of Jsoner.
- > * Deprecated JSONStreamAware and JSONAware in favor of Jsonable.
- > * Deprecated JSONObject in favor of JsonObject.
- > * Deprecated JSONArray in favor of JsonArray.
- .
- This patch uses the new json-simple Json* classes. It is compatible with
- both 2.x and 3.x json-simple releases, with a few ajustments regarding
- backward incompatible changes in json-simple 3.x:
- - The package name, changed to com.github.cliftonlabs.json_simple
- - The exception DeserializationExcetpion renamed as JsonException
- These two changes are handled using place-holders @JSON_SIMPLE@ and
- @JSON_EXCETPION@ which are substituted at build time by debian/rules.
- .
- With these tricks the package is compatible with json-simple 2.x and 3.x.
-Author: Gilles Filippini <pini@debian.org>
-Index: i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Error.java
-===================================================================
--- i2p-0.9.45.orig/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Error.java
-+++ i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Error.java
-@@ -1,7 +1,7 @@
- package com.thetransactioncompany.jsonrpc2;
- 
- 
-import org.json.simple.JsonObject;
-+import @JSON_SIMPLE@.JsonObject;
- 
- 
- /** 
-Index: i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Message.java
-===================================================================
--- i2p-0.9.45.orig/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Message.java
-+++ i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Message.java
-@@ -5,7 +5,7 @@ package com.thetransactioncompany.jsonrp
- import java.util.List;
- import java.util.Map;
- 
-import org.json.simple.JsonObject;
-+import @JSON_SIMPLE@.JsonObject;
- 
- 
- /**
-Index: i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Notification.java
-===================================================================
--- i2p-0.9.45.orig/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Notification.java
-+++ i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Notification.java
-@@ -4,7 +4,7 @@ package com.thetransactioncompany.jsonrp
- import java.util.List;
- import java.util.Map;
- 
-import org.json.simple.JsonObject;
-+import @JSON_SIMPLE@.JsonObject;
- 
- 
- /** 
-Index: i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Parser.java
-===================================================================
--- i2p-0.9.45.orig/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Parser.java
-+++ i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Parser.java
-@@ -4,8 +4,8 @@ package com.thetransactioncompany.jsonrp
- import java.util.List;
- import java.util.Map;
- 
-import org.json.simple.Jsoner;
-import org.json.simple.DeserializationException;
-+import @JSON_SIMPLE@.Jsoner;
-+import @JSON_SIMPLE@.@JSON_EXCEPTION@;
- 
- 
- /**
-@@ -181,7 +181,7 @@ public class JSONRPC2Parser {
- 		try {
- 			json = Jsoner.deserialize(jsonString);
- 				
-		} catch (DeserializationException e) {
-+		} catch (@JSON_EXCEPTION@ e) {
- 
- 			// Terse message, do not include full parse exception message
- 			throw new JSONRPC2ParseException("Invalid JSON", 
-Index: i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Request.java
-===================================================================
--- i2p-0.9.45.orig/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Request.java
-+++ i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Request.java
-@@ -4,7 +4,7 @@ package com.thetransactioncompany.jsonrp
- import java.util.List;
- import java.util.Map;
- 
-import org.json.simple.JsonObject;
-+import @JSON_SIMPLE@.JsonObject;
- 
- 
- /** 
-Index: i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Response.java
-===================================================================
--- i2p-0.9.45.orig/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Response.java
-+++ i2p-0.9.45/apps/i2pcontrol/java/com/thetransactioncompany/jsonrpc2/JSONRPC2Response.java
-@@ -3,7 +3,7 @@ package com.thetransactioncompany.jsonrp
- 
- import java.util.Map;
- 
-import org.json.simple.JsonObject;
-+import @JSON_SIMPLE@.JsonObject;
- 
- 
- /** 
-Index: i2p-0.9.45/apps/i2pcontrol/java/net/i2p/i2pcontrol/SocketController.java
-===================================================================
--- i2p-0.9.45.orig/apps/i2pcontrol/java/net/i2p/i2pcontrol/SocketController.java
-+++ i2p-0.9.45/apps/i2pcontrol/java/net/i2p/i2pcontrol/SocketController.java
-@@ -37,8 +37,8 @@ import net.i2p.util.I2PSSLSocketFactory;
- import net.i2p.util.Log;
- import net.i2p.util.PortMapper;
- 
-import org.json.simple.Jsoner;
-import org.json.simple.DeserializationException;
-+import @JSON_SIMPLE@.Jsoner;
-+import @JSON_SIMPLE@.@JSON_EXCEPTION@;
- 
- import net.i2p.i2pcontrol.security.KeyStoreProvider;
- import net.i2p.i2pcontrol.security.SecurityManager;
-@@ -199,7 +199,7 @@ public class SocketController implements
-                     // TODO
-                     System.out.println("i2pcontrol got: " + o);
-                 }
-            } catch (DeserializationException pe) {
-+            } catch (@JSON_EXCEPTION@ pe) {
-                 _log.error("i2pcontrol handler", pe);
-                 return;
-             } catch (IOException ioe) {
-Index: i2p-0.9.45/apps/routerconsole/java/src/com/vuze/plugins/mlab/MLabRunner.java
-===================================================================
--- i2p-0.9.45.orig/apps/routerconsole/java/src/com/vuze/plugins/mlab/MLabRunner.java
-+++ i2p-0.9.45/apps/routerconsole/java/src/com/vuze/plugins/mlab/MLabRunner.java
-@@ -30,8 +30,8 @@ import java.util.concurrent.atomic.Atomi
- 
- import edu.internet2.ndt.Tcpbw100;
- 
-import org.json.simple.JsonObject;
-import org.json.simple.Jsoner;
-+import @JSON_SIMPLE@.JsonObject;
-+import @JSON_SIMPLE@.Jsoner;
- 
- import net.i2p.I2PAppContext;
- import net.i2p.data.DataHelper;
-Index: i2p-0.9.45/apps/routerconsole/java/src/edu/internet2/ndt/JSONUtils.java
-===================================================================
--- i2p-0.9.45.orig/apps/routerconsole/java/src/edu/internet2/ndt/JSONUtils.java
-+++ i2p-0.9.45/apps/routerconsole/java/src/edu/internet2/ndt/JSONUtils.java
-@@ -1,9 +1,9 @@
- package edu.internet2.ndt;
- 
-import org.json.simple.JsonObject;
-import org.json.simple.Jsoner;
-+import @JSON_SIMPLE@.JsonObject;
-+import @JSON_SIMPLE@.Jsoner;
- import java.util.Iterator;
- import java.util.Map;
- 
- /**
-  * Created by Sebastian Malecki on 13.05.14.
--- a/debian/patches/series
+++ b/debian/patches/series
@ -1,4 +1,2 @@
 0001-path-substitution.patch
 0002-jetty-compatibility.patch
-0003-json-simple-3.patch
-	
--- a/debian/rules
+++ b/debian/rules
@ -24,8 +24,9 @@
 build:
 	@echo 'The build target is disabled. Use the appropriate binary target.'

-JAVA_HOME=/usr/lib/jvm/default-java
-
+#JAVA_HOME=/usr/lib/jvm/default-java
+export DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
+JAVA_HOME=/usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
 I2P=$(CURDIR)/pkg-temp
 ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java
 export DEB_BUILD_HARDENING=1
@ -38,18 +39,6 @@ export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{prin
 export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 #export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)

-# debian: bullseye - transitioning
-JSON_SIMPLE_VERSION = $(shell dpkg -l libjson-simple-java | grep '^ii' | awk '{print $$3}')
-JSON_SIMPLE_3 = $(shell dpkg --compare-versions '$(JSON_SIMPLE_VERSION)' 'gt' '3.1.1-1~' && echo yes || echo no)
-ifeq (yes,$(JSON_SIMPLE_3))
-JSON_SIMPLE_PACKAGE = com.github.cliftonlabs.json_simple
-JSON_EXCEPTION = JsonException
-else
-JSON_SIMPLE_PACKAGE = org.json.simple
-JSON_EXCEPTION = DeserializationException
-endif
-
-
 %:
 	dh $@ --with systemd,bash-completion

@ -68,8 +57,6 @@ override_dh_auto_clean:
 	rm -f $(CURDIR)/apps/susidns/src/lib/jstl.jar
 	rm -f $(CURDIR)/apps/susidns/src/lib/jstlel.jar
 	debconf-updatepo
-	find . -type f -name \*.java.json-simple \
-	  -exec sh -c 'file={} && mv $$file $${file%.json-simple}' \; -print

 override_dh_auto_build:

@ -93,8 +80,11 @@ else
 	@echo "Already found deb in version, not doing anything"
 endif
 	@# build options
-	@/bin/echo -e "javac.release=11" > $(CURDIR)/override.properties
-	@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
+	@/bin/echo -e "javac.release=8" > $(CURDIR)/override.properties
+	@/bin/echo -e "javac.version=1.8" > $(CURDIR)/override.properties
+	@/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
+	@/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
+	@/bin/echo -e "build.built-by=launchpad" >> $(CURDIR)/override.properties
 	@/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties

 	@# debian and ubuntu: everywhere
@ -123,7 +113,7 @@ endif
 	@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
 	ln -sf /usr/share/java/jsp-api.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar

-	@# debian and ubuntu: buster, disco
+	@# debian and ubuntu: wheezy-backports, jessie+, xenial+
 	@/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties
 	mkdir -p $(CURDIR)/apps/jetty/jettylib
 	ln -sf /usr/share/java/tomcat9-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
@ -156,13 +146,6 @@ endif
 	@mkdir -p $(CURDIR)/core/java/build
 	ln -sf /usr/share/java/json-simple.jar $(CURDIR)/core/java/build/json-simple.jar

-	@# debian: bullseye - transitioning
-	find . -type f -name \*.java -exec grep -q 'import @JSON_SIMPLE@' {} \; \
-	  -exec sed -i.json-simple \
-		    -e 's,@JSON_SIMPLE@,$(JSON_SIMPLE_PACKAGE),' \
-		    -e 's/@JSON_EXCEPTION@/$(JSON_EXCEPTION)/' \
-		    {} \; -print
-
 	@# debian: everywhere; ubuntu: trusty+
 	@/bin/echo -e "with-famfamfam-flag-png=true" >> $(CURDIR)/override.properties
Author	SHA1	Message	Date
idk	d1a21e240c	build bionic tarball	2023-03-14 21:46:54 +00:00
idk	82433cba42	build bionic tarball	2023-03-14 21:27:27 +00:00
idk	f8f7859926	build bionic tarball	2023-03-14 20:58:20 +00:00