From 7efab75c3cf6399fbbea672a887976869d33ce26 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Thu, 21 Jan 2010 19:44:49 +0000
Subject: [PATCH] 0.7.10

---
 build.xml                                     | 40 +++++++++++--------
 core/java/src/net/i2p/CoreVersion.java        |  2 +-
 core/java/src/net/i2p/util/LogWriter.java     |  2 +-
 history.txt                                   |  2 +
 installer/install.xml                         |  2 +-
 installer/resources/initialNews.xml           |  4 +-
 installer/resources/news.xml                  | 25 +++++-------
 .../src/net/i2p/router/RouterVersion.java     |  4 +-
 8 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/build.xml b/build.xml
index e90b578ce..29eb93d90 100644
--- a/build.xml
+++ b/build.xml
@@ -649,7 +649,7 @@
     <target name="release" depends="pkg">
         <echo message="================================================================" />
         <echo message="Did you update these files?" />
-        <exec executable="ls">
+        <exec executable="ls" failonerror="true">
             <arg value="-l" />
             <arg value="history.txt" />
             <arg value="installer/resources/initialNews.xml" />
@@ -659,15 +659,19 @@
 	    <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
         </exec>
         <echo message="Everything is checked in, right? Let's be sure:" />
-        <exec executable="mtn">
+        <exec executable="mtn" failonerror="true">
             <arg value="st" />
         </exec>
-        <input message="Enter new version number:" addproperty="release.number" />
-        <fail message="You must enter a version number." >
-            <condition>
-                <equals arg1="${release.number}" arg2=""/>
-            </condition>
-        </fail>
+        <echo message="If there are any modified files above, stop now!" />
+        <!-- get release version number -->
+        <exec executable="grep" outputproperty="versionLine" failonerror="true" >
+            <arg value="public final static String VERSION" />
+	    <arg value="core/java/src/net/i2p/CoreVersion.java" />
+        </exec>
+        <exec executable="cut" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" >
+            <arg value="-f2" />
+	    <arg value="-d&quot;" />
+        </exec>
         <echo message="New version number is ${release.number}" />
         <copy file="i2pupdate.zip" tofile="i2pupdate_${release.number}.zip" />
         <copy file="i2pinstall.exe" tofile="i2pinstall_${release.number}.exe" />
@@ -712,13 +716,16 @@
         <!-- will this use the monotonerc file in the current workspace? -->
         <echo message="Checking out fresh copy into ../i2p-${release-number} for tarballing:" />
         <delete dir="../i2p-${release.number}" />
-        <exec executable="mtn">
+        <exec executable="mtn" failonerror="true">
             <arg value="co" />
             <arg value="-b" />
             <arg value="i2p.i2p" />
+            <!-- w: is the revision of the current workspace -->
+            <arg value="-r" />
+            <arg value="w:" />
             <arg value="../i2p-${release.number}/" />
         </exec>
-        <exec executable="tar">
+        <exec executable="tar" failonerror="true">
             <arg value="cjf" />
             <arg value="i2psource_${release.number}.tar.bz2" />
             <arg value="-C" />
@@ -731,20 +738,20 @@
         <delete file="i2pinstall_${release.number}.exe.sig" />
         <delete file="i2psource_${release.number}.tar.bz2.sig" />
         <delete file="i2pupdate_${release.number}.zip.sig" />
-        <exec executable="gpg">
+        <exec executable="gpg" failonerror="true">
             <arg value="-b" />
             <arg value="i2pinstall_${release.number}.exe" />
         </exec>
-        <exec executable="gpg">
+        <exec executable="gpg" failonerror="true">
             <arg value="-b" />
             <arg value="i2psource_${release.number}.tar.bz2" />
         </exec>
-        <exec executable="gpg">
+        <exec executable="gpg" failonerror="true">
             <arg value="-b" />
             <arg value="i2pupdate_${release.number}.zip" />
         </exec>
         <echo message="File sizes:" />
-        <exec executable="ls">
+        <exec executable="ls" failonerror="true">
             <arg value="-l" />
             <arg value="i2pinstall_${release.number}.exe" />
             <arg value="i2psource_${release.number}.tar.bz2" />
@@ -755,12 +762,13 @@
             <arg value="i2pupdate_${release.number}.zip.sig" />
         </exec>
         <echo message="SHA256 sums:" />
-        <exec executable="sha256sum">
+        <exec executable="sha256sum" failonerror="true">
             <arg value="i2pinstall_${release.number}.exe" />
             <arg value="i2psource_${release.number}.tar.bz2" />
             <arg value="i2pupdate_${release.number}.zip" />
             <arg value="i2pupdate.sud" />
         </exec>
-        <echo message="Don't forget to mtn tag h: i2p-${release-number}" />
+        <echo message="Don't forget to mtn tag h: i2p-${release.number}" />
+        <echo message="... and mtn cert t:i2p-${release.number} branch i2p.i2p.release" />
     </target>
 </project>
diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java
index 2c9da4e47..c569b119f 100644
--- a/core/java/src/net/i2p/CoreVersion.java
+++ b/core/java/src/net/i2p/CoreVersion.java
@@ -16,7 +16,7 @@ package net.i2p;
 public class CoreVersion {
     /** deprecated */
     public final static String ID = "Monotone";
-    public final static String VERSION = "0.7.9";
+    public final static String VERSION = "0.7.10";
 
     public static void main(String args[]) {
         System.out.println("I2P Core version: " + VERSION);
diff --git a/core/java/src/net/i2p/util/LogWriter.java b/core/java/src/net/i2p/util/LogWriter.java
index 0a62ba07a..2135eefe1 100644
--- a/core/java/src/net/i2p/util/LogWriter.java
+++ b/core/java/src/net/i2p/util/LogWriter.java
@@ -164,7 +164,7 @@ class LogWriter implements Runnable {
                 }
             }
             if (!parent.isDirectory()) {
-                System.err.println("wtf, we cannot put the logs in a subdirectory of a plain file!  we want to stre the log as " + f.getAbsolutePath());
+                System.err.println("Cannot put the logs in a subdirectory of a plain file: " + f.getAbsolutePath());
                 //System.exit(0);
             }
         }
diff --git a/history.txt b/history.txt
index 92ed0aaa5..37b883863 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,5 @@
+* 2010-01-22  0.7.10 released
+
 2010-01-21 zzz
     * eepget.bat: Add to pkg
     * Floodfills: Increase max to 15 (was 9) and min to 10 (was 4)
diff --git a/installer/install.xml b/installer/install.xml
index 639ad3df9..cf330e4f8 100644
--- a/installer/install.xml
+++ b/installer/install.xml
@@ -4,7 +4,7 @@
 
     <info>
         <appname>i2p</appname>
-        <appversion>0.7.9</appversion>
+        <appversion>0.7.10</appversion>
         <authors>
             <author name="I2P" email="http://forum.i2p2.de/"/>
         </authors>
diff --git a/installer/resources/initialNews.xml b/installer/resources/initialNews.xml
index a23654b94..8e33ec57d 100644
--- a/installer/resources/initialNews.xml
+++ b/installer/resources/initialNews.xml
@@ -1,5 +1,5 @@
-<i2p.news date="$Date: 2010-01-12 00:00:00 $">
-<i2p.release version="0.7.9" date="2010/01/12" minVersion="0.6"/>
+<i2p.news date="$Date: 2010-01-22 00:00:00 $">
+<i2p.release version="0.7.10" date="2010/01/22" minVersion="0.6"/>
 <h4><ul><li>Congratulations on getting I2P installed!</li></ul></h4>
 <p>
 <b>Welcome to I2P!</b>
diff --git a/installer/resources/news.xml b/installer/resources/news.xml
index fc0aa4267..cd8e9ecb8 100644
--- a/installer/resources/news.xml
+++ b/installer/resources/news.xml
@@ -1,25 +1,20 @@
-<i2p.news date="$Date: 2010-01-12 00:00:00 $">
-<i2p.release version="0.7.9" date="2010/01/12" minVersion="0.6" />
-<h4><ul><li>2010-01-12: <b>0.7.9 <a href="http://www.i2p2.i2p/release-0.7.9.html">Released</a></b></li></ul></h4>
+<i2p.news date="$Date: 2010-01-22 00:00:00 $">
+<i2p.release version="0.7.10" date="2010/01/22" minVersion="0.6" />
+<h4><ul><li>2010-01-22: <b>0.7.10 <a href="http://www.i2p2.i2p/release-0.7.10.html">Released</a></b></li></ul></h4>
 <p>
-0.7.9 fixes several longstanding bugs causing message corruption.
-We are hopeful that network performance will improve once it is widely deployed.
-There are other changes that should help router reachability and tunnel build success rates.
-The release also includes additional translation support, and a full Russian translation by "forget"
-which was sponsored by "russiansponsor".
+0.7.10 closes some recently-discovered vulnerabilities related to the
+way routers communicate with floodfill peers.
+Network database stores and verifies are moved from exploratory to client tunnels, and are encrypted.
 </p><p>
-There are more changes to reduce memory and CPU usage,
-and other bug fixes.
+Also, to improve anonymity, router's fast peer set is now limited to a maximum of 30.
+The release also fixes a bug causing Windows installs to fail when the install or user path
+contained a "\r" or "\n".
 Upgrading is recommended.
-As a reminder to those still using port 8887,
-please help those who are vulnerable to blocking by changing UDP to a random port on
-<a href="config.jsp">the network configuration page</a>
-and adjusting your firewall if necessary.
 Please give the
 developers feedback on <a href="irc://127.0.0.1:6668/i2p">IRC #i2p</a> or <a href="http://forum.i2p">forum.i2p</a>
 and <a href="http://www.i2p2.i2p/getinvolved.html">get involved</a>
 or <a href="http://www.i2p2.i2p/donate.html">donate</a>!
 We are still looking for help on new and existing translations.
-Please volunteer on IRC #i2p.
+Please volunteer on <a href="irc://127.0.0.1:6668/i2p">IRC #i2p</a>.
 </p>
 </i2p.news>
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a3eccadc4..200f91ede 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,10 +18,10 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 6;
+    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);