propagate from branch 'i2p.i2p.i2p-0.6.1.33-pre' (head adbe93ae091c4ca78306ef94968a0c1d788e2c01)

to branch 'i2p.i2p' (head f541ec6c1ca7ffae49e31ee75559695d64152fa1)

apps/jetty/build.xml

@@ -1,25 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="all" name="jetty">
-        
+
+    <property name="jetty.sha1" value="021164f84da7304bd1ff07c268b45aa3e0b13322" />
+    <property name="jetty.md5" value="a61adc832be6baf2678935506743cfc3" />
+    <property name="jetty.url" value="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" />
+    <property name="jetty.filename" value="jetty-5.1.12.zip" />
+
     <target name="all" depends="build" />
-    <target name="fetchJettylib" >
+
-        <available property="jetty.zip.available" file="jetty-5.1.12.zip" type="file" />
+    <target name="ensureJettylib" >
+        <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
         <available property="jetty.zip.extracted" file="jettylib" type="dir" />
-        <ant target="doFetchJettylib" />
+        <ant target="fetchJettylib" />
-        <ant target="doExtractJettylib" />
+        <ant target="verifyJettylib" />
+        <ant target="extractJettylib" />
     </target>
-    <target name="doFetchJettylib" unless="jetty.zip.available" >
+
-        <echo message="The libraries contained within the fetched file are from Jetty's 5.1.12" />
+    <target name="fetchJettylib" unless="jetty.zip.available" >
-        <echo message="distribution (http://jetty.mortbay.org/).  These are not " />
+        <echo message="It seems that you don't have '${jetty.filename}' deployed." />
-        <echo message="necessary for using I2P, but are used by some applications on top of I2P," />
+        <echo message="The build script can download this file for you automatically," />
-        <echo message="such as the routerconsole." />
+        <echo message="or alternatively you can obtain it manually from:" />
-        <get src="http://mesh.dl.sourceforge.net/sourceforge/jetty/jetty-5.1.12.zip" verbose="true" dest="jetty-5.1.12.zip" />
+        <echo message="${jetty.url}" />
+        <echo message="" />
+        <echo message="The libraries contained in the fetched file provide the Jetty web server" />
+        <echo message="(http://jetty.mortbay.org/). They are not absolutely necessary" />
+        <echo message="but strongly recommended, since they are used by some applications" />
+        <echo message="on top of I2P, like the router console." />
+        <echo message="" />
+        <echo message="Even if you deploy the Jetty archive manually, the build script will" />
+        <echo message="still attempt to verify its checksums, which must be:" />
+        <echo message="SHA1 ${jetty.sha1}" />
+        <echo message="MD5 ${jetty.md5}" />
+        <echo message="" />
+        <input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />
+        <fail message="Aborting as requested. Please deploy the Jetty archive manually." >
+            <condition>
+                <equals arg1="${jetty.download}" arg2="n"/>
+            </condition>
+        </fail>
+        <get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
     </target>
-    <target name="doExtractJettylib" unless="jetty.zip.extracted" >
+
-        <ant target="doExtract" />
+    <target name="verifyJettylib" >
+        <condition property="jetty.zip.verified" >
+            <and>
+                <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
+                <checksum file="${jetty.filename}" algorithm="MD5" property="${jetty.md5}" />
+            </and>
+        </condition>
+        <fail message="Jetty archive does not match its checksums!" >
+            <condition>
+                <not>
+                    <istrue value="${jetty.zip.verified}" />
+                </not>
+            </condition>
+        </fail>
     </target>
-    <target name="doExtract">
+
-        <unzip src="jetty-5.1.12.zip" dest="." />
+    <target name="extractJettylib" unless="jetty.zip.extracted" >
+        <unzip src="${jetty.filename}" dest="." />
         <mkdir dir="jettylib" />
         <copy todir="jettylib">
             <fileset dir="jetty-5.1.12/lib">
@@ -30,7 +69,7 @@
             <fileset dir="jetty-5.1.12/ext">
                 <include name="ant.jar" />
                 <include name="commons-el.jar" />
-	        <include name="commons-logging.jar" />
+                <include name="commons-logging.jar" />
                 <include name="jasper-compiler.jar" />
                 <include name="jasper-runtime.jar" />
                 <include name="javax.servlet.jar" />
@@ -40,7 +79,8 @@
         </copy>
         <delete dir="jetty-5.1.12" />
     </target>
-    <target name="build" depends="fetchJettylib" />
+
+    <target name="build" depends="ensureJettylib" />
     <target name="builddep" />
     <target name="compile" />
     <target name="jar" />

build.xml

