From 7b5e3310381adff8e2602871821222b3749bf884 Mon Sep 17 00:00:00 2001 From: HungryHobo Date: Fri, 12 Nov 2010 23:28:25 +0000 Subject: [PATCH 1/5] Put a name and email in the Maintainer field --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 5dec48ea3..77a762a5d 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: i2p -Maintainer: i2p +Maintainer: Hungry Hobo Section: net Priority: optional Homepage: http://www.i2p2.de/ From a07339e1ffef8688d0f407388af98dda385b1fdd Mon Sep 17 00:00:00 2001 From: HungryHobo Date: Sat, 13 Nov 2010 00:03:13 +0000 Subject: [PATCH 2/5] Remove rc.d files in postrm, not in prerm (fixes lintian errors prerm-calls-updaterc.d and postrm-does-not-call-updaterc.d-for-init.d-script) --- debian/scripts/postrm | 3 +++ debian/scripts/prerm | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/scripts/postrm b/debian/scripts/postrm index 5cc0f518a..38a4170ab 100755 --- a/debian/scripts/postrm +++ b/debian/scripts/postrm @@ -1,5 +1,8 @@ #!/bin/sh +# /etc/rc*.d/*i2p files +update-rc.d -f i2p remove + I2PUSER=i2psvc # delete $I2PUSER if it exists (it will not if this is a purge after a remove) id $I2PUSER 2>/dev/null diff --git a/debian/scripts/prerm b/debian/scripts/prerm index 3a88e9516..74f0bafed 100755 --- a/debian/scripts/prerm +++ b/debian/scripts/prerm @@ -4,9 +4,6 @@ # stuff in /tmp rm -f /tmp/wrapper.log /tmp/wrapper.log.1 /tmp/wrapper.log.2 /tmp/i2p.pid /tmp/routerjvm.pid /tmp/router.ping -# /etc/rc*.d/*i2p files -update-rc.d -f i2p remove - # dpkg doesn't know about these files, they were copied out of jbigi.jar by the router LIB=/usr/lib/i2p rm -f $LIB/libjbigi.so $LIB/libjcpuid.so From fddf32a6ca452b6211c8e4a3df0e2f76ad7d9ba9 Mon Sep 17 00:00:00 2001 From: HungryHobo Date: Sat, 13 Nov 2010 00:28:30 +0000 Subject: [PATCH 3/5] * Stop service at runlevels 0 and 6 (lintian: init.d-script-possible-missing-stop) * Add force-reload option, same as restart (lintian: init.d-script-does-not-implement-required-option) --- debian/scripts/init | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/scripts/init b/debian/scripts/init index 544018ac6..e877bfd8a 100755 --- a/debian/scripts/init +++ b/debian/scripts/init @@ -5,7 +5,7 @@ # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Default-Start: -# Default-Stop: 1 2 3 4 5 +# Default-Stop: 0 1 2 3 4 5 6 # Short-Description: I2P anonymizing mixnet ### END INIT INFO @@ -39,7 +39,7 @@ case "$1" in log_end_msg 1 fi ;; - restart) + restart|force-reload) log_daemon_msg "Restarting I2P" "i2p" if I2P restart; then log_end_msg 0 From 0d23e37124d4f41ef6127b050e1f38ff8767f4c7 Mon Sep 17 00:00:00 2001 From: HungryHobo Date: Sat, 13 Nov 2010 00:30:11 +0000 Subject: [PATCH 4/5] Add shebang to script --- installer/resources/runplain.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/installer/resources/runplain.sh b/installer/resources/runplain.sh index 644bdadcf..eaf2d297e 100644 --- a/installer/resources/runplain.sh +++ b/installer/resources/runplain.sh @@ -1,4 +1,5 @@ -# +#!/bin/sh + # This runs the router by itself, WITHOUT the wrapper. # This means the router will not restart if it crashes. # Also, you will be using the default memory size, which is From 2152c5f6c9fffb7224cd86d720f7f6d7508c7a7f Mon Sep 17 00:00:00 2001 From: HungryHobo Date: Sat, 13 Nov 2010 00:39:55 +0000 Subject: [PATCH 5/5] Use a variable for /tmp to make lintian happy (possibly-insecure-handling-of-tmp-files-in-maintainer-script) --- debian/scripts/prerm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/scripts/prerm b/debian/scripts/prerm index 74f0bafed..5a7e5ab5d 100755 --- a/debian/scripts/prerm +++ b/debian/scripts/prerm @@ -2,7 +2,8 @@ /etc/init.d/i2p stop # stuff in /tmp -rm -f /tmp/wrapper.log /tmp/wrapper.log.1 /tmp/wrapper.log.2 /tmp/i2p.pid /tmp/routerjvm.pid /tmp/router.ping +TMPDIR=/tmp +rm -f ${TMPDIR}/wrapper.log ${TMPDIR}/wrapper.log.1 ${TMPDIR}/wrapper.log.2 ${TMPDIR}/i2p.pid ${TMPDIR}/routerjvm.pid ${TMPDIR}/router.ping # dpkg doesn't know about these files, they were copied out of jbigi.jar by the router LIB=/usr/lib/i2p