[SCM] Debian package checker branch, master, updated. 2.5.14-26-g1662c3e
The following commit has been merged in the master branch:
commit 7e089a351b607291fe59147b88d4567915b0e540
Author: Niels Thykier <niels@thykier.net>
Date: Sun Jun 30 22:21:32 2013 +0200
t(estset): Update to reflect the new systemd check
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/tests/files-bad-perm-owner/debian/debian/binary.init b/t/tests/files-bad-perm-owner/debian/debian/binary.init
index 32f2618..4ebbdf5 100644
--- a/t/tests/files-bad-perm-owner/debian/debian/binary.init
+++ b/t/tests/files-bad-perm-owner/debian/debian/binary.init
@@ -12,6 +12,8 @@ set -e
# Description: Does nothing
### END INIT INFO
+. /lib/lsb/init-functions
+
case "$1" in
start|stop|force-reload|restart|status|*)
echo hello world
diff --git a/t/tests/init.d-general/debian/debian/init.d-general-bugs.init b/t/tests/init.d-general/debian/debian/init.d-general-bugs.init
index ea68340..55305ab 100644
--- a/t/tests/init.d-general/debian/debian/init.d-general-bugs.init
+++ b/t/tests/init.d-general/debian/debian/init.d-general-bugs.init
@@ -13,3 +13,5 @@ set -e
### END INIT INFO
# start stop force-reload restart status
+
+. /lib/lsb/init-functions
diff --git a/t/tests/init.d-general/debian/debian/init.d-general-interpreter-in-usr-dir.init b/t/tests/init.d-general/debian/debian/init.d-general-interpreter-in-usr-dir.init
index 88af15d..ff7698c 100644
--- a/t/tests/init.d-general/debian/debian/init.d-general-interpreter-in-usr-dir.init
+++ b/t/tests/init.d-general/debian/debian/init.d-general-interpreter-in-usr-dir.init
@@ -11,3 +11,4 @@
### END INIT INFO
printf "start status stop reload restart force-reload\n";
+
diff --git a/t/tests/init.d-general/debian/debian/init.d-general-sourcing-without-test.init b/t/tests/init.d-general/debian/debian/init.d-general-sourcing-without-test.init
index 378be9f..7046ed9 100644
--- a/t/tests/init.d-general/debian/debian/init.d-general-sourcing-without-test.init
+++ b/t/tests/init.d-general/debian/debian/init.d-general-sourcing-without-test.init
@@ -12,6 +12,8 @@
echo start stop reload restart force-reload status
+. /lib/lsb/init-functions
+
. /etc/default/rcS
[ ! -f /etc/default/foo ] || . /etc/default/foo
diff --git a/t/tests/init.d-general/debian/debian/init.d-general.init b/t/tests/init.d-general/debian/debian/init.d-general.init
index 539acb9..b3e8ae7 100644
--- a/t/tests/init.d-general/debian/debian/init.d-general.init
+++ b/t/tests/init.d-general/debian/debian/init.d-general.init
@@ -2,6 +2,8 @@
set -e
+. /lib/lsb/init-functions
+
### BEGIN INIT INFO
# Provides: init.d-general
# Required-Start:
diff --git a/t/tests/init.d-general/tags b/t/tests/init.d-general/tags
index 5665d79..2c7a493 100644
--- a/t/tests/init.d-general/tags
+++ b/t/tests/init.d-general/tags
@@ -3,7 +3,8 @@ E: init.d-general-bugs: init.d-script-does-not-implement-required-option etc/ini
E: init.d-general-bugs: init.d-script-does-not-implement-required-option etc/init.d/init.d-general-bugs restart
E: init.d-general-bugs: init.d-script-does-not-implement-required-option etc/init.d/init.d-general-bugs start
E: init.d-general-bugs: init.d-script-does-not-implement-required-option etc/init.d/init.d-general-bugs stop
-E: init.d-general-sourcing-without-test: init.d-script-sourcing-without-test etc/init.d/init.d-general-sourcing-without-test:15 /etc/default/rcS
+E: init.d-general-sourcing-without-test: init.d-script-sourcing-without-test etc/init.d/init.d-general-sourcing-without-test:17 /etc/default/rcS
I: init.d-general-bugs: init.d-script-does-not-implement-optional-option etc/init.d/init.d-general-bugs status
+W: init.d-general-interpreter-in-usr-dir: init.d-script-does-not-source-init-functions etc/init.d/init.d-general-interpreter-in-usr-dir
W: init.d-general-interpreter-in-usr-dir: init.d-script-uses-usr-interpreter etc/init.d/init.d-general-interpreter-in-usr-dir /usr/bin/perl
W: init.d-general-script-call-internal-api: init.d-script-call-internal-API etc/init.d/init.d-general-script-call-internal-api
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init
index 3edd94f..e450395 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-length.init
@@ -12,6 +12,8 @@ set -e
# Description: The short description pretty much covers it.
### END INIT INFO
+. /lib/lsb/init-functions
+
case "$1" in
start|stop|force-reload|restart|status|*)
echo hello world!
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-local.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-local.init
index 93218d5..2f7049b 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-local.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-local.init
@@ -14,6 +14,8 @@ set -e
exec >/var/log/foo.log
+. /lib/lsb/init-functions
+
case "$1" in
start|stop|force-reload|restart|status|*)
echo hello world!
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-missing.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-missing.init
index 88b55a2..4e60e54 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-missing.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-missing.init
@@ -10,6 +10,8 @@ set -e
# Default-Stop: 0 6
### END INIT INFO
+. /lib/lsb/init-functions
+
case "$1" in
start|stop|force-reload|restart|status|*)
echo hello world
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-parsing.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-parsing.init
index e3f518f..188e1f1 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-parsing.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-parsing.init
@@ -12,6 +12,8 @@ set -e
# Description: The short description pretty much covers it.
### END INIT INFO
+. /lib/lsb/init-functions
+
case "$1" in
start|stop|force-reload|restart|status|*)
echo hello world!
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-remote.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-remote.init
index 475db5a..c0a131c 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-remote.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-remote.init
@@ -13,6 +13,7 @@ set -e
# Description: The short description pretty much covers it.
### END INIT INFO
+. /lib/lsb/init-functions
. /usr/share/foo/lib.sh
case "$1" in
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-virtual.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-virtual.init
index 6c55c20..ac98ae9 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-virtual.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers-virtual.init
@@ -13,6 +13,8 @@ set -e
# Description: The short description pretty much covers it.
### END INIT INFO
+. /lib/lsb/init-functions
+
case "$1" in
start|stop|force-reload|restart|status|*)
echo hello world
diff --git a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers.init b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers.init
index 30d83c3..847885c 100644
--- a/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers.init
+++ b/t/tests/init.d-lsb-headers/debian/debian/init.d-lsb-headers.init
@@ -14,6 +14,8 @@ set -e
# Description: The short description pretty much covers it.
### END INIT INFO
+. /lib/lsb/init-functions
+
case "$1" in
start|stop|force-reload|restart|status|*)
echo hello world!
diff --git a/t/tests/init.d-script-registration/debian/foo.in b/t/tests/init.d-script-registration/debian/foo.in
index 15f5f8f..9445298 100644
--- a/t/tests/init.d-script-registration/debian/foo.in
+++ b/t/tests/init.d-script-registration/debian/foo.in
@@ -1,5 +1,7 @@
#!/bin/sh -e
+. /lib/lsb/init-functions
+
case "$1" in
start)
;;
diff --git a/t/tests/init.d-script-registration/tags b/t/tests/init.d-script-registration/tags
index 43efd8f..6dd8974 100644
--- a/t/tests/init.d-script-registration/tags
+++ b/t/tests/init.d-script-registration/tags
@@ -1,3 +1,4 @@
+E: init.d-script-registration: init-script-is-not-a-file etc/init.d/bar
W: init.d-script-registration: init.d-script-missing-lsb-section etc/init.d/foo.in
W: init.d-script-registration: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/bar
W: init.d-script-registration: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/foo.in
diff --git a/t/tests/scripts-calls-init-script/debian/self-invoke b/t/tests/scripts-calls-init-script/debian/self-invoke
index 6eacfdd..048f01f 100755
--- a/t/tests/scripts-calls-init-script/debian/self-invoke
+++ b/t/tests/scripts-calls-init-script/debian/self-invoke
@@ -8,6 +8,9 @@
# Short-Description: Test init script
# Description: Test init script.
### END INIT INFO
+
+. /lib/lsb/init-functions
+
case "$1" in
start)
:
diff --git a/t/tests/systemd-general/debian/debian/postrm b/t/tests/systemd-general/debian/debian/postrm
new file mode 100644
index 0000000..c4a5ba4
--- /dev/null
+++ b/t/tests/systemd-general/debian/debian/postrm
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ] && which systemctl >/dev/null 2>&1; then
+ systemctl || true
+fi
diff --git a/t/tests/systemd-general/debian/debian/rules b/t/tests/systemd-general/debian/debian/rules
new file mode 100644
index 0000000..8c12dd7
--- /dev/null
+++ b/t/tests/systemd-general/debian/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+ETC_DIR=debian/$(shell dh_listpackages)/etc/
+INITD_DIR=$(ETC_DIR)/init.d
+SYSD_DIR=$(ETC_DIR)/systemd/system
+
+%:
+ dh $@
+
+override_dh_install:
+ dh_install
+ install -m 0755 -d $(INITD_DIR) $(SYSD_DIR)
+ mkfifo $(INITD_DIR)/fifo-pipe-as-init
+ mkfifo $(SYSD_DIR)/fifo-pipe-as-init.service
diff --git a/t/tests/systemd-general/desc b/t/tests/systemd-general/desc
index dc83420..93ad863 100644
--- a/t/tests/systemd-general/desc
+++ b/t/tests/systemd-general/desc
@@ -3,8 +3,10 @@ Sequence: 6000
Version: 1.0
Description: General systemd tests
Test-For:
+ init-script-is-not-a-file
init.d-script-does-not-source-init-functions
maintainer-script-calls-systemctl
+ service-file-is-not-a-file
systemd-service-file-outside-lib
systemd-tmpfiles.d-outside-usr-lib
systemd-service-file-refers-to-obsolete-target
diff --git a/t/tests/systemd-general/tags b/t/tests/systemd-general/tags
index b5bbdee..a877201 100644
--- a/t/tests/systemd-general/tags
+++ b/t/tests/systemd-general/tags
@@ -1,7 +1,14 @@
+E: systemd-general: init-script-is-not-a-file etc/init.d/fifo-pipe-as-init
+E: systemd-general: service-file-is-not-a-file etc/systemd/system/fifo-pipe-as-init.service
+E: systemd-general: service-file-is-not-a-file etc/systemd/system/fifo-pipe-as-init.service
+E: systemd-general: special-file etc/init.d/fifo-pipe-as-init 0644
+E: systemd-general: special-file etc/systemd/system/fifo-pipe-as-init.service 0644
E: systemd-general: systemd-no-service-for-init-script systemd-general
+E: systemd-general: systemd-service-file-outside-lib etc/systemd/system/fifo-pipe-as-init.service
E: systemd-general: systemd-service-file-outside-lib etc/systemd/system/test.service
E: systemd-general: systemd-tmpfiles.d-outside-usr-lib etc/tmpfiles.d/test.conf
W: systemd-general: init.d-script-call-internal-API etc/init.d/systemd-general
W: systemd-general: init.d-script-does-not-source-init-functions etc/init.d/systemd-general
-W: systemd-general: maintainer-script-calls-systemctl postrm
+W: systemd-general: maintainer-script-calls-systemctl postrm:20
+W: systemd-general: script-in-etc-init.d-not-registered-via-update-rc.d etc/init.d/fifo-pipe-as-init
W: systemd-general: systemd-service-file-refers-to-obsolete-target etc/systemd/system/test.service syslog.target
diff --git a/testset/tags.scripts b/testset/tags.scripts
index 2b694f0..daa67d0 100644
--- a/testset/tags.scripts
+++ b/testset/tags.scripts
@@ -72,6 +72,9 @@ W: scripts: executable-is-not-world-readable usr/bin/suidperlfoo2 4751
W: scripts: executable-not-elf-or-script usr/bin/perl-bizarre-3
W: scripts: init-d-script-stops-in-s-runlevel etc/init.d/lsb-broken
W: scripts: init-d-script-stops-in-s-runlevel etc/init.d/skeleton
+W: scripts: init.d-script-does-not-source-init-functions etc/init.d/lsb-broken
+W: scripts: init.d-script-does-not-source-init-functions etc/init.d/lsb-other
+W: scripts: init.d-script-does-not-source-init-functions etc/init.d/no-lsb
W: scripts: init.d-script-has-bad-lsb-line etc/init.d/lsb-broken:4
W: scripts: init.d-script-has-bad-lsb-line etc/init.d/lsb-broken:9
W: scripts: init.d-script-has-bad-stop-runlevel etc/init.d/lsb-broken X
--
Debian package checker
Reply to: