diff --git a/build.xml b/build.xml index 847629bb2a..0438ae8ba3 100644 --- a/build.xml +++ b/build.xml @@ -1266,7 +1266,11 @@ + + @@ -2192,7 +2196,9 @@ + @@ -2275,7 +2281,9 @@ --> + diff --git a/debian-alt/README.txt b/debian-alt/README.txt index 2e18105686..9bc53dd6d6 100644 --- a/debian-alt/README.txt +++ b/debian-alt/README.txt @@ -18,3 +18,5 @@ Starting with release 0.9.26, we will attempt to test debian builds before the release, and check in any required changes to debian/ and debian-alt/ before the release, so that the files may actually be used to build the release. + +See additional documentation in the doc/ directory. diff --git a/debian-alt/doc/debian-build.txt b/debian-alt/doc/debian-build.txt index 2aef1ceac4..b9a8452977 100644 --- a/debian-alt/doc/debian-build.txt +++ b/debian-alt/doc/debian-build.txt @@ -62,7 +62,7 @@ reprepro includedeb stable i2p-router_0.9.xx-1_all.deb reprepro includedeb stable libjbigi-jni_0.9.xx-1_amd64.deb reprepro includedeb stable i2p_0.9.xx-1_all.deb # if you already got the source from launchpad -# with reprepro update, skip this? +# with reprepro update, skip this. reprepro includedsc stable i2p_0.9.XX-1.dsc # copy built packages from launchpad diff --git a/debian-alt/precise/i2p-router.install b/debian-alt/precise/i2p-router.install index a159682ac6..2234bf8cdd 100644 --- a/debian-alt/precise/i2p-router.install +++ b/debian-alt/precise/i2p-router.install @@ -64,7 +64,8 @@ pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib # uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java # ubuntu and debian: everywhere -#pkg-temp/lib/jstl.jar usr/share/i2p/lib +# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail +pkg-temp/lib/jstl.jar usr/share/i2p/lib # uncomment if not building with either glassfish-javaee or libjstl1.1-java diff --git a/debian-alt/precise/i2p-router.links b/debian-alt/precise/i2p-router.links index ce86a8ead0..e3aa80d785 100644 --- a/debian-alt/precise/i2p-router.links +++ b/debian-alt/precise/i2p-router.links @@ -67,7 +67,8 @@ usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar # comment out if not building with glassfish-javaee -usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar +# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail +#usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar diff --git a/debian-alt/precise/rules b/debian-alt/precise/rules index e8141ee513..4afb564189 100755 --- a/debian-alt/precise/rules +++ b/debian-alt/precise/rules @@ -131,7 +131,8 @@ endif @# debian and ubuntu: everywhere @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties - ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar + @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail + @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar @# debian and ubuntu: everywhere diff --git a/debian-alt/trusty/rules b/debian-alt/trusty/rules index 345aa3b053..257162006c 100755 --- a/debian-alt/trusty/rules +++ b/debian-alt/trusty/rules @@ -130,7 +130,8 @@ endif @# debian and ubuntu: everywhere @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties - ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar + @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail + @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar @# debian and ubuntu: everywhere diff --git a/debian/i2p-router.install b/debian/i2p-router.install index ef9362a639..a61b4e834e 100644 --- a/debian/i2p-router.install +++ b/debian/i2p-router.install @@ -64,7 +64,8 @@ pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib # uncomment if not building with either glassfish-javaee or libjakarta-taglibs-standard-java # ubuntu and debian: everywhere -#pkg-temp/lib/jstl.jar usr/share/i2p/lib +# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail +pkg-temp/lib/jstl.jar usr/share/i2p/lib # uncomment if not building with either glassfish-javaee or libjstl1.1-java diff --git a/debian/i2p-router.links b/debian/i2p-router.links index 791d4dda7f..50119ec3ba 100644 --- a/debian/i2p-router.links +++ b/debian/i2p-router.links @@ -67,7 +67,8 @@ usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar # comment out if not building with glassfish-javaee -usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar +# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail +#usr/share/java/glassfish-javaee.jar usr/share/i2p/lib/jstl.jar usr/share/java/glassfish-appserv-jstl.jar usr/share/i2p/lib/standard.jar diff --git a/debian/rules b/debian/rules index 0cc4ff9143..b83df03a45 100755 --- a/debian/rules +++ b/debian/rules @@ -130,7 +130,8 @@ endif @# debian and ubuntu: everywhere @/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties - ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar + @# glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail + @#ln -sf /usr/share/java/glassfish-javaee.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/lib/standard.jar @# debian and ubuntu: everywhere diff --git a/history.txt b/history.txt index 3464d5e8d9..b7ffad7a47 100644 --- a/history.txt +++ b/history.txt @@ -1,15 +1,21 @@ +2016-10-10 zzz + * Debian: Don't use glassfish-javaee.jar for jstl.jar (ticket #1793) + +2016-10-06 zzz + * GeoIP: Update from Maxmind 2016-10-04 + 2016-10-02 zzz * Crypto: Add EdDSA private key spec constructor for hash * i2psnark: Add standalone shutdown method * i2ptunnel: Registration page layout fixes * SusiMail: - Show settings button even if no messages - - Add nonce to forms + - Add nonce to forms (thx Kevin Froman) 2016-09-24 zzz * DesktopGUI: Enable by default on Windows * i2ptunnel: - - Accept default 'mysite.i2p' as a valid spoof host + - Don't accept default 'mysite.i2p' as a valid spoof host - Don't wrap destination in status message box * Reseed: Remove user.mx24.eu as requested * Utils: Move SipHashInline from util to crypto @@ -65,7 +71,7 @@ * Streaming: Kill accept() when session disconnects 2016-06-25 zzz - * SSU peer testing: Add implementation (ticket #1752; proposal #126) + * SSU peer testing: Add IPv6 implementation (ticket #1752; proposal #126) * Utils: Improve random seed initialization 2016-06-22 zzz diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index cef5686075..59b43357e5 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 = 12; + public final static long BUILD = 13; /** for example "-test" */ public final static String EXTRA = "-rc";