<%=intl._("I2P Version & Running Environment")%>
-
<%=intl._("Please report bugs on trac.i2p2.i2p or trac.i2p2.de.")%>
+
+<% /* note to translators - both parameters are URLs */
+%><%=intl._("Please report bugs on {0} or {1}.",
+ "trac.i2p2.i2p",
+ "trac.i2p2.de")%>
<%=intl._("You may use the username \"guest\" and password \"guest\" if you do not wish to register.")%>
<%=intl._("Please include this information in bug reports")%>:
diff --git a/core/java/src/net/i2p/data/Base64.java b/core/java/src/net/i2p/data/Base64.java
index b5e03b03c..fe730af6b 100644
--- a/core/java/src/net/i2p/data/Base64.java
+++ b/core/java/src/net/i2p/data/Base64.java
@@ -80,7 +80,9 @@ public class Base64 {
}
/**
+ * Decodes data from Base64 notation.
* @param s Base 64 encoded string using the I2P alphabet A-Z, a-z, 0-9, -, ~
+ * @return the decoded data, null on error
*/
public static byte[] decode(String s) {
return safeDecode(s, false);
@@ -234,6 +236,7 @@ public class Base64 {
System.out.println("or : Base64 test");
}
+/*******
private static void test() {
String orig = "you smell";
String encoded = Base64.encode(orig.getBytes());
@@ -255,6 +258,7 @@ public class Base64 {
else
throw new RuntimeException("D(E([all bytes])) != [all bytes]!!!");
}
+*******/
/* ******** E N C O D I N G M E T H O D S ******** */
diff --git a/core/java/src/net/i2p/data/SimpleDataStructure.java b/core/java/src/net/i2p/data/SimpleDataStructure.java
index 16a2ec88e..96c1585c5 100644
--- a/core/java/src/net/i2p/data/SimpleDataStructure.java
+++ b/core/java/src/net/i2p/data/SimpleDataStructure.java
@@ -82,10 +82,20 @@ public abstract class SimpleDataStructure extends DataStructureImpl {
return Base64.encode(_data);
}
+ /**
+ * Sets the data.
+ * @throws DataFormatException if decoded data is not the legal number of bytes or on decoding error
+ */
@Override
public void fromBase64(String data) throws DataFormatException {
if (data == null) throw new DataFormatException("Null data passed in");
- _data = Base64.decode(data);
+ byte[] d = Base64.decode(data);
+ if (d == null)
+ throw new DataFormatException("Bad Base64 encoded data");
+ if (d.length != _length)
+ throw new DataFormatException("Bad decoded data length, expected " + _length + " got " + d.length);
+ // call setData() instead of _data = data in case overridden
+ setData(d);
}
/** @return the SHA256 hash of the byte array, or null if the data is null */
@@ -106,7 +116,7 @@ public abstract class SimpleDataStructure extends DataStructureImpl {
/**
* Overridden for efficiency.
- * Does the same thing as getData() but null not allowed.
+ * Does the same thing as setData() but null not allowed.
* @param data non-null
* @throws DataFormatException if null or wrong length
*/
@@ -114,7 +124,8 @@ public abstract class SimpleDataStructure extends DataStructureImpl {
public void fromByteArray(byte data[]) throws DataFormatException {
if (data == null) throw new DataFormatException("Null data passed in");
if (data.length != _length) throw new DataFormatException("Bad data length");
- _data = data;
+ // call setData() instead of _data = data in case overridden
+ setData(data);
}
@Override
diff --git a/debian/changelog b/debian/changelog
index 1e92507d8..110bae03b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+i2p (0.8.1-4) all; urgency=low
+ * I2P 0.8.1-6
+ * Closes: #448638
+ -- Hungry Hobo Mon, 24 Nov 2010 17:14:57 +0000
+
+i2p (0.8.1-3) all; urgency=low
+ * I2P 0.8.1-3
+ -- Hungry Hobo Mon, 21 Nov 2010 17:14:57 +0000
+
i2p (0.8.1) all; urgency=low
* Speedups
* Bugfixes
diff --git a/debian/makerepo.sh b/debian/makerepo.sh
index ad845f31d..4f1078627 100755
--- a/debian/makerepo.sh
+++ b/debian/makerepo.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# This script creates a Debian repository in ${DIR} using the reprepro tool.
# The packages are signed with the key referenced in the newest changelog entry.
@@ -9,9 +9,7 @@ DIR=./repo
CONFDIR=conf
CONFFILE=${CONFDIR}/distributions
-SIGNER=`parsechangelog --file changelog | grep Maintainer | cut -d: -f2`
-SIGNER=${SIGNER//^ /}
-SIGNER=`echo ${SIGNER} | cut -d\ -f1`
+SIGNER=`parsechangelog --file changelog | grep Maintainer | cut -d\< -f2 | cut -d\> -f1`
KEYID=`gpg --list-keys "${SIGNER}" | cut -d: -f2 | grep -w pub | cut -d/ -f2 | cut -d\ -f1`
echo Using signing key: ${SIGNER}
echo Key ID: ${KEYID}
diff --git a/history.txt b/history.txt
index 398b6ca0c..b9ff2738b 100644
--- a/history.txt
+++ b/history.txt
@@ -1,3 +1,29 @@
+2010-11-24 zzz
+ * configui: Add .pt
+ * configtunnels: Log cleanup
+ * graphs: Synch to conserve memory; cleanup
+ * i2psnark:
+ - Prevent dup requests during end game
+ (ticket 331 - thanks sponge and Oct!)
+ - POST parameter tweaks
+ - Message cleanup
+ * logs: Add trac login hint
+ * Router:
+ - Save some info to config file when installing or updating
+ - Remove global lock on accessing config
+ - Add global lock on reading/writing config file
+ * SimpleDataStructure: Fix problem in fromBase64() that
+ manifested itself as a configtunnels.jsp bug
+
+2010-11-24 sponge
+ * Slackware, fix rc.i2p, bad logic.
+
+2010-11-24 sponge
+ * Plugin: ticket 104 Fix webapp isRunning to check ALL webapps.
+ The only defecency is that if one is running, that it considers the
+ entire pliugin to be running. I'm not sure if that is a good thing
+ or a bad thing, but the other code checks threads that way.
+
2010-11-22 zzz
* Addressbook: Fix rename error on Windows (tkt 323 - thanks RN!)
* build.xml: Cleanup, fix distclean error in older ants.
diff --git a/installer/resources/readme/readme.html b/installer/resources/readme/readme.html
index 9e1f5ed1d..a1f881f13 100644
--- a/installer/resources/readme/readme.html
+++ b/installer/resources/readme/readme.html
@@ -6,7 +6,7 @@
- 
+ 
diff --git a/installer/resources/readme/readme_de.html b/installer/resources/readme/readme_de.html
index b4188c9b1..1b3ba8e1a 100644
--- a/installer/resources/readme/readme_de.html
+++ b/installer/resources/readme/readme_de.html
@@ -6,7 +6,7 @@
-
+
diff --git a/installer/resources/readme/readme_es.html b/installer/resources/readme/readme_es.html
index 286493a9a..2916cfed8 100644
--- a/installer/resources/readme/readme_es.html
+++ b/installer/resources/readme/readme_es.html
@@ -6,7 +6,7 @@
-
+
diff --git a/installer/resources/readme/readme_fr.html b/installer/resources/readme/readme_fr.html
index 5deef6444..077479b3e 100644
--- a/installer/resources/readme/readme_fr.html
+++ b/installer/resources/readme/readme_fr.html
@@ -6,7 +6,7 @@
![](\"/themes/snark/ubergine/images/add.png\")
");
out.write(_("Add Torrent"));
@@ -1036,6 +1044,10 @@ public class I2PSnarkServlet extends Default {
out.write("![](\"/themes/snark/ubergine/images/status.png\"");)
\n");
out.write("\n");
out.write("\n");
+ // don't lose peer setting
+ String peerParam = req.getParameter("p");
+ if (peerParam != null)
+ out.write("\n");
out.write("