@@ -42,7 +42,7 @@
         <copy file="router/java/build/router.jar" todir="build/" />
     </target>
     <target name="buildWEB">
-        <ant dir="apps/jetty" target="fetchJettylib" />
+        <ant dir="apps/jetty" target="ensureJettylib" />
         <ant dir="apps/routerconsole/java" target="build" />
         <copy file="apps/routerconsole/java/build/routerconsole.jar" todir="build/" />
         <copy file="apps/routerconsole/java/build/routerconsole.war" todir="build/" />

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:
+Until the build script gets this ability, you need to rename some files:
-	sha1sum i2pinstall.exe i2p.tar.bz2 i2psource-0.6.1.xx.tar.bz2 i2pupdate.zip
+	mv i2pinstall.exe i2pinstall-0.6.1.xx.exe
-	gpg -b i2pinstall.exe
+	mv i2p.tar.bz2 i2pheadless-0.6.1.xx.tar.bz2
-	gpg -b i2p.tar.bz2
+	mv i2pupdate.zip i2pupdate-0.6.1.xx.zip
-	gpg -b i2p-0.6.1.xx.tar.bz2
+	you probably don't need to rename i2pupdate.sud
-	gpg -b i2pupdate.zip
+
+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
 

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);

history.txt

@@ -1,32 +1,14 @@
-2008-03-08 zzz
+2008-03-09 Complication
-    * ClientPeerSelector: Implement strict ordering of peers,
+    * Give the Jetty build file ability to ask permission
-      based on XOR distance from a random hash
+      before downloading the Jetty archive from the web,
-      separately generated for each tunnel pool
+      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
-    * Naming: Optimize lookups for a destkey
+    * Update news and version numbers
-    * ProfileOrganizer, TunnelPoolSettings, ClientPeerSelector:
-      - Prevent peers with matching IPs from joining same tunnel.
-        Match 0-4 bytes of IP (0=off, 1=most restrictive, 4=least).
-        Default is 2 (disallow routers in same /16).
-        Set with router.defaultPool.IPRestriction=x
-      - Comment out unused RebuildPeriod pool setting
-      - Add random key to pool in preparation for XOR peer ordering
-    * SusiMail: Add 'Create Account' link
-    * TunnelDispatcher: Change a common wtf error to a warn
-
-2008-03-05 zzz
-    * Naming: Make HostsTxt the sole default NamingService
-      (was Meta = PetName + HostsTxt)
-    * Naming: Add two new experimental NamingServices, EepGet and Exec,
-      not enabled by default -
-      see source comments in core/java/src/net/i2p/client/naming
-      for configuration instructions
-    * i2psnark: Don't do a naming lookup for Base64 destkeys
-    * i2psnark: Add a StartAll button
-    * Stats: Add code to disable most stats to save memory.
-      Set on configstats.jsp or set stat.full=false to disable the stats.
-      (true by default for now)
 
 2008-03-01 zzz
     * Fix netdb.knownLeaseSets count reported by floodfill routers

initialNews.xml

@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2008-02-10 15:00:00 $">
+<i2p.news date="$Date: 2008-03-09 15:00:00 $">
- <i2p.release version="0.6.1.31" date="2008/02/10" minVersion="0.6"
+ <i2p.release version="0.6.1.32" date="2008/03/09" minVersion="0.6"
               anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
               publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
               anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 

installer/install.xml

@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.6.1.31</appversion>
+        <appversion>0.6.1.32</appversion>
         <authors>
             <author name="I2P" email="http://forum.i2p.net"/>
         </authors>

news.xml

@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2008-02-10 15:00:00 $">
+<i2p.news date="$Date: 2008-03-09 15:00:00 $">
- <i2p.release version="0.6.1.31" date="2008/02/10" minVersion="0.6"
+ <i2p.release version="0.6.1.32" date="2008/03/09" minVersion="0.6"
               anonurl="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/i2p/i2pupdate.sud"
               publicurl="http://dev.i2p.net/i2p/i2pupdate.sud"
               anonannouncement="http://i2p/NF2RLVUxVulR3IqK0sGJR0dHQcGXAzwa6rEO4WAWYXOHw-DoZhKnlbf1nzHXwMEJoex5nFTyiNMqxJMWlY54cvU~UenZdkyQQeUSBZXyuSweflUXFqKN-y8xIoK2w9Ylq1k8IcrAFDsITyOzjUKoOPfVq34rKNDo7fYyis4kT5bAHy~2N1EVMs34pi2RFabATIOBk38Qhab57Umpa6yEoE~rbyR~suDRvD7gjBvBiIKFqhFueXsR2uSrPB-yzwAGofTXuklofK3DdKspciclTVzqbDjsk5UXfu2nTrC1agkhLyqlOfjhyqC~t1IXm-Vs2o7911k7KKLGjB4lmH508YJ7G9fLAUyjuB-wwwhejoWqvg7oWvqo4oIok8LG6ECR71C3dzCvIjY2QcrhoaazA9G4zcGMm6NKND-H4XY6tUWhpB~5GefB3YczOqMbHq4wi0O9MzBFrOJEOs3X4hwboKWANf7DT5PZKJZ5KorQPsYRSq0E3wSOsFCSsdVCKUGsAAAA/pipermail/i2p/2005-September/000878.html" 
