merge of '3b23dcff9410a7f2e8443cdaa410ead6d9694f29'

and 'fd87a1b95a60a0e5c18d75aed057344e8ce5aa87'

Slackware/i2p/doinst.sh

@@ -49,16 +49,21 @@ echo
 echo "FINISHING I2P INSTALLATION. PLEASE WAIT."
 
 cd $INST_DIR
-sh postinstall.sh || (
-  echo "ERROR: failed execution of postinstall.sh. Please"
-  echo "cd into i2p installation directory and run "
-  echo "postinstall.sh manually with ./postinstall.sh"
-  exit 1
-)
 
-sleep 10
 
-sh i2prouter stop || exit 1
+
+OS_ARCH=`uname -m`
+X86_64=`echo "$OS_ARCH" | grep x86_64`
+if [ "X$X86_64" = "X" ]; then
+        wrapperpath="./lib/wrapper/linux"
+else
+        wrapperpath="./lib/wrapper/linux64"
+fi
+cp $wrapperpath/libwrapper.so ./lib/
+cp $wrapperpath/wrapper.jar ./lib/
+cp $wrapperpath/i2psvc .
+rm -rf ./lib/wrapper
+chmod 744 ./i2psvc
 
 echo
 echo "Installation finished."

Slackware/i2p/i2p.SlackBuild

@@ -18,7 +18,7 @@
 BUILD=1sim
 
 # put here installation dir, without first and last /
-# es: usr/local
+# eg: usr/local
 INSTALL_DIR=opt
 NAME=i2p
 ARCH=noarch
@@ -64,7 +64,7 @@ mkdir -p $PKG
 cd $CWD/../../
 
 ant distclean
-ant dist
+#ant dist
 ant tarball
 
 tar xjvf i2p.tar.bz2 -C $TMP
@@ -76,6 +76,34 @@ mkdir -p $PKG/$INSTALL_DIR/
 cp -a ../i2p $PKG/$INSTALL_DIR/
 
 mkdir -p $PKG/install
