From e3de3dcc1dc10efc26c77520e96afcf79dc4aaf5 Mon Sep 17 00:00:00 2001 From: sponge Date: Wed, 15 Jul 2009 08:51:51 +0000 Subject: [PATCH 1/4] * Slackware SlackBuild fixes. --- Slackware/i2p/doinst.sh | 21 +++++++----- Slackware/i2p/i2p.SlackBuild | 33 +++++++++++++++++-- history.txt | 3 ++ .../src/net/i2p/router/RouterVersion.java | 2 +- 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/Slackware/i2p/doinst.sh b/Slackware/i2p/doinst.sh index 91dd097211..0f5c9f335b 100644 --- a/Slackware/i2p/doinst.sh +++ b/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." diff --git a/Slackware/i2p/i2p.SlackBuild b/Slackware/i2p/i2p.SlackBuild index 3bb2c95033..f7ced54bfb 100755 --- a/Slackware/i2p/i2p.SlackBuild +++ b/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 diff --git a/history.txt b/history.txt index 25f62c6177..96015b69ae 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2009-07-15 sponge + * Slackware SlackBuild fixes. + 2009-07-14 dr|z3d * Increment to 0.7.5-10 * Tidy up layout of readme.* files. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 1440f81c07..217d41d542 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/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 = 11; /** for example "-test" */ public final static String EXTRA = ""; public final static String FULL_VERSION = VERSION + "-" + BUILD + EXTRA; From 8ce71d724cbd499fe73866c8776655deaf1b066a Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 15 Jul 2009 15:29:37 +0000 Subject: [PATCH 2/4] * Installer: Don't launch the router from the postinstall.sh script on linux anymore; add a panel to the installer to provide launch instructions. --- history.txt | 4 ++++ installer/install.xml | 2 ++ installer/resources/postinstall.sh | 3 ++- installer/resources/start-i2p.txt | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 installer/resources/start-i2p.txt diff --git a/history.txt b/history.txt index 96015b69ae..19c8cfcaa3 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2009-07-15 zzz + * 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. diff --git a/installer/install.xml b/installer/install.xml index 7f94a7b066..c7b0aafbea 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -85,6 +85,7 @@ + @@ -94,6 +95,7 @@ + diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh index d273d226e9..72daee17fd 100644 --- a/installer/resources/postinstall.sh +++ b/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 diff --git a/installer/resources/start-i2p.txt b/installer/resources/start-i2p.txt new file mode 100644 index 0000000000..9da29e3948 --- /dev/null +++ b/installer/resources/start-i2p.txt @@ -0,0 +1 @@ +To start I2P, run "$INSTALL_PATH/i2prouter start" From 29f13868b79aa39ceadbe2e2c463d199d7572986 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 15 Jul 2009 16:28:54 +0000 Subject: [PATCH 3/4] * Console: Convert readme_zh.html from GB2312 to UTF-8 --- history.txt | 1 + readme_zh.html | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/history.txt b/history.txt index 19c8cfcaa3..4cf10f0b74 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,5 @@ 2009-07-15 zzz + * Console: 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. diff --git a/readme_zh.html b/readme_zh.html index bb7dc314a7..7e6d509efa 100644 --- a/readme_zh.html +++ b/readme_zh.html @@ -1,26 +1,26 @@

English | Deutsch | Français | Nederlands | Svenska

-

如果 I2P 已经运行，未来的几分钟里控制台左侧的活动节点(Active)数量将开始增长，并会出现名为 "已共享客户"("shared clients") 的本地目标。(如果没有,请见 疑难解答)。待出现以上消息后，您可以:

+

濡傛灉 I2P 宸茬粡杩愯锛屾湭鏉ョ殑鍑犲垎閽熼噷鎺у埗鍙板乏渚х殑娲诲姩鑺傜偣(Active)鏁伴噺灏嗗紑濮嬪闀匡紝骞朵細鍑虹幇鍚嶄负 "宸插叡浜鎴"("shared clients") 鐨勬湰鍦扮洰鏍囥(濡傛灉娌℃湁,璇疯 鐤戦毦瑙ｇ瓟)銆傚緟鍑虹幇浠ヤ笂娑堟伅鍚庯紝鎮ㄥ彲浠:

    -
  • 浏览 IIP网站 "eepsites" - I2P 网络内匿名运行的站点 - 您要首先设置浏览器的 HTTP 代理 为 localhost:4444 然后才能浏览IIP站点 - I2P网络中还有很多其他的IIP网站(EEPSITE) - 访问上面的网站你会找到更多，收藏你喜爱的 IIP 网站，别忘了常去看看！
    • -
  • 浏览 Web 网页 - 目前 IP2 网络中只有一个 HTTP 出口代理("outproxy")挂接在你主机4444端口的HTTP代理上。- 只要将浏览器的代理设置指向为前面的地址(localhost:4444)，然后访问任何普通链接即可 - 您的HTTP请求将在 I2P 网络内部传递。
    • -
  • 文件交换 - 本机的其中一个内置 端口 中提供 Snark BitTorrent 客户端。
    • -
  • 匿名电邮 - POSTMAN 创建了兼容普通邮件客户端 (POP3 / SMTP)的邮件系统，该系统可以在 I2P 网络内部收发Email 也可以收发来自外部 Internet 的邮件！电邮账号请到 hq.postman.i2p 申请。我们将用于匿名POP3/SMTP的Web邮件客户端 SUSIMail, 集成在I2P中，并将其配置为使用POSTMAN 的邮件服务。
    • -
  • 匿名聊天 - 打开您的 IRC 客户端并链接至 localhost:6668。这样可以访问两个匿名的 IRC 服务器, 但无论你还是服务器都不知道其他人在哪里。
    • -
  • 匿名博客 - 请访问 Syndie
    • -
  • 以及其他服务。
    • +
  • 娴忚 IIP缃戠珯 "eepsites" - I2P 缃戠粶鍐呭尶鍚嶈繍琛岀殑绔欑偣 - 鎮ㄨ棣栧厛璁剧疆娴忚鍣ㄧ殑 HTTP 浠ｇ悊 涓 localhost:4444 鐒跺悗鎵嶈兘娴忚IIP绔欑偣 - I2P缃戠粶涓繕鏈夊緢澶氬叾浠栫殑IIP缃戠珯(EEPSITE) - 璁块棶涓婇潰鐨勭綉绔欎綘浼氭壘鍒版洿澶氾紝鏀惰棌浣犲枩鐖辩殑 IIP 缃戠珯锛屽埆蹇樹簡甯稿幓鐪嬬湅锛
    • +
  • 娴忚 Web 缃戦〉 - 鐩墠 IP2 缃戠粶涓彧鏈変竴涓 HTTP 鍑哄彛浠ｇ悊("outproxy")鎸傛帴鍦ㄤ綘涓绘満4444绔彛鐨凥TTP浠ｇ悊涓娿- 鍙灏嗘祻瑙堝櫒鐨勪唬鐞嗚缃寚鍚戜负鍓嶉潰鐨勫湴鍧(localhost:4444)锛岀劧鍚庤闂换浣曟櫘閫氶摼鎺ュ嵆鍙 - 鎮ㄧ殑HTTP璇锋眰灏嗗湪 I2P 缃戠粶鍐呴儴浼犻掋
    • +
  • 鏂囦欢浜ゆ崲 - 鏈満鐨勫叾涓竴涓唴缃 绔彛 涓彁渚 Snark BitTorrent 瀹㈡埛绔
    • +
  • 鍖垮悕鐢甸偖 - POSTMAN 鍒涘缓浜嗗吋瀹规櫘閫氶偖浠跺鎴风 (POP3 / SMTP)鐨勯偖浠剁郴缁燂紝璇ョ郴缁熷彲浠ュ湪 I2P 缃戠粶鍐呴儴鏀跺彂Email 涔熷彲浠ユ敹鍙戞潵鑷閮 Internet 鐨勯偖浠讹紒鐢甸偖璐﹀彿璇峰埌 hq.postman.i2p 鐢宠銆傛垜浠皢鐢ㄤ簬鍖垮悕POP3/SMTP鐨刉eb閭欢瀹㈡埛绔 SUSIMail, 闆嗘垚鍦↖2P涓紝骞跺皢鍏堕厤缃负浣跨敤POSTMAN 鐨勯偖浠舵湇鍔°
    • +
  • 鍖垮悕鑱婂ぉ - 鎵撳紑鎮ㄧ殑 IRC 瀹㈡埛绔苟閾炬帴鑷 localhost:6668銆傝繖鏍峰彲浠ヨ闂袱涓尶鍚嶇殑 IRC 鏈嶅姟鍣, 浣嗘棤璁轰綘杩樻槸鏈嶅姟鍣ㄩ兘涓嶇煡閬撳叾浠栦汉鍦ㄥ摢閲屻
    • +
  • 鍖垮悕鍗氬 - 璇疯闂 Syndie
    • +
  • 浠ュ強鍏朵粬鏈嶅姟銆
-

想创建属于您自己的 IIP 站点(EEPSITE)？

+

鎯冲垱寤哄睘浜庢偍鑷繁鐨 IIP 绔欑偣(EEPSITE)锛

-

我们已经集成了一些软件来帮助你运行自己的EEPSITE - 有一个Jetty 实例监听于本机 http://localhost:7658/上。只要将你的文件放在 eepsite/docroot/ 文件夹中 (或将任何标准的 JSP/Servlet .war 文件放置于 eepsite/webapps 中, 标准的 CGI 脚本应置于 eepsite/cgi-bin 目录内) 之后就可以浏览啦。此后运行 IIP站点隧道(EEPSITE TUNEL) 将其指向站点的端口, 您的站点就可以被他人看到了。当您创建IIP站点时的具体操作参见 您的临时EEPSITE页面。

