sadie/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Debian: Don't use glassfish-javaee.jar for jstl.jar (ticket #1793)

Browse Source
This commit is contained in:
zzz
2016-10-10 12:31:28 +00:00
parent 6b7d22c211
commit 1af23a4106
12 changed files with 35 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build.xml
View File

@@ -1266,7 +1266,11 @@
</target>
<!-- todo handle alt package too -->
<!--
glassfish-javaee.jar has ancient and conflicting classes, e.g. javax.mail
<target name="copyjstl-unlesspkg" unless="${with-glassfish-javaee}" >
-->
<target name="copyjstl-unlesspkg" >
<copy file="apps/susidns/src/lib/jstl.jar" todir="pkg-temp/lib/" />
</target>
@@ -2192,7 +2196,9 @@
<!-- libjetty8-java -->
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
<!-- libjstl1.1-java or glassfish-javaee -->
<!--
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
-->
<!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<!-- libtomcat6-java or libtomcat7-java -->
@@ -2275,7 +2281,9 @@
<fileset dir="../i2p-${Extended.Version}/apps/jetty/jetty-distribution-8.1.17.v20150415" />
-->
<!-- libjstl1.1-java or glassfish-javaee -->
<!--
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/jstl.jar" />
-->
<!-- libjakarta-taglibs-standard-java or glassfish-javaee -->
<file name="../i2p-${Extended.Version}/apps/susidns/src/lib/standard.jar" />
<!-- libtomcat6-java or libtomcat7-java -->

2
debian-alt/README.txt
View File

@@ -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.

2
debian-alt/doc/debian-build.txt
View File

@@ -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

3
debian-alt/precise/i2p-router.install
View File

@@ -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

3
debian-alt/precise/i2p-router.links
View File

@@ -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

3
debian-alt/precise/rules
View File

@@ -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

3
debian-alt/trusty/rules
View File

@@ -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

3
debian/i2p-router.install vendored
View File

@@ -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

3
debian/i2p-router.links vendored
View File

@@ -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

3
debian/rules vendored
View File

@@ -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

12
history.txt
View File

@@ -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

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@@ -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";