Pluck of 48ac112fe938c8e960413ad60f64d313a1e5c9ac and e415e24aca895c5a1f88380b1a3946e3b49749a9

* Add new *.i2p2.de certificate
* Added backup's ressed server. (Thanks backup!)
* Temporary removing h2ik's server since he's been AWOL since 06-03-2013 and he's reseed server is down.


applied changes from 185bc62d33224812060d2f68266a029935fb710d
             through 48ac112fe938c8e960413ad60f64d313a1e5c9ac

applied changes from 1194eb12084302380b4315b20e5ae0c574ce1be3
             through e415e24aca895c5a1f88380b1a3946e3b49749a9

installer/install.xml

@@ -145,26 +145,28 @@
             <!-- postinstall stuff for windows -->
             <!-- Wrapper for 32bit Windows JVM -->
             <executable targetfile="$INSTALL_PATH/utility.jar"
-                type="jar" class="net.i2p.installer.Copy"
+                type="jar"
                 stage="postinstall"
                 keep="true"
                 failure="warn"
                 condition="!is64bit">
                 <os family="windows" />
                 <args>
+                    <arg value="copy" />
                     <arg value="$INSTALL_PATH\lib\wrapper\win32\I2Psvc.exe" />
                     <arg value="$INSTALL_PATH" />
                 </args>
             </executable>
 
             <executable targetfile="$INSTALL_PATH/utility.jar"
-                type="jar" class="net.i2p.installer.Copy"
+                type="jar"
                 stage="postinstall"
                 keep="true"
                 failure="warn"
                 condition="!is64bit">
                 <os family="windows" />
                 <args>
+                    <arg value="copy" />
                     <arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" />
                     <arg value="$INSTALL_PATH\lib" />
                 </args>
@@ -172,26 +174,28 @@
 
             <!-- wrapper for 64bit Windows JVM -->
             <executable targetfile="$INSTALL_PATH/utility.jar"
-                type="jar" class="net.i2p.installer.Copy"
+                type="jar"
                 stage="postinstall"
                 keep="true"
                 failure="warn"
                 condition="is64bit">
                 <os family="windows" />
                 <args>
+                    <arg value="copy" />
                     <arg value="$INSTALL_PATH\lib\wrapper\win64\I2Psvc.exe" />
                     <arg value="$INSTALL_PATH" />
                 </args>
             </executable>
 
             <executable targetfile="$INSTALL_PATH/utility.jar"
-                type="jar" class="net.i2p.installer.Copy"
+                type="jar"
                 stage="postinstall"
                 keep="true"
                 failure="warn"
                 condition="is64bit">
                 <os family="windows" />
                 <args>
+                    <arg value="copy" />
                     <arg value="$INSTALL_PATH\lib\wrapper\win64\wrapper.dll" />
                     <arg value="$INSTALL_PATH\lib" />
                 </args>
@@ -203,13 +207,14 @@
              nothing breaks.
             -->
              <executable targetfile="$INSTALL_PATH/utility.jar"
-                 type="jar" class="net.i2p.installer.Copy"
+                 type="jar"
                  stage="postinstall"
                  keep="true"
                  failure="warn"
                  condition="is64bit">
                  <os family="windows" />
                  <args>
+                     <arg value="copy" />
                      <arg value="$INSTALL_PATH\lib\wrapper\win32\wrapper.dll" />
                      <arg value="$INSTALL_PATH\lib\wrapper-windows-x86-32.dll" />
                  </args>
@@ -217,20 +222,22 @@
 
              <!-- workaround for bad default path for wrapper.log in Windows. -->
              <executable targetfile="$INSTALL_PATH/utility.jar"
-                 type="jar" class="net.i2p.installer.FixWinPaths"
+                 type="jar"
                  stage="postinstall" keep="true">
                  <os family="windows" />
                  <args>
+                     <arg value="fixwinpaths" />
                      <arg value="$INSTALL_PATH\wrapper.config" />
                  </args>
              </executable>
 
              <!-- Now we'll get rid of the UNIX-only stuff -->
              <executable targetfile="$INSTALL_PATH/utility.jar"
-                 type="jar" class="net.i2p.installer.Delete"
+                 type="jar"
                  stage="postinstall" keep="true" failure="warn">
                  <os family="windows" />
                  <args>
+                     <arg value="delete" />
                      <arg value="$INSTALL_PATH\i2prouter" />
                      <arg value="$INSTALL_PATH\install_i2p_service_unix" />
                      <arg value="$INSTALL_PATH\install-headless.txt" />
@@ -254,26 +261,30 @@
 
             <!-- workaround for vista permission problems - see comments above -->
             <executable targetfile="$INSTALL_PATH/fixperms.bat" type="bin" stage="postinstall" keep="true" failure="warn"
