From cffcbe5f946dfdabd00325beb423d26d1b314b28 Mon Sep 17 00:00:00 2001 From: zzz Date: Fri, 7 Mar 2008 15:08:26 +0000 Subject: [PATCH 1/2] update news and version numbers to .32 --- core/java/src/net/i2p/CoreVersion.java | 2 +- history.txt | 5 ++ initialNews.xml | 4 +- installer/install.xml | 2 +- news.xml | 50 ++++++++----------- .../src/net/i2p/router/RouterVersion.java | 4 +- 6 files changed, 32 insertions(+), 35 deletions(-) diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index d6bd3aac2..32833481f 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -15,7 +15,7 @@ package net.i2p; */ public class CoreVersion { public final static String ID = "$Revision: 1.72 $ $Date: 2007-08-23 19:33:31 $"; - public final static String VERSION = "0.6.1.30"; + public final static String VERSION = "0.6.1.32"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index c471742c2..79ef470e0 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +* 2008-03-09 0.6.1.32 released + +2008-03-07 zzz + * Update news and version numbers + 2008-03-01 zzz * Fix netdb.knownLeaseSets count reported by floodfill routers (was broken by -3) diff --git a/initialNews.xml b/initialNews.xml index 3a67a3ed0..77beb6399 100644 --- a/initialNews.xml +++ b/initialNews.xml @@ -1,5 +1,5 @@ - - + i2p - 0.6.1.31 + 0.6.1.32 diff --git a/news.xml b/news.xml index 462749ef4..52f6fb317 100644 --- a/news.xml +++ b/news.xml @@ -1,5 +1,5 @@ - - + +

+• +2008-03-09: 0.6.1.32 Released +

+The 0.6.1.32 release contains a new, more efficient +tunnel build algorithm, and fixes participating tunnel counts. +These changes should help network capacity, so please +upgrade when you get a chance. +This release also increases the default inbound bandwidth limit to 32KBps. +You may wish to adjust your limits on +config.jsp. +

+

• 2008-02-29: Upcoming 0.6.1.32 Release @@ -25,24 +38,9 @@ If you already have three Update URLs, you do not have to do anything.

• -2008-02-10: 0.6.1.31 released +2008-02-05: Upgrading from 0.6.1.30 and Earlier Releases

-The transitional 0.6.1.31 release will make the I2P -release process independent of jrandom and *.i2p.net servers, -introducing two new update verification keys, adding support -for distributed update hosting inside I2P, and changing many URLs. -

-It introduces version 2 of the SAM protocol, -along with substantial improvements to the address book, -I2PSnark and ircproxy. Unless you have already done that, -read about the update procedure below. -

- -

-• -2008-02-05: Upcoming 0.6.1.31 Release -

-And, since i2p's lead developer +Since i2p's lead developer has gone AWOL, we do not have his update signing key or write access to www.i2p or @@ -51,13 +49,12 @@ Complication and zzz have generated new signing keys, and they and Amiga are pro update file hosting. These changes must be configured in your router to take effect.

Make the following configuration changes and your router will automatically install -the upcoming 0.6.1.31 release when it becomes available. -The release will include SAM v2, new jump server links, and addressbook, IRC proxy, and i2psnark improvements. +the latest release.

We recommend the automated process as it will verify the key of the signed update file. If you do not make these changes, -you will still be able to manually download the new i2pupdate.zip file from locations to -be announced. +you may manually download the i2pupdate.zip file from +www.i2p2.i2p/download.

  1. On configupdate.jsp: @@ -84,18 +81,13 @@ Add the following line: Click "Apply"
  • -You are now ready to automatically receive the 0.6.1.31 update when it becomes available, +You are now ready to automatically receive the release update file, either by setting your update policy to "download and install" or by clicking on the "update available" link when it appears.

    • If you would like to verify the trusted update keys, they are also posted and signed here. -

    -The new release will be announced here, on -the forums, on IRC, and on Syndie. -New users may install 0.6.1.31 from the -www.i2p2.de download page. Thank you for your support during this transition. For help please contact us on #i2p.

    Amiga, Complication, welterde, zzz diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index a4ea22835..92ada8a2f 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -16,8 +16,8 @@ import net.i2p.CoreVersion; */ public class RouterVersion { public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $"; - public final static String VERSION = "0.6.1.31"; - public final static long BUILD = 9; + public final static String VERSION = "0.6.1.32"; + public final static long BUILD = 0; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID); From 6606c83cb2b001bcd1c3a0836f0be10efd3cf23a Mon Sep 17 00:00:00 2001 From: complication Date: Sat, 8 Mar 2008 20:37:45 +0000 Subject: [PATCH 2/2] 2008-03-09 Complication * Give the Jetty build file ability to ask permission before downloading the Jetty archive from the web, and to verify its SHA1 + MD5 hashes. Adjust the main build file in accordance with this change. * Improve the release checklist. --- apps/jetty/build.xml | 74 ++++++++++++++----- build.xml | 2 +- checklist.txt | 26 +++++-- history.txt | 7 ++ .../src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 85 insertions(+), 26 deletions(-) diff --git a/apps/jetty/build.xml b/apps/jetty/build.xml index 76db0747c..a59c3fddb 100644 --- a/apps/jetty/build.xml +++ b/apps/jetty/build.xml @@ -1,25 +1,64 @@ - + + + + + + - - + + + - - + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + - - + + + @@ -30,7 +69,7 @@ - + @@ -40,7 +79,8 @@ - + + diff --git a/build.xml b/build.xml index 297b3a3ee..fd9229ce3 100644 --- a/build.xml +++ b/build.xml @@ -42,7 +42,7 @@ - + diff --git a/checklist.txt b/checklist.txt index a17ad672b..15ce0cb53 100644 --- a/checklist.txt +++ b/checklist.txt @@ -4,6 +4,7 @@ Release checklist Sync with mtn.i2p2.i2p Start with a clean checkout mtn -d i2p.mtn co --branch=i2p.i2p Double-check trust list +Deploy the Jetty archive, a clean checkout lacks it Change revision in: history.txt @@ -16,7 +17,7 @@ Change revision in: Build and tag: ant dist mtn ci - mtn tag i2p-0.6.1.xx h: + mtn tag h: i2p-0.6.1.xx Sync with mtn.i2p2.i2p Create a signed update file with: @@ -33,12 +34,23 @@ Make the source tarball: tar cjf i2psource-0.6.1.xx.tar.bz2 --exclude i2p-0.6.1.xx/_MTN i2p-0.6.1.xx mv i2p-0.6.1.xx.tar.bz2 i2p.i2p -More signatures: - sha1sum i2pinstall.exe i2p.tar.bz2 i2psource-0.6.1.xx.tar.bz2 i2pupdate.zip - gpg -b i2pinstall.exe - gpg -b i2p.tar.bz2 - gpg -b i2p-0.6.1.xx.tar.bz2 - gpg -b i2pupdate.zip +Until the build script gets this ability, you need to rename some files: + mv i2pinstall.exe i2pinstall-0.6.1.xx.exe + mv i2p.tar.bz2 i2pheadless-0.6.1.xx.tar.bz2 + mv i2pupdate.zip i2pupdate-0.6.1.xx.zip + you probably don't need to rename i2pupdate.sud + +Generate hashes: + sha1sum i2p*0.6.1.xx.* + sha1sum i2pupdate.sud + now GPG-sign an announcement with the hashes + +Generate PGP signatures: + gpg -b i2pinstall-0.6.1.xx.exe + gpg -b i2pheadless-0.6.1.xx.tar.bz2 + gpg -b i2psource-0.6.1.xx.tar.bz2 + gpg -b i2pupdate-0.6.1.xx.zip + gpg -b i2pupdate.sud Distribute files to download locations and to www.i2p2.i2p diff --git a/history.txt b/history.txt index 79ef470e0..406b81006 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,10 @@ +2008-03-09 Complication + * Give the Jetty build file ability to ask permission + before downloading the Jetty archive from the web, + and to verify its SHA1 + MD5 hashes. Adjust the main build file + in accordance with this change. + * Improve the release checklist. + * 2008-03-09 0.6.1.32 released 2008-03-07 zzz diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 92ada8a2f..a82012c51 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -17,7 +17,7 @@ import net.i2p.CoreVersion; public class RouterVersion { public final static String ID = "$Revision: 1.548 $ $Date: 2008-02-10 15:00:00 $"; public final static String VERSION = "0.6.1.32"; - public final static long BUILD = 0; + public final static long BUILD = 1; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION + "-" + BUILD); System.out.println("Router ID: " + RouterVersion.ID);