+
+#############################################################################
+# Preconfigureation to make package smaller
+#############################################################################
+cd $PKG/$INSTALL_DIR/i2p
+
+# wrapper.config $INSTALL_PATH and $SYSTEM_java_io_tmpdir
+sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" wrapper.config > a
+sed "s|\$SYSTEM_java_io_tmpdir|/var/tmp|g" a > wrapper.config
+# eepget %INSTALL_PATH
+sed "s|\$INSTALL_PATH|$INSTALL_DIR/i2p|g" eepget > a
+rm eepget
+mv a eepget
+# runplain.sh %INSTALL_PATH and %SYSTEM_java_io_tmpdir
+sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" runplain.sh > a
+sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > runplain.sh
+# i2prouter %INSTALL_PATH and %SYSTEM_java_io_tmpdir
+sed "s|%INSTALL_PATH|$INSTALL_DIR/i2p|g" i2prouter > a
+sed "s|%SYSTEM_java_io_tmpdir|/var/tmp|g" a > i2prouter
+
+chmod 744 ./i2prouter
+chmod 744 ./osid
+chmod 744 ./runplain.sh
+chmod 744 ./eepget
+chmod 744 ./scripts/i2pbench.sh
+chmod 744 ./scripts/i2ptest.sh
+rm -Rf ./lib/*.dll ./*.bat ./*.exe ./installer ./icons ./a postinstall.sh
+
 mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install
 mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new
 mv $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml.new
@@ -83,6 +111,7 @@ mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsit
 mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new
 sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
+
 cd $PKG
 requiredbuilder -v -y -s $CWD $PKG
 makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.tgz

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

@@ -84,6 +84,7 @@ public class IndexBean {
     static final String CLIENT_NICKNAME = "shared clients";
     
     public static final String PROP_THEME_NAME = "routerconsole.theme";
+    public static final String DEFAULT_THEME = "light";
     public static final String PROP_CSS_DISABLED = "routerconsole.css.disabled";
     public static final String PROP_JS_DISABLED = "routerconsole.javascript.disabled";
     
@@ -319,11 +320,8 @@ public class IndexBean {
     ////
     
     public String getTheme() {
-    	String theme = _context.getProperty(PROP_THEME_NAME);
-    	if (theme != null)
+    	String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME);
 	return "/themes/console/" + theme + "/";
-    	else
-    		return "/themes/console/";
     }
 
     public boolean allowCSS() {

apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java

@@ -8,6 +8,7 @@ public class CSSHelper extends HelperBase {
     public CSSHelper() {}
     
     public static final String PROP_THEME_NAME = "routerconsole.theme";
+    public static final String DEFAULT_THEME = "light";
     private static final String BASE = "/themes/console/";
     private static final String FORCE = "classic";
 
@@ -16,8 +17,7 @@ public class CSSHelper extends HelperBase {
         if (userAgent != null && userAgent.contains("MSIE")) {
             url += FORCE + "/";
         } else {
-            String theme = _context.getProperty(PROP_THEME_NAME);
-            if (theme != null)
+            String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME);
             url += theme + "/";
         }
         return url;

apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java

@@ -3,12 +3,11 @@ package net.i2p.router.web;
 public class ConfigUIHelper extends HelperBase {
     public ConfigUIHelper() {}
     
-    public static final String PROP_THEME = "routerconsole.theme";
     private static final String themes[] = {"classic", "dark", "light"};
 
     public String getSettings() {
         StringBuilder buf = new StringBuilder(512);
-        String current = _context.getProperty(PROP_THEME, "default");
+        String current = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);
         for (String theme : themes) {
             buf.append("<input type=\"radio\" name=\"theme\" ");
             if (theme.equals(current))

history.txt

@@ -1,3 +1,13 @@
+2009-07-15 zzz
+    * Console:
+      - Make light the default theme
+      - Convert readme_zh.html from GB2312 to UTF-8
+    * Installer: Don't launch the router from the postinstall.sh script
+      on linux anymore; add a panel to the installer to provide launch instructions.
+
+2009-07-15 sponge
+    * Slackware SlackBuild fixes.
+
 2009-07-14 dr|z3d
     * Increment to 0.7.5-10
     * Tidy up layout of readme.* files.

installer/install.xml

@@ -85,6 +85,7 @@
         <res id="InfoPanel.info" src="installer/resources/readme.license.txt"/>
         <!-- <res id="ProcessPanel.Spec.xml" src="installer/resources/ProcessPanel.Spec.xml"/> -->
 	<res id="shortcutSpec.xml" src="installer/resources/shortcutSpec.xml" />
+	<res id="XInfoPanel.info" src="installer/resources/start-i2p.txt" />
     </resources>
 
     <panels>
@@ -94,6 +95,7 @@
         <panel classname="InstallPanel"/>
         <panel classname="ShortcutPanel"><os family="windows" /></panel>
         <!-- <panel classname="ProcessPanel"><os family="windows" /></panel> -->
+        <panel classname="XInfoPanel" ><os family="unix|mac" /></panel>
         <panel classname="SimpleFinishPanel"/>
     </panels>
 

installer/resources/postinstall.sh

@@ -74,6 +74,7 @@ rm -f ./lib/*.dll
 rm -f ./*.bat
 rm -f ./*.exe
 rm -rf ./installer
-./i2prouter start
+# no, let's not start the router from the install script any more
+# ./i2prouter start
 exit 0
 

installer/resources/start-i2p.txt

@@ -0,0 +1 @@
+To start I2P, run "$INSTALL_PATH/i2prouter start"

readme_zh.html

@@ -1,26 +1,26 @@
 <p align=right><font size="-1"><a href="/index.jsp?lang=en">English</a> | <a href="/index.jsp?lang=de">Deutsch</a> | <a href="/index.jsp?lang=fr">Fran&#231;ais</a> | <a href="/index.jsp?lang=nl">Nederlands</a> | <a href="/index.jsp?lang=sv">Svenska</a></font></p>
-<p><EFBFBD><EFBFBD><EFBFBD><EFBFBD> I2P <EFBFBD>Ѿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>У<EFBFBD>δ<EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>̨<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļ<EFBFBD>ڵ<EFBFBD>(Active)<29><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊ &quot;<EFBFBD>ѹ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͻ<EFBFBD>&quot;(&quot;shared clients&quot;) <EFBFBD>ı<EFBFBD><EFBFBD><EFBFBD>Ŀ<EFBFBD>ꡣ(<28><><EFBFBD><EFBFBD>û<EFBFBD><C3BB>,<2C><><EFBFBD><EFBFBD> <a href="#trouble"><EFBFBD><EFBFBD><EFBFBD>ѽ<EFBFBD><EFBFBD><EFBFBD></a>)<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>:</p>
+<p>如果 I2P 已经运行，未来的几分钟里控制台左侧的活动节点(Active)数量将开始增长，并会出现名为 &quot;已共享客户&quot;(&quot;shared clients&quot;) 的本地目标。(如果没有,请见 <a href="#trouble">疑难解答</a>)。待出现以上消息后，您可以:</p>
 <ul>
- <li><B><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IIP<EFBFBD><EFBFBD>վ &quot;eepsites&quot;</B> -  I2P <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>е<EFBFBD>վ<EFBFBD><EFBFBD> - <20><>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <B>HTTP <EFBFBD><EFBFBD><EFBFBD><EFBFBD></B> Ϊ localhost:4444 Ȼ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IIPվ<EFBFBD><EFBFBD> - <ul>
-         <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> <EFBFBD><EFBFBD> <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>վ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڸ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Щ IIP վ<><D5BE><EFBFBD><EFBFBD><EFBFBD>ߡ<EFBFBD></li>
-         <li><a href="http://forum.i2p/">forum.i2p</a>: <EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ķ<EFBFBD><EFBFBD><EFBFBD>I2P<EFBFBD>ٷ<EFBFBD><EFBFBD><EFBFBD>̳ <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
-         <li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> <EFBFBD><EFBFBD><EFBFBD>侵<EFBFBD><EFBFBD> <a href="http://i2p-projekt.i2p">i2p-projekt.i2p</a>: <EFBFBD><EFBFBD>ȫ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ķ<EFBFBD><EFBFBD><EFBFBD>I2P<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <a href="http://www.i2p2.de/">www.i2p2.de</a></li>
-         <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IIP<EFBFBD><EFBFBD>վ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></li>
-         <li><a href="http://ugha.i2p/">ugha.i2p</a>: UGHA <EFBFBD><EFBFBD>IIPվ<EFBFBD><EFBFBD>, <20>κ<EFBFBD><CEBA>˶<EFBFBD><CBB6><EFBFBD><EFBFBD>Ա༭<D4B1><E0BCAD>WIKI, <20>зḻ<D0B7><E1B8BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD></li>
-         <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: FREENET <EFBFBD><EFBFBD><EFBFBD><EFBFBD></li>
-     </ul> I2P<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>л<EFBFBD><EFBFBD>кܶ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IIP<EFBFBD><EFBFBD>վ(EEPSITE) - <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>վ<EFBFBD><D5BE><EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><D2B5><EFBFBD><EFBFBD>࣬<EFBFBD>ղ<EFBFBD><D5B2><EFBFBD>ϲ<EFBFBD><CFB2><EFBFBD><EFBFBD> IIP <20><>վ<EFBFBD><D5BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˳<EFBFBD>ȥ<EFBFBD><C8A5><EFBFBD><EFBFBD><EFBFBD><EFBFBD></li>
- <li><B><EFBFBD><EFBFBD><EFBFBD><EFBFBD> Web <EFBFBD><EFBFBD>ҳ</B> - Ŀǰ IP2 <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ֻ<EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD> HTTP <20><><EFBFBD>ڴ<EFBFBD><DAB4><EFBFBD>(&quot;outproxy&quot;)<EFBFBD>ҽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>4444<EFBFBD>˿ڵ<EFBFBD>HTTP<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϡ<EFBFBD>- ֻҪ<D6BB><D2AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ĵ<EFBFBD><C4B4><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><D6B8>Ϊǰ<CEAA><C7B0><EFBFBD>ĵ<EFBFBD>ַ(localhost:4444)<29><>Ȼ<EFBFBD><C8BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κ<EFBFBD><CEBA><EFBFBD>ͨ<EFBFBD><CDA8><EFBFBD>Ӽ<EFBFBD><D3BC><EFBFBD> - <20><><EFBFBD><EFBFBD>HTTP<54><50><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> I2P <20><><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><DAB2><EFBFBD><EFBFBD>ݡ<EFBFBD></li>
- <li><B><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></B> - <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <a href="i2psnark/"><EFBFBD>˿<EFBFBD></a> <EFBFBD><EFBFBD><EFBFBD>ṩ <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a> <EFBFBD>ͻ<EFBFBD><EFBFBD>ˡ<EFBFBD></li>
- <li><B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></B> - POSTMAN <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˼<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD>ʼ<EFBFBD><EFBFBD>ͻ<EFBFBD><EFBFBD><EFBFBD> (POP3 / SMTP)<29><><EFBFBD>ʼ<EFBFBD>ϵͳ<CFB5><CDB3><EFBFBD><EFBFBD>ϵͳ<CFB5><CDB3><EFBFBD><EFBFBD><EFBFBD><EFBFBD> I2P <20><><EFBFBD><EFBFBD><EFBFBD>ڲ<EFBFBD><DAB2>շ<EFBFBD>Email Ҳ<><D2B2><EFBFBD><EFBFBD><EFBFBD>շ<EFBFBD><D5B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ⲿ Internet <20><><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˺<EFBFBD><CBBA>뵽 <a href="http://hq.postman.i2p/">hq.postman.i2p</a> <EFBFBD><EFBFBD><EFBFBD>롣<EFBFBD><EFBFBD><EFBFBD>ǽ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>POP3/SMTP<EFBFBD><EFBFBD>Web<EFBFBD>ʼ<EFBFBD><EFBFBD>ͻ<EFBFBD><EFBFBD><EFBFBD> <a href="/susimail/susimail">SUSIMail</a>, <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>I2P<EFBFBD>У<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ϊʹ<EFBFBD><EFBFBD>POSTMAN <20><><EFBFBD>ʼ<EFBFBD><CABC><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></li>
- <li><B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></B> - <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IRC <20>ͻ<EFBFBD><CDBB>˲<EFBFBD><CBB2><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <B>localhost:6668</B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Է<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> IRC <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>㻹<EFBFBD>Ƿ<EFBFBD><C7B7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>֪<EFBFBD><D6AA><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></li>
- <li><B><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></B> - <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <a href="http://syndie.i2p2.de/">Syndie</a></li>
- <li><EFBFBD>Լ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD></li>
+ <li><B>浏览 IIP网站 &quot;eepsites&quot;</B> -  I2P 网络内匿名运行的站点 - 您要首先设置浏览器的 <B>HTTP 代理</B> 为 localhost:4444 然后才能浏览IIP站点 - <ul>
+         <li><a href="http://inproxy.tino.i2p/status.php">inproxy.tino.i2p</a> 和 <a href="http://perv.i2p/stats.cgi">perv.i2p</a>: 这两个站点用于跟踪哪些 IIP 站点在线。</li>
+         <li><a href="http://forum.i2p/">forum.i2p</a>: 安全匿名的访问I2P官方论坛 <a href="http://forum.i2p2.de/">forum.i2p2.de</a></li>
+         <li><a href="http://www.i2p2.i2p/">www.i2p2.i2p</a> 与其镜像 <a href="http://i2p-projekt.i2p">i2p-projekt.i2p</a>: 安全匿名的访问I2P官网 <a href="http://www.i2p2.de/">www.i2p2.de</a></li>
+         <li><a href="http://eepsites.i2p/">eepsites.i2p</a>: 匿名建立的IIP网站搜索引擎</li>
+         <li><a href="http://ugha.i2p/">ugha.i2p</a>: UGHA 的IIP站点, 任何人都可以编辑的WIKI, 有丰富的链接</li>
+         <li><a href="http://fproxy.tino.i2p">fproxy.tino.i2p</a>: FREENET 代理</li>
+     </ul> I2P网络中还有很多其他的IIP网站(EEPSITE) - 访问上面的网站你会找到更多，收藏你喜爱的 IIP 网站，别忘了常去看看！</li>
+ <li><B>浏览 Web 网页</B> - 目前 IP2 网络中只有一个 HTTP 出口代理(&quot;outproxy&quot;)挂接在你主机4444端口的HTTP代理上。- 只要将浏览器的代理设置指向为前面的地址(localhost:4444)，然后访问任何普通链接即可 - 您的HTTP请求将在 I2P 网络内部传递。</li>
+ <li><B>文件交换</B> - 本机的其中一个内置 <a href="i2psnark/">端口</a> 中提供 <a href="http://www.klomp.org/snark/">Snark</a> <a href="http://www.bittorrent.com/">BitTorrent</a> 客户端。</li>
+ <li><B>匿名电邮</B> - POSTMAN 创建了兼容普通邮件客户端 (POP3 / SMTP)的邮件系统，该系统可以在 I2P 网络内部收发Email 也可以收发来自外部 Internet 的邮件！电邮账号请到 <a href="http://hq.postman.i2p/">hq.postman.i2p</a> 申请。我们将用于匿名POP3/SMTP的Web邮件客户端 <a href="/susimail/susimail">SUSIMail</a>, 集成在I2P中，并将其配置为使用POSTMAN 的邮件服务。</li>
+ <li><B>匿名聊天</B> - 打开您的 IRC 客户端并链接至 <B>localhost:6668</B>。这样可以访问两个匿名的 IRC 服务器, 但无论你还是服务器都不知道其他人在哪里。</li>
+ <li><B>匿名博客</B> - 请访问 <a href="http://syndie.i2p2.de/">Syndie</a></li>
+ <li>以及其他服务。</li>
 </ul>
 
-<h2><EFBFBD>봴<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Լ<EFBFBD><EFBFBD><EFBFBD> IIP վ<EFBFBD><EFBFBD>(EEPSITE)<EFBFBD><EFBFBD></h2>
+<h2>想创建属于您自己的 IIP 站点(EEPSITE)？</h2>
 
-<p><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ѿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һЩ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Լ<EFBFBD><EFBFBD><EFBFBD>EEPSITE - <EFBFBD><EFBFBD>һ<EFBFBD><EFBFBD><a href="http://jetty.mortbay.org/">Jetty</a> ʵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڱ<EFBFBD><EFBFBD><EFBFBD> <a href="http://localhost:7658/">http://localhost:7658/</a><EFBFBD>ϡ<EFBFBD>ֻҪ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <code>eepsite/docroot/</code> <EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><><EFBFBD><EFBFBD><EFBFBD>κα<CEBA>׼<EFBFBD><D7BC> JSP/Servlet <code>.war</code> <EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <code>eepsite/webapps</code> <EFBFBD><EFBFBD>, <20><>׼<EFBFBD><D7BC> CGI <20>ű<EFBFBD>Ӧ<EFBFBD><D3A6><EFBFBD><EFBFBD> <code>eepsite/cgi-bin</code> Ŀ¼<EFBFBD><EFBFBD>) ֮<><D6AE><EFBFBD>Ϳ<EFBFBD><CDBF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˺<EFBFBD><CBBA><EFBFBD><EFBFBD><EFBFBD> <a href="/i2ptunnel/">IIPվ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>(EEPSITE TUNEL)</a> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>ָ<EFBFBD><EFBFBD>վ<EFBFBD><EFBFBD><EFBFBD>Ķ˿<EFBFBD>, <20><><EFBFBD><EFBFBD>վ<EFBFBD><D5BE><EFBFBD>Ϳ<EFBFBD><CDBF>Ա<EFBFBD><D4B1><EFBFBD><EFBFBD>˿<EFBFBD><CBBF><EFBFBD><EFBFBD>ˡ<EFBFBD><CBA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>IIPվ<50><D5BE>ʱ<EFBFBD>ľ<EFBFBD><C4BE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>μ<EFBFBD> <a href="http://localhost:7658/"><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱEEPSITEҳ<EFBFBD><EFBFBD></a><EFBFBD><EFBFBD></p>
+<p>我们已经集成了一些软件来帮助你运行自己的EEPSITE - 有一个<a href="http://jetty.mortbay.org/">Jetty</a> 实例监听于本机 <a href="http://localhost:7658/">http://localhost:7658/</a>上。只要将你的文件放在 <code>eepsite/docroot/</code> 文件夹中 (或将任何标准的 JSP/Servlet <code>.war</code> 文件放置于 <code>eepsite/webapps</code> 中, 标准的 CGI 脚本应置于 <code>eepsite/cgi-bin</code> 目录内) 之后就可以浏览啦。此后运行 <a href="/i2ptunnel/">IIP站点隧道(EEPSITE TUNEL)</a> 将其指向站点的端口, 您的站点就可以被他人看到了。当您创建IIP站点时的具体操作参见 <a href="http://localhost:7658/">您的临时EEPSITE页面</a>。</p>
 
-<h2><a name="trouble"><EFBFBD><EFBFBD><EFBFBD>ѽ<EFBFBD><EFBFBD><EFBFBD></a></h2>
+<h2><a name="trouble">疑难解答</a></h2>
 
-<p><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> - I2P <20><>һ<EFBFBD><D2BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1>Ҫ<EFBFBD><D2AA><EFBFBD><EFBFBD><EFBFBD>ڵ㣬<DAB5><E3A3AC><EFBFBD>ܱȽϻ<C8BD><CFBB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>30<33><30><EFBFBD>Ӻ<EFBFBD><D3BA><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ļ<C4BB>ڵ<EFBFBD>(Active:<3A><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>/<2F>½<EFBFBD><C2BD><EFBFBD><EFBFBD><EFBFBD>) <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 10 <20><><EFBFBD>ڵ<EFBFBD><DAB5><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD>ڷ<EFBFBD><DAB7><EFBFBD>ǽ<EFBFBD>д<EFBFBD><D0B4><EFBFBD> 8887 <20>˿ڸ<CBBF><DAB8><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܡ<EFBFBD><DCA1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD>κ<EFBFBD>EEPSITE(<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <a href="http://www.i2p2.i2p/">www.i2p2.i2p</a>)<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD>Ϊ<EFBFBD><EFBFBD><EFBFBD>ص<EFBFBD> localhost:4444<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ҳ<EFBFBD><EFBFBD><EFBFBD>Բ鿴 <a href="http://www.i2p2.i2p/">I2P <EFBFBD><EFBFBD>վ</a> <EFBFBD>ϵ<EFBFBD><EFBFBD><EFBFBD>Ϣ, <20><> <a href="http://forum.i2p2.de/">I2P <EFBFBD><EFBFBD>̳</a> <EFBFBD>з<EFBFBD><EFBFBD><EFBFBD>, <20><> <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a> , irc.postman.i2p <EFBFBD><EFBFBD> irc.freshcoffee.i2p <EFBFBD>ϵ<EFBFBD> #i2p <EFBFBD><EFBFBD> #i2p-chat <EFBFBD><EFBFBD><EFBFBD><EFBFBD>IRCƵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<28><>Щ<EFBFBD><D0A9><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵ<EFBFBD><CFB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8>)<29><></p>
+<p>保持耐心 - I2P 第一次启动时需要搜索节点，可能比较缓慢。如果30分钟后，您的活动节点(Active:已连接/新近连接) 计数仍在 10 个节点以下, 请在防火墙中打开 8887 端口改善连接性能。如果您根本无法打开任何EEPSITE(甚至 <a href="http://www.i2p2.i2p/">www.i2p2.i2p</a>)，检查您的浏览器代理设置是否为本地的 localhost:4444。你也可以查看 <a href="http://www.i2p2.i2p/">I2P 网站</a> 上的信息, 在 <a href="http://forum.i2p2.de/">I2P 论坛</a> 中发帖, 来 <a href="irc://irc.freenode.net/#i2p">irc.freenode.net</a> , irc.postman.i2p 或 irc.freshcoffee.i2p 上的 #i2p 或 #i2p-chat 两个IRC频道坐坐。 (这些服务器上的这两个频道是相通的)。</p>

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

@@ -18,7 +18,7 @@ public class RouterVersion {
     /** deprecated */
     public final static String ID = "Monotone";
     public final static String VERSION = CoreVersion.VERSION;
-    public final static long BUILD = 10;
+    public final static long BUILD = 12;
     /** for example "-test" */
     public final static String EXTRA = "";
     public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA;