Adding upstream version 2.117.0.upstream/2.117.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

10 files changed, 68 insertions, 0 deletions

diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/debian/install b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/debian/install
new file mode 100644
index 0000000..31e3a9e
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/debian/install
@@ -0,0 +1,4 @@
+bad          /etc/cron.daily
+other-action /etc/cron.daily
+test-first   /etc/cron.daily
+self-invoke  /etc/init.d
diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/debian/postinst b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/debian/postinst
new file mode 100644
index 0000000..3feaa42
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/debian/postinst
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+update-rc.d self-invoke defaults >/dev/null
+/etc/init.d/self-invoke start
+
+#DEBHELPER#
diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/debian/postrm b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/debian/postrm
new file mode 100644
index 0000000..acba064
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/debian/postrm
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+if [ "remove" = "$1" ] ; then
+    update-rc.d self-invoke remove >/dev/null
+fi
+
+#DEBHELPER#
diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/fill-values b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/fill-values
new file mode 100644
index 0000000..e5cb95f
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/fill-values
@@ -0,0 +1,3 @@
+Skeleton: upload-native
+Testname: scripts-calls-init-script
+Description: Test proper use of invoke-rc.d
diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/bad b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/bad
new file mode 100755
index 0000000..86c80a7
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/bad
@@ -0,0 +1,2 @@
+#!/bin/sh
+/etc/init.d/ntp restart
diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/other-action b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/other-action
new file mode 100755
index 0000000..cd58f75
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/other-action
@@ -0,0 +1,3 @@
+#!/bin/sh
+# Only supported invoke-rc.d actions are required to go through invoke-rc.d.
+/etc/init.d/foo frobnicate-the-bazerator
diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/self-invoke b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/self-invoke
new file mode 100755
index 0000000..048f01f
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/self-invoke
@@ -0,0 +1,30 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          self-invoke
+# Required-Start:    
+# Required-Stop:     
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Test init script
+# Description:       Test init script.
+### END INIT INFO
+
+. /lib/lsb/init-functions
+
+case "$1" in
+  start)
+    :
+    ;;
+  stop)
+    :
+    ;;
+  restart)
+    /etc/init.d/self-invoke start
+    ;;
+  status)
+    :
+    ;;
+  force-reload)
+    :
+    ;;
+esac
diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/test-first b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/test-first
new file mode 100755
index 0000000..5019218
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/build-spec/orig/test-first
@@ -0,0 +1,6 @@
+#!/bin/sh
+if which invoke-rc.d >/dev/null 2>&1 ; then
+    invoke-rc.d ntp restart
+else
+    /etc/init.d/ntp restart
+fi
diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/eval/desc b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/eval/desc
new file mode 100644
index 0000000..4754f9c
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/eval/desc
@@ -0,0 +1,4 @@
+Testname: scripts-calls-init-script
+Check: init-d/maintainer-script
+See-Also:
+ Bug#381485
diff --git a/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/eval/hints b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/eval/hints
new file mode 100644
index 0000000..1101108
--- /dev/null
+++ b/t/recipes/checks/init-d/maintainer-script/scripts-calls-init-script/eval/hints
@@ -0,0 +1 @@
+scripts-calls-init-script (binary): maintainer-script-calls-init-script-directly [postinst:5]