diff --git a/build.xml b/build.xml index 6411b2523a..3e14c6510e 100644 --- a/build.xml +++ b/build.xml @@ -2094,6 +2094,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/debian-alt/precise/control b/debian-alt/precise/control index c3f2e70090..5df01192d3 100644 --- a/debian-alt/precise/control +++ b/debian-alt/precise/control @@ -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 @@ -13,9 +13,11 @@ Build-Depends: debhelper (>= 7.0.50~) # Ant requires java 6 tools.jar: # Unable to locate tools.jar. Expected to find it in /usr/lib/jvm/java-6-openjdk-amd64/lib/tools.jar ,openjdk-6-jdk + ,glassfish-javaee ,dh-apparmor ,gettext - ,libgmp3-dev + ,libgetopt-java + ,libgmp-dev (>= 2:5.0.2) ,libservice-wrapper-java ,hardening-wrapper ,po-debconf @@ -45,7 +47,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). . @@ -72,7 +74,12 @@ Architecture: all Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, - openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, libecj-java + openjdk-8-jre-headless | openjdk-7-jre-headless | java8-runtime-headless | java7-runtime-headless, + libecj-java, + geoip-database, + gettext-base, + libgetopt-java, + glassfish-javaee Replaces: i2p ( << 0.8.6-5) Breaks: i2p (<< 0.8.6-5) Recommends: libjbigi-jni, ttf-dejavu diff --git a/debian-alt/precise/i2p-router.install b/debian-alt/precise/i2p-router.install new file mode 100644 index 0000000000..a159682ac6 --- /dev/null +++ b/debian-alt/precise/i2p-router.install @@ -0,0 +1,72 @@ +# history.txt is installed to /usr/share/i2p because +# it's shown in the router console at http://127.0.0.1:7657 +# (this is also why I don't use dh_installchangelogs -k for it) +history.txt usr/share/i2p + +pkg-temp/blocklist.txt usr/share/i2p +pkg-temp/certificates usr/share/i2p +pkg-temp/clients.config usr/share/i2p +pkg-temp/docs usr/share/i2p/ +pkg-temp/eepget usr/bin +pkg-temp/eepsite usr/share/i2p +pkg-temp/geoip usr/share/i2p +pkg-temp/hosts.txt usr/share/i2p +pkg-temp/i2prouter-nowrapper usr/bin +pkg-temp/i2psnark.config usr/share/i2p +pkg-temp/i2ptunnel.config usr/share/i2p +pkg-temp/router.config usr/share/i2p +pkg-temp/systray.config usr/share/i2p +pkg-temp/webapps usr/share/i2p + + +pkg-temp/lib/BOB.jar usr/share/i2p/lib +pkg-temp/lib/desktopgui.jar usr/share/i2p/lib +pkg-temp/lib/i2p.jar usr/share/i2p/lib +pkg-temp/lib/i2psnark.jar usr/share/i2p/lib +pkg-temp/lib/i2ptunnel.jar usr/share/i2p/lib +pkg-temp/lib/jetty-i2p.jar usr/share/i2p/lib +pkg-temp/lib/jrobin.jar usr/share/i2p/lib +pkg-temp/lib/mstreaming.jar usr/share/i2p/lib +pkg-temp/lib/routerconsole.jar usr/share/i2p/lib +pkg-temp/lib/router.jar usr/share/i2p/lib +pkg-temp/lib/sam.jar usr/share/i2p/lib +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 +# ubuntu: in trusty vivid wily xenial +# debian: in wheezy jessie stretch sid +pkg-temp/lib/jetty-continuation.jar usr/share/i2p/lib +pkg-temp/lib/jetty-deploy.jar usr/share/i2p/lib +pkg-temp/lib/jetty-http.jar usr/share/i2p/lib +pkg-temp/lib/jetty-io.jar usr/share/i2p/lib +pkg-temp/lib/jetty-rewrite-handler.jar usr/share/i2p/lib +pkg-temp/lib/jetty-security.jar usr/share/i2p/lib +pkg-temp/lib/jetty-servlet.jar usr/share/i2p/lib +pkg-temp/lib/jetty-servlets.jar usr/share/i2p/lib +pkg-temp/lib/jetty-start.jar usr/share/i2p/lib +pkg-temp/lib/jetty-util.jar usr/share/i2p/lib +pkg-temp/lib/jetty-webapp.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 +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 +# 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 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 diff --git a/debian-alt/precise/i2p-router.links b/debian-alt/precise/i2p-router.links new file mode 100644 index 0000000000..ce86a8ead0 --- /dev/null +++ b/debian-alt/precise/i2p-router.links @@ -0,0 +1,100 @@ +usr/share/common-licenses/GPL-2 usr/share/doc/i2p-router/licenses/LICENSE-GPLv2.txt +usr/share/common-licenses/LGPL-2.1 usr/share/doc/i2p-router/licenses/LICENSE-LGPLv2.1.txt +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 + + +# comment out if not building with libjetty8-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 +# 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 +# legacy name in lib/ +#usr/share/java/jetty8-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 +# legacy name in lib/ +#usr/share/java/servlet-api-3.0.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 + + +# comment out if not building with glassfish-javaee +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 + + +# comment out if not building with gettext-base +# ubuntu and debian: everywhere +usr/share/java/libintl.jar usr/share/i2p/lib/libintl.jar + + +# comment out if not building with libgetopt-java +# ubuntu and debian: everywhere +usr/share/java/gnu-getopt.jar usr/share/i2p/lib/gnu-getopt.jar + + +# comment out if not building with libhttpclient-java and libhttpcore-java +# 2 MB of dependencies vs. 20 KB of copied source +# Requires 4.4 or higher. +# Debian: Not in wheezy/jessie +# Ubuntu: Only in wily and later +#usr/share/java/httpclient.jar usr/share/i2p/lib/httpclient.jar +#usr/share/java/httpcore.jar usr/share/i2p/lib/httpcore.jar diff --git a/debian-alt/precise/rules b/debian-alt/precise/rules index a527fc1bf6..e8141ee513 100755 --- a/debian-alt/precise/rules +++ b/debian-alt/precise/rules @@ -34,6 +34,9 @@ export DEB_BUILD_HARDENING=1 #export EXTRAPREFIX := deb export JAVA_HOME I2P export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/') +# required for jbigi/jcpuid build +export BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) +#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU) %: dh $@ @@ -62,8 +65,6 @@ binary-indep: build-indep build-indep: dh_prep mkdir -p $(CURDIR)/installer/lib/wrapper/all - mkdir -p $(CURDIR)/installer/lib/launch4j/lib/ - ln -sf /usr/share/java/commons-logging.jar $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar ln -sf /usr/share/java/wrapper.jar $(CURDIR)/installer/lib/wrapper/all/wrapper.jar if [ ! -e $(CURDIR)/debian/routerversion.java.bak ]; then \ cp $(ROUTERVERSION) $(CURDIR)/debian/routerversion.java.bak; \ @@ -74,11 +75,92 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" "" else @echo "Already found deb in version, not doing anything" endif - # build options + @# build options @/bin/echo -e "javac.version=1.7" > $(CURDIR)/override.properties @/bin/echo -e "javac.compilerargs=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties + + @# 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 + @#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 + + @# 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 + 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 + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-gettext-base=true" >> $(CURDIR)/override.properties + @mkdir -p $(CURDIR)/core/java/build + ln -sf /usr/share/java/libintl.jar $(CURDIR)/core/java/build/libintl.jar + + @# debian and ubuntu: everywhere + @/bin/echo -e "with-libgetopt-java=true" >> $(CURDIR)/override.properties + @mkdir -p $(CURDIR)/core/java/build + ln -sf /usr/share/java/gnu-getopt.jar $(CURDIR)/core/java/build/gnu-getopt.jar + + @# 2 MB of dependencies vs. 20 KB of copied source + @# Requires 4.4 or higher. + @# Debian: Not in wheezy/jessie + @# Ubuntu: Only in wily and later + @#/bin/echo -e "with-libhttpclient-java=true" >> $(CURDIR)/override.properties + @#mkdir -p $(CURDIR)/core/java/build + @#ln -sf /usr/share/java/httpclient.jar $(CURDIR)/core/java/build/httpclient.jar + @#ln -sf /usr/share/java/httpcore.jar $(CURDIR)/core/java/build/httpcore.jar + TZ=UTC JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8 ant preppkg-unix javadoc echo router.updateDisabled=true > $(I2P)/router.config mv $(I2P)/runplain.sh $(I2P)/i2prouter-nowrapper