-                condition="izpack.windowsinstall.vista|izpack.windowsinstall.7" >
+                condition="!izpack.windowsinstall.xp+!izpack.windowsinstall.2003" >
+                <os family="windows" />
                 <args>
                     <arg value="$INSTALL_PATH" />
                 </args>
             </executable>
             <!-- else delete it -->
             <executable targetfile="$INSTALL_PATH/utility.jar"
-                type="jar" class="net.i2p.installer.Delete"
+                type="jar"
                 stage="postinstall" keep="true" failure="warn" condition="izpack.windowsinstall.xp|izpack.windowsinstall.2003">
+                <os family="windows" />
                 <args>
+                    <arg value="delete" />
                     <arg value="$INSTALL_PATH\fixperms.bat" />
                 </args>
             </executable>
 
             <!--
             <executable targetfile="$INSTALL_PATH/utility.jar"
-                type="jar" class="net.i2p.installer.Exec"
+                type="jar"
                 stage="postinstall" keep="true" failure="warn">
                 <os family="windows" />
                     <args>
+                        <arg value="exec" />
                         <arg value="$INSTALL_PATH" />
                         <arg value="$INSTALL_PATH\I2Psvc.exe" />
                         <arg value="-c" />
@@ -291,10 +302,11 @@
                   This, however, works fine.
              -->
              <executable targetfile="$INSTALL_PATH/utility.jar"
-                 type="jar" class="net.i2p.installer.Delete"
+                 type="jar"
                  stage="postinstall" keep="false" failure="warn">
                  <os family="windows" />
                  <args>
+                     <arg value="delete" />
                      <arg value="$INSTALL_PATH/utility.jar" />
                  </args>
              </executable>

installer/java/build.xml

@@ -49,6 +49,7 @@
             <fileset dir="../../core/java/build/obj" includes="**/FileUtil.class"/>
             <fileset dir="./build/obj" includes="**" />
             <manifest>
+                <attribute name="Main-Class" value="net.i2p.installer.Main" />
                 <attribute name="Built-By" value="${build.built-by}" />
                 <attribute name="Build-Date" value="${build.timestamp}" />
                 <attribute name="Base-Revision" value="${workspace.version}" />

installer/java/src/net/i2p/installer/Main.java

@@ -0,0 +1,36 @@
+package net.i2p.installer;
+
+/**
+ * <p>
+ * Execute one of the other classes in this package.
+ * Workaround for izpack bug #162 / our bug #912
+ * http://jira.codehaus.org/browse/IZPACK-162
+ * http://trac.i2p2.i2p/ticket/912
+ * </p>
+ * Usage: <code>copy|delete|exec|fixwinpaths args...</code><br>
+ *
+ * @since 0.9.6
+ */
+public class Main {
+
+    private static final String USAGE = "Usage: {copy|delete|exec|fixwinpaths} [args...]";
+
+    public static void main(String args[]) {
+        if (args.length == 0)
+            throw new IllegalArgumentException(USAGE);
+        String cmd = args[0];
+        String[] shift = new String[args.length - 1];
+        if (shift.length > 0)
+            System.arraycopy(args, 1, shift, 0, shift.length);
+        if (cmd.equals("copy"))
+            Copy.main(shift);
+        else if (cmd.equals("delete"))
+            Delete.main(shift);
+        else if (cmd.equals("exec"))
+            Exec.main(shift);
+        else if (cmd.equals("fixwinpaths"))
+            FixWinPaths.main(shift);
+        else
+            throw new IllegalArgumentException(USAGE);
+    }
+}