+

鎴戜滑宸茬粡闆嗘垚浜嗕竴浜涜蒋浠舵潵甯姪浣犺繍琛岃嚜宸辩殑EEPSITE - 鏈変竴涓Jetty 瀹炰緥鐩戝惉浜庢湰鏈 http://localhost:7658/涓娿傚彧瑕佸皢浣犵殑鏂囦欢鏀惧湪 eepsite/docroot/ 鏂囦欢澶逛腑 (鎴栧皢浠讳綍鏍囧噯鐨 JSP/Servlet .war 鏂囦欢鏀剧疆浜 eepsite/webapps 涓, 鏍囧噯鐨 CGI 鑴氭湰搴旂疆浜 eepsite/cgi-bin 鐩綍鍐) 涔嬪悗灏卞彲浠ユ祻瑙堝暒銆傛鍚庤繍琛 IIP绔欑偣闅ч亾(EEPSITE TUNEL) 灏嗗叾鎸囧悜绔欑偣鐨勭鍙, 鎮ㄧ殑绔欑偣灏卞彲浠ヨ浠栦汉鐪嬪埌浜嗐傚綋鎮ㄥ垱寤篒IP绔欑偣鏃剁殑鍏蜂綋鎿嶄綔鍙傝 鎮ㄧ殑涓存椂EEPSITE椤甸潰銆

-

疑难解答

+

鐤戦毦瑙ｇ瓟

-

保持耐心 - I2P 第一次启动时需要搜索节点，可能比较缓慢。如果30分钟后，您的活动节点(Active:已连接/新近连接) 计数仍在 10 个节点以下, 请在防火墙中打开 8887 端口改善连接性能。如果您根本无法打开任何EEPSITE(甚至 www.i2p2.i2p)，检查您的浏览器代理设置是否为本地的 localhost:4444。你也可以查看 I2P 网站 上的信息, 在 I2P 论坛 中发帖, 来 irc.freenode.net , irc.postman.i2p 或 irc.freshcoffee.i2p 上的 #i2p 或 #i2p-chat 两个IRC频道坐坐。 (这些服务器上的这两个频道是相通的)。

+

淇濇寔鑰愬績 - I2P 绗竴娆″惎鍔ㄦ椂闇瑕佹悳绱㈣妭鐐癸紝鍙兘姣旇緝缂撴參銆傚鏋30鍒嗛挓鍚庯紝鎮ㄧ殑娲诲姩鑺傜偣(Active:宸茶繛鎺/鏂拌繎杩炴帴) 璁℃暟浠嶅湪 10 涓妭鐐逛互涓, 璇峰湪闃茬伀澧欎腑鎵撳紑 8887 绔彛鏀瑰杽杩炴帴鎬ц兘銆傚鏋滄偍鏍规湰鏃犳硶鎵撳紑浠讳綍EEPSITE(鐢氳嚦 www.i2p2.i2p)锛屾鏌ユ偍鐨勬祻瑙堝櫒浠ｇ悊璁剧疆鏄惁涓烘湰鍦扮殑 localhost:4444銆備綘涔熷彲浠ユ煡鐪 I2P 缃戠珯 涓婄殑淇℃伅, 鍦 I2P 璁哄潧 涓彂甯, 鏉 irc.freenode.net , irc.postman.i2p 鎴 irc.freshcoffee.i2p 涓婄殑 #i2p 鎴 #i2p-chat 涓や釜IRC棰戦亾鍧愬潗銆 (杩欎簺鏈嶅姟鍣ㄤ笂鐨勮繖涓や釜棰戦亾鏄浉閫氱殑)銆

From 53a68ff5a34cc90e530d68103977e02c7f928ad0 Mon Sep 17 00:00:00 2001 From: zzz Date: Wed, 15 Jul 2009 22:56:53 +0000 Subject: [PATCH 4/4] Make light the default theme --- .../java/src/net/i2p/i2ptunnel/web/IndexBean.java | 8 +++----- .../java/src/net/i2p/router/web/CSSHelper.java | 6 +++--- .../java/src/net/i2p/router/web/ConfigUIHelper.java | 3 +-- history.txt | 4 +++- router/java/src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java index 48bb984b69..53ed827494 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java +++ b/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) - return "/themes/console/" + theme + "/"; - else - return "/themes/console/"; + String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME); + return "/themes/console/" + theme + "/"; } public boolean allowCSS() { diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java index 6b3916883a..a2f3341f9d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java +++ b/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,9 +17,8 @@ public class CSSHelper extends HelperBase { if (userAgent != null && userAgent.contains("MSIE")) { url += FORCE + "/"; } else { - String theme = _context.getProperty(PROP_THEME_NAME); - if (theme != null) - url += theme + "/"; + String theme = _context.getProperty(PROP_THEME_NAME, DEFAULT_THEME); + url += theme + "/"; } return url; } diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java index 0e0b36a28a..9bfd22077d 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/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("