Packman Build Service PMBS

ZoneMinder.changes Changed

ZoneMinder.spec Changed

@@ -43,7 +43,7 @@
 License:        GPL
 Group:          Productivity/Networking/Web/Servers
 Summary:        A Linux based camera monitoring and analysis tool
-Version:        1.32.3
+Version: 1.34.2
 Release:        12.1
 Packager:       Monex <monex@liquid-co.de>
 URL:            http://www.zoneminder.com/
@@ -65,8 +65,8 @@
 Patch1:         zm.conf.patch
 Patch2:         zm_database_default_config.patch
 Patch3:         ignore_signal_on_config_write.patch
-Patch4:         reload_config.patch
-Patch5:         fix-ZM_VERSION-already-defined-error.patch
+Patch4:         reload_config.20200211.patch
+Patch5:         fix-ZM_VERSION-already-defined-error.20200211.patch
 Patch6:         systemd-name-conventions.patch
 Patch7:         move-include-sys-uio.h-outside-defined-BSD-block.patch
 
@@ -218,7 +218,8 @@
 %defattr(-,root,root)
 %_sysconfdir/permissions.d/*
 %{_sysconfdir}/logrotate.d/zm
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README* LICENSE*
+%doc README* version CONTRIBUTING.md COPYING LICENSE* 
+#%doc AUTHORS COPYING ChangeLog INSTALL NEWS README* LICENSE*
 %defattr(640,root,www)
 %config(noreplace) %{_sysconfdir}/zm.conf
 %config(noreplace) %{_sysconfdir}/conf.d/*

fix-ZM_VERSION-already-defined-error.20200211.patch Added

reload_config.patch -> reload_config.20200211.patch Changed

@@ -1,38 +1,39 @@
-From aeb83d12edcdff979001ad79faecd111e9f5630a Mon Sep 17 00:00:00 2001
-From: Dirk Hartmann <2monex@gmx.net>
-Date: Thu, 3 Apr 2014 20:13:44 +0200
-Subject: [PATCH 4/7] reload_config.patch
-
----
- scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in | 10 +++++++---
- scripts/zmpkg.pl.in                            |  3 +++
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
-index 7f38d2c6e..a10391722 100644
---- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
-+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
-@@ -70,8 +70,8 @@ use constant ZM_CONFIG_SUBDIR => "@ZM_CONFIG_SUBDIR@"; # Path to the ZoneMinder
- use Carp;
+diff -Nur zoneminder-1.34.2.qorig/scripts/zmpkg.pl.in zoneminder-1.34.2/scripts/zmpkg.pl.in
+--- zoneminder-1.34.2.qorig/scripts/zmpkg.pl.in	2020-02-11 13:24:05.817278256 +0100
++++ zoneminder-1.34.2/scripts/zmpkg.pl.in	2020-02-11 13:25:01.741227568 +0100
+@@ -168,6 +168,9 @@
+   Debug("zmdc.pl check = $status");
+ 
+   if ( $status eq 'stopped' ) {
++  
++    ZoneMinder::Config::load_configuration();
++    
+     if ( $Config{ZM_DYN_DB_VERSION}
+         and ( $Config{ZM_DYN_DB_VERSION} ne ZM_VERSION )
+        ) {
+diff -Nur zoneminder-1.34.2.qorig/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in zoneminder-1.34.2/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+--- zoneminder-1.34.2.qorig/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in	2020-02-11 13:27:41.849245307 +0100
++++ zoneminder-1.34.2/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in	2020-02-11 13:26:32.002337668 +0100
+@@ -72,7 +72,8 @@
+ require ZoneMinder::Database;
  
  # Load the config from the database into the symbol table
 -BEGIN {
--
 +sub load_configuration
 +{
+ require ZoneMinder::Database;
+ 
    # Process name, value pairs from the main config file first
-   my $config_file = ZM_CONFIG;
-   process_configfile($config_file);
-@@ -163,7 +163,7 @@ BEGIN {
-     }
-   }
+@@ -144,7 +145,7 @@
+     close($CONFIG);
+   } # end sub process_configfile
  
 -} # end BEGIN
 +} # end load_configuration
  
  sub loadConfigFromDB {
    print( 'Loading config from DB' );
-@@ -267,6 +267,10 @@ sub saveConfigToDB {
+@@ -246,6 +249,10 @@
    $dbh->{AutoCommit} = $ac;
  } # end sub saveConfigToDB
  
@@ -42,21 +43,4 @@
 +} # end BEGIN
  1;
  __END__
- 
-diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
-index f636007c5..781b49bbf 100644
---- a/scripts/zmpkg.pl.in
-+++ b/scripts/zmpkg.pl.in
-@@ -178,6 +178,9 @@ if ( $command =~ /^(?:start|restart)$/ ) {
-   Debug("zmdc.pl check = $status");
- 
-   if ( $status eq 'stopped' ) {
-+  
-+    ZoneMinder::Config::load_configuration();
-+    
-     if ( $Config{ZM_DYN_DB_VERSION}
-         and ( $Config{ZM_DYN_DB_VERSION} ne ZM_VERSION )
-        ) {
--- 
-2.18.0

reload_patch.20200211.patch Added

@@ -0,0 +1,73 @@
+diff -Nur zoneminder-1.34.2.qorig/scripts/zmpkg.pl.in zoneminder-1.34.2/scripts/zmpkg.pl.in
+--- zoneminder-1.34.2.qorig/scripts/zmpkg.pl.in	2020-02-11 11:16:01.896009112 +0100
++++ zoneminder-1.34.2/scripts/zmpkg.pl.in	2020-02-11 15:16:39.554416967 +0100
+@@ -168,6 +168,9 @@
+   Debug("zmdc.pl check = $status");
+ 
+   if ( $status eq 'stopped' ) {
++  
++    ZoneMinder::Config::load_configuration();
++    
+     if ( $Config{ZM_DYN_DB_VERSION}
+         and ( $Config{ZM_DYN_DB_VERSION} ne ZM_VERSION )
+        ) {
+diff -Nur zoneminder-1.34.2.qorig/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in zoneminder-1.34.2/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+--- zoneminder-1.34.2.qorig/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in	2020-02-11 15:16:17.934416462 +0100
++++ zoneminder-1.34.2/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in	2020-02-11 15:16:39.554416967 +0100
+@@ -72,7 +72,8 @@
+ require ZoneMinder::Database;
+ 
+ # Load the config from the database into the symbol table
+-BEGIN {
++sub load_configuration
++{
+ require ZoneMinder::Database;
+ 
+   # Process name, value pairs from the main config file first
+@@ -144,7 +145,7 @@
+     close($CONFIG);
+   } # end sub process_configfile
+ 
+-} # end BEGIN
++} # end load_configuration
+ 
+ sub loadConfigFromDB {
+   print( 'Loading config from DB' );
+@@ -248,6 +249,10 @@
+   $dbh->{AutoCommit} = $ac;
+ } # end sub saveConfigToDB
+ 
++BEGIN
++{
++       load_configuration(); 
++} # end BEGIN
+ 1;
+ __END__
+ 
+diff -Nur zoneminder-1.34.2.qorig/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in.orig zoneminder-1.34.2/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in.orig
+--- zoneminder-1.34.2.qorig/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in.orig	2020-02-11 11:16:01.884009112 +0100
++++ zoneminder-1.34.2/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in.orig	2020-02-11 15:16:17.934416462 +0100
+@@ -184,6 +184,8 @@
+ 
+ sub saveConfigToDB {
+   print( 'Saving config to DB ' . @options . " entries\n" );
++  local $SIG{INT} = 'IGNORE';
++  local $SIG{TERM} = 'IGNORE';
+   my $dbh = ZoneMinder::Database::zmDbConnect();
+   if ( !$dbh ) {
+     print( "Error: unable to save options to database: $DBI::errstr\n" );
+diff -Nur zoneminder-1.34.2.qorig/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in.rej zoneminder-1.34.2/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in.rej
+--- zoneminder-1.34.2.qorig/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in.rej	2020-02-11 13:45:33.206289223 +0100
++++ zoneminder-1.34.2/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in.rej	1970-01-01 01:00:00.000000000 +0100
+@@ -1,11 +0,0 @@
+---- scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in	2020-02-11 13:27:41.849245307 +0100
+-+++ scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in	2020-02-11 13:26:32.002337668 +0100
+-@@ -185,6 +186,8 @@
+- 
+- sub saveConfigToDB {
+-   print( 'Saving config to DB ' . @options . " entries\n" );
+-+  local $SIG{INT} = 'IGNORE';
+-+  local $SIG{TERM} = 'IGNORE';
+-   my $dbh = ZoneMinder::Database::zmDbConnect();
+-   if ( !$dbh ) {
+-     print( "Error: unable to save options to database: $DBI::errstr\n" );

checkout-diego.sh Added

zoneminder-1.32.3.tar.gz -> zoneminder-1.34.2.tar.gz Changed

Changes of Revision 4