From abec6ad64cf23adb874a2a2c9f55cdea2a0b3802 Mon Sep 17 00:00:00 2001 From: zzz Date: Sat, 14 Apr 2018 12:38:39 +0000 Subject: [PATCH] Debian Buster updates (ticket #2027) As pulled out of http://http.debian.net/debian/pool/main/i/i2p/i2p_0.9.34-1.debian.tar.xz License file update --- LICENSE.txt | 6 +- debian-alt/buster/changelog | 84 +++++++++++++++++++++- debian-alt/buster/control | 31 ++++---- debian-alt/buster/i2p.postinst | 127 +++++++++++++++++++++++++++++++++ debian-alt/buster/rules | 7 +- 5 files changed, 233 insertions(+), 22 deletions(-) create mode 100755 debian-alt/buster/i2p.postinst diff --git a/LICENSE.txt b/LICENSE.txt index efca427ff7..8b9dcb8ce9 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -212,7 +212,7 @@ Applications: Zxing 3.3.0: See licenses/LICENSE-Apache2.0.txt - Jetty 9.2.22.v20170606: + Jetty 9.2.24.v20180105: See licenses/ABOUT-Jetty.html See licenses/NOTICE-Jetty.html See licenses/LICENSE-Apache2.0.txt @@ -283,8 +283,8 @@ Applications: Bundles systray4j-2.4.1: See licenses/LICENSE-LGPLv2.1.txt - Tomcat 8.5.23: - Copyright 1999-2017 The Apache Software Foundation + Tomcat 8.5.30: + Copyright 1999-2018 The Apache Software Foundation See licenses/LICENSE-Apache2.0.txt See licenses/NOTICE-Tomcat.txt diff --git a/debian-alt/buster/changelog b/debian-alt/buster/changelog index 780981652f..6ab7577865 100644 --- a/debian-alt/buster/changelog +++ b/debian-alt/buster/changelog @@ -1,3 +1,59 @@ +i2p (0.9.34-1) unstable; urgency=medium + + * New upstream release. + * d/README.Debian: Fixed a typo. + * d/control: Removed unnecessary comma. + * d/control: Added Vcs-* entries. + * d/po/*: Synced with the upstream. + * d/rules: Set javac option -source & -target to 1.8. + + -- Masayuki Hatta Thu, 12 Apr 2018 02:40:45 +0900 + +i2p (0.9.33-2) unstable; urgency=medium + + * d/control: bumped Standards-Version to 4.1.3. + * d/control: default-jdk is now openjdk-9-jdk so depends on and use it. + * d/rules: ditto. + + -- Masayuki Hatta Thu, 29 Mar 2018 00:02:36 +0900 + +i2p (0.9.33-1) unstable; urgency=medium + + * New upstream release. + * Now uses libtaglibs-standard-*-java instead of + glassfish-javaee (closes: #882489) + * Removed -m32 and -m64 flags for Debian builds (closes: #877042) + * Updated sv.po (closes: #890653) + * Updated ru.po (closes: #883920) + + -- Masayuki Hatta Tue, 27 Mar 2018 20:05:18 +0900 + +i2p (0.9.32-2) unstable; urgency=medium + + * debian/i2p.postinst: changed logic to invoke systemctl. + let's see if it works with piuparts. + * debian/watch: updated, now it supposed to work. + * debian/README.Debian: fixed a typo. + + -- Masayuki Hatta Sat, 18 Nov 2017 17:29:54 +0900 + +i2p (0.9.32-1) unstable; urgency=medium + + * New upstream release. + * Based on 0.9.32-1ubuntu1. + * debian/control: removed obsoleted dh-systemd. + * debian/control: now depends on debhelper (>= 9.20160709). + * debian/control: changed Standards-Version to 4.1.1. + * debian/control: changed i2p-doc priority from extra to optional. + * debian/README.Debian: fixed port number (closes: #877022). + * debian/po/nl.po: updated (closes: #879135). + * debian/patches/0004-remove-linkrel-from-eclipse-license.patch: added. + to make lintian happy. + * debian/patches/0005-license-path-fix-patch: added. + codehaus is long gone, states new URL. to make lintian happy. + + -- Masayuki Hatta Fri, 17 Nov 2017 19:43:29 +0900 + i2p (0.9.30-4) unstable; urgency=medium * Initial release for Debian (closes: #448638). @@ -17,17 +73,41 @@ i2p (0.9.30-4) unstable; urgency=medium * debian/NEWS: moved to NEWS.old. * debian/i2p-router.lintian-overrides: added. * debian/i2p.postinst: change systemctl -> deb-systemd-helper. - * debian/i2p.postinst: Fixed a typo (missing ")" in /etc/default/i2p). + * debian/i2p.postinst: fixed a typo (missing ")" in /etc/default/i2p). -- Masayuki Hatta Wed, 26 Jul 2017 13:21:41 +0900 Old Changelog: +i2p (0.9.34-2ubuntu1) artful; urgency=medium + + * New upstream version 0.9.34 + + -- zzz on i2p (key signing) Wed, 11 Apr 2018 12:12:12 +0000 + +i2p (0.9.33-1ubuntu1) artful; urgency=medium + + * New upstream version 0.9.33 + + -- zzz on i2p (key signing) Wed, 30 Jan 2018 12:12:12 +0000 + +i2p (0.9.32-1ubuntu1) xenial; urgency=medium + + * New upstream version 0.9.32 + + -- zzz on i2p (key signing) Wed, 08 Nov 2017 12:12:12 +0000 + +i2p (0.9.31-1ubuntu1) xenial; urgency=medium + + * New upstream version 0.9.31 + + -- zzz on i2p (key signing) Wed, 09 Aug 2017 12:12:12 +0000 + i2p (0.9.30-3ubuntu1) xenial; urgency=medium * New upstream version 0.9.30 - -- zzz on i2p (key signing) Mon, 03 May 2017 12:12:12 +0000 + -- zzz on i2p (key signing) Wed, 03 May 2017 12:12:12 +0000 i2p (0.9.29-1ubuntu1) trusty; urgency=medium diff --git a/debian-alt/buster/control b/debian-alt/buster/control index 848fd0e1c5..c099951bde 100644 --- a/debian-alt/buster/control +++ b/debian-alt/buster/control @@ -1,22 +1,23 @@ Source: i2p Maintainer: Masayuki Hatta Section: net -Standards-Version: 4.0.0 +Standards-Version: 4.1.3 Priority: optional Homepage: https://geti2p.net/ -Build-Depends: debhelper (>= 7.0.50~) +Vcs-Browser: https://salsa.debian.org/debian/i2p +Vcs-Git: https://salsa.debian.org/debian/i2p.git +Build-Depends: debhelper (>= 9.20160709) ,ant (>= 1.8) ,debconf - ,openjdk-8-jdk + ,openjdk-9-jdk ,libjetty9-java (>= 9.2.22) ,libtaglibs-standard-jstlel-java ,libtomcat8-java ,dh-apparmor - ,dh-systemd ,bash-completion ,gettext ,libgetopt-java - ,libgmp-dev (>= 2:5.0.2) + ,libgmp-dev (>= 2:5.0.5) ,libservice-wrapper-java ,po-debconf @@ -29,9 +30,9 @@ Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, debconf, i2p-router (>= 0.8.6-5), libjbigi-jni, - lsb-base, + lsb-base (>= 3.0-6), service-wrapper -Description: Invisible Internet Project - anonymous network +Description: Invisible Internet Project (I2P) - anonymous network I2P is an anonymizing network, offering a simple layer that identity-sensitive applications can use to securely communicate. All data is wrapped with several layers of encryption, and the network is both distributed and dynamic, with no @@ -46,7 +47,7 @@ Section: java Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, i2p-router Homepage: https://geti2p.net/ -Description: Invisible Internet Project - libjbigi library +Description: Invisible Internet Project (I2P) - libjbigi library This Package contains the libjbigi JNI library (and on x86 platforms, jcpuid). . libjbigi is a math library that is part of the I2P installation. Use of this @@ -57,10 +58,10 @@ Description: Invisible Internet Project - libjbigi library Package: i2p-doc Architecture: all Section: doc -Priority: extra +Priority: optional Depends: ${misc:Depends} Suggests: i2p, default-jdk-doc -Description: Invisible Internet Project - developer documentation +Description: Invisible Internet Project (I2P) - developer documentation I2P is an anonymizing network, offering a simple layer that identity-sensitive applications can use to securely communicate. All data is wrapped with several layers of encryption, and the network is both distributed and dynamic, with no @@ -73,20 +74,20 @@ Architecture: all Section: net Priority: optional Depends: ${misc:Depends}, ${java:Depends}, ${shlibs:Depends}, - openjdk-8-jre-headless | java8-runtime-headless, - libjetty9-java, - libtaglibs-standard-jstlel-java, - libtomcat8-java, + openjdk-9-jre-headless | openjdk-8-jre-headless | default-jre-headless | java9-runtime-headless | java8-runtime-headless, geoip-database, gettext-base, libgetopt-java, + libjetty9-java, + libtaglibs-standard-jstlel-java, + libtomcat8-java, Replaces: i2p ( << 0.8.6-5) Breaks: i2p (<< 0.8.6-5) Recommends: libjbigi-jni, ttf-dejavu Suggests: apparmor ,privoxy ,syndie -Description: Invisible Internet Project - router +Description: Invisible Internet Project (I2P) - Router I2P is an anonymizing network, offering a simple layer that identity-sensitive applications can use to securely communicate. All data is wrapped with several layers of encryption, and the network is both distributed and dynamic, with no diff --git a/debian-alt/buster/i2p.postinst b/debian-alt/buster/i2p.postinst new file mode 100755 index 0000000000..a063b845c7 --- /dev/null +++ b/debian-alt/buster/i2p.postinst @@ -0,0 +1,127 @@ +#!/bin/sh + +set -e + +I2PHOME=/var/lib/i2p +I2PSYSUSER=i2psvc + +conffile="/etc/default/i2p" +systemdservice="/lib/systemd/system/i2p.service" + +# Source debconf library -- we have a Depends line +# to make sure it is there... +. /usr/share/debconf/confmodule +db_version 2.0 + + +case "$1" in + configure|reconfigure) + if [ ! -e $conffile ]; then + echo "# Defaults for i2p initscript (/etc/init.d/i2p)" >> $conffile + echo "# This is a posix shell fragment" >> $conffile + echo >> $conffile + echo "# [automatically edited by postinst, do not change line format ]" >> $conffile + echo "# Run 'dpkg-reconfigure -plow i2p' to change these values." >> $conffile + echo >> $conffile + echo "RUN_DAEMON=" >> $conffile + echo "I2PUSER=" >> $conffile + echo "ULIMIT=" >> $conffile + echo "CONFINE_WITH_APPARMOR=" >> $conffile + echo "# The next value is also wrapper.java.maxmemory in /etc/i2p/wrapper.config" >> $conffile + echo "MEMORYLIMIT=" >> $conffile + fi + + db_get i2p/daemon + RUN_DAEMON="$RET" + db_get i2p/user + I2PUSER="$RET" + db_get i2p/memory + MEMORYLIMIT="$RET" + db_get i2p/aa + CONFINE_WITH_APPARMOR="$RET" + + cp -a -f $conffile $conffile.tmp + + # If the admin deleted or commented some variables but then set them via debconf, + # (re-)add them to the conffile. + test -z "$RUN_DAEMON" || grep -Eq '^ *RUN_DAEMON=' $conffile || \ + echo "RUN_DAEMON=" >> $conffile + test -z "$I2PUSER" || grep -Eq '^ *I2PUSER=' $conffile || \ + echo "I2PUSER=" >> $conffile + test -z "$MEMORYLIMIT" || grep -Eq '^ *MEMORYLIMIT=' $conffile || \ + echo "MEMORYLIMIT=" >> $conffile + test -z "$ULIMIT" || grep -Eq '^ *ULIMIT=' $conffile || \ + echo "ULIMIT=" >> $conffile + test -z "$CONFINE_WITH_APPARMOR" || grep -Eq '^ *CONFINE_WITH_APPARMOR=' $conffile || \ + echo "CONFINE_WITH_APPARMOR=" >> $conffile + + if [ -z $RUN_DAEMON ]; then + RUN_DAEMON="false" + I2PUSER="i2psvc" + fi + + sed -e "s/^ *RUN_DAEMON=.*/RUN_DAEMON=\"$RUN_DAEMON\"/" \ + -e "s/^ *I2PUSER=.*/I2PUSER=\"$I2PUSER\"/" \ + -e "s/^ *MEMORYLIMIT=.*/MEMORYLIMIT=\"$MEMORYLIMIT\"/" \ + -e "s/^ *CONFINE_WITH_APPARMOR=.*/CONFINE_WITH_APPARMOR=\"$CONFINE_WITH_APPARMOR\"/" \ + < $conffile > $conffile.tmp + mv -f $conffile.tmp $conffile + + if [ -e "$systemdservice" ]; then + sed -e "s/User=.*/User=$I2PUSER/" < "$systemdservice" > "$systemdservice.tmp" + mv -f "$systemdservice.tmp" "$systemdservice" + chmod 0644 -f "$systemdservice" + if [ -d /run/systemd/system ]; then + systemctl --system daemon-reload || true + if [ $RUN_DAEMON = 'true' ]; then + deb-systemd-helper enable i2p.service + else + deb-systemd-helper disable i2p.service + fi + fi + fi + + sed -e "s/^ *wrapper\.java\.maxmemory=.*/wrapper\.java\.maxmemory=$MEMORYLIMIT/" \ + < /etc/i2p/wrapper.config > /etc/i2p/wrapper.config.tmp + mv -f /etc/i2p/wrapper.config.tmp /etc/i2p/wrapper.config + chmod 0644 -f /etc/i2p/wrapper.config + + # Older versions of adduser created the home directory. + # The version of adduser in Debian unstable does not. + [ -d $I2PHOME ] || mkdir -m0750 $I2PHOME + + # Create user and group as a system user. + if getent passwd i2psvc > /dev/null 2>&1 ; then + groupadd -f $I2PSYSUSER || true + usermod -c "I2P Router Daemon" -d $I2PHOME -g $I2PSYSUSER -s "/bin/false" \ + $I2PSYSUSER -e 1 > /dev/null 2>&1 || true + else + adduser --system --quiet --group --home $I2PHOME $I2PSYSUSER > /dev/null 2>&1 + fi + + [ -d /var/log/i2p ] || mkdir -m0750 /var/log/i2p + chown -f -R $I2PSYSUSER:i2psvc /var/log/i2p + + # Has someone set the permissions with dpkg-statoverride? If so, obey them. + if ! dpkg-statoverride --list $I2PHOME > /dev/null 2>&1 + then + chown -f -R $I2PSYSUSER:$I2PSYSUSER $I2PHOME + chmod -f u=rwx,g=rxs,o= $I2PHOME + fi + + db_stop +;; +abort-upgrade|abort-remove|abort-deconfigure) + echo "Aborting upgrade" + exit 0 + ;; +*) + echo "postinst called with unknown argument \`$1'" >&2 + exit 0 + ;; +esac + +#DEBHELPER# + +exit 0 +# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 diff --git a/debian-alt/buster/rules b/debian-alt/buster/rules index 85a8a8a611..24c588d5a0 100755 --- a/debian-alt/buster/rules +++ b/debian-alt/buster/rules @@ -79,8 +79,11 @@ else endif @# build options @/bin/echo -e "javac.version=1.8" > $(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 "javac.version=9" > $(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.compilerargs=-source 1.8 -target 1.8" >> $(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 "javac.compilerargs7=" >> $(CURDIR)/override.properties @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties @# debian and ubuntu: everywhere