diff --git a/debian/NEWS b/debian/NEWS index 4f163c621..38e309017 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 44d2292f0..4f7cc85be 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 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 af289f1f5..6bf4bf553 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 85a2c4575..34a9aefe7 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 7449c90d1..ec464951a 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 f1522a86b..416ea47b3 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 6462ab07f..3afff1bae 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 c245d75df..000000000 --- a/debian/patches/0004-jetty6.patch +++ /dev/null @@ -1,268 +0,0 @@ -From: Kill Your TV -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 @@ - - - -- -- -- -- -- - - - -- - -- -- - - - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - - - - -- -+ - - - - - -- - - - -@@ -181,22 +119,10 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -+ -+ - - -+ -+ - ---- a/apps/i2ptunnel/java/build.xml -+++ b/apps/i2ptunnel/java/build.xml -@@ -164,13 +164,15 @@ - - - -- -- -- -- -+ - -+ -+ -+ -+ -+ - -- -+ - - - -@@ -187,10 +189,12 @@ - destdir="../jsp/WEB-INF/classes/" srcdir="../jsp/WEB-INF/classes" includes="**/*.java"> - - -- -- -- - -+ -+ -+ -+ -+ - - - ---- a/apps/routerconsole/java/build.xml -+++ b/apps/routerconsole/java/build.xml -@@ -238,8 +238,10 @@ - --> - - -- -- -+ -+ -+ -+ - - - -@@ -273,7 +275,10 @@ - srcdir="../jsp/WEB-INF/classes" includes="**/*.java"> - - -- -+ -+ -+ -+ - - - ---- a/apps/susidns/src/build.xml -+++ b/apps/susidns/src/build.xml -@@ -14,8 +14,10 @@ - - - -- -- -+ -+ -+ -+ - - - ---- a/build.xml -+++ b/build.xml -@@ -679,7 +679,7 @@ - - - -- -+ - - - diff --git a/debian/patches/series b/debian/patches/series index ca53a9661..4b7813501 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 537758661..286a1f6be 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 " >> $(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 3fc59482d..dcba72069 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,2 +1,2 @@ -compression="bzip2" +compression="xz" compression-level=9