From ad6cd05295b3bb3410ee0433f149c7979b99ef8e Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 30 Jul 2009 17:44:08 +0000 Subject: [PATCH 1/2] last minute fixes --- .../java/src/net/i2p/router/web/StatSummarizer.java | 3 +-- apps/routerconsole/jsp/summaryframe.jsp | 2 -- installer/resources/themes/console/snark.css | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java index b8ea32bc9..15a9bf9b5 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/StatSummarizer.java @@ -183,8 +183,7 @@ public class StatSummarizer implements Runnable { def.setGridY(false); } //System.out.println("rendering: path=" + path + " dsNames[0]=" + dsNames[0] + " dsNames[1]=" + dsNames[1] + " lsnr.getName=" + _listener.getName()); - // Let's set anti-aliasing on and see what happens.. - def.setAntiAliasing(true); + def.setAntiAliasing(false); //System.out.println("Rendering: \n" + def.exportXmlTemplate()); //System.out.println("*****************\nData: \n" + _listener.getData().dump()); RrdGraph graph = new RrdGraph(def); diff --git a/apps/routerconsole/jsp/summaryframe.jsp b/apps/routerconsole/jsp/summaryframe.jsp index ae65c69e4..9532602fa 100644 --- a/apps/routerconsole/jsp/summaryframe.jsp +++ b/apps/routerconsole/jsp/summaryframe.jsp @@ -13,7 +13,6 @@ Summary Bar <% - out.print("
\n"); // try hard to avoid an error page in the iframe after shutdown String action = request.getParameter("action"); String d = request.getParameter("refresh"); @@ -50,7 +49,6 @@ shutdownSoon = true; } } - out.print("
\n"); %> <%@include file="css.jsp" %> diff --git a/installer/resources/themes/console/snark.css b/installer/resources/themes/console/snark.css index f72a1967f..f78956ad1 100644 --- a/installer/resources/themes/console/snark.css +++ b/installer/resources/themes/console/snark.css @@ -92,7 +92,7 @@ th { font-size: 8pt; border-top: 1px outset #001; border-bottom: 1px inset #001; - background: #f91 url('.../console/images/tabletitleorangealt.png') repeat-x; + background: #f91 url('/themes/console/images/tabletitleorange.png') repeat-x; text-align: left; } @@ -323,4 +323,4 @@ div.configsection a:hover{ background: #eef; -moz-box-shadow: inset 0px 0px 1px 0px #002; background: #ddf url('../console/light/images/tabletile.png'); -} \ No newline at end of file +} From 7ffb3f46b556b6f4d99ecbb268180a61f023945f Mon Sep 17 00:00:00 2001 From: zzz Date: Thu, 30 Jul 2009 21:58:29 +0000 Subject: [PATCH 2/2] 0.7.6 --- checklist.txt | 12 ++-- core/java/src/net/i2p/CoreVersion.java | 5 +- history.txt | 10 +++ initialNews.xml | 4 +- installer/install.xml | 6 +- news.xml | 64 +++++++++++-------- .../src/net/i2p/router/RouterVersion.java | 4 +- .../router/tunnel/pool/TunnelPoolManager.java | 4 +- 8 files changed, 64 insertions(+), 45 deletions(-) diff --git a/checklist.txt b/checklist.txt index 17f8d9753..e65134b7c 100644 --- a/checklist.txt +++ b/checklist.txt @@ -49,8 +49,8 @@ Until the build script gets this ability, you need to rename some files: you probably don't need to rename i2pupdate.sud Generate hashes: - sha1sum i2p*0.7.xx.* - sha1sum i2pupdate.sud + sha256sum i2p*0.7.xx.* + sha256sum i2pupdate.sud now GPG-sign an announcement with the hashes Generate PGP signatures: @@ -65,14 +65,12 @@ Website files to change: Sync with mtn.i2p2.i2p announcements.html announcements_de.html - download.html (change SHA1s) - download_de.html (change SHA1s) + download.html (change SHA256s) + download_de.html (change SHA256s) index.html index_de.html hosts.txt (copy from mtn) release-x.y.z.html (new) Sync with mtn.i2p2.i2p -Copy news.xml to subscription location - -Announce on #i2p, forum.i2p, Syndie, freshmeat +Announce on #i2p, forum.i2p diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index fecc6c9a8..78790b91a 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,9 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.72 $ $Date: 2008-08-24 12:00:00 $"; - public final static String VERSION = "0.7.5"; + /** deprecated */ + public final static String ID = "Monotone"; + public final static String VERSION = "0.7.6"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index cc7cbddf5..10ce5688d 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,13 @@ +* 2009-07-31 0.7.6 released + +2009-07-31 zzz + * Update versions, package release + * Fix snark.css link + * Revert graph antialias enable + * Remove
from iframe head + * Fix tunnels.jsp HTML + * Prevent linux-only installer screen from displaying on windows + 2009-07-28 zzz * Add new reseed URL (thanks eche|on!) diff --git a/initialNews.xml b/initialNews.xml index f505ddb5b..1572c2ad4 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - - + +

