forked from I2P_Developers/i2p.i2p
propagate from branch 'i2p.i2p.zzz.jetty9' (head 80022f6ef552acd1382d45103969aa7c17b1d794)
to branch 'i2p.i2p' (head 3b4b418ae8be95d52228fc7c325fc52e0223e4fe)
This commit is contained in:
9
debian/control
vendored
9
debian/control
vendored
@ -7,11 +7,11 @@ Bugs: mailto:zzz@i2pmail.org
|
||||
Homepage: https://geti2p.net/
|
||||
Build-Depends: debhelper (>= 7.0.50~)
|
||||
,ant (>= 1.8)
|
||||
,ant-optional
|
||||
,debconf
|
||||
,openjdk-7-jdk
|
||||
,libjetty8-java, libservlet3.0-java
|
||||
,libjetty9-java
|
||||
,glassfish-javaee
|
||||
,libtomcat8-java
|
||||
,dh-apparmor
|
||||
,gettext
|
||||
,libgetopt-java
|
||||
@ -79,8 +79,9 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends},
|
||||
geoip-database,
|
||||
gettext-base,
|
||||
libgetopt-java,
|
||||
libjetty8-java, libservlet3.0-java,
|
||||
glassfish-javaee
|
||||
libjetty9-java,
|
||||
glassfish-javaee,
|
||||
libtomcat8-java
|
||||
Replaces: i2p ( << 0.8.6-5)
|
||||
Breaks: i2p (<< 0.8.6-5)
|
||||
Recommends: libjbigi-jni, ttf-dejavu
|
||||
|
||||
12
debian/i2p-router.install
vendored
12
debian/i2p-router.install
vendored
@ -34,7 +34,7 @@ pkg-temp/lib/streaming.jar usr/share/i2p/lib
|
||||
pkg-temp/lib/systray.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# uncomment if not building with libjetty8-java
|
||||
# uncomment if not building with libjetty9-java
|
||||
# ubuntu: in trusty vivid wily xenial
|
||||
# debian: in wheezy jessie stretch sid
|
||||
#pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib
|
||||
@ -51,15 +51,15 @@ pkg-temp/lib/systray.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/jetty-xml.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/org.mortbay.jetty.jar usr/share/i2p/lib
|
||||
#pkg-temp/lib/org.mortbay.jmx.jar usr/share/i2p/lib
|
||||
# following two are from libservlet3.0-java which is a dependency of libjetty8-java
|
||||
# following two are from libservlet3.0-java which is a dependency of libjetty9-java
|
||||
#pkg-temp/lib/javax.servlet.jar usr/share/i2p/lib
|
||||
|
||||
|
||||
# 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 libtomcat8-java
|
||||
#pkg-temp/lib/commons-el.jar usr/share/i2p/lib
|
||||
# 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
|
||||
#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 either glassfish-javaee or libjakarta-taglibs-standard-java
|
||||
|
||||
86
debian/i2p-router.links
vendored
86
debian/i2p-router.links
vendored
@ -6,81 +6,49 @@ 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
|
||||
|
||||
|
||||
# comment out if not building with libjetty8-java
|
||||
# comment out if not building with libjetty9-java
|
||||
# ubuntu: in trusty vivid wily xenial
|
||||
# debian: in wheezy jessie stretch sid
|
||||
usr/share/java/jetty8-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
|
||||
usr/share/java/jetty8-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
|
||||
usr/share/java/jetty8-http.jar usr/share/i2p/lib/jetty-http.jar
|
||||
usr/share/java/jetty8-io.jar usr/share/i2p/lib/jetty-io.jar
|
||||
usr/share/java/jetty9-apache-jsp.jar usr/share/i2p/lib/jetty-apache-jsp.jar
|
||||
usr/share/java/jetty9-continuation.jar usr/share/i2p/lib/jetty-continuation.jar
|
||||
usr/share/java/jetty9-deploy.jar usr/share/i2p/lib/jetty-deploy.jar
|
||||
usr/share/java/jetty9-http.jar usr/share/i2p/lib/jetty-http.jar
|
||||
usr/share/java/jetty9-io.jar usr/share/i2p/lib/jetty-io.jar
|
||||
# legacy name in lib/
|
||||
usr/share/java/jetty8-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
|
||||
usr/share/java/jetty8-security.jar usr/share/i2p/lib/jetty-security.jar
|
||||
usr/share/java/jetty8-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
|
||||
usr/share/java/jetty8-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
|
||||
usr/share/java/jetty8-start.jar usr/share/i2p/lib/jetty-start.jar
|
||||
usr/share/java/jetty8-util.jar usr/share/i2p/lib/jetty-util.jar
|
||||
usr/share/java/jetty8-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
|
||||
usr/share/java/jetty8-xml.jar usr/share/i2p/lib/jetty-xml.jar
|
||||
usr/share/java/jetty9-rewrite.jar usr/share/i2p/lib/jetty-rewrite-handler.jar
|
||||
usr/share/java/jetty9-security.jar usr/share/i2p/lib/jetty-security.jar
|
||||
usr/share/java/jetty9-servlet.jar usr/share/i2p/lib/jetty-servlet.jar
|
||||
usr/share/java/jetty9-servlets.jar usr/share/i2p/lib/jetty-servlets.jar
|
||||
usr/share/java/jetty9-start.jar usr/share/i2p/lib/jetty-start.jar
|
||||
usr/share/java/jetty9-util.jar usr/share/i2p/lib/jetty-util.jar
|
||||
usr/share/java/jetty9-webapp.jar usr/share/i2p/lib/jetty-webapp.jar
|
||||
usr/share/java/jetty9-xml.jar usr/share/i2p/lib/jetty-xml.jar
|
||||
# legacy name in lib/
|
||||
usr/share/java/jetty8-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
|
||||
usr/share/java/jetty9-server.jar usr/share/i2p/lib/org.mortbay.jetty.jar
|
||||
# legacy name in lib/
|
||||
usr/share/java/jetty8-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
|
||||
# following two are from libservlet3.0-java which is a dependency of libjetty8-java
|
||||
usr/share/java/jetty9-jmx.jar usr/share/i2p/lib/org.mortbay.jmx.jar
|
||||
# following two are from libservlet3.1-java which is a dependency of libjetty9-java
|
||||
# legacy name in lib/
|
||||
usr/share/java/servlet-api-3.0.jar usr/share/i2p/lib/javax.servlet.jar
|
||||
usr/share/java/servlet-api-3.1.jar usr/share/i2p/lib/javax.servlet.jar
|
||||
# combined into javax.servlet.jar in non-package builds
|
||||
usr/share/java/jsp-api-2.2.jar usr/share/i2p/lib/jsp-api.jar
|
||||
|
||||
|
||||
# comment out if not building with libtomcat6-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/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
|
||||
usr/share/java/jsp-api-2.3.jar usr/share/i2p/lib/jsp-api.jar
|
||||
|
||||
|
||||
# comment out if not building with libtomcat8-java
|
||||
# ubuntu: only in xenial+
|
||||
# debian: wheezy-backports, jessie+
|
||||
# legacy name, contains only tomcat-juli, not commons-logging
|
||||
#usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
|
||||
#usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
|
||||
usr/share/java/tomcat8-juli.jar usr/share/i2p/lib/commons-logging.jar
|
||||
usr/share/java/tomcat8-jasper.jar usr/share/i2p/lib/jasper-runtime.jar
|
||||
# combined into jasper-runtime.jar in non-package builds
|
||||
#usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
|
||||
# tomcat 7 only
|
||||
#usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
|
||||
#usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
|
||||
usr/share/java/tomcat8-coyote.jar usr/share/i2p/lib/tomcat-coyote.jar
|
||||
usr/share/java/tomcat8-api.jar usr/share/i2p/lib/tomcat-api.jar
|
||||
usr/share/java/tomcat8-util.jar usr/share/i2p/lib/tomcat-util.jar
|
||||
usr/share/java/tomcat8-util-scan.jar usr/share/i2p/lib/tomcat-util-scan.jar
|
||||
# combined into commons-el.jar in non-package builds
|
||||
#usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
|
||||
usr/share/java/tomcat8-jasper-el.jar usr/share/i2p/lib/jasper-el.jar
|
||||
# legacy name in lib/
|
||||
#usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
|
||||
usr/share/java/tomcat8-el-api.jar usr/share/i2p/lib/commons-el.jar
|
||||
|
||||
|
||||
# comment out if not building with glassfish-javaee
|
||||
|
||||
83
debian/rules
vendored
83
debian/rules
vendored
@ -83,61 +83,40 @@ endif
|
||||
@# debian and ubuntu: everywhere
|
||||
@/bin/echo -e "with-geoip-database=true" >> $(CURDIR)/override.properties
|
||||
|
||||
@# ubuntu: not in precise
|
||||
@# debian: in wheezy jessie stretch sid
|
||||
@/bin/echo -e "with-libjetty8-java=true" >> $(CURDIR)/override.properties
|
||||
@# ubuntu: in xenial
|
||||
@# debian: in jessie-backports stretch sid
|
||||
@/bin/echo -e "with-libjetty9-java=true" >> $(CURDIR)/override.properties
|
||||
mkdir -p $(CURDIR)/apps/jetty/jettylib
|
||||
ln -sf /usr/share/java/jetty8-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
|
||||
ln -sf /usr/share/java/jetty8-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
|
||||
ln -sf /usr/share/java/jetty8-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
|
||||
ln -sf /usr/share/java/jetty8-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
|
||||
ln -sf /usr/share/java/jetty8-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
|
||||
ln -sf /usr/share/java/jetty8-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
|
||||
ln -sf /usr/share/java/jetty8-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
|
||||
ln -sf /usr/share/java/jetty8-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
|
||||
ln -sf /usr/share/java/jetty8-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
|
||||
ln -sf /usr/share/java/jetty8-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
|
||||
ln -sf /usr/share/java/jetty8-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
|
||||
ln -sf /usr/share/java/jetty8-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
|
||||
ln -sf /usr/share/java/jetty8-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
|
||||
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.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-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
|
||||
@#mkdir -p $(CURDIR)/apps/jetty/jettylib
|
||||
@#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
|
||||
ln -sf /usr/share/java/jetty9-continuation.jar $(CURDIR)/apps/jetty/jettylib/jetty-continuation.jar
|
||||
ln -sf /usr/share/java/jetty9-deploy.jar $(CURDIR)/apps/jetty/jettylib/jetty-deploy.jar
|
||||
ln -sf /usr/share/java/jetty9-http.jar $(CURDIR)/apps/jetty/jettylib/jetty-http.jar
|
||||
ln -sf /usr/share/java/jetty9-io.jar $(CURDIR)/apps/jetty/jettylib/jetty-io.jar
|
||||
ln -sf /usr/share/java/jetty9-rewrite.jar $(CURDIR)/apps/jetty/jettylib/jetty-rewrite-handler.jar
|
||||
ln -sf /usr/share/java/jetty9-security.jar $(CURDIR)/apps/jetty/jettylib/jetty-security.jar
|
||||
ln -sf /usr/share/java/jetty9-servlet.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlet.jar
|
||||
ln -sf /usr/share/java/jetty9-servlets.jar $(CURDIR)/apps/jetty/jettylib/jetty-servlets.jar
|
||||
ln -sf /usr/share/java/jetty9-start.jar $(CURDIR)/apps/jetty/jettylib/jetty-start.jar
|
||||
ln -sf /usr/share/java/jetty9-util.jar $(CURDIR)/apps/jetty/jettylib/jetty-util.jar
|
||||
ln -sf /usr/share/java/jetty9-webapp.jar $(CURDIR)/apps/jetty/jettylib/jetty-webapp.jar
|
||||
ln -sf /usr/share/java/jetty9-xml.jar $(CURDIR)/apps/jetty/jettylib/jetty-xml.jar
|
||||
ln -sf /usr/share/java/jetty9-server.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jetty.jar
|
||||
ln -sf /usr/share/java/jetty9-jmx.jar $(CURDIR)/apps/jetty/jettylib/org.mortbay.jmx.jar
|
||||
@# following two are from libservlet3.1-java which is a dependency of libjetty9-java
|
||||
ln -sf /usr/share/java/servlet-api-3.1.jar $(CURDIR)/apps/jetty/jettylib/javax.servlet.jar
|
||||
@# this is roughly the same as tomcat8-jsp-api.jar, we use this one
|
||||
ln -sf /usr/share/java/jsp-api-2.3.jar $(CURDIR)/apps/jetty/jettylib/jsp-api.jar
|
||||
|
||||
@# debian and ubuntu: wheezy-backports, jessie+, xenial+
|
||||
@#/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
|
||||
@#mkdir -p $(CURDIR)/apps/jetty/jettylib
|
||||
@#ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
|
||||
@#ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
|
||||
@#ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
|
||||
@#ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
|
||||
@#ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
|
||||
@#ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
|
||||
@#ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
|
||||
/bin/echo -e "with-libtomcat8-java=true" >> $(CURDIR)/override.properties
|
||||
mkdir -p $(CURDIR)/apps/jetty/jettylib
|
||||
ln -sf /usr/share/java/tomcat8-api.jar $(CURDIR)/apps/jetty/jettylib/tomcat-api.jar
|
||||
ln -sf /usr/share/java/tomcat8-coyote.jar $(CURDIR)/apps/jetty/jettylib/tomcat-coyote.jar
|
||||
ln -sf /usr/share/java/tomcat8-el-api.jar $(CURDIR)/apps/jetty/jettylib/commons-el.jar
|
||||
ln -sf /usr/share/java/tomcat8-jasper.jar $(CURDIR)/apps/jetty/jettylib/jasper-runtime.jar
|
||||
ln -sf /usr/share/java/tomcat8-jasper-el.jar $(CURDIR)/apps/jetty/jettylib/jasper-el.jar
|
||||
ln -sf /usr/share/java/tomcat8-juli.jar $(CURDIR)/apps/jetty/jettylib/commons-logging.jar
|
||||
ln -sf /usr/share/java/tomcat8-util.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util.jar
|
||||
ln -sf /usr/share/java/tomcat8-util-scan.jar $(CURDIR)/apps/jetty/jettylib/tomcat-util-scan.jar
|
||||
|
||||
@# debian and ubuntu: everywhere
|
||||
@/bin/echo -e "with-glassfish-javaee=true" >> $(CURDIR)/override.properties
|
||||
|
||||
Reference in New Issue
Block a user