pkgsrc-WIP-changes archive

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

zoneminder: Inhibit a couple of "phone home" options that are enabled by default. These should be opt-in rather than opt-out.



Module Name:	pkgsrc-wip
Committed By:	davidsainty <david.sainty%gmail.com@localhost>
Pushed By:	dsainty
Date:		Sun Jan 23 22:44:03 2022 +1300
Changeset:	15e135aad76e25b85b540d3500abb1554eb63ef0

Modified Files:
	zoneminder/Makefile
	zoneminder/distinfo
Added Files:
	zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in

Log Message:
zoneminder: Inhibit a couple of "phone home" options that are enabled by default.  These should be opt-in rather than opt-out.

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

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

diffstat:
 zoneminder/Makefile                                |  2 +-
 zoneminder/distinfo                                |  1 +
 ...ipts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in | 28 ++++++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)

diffs:
diff --git a/zoneminder/Makefile b/zoneminder/Makefile
index cddb00f28f..000e2f16a0 100644
--- a/zoneminder/Makefile
+++ b/zoneminder/Makefile
@@ -278,7 +278,7 @@ PRINT_PLIST_AWK+=	/.orig$$/ { next; }
 # After patching remove any .orig files because (for patched .pm files) they
 # end up going through the installation process.
 pre-configure:
-	${FIND} ${WRKSRC} -name "*.pm.orig" -type f | ${XARGS} ${RM} -f
+	${FIND} ${WRKSRC} -name "*.pm*.orig" -type f | ${XARGS} ${RM} -f
 
 #
 # Arrange for module.mk to perform its magic here on top of the non-Perl
diff --git a/zoneminder/distinfo b/zoneminder/distinfo
index 379e44887d..cb5678b90f 100644
--- a/zoneminder/distinfo
+++ b/zoneminder/distinfo
@@ -8,6 +8,7 @@ SHA512 (ZoneMinder-1.30.5.tar.gz) = f423b79726357c277814c9346445b695fc1b0f9cff61
 Size (ZoneMinder-1.30.5.tar.gz) = 9936584 bytes
 SHA1 (patch-CMakeLists.txt) = 4cf38ed2818c2000863c4b6587c5b5f64b0c1127
 SHA1 (patch-cmake_Modules_Pod2Man.cmake) = f0a1462037fc63fa9f35d0595f4f50946f5518e7
+SHA1 (patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in) = b8f508abcd5451da73092070a302b99d1fd59def
 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
diff --git a/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in b/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in
new file mode 100644
index 0000000000..e6026c5e0b
--- /dev/null
+++ b/zoneminder/patches/patch-scripts_ZoneMinder_lib_ZoneMinder_ConfigData.pm.in
@@ -0,0 +1,28 @@
+$NetBSD$
+
+Inhibit a couple of "phone home" options that are enabled by default.  These
+should be opt-in rather than opt-out.
+
+The ConfigData.pm module determines what the default setting is for new
+options during an upgrade as well as on an initial installation.
+
+--- scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in.orig	2022-01-23 22:09:24.000000000 +1300
++++ scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in	2022-01-23 22:11:28.000000000 +1300
+@@ -2787,7 +2787,7 @@
+   },
+   {
+     name        => "ZM_CHECK_FOR_UPDATES",
+-    default     => "yes",
++    default     => "no",
+     description => "Check with zoneminder.com for updated versions",
+     help        => qqq("
+         From ZoneMinder version 1.17.0 onwards new versions are
+@@ -2805,7 +2805,7 @@
+   },
+   {
+     name        => "ZM_TELEMETRY_DATA",
+-    default     => "yes",
++    default     => "no",
+     description => "Send usage information to ZoneMinder",
+     help        => qqq("
+         Enable collection of usage information of the local system and send


Home | Main Index | Thread Index | Old Index