installer/resources/certificates/ieb9oopo.mooo.com.crt

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFITCCBAmgAwIBAgIJALPc1htlOiBTMA0GCSqGSIb3DQEBBQUAMIG7MQswCQYD
+VQQGEwJERTEaMBgGA1UECBMRaWViOW9vcG8ubW9vby5jb20xGjAYBgNVBAcTEWll
+Yjlvb3BvLm1vb28uY29tMRowGAYDVQQKExFpZWI5b29wby5tb29vLmNvbTEaMBgG
+A1UECxMRaWViOW9vcG8ubW9vby5jb20xGjAYBgNVBAMTEWllYjlvb3BvLm1vb28u
+Y29tMSAwHgYJKoZIhvcNAQkBFhFpZWI5b29wby5tb29vLmNvbTAeFw0xMjExMDQx
+ODMyMzVaFw0zMjEwMzAxODMyMzVaMIG7MQswCQYDVQQGEwJERTEaMBgGA1UECBMR
+aWViOW9vcG8ubW9vby5jb20xGjAYBgNVBAcTEWllYjlvb3BvLm1vb28uY29tMRow
+GAYDVQQKExFpZWI5b29wby5tb29vLmNvbTEaMBgGA1UECxMRaWViOW9vcG8ubW9v
+by5jb20xGjAYBgNVBAMTEWllYjlvb3BvLm1vb28uY29tMSAwHgYJKoZIhvcNAQkB
+FhFpZWI5b29wby5tb29vLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBALsBO5be1l19fiNVg0yiZYglHCi9/dodQ4nT9X8N+1+HFuFo5DRY8uprsuNd
+wSCTBU6NC3MRJ/iXgGyFhNuMH3F7xWBxSUtlidpK3CloKcO4VsZzRF6i6qLtSpWk
+X7nA3A6WjjirwhFFwIRfi/LruKjCvZcSu1P6xYUbmV7PF7w2CWxr8TvR/RDGaR+c
+mcHv0clmzl19IRAXpjfI10k3SxNHjPpoBrk72gW522oyqMF4pAUFC2RvCgOT6voM
+rxgJUpTLBWgg+KebvlMp/iXlMECMfit2bV7rEKR7g9qa2U7fyNT9XBc4vSmkNl5s
+P4xiKeVXsvB6REDXN636sftwaKMCAwEAAaOCASQwggEgMB0GA1UdDgQWBBRZe7PX
+oFzrR2lNdr2NVuOf+RFawDCB8AYDVR0jBIHoMIHlgBRZe7PXoFzrR2lNdr2NVuOf
++RFawKGBwaSBvjCBuzELMAkGA1UEBhMCREUxGjAYBgNVBAgTEWllYjlvb3BvLm1v
+b28uY29tMRowGAYDVQQHExFpZWI5b29wby5tb29vLmNvbTEaMBgGA1UEChMRaWVi
+OW9vcG8ubW9vby5jb20xGjAYBgNVBAsTEWllYjlvb3BvLm1vb28uY29tMRowGAYD
+VQQDExFpZWI5b29wby5tb29vLmNvbTEgMB4GCSqGSIb3DQEJARYRaWViOW9vcG8u
+bW9vby5jb22CCQCz3NYbZTogUzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUA
+A4IBAQCWjZH6nsnY2cpS3BOapCIx8hhyV6u+ujen9yXLuQNArN6FzqAiESk0bjkH
+v6hFJ/JLiVglrvZDQUJP4whnXWXNETm+/WIjkzfnKPHv+L8KkRtI65ZSMNU+ghwA
+fxZmu6ENIGZbXxvwSQX3uzXTgBgKsRX6QtXjtp84pOmIP+ypmaxRp764jTSYZtm2
+l4A7SZWxgVELUhOSsRqxZwfXL9DnXJ9PX5wQ8MjBQBWwk0QykT3YKZpLm/aXX4Zm
+4C/NGZAanSphJXhY5jxWXSqxSAqNVzbbKNanCMpOu75KCcZ+kL+Sp5EZEnNsiQFl
+PEJPqmwRc3NwLefhcsKmXCJgrHpj
+-----END CERTIFICATE-----

installer/resources/certificates/netdb.i2p2.de.crt