Congratulations on getting I2P installed!

  • diff --git a/installer/install.xml b/installer/install.xml index c7b0aafbe..1988e5e2a 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.7.5 + 0.7.6 @@ -95,7 +95,9 @@ - + + + diff --git a/news.xml b/news.xml index c0f62dc7d..be13ee443 100644 --- a/news.xml +++ b/news.xml @@ -1,5 +1,5 @@ - - +

    -

    +

    -I2P version 0.7.5 foremost addresses network stability issues -by adjusting how exploratory tunnels are built if a router nears -its connection limit, and also by distinguishing between -connected peers and other non-failing peers while picking them -for inclusion in tunnels. +I2P version 0.7.6 contains additional fixes for network stability issues +related to tunnel building and connection limits. +While the 0.7.5 release greatly improved the congestion that +appeared UTC evenings and weekends, it was not eliminated; +this release should improve the situation further.

    -This version also delivers fixes to installer behaviour on Windows, -to the Router Console, NTCP transport and UPnP mechanism. +This version also has new console themes by dr|z3d, +which may be selected on the new UI configuration page. +Sorry, the new themes are not available for IE browsers.

    -Additionally, version 0.7.5 changes the "news.xml" file location -where I2P routers check whether a new version is available. -Instead of the old URL (http://complication.i2p/news.xml) -a new location (http://echelon.i2p./news.xml) will be used. -If your router uses default updater settings, it will start using -the new URL automatically. If not, you will need to visit -configupdate.jsp, and change it manually. -For a while after this update, the old news.xml location will also -redirect all HTTP requests to the new one. +The default tunnel length variance is changed from 1 to 0. +This mainly affects exploratory tunnels and iMule. +As explained on zzz.i2p, +a non-zero variance adds very little protection, at great cost +in resources. +Should you wish to reconfigure your exploratory settings back to the old variance of 1, +or change to length 3 variance 0, +you may do so on the config tunnels page. +iMule settings are best changed within that application.

    -Finally, since Complication is withdrawing from the I2P project, -to make some far-reaching changes in his life, this update removes -Complication's public key from the list of release signing keys. -You should expect the next release to be signed by zzz instead. -If you have non-default updater settings, you may want to remove -Complication's public key manually, by visiting configupdate.jsp, -and removing the key line starting with the characters "JHFA". -If you wish to verify whether this information is correct, -please check the GPG-signed release announcement. +I2P now stores temporary data in the system temp directory +(generally /var/tmp on Linux and %TEMP% on Windows). +For new installs only, +user data is in $HOME/.i2p on Linux/Mac and +%APPDATA%\I2P on Windows. +

    +The release contains several changes to reduce resource usage +(memory, CPU, and connections) and the usual assortment of bug fixes. +Upgrading is recommended. +

    +This is the first release built and signed by zzz. +Thanks again to Complication for his many contributions to the project +over the past five years. +I2P is undergoing the most rapid development in years. Please give the +developers feedback on IRC #i2p or forum.i2p +and get involved!

    diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 23d4b1f0d..8aa072fcf 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,9 +18,9 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 34; + public final static long BUILD = 0; /** for example "-test" */ - public final static String EXTRA = "-rc"; + public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; public static void main(String args[]) { System.out.println("I2P Router version: " + FULL_VERSION); diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index 99b1e58a3..7524e12c3 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -622,8 +622,8 @@ public class TunnelPoolManager implements TunnelManagerFacade { out.write('\n'); } out.write("Tunnels" + tunnelCount); - out.write(" " + partCount); - out.write(" \n"); + out.write(" " + partCount); + out.write(" \n"); } /** @return total number of non-fallback expl. + client tunnels */