diff --git a/build.xml b/build.xml index c3aaba208..5fb4d88b8 100644 --- a/build.xml +++ b/build.xml @@ -2549,7 +2549,7 @@ - + @@ -2606,7 +2606,7 @@ - + @@ -2793,7 +2793,7 @@ - + diff --git a/debian-alt/README.txt b/debian-alt/README.txt index 2539682f2..cbc18a733 100644 --- a/debian-alt/README.txt +++ b/debian-alt/README.txt @@ -1,20 +1,20 @@ -The files in ../debian/ are for stretch. -You may also use them for jessie if you have libjetty9-java from jessie-backports. +The files in ../debian/ are for the current stable distribution (buster). +They should also work with bullseye, experimental, sid, testing. Alternates are in the subdirectories here. To use them, copy them over the files in ../debian/ . Built file compatibility: trusty may be copied to vivid. -trusty may be used for jessie without libjetty9-java from backports. +trusty may be used for jessie with libjetty9-java from backports. xenial may be copied to yakkety, zesty bionic may be copied to cosmic disco may be copied to eoan Not maintained: wheezy files are not maintained. Use the precise files instead. -jessie files may not be maintained. Use the trusty files instead. -buster and sid files are not maintained, see the latest in Debian. +jessie files are not be maintained. Use the trusty files instead. +stretch files may not be maintained. Use the trusty files instead. Note on systemd: diff --git a/debian-alt/disco/i2p-router.links b/debian-alt/bionic/i2p-router.links similarity index 90% rename from debian-alt/disco/i2p-router.links rename to debian-alt/bionic/i2p-router.links index 8f980dcd4..2284de235 100644 --- a/debian-alt/disco/i2p-router.links +++ b/debian-alt/bionic/i2p-router.links @@ -33,25 +33,24 @@ usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar -# comment out if not building with libtomcat9-java +# comment out if not building with libtomcat8-java # ubuntu: only in xenial+ # debian: wheezy-backports, jessie+ # legacy name, contains only tomcat-juli, not commons-logging -usr/share/java/tomcat9-juli.jar usr/share/i2p/lib/commons-logging.jar -usr/share/java/tomcat9-jasper.jar usr/share/i2p/lib/jasper-runtime.jar +usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar +usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar # combined into jasper-runtime.jar in non-package builds -usr/share/java/tomcat9-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar -usr/share/java/tomcat9-api.jar usr/share/i2p/lib/tomcat-api.jar -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 +usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar +usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar +usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar +usr/share/java/tomcat8-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 +usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar # legacy name in lib/ -usr/share/java/tomcat9-el-api.jar usr/share/i2p/lib/commons-el.jar +usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.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 usr/share/java/taglibs-standard-impl.jar usr/share/i2p/lib/standard.jar diff --git a/debian-alt/bionic/patches/series b/debian-alt/bionic/patches/series deleted file mode 100644 index 5fabbd7e7..000000000 --- a/debian-alt/bionic/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-path-substitution.patch -0002-jetty-compatibility.patch diff --git a/debian-alt/buster/changelog b/debian-alt/buster/changelog deleted file mode 100644 index 6ab757786..000000000 --- a/debian-alt/buster/changelog +++ /dev/null @@ -1,1082 +0,0 @@ -i2p (0.9.34-1) unstable; urgency=medium - - * New upstream release. - * d/README.Debian: Fixed a typo. - * d/control: Removed unnecessary comma. - * d/control: Added Vcs-* entries. - * d/po/*: Synced with the upstream. - * d/rules: Set javac option -source & -target to 1.8. - - -- Masayuki Hatta Thu, 12 Apr 2018 02:40:45 +0900 - -i2p (0.9.33-2) unstable; urgency=medium - - * d/control: bumped Standards-Version to 4.1.3. - * d/control: default-jdk is now openjdk-9-jdk so depends on and use it. - * d/rules: ditto. - - -- Masayuki Hatta Thu, 29 Mar 2018 00:02:36 +0900 - -i2p (0.9.33-1) unstable; urgency=medium - - * New upstream release. - * Now uses libtaglibs-standard-*-java instead of - glassfish-javaee (closes: #882489) - * Removed -m32 and -m64 flags for Debian builds (closes: #877042) - * Updated sv.po (closes: #890653) - * Updated ru.po (closes: #883920) - - -- Masayuki Hatta Tue, 27 Mar 2018 20:05:18 +0900 - -i2p (0.9.32-2) unstable; urgency=medium - - * debian/i2p.postinst: changed logic to invoke systemctl. - let's see if it works with piuparts. - * debian/watch: updated, now it supposed to work. - * debian/README.Debian: fixed a typo. - - -- Masayuki Hatta Sat, 18 Nov 2017 17:29:54 +0900 - -i2p (0.9.32-1) unstable; urgency=medium - - * New upstream release. - * Based on 0.9.32-1ubuntu1. - * debian/control: removed obsoleted dh-systemd. - * debian/control: now depends on debhelper (>= 9.20160709). - * debian/control: changed Standards-Version to 4.1.1. - * debian/control: changed i2p-doc priority from extra to optional. - * debian/README.Debian: fixed port number (closes: #877022). - * debian/po/nl.po: updated (closes: #879135). - * debian/patches/0004-remove-linkrel-from-eclipse-license.patch: added. - to make lintian happy. - * debian/patches/0005-license-path-fix-patch: added. - codehaus is long gone, states new URL. to make lintian happy. - - -- Masayuki Hatta Fri, 17 Nov 2017 19:43:29 +0900 - -i2p (0.9.30-4) unstable; urgency=medium - - * Initial release for Debian (closes: #448638). - * Based on 0.9.30-3ubuntu1. - * patches/0004-jetty9.2.22.fix.patch: temporarily added. - * patches/0005-license-path-fix.patch: to make lintian happy. - * debian/compat: set compat level to 9. - * debian/control: removed hardening-wrapper from Build-Dep. - * debian/ctonrol: versioned dependency on libjetty9-java in Build-Dep. - * debian/control: changed Maintainer. - * debian/control: changed Standards-Version to 4.0.0. - * debian/control: added ${misc:Depends} to i2p & libjbigi-jni's Dep. - * debian/control: revised Descriptions to make lintian happy. - * debian/rules: remove apps/susidns/src/lib/standard.jar symlink on clean. - * debian/rules: fixed a typo (override_dh_dhlibdeps -> override_dh_shlibdeps). - * debian/changelog: added "Old Changelog:" to make lintian happy. - * debian/NEWS: moved to NEWS.old. - * debian/i2p-router.lintian-overrides: added. - * debian/i2p.postinst: change systemctl -> deb-systemd-helper. - * debian/i2p.postinst: fixed a typo (missing ")" in /etc/default/i2p). - - -- Masayuki Hatta Wed, 26 Jul 2017 13:21:41 +0900 - -Old Changelog: - -i2p (0.9.34-2ubuntu1) artful; urgency=medium - - * New upstream version 0.9.34 - - -- zzz on i2p (key signing) Wed, 11 Apr 2018 12:12:12 +0000 - -i2p (0.9.33-1ubuntu1) artful; urgency=medium - - * New upstream version 0.9.33 - - -- zzz on i2p (key signing) Wed, 30 Jan 2018 12:12:12 +0000 - -i2p (0.9.32-1ubuntu1) xenial; urgency=medium - - * New upstream version 0.9.32 - - -- zzz on i2p (key signing) Wed, 08 Nov 2017 12:12:12 +0000 - -i2p (0.9.31-1ubuntu1) xenial; urgency=medium - - * New upstream version 0.9.31 - - -- zzz on i2p (key signing) Wed, 09 Aug 2017 12:12:12 +0000 - -i2p (0.9.30-3ubuntu1) xenial; urgency=medium - - * New upstream version 0.9.30 - - -- zzz on i2p (key signing) Wed, 03 May 2017 12:12:12 +0000 - -i2p (0.9.29-1ubuntu1) trusty; urgency=medium - - * New upstream version 0.9.29 - - -- zzz on i2p (key signing) Mon, 27 Feb 2017 12:12:12 +0000 - -i2p (0.9.28-1ubuntu1) trusty; urgency=medium - - * New upstream version 0.9.28 - - -- zzz on i2p (key signing) Tue, 13 Dec 2016 12:12:12 +0000 - -i2p (0.9.27-1-1ubuntu1) trusty; urgency=medium - - * New upstream version 0.9.27 - - -- zzz on i2p (key signing) Mon, 17 Oct 2016 12:12:12 +0000 - -i2p (0.9.26-1ubuntu1) trusty; urgency=medium - - * New upstream version 0.9.26 - - -- zzz on i2p (key signing) Tue, 07 Jun 2016 12:12:12 +0000 - -i2p (0.9.25-1ubuntu1) trusty; urgency=medium - - * New upstream version 0.9.25 - - -- zzz on i2p (key signing) Sat, 26 Mar 2016 12:12:12 +0000 - -i2p (0.9.24-1ubuntu1) trusty; urgency=medium - - * Upload to PPA - - -- Kill Your TV Sat, 30 Jan 2016 14:12:27 +0000 - -i2p (0.9.24-1) unstable; urgency=medium - - * New upstream version 0.9.24 - - -- Kill Your TV Sat, 30 Jan 2016 12:08:27 +0000 - -i2p (0.9.23-2) unstable; urgency=medium - - * Backport of two fixes from after the release of 0.9.23 - - debian/patches/0005-Console-Fix-escaping-of-plugin-description-on-config.patch - - debian/patches/0006-NetDb-Fix-deadlock-ticket-1722.patch - * AppArmor: - - Remove 'l' from the debian AppArmor profiles - - Allow writing to /tmp/imageio*, needed by graph creation on some systems - - -- Kill Your TV Sun, 06 Dec 2015 14:28:23 +0000 - -i2p (0.9.23-1) unstable; urgency=medium - - * New Upstream Version - - Accelerate transition to Ed25519 - - Fix some bugs soft restarting after a large clock shift (e.g. resume) (but more to do) - - Fix streaming retransmission timers that were dying, and related timer bugs - - Fix streaming connections rejected while tunnel is opening - - Fix rare i2psnark and UPnP deadlocks - - Fix lifetime participating bandwidth display in console - - Increase default outbound exploratory tunnel length to 3 - - Use max of 2 not-failing peers in exploratory tunnels to improve build success - - Add support for hostnames prefixed with "www."; - - Store news feed items separately on disk, show on new /news page, limit display on home page to 2 - - Increase probability of rekeying to EdDSA - - Detect for broken ECDSA support in Gentoo - - Console: Add a Java 6 warning, this is the last release to support Java 6 - - Changes to prepare for Java 9 compatibility - - i2ptunnel: Pass Accept-Encoding header through client and server proxies, to allow end-to-end compression - - i2psnark: Increase piece size, piece count, and file count limits - - i2psnark: Save added and completed times - - i2psnark: Save magnet parameters across restart - - i2psnark: Don't delete .torrent file on errors at startup, rename to .torrent.BAD - - i2psnark: Add recheck, start, stop buttons on details pages - - i2psnark: Add option to disable "smart sort" - - Speed up IP address validation - - Separate streaming blacklists for ECDSA and EdDSA - - Translation updates - - Update GeoIP data (new installs and PPA only) - - -- Kill Your TV Thu, 19 Nov 2015 12:41:36 +0000 - -i2p (0.9.22-1) unstable; urgency=medium - - * New Upstream Version - - Start migration to Ed25519 router info signatures - - Fix i2psnark getting stuck before download complete, and not deleting temp - files - - Fix excluded SSL ciphers in console - - Translation updates - - Update GeoIP data - - -- Kill Your TV Sun, 13 Sep 2015 11:27:16 +0000 - -i2p (0.9.21-2) unstable; urgency=medium - - * Add exception to apparmor rules for scrypt, needed by I2P-Bote - - -- Kill Your TV Sun, 02 Aug 2015 15:00:30 +0000 - -i2p (0.9.21-1) unstable; urgency=medium - - * New Upstream Version - - Add multisession support for dual-signature crypto on the same tunnels - - Use multisession for shared clients - - Increase default outbound bandwidth limit to 60 KBps - - Increase default maximum participating tunnels - - Floodfills will send database store acks directly if connected, for efficiency - - Set TCP keepalive on I2CP and SAM sockets - - More efficient decompression in HTTP proxy, use less threads - - Add support for fast extensions in i2psnark - - i2psnark only autostarts torrents that were running previously - - Add support for translated console news - - SSU fixes to compete better with NTCP for bandwidth when limited - - Fixes to prevent SSU stalls - - Wait for outbound tunnels before sending first leaseset to client, to - prevent dropping first message - - Clean up resources correctly when SAM stops - - Better error handling and notification when HTTP proxy is not running - - More i2ptunnel fixes at startup and shutdown of tunnels - - Fix total_size in i2psnark metadata message - - Restore dates in console news headers - - Several I2CP fixes - - Use same session for naming lookups in I2PSocketEepGet - - Increase max bandwidth to 16 MBps, add larger Bloom filter - - New floodfills will send their info to nearby floodfills to speed integration - - Apache Tomcat 6.0.44 - - Translation updates - * Drop the following patches; included in 0.9.21: - - 0005-i2ptunnel-Don-t-connect-manager-to-router-in-constru.patch - - 0006-i2ptunnel-Don-t-call-startup-in-chained-constructor-.patch - - 0007-Define-I2PTunnelClientBase-stats-in-one-place.patch - - 0008-i2psnark-Fix-NPE-ticket-1602.patch - - - -- Kill Your TV Fri, 31 Jul 2015 20:01:42 +0000 - -i2p (0.9.20-3) unstable; urgency=medium - - * Add datagram exception to the apparmor profile - - -- Kill Your TV Sat, 20 Jun 2015 11:22:28 +0000 -i2p (0.9.20-2) unstable; urgency=medium - - [str4d] - * i2ptunnel: Don't connect manager to router in constructor (ticket #815) - * i2ptunnel: Don't call startup() in chained constructor (ticket #1593) - * Define I2PTunnelClientBase stats in one place - - [killyourtv] - * Tighten apparmor rules for TMPDIR - * Add support for specifying limits to the initscript - * Fix NPE in I2PSnark (I2P Trac #1602) - - -- Kill Your TV Sun, 14 Jun 2015 16:11:33 +0000 - -i2p (0.9.20-1) unstable; urgency=medium - - * New Upstream Version - - Add support for address book export - - Add support for SSL in HTTP server tunnel - - Allow class 'M' (64-128 KBps share bandwidth) to become floodfill - - Raise connection limits for new classes 'P' (512-2000 KBps share - bandwidth) and 'X' (over 2000 KBps) - - Add support for signed development builds - - Clock skew fixes - - Fixes and configuration for when IPv4 is firewalled but IPv6 still works - - Locking fixes for i2ptunnel clients to prevent hangs at startup - - Verify hostnames when reseeding - - Fix deletion of config files for deleted torrents in i2psnark - - Fix hangs fetching proxy.i2p local resources via Privoxy - - Fixes for duplicate shared clients - - Fix for occasional page truncation in HTTP client - - Fixes for handling corrupted SSU packets - - Fix closing of SAM sessions when I2P session closes - - Reduce NTCP threads - - Eliminate SimpleScheduler threads - - Add continent-based NTP servers as fallbacks for country-based ones - - Remove all default non-SSL reseed hosts - - Disable fallback to non-su3 reseeding - - Several fixes in streaming for better "loopback" performance, - may or may not help in real world - - Reduce latency in i2ptunnel - - Add a larger Bloom filter for very high bandwidth and memory - - Add Bloom filter warning when configured for high bandwidth but not - enough memory - - Reduce max netdb search depth to reduce floodfill load - - Improved header processing and error handling in i2ptunnel HTTP server - - Better error handling and user feedback when HTTP client tunnel is - disabled - - More changes to improve floodfill capacity - - New configuration for forcing IPv4 (only) to firewalled on /confignet - - New configuration for floodfill on /configadvanced - - Show separate IPv4 and IPv6 status in summary bar when appropriate - - Better handling of corrupt SSU packets - - Jetty 8.1.17.v20150415 - - Translation updates - - Update GeoIP data (new installs and PPA only) - - -- Kill Your TV Tue, 02 Jun 2015 18:36:42 +0000 - -i2p (0.9.19-4) unstable; urgency=medium - - * Re-enable systemd unit file - - -- Kill Your TV Thu, 30 Apr 2015 22:54:56 +0000 - -i2p (0.9.19-3) unstable; urgency=medium - - * A couple more apparmor profile tweaks - - -- Kill Your TV Tue, 14 Apr 2015 20:35:39 +0000 - -i2p (0.9.19-2) unstable; urgency=medium - - * Fix usr.bin.i2prouter apparmor profile - - -- Kill Your TV Tue, 14 Apr 2015 12:58:22 +0000 - -i2p (0.9.19-1) unstable; urgency=medium - - * New Upstream Version - - Floodfill performance improvements - - Easier ways to reseed manually from a file or URL - - New way to export reseed data for others - - Support for installing plugin from file - - Fixes for high CPU usage in floodfills - - i2ptunnel locking fixes - - Fixes in read timeout handling in streaming - - Update to UPnP library 3.0 - - Improve tracking of floodfill lookup success - - Direct router info lookups if connected to floodfill - - Auto-adjustment of i2psnark tunnel quantity - - Increase exploratory tunnel quantity when floodfill - - Increase min and default bandwidth for i2psnark - - Improved strategies for dropping jobs on high job lag to prevent overload - - Apache Tomcat 6.0.43 - - Translation updates - - Update GeoIP data - * debconf translation updates - * Minor updates to AppArmor profiles - - -- Kill Your TV Sun, 12 Apr 2015 22:34:40 +0000 - -i2p (0.9.18-1) unstable; urgency=medium - - * New Upstream Version - * Daemon runs confined with AppArmor - Bug Fixes - - Fix parsing of ECDSA address helper in HTTP client proxy - - Fix news last-modified processing which prevented notification of update - - Improve handling of UPnP device changes - - Don't hang at startup forever waiting for entropy - - Possible fixes for high CPU usage in NTCP - Other - - Publish router info faster when address costs change - - Start i2ptunnel 90s sooner - - Accept tunnels 10m sooner - - Increase exploratory tunnel quantity during initial exploration - - Latency reductions in several places - - Add startup browser configuration with advanced config - routerconsole.browser - - Persistent leaseset keys to eliminate correlation with restart - - Faster unchoking of new peers in i2psnark - - More aggressive throttling of lookups at floodfills - - Tunnel build request record refactoring - - Reduce thread usage in i2ptunnel - - Add i2ptunnel server option for multihomed sites - - Disallow some common I2P application ports as router ports - - Increase connection limits for fast routers - - Add Save-As button for SusiMail messages - - Use 'hidden service' terminology in the console - - Encrypted netdb lookups for 32-bit x86 - - Translation updates - - -- Kill Your TV Sun, 22 Feb 2015 22:23:50 +0000 - -i2p (0.9.17-1) unstable; urgency=medium - - * New Upstream Version - Changes - - Signed news - - ECDSA default for new server tunnels - - Reseeding now SSL-only by default - Bug Fixes - - Fix SSU sending corrupt ack-only packets with partial bitfields - - Fix SSU inbound connection fail from non-DSA router - - Don't select incompatible peers if we are a non-DSA router - - Fix EdDSA signature verification bug - - Set I2NP lookup type flags in all cases, not just when a reply tunnel is used - - Stop i2ptunnel server acceptor thread after close - - Fix bug preventing some plugins from stopping completely - - Fix SAM v3 bug causing failures in incoming connections - Other - - Add a warning in the console sidebar if ECDSA not supported - - Log warnings for Java 6 that we will eventually require Java 7 - - Don't let proxied routers auto-floodfill - - Don't resend SSU acks that are too old - - Don't publish direct info in SSU address if introducers are required - - New default opentrackers in i2psnark - - Add support for specifiying data directory per-torrent in i2psnark - - Changes in streaming accept() error behavior - - Minor blockfile format changes - - New option for persistent random key to preserve peer ordering across restarts - - Translation updates - - Update GeoIP data - - -- Kill Your TV Sun, 30 Nov 2014 22:20:06 +0000 - -i2p (0.9.16-1) unstable; urgency=medium - - * New Upstream Version - - Add support for stronger Router Info signatures - - Encrypt RI lookups and responses on faster boxes - - Require I2CP authorization for all messages when enabled (requires 0.9.11 - or higher client) - - Disable TLSv3 and older ciphers for reseeding and other uses of SSL - - Use ECDSA by default for i2ptunnel IRC, SOCKS-IRC, and standard client - tunnels - - Don't prefer floodfills in some countries - - New column sorting, set-all priority buttons, and upload ratio display in - i2psnark - - Increase i2psnark tunnel default to 3 hops - - Implement bundling of multiple fragments in a single SSU message for - efficiency - - New add-to-addressbook links on netdb leaseset page - - Implement I2NP DatabaseLookupMessage search type field to improve lookup - efficiency - - CPUID fixes and updates for recent processors - - i2psnark fix magnet links with %-encoding - - Improve handling of SSU socket closing out from under us (hopefully fix - 100% CPU) - - SSU bitfield handling fixes - - Fix HTTP header issues in i2psnark - - Fix rare NPE when building garlic message - - Fix console lockups (hopefully) - - Fix i2ptunnel js confirm-delete - - Move router data structures from i2p.jar to router.jar (breaks i2pcontrol - plugin) - - New router keys now stored in router.keys.dat (privKeys.dat format) - instead of router.keys - - Improve handling of unsupported encryption throughout - - More error checking of client I2CP messages by the router - - Initial work on hooks for pluggable transports - - Enforce request timestamp in tunnel build messages - - Re-enable message status in streaming, but treat no leaseset as a soft - failure for now - - Return unused DH keypairs to the pool for efficiency - - Raise failsafe tagset limit and improve deletion strategy when hit - - Change eepsite Jetty threadpool and queue configuration - - NTCP establishment refactoring in prep for NTCP2 and PT - - Jetty 8.1.16-v20140903 - - Translation updates - - Update GeoIP data - -i2p (0.9.15-1) unstable; urgency=medium - - * New Upstream release - - Add support for Ed25519 signatures - - i2psnark move to separate config file for each torrent to better support - per-torrent settings - - Add i2psnark support for data outside the i2psnark/ directory - - Enable stronger signatures (su3 format) for plugins - - Speed up SSU introductions by responding to hole punch messages - - Several improvements in SAM efficiency - - More HTML escaping and form submission fixes in the console and i2psnark - - Streaming fixes for long signatures - - i2psnark fixes for file name character mapping when seeding - - I2PTunnel fixes stopping client tunnels - - I2PTunnel fix updating options on a running delay-open client tunnel - - Re-enable plugin installation via the console, removed in 0.9.14 - - i2psnark now remembers uploaded count across restarts - - i2psnark increase max piece size to 8 MB - - i2psnark several UI fixes - - Prohibit SSU peer test requests unless a connection is established - - i2ptunnel add support for local SSL connections for standard and IRC - client tunnels - - Console and log warnings for unavailable crypto - - More consistent routing for Delivery Status Messages to reduce network - connections - - Disable external entities in UPnP XML parser - - Translation updates - - Update GeoIP data - - -- Kill Your TV Sun, 21 Sep 2014 00:07:36 +0000 - -i2p (0.9.14.1-1) unstable; urgency=medium - - * New upstream point release, 0.9.14.1 - - Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country - database from 2014-08-06. - - 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 - + More escaping - - i2psnark: Fix add torrent form - - ExecNamingService: Remove - - Plugins: Add whitelist of keys - - -- Kill Your TV Sat, 09 Aug 2014 23:09:33 +0000 - -i2p (0.9.14-1) unstable; urgency=high - - * New upstream release, 0.9.14 - * Fix several XSS issues - - Disable changing news feed URL from UI - - Disable plugin install - - Disable setting unsigned update URL from UI - - Disable clients.config editing from the UI - - Add Content-Security-Policy and X-XSS-Protection headers - - Disable unused ExecNamingService (thx joernchen of Phenoelit) - * Bug fixes - - Fix tunnel building so it doesn't get "stuck" on a single pool - - Reject participating tunnels when hidden - - 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 - - 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 - - Lots of findbugs fixes and cleanups - - Support signature types in SAM, bump rev to 3.1 - - New event log page in console - - Jetty 8.1.15.v20140411 - - Tomcat 6.0.41 - - -- Kill Your TV Sat, 26 Jul 2014 23:23:36 +0000 - -i2p (0.9.13-1) unstable; urgency=medium - - * New Upstream release - * debconf: New Slovak translation - - -- Kill Your TV Thu, 22 May 2014 19:08:45 +0000 - -i2p (0.9.12-2) unstable; urgency=low - - * Re-enable i2p-docs package - * Have libjbigi package depend on i2p-router - * Remove ${misc:Depends} from the i2p dependencies to avoid hard-depending - on i2p-router (= ${source:Version}. This prevents users from trying dev - builds using "dpkg -i i2p-router-${devbuild}_all.deb. The i2p package - already depended on i2p-router. - - -- Kill Your TV Sun, 06 Apr 2014 16:27:31 +0000 - -i2p (0.9.12-1) unstable; urgency=medium - - * New upstream release - - -- Kill Your TV Mon, 31 Mar 2014 19:07:54 +0000 - -i2p (0.9.11-3) unstable; urgency=medium - - * Enable systemd for unstable and saucy|trusty - * Fix postinst - - -- Kill Your TV Tue, 11 Mar 2014 00:45:52 +0000 - -i2p (0.9.11-1) unstable; urgency=medium - - * New release - * Debconf: New Korean and Polish translations - - -- Kill Your TV Sat, 09 Feb 2014 00:00:00 +0000 - -i2p (0.9.10-1) unstable; urgency=medium - - * New release - * Remove /var/lib/i2p when i2p package is purged. - * Bump standards version to 3.9.5 (no changes needed) - - -- Kill Your TV Wed, 22 Jan 2014 16:00:24 +0000 - -i2p (0.9.9-1) unstable; urgency=medium - - * New Upstream release - * debconf: - - Updated French translation - - New Romanian translation - - -- Kill Your TV Sat, 07 Dec 2013 18:17:24 +0000 - -i2p (0.9.8-1) unstable; urgency=low - - * New Upstream Version - * Debconf: updated Swedish translation - - -- Kill Your TV Mon, 30 Sep 2013 16:14:40 +0000 - -i2p (0.9.7.1-1) unstable; urgency=low - - * New upstream version 0.9.7.1 - * Compress packages with xz - - -- Kill Your TV 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 Tue, 16 Jul 2013 11:08:48 +0000 - -i2p (0.9.7-1) unstable; urgency=low - - * New upstream release - * debconf: - - New Chinese, Portuguese, and Turkish translations - - Russian translation updates - - -- Kill Your TV Mon, 15 Jul 2013 19:35:09 +0000 - -i2p (0.9.6-1) unstable; urgency=low - - * New upstream release - * i2prouter: allow overrides to be set in /etc/default/i2p - - -- Kill Your TV 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. - - -- Kill Your TV Sun, 31 Mar 2013 12:50:17 +0000 - -i2p (0.9.5-1) unstable; urgency=low - - * New Upstream release - * Drop debian/patches/0007-backported-news-fix.patch and - debian/patches/#0006-remove-izpack.patch - * Spanish debconf update - - -- Kill Your TV Fri, 08 Mar 2013 23:04:51 +0000 - -i2p (0.9.4-3) unstable; urgency=low - - * Backport fix from MTN for ticket #817 - - -- Kill Your TV Sat, 22 Dec 2012 13:07:47 +0000 - -i2p (0.9.4-2) unstable; urgency=low - - * Add missing build-dep on libservice-wrapper-java - - -- Kill Your TV Mon, 17 Dec 2012 20:40:07 +0000 - -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 - subpar. We can't force a depend on openjdk since kFreeBSD does not include - it (yet). - * French Debconf translation updates - * Initscript: Don't display a warning if /var/run/i2p contains files after - shutdown. - * Upsteam changelog (full details in history.txt): - - Add per-destination outbound priorities - - Fix major bug that reduced SSU connection limits which reduced tunnel - build success rates - - Fix bug with external I2CP that prevented some external apps from working - - Fixed several bugs in i2psnark DHT - - Fixed bug in i2psnark PEX that inflated peer counts - - Handle dropped I2CP messages better - - Reduce overhead of I2CP messages - - Enforce max size in transport outbound message queues - - Fix a bug that would drop messages of exactly 512 bytes in SSU - - More performance improvements, memory reduction, and object churn reduction - - Better detection of network disconnections - - Further improvements in the SSU transport - - Add console password form - - Convert http proxy and console from basic to digest authentication for added security - - Improved verification of console form submissions, using jsp sessions. - Cookies may now be required on forms, except when the console password is - enabled - - Initial work on new interfaces to manage applications started via - clients.config - - Increase minimum peer port to 1024 - - Increase granularity of bandwidth limiter for smoother transmissions - - Translation updates: Chinese, French, German, Italian, Polish, - Portuguese, Swedish, and Ukrainian - - -- Kill Your TV Mon, 17 Dec 2012 23:59:59 +0000 - -i2p (0.9.3-1) stable; urgency=low - - * New Upstream release - * Upstream changelog (full details in history.txt): - - Active Queue Management - - I2PSnark DHT: Several bug fixes, enable by default. - - Priority queues - - Several SSU fixes including memory leak, and better handling of routers - behind firewalls that change UDP ports; additional defenses for malicious - packets. - - Fix piece selection (rarest-first) bugs in i2psnark - - Fix bug causing multiple browsers to open at startup - - Improvements in caching - - Several synchronization fixes and lock contention reduction - - Major reduction in SSU buffers memory use - - Fix streaming connection timeout back to 1 minute, was inadvertently - changed to 5 minutes; set i2ptunnel server read timeout to 5 minutes, was - unlimited - - Improved defenses in i2ptunnel for "darkloris" - - More validation at torrent creation in i2psnark - - Several parameter changes in SSU to improve throughput - - New event log for major events including restarts; show multiple restart - lines on graphs - - Remove duplicate messages from logs - - Don't respond to blocked streaming connections with a reset, just drop - - Remove all uses of inefficient SimpleTimer - - More checks for valid IPs and ports entered in console - - Fix bug that wasted a lot of entropy - - Translation updates: Italian, Portuguese, Spanish, Swedish - - Add non-NIO configuration in jetty.xml, recommended for Java 5 - - Update GeoIP data - - -- Kill Your TV Sat, 27 Oct 2012 16:47:37 +0000 - -i2p (0.9.2-2) stable; urgency=high - - * Fix stupid bug in i2prouter - - -- Kill Your TV Sat, 22 Sep 2012 13:57:39 +0000 - -i2p (0.9.2-1) stable; urgency=low - - * New upstream release (see history.txt for details) - - -- Kill Your TV Fri, 21 Sep 2012 18:13:32 +0000 - -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 - in the next Debian stable, so we'll switch to our libs sooner than later. - * Debconf - - New Greek translation - - New Italian translation - - New Hungarian translation - * Initscript - - Add graceful option - - Change exit statuses - - -- Kill Your TV Mon, 30 Jul 2012 17:41:04 +0000 - -i2p (0.9-1) stable; urgency=low - - * New Upstream Version - - -- Kill Your TV Wed, 02 May 2012 16:33:11 +0000 - -i2p (0.8.13-2) stable; urgency=low - - * Fix bug in postinst cause by changes to adduser's behaviour. - - -- Kill Your TV Mon, 09 Apr 2012 16:25:19 +0000 - -i2p (0.8.13-1) stable; urgency=low - - * New upstream version 0.8.13 - * Packages are compressed with bzip2 - * Remove debian/patches/0005-EepGet_correct_status.patch - * Bump standards version to 3.9.3 (no changes to source needed) - * Debconf: - - New Czech language translation - - Updated German, Polish, Russian, and Ukrainian translations - - -- Kill Your TV Mon, 27 Feb 2012 21:06:56 +0000 - -i2p (0.8.12-2) stable; urgency=low - - * postinst: Don't fail if the i2psvc group doesn't exist - - -- Kill Your TV Fri, 06 Jan 2012 18:43:09 +0000 - -i2p (0.8.12-1) stable; urgency=low - - * New upstream I2P release - * Debconf: - - add wrapper.java.maxmemory from wrapper.config - - The warning about the daemon user needing to exist was confusing to some - that assumed this meant that i2psvc had to exit. This warning has been - clarified. - - Spanish, Swedish, Ukrainian translation updates - * Initscript changes/fixes: - - increase shutdown wait-time in initscript - - renumber "wrapper.additional" lines (since gaps are allowed with newer - wrapper versions) - - move I2PTEMP to /tmp/i2p-daemon - - move router.ping to /var/run/i2p - - various other clean-ups - - explicity redirect errors to stderr - * maintainer scripts: - - postinst: rewrite the handling of an existing i2psvc account - - postrm: remove /etc/default/i2p if the package is purged - - -- Kill Your TV Fri, 06 Jan 2012 02:49:03 +0000 - -i2p (0.8.11-2) stable; urgency=medium - - * Fix STUPID bug running I2P with i2prouter. Thanks soundwave. - - -- Kill Your TV Tue, 08 Nov 2011 20:02:05 +0000 - -i2p (0.8.11-1) stable; urgency=low - - * New Upstream Version - * sv and uk debconf translation updates - - -- Kill Your TV Mon, 07 Nov 2011 19:20:15 +0000 - -i2p (0.8.10-1) stable; urgency=medium - - * New upstream version - - -- Kill Your TV Thu, 20 Oct 2011 05:25:04 +0000 - -i2p (0.8.9-1) stable; urgency=medium - - * New upstream version - - -- Kill Your TV Tue, 11 Oct 2011 19:55:08 +0000 - -i2p (0.8.8-3) UNRELEASED; urgency=low - - * Add dump option to initscript - - -- Kill Your TV Tue, 06 Sep 2011 12:42:22 +0000 - -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 - installation") - * Fix initscript bug that caused the encoding to be ANSI when the router - started at boot. - - -- Kill Your TV Fri, 02 Sep 2011 23:32:32 +0000 - -i2p (0.8.8-1) stable; urgency=low - - * New Upstream Version - - -- Kill Your TV Tue, 23 Aug 2011 20:24:22 +0000 - -i2p (0.8.7-6) UNRELEASED; urgency=low - - * Add ttf-dejavu-core and ttf-dejavu-extra as dependencies so that graphs on - headless systems can be generated. - - -- Kill Your TV Thu, 18 Aug 2011 15:50:59 +0000 - -i2p (0.8.7-5) stable; urgency=low - - * Depend on default-jre-headless | java5-runtime-headless | - java6-runtime-headless instead of the non-headless versions. Sure the - -headless packages fulfilled the dependency, but this way it should pull in - the headless package by default. - * Remove unused lock from core/java/src/net/i2p/crypto/ElGamalEngine.java to - fix lock-ups on arm/ppc CPUs - - -- Kill Your TV Mon, 01 Aug 2011 17:51:14 +0000 - -i2p (0.8.7-4) stable; urgency=low - - * Change to allow jbigi to be built on non-x86 - - -- Kill Your TV Tue, 26 Jul 2011 23:13:00 +0000 - -i2p (0.8.7-3) stable; urgency=low - - * When i2p-doc package is installed, add the Javadoc link to the router - console. - - -- Kill Your TV Tue, 28 Jun 2011 22:39:46 +0000 - -i2p (0.8.7-2) stable; urgency=low - - * Remove --with quilt from debian/rules. This is only meant for use in mtn - - - -- Kill Your TV Mon, 27 Jun 2011 16:41:40 +0000 - -i2p (0.8.7-1) stable; urgency=low - - * The "W00t! My debs are official!" release - * New upstream release. See /usr/share/doc/i2p/changelog.gz for the details. - * Drop from debian/patches: 0002-sync-countries, 0006-i2p-jetty, - 0007-eepget-redirections, 0008-config-news, 0009-jetty-snark-disable and - re-work the existing patches. - * Debconf translations (thanks guys!) - - Russian (by hiddenz@mail.i2p) - - German & Spanish (by m1xxy@mail.i2p) - - -- Kill Your TV Mon, 27 Jun 2011 12:38:59 +0000 - -i2p (0.8.6-7) stable; urgency=low - - * Fix bug in maintainer script that caused upgrade to fail on some systems. - - -- Kill Your TV Sun, 29 May 2011 15:53:04 +0000 - -i2p (0.8.6-6) stable; urgency=low - - * Remove extraneous cruft from debian/rules from back when cpuid couldn't be - built for i386 - * Ship our own router.config with router.updatesDisabled=true to prevent - upgrades to be performed by the router itself. Per Debian policy, upgrades - *must* take place via the package manager. - * Backported eepget fix - * Backported news fix - - -- Kill Your TV Sat, 28 May 2011 10:23:51 +0000 - -i2p (0.8.6-5) stable; urgency=low - - * Remove /etc/i2p/wrapper.service. Changes have been moved to the - initscript. - * Don't disable browser launch. This is handled automatically for the i2psvc - user. - * Create debian/copyright dynamically at build time - * Don't ship the standalone jetty-i2psnark - * Create split package so that the wrapper isn't required - * Install missing certificates directory - - -- Kill Your TV Fri, 27 May 2011 03:48:56 +0000 - -i2p (0.8.6-4) stable; urgency=low - - * backported patch from 9a26dcaef3687ff7fa08cf3b3eb2180ebb2dedde to fix - missing "addWebApplications" in Jetty. - - -- Kill Your TV Sun, 22 May 2011 19:00:37 +0000 - -i2p (0.8.6-3) stable; urgency=low - - [Kill Your TV] - * Creating libjbigi-jni packages again. Backported patch from MTN so that - jbigi can be built for i386 - * Drop build-dep on unzip since jbigi can be built. - * Check to see if doc/libjbigi-jni is a directory and remove it. It is - supposed to be a symlink to doc/i2p - * Don't chown $I2P to i2psvc - * Add Build-Dep for tor-geoipdb and remove from debian/ - * Add launch-i2psnark to doc/examples - * Remove obsolete build-dep on default-jdk-builddep - [Karl Goetz] - * Move adduser to depends from pre-depends - * Tidy postinst - - -- Kill Your TV Fri, 20 May 2011 22:03:52 +0000 - -i2p (0.8.6-2) stable; urgency=low - - * Fix permissions bug for /var/run/i2p, reported by "signhere" on IRC - - -- Kill Your TV Tue, 17 May 2011 16:30:29 +0000 - -i2p (0.8.6-1) stable; urgency=low - - * New upstream version - - -- Kill Your TV Tue, 17 May 2011 12:30:07 +0000 - -i2p (0.8.5-4) stable; urgency=low - - * Correct lintian error - - -- Kill Your TV Sun, 15 May 2011 16:20:39 +0000 - -i2p (0.8.5-3) stable; urgency=low - - * *Sigh* Set debian/i2p.default run_daemon to false - - -- Kill Your TV Fri, 29 Apr 2011 09:54:39 +0000 - -i2p (0.8.5-2) stable; urgency=low - - * Change debconf priority to medium. - * RUN_DAEMON defaults to false. Earlier versions defaulted to true. Since - the priority is changing, this should as well. - * Split jbigi into its own source package - * Update geoip.txt - * Update Suggests: - - -- Kill Your TV Mon, 25 Apr 2011 17:00:43 +0000 - -i2p (0.8.5-1) stable; urgency=low - - * New upstream - - -- Kill Your TV Mon, 18 Apr 2011 15:41:42 +0000 - -i2p (0.8.4-4) stable; urgency=low - - * Update geoip from tor-0.2.2.23-alpha - - -- Kill Your TV Sat, 09 Apr 2011 23:34:11 +0000 - -i2p (0.8.4-3) stable; urgency=low - - * Back out upgrade 'do you want to reboot' logic since it's utterly borked. - - -- Kill Your TV Thu, 17 Mar 2011 18:54:09 +0000 - -i2p (0.8.4-2) stable; urgency=low - - * Stop including /usr/share/i2p/lib/jbigi.jar. - * Compile a dynamic jbigi and create a new package, libjbigi-jni. Since I - can't get jcpuid to compile I take this library from jbigi.jar. - Unfortunately it was not compiled with -fPIC, causing lintian to complain. - Additionally it is a 32bit compile, forcing libc-i386 to be installed on - amd64 boxes. - * Add dependency on libc-i386 because of jcpuid and a build-dep on unzip for - the same reason. - * Don't display errors generated from chowning files that don't exist. - * Bug fix: Somehow I missed packaging the geoip information before. Oops. - * Bug fix: Add history.txt to /usr/share/i2p. I didn't realize it was shown - in the console at /help. - * Since I'm packaging the missing geoip information, I use an updated - geoiodb from tor (taken from Debian package tor-geoipdb version - 0.2.2.22-alpha-1) - * Patching countries.txt to add entries that are in Maxmind's database. - * Now using debconf to ask about running as a daemon. - * From this point forward, users will be asked to confirm that they want to - upgrade this package, due to it requiring a router reboot. - * Updated README.Debian to better explain differences compared with - upstream. - * Add history.txt to /usr/share/i2p - - -- Kill Your TV Sun, 13 Mar 2011 10:45:47 +0000 - -i2p (0.8.4-1) stable; urgency=low - - * New upstream version, monotone revision - fea6969d789a6b85396439be9906abb9b4a4a405 - - -- Kill Your TV Thu, 03 Mar 2011 11:37:37 +0000 - -i2p (0.8.3-2) testing; urgency=low - - * Minor changes to initscript - - -- Kill Your TV Wed, 26 Jan 2011 14:29:50 +0000 - -i2p (0.8.3-1) testing; urgency=low - - * New upstream - - -- Kill Your TV Mon, 24 Jan 2011 20:23:38 +0000 - -i2p (0.8.2-1) testing; urgency=low - - * Initial packaging - - -- Kill Your TV Sun, 23 Jan 2011 00:03:31 +0000 - diff --git a/debian-alt/buster/control b/debian-alt/buster/control deleted file mode 100644 index 2fb468a69..000000000 --- a/debian-alt/buster/control +++ /dev/null @@ -1,103 +0,0 @@ -Source: i2p -Maintainer: Masayuki Hatta -Section: net -Standards-Version: 4.1.3 -Priority: optional -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.8) - ,debconf - ,openjdk-9-jdk - ,libjetty9-java (>= 9.2.22) - ,libtaglibs-standard-jstlel-java - ,libtomcat9-java - ,dh-apparmor - ,bash-completion - ,gettext - ,libgetopt-java - ,libjson-simple-java (<< 3) - ,libgmp-dev (>= 2:5.0.5) - ,libservice-wrapper-java - ,po-debconf - -Package: i2p -Architecture: all -Section: net -Priority: optional -Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, - adduser, - apparmor, - debconf, - i2p-router (>= 0.8.6-5), - libjbigi-jni, - lsb-base (>= 3.0-6), - service-wrapper, - ucf (>= 0.28) -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 - layers of encryption, and the network is both distributed and dynamic, with no - trusted parties. - . - This package depends on the router, jbigi, the java service wrapper, and - includes support to run I2P as a daemon. - -Package: libjbigi-jni -Architecture: any -Section: java -Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, i2p-router -Homepage: https://geti2p.net/ -Description: Invisible Internet Project (I2P) - libjbigi library - This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid). - . - libjbigi is a math library that is part of the I2P installation. Use of this - library greatly enhances the efficiency of cryptographic algorithms, such as - the ones used by I2P. You can expect to see a 5-7x speed improvement on certain - tasks, such as elGamal encryption/decryption. - -Package: i2p-doc -Architecture: all -Section: doc -Priority: optional -Depends: ${misc:Depends} -Suggests: i2p, default-jdk-doc -Description: Invisible Internet Project (I2P) - developer documentation - I2P is an anonymizing network, offering a simple layer that identity-sensitive - applications can use to securely communicate. All data is wrapped with several - layers of encryption, and the network is both distributed and dynamic, with no - trusted parties. - . - This package contains the Javadoc files. - -Package: i2p-router -Architecture: all -Section: net -Priority: optional -Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, - openjdk-9-jre-headless | openjdk-8-jre-headless | default-jre-headless | java9-runtime-headless | java8-runtime-headless, - geoip-database, - gettext-base, - libgetopt-java, - libjson-simple-java (<< 3), - libjetty9-java, - libtaglibs-standard-jstlel-java, - libtomcat9-java, - famfamfam-flag-png, - sensible-utils -Replaces: i2p ( << 0.8.6-5) -Breaks: i2p (<< 0.8.6-5) -Recommends: libjbigi-jni, fonts-dejavu -Suggests: apparmor - ,privoxy - ,syndie -Description: Invisible Internet Project (I2P) - Router - I2P is an anonymizing network, offering a simple layer that identity-sensitive - applications can use to securely communicate. All data is wrapped with several - layers of encryption, and the network is both distributed and dynamic, with no - trusted parties. - . - TrueType fonts (such as those provided in the package fonts-dejavu) are required - in order to generate graphs. diff --git a/debian-alt/buster/i2p.postinst b/debian-alt/buster/i2p.postinst deleted file mode 100755 index a063b845c..000000000 --- a/debian-alt/buster/i2p.postinst +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/sh - -set -e - -I2PHOME=/var/lib/i2p -I2PSYSUSER=i2psvc - -conffile="/etc/default/i2p" -systemdservice="/lib/systemd/system/i2p.service" - -# Source debconf library -- we have a Depends line -# to make sure it is there... -. /usr/share/debconf/confmodule -db_version 2.0 - - -case "$1" in - configure|reconfigure) - if [ ! -e $conffile ]; then - echo "# Defaults for i2p initscript (/etc/init.d/i2p)" >> $conffile - echo "# This is a posix shell fragment" >> $conffile - echo >> $conffile - echo "# [automatically edited by postinst, do not change line format ]" >> $conffile - echo "# Run 'dpkg-reconfigure -plow i2p' to change these values." >> $conffile - echo >> $conffile - echo "RUN_DAEMON=" >> $conffile - echo "I2PUSER=" >> $conffile - echo "ULIMIT=" >> $conffile - echo "CONFINE_WITH_APPARMOR=" >> $conffile - echo "# The next value is also wrapper.java.maxmemory in /etc/i2p/wrapper.config" >> $conffile - echo "MEMORYLIMIT=" >> $conffile - fi - - db_get i2p/daemon - RUN_DAEMON="$RET" - db_get i2p/user - I2PUSER="$RET" - db_get i2p/memory - MEMORYLIMIT="$RET" - db_get i2p/aa - CONFINE_WITH_APPARMOR="$RET" - - cp -a -f $conffile $conffile.tmp - - # If the admin deleted or commented some variables but then set them via debconf, - # (re-)add them to the conffile. - test -z "$RUN_DAEMON" || grep -Eq '^ *RUN_DAEMON=' $conffile || \ - echo "RUN_DAEMON=" >> $conffile - test -z "$I2PUSER" || grep -Eq '^ *I2PUSER=' $conffile || \ - echo "I2PUSER=" >> $conffile - test -z "$MEMORYLIMIT" || grep -Eq '^ *MEMORYLIMIT=' $conffile || \ - echo "MEMORYLIMIT=" >> $conffile - test -z "$ULIMIT" || grep -Eq '^ *ULIMIT=' $conffile || \ - echo "ULIMIT=" >> $conffile - test -z "$CONFINE_WITH_APPARMOR" || grep -Eq '^ *CONFINE_WITH_APPARMOR=' $conffile || \ - echo "CONFINE_WITH_APPARMOR=" >> $conffile - - if [ -z $RUN_DAEMON ]; then - RUN_DAEMON="false" - I2PUSER="i2psvc" - fi - - sed -e "s/^ *RUN_DAEMON=.*/RUN_DAEMON=\"$RUN_DAEMON\"/" \ - -e "s/^ *I2PUSER=.*/I2PUSER=\"$I2PUSER\"/" \ - -e "s/^ *MEMORYLIMIT=.*/MEMORYLIMIT=\"$MEMORYLIMIT\"/" \ - -e "s/^ *CONFINE_WITH_APPARMOR=.*/CONFINE_WITH_APPARMOR=\"$CONFINE_WITH_APPARMOR\"/" \ - < $conffile > $conffile.tmp - mv -f $conffile.tmp $conffile - - if [ -e "$systemdservice" ]; then - sed -e "s/User=.*/User=$I2PUSER/" < "$systemdservice" > "$systemdservice.tmp" - mv -f "$systemdservice.tmp" "$systemdservice" - chmod 0644 -f "$systemdservice" - if [ -d /run/systemd/system ]; then - systemctl --system daemon-reload || true - if [ $RUN_DAEMON = 'true' ]; then - deb-systemd-helper enable i2p.service - else - deb-systemd-helper disable i2p.service - fi - fi - fi - - sed -e "s/^ *wrapper\.java\.maxmemory=.*/wrapper\.java\.maxmemory=$MEMORYLIMIT/" \ - < /etc/i2p/wrapper.config > /etc/i2p/wrapper.config.tmp - mv -f /etc/i2p/wrapper.config.tmp /etc/i2p/wrapper.config - chmod 0644 -f /etc/i2p/wrapper.config - - # Older versions of adduser created the home directory. - # The version of adduser in Debian unstable does not. - [ -d $I2PHOME ] || mkdir -m0750 $I2PHOME - - # Create user and group as a system user. - if getent passwd i2psvc > /dev/null 2>&1 ; then - groupadd -f $I2PSYSUSER || true - usermod -c "I2P Router Daemon" -d $I2PHOME -g $I2PSYSUSER -s "/bin/false" \ - $I2PSYSUSER -e 1 > /dev/null 2>&1 || true - else - adduser --system --quiet --group --home $I2PHOME $I2PSYSUSER > /dev/null 2>&1 - fi - - [ -d /var/log/i2p ] || mkdir -m0750 /var/log/i2p - chown -f -R $I2PSYSUSER:i2psvc /var/log/i2p - - # Has someone set the permissions with dpkg-statoverride? If so, obey them. - if ! dpkg-statoverride --list $I2PHOME > /dev/null 2>&1 - then - chown -f -R $I2PSYSUSER:$I2PSYSUSER $I2PHOME - chmod -f u=rwx,g=rxs,o= $I2PHOME - fi - - db_stop -;; -abort-upgrade|abort-remove|abort-deconfigure) - echo "Aborting upgrade" - exit 0 - ;; -*) - echo "postinst called with unknown argument \`$1'" >&2 - exit 0 - ;; -esac - -#DEBHELPER# - -exit 0 -# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 diff --git a/debian-alt/disco/patches/0002-jetty-compatibility.patch b/debian-alt/disco/patches/0002-jetty-compatibility.patch deleted file mode 100644 index 95cd92d91..000000000 --- a/debian-alt/disco/patches/0002-jetty-compatibility.patch +++ /dev/null @@ -1,126 +0,0 @@ ---- a/apps/jetty/java/src/net/i2p/jetty/JettyXmlConfigurationParser.java -+++ b/apps/jetty/java/src/net/i2p/jetty/JettyXmlConfigurationParser.java -@@ -43,9 +43,9 @@ - private static XmlParser initParser() - { - XmlParser parser = new XmlParser(); -- URL config60 = Loader.getResource(XmlConfiguration.class, "org/eclipse/jetty/xml/configure_6_0.dtd"); -- URL config76 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_7_6.dtd"); -- URL config90 = Loader.getResource(XmlConfiguration.class,"org/eclipse/jetty/xml/configure_9_0.dtd"); -+ URL config60 = Loader.getResource("org/eclipse/jetty/xml/configure_6_0.dtd"); -+ URL config76 = Loader.getResource("org/eclipse/jetty/xml/configure_7_6.dtd"); -+ URL config90 = Loader.getResource("org/eclipse/jetty/xml/configure_9_0.dtd"); - parser.redirectEntity("configure.dtd",config90); - parser.redirectEntity("configure_1_0.dtd",config60); - parser.redirectEntity("configure_1_1.dtd",config60); ---- a/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java -+++ b/apps/jetty/java/src/net/i2p/servlet/I2PDefaultServlet.java -@@ -132,7 +132,6 @@ - * - * Get the resource list as a HTML directory listing. - */ -- @Override - protected void sendDirectory(HttpServletRequest request, - HttpServletResponse response, - Resource resource, ---- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java -+++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java -@@ -317,7 +317,7 @@ - buf.append(request.getMethod()); - buf.append(' '); - -- request.getUri().writeTo(u8buf); -+ u8buf.append(request.getHttpURI().toString()); - - buf.append(' '); - buf.append(request.getProtocol()); ---- a/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java -+++ b/apps/routerconsole/java/src/net/i2p/router/web/HostCheckHandler.java -@@ -15,7 +15,7 @@ - import net.i2p.util.PortMapper; - - import org.eclipse.jetty.server.Request; --import org.eclipse.jetty.servlets.gzip.GzipHandler; -+import org.eclipse.jetty.server.handler.gzip.GzipHandler; - - /** - * Block certain Host headers to prevent DNS rebinding attacks. ---- a/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java -+++ b/apps/routerconsole/java/src/net/i2p/router/web/RouterConsoleRunner.java -@@ -22,6 +22,7 @@ - import java.util.SortedSet; - import java.util.StringTokenizer; - import java.util.concurrent.LinkedBlockingQueue; -+import javax.servlet.ServletRequest; - - import net.i2p.I2PAppContext; - import net.i2p.app.ClientApp; -@@ -48,6 +49,7 @@ - import org.eclipse.jetty.security.HashLoginService; - import org.eclipse.jetty.security.ConstraintMapping; - import org.eclipse.jetty.security.ConstraintSecurityHandler; -+import org.eclipse.jetty.security.UserStore; - import org.eclipse.jetty.security.authentication.DigestAuthenticator; - import org.eclipse.jetty.server.AbstractConnector; - import org.eclipse.jetty.server.ConnectionFactory; -@@ -959,6 +961,8 @@ - } else { - HashLoginService realm = new CustomHashLoginService(JETTY_REALM, context.getContextPath(), - ctx.logManager().getLog(RouterConsoleRunner.class)); -+ UserStore userStore = new UserStore(); -+ realm.setUserStore(userStore); - sec.setLoginService(realm); - sec.setAuthenticator(authenticator); - String[] role = new String[] {JETTY_ROLE}; -@@ -966,7 +970,7 @@ - String user = e.getKey(); - String pw = e.getValue(); - Credential cred = Credential.getCredential(MD5_CREDENTIAL_TYPE + pw); -- realm.putUser(user, cred, role); -+ userStore.addUser(user, cred, role); - Constraint constraint = new Constraint(user, JETTY_ROLE); - constraint.setAuthenticate(true); - ConstraintMapping cm = new ConstraintMapping(); -@@ -986,7 +990,7 @@ - try { - // each char truncated to 8 bytes - String user2 = new String(b2, "ISO-8859-1"); -- realm.putUser(user2, cred, role); -+ userStore.addUser(user2, cred, role); - constraint = new Constraint(user2, JETTY_ROLE); - constraint.setAuthenticate(true); - cm = new ConstraintMapping(); -@@ -997,7 +1001,7 @@ - // each UTF-8 byte as a char - // this is what chrome does - String user3 = new String(b1, "ISO-8859-1"); -- realm.putUser(user3, cred, role); -+ userStore.addUser(user3, cred, role); - constraint = new Constraint(user3, JETTY_ROLE); - constraint.setAuthenticate(true); - cm = new ConstraintMapping(); -@@ -1072,8 +1076,8 @@ - } - - @Override -- public UserIdentity login(String username, Object credentials) { -- UserIdentity rv = super.login(username, credentials); -+ public UserIdentity login(String username, Object credentials, ServletRequest request) { -+ UserIdentity rv = super.login(username, credentials, request); - if (rv == null) - //_log.logAlways(net.i2p.util.Log.WARN, "Console authentication failed, webapp: " + _webapp + ", user: " + username); - _log.logAlways(net.i2p.util.Log.WARN, "Console authentication failed, user: " + username); ---- a/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java -+++ b/apps/routerconsole/java/src/net/i2p/router/web/LocaleWebAppHandler.java -@@ -85,9 +85,9 @@ - String testPath = pathInContext.substring(0, len - 4) + '_' + lang + ".jsp"; - // Do we have a servlet for the new path that isn't the catchall *.jsp? - @SuppressWarnings("rawtypes") -- Map.Entry servlet = _wac.getServletHandler().getHolderEntry(testPath); -+ org.eclipse.jetty.http.pathmap.MappedResource servlet = _wac.getServletHandler().getMappedServlet(testPath); - if (servlet != null) { -- String servletPath = (String) servlet.getKey(); -+ String servletPath = servlet.getPathSpec().getDeclaration(); - if (servletPath != null && !servletPath.startsWith("*")) { - // success!! - //System.err.println("Servlet is: " + servletPath); diff --git a/debian-alt/disco/patches/series b/debian-alt/disco/patches/series deleted file mode 100644 index 5fabbd7e7..000000000 --- a/debian-alt/disco/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -0001-path-substitution.patch -0002-jetty-compatibility.patch diff --git a/debian-alt/disco/rules b/debian-alt/disco/rules index c7bf6f18b..db79e55d5 100755 --- a/debian-alt/disco/rules +++ b/debian-alt/disco/rules @@ -113,18 +113,6 @@ endif @# this is roughly the same as tomcat8-jsp-api.jar, we use this one ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar - @# debian and ubuntu: wheezy-backports, jessie+, xenial+ - @#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties - @#mkdir -p $(CURDIR)/apps/jetty/jettylib - @#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar - @#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar - @#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar - @#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar - @#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar - @#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar - @#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar - @#ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar - @# debian and ubuntu: buster, disco @/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties mkdir -p $(CURDIR)/apps/jetty/jettylib diff --git a/debian-alt/doc/debian-build.txt b/debian-alt/doc/debian-build.txt index 6d4750d45..40c50da51 100644 --- a/debian-alt/doc/debian-build.txt +++ b/debian-alt/doc/debian-build.txt @@ -83,6 +83,7 @@ reprepro -v update eoan # and /var/www/debian/conf/updates # and then: reprepro -v export foo (for new foo) # and then: reprepro -v update foo +# and: reprepro -v copysrc foo buster i2p-keyring # If you remove, you must do: reprepro clearvanished diff --git a/debian-alt/precise/patches/series b/debian-alt/precise/patches/series new file mode 100644 index 000000000..9767bacd6 --- /dev/null +++ b/debian-alt/precise/patches/series @@ -0,0 +1 @@ +0001-path-substitution.patch diff --git a/debian-alt/disco/control b/debian-alt/stretch/control similarity index 90% rename from debian-alt/disco/control rename to debian-alt/stretch/control index 5fe5be582..c91252ed9 100644 --- a/debian-alt/disco/control +++ b/debian-alt/stretch/control @@ -1,19 +1,17 @@ Source: i2p Maintainer: zzz 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.8) ,debconf - ,default-jdk + ,openjdk-8-jdk ,libjetty9-java ,libtaglibs-standard-jstlel-java - ,libtomcat9-java + ,libtomcat8-java ,dh-apparmor ,bash-completion ,gettext @@ -29,13 +27,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 @@ -78,16 +74,15 @@ Architecture: all Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, - openjdk-11-jre-headless | java11-runtime-headless, + openjdk-9-jre-headless | openjdk-8-jre-headless | default-jre-headless | java9-runtime-headless | java8-runtime-headless, geoip-database, gettext-base, libgetopt-java, libjson-simple-java (<< 3), libjetty9-java, libtaglibs-standard-jstlel-java, - libtomcat9-java, - famfamfam-flag-png, - sensible-utils + libtomcat8-java, + famfamfam-flag-png Replaces: i2p ( << 0.8.6-5) Breaks: i2p (<< 0.8.6-5) Recommends: libjbigi-jni, fonts-dejavu diff --git a/debian-alt/stretch/i2p-router.links b/debian-alt/stretch/i2p-router.links new file mode 100644 index 000000000..2284de235 --- /dev/null +++ b/debian-alt/stretch/i2p-router.links @@ -0,0 +1,118 @@ +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 +usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt + + + +# comment out if not building with libjetty9-java +# ubuntu: in trusty vivid wily xenial +# debian: in wheezy jessie stretch sid +usr/share/java/jetty9-apache-jsp.jar usr/share/i2p/lib/jetty-apache-jsp.jar +usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar +usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar +usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar +usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar +# legacy name in lib/ +usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar +usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar +usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar +usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar +usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar +usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar +usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar +usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar +# legacy name in lib/ +usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar +# legacy name in lib/ +usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar +# following two are from libservlet3.1-java which is a dependency of libjetty9-java +# legacy name in lib/ +usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar +# combined into javax.servlet.jar in non-package builds +usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar + + +# comment out if not building with libtomcat8-java +# ubuntu: only in xenial+ +# debian: wheezy-backports, jessie+ +# legacy name, contains only tomcat-juli, not commons-logging +usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar +usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar +# combined into jasper-runtime.jar in non-package builds +usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar +usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar +usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar +usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar +# combined into commons-el.jar in non-package builds +usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar +# legacy name in lib/ +usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.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 +usr/share/java/taglibs-standard-impl.jar usr/share/i2p/lib/standard.jar +usr/share/java/taglibs-standard-jstlel.jar usr/share/i2p/lib/jstlel.jar + + +# comment out if not building with glassfish-javaee +# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail +#usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar +#usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar + + +# comment out if not building with libjakarta-taglibs-standard-java +# ubuntu and debian: everywhere +#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar + + +# comment out if not building with libjstl1.1-java +# ubuntu and debian: everywhere +#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar + + +# comment out if not building with gettext-base +# ubuntu and debian: everywhere +usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar + + +# comment out if not building with libgetopt-java +# ubuntu and debian: everywhere +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 +usr/share/flags/countries/16x11 usr/share/i2p/docs/icons/flags +usr/share/flags/countries/16x11/az.png usr/share/i2p/eepsite/docroot/help/lib/az.png +usr/share/flags/countries/16x11/cn.png usr/share/i2p/eepsite/docroot/help/lib/cn.png +usr/share/flags/countries/16x11/de.png usr/share/i2p/eepsite/docroot/help/lib/de.png +usr/share/flags/countries/16x11/es.png usr/share/i2p/eepsite/docroot/help/lib/es.png +usr/share/flags/countries/16x11/fr.png usr/share/i2p/eepsite/docroot/help/lib/fr.png +usr/share/flags/countries/16x11/hu.png usr/share/i2p/eepsite/docroot/help/lib/hu.png +usr/share/flags/countries/16x11/id.png usr/share/i2p/eepsite/docroot/help/lib/id.png +usr/share/flags/countries/16x11/it.png usr/share/i2p/eepsite/docroot/help/lib/it.png +usr/share/flags/countries/16x11/nl.png usr/share/i2p/eepsite/docroot/help/lib/nl.png +usr/share/flags/countries/16x11/pl.png usr/share/i2p/eepsite/docroot/help/lib/pl.png +usr/share/flags/countries/16x11/pt.png usr/share/i2p/eepsite/docroot/help/lib/pt.png +usr/share/flags/countries/16x11/ru.png usr/share/i2p/eepsite/docroot/help/lib/ru.png +usr/share/flags/countries/16x11/se.png usr/share/i2p/eepsite/docroot/help/lib/se.png +usr/share/flags/countries/16x11/tr.png usr/share/i2p/eepsite/docroot/help/lib/tr.png +usr/share/flags/countries/16x11/us.png usr/share/i2p/eepsite/docroot/help/lib/us.png + + +# comment out if not building with libhttpclient-java and libhttpcore-java +# 2 MB of dependencies vs. 20 KB of copied source +# Requires 4.4 or higher. +# Debian: Not in wheezy/jessie +# Ubuntu: Only in wily and later +#usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar +#usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar diff --git a/debian-alt/stretch/patches/series b/debian-alt/stretch/patches/series new file mode 100644 index 000000000..9767bacd6 --- /dev/null +++ b/debian-alt/stretch/patches/series @@ -0,0 +1 @@ +0001-path-substitution.patch diff --git a/debian-alt/buster/rules b/debian-alt/stretch/rules similarity index 84% rename from debian-alt/buster/rules rename to debian-alt/stretch/rules index 6a8934542..a1fc85e67 100755 --- a/debian-alt/buster/rules +++ b/debian-alt/stretch/rules @@ -79,11 +79,8 @@ else endif @# build options @/bin/echo -e "javac.version=1.8" > $(CURDIR)/override.properties -# @/bin/echo -e "javac.version=9" > $(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.compilerargs=-source 1.8 -target 1.8" >> $(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 "javac.compilerargs7=" >> $(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=debian" >> $(CURDIR)/override.properties @/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties @@ -114,28 +111,16 @@ endif ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar @# debian and ubuntu: wheezy-backports, jessie+, xenial+ - @#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties - @#mkdir -p $(CURDIR)/apps/jetty/jettylib - @#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar - @#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar - @#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar - @#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar - @#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar - @#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar - @#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar - @#ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar - - @# debian and ubuntu: buster, disco - @/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties + @/bin/echo -e "with-libtomcat8-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 - ln -sf /usr/share/java/tomcat9-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar - ln -sf /usr/share/java/tomcat9-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar - ln -sf /usr/share/java/tomcat9-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar - ln -sf /usr/share/java/tomcat9-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar - ln -sf /usr/share/java/tomcat9-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar - ln -sf /usr/share/java/tomcat9-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar - ln -sf /usr/share/java/tomcat9-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar + ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar + ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar + ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar + ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar @# debian and ubuntu: stretch+, zesty+ @/bin/echo -e "with-libtaglibs-standard=true" >> $(CURDIR)/override.properties diff --git a/debian-alt/trusty/patches/series b/debian-alt/trusty/patches/series new file mode 100644 index 000000000..9767bacd6 --- /dev/null +++ b/debian-alt/trusty/patches/series @@ -0,0 +1 @@ +0001-path-substitution.patch diff --git a/debian-alt/unstable/changelog b/debian-alt/unstable/changelog deleted file mode 100644 index c5921551b..000000000 --- a/debian-alt/unstable/changelog +++ /dev/null @@ -1,985 +0,0 @@ -i2p (0.9.25-1) unstable; urgency=medium - - * New upstream version 0.9.25 - - -- zzz on i2p Tue, 29 Mar 2016 18:12:12 +0000 - -i2p (0.9.24-1) unstable; urgency=medium - - * New upstream version 0.9.24 - - -- Kill Your TV Sat, 30 Jan 2016 12:08:27 +0000 - -i2p (0.9.23-2) unstable; urgency=medium - - * Backport of two fixes from after the release of 0.9.23 - - debian/patches/0005-Console-Fix-escaping-of-plugin-description-on-config.patch - - debian/patches/0006-NetDb-Fix-deadlock-ticket-1722.patch - * AppArmor: - - Remove 'l' from the debian AppArmor profiles - - Allow writing to /tmp/imageio*, needed by graph creation on some systems - - -- Kill Your TV Sun, 06 Dec 2015 14:28:23 +0000 - -i2p (0.9.23-1) unstable; urgency=medium - - * New Upstream Version - - Accelerate transition to Ed25519 - - Fix some bugs soft restarting after a large clock shift (e.g. resume) (but more to do) - - Fix streaming retransmission timers that were dying, and related timer bugs - - Fix streaming connections rejected while tunnel is opening - - Fix rare i2psnark and UPnP deadlocks - - Fix lifetime participating bandwidth display in console - - Increase default outbound exploratory tunnel length to 3 - - Use max of 2 not-failing peers in exploratory tunnels to improve build success - - Add support for hostnames prefixed with "www."; - - Store news feed items separately on disk, show on new /news page, limit display on home page to 2 - - Increase probability of rekeying to EdDSA - - Detect for broken ECDSA support in Gentoo - - Console: Add a Java 6 warning, this is the last release to support Java 6 - - Changes to prepare for Java 9 compatibility - - i2ptunnel: Pass Accept-Encoding header through client and server proxies, to allow end-to-end compression - - i2psnark: Increase piece size, piece count, and file count limits - - i2psnark: Save added and completed times - - i2psnark: Save magnet parameters across restart - - i2psnark: Don't delete .torrent file on errors at startup, rename to .torrent.BAD - - i2psnark: Add recheck, start, stop buttons on details pages - - i2psnark: Add option to disable "smart sort" - - Speed up IP address validation - - Separate streaming blacklists for ECDSA and EdDSA - - Translation updates - - Update GeoIP data (new installs and PPA only) - - -- Kill Your TV Thu, 19 Nov 2015 12:41:36 +0000 - -i2p (0.9.22-1) unstable; urgency=medium - - * New Upstream Version - - Start migration to Ed25519 router info signatures - - Fix i2psnark getting stuck before download complete, and not deleting temp - files - - Fix excluded SSL ciphers in console - - Translation updates - - Update GeoIP data - - -- Kill Your TV Sun, 13 Sep 2015 11:27:16 +0000 - -i2p (0.9.21-2) unstable; urgency=medium - - * Add exception to apparmor rules for scrypt, needed by I2P-Bote - - -- Kill Your TV Sun, 02 Aug 2015 15:00:30 +0000 - -i2p (0.9.21-1) unstable; urgency=medium - - * New Upstream Version - - Add multisession support for dual-signature crypto on the same tunnels - - Use multisession for shared clients - - Increase default outbound bandwidth limit to 60 KBps - - Increase default maximum participating tunnels - - Floodfills will send database store acks directly if connected, for efficiency - - Set TCP keepalive on I2CP and SAM sockets - - More efficient decompression in HTTP proxy, use less threads - - Add support for fast extensions in i2psnark - - i2psnark only autostarts torrents that were running previously - - Add support for translated console news - - SSU fixes to compete better with NTCP for bandwidth when limited - - Fixes to prevent SSU stalls - - Wait for outbound tunnels before sending first leaseset to client, to - prevent dropping first message - - Clean up resources correctly when SAM stops - - Better error handling and notification when HTTP proxy is not running - - More i2ptunnel fixes at startup and shutdown of tunnels - - Fix total_size in i2psnark metadata message - - Restore dates in console news headers - - Several I2CP fixes - - Use same session for naming lookups in I2PSocketEepGet - - Increase max bandwidth to 16 MBps, add larger Bloom filter - - New floodfills will send their info to nearby floodfills to speed integration - - Apache Tomcat 6.0.44 - - Translation updates - * Drop the following patches; included in 0.9.21: - - 0005-i2ptunnel-Don-t-connect-manager-to-router-in-constru.patch - - 0006-i2ptunnel-Don-t-call-startup-in-chained-constructor-.patch - - 0007-Define-I2PTunnelClientBase-stats-in-one-place.patch - - 0008-i2psnark-Fix-NPE-ticket-1602.patch - - - -- Kill Your TV Fri, 31 Jul 2015 20:01:42 +0000 - -i2p (0.9.20-3) unstable; urgency=medium - - * Add datagram exception to the apparmor profile - - -- Kill Your TV Sat, 20 Jun 2015 11:22:28 +0000 - -i2p (0.9.20-2) unstable; urgency=medium - - [str4d] - * i2ptunnel: Don't connect manager to router in constructor (ticket #815) - * i2ptunnel: Don't call startup() in chained constructor (ticket #1593) - * Define I2PTunnelClientBase stats in one place - - [killyourtv] - * Tighten apparmor rules for TMPDIR - * Add support for specifying limits to the initscript - * Fix NPE in I2PSnark (I2P Trac #1602) - - -- Kill Your TV Sun, 14 Jun 2015 16:11:33 +0000 - -i2p (0.9.20-1) unstable; urgency=medium - - * New Upstream Version - - Add support for address book export - - Add support for SSL in HTTP server tunnel - - Allow class 'M' (64-128 KBps share bandwidth) to become floodfill - - Raise connection limits for new classes 'P' (512-2000 KBps share - bandwidth) and 'X' (over 2000 KBps) - - Add support for signed development builds - - Clock skew fixes - - Fixes and configuration for when IPv4 is firewalled but IPv6 still works - - Locking fixes for i2ptunnel clients to prevent hangs at startup - - Verify hostnames when reseeding - - Fix deletion of config files for deleted torrents in i2psnark - - Fix hangs fetching proxy.i2p local resources via Privoxy - - Fixes for duplicate shared clients - - Fix for occasional page truncation in HTTP client - - Fixes for handling corrupted SSU packets - - Fix closing of SAM sessions when I2P session closes - - Reduce NTCP threads - - Eliminate SimpleScheduler threads - - Add continent-based NTP servers as fallbacks for country-based ones - - Remove all default non-SSL reseed hosts - - Disable fallback to non-su3 reseeding - - Several fixes in streaming for better "loopback" performance, - may or may not help in real world - - Reduce latency in i2ptunnel - - Add a larger Bloom filter for very high bandwidth and memory - - Add Bloom filter warning when configured for high bandwidth but not - enough memory - - Reduce max netdb search depth to reduce floodfill load - - Improved header processing and error handling in i2ptunnel HTTP server - - Better error handling and user feedback when HTTP client tunnel is - disabled - - More changes to improve floodfill capacity - - New configuration for forcing IPv4 (only) to firewalled on /confignet - - New configuration for floodfill on /configadvanced - - Show separate IPv4 and IPv6 status in summary bar when appropriate - - Better handling of corrupt SSU packets - - Jetty 8.1.17.v20150415 - - Translation updates - - Update GeoIP data (new installs and PPA only) - - -- Kill Your TV Tue, 02 Jun 2015 18:36:42 +0000 - -i2p (0.9.19-4) unstable; urgency=medium - - * Re-enable systemd unit file - - -- Kill Your TV Thu, 30 Apr 2015 22:54:56 +0000 - -i2p (0.9.19-3) unstable; urgency=medium - - * A couple more apparmor profile tweaks - - -- Kill Your TV Tue, 14 Apr 2015 20:35:39 +0000 - -i2p (0.9.19-2) unstable; urgency=medium - - * Fix usr.bin.i2prouter apparmor profile - - -- Kill Your TV Tue, 14 Apr 2015 12:58:22 +0000 - -i2p (0.9.19-1) unstable; urgency=medium - - * New Upstream Version - - Floodfill performance improvements - - Easier ways to reseed manually from a file or URL - - New way to export reseed data for others - - Support for installing plugin from file - - Fixes for high CPU usage in floodfills - - i2ptunnel locking fixes - - Fixes in read timeout handling in streaming - - Update to UPnP library 3.0 - - Improve tracking of floodfill lookup success - - Direct router info lookups if connected to floodfill - - Auto-adjustment of i2psnark tunnel quantity - - Increase exploratory tunnel quantity when floodfill - - Increase min and default bandwidth for i2psnark - - Improved strategies for dropping jobs on high job lag to prevent overload - - Apache Tomcat 6.0.43 - - Translation updates - - Update GeoIP data - * debconf translation updates - * Minor updates to AppArmor profiles - - -- Kill Your TV Sun, 12 Apr 2015 22:34:40 +0000 - -i2p (0.9.18-1) unstable; urgency=medium - - * New Upstream Version - * Daemon runs confined with AppArmor - Bug Fixes - - Fix parsing of ECDSA address helper in HTTP client proxy - - Fix news last-modified processing which prevented notification of update - - Improve handling of UPnP device changes - - Don't hang at startup forever waiting for entropy - - Possible fixes for high CPU usage in NTCP - Other - - Publish router info faster when address costs change - - Start i2ptunnel 90s sooner - - Accept tunnels 10m sooner - - Increase exploratory tunnel quantity during initial exploration - - Latency reductions in several places - - Add startup browser configuration with advanced config - routerconsole.browser - - Persistent leaseset keys to eliminate correlation with restart - - Faster unchoking of new peers in i2psnark - - More aggressive throttling of lookups at floodfills - - Tunnel build request record refactoring - - Reduce thread usage in i2ptunnel - - Add i2ptunnel server option for multihomed sites - - Disallow some common I2P application ports as router ports - - Increase connection limits for fast routers - - Add Save-As button for SusiMail messages - - Use 'hidden service' terminology in the console - - Encrypted netdb lookups for 32-bit x86 - - Translation updates - - -- Kill Your TV Sun, 22 Feb 2015 22:23:50 +0000 - -i2p (0.9.17-1) unstable; urgency=medium - - * New Upstream Version - Changes - - Signed news - - ECDSA default for new server tunnels - - Reseeding now SSL-only by default - Bug Fixes - - Fix SSU sending corrupt ack-only packets with partial bitfields - - Fix SSU inbound connection fail from non-DSA router - - Don't select incompatible peers if we are a non-DSA router - - Fix EdDSA signature verification bug - - Set I2NP lookup type flags in all cases, not just when a reply tunnel is used - - Stop i2ptunnel server acceptor thread after close - - Fix bug preventing some plugins from stopping completely - - Fix SAM v3 bug causing failures in incoming connections - Other - - Add a warning in the console sidebar if ECDSA not supported - - Log warnings for Java 6 that we will eventually require Java 7 - - Don't let proxied routers auto-floodfill - - Don't resend SSU acks that are too old - - Don't publish direct info in SSU address if introducers are required - - New default opentrackers in i2psnark - - Add support for specifiying data directory per-torrent in i2psnark - - Changes in streaming accept() error behavior - - Minor blockfile format changes - - New option for persistent random key to preserve peer ordering across restarts - - Translation updates - - Update GeoIP data - - -- Kill Your TV Sun, 30 Nov 2014 22:20:06 +0000 - -i2p (0.9.16-1) unstable; urgency=medium - - * New Upstream Version - - Add support for stronger Router Info signatures - - Encrypt RI lookups and responses on faster boxes - - Require I2CP authorization for all messages when enabled (requires 0.9.11 - or higher client) - - Disable TLSv3 and older ciphers for reseeding and other uses of SSL - - Use ECDSA by default for i2ptunnel IRC, SOCKS-IRC, and standard client - tunnels - - Don't prefer floodfills in some countries - - New column sorting, set-all priority buttons, and upload ratio display in - i2psnark - - Increase i2psnark tunnel default to 3 hops - - Implement bundling of multiple fragments in a single SSU message for - efficiency - - New add-to-addressbook links on netdb leaseset page - - Implement I2NP DatabaseLookupMessage search type field to improve lookup - efficiency - - CPUID fixes and updates for recent processors - - i2psnark fix magnet links with %-encoding - - Improve handling of SSU socket closing out from under us (hopefully fix - 100% CPU) - - SSU bitfield handling fixes - - Fix HTTP header issues in i2psnark - - Fix rare NPE when building garlic message - - Fix console lockups (hopefully) - - Fix i2ptunnel js confirm-delete - - Move router data structures from i2p.jar to router.jar (breaks i2pcontrol - plugin) - - New router keys now stored in router.keys.dat (privKeys.dat format) - instead of router.keys - - Improve handling of unsupported encryption throughout - - More error checking of client I2CP messages by the router - - Initial work on hooks for pluggable transports - - Enforce request timestamp in tunnel build messages - - Re-enable message status in streaming, but treat no leaseset as a soft - failure for now - - Return unused DH keypairs to the pool for efficiency - - Raise failsafe tagset limit and improve deletion strategy when hit - - Change eepsite Jetty threadpool and queue configuration - - NTCP establishment refactoring in prep for NTCP2 and PT - - Jetty 8.1.16-v20140903 - - Translation updates - - Update GeoIP data - - -- Kill Your TV Sat, 01 Nov 2014 23:34:28 +0000 - -i2p (0.9.15-1) unstable; urgency=medium - - * New Upstream Version - - Add support for Ed25519 signatures - - i2psnark move to separate config file for each torrent to better support - per-torrent settings - - Add i2psnark support for data outside the i2psnark/ directory - - Enable stronger signatures (su3 format) for plugins - - Speed up SSU introductions by responding to hole punch messages - - Several improvements in SAM efficiency - - More HTML escaping and form submission fixes in the console and i2psnark - - Streaming fixes for long signatures - - i2psnark fixes for file name character mapping when seeding - - I2PTunnel fixes stopping client tunnels - - I2PTunnel fix updating options on a running delay-open client tunnel - - Re-enable plugin installation via the console, removed in 0.9.14 - - i2psnark now remembers uploaded count across restarts - - i2psnark increase max piece size to 8 MB - - i2psnark several UI fixes - - Prohibit SSU peer test requests unless a connection is established - - i2ptunnel add support for local SSL connections for standard and IRC - client tunnels - - Console and log warnings for unavailable crypto - - More consistent routing for Delivery Status Messages to reduce network - connections - - Disable external entities in UPnP XML parser - - Translation updates - - Update GeoIP data - - -- Kill Your TV Sun, 21 Sep 2014 00:07:36 +0000 - -i2p (0.9.14.1-1) unstable; urgency=medium - - * New upstream point release, 0.9.14.1 - - Updates to geoip.txt and geoipv6.dat.gz based on Maxmind GeoLite Country - database from 2014-08-06. - - 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 - + More escaping - - i2psnark: Fix add torrent form - - ExecNamingService: Remove - - Plugins: Add whitelist of keys - - -- Kill Your TV Sat, 09 Aug 2014 23:09:33 +0000 - -i2p (0.9.14-1) unstable; urgency=high - - * New upstream release, 0.9.14 - * Fix several XSS issues - - Disable changing news feed URL from UI - - Disable plugin install - - Disable setting unsigned update URL from UI - - Disable clients.config editing from the UI - - Add Content-Security-Policy and X-XSS-Protection headers - - Disable unused ExecNamingService (thx joernchen of Phenoelit) - * Bug fixes - - Fix tunnel building so it doesn't get "stuck" on a single pool - - Reject participating tunnels when hidden - - 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 - - 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 - - Lots of findbugs fixes and cleanups - - Support signature types in SAM, bump rev to 3.1 - - New event log page in console - - Jetty 8.1.15.v20140411 - - Tomcat 6.0.41 - - -- Kill Your TV Sat, 26 Jul 2014 23:23:36 +0000 - -i2p (0.9.13-1) unstable; urgency=medium - - * New Upstream release - * debconf: New Slovak translation - - -- Kill Your TV Thu, 22 May 2014 19:08:45 +0000 - -i2p (0.9.12-2) unstable; urgency=low - - * Re-enable i2p-docs package - * Have libjbigi package depend on i2p-router - * Remove ${misc:Depends} from the i2p dependencies to avoid hard-depending - on i2p-router (= ${source:Version}. This prevents users from trying dev - builds using "dpkg -i i2p-router-${devbuild}_all.deb. The i2p package - already depended on i2p-router. - - -- Kill Your TV Sun, 06 Apr 2014 16:27:31 +0000 - -i2p (0.9.12-1) unstable; urgency=medium - - * New upstream release - - -- Kill Your TV Mon, 31 Mar 2014 19:07:54 +0000 - -i2p (0.9.11-3) unstable; urgency=medium - - * Enable systemd for unstable and saucy|trusty - * Fix postinst - - -- Kill Your TV Tue, 11 Mar 2014 00:45:52 +0000 - -i2p (0.9.11-1) unstable; urgency=medium - - * New Upstream Version - * Debconf: New Japanese and Korean translations - - -- Kill Your TV Sat, 08 Feb 2014 22:31:59 +0000 - -i2p (0.9.10-1) unstable; urgency=medium - - * 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 Wed, 22 Jan 2014 16:00:24 +0000 - -i2p (0.9.9-1deb8u1) 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 - * debconf: - - Updated French translation - - New Romanian translation - - -- Kill Your TV 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 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 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 Mon, 30 Sep 2013 16:14:40 +0000 - -i2p (0.9.7.1-1) stable; urgency=low - - * New upstream version 0.9.7.1 - * Compress packages with xz - - -- Kill Your TV Sat, 10 Aug 2013 19:02:24 +0000 - -i2p (0.9.7-2) unstable; urgency=low - - * Bugfix: Add missing ; to i2prouter script. - - -- Kill Your TV Tue, 16 Jul 2013 11:08:48 +0000 - -i2p (0.9.7-1) unstable; urgency=low - - * New upstream release - * debconf: - - New Chinese, Portuguese, and Turkish translations - - Russian translation updates - - -- Kill Your TV Mon, 15 Jul 2013 19:35:09 +0000 - -i2p (0.9.6-1) unstable; urgency=low - - * New upstream release - - -- Kill Your TV 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. Fixes #906. - - -- Kill Your TV Sun, 31 Mar 2013 12:53:43 +0000 - -i2p (0.9.5-1) unstable; urgency=low - - * New Upstream release - * Drop debian/patches/0007-backported-news-fix.patch and - debian/patches/#0006-remove-izpack.patch - * Spanish debconf update - - -- Kill Your TV Fri, 08 Mar 2013 23:04:51 +0000 - -i2p (0.9.4+repack-3) unstable; urgency=low - - * Backport fix from MTN for ticket #817 - - -- Kill Your TV Sat, 22 Dec 2012 13:07:47 +0000 - -i2p (0.9.4+repack-2) unstable; urgency=low - - * Add missing build-dep on libservice-wrapper-java - - -- Kill Your TV Mon, 17 Dec 2012 20:40:07 +0000 - -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 - subpar. We can't force a depend on openjdk since kFreeBSD does not include - it (yet). - * French Debconf translation updates - * Initscript: Don't display a warning if /var/run/i2p contains files after - shutdown. - * Upsteam changelog (full details in history.txt): - - Add per-destination outbound priorities - - Fix major bug that reduced SSU connection limits which reduced tunnel - build success rates - - Fix bug with external I2CP that prevented some external apps from working - - Fixed several bugs in i2psnark DHT - - Fixed bug in i2psnark PEX that inflated peer counts - - Handle dropped I2CP messages better - - Reduce overhead of I2CP messages - - Enforce max size in transport outbound message queues - - Fix a bug that would drop messages of exactly 512 bytes in SSU - - More performance improvements, memory reduction, and object churn reduction - - Better detection of network disconnections - - Further improvements in the SSU transport - - Add console password form - - Convert http proxy and console from basic to digest authentication for added security - - Improved verification of console form submissions, using jsp sessions. - Cookies may now be required on forms, except when the console password is - enabled - - Initial work on new interfaces to manage applications started via - clients.config - - Increase minimum peer port to 1024 - - Increase granularity of bandwidth limiter for smoother transmissions - - Translation updates: Chinese, French, German, Italian, Polish, - Portuguese, Swedish, and Ukrainian - - -- Kill Your TV Mon, 17 Dec 2012 23:59:59 +0000 - -i2p (0.9.3+repack-1) unstable; urgency=low - - * New Upstream release - * Upstream changelog: - - Active Queue Management - - I2PSnark DHT: Several bug fixes, enable by default. - - Priority queues - - Several SSU fixes including memory leak, and better handling of routers - behind firewalls that change UDP ports; additional defenses for malicious - packets. - - Fix piece selection (rarest-first) bugs in i2psnark - - Fix bug causing multiple browsers to open at startup - - Improvements in caching - - Several synchronization fixes and lock contention reduction - - Major reduction in SSU buffers memory use - - Fix streaming connection timeout back to 1 minute, was inadvertently - changed to 5 minutes; set i2ptunnel server read timeout to 5 minutes, was - unlimited - - Improved defenses in i2ptunnel for "darkloris" - - More validation at torrent creation in i2psnark - - Several parameter changes in SSU to improve throughput - - New event log for major events including restarts; show multiple restart - lines on graphs - - Remove duplicate messages from logs - - Don't respond to blocked streaming connections with a reset, just drop - - Remove all uses of inefficient SimpleTimer - - More checks for valid IPs and ports entered in console - - Fix bug that wasted a lot of entropy - - Translation updates: Italian, Portuguese, Spanish, Swedish - - Add non-NIO configuration in jetty.xml, recommended for Java 5 - - Update GeoIP data - - -- Kill Your TV Sat, 27 Oct 2012 16:47:37 +0000 - -i2p (0.9.2+repack-2) unstable; urgency=high - - * Fix stupid bug in i2prouter - - -- Kill Your TV Sat, 22 Sep 2012 13:57:39 +0000 - -i2p (0.9.2+repack-1) stable; urgency=low - - * New upstream release (see history.txt for details) - - -- Kill Your TV Fri, 21 Sep 2012 18:13:32 +0000 - -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 - in the next Debian stable, so we'll switch to our libs sooner than later. - * Debconf - - New Greek translation - - New Italian translation - - New Hungarian translation - * Initscript - - Add graceful option - - Change exit statuses - - -- Kill Your TV Mon, 30 Jul 2012 17:41:04 +0000 - -i2p (0.9-1) unstable; urgency=low - - * New Upstream Version - - -- Kill Your TV Wed, 02 May 2012 16:33:11 +0000 - -i2p (0.8.13-2) unstable; urgency=low - - * Fix bug in postinst cause by changes to adduser's behaviour. - - -- Kill Your TV Mon, 09 Apr 2012 16:25:19 +0000 - -i2p (0.8.13-1) stable; urgency=low - - * New upstream version 0.8.13 - * Packages are compressed with bzip2 - * Remove debian/patches/0005-EepGet_correct_status.patch - * Bump standards version to 3.9.3 (no changes to source needed) - * Debconf: - - New Czech language translation - - Updated German, Polish, Russian, and Ukrainian translations - - -- Kill Your TV Mon, 27 Feb 2012 21:06:56 +0000 - -i2p (0.8.12-2) stable; urgency=low - - * postinst: Don't fail if the i2psvc group doesn't exist - - -- Kill Your TV Fri, 06 Jan 2012 18:43:09 +0000 - -i2p (0.8.12-1) stable; urgency=low - - * New upstream I2P release - * Debconf: - - add wrapper.java.maxmemory from wrapper.config - - The warning about the daemon user needing to exist was confusing to some - that assumed this meant that i2psvc had to exit. This warning has been - clarified. - - Spanish, Swedish, Ukrainian translation updates - * Initscript changes/fixes: - - increase shutdown wait-time in initscript - - renumber "wrapper.additional" lines (since gaps are allowed with newer - wrapper versions) - - move I2PTEMP to /tmp/i2p-daemon - - move router.ping to /var/run/i2p - - various other clean-ups - - explicity redirect errors to stderr - * maintainer scripts: - - postinst: rewrite the handling of an existing i2psvc account - - postrm: remove /etc/default/i2p if the package is purged - - -- Kill Your TV Fri, 06 Jan 2012 02:49:03 +0000 - -i2p (0.8.11+repack-2) stable; urgency=medium - - * Fix STUPID bug running I2P with i2prouter. Thanks soundwave. - - -- Kill Your TV Tue, 08 Nov 2011 20:02:05 +0000 - -i2p (0.8.11+repack-1) stable; urgency=low - - * New Upstream Version - * sv and uk debconf translation updates - - -- Kill Your TV Mon, 07 Nov 2011 19:20:15 +0000 - -i2p (0.8.10+repack-1) stable; urgency=medium - - * New upstream version - - -- Kill Your TV Thu, 20 Oct 2011 05:25:04 +0000 - -i2p (0.8.9+repack-1) stable; urgency=medium - - * New upstream version - - -- Kill Your TV Tue, 11 Oct 2011 19:55:08 +0000 - -i2p (0.8.8+repack-3) UNRELEASED; urgency=low - - * Add dump option to initscript - - -- Kill Your TV Tue, 06 Sep 2011 12:42:22 +0000 - -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 - installation") - * Fix initscript bug that caused the encoding to be ANSI when the router - started at boot. - - -- Kill Your TV Fri, 02 Sep 2011 23:32:32 +0000 - -i2p (0.8.8+repack-1) stable; urgency=low - - * New Upstream Version - - -- Kill Your TV Tue, 23 Aug 2011 20:24:22 +0000 - -i2p (0.8.7-6) UNRELEASED; urgency=low - - * Add ttf-dejavu-core and ttf-dejavu-extra as dependencies so that graphs on - headless systems can be generated. - - -- Kill Your TV Thu, 18 Aug 2011 15:50:59 +0000 - -i2p (0.8.7-5) stable; urgency=low - - * Depend on default-jre-headless | java5-runtime-headless | - java6-runtime-headless instead of the non-headless versions. Sure the - -headless packages fulfilled the dependency, but this way it should pull in - the headless package by default. - * Remove unused lock from core/java/src/net/i2p/crypto/ElGamalEngine.java to - fix lock-ups on arm/ppc CPUs - - -- Kill Your TV Mon, 01 Aug 2011 17:51:14 +0000 - -i2p (0.8.7-4) stable; urgency=low - - * Change to allow jbigi to be built on non-x86 - - -- Kill Your TV Tue, 26 Jul 2011 23:13:00 +0000 - -i2p (0.8.7-3) stable; urgency=low - - * When i2p-doc package is installed, add the Javadoc link to the router - console. - - -- Kill Your TV Tue, 28 Jun 2011 22:39:46 +0000 - -i2p (0.8.7-2) stable; urgency=low - - * Remove --with quilt from debian/rules. This is only meant for use in mtn - - - -- Kill Your TV Mon, 27 Jun 2011 16:41:40 +0000 - -i2p (0.8.7-1) stable; urgency=low - - * The "W00t! My debs are official!" release - * New upstream release. See /usr/share/doc/i2p/changelog.gz for the details. - * Drop from debian/patches: 0002-sync-countries, 0006-i2p-jetty, - 0007-eepget-redirections, 0008-config-news, 0009-jetty-snark-disable and - re-work the existing patches. - * Debconf translations (thanks guys!) - - Russian (by hiddenz@mail.i2p) - - German & Spanish (by m1xxy@mail.i2p) - - -- Kill Your TV Mon, 27 Jun 2011 12:38:59 +0000 - -i2p (0.8.6-7) stable; urgency=low - - * Fix bug in maintainer script that caused upgrade to fail on some systems. - - -- Kill Your TV Sun, 29 May 2011 15:53:04 +0000 - -i2p (0.8.6-6) stable; urgency=low - - * Remove extraneous cruft from debian/rules from back when cpuid couldn't be - built for i386 - * Ship our own router.config with router.updatesDisabled=true to prevent - upgrades to be performed by the router itself. Per Debian policy, upgrades - *must* take place via the package manager. - * Backported eepget fix - * Backported news fix - - -- Kill Your TV Sat, 28 May 2011 10:23:51 +0000 - -i2p (0.8.6-5) stable; urgency=low - - * Remove /etc/i2p/wrapper.service. Changes have been moved to the - initscript. - * Don't disable browser launch. This is handled automatically for the i2psvc - user. - * Create debian/copyright dynamically at build time - * Don't ship the standalone jetty-i2psnark - * Create split package so that the wrapper isn't required - * Install missing certificates directory - - -- Kill Your TV Fri, 27 May 2011 03:48:56 +0000 - -i2p (0.8.6-4) stable; urgency=low - - * backported patch from 9a26dcaef3687ff7fa08cf3b3eb2180ebb2dedde to fix - missing "addWebApplications" in Jetty. - - -- Kill Your TV Sun, 22 May 2011 19:00:37 +0000 - -i2p (0.8.6-3) stable; urgency=low - - [Kill Your TV] - * Creating libjbigi-jni packages again. Backported patch from MTN so that - jbigi can be built for i386 - * Drop build-dep on unzip since jbigi can be built. - * Check to see if doc/libjbigi-jni is a directory and remove it. It is - supposed to be a symlink to doc/i2p - * Don't chown $I2P to i2psvc - * Add Build-Dep for tor-geoipdb and remove from debian/ - * Add launch-i2psnark to doc/examples - * Remove obsolete build-dep on default-jdk-builddep - [Karl Goetz] - * Move adduser to depends from pre-depends - * Tidy postinst - - -- Kill Your TV Fri, 20 May 2011 22:03:52 +0000 - -i2p (0.8.6-2) stable; urgency=low - - * Fix permissions bug for /var/run/i2p, reported by "signhere" on IRC - - -- Kill Your TV Tue, 17 May 2011 16:30:29 +0000 - -i2p (0.8.6-1) stable; urgency=low - - * New upstream version - - -- Kill Your TV Tue, 17 May 2011 12:30:07 +0000 - -i2p (0.8.5-4) stable; urgency=low - - * Correct lintian error - - -- Kill Your TV Sun, 15 May 2011 16:20:39 +0000 - -i2p (0.8.5-3) stable; urgency=low - - * *Sigh* Set debian/i2p.default run_daemon to false - - -- Kill Your TV Fri, 29 Apr 2011 09:54:39 +0000 - -i2p (0.8.5-2) stable; urgency=low - - * Change debconf priority to medium. - * RUN_DAEMON defaults to false. Earlier versions defaulted to true. Since - the priority is changing, this should as well. - * Split jbigi into its own source package - * Update geoip.txt - * Update Suggests: - - -- Kill Your TV Mon, 25 Apr 2011 17:00:43 +0000 - -i2p (0.8.5-1) stable; urgency=low - - * New upstream - - -- Kill Your TV Mon, 18 Apr 2011 15:41:42 +0000 - -i2p (0.8.4-4) stable; urgency=low - - * Update geoip from tor-0.2.2.23-alpha - - -- Kill Your TV Sat, 09 Apr 2011 23:34:11 +0000 - -i2p (0.8.4-3) stable; urgency=low - - * Back out upgrade 'do you want to reboot' logic since it's utterly borked. - - -- Kill Your TV Thu, 17 Mar 2011 18:54:09 +0000 - -i2p (0.8.4-2) stable; urgency=low - - * Stop including /usr/share/i2p/lib/jbigi.jar. - * Compile a dynamic jbigi and create a new package, libjbigi-jni. Since I - can't get jcpuid to compile I take this library from jbigi.jar. - Unfortunately it was not compiled with -fPIC, causing lintian to complain. - Additionally it is a 32bit compile, forcing libc-i386 to be installed on - amd64 boxes. - * Add dependency on libc-i386 because of jcpuid and a build-dep on unzip for - the same reason. - * Don't display errors generated from chowning files that don't exist. - * Bug fix: Somehow I missed packaging the geoip information before. Oops. - * Bug fix: Add history.txt to /usr/share/i2p. I didn't realize it was shown - in the console at /help. - * Since I'm packaging the missing geoip information, I use an updated - geoiodb from tor (taken from Debian package tor-geoipdb version - 0.2.2.22-alpha-1) - * Patching countries.txt to add entries that are in Maxmind's database. - * Now using debconf to ask about running as a daemon. - * From this point forward, users will be asked to confirm that they want to - upgrade this package, due to it requiring a router reboot. - * Updated README.Debian to better explain differences compared with - upstream. - * Add history.txt to /usr/share/i2p - - -- Kill Your TV Sun, 13 Mar 2011 10:45:47 +0000 - -i2p (0.8.4-1) stable; urgency=low - - * New upstream version, monotone revision - fea6969d789a6b85396439be9906abb9b4a4a405 - - -- Kill Your TV Thu, 03 Mar 2011 11:37:37 +0000 - -i2p (0.8.3-2) testing; urgency=low - - * Minor changes to initscript - - -- Kill Your TV Wed, 26 Jan 2011 14:29:50 +0000 - -i2p (0.8.3-1) testing; urgency=low - - * New upstream - - -- Kill Your TV Mon, 24 Jan 2011 20:23:38 +0000 - -i2p (0.8.2-1) testing; urgency=low - - * Initial packaging - - -- Kill Your TV Sun, 23 Jan 2011 00:03:31 +0000 - diff --git a/debian/changelog b/debian/changelog index 9b65a9c94..12972e887 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,87 @@ +i2p (0.9.41-1~disco+1) disco; urgency=medium + + * New upstream version 0.9.41 + + -- zzz on i2p (key signing) Wed, 3 Jul 2019 12:12:12 +0000 + +i2p (0.9.40-1~disco+1) disco; urgency=medium + + * New upstream version 0.9.40 + + -- zzz on i2p (key signing) Wed, 8 May 2019 12:12:12 +0000 + +i2p (0.9.39-1~disco+1) disco; urgency=medium + + * New upstream version 0.9.39 + + -- zzz on i2p (key signing) Fri, 22 Mar 2019 12:12:12 +0000 + +i2p (0.9.38-1~disco+1) disco; urgency=medium + + * New upstream version 0.9.38 + + -- zzz on i2p (key signing) Wed, 23 Jan 2019 12:12:12 +0000 + +i2p (0.9.37-1ubuntu1) bionic; urgency=medium + + * New upstream version 0.9.37 + + -- zzz on i2p (key signing) Fri, 05 Oct 2018 12:12:12 +0000 + +i2p (0.9.36-2ubuntu1) bionic; urgency=medium + + * New upstream version 0.9.36 + + -- zzz on i2p (key signing) Wed, 23 Aug 2018 12:12:12 +0000 + +i2p (0.9.35-1ubuntu1) artful; urgency=medium + + * New upstream version 0.9.35 + + -- zzz on i2p (key signing) Wed, 27 Jun 2018 12:12:12 +0000 + +i2p (0.9.34-2ubuntu1) artful; urgency=medium + + * New upstream version 0.9.34 + + -- zzz on i2p (key signing) Wed, 11 Apr 2018 12:12:12 +0000 + +i2p (0.9.33-1ubuntu1) artful; urgency=medium + + * New upstream version 0.9.33 + + -- zzz on i2p (key signing) Wed, 30 Jan 2018 12:12:12 +0000 + +i2p (0.9.32-1ubuntu1) xenial; urgency=medium + + * New upstream version 0.9.32 + + -- zzz on i2p (key signing) Wed, 08 Nov 2017 12:12:12 +0000 + +i2p (0.9.31-1ubuntu1) xenial; urgency=medium + + * New upstream version 0.9.31 + + -- zzz on i2p (key signing) Wed, 09 Aug 2017 12:12:12 +0000 + +i2p (0.9.30-3ubuntu1) xenial; urgency=medium + + * New upstream version 0.9.30 + + -- zzz on i2p (key signing) Wed, 03 May 2017 12:12:12 +0000 + +i2p (0.9.29-1ubuntu1) trusty; urgency=medium + + * New upstream version 0.9.29 + + -- zzz on i2p (key signing) Mon, 27 Feb 2017 12:12:12 +0000 + +i2p (0.9.28-1ubuntu1) trusty; urgency=medium + + * New upstream version 0.9.28 + + -- zzz on i2p (key signing) Tue, 13 Dec 2016 12:12:12 +0000 + i2p (0.9.27-1~deb8u+1) stable; urgency=medium * Backport to Jessie diff --git a/debian/control b/debian/control index c91252ed9..5fe5be582 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,19 @@ Source: i2p Maintainer: zzz Section: net -Standards-Version: 3.9.8 +Standards-Version: 4.3.0 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.8) ,debconf - ,openjdk-8-jdk + ,default-jdk ,libjetty9-java ,libtaglibs-standard-jstlel-java - ,libtomcat8-java + ,libtomcat9-java ,dh-apparmor ,bash-completion ,gettext @@ -27,11 +29,13 @@ 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 + service-wrapper, + ucf (>= 0.28) 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 @@ -74,15 +78,16 @@ Architecture: all Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, - openjdk-9-jre-headless | openjdk-8-jre-headless | default-jre-headless | java9-runtime-headless | java8-runtime-headless, + openjdk-11-jre-headless | java11-runtime-headless, geoip-database, gettext-base, libgetopt-java, libjson-simple-java (<< 3), libjetty9-java, libtaglibs-standard-jstlel-java, - libtomcat8-java, - famfamfam-flag-png + libtomcat9-java, + famfamfam-flag-png, + sensible-utils Replaces: i2p ( << 0.8.6-5) Breaks: i2p (<< 0.8.6-5) Recommends: libjbigi-jni, fonts-dejavu diff --git a/debian/i2p-router.links b/debian/i2p-router.links index 2284de235..8f980dcd4 100644 --- a/debian/i2p-router.links +++ b/debian/i2p-router.links @@ -33,24 +33,25 @@ usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar -# comment out if not building with libtomcat8-java +# comment out if not building with libtomcat9-java # ubuntu: only in xenial+ # debian: wheezy-backports, jessie+ # legacy name, contains only tomcat-juli, not commons-logging -usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar -usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar +usr/share/java/tomcat9-juli.jar usr/share/i2p/lib/commons-logging.jar +usr/share/java/tomcat9-jasper.jar usr/share/i2p/lib/jasper-runtime.jar # combined into jasper-runtime.jar in non-package builds -usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar -usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar -usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar -usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar +usr/share/java/tomcat9-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar +usr/share/java/tomcat9-api.jar usr/share/i2p/lib/tomcat-api.jar +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/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar +usr/share/java/tomcat9-jasper-el.jar usr/share/i2p/lib/jasper-el.jar # legacy name in lib/ -usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar +usr/share/java/tomcat9-el-api.jar usr/share/i2p/lib/commons-el.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 usr/share/java/taglibs-standard-impl.jar usr/share/i2p/lib/standard.jar diff --git a/debian/i2p.postinst b/debian/i2p.postinst index 112689728..d12335e8e 100755 --- a/debian/i2p.postinst +++ b/debian/i2p.postinst @@ -71,8 +71,8 @@ case "$1" in sed -e "s/User=.*/User=$I2PUSER/" < "$systemdservice" > "$systemdservice.tmp" mv -f "$systemdservice.tmp" "$systemdservice" chmod 0644 -f "$systemdservice" - if grep -q 'systemd' /proc/1/comm > /dev/null 2>&1; then - systemctl --system daemon-reload + if [ -d /run/systemd/system ]; then + systemctl --system daemon-reload || true if [ $RUN_DAEMON = 'true' ]; then deb-systemd-helper enable i2p.service else diff --git a/debian-alt/bionic/patches/0002-jetty-compatibility.patch b/debian/patches/0002-jetty-compatibility.patch similarity index 100% rename from debian-alt/bionic/patches/0002-jetty-compatibility.patch rename to debian/patches/0002-jetty-compatibility.patch diff --git a/debian/patches/series b/debian/patches/series index 9767bacd6..5fabbd7e7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-path-substitution.patch +0002-jetty-compatibility.patch diff --git a/debian/rules b/debian/rules index a1fc85e67..fe976bd52 100755 --- a/debian/rules +++ b/debian/rules @@ -25,6 +25,7 @@ build: @echo 'The build target is disabled. Use the appropriate binary target.' JAVA_HOME=/usr/lib/jvm/default-java + I2P=$(CURDIR)/pkg-temp ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java export DEB_BUILD_HARDENING=1 @@ -78,9 +79,9 @@ else @echo "Already found deb in version, not doing anything" endif @# build options - @/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 "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=debian" >> $(CURDIR)/override.properties @/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties @@ -110,17 +111,17 @@ endif @# this is roughly the same as tomcat8-jsp-api.jar, we use this one ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar - @# debian and ubuntu: wheezy-backports, jessie+, xenial+ - @/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties + @# debian and ubuntu: buster, disco + @/bin/echo -e "with-libtomcat9-java=true" >> $(CURDIR)/override.properties mkdir -p $(CURDIR)/apps/jetty/jettylib - ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar - ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar - ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar - ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar - ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar - ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar - ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar - ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar + ln -sf /usr/share/java/tomcat9-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar + ln -sf /usr/share/java/tomcat9-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar + ln -sf /usr/share/java/tomcat9-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar + ln -sf /usr/share/java/tomcat9-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar + ln -sf /usr/share/java/tomcat9-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar + ln -sf /usr/share/java/tomcat9-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar + ln -sf /usr/share/java/tomcat9-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar + ln -sf /usr/share/java/tomcat9-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar @# debian and ubuntu: stretch+, zesty+ @/bin/echo -e "with-libtaglibs-standard=true" >> $(CURDIR)/override.properties