Debian:

Add dependency on libjetty8-java and libservlet3.0-java packages Remove those binaries in debian builds Prep for dependency on libservlet2.5-java package Prep for dependency on libtomcat6-java package Prep for dependency on libtomcat7-java package Prep for dependency on libjakarta-taglibs-standard-java package Prep for dependency on libjstl1.1-java package Add build properties for building with packages Rework of apps/jetty/build.xml for building with packages Redefine debian/ as the files for the jessie build Make debian-alt directories for ubuntu builds Move debian/changelog to debian-alt/trusty/changelog Move debian-alt/jessie/changelog to debian/changelog Add apps/jetty/jettylib/jsp-api.jar to classpath for jsp builds
2016-04-01 18:19:06 +00:00
parent a493a2842a
commit e2f048b2ac
16 changed files with 469 additions and 211 deletions
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,8 @@
-i2p (0.9.25-1ubuntu1) trusty; urgency=medium
+i2p (0.9.25-1~deb8u+1) stable; urgency=medium

-  * New upstream version 0.9.25
+  * Backport to Jessie

- -- 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
+ -- zzz on i2p <zzz@i2pmail.org>  Tue, 29 Mar 2016 18:12:12 +0000

 i2p (0.9.24-1) unstable; urgency=medium

@@ -118,6 +112,7 @@ 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]
@@ -331,9 +326,11 @@ 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 release
+  * New Upstream Version
    - Add support for Ed25519 signatures
    - i2psnark move to separate config file for each torrent to better support
      per-torrent settings
@@ -370,14 +367,10 @@ 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
@@ -401,12 +394,10 @@ 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
@@ -448,46 +439,94 @@ i2p (0.9.11-3) unstable; urgency=medium

 i2p (0.9.11-1) unstable; urgency=medium

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

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

 i2p (0.9.10-1) unstable; urgency=medium

-  * New release
+  * New Upstream Version
  * 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-1) unstable; urgency=medium
+i2p (0.9.9-1deb8u1) unstable; urgency=medium

-  * New Upstream release
+  * 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
  * 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) unstable; urgency=low
+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

  * 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) unstable; urgency=low
+i2p (0.9.7.1-1) stable; urgency=low

  * New upstream version 0.9.7.1
  * Compress packages with xz

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

@@ -503,16 +542,15 @@ 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 00:00:00 +0000
+ -- Kill Your TV <killyourtv@i2pmail.org>  Mon, 27 May 2013 23:18:54 +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.
+    to compensate for stricter umasks. Fixes #906.

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

 i2p (0.9.5-1) unstable; urgency=low

@@ -523,19 +561,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-3) unstable; urgency=low
+i2p (0.9.4+repack-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-2) unstable; urgency=low
+i2p (0.9.4+repack-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-1) stable; urgency=low
+i2p (0.9.4+repack-1) unstable; urgency=low

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

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

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

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

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

-i2p (0.9.2-2) stable; urgency=high
+i2p (0.9.2+repack-2) unstable; 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-1) stable; urgency=low
+i2p (0.9.2+repack-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-1) stable; urgency=low
+i2p (0.9.1+repack-1) unstable; urgency=low

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

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

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

  * New Upstream Version

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

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

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

@@ -686,38 +724,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-2) stable; urgency=medium
+i2p (0.8.11+repack-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-1) stable; urgency=low
+i2p (0.8.11+repack-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-1) stable; urgency=medium
+i2p (0.8.10+repack-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-1) stable; urgency=medium
+i2p (0.8.9+repack-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-3) UNRELEASED; urgency=low
+i2p (0.8.8+repack-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-2) stable; urgency=medium
+i2p (0.8.8+repack-2) stable; urgency=medium

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

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

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

  * New Upstream Version

--- a/debian/control
+++ b/debian/control
@@ -10,6 +10,7 @@ Build-Depends: debhelper (>= 7.0.50~)
 ,ant-optional
 ,debconf
 ,openjdk-7-jdk
+ ,libjetty8-java, libservlet3.0-java
 ,dh-apparmor
 ,gettext
 ,libgmp-dev (>= 2:5.0.5)
@@ -72,7 +73,8 @@ Priority: optional
 Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
 openjdk-8-jre-headless | openjdk-7-jre-headless | default-jre-headless | java8-runtime-headless | java7-runtime-headless,
 libecj-java,
- geoip-database
+ geoip-database,
+ libjetty8-java, libservlet3.0-java
 Replaces: i2p ( << 0.8.6-5)
 Breaks: i2p (<< 0.8.6-5)
 Recommends: libjbigi-jni, ttf-dejavu
--- a/debian/i2p-router.install
+++ b/debian/i2p-router.install
@@ -20,36 +20,64 @@ pkg-temp/webapps usr/share/i2p


 pkg-temp/lib/BOB.jar usr/share/i2p/lib
-pkg-temp/lib/commons-el.jar usr/share/i2p/lib
-pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
 pkg-temp/lib/desktopgui.jar usr/share/i2p/lib
 pkg-temp/lib/i2p.jar usr/share/i2p/lib
 pkg-temp/lib/i2psnark.jar usr/share/i2p/lib
 pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib
-pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
-pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
-pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
 pkg-temp/lib/jrobin.jar usr/share/i2p/lib
-pkg-temp/lib/jstl.jar usr/share/i2p/lib
 pkg-temp/lib/mstreaming.jar usr/share/i2p/lib
-pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
-pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
 pkg-temp/lib/routerconsole.jar usr/share/i2p/lib
 pkg-temp/lib/router.jar usr/share/i2p/lib
 pkg-temp/lib/sam.jar usr/share/i2p/lib
-pkg-temp/lib/standard.jar usr/share/i2p/lib
 pkg-temp/lib/streaming.jar usr/share/i2p/lib
 pkg-temp/lib/systray4j.jar usr/share/i2p/lib
 pkg-temp/lib/systray.jar usr/share/i2p/lib
+
+
+# uncomment if not building with libjetty8-java
+# ubuntu: only in wily
+# debian: in wheezy jessie stretch sid
+#pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-http.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-io.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-security.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-start.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-util.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-webapp.jar usr/share/i2p/lib
+#pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
+#pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
+#pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
+# following two are from libservlet3.0-java which is a dependency of libjetty8-java
+#pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
+#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
+
+
+# uncomment if not building with libservlet2.5-java
+# ubuntu: only in wily
+# debian: in wheezy jessie stretch sid
+pkg-temp/lib/commons-el.jar usr/share/i2p/lib
+
+
+# uncomment if not building with libtomcat6-java
+# ubuntu: only in precise trusty vivid
+# debian: only in wheezy
+# todo: see if libtomcat7-java will work
+# legacy name, contains only tomcat-juli, not commons-logging
+pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
+
+
+# uncomment if not building with libjakarta-taglibs-standard-java
+# ubuntu: only in wily
+# debian: in wheezy jessie stretch sid
+pkg-temp/lib/jstl.jar usr/share/i2p/lib
+
+
+# uncomment if not building with libjstl1.1-java
+# ubuntu: in precise trusty vivid wily xenial
+# debian: in wheezy jessie stretch sid
+pkg-temp/lib/standard.jar usr/share/i2p/lib
--- a/debian/i2p-router.links
+++ b/debian/i2p-router.links
@@ -3,4 +3,60 @@ usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGP
 usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
 usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt

-usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
+usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
+
+
+# comment out if not building with libjetty8-java
+# ubuntu: only in wily
+# debian: in wheezy jessie stretch sid
+usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
+usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
+usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
+usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
+# legacy name in lib/
+usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
+usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
+usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
+usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
+usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
+usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
+usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
+usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
+# legacy name in lib/
+usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
+# legacy name in lib/
+usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
+# following two are from libservlet3.0-java which is a dependency of libjetty8-java
+# legacy name in lib/
+usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
+# combined into javax.servlet.jar in non-package builds
+usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
+
+
+# comment out if not building with libservlet2.5-java
+# ubuntu: only in wily
+# debian: in wheezy jessie stretch sid
+#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
+
+
+# comment out if not building with libtomcat6-java
+# ubuntu: only in precise trusty vivid
+# debian: only in wheezy
+# todo: see if libtomcat7-java will work
+# legacy name, contains only tomcat-juli, not commons-logging
+#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
+#usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
+# combined into jasper-runtime.jar in non-package builds
+#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
+
+
+# comment out if not building with libjakarta-taglibs-standard-java
+# ubuntu: only in wily
+# debian: in wheezy jessie stretch sid
+#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
+
+
+# comment out if not building with libjstl1.1-java
+# ubuntu: in precise trusty vivid wily xenial
+# debian: in wheezy jessie stretch sid
+#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
--- a/debian/repack.sh
+++ b/debian/repack.sh
@@ -31,6 +31,11 @@ bzcat "$tarball" | tar --wildcards --delete '*/installer/lib/*' \
                        --delete '*/debian-alt/*' \
                        --delete '*/installer/resources/geoip.txt' \
                        --delete '*/installer/resources/geoipv6.dat.gz' \
+                        --delete '*/apps/jetty/apache-tomcat/*' \
+                        --delete '*/apps/jetty/apache-tomcat-deployer/*' \
+                        --delete '*/apps/jetty/jetty-distribution-*/*' \
+                        --delete '*/apps/susidns/src/WEB-INF/lib/jstl.jar' \
+                        --delete '*/apps/susidns/src/WEB-INF/lib/standard.jar' \
                        --delete '*/debian/*' > "$tdir/${fname}"

 echo "Compressing filtered tarball..."
--- a/debian/rules
+++ b/debian/rules
@@ -76,8 +76,60 @@ endif
 	@/bin/echo -e "javac.version=1.7" > $(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 "with-geoip-database=true" >> $(CURDIR)/override.properties
 	@/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
+
+	# debian and ubuntu: everywhere
+	@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
+
+	# ubuntu: only in wily
+	# debian: in wheezy jessie stretch sid
+	@/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
+	ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
+	ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
+	ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
+	ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
+	ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
+	ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
+	ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
+	ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
+	ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
+	ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
+	ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
+	ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
+	ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
+	ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
+
+	# ubuntu: only in wily
+	# debian: in wheezy jessie stretch sid
+	#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
+	#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
+	#ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
+	#ln -sf /usr/share/java/servlet-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
+
+	# ubuntu: only in precise trusty vivid
+	# debian: only in wheezy
+	#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
+	#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
+	#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
+	#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
+	#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
+
+	# debian and ubuntu: everywhere
+	#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
+	#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
+	#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
+	#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
+	#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
+
+	# ubuntu: only in wily
+	# debian: in wheezy jessie stretch sid
+	#@/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
+	#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
+
+	# debian and ubuntu: everywhere
+	#@/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
+	#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/jstl.jar
+
 	TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
 	echo router.updateDisabled=true > $(I2P)/router.config
 	mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper