I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit dad4bef7 authored by z3d's avatar z3d
Browse files

merge of '3b23dcff9410a7f2e8443cdaa410ead6d9694f29' 

     and 'fd87a1b95a60a0e5c18d75aed057344e8ce5aa87'
parents 13a04dba 53a68ff5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 86 additions and 41 deletions
Slackware/i2p/doinst.sh
+ 13
− 8
View file @ dad4bef7
......@@ -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
+ 31
− 2
View file @ dad4bef7
......@@ -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
+ 3
− 5
View file @ dad4bef7
......@@ -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() {
......
apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
+ 3
− 3
View file @ dad4bef7
......@@ -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;
}
......
apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java
+ 1
− 2
View file @ dad4bef7
......@@ -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
+ 10
− 0
View file @ dad4bef7
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
+ 2
− 0
View file @ dad4bef7
......@@ -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
+ 2
− 1
View file @ dad4bef7
......@@ -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 → 100644
+ 1
− 0
View file @ dad4bef7
To start I2P, run "$INSTALL_PATH/i2prouter start"
readme_zh.html
+ 19
− 19
View file @ dad4bef7
<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>如果 I2P 已经运行，未来的几分钟里控制台左侧的活动节点(Active)数量将开始增长，并会出现名为 &quot;已共享客户&quot;(&quot;shared clients&quot;) 的本地目标。(如果没有,请见 <a href="#trouble">疑难解答</a>)。待出现以上消息后，您可以:</p>
<p>如果 I2P 已经运行，未来的几分钟里控制台左侧的活动节点(Active)数量将开始增长，并会出现名为 &quot;已共享客户&quot;(&quot;shared clients&quot;) 的本地目标。(如果没有,请见 <a href="#trouble">疑难解答</a>)。待出现以上消息后，您可以:</p>
<ul>
<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>
<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>想创建属于您自己的 IIP 站点(EEPSITE)？</h2>
<h2>想创建属于您自己的 IIP 站点(EEPSITE)？</h2>
<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">疑难解答</a></h2>
<h2><a name="trouble">疑难解答</a></h2>
<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
+ 1
− 1
View file @ dad4bef7
......@@ -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;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]