forked from I2P_Developers/i2p.i2p
Debian:
Prep for dependency on libtomcat7 Doesn't work yet, breaks susidns. glassfish-javaee for jstl.jar and standard.jar version 1.2 won't work with tomcat7, it's ancient and not compatible with recent el libs. Add back option to depend on libjakarta-taglibs-standard and libjstl1.1-java which are version 1.1.2, but not clear if they will work with tomcat7 either, even though they are dependencies of libjetty8-extra-java. We switched from JSTL 1.1.2 to JSTL 1.2 when we went from Jetty 5 to Jetty 6 in 2012. 1.2 libs are not available anywhere except for Glassfish, and Debian only has the ancient Java EE 5 Glassfish 2.1. Not clear there's any way to get susidns (and bote) to work with both Tomcat 6 and 7. - Fix wrong jsp-api version - Fix other minor errors in install and links files. - Log stack trace for Jetty warnings if log level is WARN - SusiDNS: Move standard.jar and jstl.jar out of WEB-INF/lib, where Tomcat 7 build refuses to find them
This commit is contained in:
4
debian/control
vendored
4
debian/control
vendored
@@ -4,7 +4,7 @@ Section: net
|
||||
Standards-Version: 3.9.6
|
||||
Priority: optional
|
||||
Bugs: mailto:zzz@i2pmail.org
|
||||
Homepage: https://geti2p.net
|
||||
Homepage: https://geti2p.net/
|
||||
Build-Depends: debhelper (>= 7.0.50~)
|
||||
,ant (>= 1.8)
|
||||
,ant-optional
|
||||
@@ -45,7 +45,7 @@ Architecture: any
|
||||
Section: java
|
||||
Priority: optional
|
||||
Depends: ${shlibs:Depends}, i2p-router
|
||||
Homepage: http://www.i2p2.de/jbigi
|
||||
Homepage: https://geti2p.net/
|
||||
Description: Java Big Integer library
|
||||
This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid).
|
||||
.
|
||||
|
||||
16
debian/i2p-router.install
vendored
16
debian/i2p-router.install
vendored
@@ -56,22 +56,18 @@ pkg-temp/lib/systray.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with libservlet2.5-java
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
# uncomment if not building with either libtomcat6-java or libtomcat7-java
|
||||
pkg-temp/lib/commons-el.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with libtomcat6-java
|
||||
# ubuntu: only in precise trusty vivid
|
||||
# debian: only in wheezy
|
||||
# todo: see if libtomcat7-java will work
|
||||
# legacy name, contains only tomcat-juli, not commons-logging
|
||||
pkg-temp/lib/commons-logging.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/jasper-runtime.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with glassfish-javaee
|
||||
# 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
|
||||
|
||||
|
||||
# uncomment if not building with either glassfish-javaee or libjstl1.1-java
|
||||
# ubuntu and debian: everywhere
|
||||
#pkg-temp/lib/standard.jar usr/share/i2p/lib
|
||||
|
||||
43
debian/i2p-router.links
vendored
43
debian/i2p-router.links
vendored
@@ -3,7 +3,7 @@ usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGP
|
||||
usr/share/common-licenses/Apache-2.0 usr/share/doc/i2p-router/licenses/LICENSE-Apache2.0.txt
|
||||
usr/share/common-licenses/BSD usr/share/doc/i2p-router/licenses/LICENSE-BSD.txt
|
||||
|
||||
usr/share/java/eclipse-ecj.jar /usr/share/i2p/lib/eclipse-ecj.jar
|
||||
usr/share/java/eclipse-ecj.jar usr/share/i2p/lib/eclipse-ecj.jar
|
||||
|
||||
|
||||
# comment out if not building with libjetty8-java
|
||||
@@ -33,24 +33,49 @@ usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
|
||||
usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
|
||||
|
||||
|
||||
# comment out if not building with libservlet2.5-java
|
||||
# ubuntu: only in wily
|
||||
# debian: in wheezy jessie stretch sid
|
||||
#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
|
||||
|
||||
|
||||
# comment out if not building with libtomcat6-java
|
||||
# ubuntu: only in precise trusty vivid
|
||||
# debian: only in wheezy
|
||||
# todo: see if libtomcat7-java will work
|
||||
# legacy name, contains only tomcat-juli, not commons-logging
|
||||
#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
|
||||
#usr/share/java/jasper.jar usr/share/i2p/lib/jasper-runtime.jar
|
||||
# combined into jasper-runtime.jar in non-package builds
|
||||
#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
|
||||
# combined into commons-el.jar in non-package builds
|
||||
#usr/share/java/jasper-el.jar usr/share/i2p/lib/jasper-el.jar
|
||||
# following is from libservlet2.5-java which is a dependency of libtomcat6-java
|
||||
# legacy name in lib/
|
||||
#usr/share/java/el-api-2.1.jar usr/share/i2p/lib/commons-el.jar
|
||||
|
||||
|
||||
# comment out if not building with libtomcat7-java
|
||||
# ubuntu: only in precise trusty vivid
|
||||
# debian: only in wheezy
|
||||
# legacy name, contains only tomcat-juli, not commons-logging
|
||||
#usr/share/java/tomcat-juli.jar usr/share/i2p/lib/commons-logging.jar
|
||||
#usr/share/java/tomcat-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
|
||||
# combined into jasper-runtime.jar in non-package builds
|
||||
#usr/share/java/tomcat-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
|
||||
# tomcat 7 only
|
||||
#usr/share/java/tomcat-api.jar usr/share/i2p/lib/tomcat-api.jar
|
||||
#usr/share/java/tomcat-util.jar usr/share/i2p/lib/tomcat-util.jar
|
||||
# combined into commons-el.jar in non-package builds
|
||||
#usr/share/java/tomcat-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
|
||||
# following is from libservlet3.0-java which is a dependency of libtomcat7-java
|
||||
# legacy name in lib/
|
||||
#usr/share/java/el-api-2.2.jar usr/share/i2p/lib/commons-el.jar
|
||||
|
||||
|
||||
# comment out if not building with glassfish-javaee
|
||||
# ubuntu and debian: everywhere
|
||||
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
|
||||
|
||||
|
||||
# comment out if not building with libjakarta-taglibs-standard-java
|
||||
# ubuntu and debian: everywhere
|
||||
#usr/share/java/standard.jar usr/share/i2p/lib/standard.jar
|
||||
|
||||
|
||||
# comment out if not building with libjstl1.1-java
|
||||
# ubuntu and debian: everywhere
|
||||
#usr/share/java/jstl1.1.jar usr/share/i2p/lib/jstl.jar
|
||||
|
||||
32
debian/rules
vendored
32
debian/rules
vendored
@@ -101,35 +101,43 @@ endif
|
||||
ln -sf /usr/share/java/jetty8-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
|
||||
@# following two are from libservlet3.0-java which is a dependency of libjetty8-java
|
||||
ln -sf /usr/share/java/servlet-api-3.0.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
|
||||
ln -sf /usr/share/java/jsp-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
|
||||
|
||||
@# ubuntu: only in wily
|
||||
@# debian: in wheezy jessie stretch sid
|
||||
@#mkdir -p $(CURDIR)/apps/jetty/jettylib
|
||||
@#@/bin/echo -e "with-libservlet2.5-java=true" >> $(CURDIR)/override.properties
|
||||
@#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
|
||||
ln -sf /usr/share/java/jsp-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
|
||||
|
||||
@# ubuntu: only in precise trusty vivid
|
||||
@# debian: only in wheezy
|
||||
@#@/bin/echo -e "with-libtomcat6-java=true" >> $(CURDIR)/override.properties
|
||||
@#mkdir -p $(CURDIR)/apps/jetty/jettylib
|
||||
@#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
|
||||
@#ln -sf /usr/share/java/jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
|
||||
@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
|
||||
@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
|
||||
@#ln -sf /usr/share/java/jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
|
||||
@# following is from libservlet2.5-java which is a dependency of libtomcat6-java
|
||||
@#ln -sf /usr/share/java/el-api-2.1.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
|
||||
|
||||
@# debian and ubuntu: everywhere
|
||||
@#@/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
|
||||
@#/bin/echo -e "with-libtomcat7-java=true" >> $(CURDIR)/override.properties
|
||||
@#mkdir -p $(CURDIR)/apps/jetty/jettylib
|
||||
@#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-compiler.jar
|
||||
@#ln -sf /usr/share/java/tomcat-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
|
||||
@#ln -sf /usr/share/java/tomcat-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
|
||||
@#ln -sf /usr/share/java/tomcat-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
|
||||
@#ln -sf /usr/share/java/tomcat-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
|
||||
@#ln -sf /usr/share/java/tomcat-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
|
||||
@#ln -sf /usr/share/java/tomcat-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
|
||||
@# following is from libservlet3.0-java which is a dependency of libtomcat7-java
|
||||
@#ln -sf /usr/share/java/el-api-2.2.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
|
||||
|
||||
@# 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/WEB-INF/lib/jstl.jar
|
||||
ln -sf /usr/share/java/glassfish-appserv-jstl.jar $(CURDIR)/apps/susidns/src/WEB-INF/lib/standard.jar
|
||||
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
|
||||
@#/bin/echo -e "with-libjakarta-taglibs-standard-java=true" >> $(CURDIR)/override.properties
|
||||
@#ln -sf /usr/share/java/standard.jar $(CURDIR)/apps/susidns/src/lib/standard.jar
|
||||
|
||||
@# debian and ubuntu: everywhere
|
||||
@#/bin/echo -e "with-libjstl1.1-java=true" >> $(CURDIR)/override.properties
|
||||
@#ln -sf /usr/share/java/jstl1.1.jar $(CURDIR)/apps/susidns/src/lib/jstl.jar
|
||||
|
||||
TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc
|
||||
echo router.updateDisabled=true > $(I2P)/router.config
|
||||
|
||||
Reference in New Issue
Block a user