pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

zoneminder: Inhibit the fragile and unnecessary systemd check



Module Name:	pkgsrc-wip
Committed By:	davidsainty <david.sainty%gmail.com@localhost>
Pushed By:	dsainty
Date:		Sat Jan 22 23:21:33 2022 +1300
Changeset:	84073b583b7154c37a26a6d2067dc5f70b8d00a4

Modified Files:
	zoneminder/distinfo
Added Files:
	zoneminder/patches/patch-scripts_zmpkg_pl_in

Log Message:
zoneminder: Inhibit the fragile and unnecessary systemd check

The systemd check in zmpkg.pl does not work, even on systems that use systemd.
It fails to start, eventually timing out, if there is any parent process
between zmpkg.pl and systemd or init - such as /etc/init.d/zoneminder

But everything does seem to work ok from systemd without this roundabout code
anyway, so just inhibit it.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=84073b583b7154c37a26a6d2067dc5f70b8d00a4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 zoneminder/distinfo                          |  1 +
 zoneminder/patches/patch-scripts_zmpkg_pl_in | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+)

diffs:
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index f8eb827aea..379e44887d 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -11,6 +11,7 @@ SHA1 (patch-cmake_Modules_Pod2Man.cmake) = f0a1462037fc63fa9f35d0595f4f50946f551
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_General_pm) = bded373e318cd074b92853165d5ca38d23bdea5f
 SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_Memory_Shared.pm) = b97c104f6ac102fc4510eb0977169375cdd97197
 SHA1 (patch-scripts_zm_in) = a05727261bb8be6b707e9a14ae4ff52ea3770d51
+SHA1 (patch-scripts_zmpkg_pl_in) = 04f30a02ad5132a58c5396bbf5dbb92280eddb8f
 SHA1 (patch-src_zm__event.cpp) = c9ffa1f11c410b56b774be1879a227f2be361f36
 SHA1 (patch-src_zm__monitor.cpp) = f690dae0adee48faeb94a393ca22f1ec49e8331e
 SHA1 (patch-src_zm__rtp__ctrl.h) = 4e0fd8e80932de8d77b3386a356cc026ddc23113
diff --git a/zoneminder/patches/patch-scripts_zmpkg_pl_in b/zoneminder/patches/patch-scripts_zmpkg_pl_in
new file mode 100644
index 0000000000..b5e3f2cbd1
--- /dev/null
+++ b/zoneminder/patches/patch-scripts_zmpkg_pl_in
@@ -0,0 +1,20 @@
+$NetBSD$
+
+The systemd check in zmpkg.pl does not work, even on systems that use systemd.
+It fails to start, eventually timing out, if there is any parent process
+between zmpkg.pl and systemd or init - such as /etc/init.d/zoneminder
+
+But everything does seem to work ok from systemd without this roundabout code
+anyway, so just inhibit it.
+
+--- scripts/zmpkg.pl.in.orig	2021-09-26 20:28:10.324733138 +1300
++++ scripts/zmpkg.pl.in	2021-09-26 20:28:30.414613144 +1300
+@@ -168,7 +168,7 @@
+ }
+ 
+ # Check if we are running systemd and if we have been called by the system
+-if ( $command =~ /^(start|stop|restart)$/ )
++if ( 0 && $command =~ /^(start|stop|restart)$/ )
+ {
+     # We have to detaint to keep perl from complaining
+     $command = $1;


Home | Main Index | Thread Index | Old Index