@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE5zCCA8+gAwIBAgIQfVFBXr4UwHJKSAhsc3ZrozANBgkqhkiG9w0BAQUFADBw
+MQswCQYDVQQGEwJHQjEbMBkGA1UECBMSR3JlYXRlciBNYW5jaGVzdGVyMRAwDgYD
+VQQHEwdTYWxmb3JkMRowGAYDVQQKExFDT01PRE8gQ0EgTGltaXRlZDEWMBQGA1UE
+AxMNQ09NT0RPIFNTTCBDQTAeFw0xMzA0MTYwMDAwMDBaFw0xODA0MTUyMzU5NTla
+MFUxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UECxMT
+Q09NT0RPIFNTTCBXaWxkY2FyZDESMBAGA1UEAxQJKi5pMnAyLmRlMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA87UdXGI3YviPk9mP/jbUJ02QSS9TmkyO
+8i9R9Q7tcEQg7BGE/RLOCt/VXJ8o5w5RllwkQD26+aGtSLOXmUtS5vNyLXPZ6oAk
+Ldiwt4p6ylwK96cOI8kk+LTKcDptWpS4oSyY5SdfW2avglhPX3eNdLy660jtGhuO
+7DwZ9JPO+MeEokj9NaifxXbI50KzGeaWpqPnB8mop2bFV3jjJJAq2yI79kRCT5pn
++7cYpOCG9vIyaGYZhN78ITGGU7n+oqWdqw+M0dJqMxMn+Uyy5OpkTm+8YVZYEc93
+/X3tfyU25J/1AZZMkgMggeDcn0HlUnyHqhMpI3kE+wGaDuR+lHMncwIDAQABo4IB
+ljCCAZIwHwYDVR0jBBgwFoAUG2u9H4pJGJRUN1W0IBftN7l3GH0wHQYDVR0OBBYE
+FEubJXM4dpbJLU/Y8W7zT07wRr6HMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
+AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjBPBgNVHSAESDBGMDoG
+CysGAQQBsjEBAgIHMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9k
+by5jb20vQ1BTMAgGBmeBDAECATA4BgNVHR8EMTAvMC2gK6AphidodHRwOi8vY3Js
+LmNvbW9kb2NhLmNvbS9DT01PRE9TU0xDQS5jcmwwaQYIKwYBBQUHAQEEXTBbMDMG
+CCsGAQUFBzAChidodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9DT01PRE9TU0xDQS5j
+cnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTAdBgNVHREE
+FjAUggkqLmkycDIuZGWCB2kycDIuZGUwDQYJKoZIhvcNAQEFBQADggEBAADqXO9c
+2u5/OlJiWil85tqPkHxF0EaV/upt5mNmvJHGPSS9XvLiKtPGIOtdKuf7gLxGVdS1
+SlbTvpU0iKi1nxT9ZssayudhjBsM2a7P67vOc81P1C5+RM9cBQkLnsqbxBZg0eM8
+Cwh2w8hClSZvWxw3F+6jcyCp34HcHixcRiKNrZqWVKdL3ykv/cw6OoiQlK5Oy77t
+4anEh7QkAWDfdMfTujBtjnIGTIYDVj1hZGbHcogrSRL5tPVr/tpvmJhwQprHiL8J
+a16zGB78hVHjIyTtBJoOBBOHGCJVBxyHRipJD0kpkjXzh26cAOqI6+f/2hMiBwAy
+qnh3TiGbcv2f0I4=
+-----END CERTIFICATE-----

router/java/src/net/i2p/router/RouterVersion.java

@@ -21,7 +21,7 @@ public class RouterVersion {
     public final static long BUILD = 0;
 
     /** for example "-test" */
-    public final static String EXTRA = "";
+    public final static String EXTRA = "-win1";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + FULL_VERSION);

router/java/src/net/i2p/router/networkdb/reseed/Reseeder.java

@@ -69,7 +69,9 @@ public class Reseeder {
               "http://193.150.121.66/netDb/" + "," +
               "http://netdb.i2p2.no/" + "," +
               "http://reseed.info/"  + "," +
-              "http://i2p.feared.eu/";
+              "http://ieb9oopo.mooo.com";
+              // Temp disabled since h2ik have been AWOL since 06-03-2013
+              //"http://i2p.feared.eu/";
 
     /** @since 0.8.2 */
     public static final String DEFAULT_SSL_SEED_URL =
@@ -81,7 +83,9 @@ public class Reseeder {
               "https://193.150.121.66/netDb/" + "," +
               "https://netdb.i2p2.no/" + "," +
               "https://reseed.info/"  + "," +
-              "https://i2p.feared.eu/";
+              "https://ieb9oopo.mooo.com";
+              // Temp disabled since h2ik have been AWOL since 06-03-2013
+              //"https://i2p.feared.eu/";
 
     public static final String PROP_PROXY_HOST = "router.reseedProxyHost";
     public static final String PROP_PROXY_PORT = "router.reseedProxyPort";

router/java/src/net/i2p/router/startup/WorkingDir.java

@@ -294,6 +294,9 @@ public class WorkingDir {
             String s = null;
             boolean isDaemon = DAEMON_USER.equals(System.getProperty("user.name"));
             while ((s = DataHelper.readLine(in)) != null) {
+                // readLine() doesn't strip \r
+                if (s.endsWith("\r"))
+                    s = s.substring(0, s.length() - 1);
                 if (s.endsWith("=\"eepsite/jetty.xml\"")) {
                     s = s.replace("=\"eepsite/jetty.xml\"", "=\"" + todir.getAbsolutePath() +
                                                             File.separatorChar + "eepsite" +
@@ -333,6 +336,9 @@ public class WorkingDir {
             out = new PrintWriter(new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(newFile), "UTF-8")));
             String s = null;
             while ((s = DataHelper.readLine(in)) != null) {
+                // readLine() doesn't strip \r
+                if (s.endsWith("\r"))
+                    s = s.substring(0, s.length() - 1);
                 if (s.indexOf(oldString) >= 0) {
                     s = s.replace(oldString, newString);
                 }