diff --git a/debian/NEWS b/debian/NEWS
index 4f163c621e5ee6785811412b26770051d036c181..38e309017af4f41b97b450cb5177e6d283cfd843 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,8 +4,8 @@ i2p (0.8.6-5) stable; urgency=low
Instead the file /etc/i2p/wrapper.config is used with the changes that used to
be in wrapper.service have been moved to the initscript. If you have changed
the amount of memory set aside for I2P, you'll need to make that change to
- /etc/i2p/wrapper.config.
-
+ /etc/i2p/wrapper.config.
+
The I2P router is now split into four different packages: i2p, i2p-doc,
i2p-router, and libjbigi.
diff --git a/debian/changelog b/debian/changelog
index 44d2292f029528a919c3d8ef1282351ed927ccb2..4f7cc85be3bbcedf90d55dfda37b1ab85f08d431 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+i2p (0.9.24-1) unstable; urgency=medium
+
+ * New upstream version 0.9.24
+
+ -- Kill Your TV <killyourtv@i2pmail.org> Sat, 30 Jan 2016 12:08:27 +0000
+
i2p (0.9.23-2) unstable; urgency=medium
* Backport of two fixes from after the release of 0.9.23
diff --git a/debian/control b/debian/control
index af289f1f52555ac479d8684da20583d8d27700b7..6bf4bf55384f7a871346968e279eacff3be28bd8 100644
--- a/debian/control
+++ b/debian/control
@@ -18,8 +18,7 @@ Build-Depends: debhelper (>= 7.0.50~)
,libcommons-logging-java
,hardening-wrapper
,po-debconf
-# Uncomment the next line for Debian unstable or Ubuntu Saucy (and newer)
-# ,dh-systemd
+ ,dh-systemd
Package: i2p
Architecture: all
@@ -27,6 +26,7 @@ Section: net
Priority: optional
Depends: ${java:Depends}, ${shlibs:Depends},
adduser,
+ debconf,
i2p-router (>= 0.8.6-5),
libjbigi-jni,
lsb-base,
@@ -77,6 +77,7 @@ Replaces: i2p ( << 0.8.6-5)
Breaks: i2p (<< 0.8.6-5)
Recommends: libjbigi-jni, ttf-dejavu
Suggests: tor
+ ,apparmor
,i2p-messenger
,i2phex
,i2p-tahoe-lafs
diff --git a/debian/i2p-doc.preinst b/debian/i2p-doc.preinst
index 85a2c4575a3cbc7a6b6623cca868e9897b86cebf..34a9aefe74c7396d3f6c9444570be0b2f9a5229b 100644
--- a/debian/i2p-doc.preinst
+++ b/debian/i2p-doc.preinst
@@ -9,7 +9,7 @@ if [ ! -z $2 ]; then
if dpkg --compare-versions $2 lt 0.8.7-3; then
test -d /usr/share/doc/i2p-doc/api \
&& rm -rf /usr/share/doc/i2p-doc/api
- fi
+ fi
fi
#DEBHELPER#
diff --git a/debian/i2p.templates b/debian/i2p.templates
index 7449c90d1a451309b5d67843c8ea2f62f6df54fd..ec464951aebd8928824cc2263705812fa9c3329d 100644
--- a/debian/i2p.templates
+++ b/debian/i2p.templates
@@ -37,6 +37,6 @@ _Description: Memory that can be allocated to I2P:
Template: i2p/aa
Type: boolean
Default: true
-_Description: Run I2P daemon confined with AppArmor
+_Description: Should the I2P daemon be confined with AppArmor?
With this option enabled I2P will be sandboxed with AppArmor, restricting which files and
directories may be accessed by I2P.
diff --git a/debian/patches/0002-jbigi-soname.patch b/debian/patches/0002-jbigi-soname.patch
index f1522a86b4f1eee8ee5e7f54e9e0f861ba8dd4f2..416ea47b3812878c0b7f592e695bc8640c83b859 100644
--- a/debian/patches/0002-jbigi-soname.patch
+++ b/debian/patches/0002-jbigi-soname.patch
@@ -6,12 +6,14 @@ The purpose of this patch is to change the path that build_jbigi.sh
expects to find the source files at. At the same time I'm specifying
a soname to shut lintian up.
---
- core/c/jbigi/build_jbigi.sh | 4 ++--
+ core/c/jbigi/build_jbigi.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/core/c/jbigi/build_jbigi.sh b/core/c/jbigi/build_jbigi.sh
+index 1521392..6a89c92 100755
--- a/core/c/jbigi/build_jbigi.sh
+++ b/core/c/jbigi/build_jbigi.sh
-@@ -39,7 +39,7 @@
+@@ -39,7 +39,7 @@ SunOS*|OpenBSD*|NetBSD*|*FreeBSD*|Linux*)
UNIXTYPE="linux"
fi
COMPILEFLAGS="-fPIC -Wall $CFLAGS"
@@ -20,7 +22,7 @@ a soname to shut lintian up.
LINKFLAGS="-shared -Wl,-soname,libjbigi.so"
LIBFILE="libjbigi.so";;
*)
-@@ -58,7 +58,7 @@
+@@ -58,7 +58,7 @@ fi
echo "Compiling C code..."
rm -f jbigi.o $LIBFILE
diff --git a/debian/patches/0003-renaming-jcpuid.patch b/debian/patches/0003-rename-jcpuid.patch
similarity index 82%
rename from debian/patches/0003-renaming-jcpuid.patch
rename to debian/patches/0003-rename-jcpuid.patch
index 6462ab07f2fb4df83b9f6f55841b3e506f1eb5c2..3afff1bae58489532cde60e081f3ee55906619e7 100644
--- a/debian/patches/0003-renaming-jcpuid.patch
+++ b/debian/patches/0003-rename-jcpuid.patch
@@ -3,12 +3,14 @@ Date: Tue, 24 May 2011 21:26:10 +0000
Subject: rename jcpuid
---
- core/c/jcpuid/build.sh | 8 ++------
+ core/c/jcpuid/build.sh | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
+diff --git a/core/c/jcpuid/build.sh b/core/c/jcpuid/build.sh
+index 5b63c6c..f39148d 100755
--- a/core/c/jcpuid/build.sh
+++ b/core/c/jcpuid/build.sh
-@@ -75,12 +75,8 @@
+@@ -75,12 +75,8 @@ case `uname -s` in
exit 0;;
esac
diff --git a/debian/patches/0004-jetty6.patch b/debian/patches/0004-jetty6.patch
deleted file mode 100644
index c245d75df1fe97ca1629ce49f5704f61ba00ae46..0000000000000000000000000000000000000000
--- a/debian/patches/0004-jetty6.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-From: Kill Your TV <killyourtv@i2pmail.org>
-Date: Sun, 1 Jan 2011 22:30:32 +0000
-Subject: Jetty 6
-
-This patch updates
-
- apps/i2ptunnel/java/build.xml
- apps/jetty/build.xml
- apps/routerconsole/java/build.xml
- apps/susidns/src/build.xml
-
-so that I2P can be built using Jetty packages from Debian/Ubuntu
---- a/apps/jetty/build.xml
-+++ b/apps/jetty/build.xml
-@@ -2,76 +2,18 @@
- <project basedir="." default="all" name="jetty">
-
- <property name="jetty.ver" value="6.1.26" />
-- <property name="jetty.base" value="jetty-${jetty.ver}" />
-- <property name="jetty.sha1" value="9485913f1a1945a849a90f1a34853d22350bc524" />
-- <property name="jetty.filename" value="${jetty.base}.zip" />
-- <property name="jetty.url" value="http://dist.codehaus.org/jetty/${jetty.base}/${jetty.filename}" />
-- <property name="verified.filename" value="verified.txt" />
- <property name="javac.compilerargs" value="" />
-
- <target name="all" depends="build" />
--
- <target name="ensureJettylib" >
-- <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
-- <available property="jetty.zip.extracted" file="jettylib" type="dir" />
- <ant target="fetchJettylib" />
- <ant target="verifyJettylib" />
- <ant target="extractJettylib" />
- </target>
-
-- <target name="fetchJettylib" unless="jetty.zip.available" >
-- <echo message="It seems that you don't have '${jetty.filename}' deployed." />
-- <echo message="The build script can download this file for you automatically," />
-- <echo message="or alternatively you can obtain it manually from:" />
-- <echo message="${jetty.url}" />
-- <echo message="" />
-- <echo message="The libraries contained in the fetched file provide the Jetty web server" />
-- <echo message="(http://jetty.mortbay.org/). They are not absolutely necessary" />
-- <echo message="but strongly recommended, since they are used by some applications" />
-- <echo message="on top of I2P, like the router console." />
-- <echo message="" />
-- <echo message="Even if you deploy the Jetty archive manually into directory apps/jetty/," />
-- <echo message="the build script will still attempt to verify its checksums, which must be:" />
-- <echo message="SHA1 ${jetty.sha1}" />
-- <echo message="" />
-- <input message="Download Jetty archive automatically?" validargs="y,n" addproperty="jetty.download" />
-- <fail message="Aborting as requested. Please deploy the Jetty archive manually." >
-- <condition>
-- <equals arg1="${jetty.download}" arg2="n"/>
-- </condition>
-- </fail>
-- <get src="${jetty.url}" verbose="true" dest="${jetty.filename}" />
-- </target>
--
-- <condition property="verified.already" >
-- <and>
-- <available file="${jetty.filename}" />
-- <uptodate property="foo.bar.baz" srcfile="${jetty.filename}" targetfile="${verified.filename}" />
-- </and>
-- </condition>
--
-- <target name="verifyJettylib" unless="verified.already" >
-- <condition property="jetty.zip.verified" >
-- <checksum file="${jetty.filename}" algorithm="SHA" property="${jetty.sha1}" />
-- </condition>
-- <fail message="Jetty archive does not match its checksum!" >
-- <condition>
-- <not>
-- <istrue value="${jetty.zip.verified}" />
-- </not>
-- </condition>
-- </fail>
-- <touch file="${verified.filename}" />
-- </target>
--
-- <target name="extractJettylib" unless="jetty.zip.extracted" >
-- <!-- for .tgz -->
-- <!--
-- <gunzip src="${jetty.filename}" dest="jetty.tar" />
-- <untar src="jetty.tar" dest="." />
-- -->
-- <!-- for .zip -->
-- <unzip src="${jetty.filename}" dest="." />
-+ <target name="verifyJettylib" />
-+ <target name="fetchJettylib" />
-+ <target name="extractJettylib">
- <mkdir dir="jettylib" />
- <!-- We copy everything to names without the version numbers so we
- can update them later. Where there was something similar in Jetty 5,
-@@ -86,30 +28,27 @@
- jetty-rewrite-handler: Not used by I2P, but only 20KB and could be useful for eepsites
- All of these are available in the Ubuntu packages libjetty-java and libjetty-extra-java
- -->
-- <copy preservelastmodified="true" file="${jetty.base}/start.jar" tofile="jettylib/jetty-start.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/${jetty.base}.jar" tofile="jettylib/org.mortbay.jetty.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/jetty-util-${jetty.ver}.jar" tofile="jettylib/jetty-util.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-java5-threadpool-${jetty.ver}.jar" tofile="jettylib/jetty-java5-threadpool.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-rewrite-handler-${jetty.ver}.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/ext/jetty-sslengine-${jetty.ver}.jar" tofile="jettylib/jetty-sslengine.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/ant-1.6.5.jar" tofile="jettylib/ant.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-compiler-5.5.15.jar" tofile="jettylib/jasper-compiler.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jasper-runtime-5.5.15.jar" tofile="jettylib/jasper-runtime.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/jsp-2.0/jsp-api-2.0.jar" tofile="jettylib/jsp-api.jar" />
-- <copy preservelastmodified="true" file="${jetty.base}/lib/servlet-api-2.5-20081211.jar" tofile="jettylib/javax.servlet.jar" />
-- <delete file="jetty.tar" />
-- <delete dir="${jetty.base}" />
-- <!-- commons-logging.jar not in Jetty 6 but we have it in launch4j so copy it over, we need it
-- for org.apache.jasper.JspC compiler
-- -->
-- <copy preservelastmodified="true" file="../../installer/lib/launch4j/lib/commons-logging.jar" todir="jettylib/" />
-+ <copy preservelastmodified="true" file="/usr/share/java/commons-el-1.0.jar" tofile="jettylib/commons-el.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/java/commons-logging.jar" todir="jettylib/" />
-+ <copy preservelastmodified="true" file="/usr/share/java/el-api-2.1.jar" tofile="jettylib/el-api.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/java/jasper-el.jar" todir="jettylib/" />
-+ <copy preservelastmodified="true" file="/usr/share/java/jetty-java5-threadpool.jar" tofile="jettylib/jetty-java5-threadpool.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/java/jetty-rewrite-handler.jar" tofile="jettylib/jetty-rewrite-handler.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/java/jetty-sslengine.jar" tofile="jettylib/jetty-sslengine.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/java/jetty-start.jar" tofile="jettylib/jetty-start.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/java/jetty-util.jar" tofile="jettylib/jetty-util.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/java/jetty.jar" tofile="jettylib/org.mortbay.jetty.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/java/servlet-api.jar" tofile="jettylib/javax.servlet.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/java/tomcat-juli.jar" tofile="jettylib/tomcat-juli.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/jetty/lib/jsp-2.1/ant.jar" tofile="jettylib/ant.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/jetty/lib/jsp-2.1/jasper.jar" tofile="jettylib/jasper.jar" />
-+ <copy preservelastmodified="true" file="/usr/share/jetty/lib/jsp-2.1/jsp-api.jar" tofile="jettylib/jsp-api.jar" />
- </target>
-
- <target name="build" depends="jar" />
-
- <target name="builddep" />
-- <target name="compile" depends="builddep, ensureJettylib" >
-+ <target name="compile" depends="builddep, extractJettylib" >
- <mkdir dir="./build" />
- <mkdir dir="./build/obj" />
- <javac
-@@ -173,7 +112,6 @@
- <target name="cleandep" depends="clean" />
- <target name="distclean" depends="clean">
- <delete dir="./jettylib" />
-- <echo message="Not actually deleting the jetty libs (since they're so large)" />
- </target>
- <target name="reallyclean" depends="distclean">
- </target>
-@@ -181,22 +119,10 @@
- <delete dir="./jettylib" />
- <delete file="${jetty.filename}" />
- </target>
-- <target name="javadoc" >
-- <available property="jetty.zip.available" file="${jetty.filename}" type="file" />
-- <available property="jetty.zip.javadocExtracted" file="build/javadoc" type="dir" />
-- <ant target="fetchJettylib" />
-- <ant target="verifyJettylib" />
-- <ant target="extractJavadoc" />
-- </target>
-- <target name="extractJavadoc" unless="jetty.zip.javadocExtracted" >
-- <mkdir dir="./build" />
-- <mkdir dir="./build/javadoc" />
-- <unzip src="${jetty.filename}" dest="./build/javadoc" >
-- <patternset>
-- <include name="${jetty.base}/javadoc/" />
-- </patternset>
-- <mapper type="glob" from="${jetty.base}/javadoc/*" to="javadoc/*" />
-- </unzip>
-+ <target name="javadoc">
-+ <echo message="Javadocs are available in the package "libjetty-java-doc"" />
- </target>
-
-+ <target name="extractJavadoc" />
-+
- </project>
---- a/apps/i2ptunnel/java/build.xml
-+++ b/apps/i2ptunnel/java/build.xml
-@@ -164,13 +164,15 @@
- <!-- there are various jspc ant tasks, but they all seem a bit flakey -->
- <java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
- <classpath>
-- <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
-- <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
-- <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-- <pathelement location="../../jetty/jettylib/commons-logging.jar" />
-+ <pathelement location="../../jetty/jettylib/ant.jar" />
- <pathelement location="../../jetty/jettylib/commons-el.jar" />
-+ <pathelement location="../../jetty/jettylib/commons-logging.jar" />
-+ <pathelement location="../../jetty/jettylib/el-api.jar" />
-+ <pathelement location="../../jetty/jettylib/jasper-el.jar" />
-+ <pathelement location="../../jetty/jettylib/jasper.jar" />
-+ <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
- <pathelement location="../../jetty/jettylib/jsp-api.jar" />
-- <pathelement location="../../jetty/jettylib/ant.jar" />
-+ <pathelement location="../../jetty/jettylib/tomcat-juli.jar" />
- <pathelement location="build/i2ptunnel.jar" />
- </classpath>
- <arg value="-d" />
-@@ -187,10 +189,12 @@
- destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
- <compilerarg line="${javac.compilerargs}" />
- <classpath>
-- <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
-- <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
-- <pathelement location="../../jetty/jettylib/commons-logging.jar" />
- <pathelement location="../../jetty/jettylib/commons-el.jar" />
-+ <pathelement location="../../jetty/jettylib/commons-logging.jar" />
-+ <pathelement location="../../jetty/jettylib/el-api.jar" />
-+ <pathelement location="../../jetty/jettylib/jasper-el.jar" />
-+ <pathelement location="../../jetty/jettylib/jasper.jar" />
-+ <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
- <pathelement location="../../jetty/jettylib/jsp-api.jar" />
- <pathelement location="build/i2ptunnel.jar" />
- </classpath>
---- a/apps/routerconsole/java/build.xml
-+++ b/apps/routerconsole/java/build.xml
-@@ -238,8 +238,10 @@
- -->
- <java classname="org.apache.jasper.JspC" fork="true" failonerror="true">
- <classpath>
-- <pathelement location="../../jetty/jettylib/jasper-compiler.jar" />
-- <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
-+ <pathelement location="../../jetty/jettylib/jasper.jar" />
-+ <pathelement location="../../jetty/jettylib/tomcat-juli.jar" />
-+ <pathelement location="../../jetty/jettylib/el-api.jar" />
-+ <pathelement location="../../jetty/jettylib/jasper-el.jar" />
- <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
- <pathelement location="../../jetty/jettylib/commons-logging.jar" />
- <pathelement location="../../jetty/jettylib/commons-el.jar" />
-@@ -273,7 +275,10 @@
- srcdir="../jsp/WEB-INF/classes" includes="**/*.java">
- <compilerarg line="${javac.compilerargs}" />
- <classpath>
-- <pathelement location="../../jetty/jettylib/jasper-runtime.jar" />
-+ <pathelement location="../../jetty/jettylib/jasper.jar" />
-+ <pathelement location="../../jetty/jettylib/el-api.jar" />
-+ <pathelement location="../../jetty/jettylib/jasper-el.jar" />
-+ <pathelement location="../../jetty/jettylib/tomcat-juli.jar" />
- <pathelement location="../../jetty/jettylib/javax.servlet.jar" />
- <pathelement location="../../jetty/jettylib/commons-logging.jar" />
- <pathelement location="../../jetty/jettylib/commons-el.jar" />
---- a/apps/susidns/src/build.xml
-+++ b/apps/susidns/src/build.xml
-@@ -14,8 +14,10 @@
- <pathelement location="${lib}/org.mortbay.jetty.jar"/>
- <pathelement location="WEB-INF/lib/jstl.jar" />
- <pathelement location="WEB-INF/lib/standard.jar" />
-- <pathelement location="${lib}/jasper-compiler.jar" />
-- <pathelement location="${lib}/jasper-runtime.jar" />
-+ <pathelement location="${lib}/jasper.jar" />
-+ <pathelement location="${lib}/tomcat-juli.jar" />
-+ <pathelement location="${lib}/el-api.jar" />
-+ <pathelement location="${lib}/jasper-el.jar" />
- <pathelement location="${lib}/javax.servlet.jar" />
- <pathelement location="${lib}/jsp-api.jar" />
- <pathelement location="${lib}/commons-logging.jar" />
---- a/build.xml
-+++ b/build.xml
-@@ -679,7 +679,7 @@
- <copy file="build/i2ptunnel.jar" todir="pkg-temp/lib/" />
- <!-- all jetty stuff -->
- <copy todir="pkg-temp/lib" >
-- <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar" />
-+ <fileset dir="build" includes="commons*.jar jasper*.jar javax*.jar jetty*.jar jsp*.jar org.mortbay.jetty.jar el-api.jar tomcat-juli.jar" />
- </copy>
- <copy file="build/mstreaming.jar" todir="pkg-temp/lib/" />
- <copy file="build/streaming.jar" todir="pkg-temp/lib/" />
diff --git a/debian/patches/series b/debian/patches/series
index ca53a966175b4d7cab66da0fb33d308de5ad6aa0..4b78135017bd558598a465a5088e0a53e75ca4ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
0001-path-substitution.patch
0002-jbigi-soname.patch
-0003-renaming-jcpuid.patch
-#0004-jetty6.patch
+0003-rename-jcpuid.patch
+0004-remove-launch4j.patch
diff --git a/debian/rules b/debian/rules
index 5377586612b0869ccc13f6a42b5136c69e809864..286a1f6be94e76b341d7aa65203219781f16442d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,19 +27,16 @@ build:
JAVA_HOME=/usr/lib/jvm/default-java
I2P=$(CURDIR)/pkg-temp
ROUTERVERSION=$(CURDIR)/router/java/src/net/i2p/router/RouterVersion.java
+export DEB_BUILD_HARDENING=1
# I2P's version will be displayed in the router console as "$I2PVERSION-$EXTRAPREFIX$DEBIANVERSION", eg. 0.8.12-0-deb1
-export EXTRAPREFIX := deb
+#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/')
+export DEBIANVERSION := $(shell dpkg-parsechangelog |awk -F' ' '/^Version:/{print $$2}' |sed 's/.*-\([.0-9A-Za-z~+]\{1,\}\)$$/\1/')
#export DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
%:
- dh $@ --with quilt
- # with systemd needs dh-systemd which isn't available in Wheezy (except from backports),
- # and is only Ubuntu as of "Saucy". The official packages will enable this for Debian unstable and
- # Ubuntu Saucy (and newer)
- #dh $@ --with systemd,quilt
+ dh $@ --with systemd
clean: createcopyright
@@ -47,16 +44,16 @@ override_dh_auto_clean:
-[ -r $(CURDIR)/debian/routerversion.java.bak ] && mv -f $(CURDIR)/debian/routerversion.java.bak $(ROUTERVERSION)
dh_auto_clean
ant distclean
- find $(CURDIR)/core -name '*\.[s]o' -exec rm -f {} \;
+ find $(CURDIR)/core \( -name '*\.so' -o -name '*\.o' \) -exec rm -f {} \;
rm -rf $(CURDIR)/core/c/jcpuid/lib/
- #rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
+ rm -f $(CURDIR)/installer/lib/wrapper/all/wrapper.jar
+ rm -f $(CURDIR)/installer/lib/launch4j/lib/commons-logging.jar
+ rm -rf $(CURDIR)/debian/python-i2p
debconf-updatepo
override_dh_auto_build:
-# Uncomment the next override line for systems that support dh-systemd
-# (currently Debian unstable and Ubuntu Saucy (and newer))
-#override_dh_systemd_enable:
+override_dh_systemd_enable:
# We purposely do not set I2P to start at boot.
# This matches the behavior of the initscript
# and the setting RUN_DAEMON=false in /etc/default/i2p
@@ -64,6 +61,10 @@ override_dh_auto_build:
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; \
fi
@@ -73,12 +74,9 @@ ifeq "$(findstring deb,$(shell grep 'deb' $(ROUTERVERSION)))" ""
else
@echo "Already found deb in version, not doing anything"
endif
- sh -n installer/resources/i2prouter || exit 1
- sh -n installer/resources/runplain.sh || exit 1
- TZ=UTC ant preppkg-unix javadoc
+ 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
-
binary-arch: build-arch
build-arch:
@@ -94,11 +92,12 @@ createcopyright:
@rm -f $(CURDIR)/debian/copyright
@/bin/echo -e "This package was Debianized by kytv <killyourtv@i2pmail.org>" >> $(CURDIR)/debian/copyright
@/bin/echo -e "Sun, 23 Jan 2011 20:26:51 +0000" >> $(CURDIR)/debian/copyright
- @/bin/echo -e "\nIt was downloaded from http://www.i2p2.de" >> $(CURDIR)/debian/copyright
+ @/bin/echo -e "\nIt was downloaded from https://geti2p.net" >> $(CURDIR)/debian/copyright
@/bin/echo -e "\nI2P is tracked upstream using the Monotone VCS" >> $(CURDIR)/debian/copyright
@/bin/echo -e "Complete information on fetching the source with monotone can be found" >> $(CURDIR)/debian/copyright
- @/bin/echo -e "at http://www.i2p2.de/newdevelopers#getting-the-i2p-code\n\n\n" >> $(CURDIR)/debian/copyright
+ @/bin/echo -e "at https://geti2p.net/newdevelopers#getting-the-i2p-code\n\n\n" >> $(CURDIR)/debian/copyright
@/bin/cat $(CURDIR)/LICENSE.txt >> $(CURDIR)/debian/copyright
+ @/bin/echo -e "\n\n The debian packaging has been released into the public domain." >> $(CURDIR)/debian/copyright
override_dh_compress:
dh_compress -X.xsl -X.xml
diff --git a/debian/source/options b/debian/source/options
index 3fc59482d05aebb2e3bf7188933cd7bdb2309054..dcba7206941309f7aa80549b0698d5262bb4e2c8 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,2 @@
-compression="bzip2"
+compression="xz"
compression-level=9