@@ -9,6 +9,19 @@
             publicurl="http://dev.i2p.net/pipermail/i2p/2005-July/000826.html"
             anonlogs="http://i2p/Nf3ab-ZFkmI-LyMt7GjgT-jfvZ3zKDl0L96pmGQXF1B82W2Bfjf0n7~288vafocjFLnQnVcmZd~-p0-Oolfo9aW2Rm-AhyqxnxyLlPBqGxsJBXjPhm1JBT4Ia8FB-VXt0BuY0fMKdAfWwN61-tj4zIcQWRxv3DFquwEf035K~Ra4SWOqiuJgTRJu7~o~DzHVljVgWIzwf8Z84cz0X33pv-mdG~~y0Bsc2qJVnYwjjR178YMcRSmNE0FVMcs6f17c6zqhMw-11qjKpY~EJfHYCx4lBWF37CD0obbWqTNUIbL~78vxqZRT3dgAgnLixog9nqTO-0Rh~NpVUZnoUi7fNR~awW5U3Cf7rU7nNEKKobLue78hjvRcWn7upHUF45QqTDuaM3yZa7OsjbcH-I909DOub2Q0Dno6vIwuA7yrysccN1sbnkwZbKlf4T6~iDdhaSLJd97QCyPOlbyUfYy9QLNExlRqKgNVJcMJRrIual~Lb1CLbnzt0uvobM57UpqSAAAA/meeting141"
             publiclogs="http://www.i2p.net/meeting141" />
+<p>
+&#149;
+2008-03-09: <b>0.6.1.32 Released</b>
+</p><p>
+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
+<a href="config.jsp">config.jsp</a>.
+</p>
+
 <p>
 &#149;
 2008-02-29: <b>Upcoming 0.6.1.32 Release</b>
@@ -25,24 +38,9 @@ If you already have three Update URLs, you do not have to do anything.
 
 <p>
 &#149;
-2008-02-10: <b>0.6.1.31 released</b>
+2008-02-05: <b>Upgrading from 0.6.1.30 and Earlier Releases</b>
 </p><p>
-The transitional 0.6.1.31 release will make the I2P
+Since i2p's lead developer
-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.
-</p><p>
-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.
-</p>
-
-<p>
-&#149;
-2008-02-05: <b>Upcoming 0.6.1.31 Release</b>
-</p><p>
-And, since i2p's lead developer
 <a href="http://dreamtheaterfan.i2p/jrandom-awol.html">has gone AWOL</a>,
 we do not have his update signing key or write access to
 <a href="http://www.i2p/">www.i2p</a> 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.
 </p><p>
 Make the following configuration changes and your router will automatically install
-the upcoming 0.6.1.31 release when it becomes available.
+the latest release.
-The release will include SAM v2, new jump server links, and addressbook, IRC proxy, and i2psnark improvements.
 </p><p>
 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
+you may manually download the i2pupdate.zip file from
-be announced.
+<a href="http://www.i2p2.i2p/download.html">www.i2p2.i2p/download</a>.
 <ol><li>
 On
 <a href="configupdate.jsp">configupdate.jsp</a>:
@@ -84,18 +81,13 @@ Add the following line:
 Click "Apply"
 </li></ol>
 <li>
-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.
 </li></li></ol>
 </p><p>
 If you would like to verify the trusted update keys, they are also
 <a href="http://stats.i2p/i2p/signingkeys.html">posted and signed here</a>.
-</p><p>
-The new release will be announced here, on
-<a href="http://forum.i2p/">the forums</a>, on IRC, and on Syndie.
-New users may install 0.6.1.31 from the
-<a href="http://www.i2p2.de/download">www.i2p2.de download page</a>.
 Thank you for your support during this transition. For help please contact us on #i2p.
 </p><p>
 Amiga, Complication, welterde, zzz

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 String VERSION = "0.6.1.32";
-    public final static long BUILD = 3204;
+    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);