From c90ac9ee6ca7ebeff277f2dbe2884a7dc3e4d1ae Mon Sep 17 00:00:00 2001 From: kytv Date: Sat, 20 Aug 2011 20:03:47 +0000 Subject: [PATCH 01/12] I created this script for my own convenience. It isn't used by the Debian packaging in any way. Now that I know about ant getBuildNumber, I'll just use that. --- debian/i2pversion | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100755 debian/i2pversion diff --git a/debian/i2pversion b/debian/i2pversion deleted file mode 100755 index 8c7a821faf..0000000000 --- a/debian/i2pversion +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -ROUTER=$(/bin/echo -ne "_")$(cat ./router/java/src/net/i2p/router/RouterVersion.java | grep -e "public final static long BUILD" | cut -f2 -d"=" | cut -f1 -d";" | sed -re "s/ //g") -if [ "$ROUTER" = "_" ] ; then - ROUTER="_0" -fi - -# -# That was the easy one, now for the tough one. -# - -CORE=$(cat core/java/src/net/i2p/CoreVersion.java | grep -e "public final static String VERSION" | cut -f2 -d'"' | sed -re "s/ //g") -CORE1=$(/bin/echo -n $CORE.x.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/") -CORE2=$(/bin/echo -n $CORE.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/") - -if [ "$CORE.x.x" = "$CORE1" ] ; then - CORE=$(/bin/echo -ne $CORE".0.0") -fi -if [ "$CORE.x" = "$CORE2" ] ; then - CORE=$(/bin/echo -ne $CORE".0") -fi - -VERSION=$(/bin/echo $CORE$ROUTER) - -echo $VERSION From dc3f540a641600f1b6c1e3df7ff4d3a8a82ef31d Mon Sep 17 00:00:00 2001 From: kytv Date: Sat, 20 Aug 2011 21:13:29 +0000 Subject: [PATCH 02/12] changing the pastebin on the router console to one that may prove to be more stable. --- installer/resources/readme/readme.html | 4 ++-- installer/resources/readme/readme_de.html | 2 +- installer/resources/readme/readme_es.html | 2 +- installer/resources/readme/readme_fr.html | 4 ++-- installer/resources/readme/readme_nl.html | 4 ++-- installer/resources/readme/readme_pt.html | 2 +- installer/resources/readme/readme_ru.html | 4 ++-- installer/resources/readme/readme_sv.html | 2 +- installer/resources/readme/readme_zh.html | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html index bf0f5d6a19..15211f6c1d 100644 --- a/installer/resources/readme/readme.html +++ b/installer/resources/readme/readme.html @@ -54,7 +54,7 @@ anonymous connections to www.i2p2.de. There's also an official mirror running on geti2p.net. If you want to know more about how I2P works or how you can participate, this is your first port of call!
  • I2P Community Forums
    forum.i2p: A secure and anonymous connection to forum.i2p2.de, an online forum community where developers and users alike discuss problems and ideas relating to I2P and associated topics, and zzz's developer forums for both end users and developers.
    • -
  • I2P Anonymous Pastebin
    paste.i2p2.i2p: Secure and +
  • I2P Anonymous Pastebin
    pastethis.i2p: Secure and anonymous paste service allowing anonymous text and text-based code sharing over I2P.
  • Echelon's I2P Resources
    echelon.i2p: I2P software archive with source code (where permissible), information about I2P, including a beginner's guide and pre-release developer builds of I2P for the adventurous to try.
    • @@ -89,7 +89,7 @@ make sure your browser's proxy is set to access http traffic (not https, not socks) via 127.0.0.1 port 4444. If you need some help, there's a guide to configuring your browser for I2P use, also available on the normal web. -
  • Check Your Logs
    Logs may help resolve a problem. You may wish to paste excerpts in a forum for help, or perhaps paste it instead and reference the link on IRC for help. +
  • Check Your Logs
    Logs may help resolve a problem. You may wish to paste excerpts in a forum for help, or perhaps paste it instead and reference the link on IRC for help.
  • Verify Java is Up to Date
    Ensure your Java is up to date [version 1.6 recommended and required for some features]. Check the version of your JRE (Java Runtime Environment) diff --git a/installer/resources/readme/readme_de.html b/installer/resources/readme/readme_de.html index 0edc7751e1..b128980e7c 100644 --- a/installer/resources/readme/readme_de.html +++ b/installer/resources/readme/readme_de.html @@ -12,7 +12,7 @@
  • ugha.i2p: Ugha's Eepseite, ein öffentliches Wiki mit vielen Links
  • fproxy.tino.i2p: ein Freenet-Proxy
  • echelon.i2p: Softwarearchiv und Informationen zu I2P (mit BitTorrent-Klienten, iMule, I2PFox, I2P-Messenger, …)
    • -
  • paste.i2p2.i2p: anonymer Pastebin
    • +
  • pastethis.i2p: anonymer Pastebin

    • Es gibt viele andere Eepseiten - folge einfach den Links, die du findest, setze Lesezeichen für Deine Favoriten, und besuche sie oft! diff --git a/installer/resources/readme/readme_es.html b/installer/resources/readme/readme_es.html index f6f2cd5442..17065967c4 100644 --- a/installer/resources/readme/readme_es.html +++ b/installer/resources/readme/readme_es.html @@ -12,7 +12,7 @@
  • ugha.i2p: página de Ugha; un wiki público con muchos enlaces
  • fproxy.tino.i2p: un proxy para acceder a Freenet
  • echelon.i2p: archivo de software e informaciones sobre I2P (con aplicaciones de BitTorrent, iMule, I2PFox, I2P-Messenger, ...)
    • -
  • paste.i2p2.i2p: pastebin anónimo
    • +
  • pastethis.i2p: pastebin anónimo

    • Hay muchas páginas I2P más - simplemente ¡sigue los enlaces que encuentres, pon marcadores para tus favoritos y visítalos frecuentemente!
  • navegar en internet - I2P cuenta con un HTTP-"Outproxy". Para poder usarlo, puedes también utilizar el proxy HTTP en el puerto 4444 - Si configuras tu navegador web para usar este proxy, puedes visitar las páginas web de forma anónima. El tráfico será enrutado através de la red I2P.
    • diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html index 9f2122dd94..9e77c85d5a 100644 --- a/installer/resources/readme/readme_fr.html +++ b/installer/resources/readme/readme_fr.html @@ -126,7 +126,7 @@ façon d'y contribuer, vous venez de trouver la porte d'entrée. utilisateurs aiment discuter de problèmes et d'idées relatifs à I2P et aux sujets apparentés, et le forum des développeurs de zzz également ouvert aux utilisateurs.
  • Pastebin anonyme I2P
    -paste.i2p2.i2p: service de collage sécurisé et anonyme pour le +pastethis.i2p: service de collage sécurisé et anonyme pour le partage de texte et de code au format textuel sur I2P.
  • Les ressources i2P d'Echelon
    echelon.i2p: dépôt de logiciels I2P (I2PFox, iMule, @@ -198,7 +198,7 @@ l'utilisation avec I2P, également
  • Vérifiez vos historiques
    Les historiques peuvent aider à diagnostiquer un problème. Vous pouvez en coller un extrait sur un forum pour obtenir de l'aide, ou plutôt le -coller ici et faire référence au lien sur le canal IRC #i2p-fr +coller ici et faire référence au lien sur le canal IRC #i2p-fr (Freenode).
    • diff --git a/installer/resources/readme/readme_nl.html b/installer/resources/readme/readme_nl.html index beb580c929..c9471316d7 100644 --- a/installer/resources/readme/readme_nl.html +++ b/installer/resources/readme/readme_nl.html @@ -41,7 +41,7 @@ en maak verbinding met de server op www.i2p2.de. Er is ook een officiële mirror actief op geti2p.net. Als je meer wilt weten over hoe I2P werkt of hoe je mee kan doen is dit de website waar je terecht kan!
  • I2P Community Forums
    forum.i2p: Een veilige en anonieme verbinding naar forum.i2p2.de, een online forum waar ontwikkelaars en gebruikers problemen bespreken en ideëen uitwisselen gerelateerd aan I2P en geassocieerde onderwerpen, en zzz's developer forums voor zowel ontwikkelaars als eindgebruikers.
    • -
  • I2P Anonieme Pastebin
    paste.i2p2.i2p: Veilige en +
  • I2P Anonieme Pastebin
    pastethis.i2p: Veilige en anonieme paste dienst die het anoniem delen van tekst en tekst-based code over I2P.
  • Echelon's I2P Resources
    echelon.i2p: I2P software archief met broncode (waar toegestaan), informatie over I2P, inclusief een beginner's guide en pre-release ontwikkelaars versies van I2P voor de avonturiers om te proberen.
    • @@ -70,7 +70,7 @@ Als je achter een verbiedende firewall zit maar wel onbeperkt uitgaande toegang, je helemaal geen eepsites kan zien (zelfs niet www.i2p2.i2p), zorg er dan voor dat je browser's proxy is ingesteld op http proxy (niet https, niet socks) via 127.0.0.1 poort 4444. Als je hulp nodig hebt is er een handleiding voor het configureren van je browser voor gebruik met I2P, ook beschikbaar op het normale Internet. -
  • Controleer je Logs
    Logs kunnen je helpen met problemen oplossen. Je kan mogelijk fragmenten in een forum posten voor hulp, of misschien plakken en als referentie link laten zien op IRC voor hulp.
    • +
  • Controleer je Logs
    Logs kunnen je helpen met problemen oplossen. Je kan mogelijk fragmenten in een forum posten voor hulp, of misschien plakken en als referentie link laten zien op IRC voor hulp.
  • Verifieer dat Java up-to-date is
    Zorg er voor dat Java up-to-date is [versie 1.6 aanbevolen en vereist voor sommige functies]. Als je geen Java geinstalleerd hebt wil je waarschijnlijk een implementatie van de JRE (Java Runtime Environment); als je een ontwikkelaar bent is de SDK mogelijk ook interessant, en misschien Apache Ant die we gebruiken om de I2P Java binaries te compileren.
    • diff --git a/installer/resources/readme/readme_pt.html b/installer/resources/readme/readme_pt.html index 6522ea8a94..dbe0b3de4f 100644 --- a/installer/resources/readme/readme_pt.html +++ b/installer/resources/readme/readme_pt.html @@ -12,7 +12,7 @@
  • ugha.i2p: página de Ugha; um wiki público com muitos links
  • fproxy.tino.i2p: um proxy para acessar à Freenet
  • echelon.i2p: arquivo de software e informações sobre I2P (com aplicações de BitTorrent, iMule, I2PFox, I2P-Messenger, ...)
    • -
  • paste.i2p2.i2p: pastebin anônimo
    • +
  • pastethis.i2p: pastebin anônimo

    • Ha muitas mais páginas I2P - simplesmente segue os links que encontre, ponhe marcadores para os seus favoritos e visíte-los freqüentemente!
  • navegar na internet - I2P dispõe de um "outproxy" http - para usâ-lo, também pode empregar o proxy http no porto 4444 - Se configurar o seu navegador web para usar este proxy, pode visitar as páginas web de maneira anônima e o trânsito será roteado atravez da rede I2P.
    • diff --git a/installer/resources/readme/readme_ru.html b/installer/resources/readme/readme_ru.html index 85ebd6ca16..c402caa2b3 100644 --- a/installer/resources/readme/readme_ru.html +++ b/installer/resources/readme/readme_ru.html @@ -44,7 +44,7 @@ доступ к www.i2p2.de. Так же имеется официальное зеркало на geti2p.net. Если вы хотите узнать больше о том, как работает I2P, или о том, как вы можете принять участие, это послужит вам точкой входа.
  • Форумы сообщества I2P
    forum.i2p: Безопасный и анонимный доступ к forum.i2p2.de, где разработчики и пользователи обсуждают относящиеся к I2P и сопутствующим вещам проблемы и идеи, и форумы разработчика zzz как для разработчиков, так и для конечных пользователей.
    • -
  • Анонимный I2P Pastebin
    paste.i2p2.i2p: +
  • Анонимный I2P Pastebin
    pastethis.i2p: Безопасный и анонимный pastebin-сервис, предоставляющий возможность анонимного обмена текстом и кодом через I2P.
  • Ресурсы Echelon-а
    echelon.i2p: архив I2P софта с исходными текстами (где позволяет лицензия), информация об I2P, включая руководство для начинающих и пре-релизные девелоперские сборки I2P для тестирования.
    • @@ -73,7 +73,7 @@ вы не можете попасть ни на один eep-сайт (даже на www.i2p2.i2p), убедитесь, что в браузере прописан именно http-прокси (не https и не socks) 127.0.0.1 port 4444. Если вам нужна помощь, здесь есть руководство по настройке браузера для использования I2P, которое так же доступно через обычный интернет. -
  • Проверьте логи
    Логи могут помочь решить проблему. У вас может возникнуть желание запостить часть логов на форум, чтобы получить помощь, или, может быть, на pastebin, чтобы дать ссылку на IRC.
    • +
  • Проверьте логи
    Логи могут помочь решить проблему. У вас может возникнуть желание запостить часть логов на форум, чтобы получить помощь, или, может быть, на pastebin, чтобы дать ссылку на IRC.
  • Проверьте свежесть Java
    Убедитесь, что у вас достаточно свежая Java [версия 1.6 рекомендуется и необходима для функционирования некоторых возможностей]. Если у вас не установлена Java, скорее всего, вам требуется какая-нибудь реализация JRE (Java Runtime Environment); если вы программист, SDK так же может быть интересен, и, возможно, Apache Ant, который мы используем для сборки бинарников I2P.
    • diff --git a/installer/resources/readme/readme_sv.html b/installer/resources/readme/readme_sv.html index 64beb58826..98fe0ddf74 100644 --- a/installer/resources/readme/readme_sv.html +++ b/installer/resources/readme/readme_sv.html @@ -23,7 +23,7 @@ wiki som alla kan förändra, innehåller många länkarfproxy.tino.i2p: Freenet proxy
  • echelon.i2p: programvaruförråd och information om I2P
    • -
  • paste.i2p2.i2p: anonym och säker pastebin
    • +
  • pastethis.i2p: anonym och säker pastebin

    • Det finns många fler eepsidor - följ bara länkarna från dom du ser, spara dina favoriter och besök dom ofta! diff --git a/installer/resources/readme/readme_zh.html b/installer/resources/readme/readme_zh.html index bc083dc817..eb58e4e88a 100644 --- a/installer/resources/readme/readme_zh.html +++ b/installer/resources/readme/readme_zh.html @@ -11,7 +11,7 @@
  • ugha.i2p:UGHA 的 I2P 小站，开放编辑的WIKI，有丰富的链接
  • fproxy.tino.i2p:FREENET 代理
  • echelon.i2p:软件存档及有关I2P的相关文档 (例如 I2P Messenger 基于I2P的匿名聊天工具等) 
    • -
  • paste.i2p2.i2p:安全匿名的公共剪贴板
    • +
  • pastethis.i2p:安全匿名的公共剪贴板

    • I2P网络中还有很多其他站点 - 访问上面的网站你会找到更多，别忘了收藏你喜爱的 I2P 网站方便访问。
  • 浏览 Web 网页 - 目前 IP2 网络中的出口代理("Outproxy")只有一个，它的HTTP代理映射在本机的4444端口上。- 将浏览器的代理设置指向为上述地址(127.0.0.1:4444)后，访问任何普通链接即可 - 您的HTTP请求将在 I2P 网络内部传递。
    • From 4c988f076749da8134b5e11ff3d7e5e505e5524b Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 21 Aug 2011 01:11:50 +0000 Subject: [PATCH 03/12] spell the language right --- .../java/src/net/i2p/router/web/ConfigUIHelper.java | 2 +- apps/routerconsole/jsp/index.jsp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 d8318480a5..999516f082 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHelper.java @@ -63,7 +63,7 @@ public class ConfigUIHelper extends HelperBase { _x("German"), _x("English"), _x("Spanish"),_x("Finnish"), _x("French"), _x("Italian"), _x("Dutch"), _x("Polish"), _x("Portuguese"), _x("Russian"), _x("Swedish"), - _x("Ukranian"), _x("Vietnamese"), _x("Chinese")}; + _x("Ukrainian"), _x("Vietnamese"), _x("Chinese")}; /** todo sort by translated string */ public String getLangSettings() { diff --git a/apps/routerconsole/jsp/index.jsp b/apps/routerconsole/jsp/index.jsp index 40b84538fe..46eea2dd94 100644 --- a/apps/routerconsole/jsp/index.jsp +++ b/apps/routerconsole/jsp/index.jsp @@ -44,7 +44,7 @@ Português Русский Svenska - Ukranian + Ukrainian Tiếng Việt From 13545fdd708c959379a4c037cff3c46efa84db23 Mon Sep 17 00:00:00 2001 From: walking Date: Sun, 21 Aug 2011 06:25:32 +0000 Subject: [PATCH 04/12] ant build now works again on winows --- build.xml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 3137d76969..536d0458f6 100644 --- a/build.xml +++ b/build.xml @@ -434,10 +434,18 @@ - + + + + + + + + + From 5283b8d127f6cc0147713e4e63d61c9239f245b5 Mon Sep 17 00:00:00 2001 From: kytv Date: Sun, 21 Aug 2011 10:26:55 +0000 Subject: [PATCH 05/12] 0.8.8 debian changelog --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 476ca08b49..b16f98b3ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +i2p (0.8.8-1) stable; urgency=low + + * New upstream release. + + -- Kill Your TV Sun, 21 Aug 2011 12:00:00 +0000 + i2p (0.8.7-6) UNRELEASED; urgency=low * Add ttf-dejavu to recommends, so that graphs on From 363a3e57ffcbae42c40ba203f75062738ba54189 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 21 Aug 2011 16:31:46 +0000 Subject: [PATCH 06/12] cleanups and javadoc fixes --- core/java/src/net/i2p/stat/RateStat.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/core/java/src/net/i2p/stat/RateStat.java b/core/java/src/net/i2p/stat/RateStat.java index ba56cc5c5f..411f722bf5 100644 --- a/core/java/src/net/i2p/stat/RateStat.java +++ b/core/java/src/net/i2p/stat/RateStat.java @@ -32,7 +32,7 @@ public class RateStat { for (int i = 0; i < periods.length; i++) { Rate rate = new Rate(periods[i]); rate.setRateStat(this); - _rates.put(rate.getPeriod(),rate);; + _rates.put(rate.getPeriod(),rate); } } public void setStatLog(StatLog sl) { _statLog = sl; } @@ -75,19 +75,19 @@ public class RateStat { } public double getLifetimeAverageValue() { - if ( (_rates == null) || (_rates.size() <= 0) ) return 0; + if (_rates.isEmpty()) return 0; return _rates.values().iterator().next().getLifetimeAverageValue(); } public long getLifetimeEventCount() { - if ( (_rates == null) || (_rates.size() <= 0) ) return 0; + if (_rates.isEmpty()) return 0; return _rates.values().iterator().next().getLifetimeEventCount(); } /** * Returns rate with requested period if it exists, * otherwise creates new rate with requested period, adds it to list of rates and returns it. - * @param period - * @return + * @param period ms + * @return the Rate */ public Rate getRate(long period) { if (_rates.containsKey(period)){ @@ -103,7 +103,8 @@ public class RateStat { /** * Adds a new rate with the requested period, provided that * a rate with that period does not already exist. - * @param period + * @param period ms + * @since 0.8.8 */ public void addRate(long period) { if (!_rates.containsKey(period)){ @@ -115,7 +116,8 @@ public class RateStat { /** * If a rate with the provided period exists, remove it. - * @param period + * @param period ms + * @since 0.8.8 */ public void removeRate(long period) { _rates.remove(period); @@ -123,8 +125,9 @@ public class RateStat { /** * Tests if a rate with the provided period exists within this RateStat. - * @param period - * @return + * @param period ms + * @return true if exists + * @since 0.8.8 */ public boolean containsRate(long period) { return _rates.containsKey(period); From 5fd7997661a7badf2be83168c8e04085ebcf5b27 Mon Sep 17 00:00:00 2001 From: zzz Date: Sun, 21 Aug 2011 16:32:15 +0000 Subject: [PATCH 07/12] fix encoding issues --- apps/susimail/src/src/i2p/susi/webmail/WebMail.java | 13 ++++++++++--- history.txt | 4 ++++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java index c07947c289..8668207be4 100644 --- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java +++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java @@ -1202,6 +1202,8 @@ public class WebMail extends HttpServlet private void processRequest( HttpServletRequest httpRequest, HttpServletResponse response ) throws IOException, ServletException { + httpRequest.setCharacterEncoding("UTF-8"); + response.setCharacterEncoding("UTF-8"); RequestWrapper request = new RequestWrapper( httpRequest ); SessionObject sessionObject = null; @@ -1268,13 +1270,18 @@ public class WebMail extends HttpServlet subtitle = _("Show Message"); response.setContentType( "text/html" ); - out.println( "\n" ); /* * write header */ - out.println( "\nsusimail v0." + version + " - " + subtitle + - "\n\n\n\n

    \"Susimail\"
     

    \n
    " ); + out.println( "\n\n" + + "\n" + + "\n" + + "susimail - " + subtitle + "\n" + + "\n" + + "\n\n" + + "

    \"Susimail\"
     

    \n" + + "" ); if( sessionObject.error != null && sessionObject.error.length() > 0 ) { out.println( "

    " + sessionObject.error + "

    " ); diff --git a/history.txt b/history.txt index c00376fd5e..444268a5f3 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,7 @@ +2011-08-21 zzz + * RateStat: Cleanups and javadoc fixes + * susimail: Fix page encoding + 2011-08-20 zzz * Translations: - New Danish and Ukranian translations from transifex diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 0e04b1445c..33006bcb1f 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 = 26; + public final static long BUILD = 27; /** for example "-test" */ public final static String EXTRA = "-rc"; From 20c77e15299e884a6130fbaaccdfe1d1e98894e7 Mon Sep 17 00:00:00 2001 From: zzz Date: Mon, 22 Aug 2011 19:09:09 +0000 Subject: [PATCH 08/12] fixes after review --- .../java/src/net/i2p/addressbook/Daemon.java | 2 +- .../src/net/i2p/router/web/SummaryHelper.java | 8 +-- .../src/net/i2p/util/LogConsoleBuffer.java | 4 +- history.txt | 5 ++ installer/resources/fix_logfile_path.cmd | 66 +++++++++---------- installer/resources/postinstall.sh | 1 + .../resources/release_checklist.txt | 0 7 files changed, 46 insertions(+), 40 deletions(-) rename release_checklist.txt => installer/resources/release_checklist.txt (100%) diff --git a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java index becfc8ea43..4ce2e4f714 100644 --- a/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java +++ b/apps/addressbook/java/src/net/i2p/addressbook/Daemon.java @@ -201,7 +201,7 @@ public class Daemon { } } catch (DataFormatException dfe) { if (log != null) - log.append("Invalid b64 for" + key + " From: " + sub.getLocation()); + log.append("Invalid b64 for " + key + " From: " + sub.getLocation()); invalid++; } total++; diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java index 233f4167bd..0617bb7986 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java @@ -515,11 +515,11 @@ public class SummaryHelper extends HelperBase { */ public String getJobLag() { if (_context == null) - return "0 ms"; + return "0"; RateStat rs = _context.statManager().getRate("jobQueue.jobLag"); if (rs == null) - return "0 ms"; + return "0"; Rate lagRate = rs.getRate(60*1000); return DataHelper.formatDuration2((long)lagRate.getAverageValue()); } @@ -531,7 +531,7 @@ public class SummaryHelper extends HelperBase { */ public String getMessageDelay() { if (_context == null) - return "0 ms"; + return "0"; return DataHelper.formatDuration2(_context.throttle().getMessageDelay()); } @@ -543,7 +543,7 @@ public class SummaryHelper extends HelperBase { */ public String getTunnelLag() { if (_context == null) - return "0 ms"; + return "0"; return DataHelper.formatDuration2(_context.throttle().getTunnelLag()); } diff --git a/core/java/src/net/i2p/util/LogConsoleBuffer.java b/core/java/src/net/i2p/util/LogConsoleBuffer.java index 051ffbf5b7..6149c24da9 100644 --- a/core/java/src/net/i2p/util/LogConsoleBuffer.java +++ b/core/java/src/net/i2p/util/LogConsoleBuffer.java @@ -36,8 +36,8 @@ public class LogConsoleBuffer { lim = Math.max(limit, 4); // Add some extra room to minimize the chance of losing a message, // since we are doing offer() below. - _buffer = new LinkedBlockingQueue(limit + 4); - _critBuffer = new LinkedBlockingQueue(limit + 4); + _buffer = new LinkedBlockingQueue(lim + 4); + _critBuffer = new LinkedBlockingQueue(lim + 4); } void add(String msg) { diff --git a/history.txt b/history.txt index 444268a5f3..a402d498b8 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,8 @@ +* 2011-08-23 0.8.8 released + +2011-08-23 zzz + * Tweaks after review + 2011-08-21 zzz * RateStat: Cleanups and javadoc fixes * susimail: Fix page encoding diff --git a/installer/resources/fix_logfile_path.cmd b/installer/resources/fix_logfile_path.cmd index c1dc6f2f41..2bc04137d5 100644 --- a/installer/resources/fix_logfile_path.cmd +++ b/installer/resources/fix_logfile_path.cmd @@ -1,33 +1,33 @@ -@echo off -:: fix_logfile_path.cmd -:: -:: This is a simple (and/or stupid) script whose sole purpose is to set the -:: correct path for wrapper.logfile, by explicitly setting it to use the -:: environment variable %temp%. -:: -:: On every *NIX-like system, $SYSTEM_java_io_tmpdir/wrapper.log points to a system-level -:: temp directory (/tmp on Linux, /var/tmp on BSD, etc.), but in Windows the value of %temp% -:: depends on whose account a process is running under. If the same user that installs I2P -:: is the only one that will run I2P, this isn't a problem. -:: -:: The problem comes from trying to run the process as a service, or trying to run under an -:: account other than the one that did the installation. For example if the user "Administrator" -:: installed I2P on Windows 7, the value for wrapper.logfile will be set to the hardcoded value of -:: C:\Users\Administrator\AppData\Local\Temp\wrapper.log (if it's left at the default value of -:: $SYSTEM_java_io_tmpdir/wrapper.log. -:: -:: If user Alice tries to run I2P, the wrapper will try to write its logfile to -:: C:\Users\Administrator\AppData\Local\Temp\wrapper.log. Unfortunately Alice -:: doesn't have the rights to access Administrator's temp directory. The same -:: will happen with the "limited access account" that the I2P service runs -:: under. -:: -:: Since Windows doesn't have sed and it has a retarded find, we resort to this -:: lameness. -:: -cd /d %~dp0 -find /V /I "wrapper.logfile=" wrapper.config > wrapper.new -echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new -move wrapper.new wrapper.config - -:: As an added bonus, wrapper.config now has DOS line endings in Windows. +@echo off +:: fix_logfile_path.cmd +:: +:: This is a simple (and/or stupid) script whose sole purpose is to set the +:: correct path for wrapper.logfile, by explicitly setting it to use the +:: environment variable %temp%. +:: +:: On every *NIX-like system, $SYSTEM_java_io_tmpdir/wrapper.log points to a system-level +:: temp directory (/tmp on Linux, /var/tmp on BSD, etc.), but in Windows the value of %temp% +:: depends on whose account a process is running under. If the same user that installs I2P +:: is the only one that will run I2P, this isn't a problem. +:: +:: The problem comes from trying to run the process as a service, or trying to run under an +:: account other than the one that did the installation. For example if the user "Administrator" +:: installed I2P on Windows 7, the value for wrapper.logfile will be set to the hardcoded value of +:: C:\Users\Administrator\AppData\Local\Temp\wrapper.log (if it's left at the default value of +:: $SYSTEM_java_io_tmpdir/wrapper.log. +:: +:: If user Alice tries to run I2P, the wrapper will try to write its logfile to +:: C:\Users\Administrator\AppData\Local\Temp\wrapper.log. Unfortunately Alice +:: doesn't have the rights to access Administrator's temp directory. The same +:: will happen with the "limited access account" that the I2P service runs +:: under. +:: +:: Since Windows doesn't have sed and it has a retarded find, we resort to this +:: lameness. +:: +cd /d %~dp0 +findstr /V /R "^wrapper.logfile=" wrapper.config > wrapper.new +echo wrapper.logfile=%%temp%%\wrapper.log >> wrapper.new +move wrapper.new wrapper.config + +:: As an added bonus, wrapper.config now has DOS line endings in Windows. diff --git a/installer/resources/postinstall.sh b/installer/resources/postinstall.sh index f50cf1982a..e79038b114 100644 --- a/installer/resources/postinstall.sh +++ b/installer/resources/postinstall.sh @@ -95,6 +95,7 @@ rm -rf ./icons rm -rf ./lib/wrapper rm -f ./lib/*.dll rm -f ./*.bat +rm -f ./fix_logfile_path.cmd rm -f ./*.exe rm -rf ./installer diff --git a/release_checklist.txt b/installer/resources/release_checklist.txt similarity index 100% rename from release_checklist.txt rename to installer/resources/release_checklist.txt From 73aade4fb386dab9a72ef006f65a71f92923db44 Mon Sep 17 00:00:00 2001 From: dream Date: Tue, 23 Aug 2011 04:28:05 +0000 Subject: [PATCH 09/12] Proper handling of implied "/" paths --- .../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java index feb9551263..f8177c2810 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java @@ -389,8 +389,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn // pos is the start of the path pos = request.indexOf("/"); if (pos == -1) { - method = null; - break; + pos = request.length(); } host = request.substring(0, pos); From 010399d865c5243a2d90ec70330ccaf165713e72 Mon Sep 17 00:00:00 2001 From: zzz Date: Tue, 23 Aug 2011 16:07:44 +0000 Subject: [PATCH 10/12] 0.8.8 --- core/java/src/net/i2p/CoreVersion.java | 2 +- installer/install.xml | 2 +- installer/resources/news.xml | 36 ++++++------------- .../src/net/i2p/router/RouterVersion.java | 4 +-- 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 2dec32f8ce..862546bc7c 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.8.7"; + public final static String VERSION = "0.8.8"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/installer/install.xml b/installer/install.xml index 7381cc794c..c0ae82c383 100644 --- a/installer/install.xml +++ b/installer/install.xml @@ -4,7 +4,7 @@ i2p - 0.8.7 + 0.8.8 diff --git a/installer/resources/news.xml b/installer/resources/news.xml index 61563aae34..3b7525ae95 100644 --- a/installer/resources/news.xml +++ b/installer/resources/news.xml @@ -1,33 +1,19 @@
    -

    2011-06-27: 0.8.7 Released

    - -

    I2P release 0.8.7 contains several upgrades to long-neglected components, - including the Naming Services, graphing, the native CPU ID and BigInteger - libraries, crypto implementations, and the wrapper.

    - -

    Thanks to new contributor KillYourTV who was instrumental in implementing - and testing these upgrades, with additional support from sponge and hottuna.

    - -

    CPU ID enhancements are by hottuna, generously funded by - http://relakks.com/ and http://ipredator.se/ - - thanks to Peter Sunde and Jan-Erik Fiske for their support.

    - -

    Also, for the first time, we now have an official -I2P Personal Package Archive (PPA) on launchpad.net. -For those of you using Ubuntu, this offers an easy way to install I2P and keep the - various components up-to-date. The I2P package offers the option of installing as - a service, or it may be started on-demand as usual. This PPA is currently maintained - by KillYourTV with support by other members of the development team. -The Ubuntu/Debian installation instructions are on our website. -

    - -

    For those updating over the network, this update is about 4 times the usual size, - due to the inclusion of the jbigi updates. Please be patient while downloading the update over the network. +

    2011-08-23: 0.8.8 Released

    +

    I2P release 0.8.8 enables the new hosts.txt database to speed hostname lookups + and store additional information on hostname entries. + It also includes improvements to speed a router's integration on startup. + There is new code to detect and react to large clock shifts that should help + a router recover after suspend/resume of the computer. +

    + There are new translations for Danish and Ukranian and lots of updates in other languages. + Also included are, of course, a large collection of bug fixes, performance improvements, + and updates to deal with the continued rapid expansion of the network.

    Please help grow the network. diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 33006bcb1f..a411b00998 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 = 27; + 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); From e7285329588e75bc781c0f3585eca85d1aa8c35c Mon Sep 17 00:00:00 2001 From: kytv Date: Tue, 23 Aug 2011 22:29:36 +0000 Subject: [PATCH 11/12] copy.jar, delete.jar, etc., aren't used by anything but Windows --- build.xml | 72 ------------------------------------------------------- 1 file changed, 72 deletions(-) diff --git a/build.xml b/build.xml index 536d0458f6..96e28ab16a 100644 --- a/build.xml +++ b/build.xml @@ -1027,30 +1027,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1059,30 +1035,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1093,30 +1045,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - From 2654ada2268b18e3a84f6581cbee29aa8922b7f2 Mon Sep 17 00:00:00 2001 From: kytv Date: Tue, 23 Aug 2011 22:30:33 +0000 Subject: [PATCH 12/12] Switch from ant call target --- build.xml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build.xml b/build.xml index 96e28ab16a..5f8337525b 100644 --- a/build.xml +++ b/build.xml @@ -1117,15 +1117,10 @@ - - - - - - + - +