From d958a131147d5e9a2d8ff927daf3af5ee625ec1f Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Tue, 30 Dec 2014 09:49:14 -0500 Subject: [PATCH 1/4] this patch has been applied to master branch and is no longer needed. --- distros/ubuntu1204/patches/01_vendor-perl.diff | 17 ----------------- distros/ubuntu1204/patches/series | 1 - 2 files changed, 18 deletions(-) delete mode 100644 distros/ubuntu1204/patches/01_vendor-perl.diff diff --git a/distros/ubuntu1204/patches/01_vendor-perl.diff b/distros/ubuntu1204/patches/01_vendor-perl.diff deleted file mode 100644 index a58ef8778..000000000 --- a/distros/ubuntu1204/patches/01_vendor-perl.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: ZoneMinder/configure.ac -=================================================================== ---- ZoneMinder.orig/configure.ac 2014-12-13 15:10:27.705191682 +0100 -+++ ZoneMinder/configure.ac 2014-12-13 16:50:07.101049743 +0100 -@@ -443,10 +443,10 @@ - PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"` - PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"` - EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path" -- PERL_MM_PARMS="PREFIX=$prefix" -+ PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\"" - else - EXTRA_PERL_LIB="# Include from system perl paths only" -- PERL_MM_PARMS= -+ PERL_MM_PARMS="\"INSTALLDIRS=vendor\"" - fi - AC_SUBST(PERL_MM_PARMS) - AC_SUBST(EXTRA_PERL_LIB) diff --git a/distros/ubuntu1204/patches/series b/distros/ubuntu1204/patches/series index b479dc507..e69de29bb 100644 --- a/distros/ubuntu1204/patches/series +++ b/distros/ubuntu1204/patches/series @@ -1 +0,0 @@ -01_vendor-perl.diff From e460c6f448bdb169aa8e4d63ea8fa7d09036caa7 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 1 Jan 2015 17:18:12 -0500 Subject: [PATCH 2/4] BSD uses some different includes, these are from FreeBSD ports --- src/zm_comms.cpp | 5 +++++ src/zmc.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/src/zm_comms.cpp b/src/zm_comms.cpp index b30bed1d5..56bebf01b 100644 --- a/src/zm_comms.cpp +++ b/src/zm_comms.cpp @@ -25,7 +25,12 @@ #include #include //#include +#if defined(BSD) +#include +#else #include +#endif + #include //#include #include diff --git a/src/zmc.cpp b/src/zmc.cpp index df6258f69..2d25822b4 100644 --- a/src/zmc.cpp +++ b/src/zmc.cpp @@ -19,7 +19,11 @@ #include #include +#if defined(BSD) +#include +#else #include +#endif #include "zm.h" #include "zm_db.h" From 0de72173177ba63c6e26e0f5ae2e096c57604a49 Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Sat, 3 Jan 2015 14:13:41 +0100 Subject: [PATCH 3/4] Remove no longer needed patch because applied to master --- distros/debian/patches/01_vendor-perl.diff | 17 ----------------- distros/debian/patches/series | 1 - distros/debian8/patches/01_vendor-perl.diff | 15 --------------- distros/debian8/patches/series | 1 - 4 files changed, 34 deletions(-) delete mode 100644 distros/debian/patches/01_vendor-perl.diff delete mode 100644 distros/debian8/patches/01_vendor-perl.diff diff --git a/distros/debian/patches/01_vendor-perl.diff b/distros/debian/patches/01_vendor-perl.diff deleted file mode 100644 index a58ef8778..000000000 --- a/distros/debian/patches/01_vendor-perl.diff +++ /dev/null @@ -1,17 +0,0 @@ -Index: ZoneMinder/configure.ac -=================================================================== ---- ZoneMinder.orig/configure.ac 2014-12-13 15:10:27.705191682 +0100 -+++ ZoneMinder/configure.ac 2014-12-13 16:50:07.101049743 +0100 -@@ -443,10 +443,10 @@ - PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"` - PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"` - EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path" -- PERL_MM_PARMS="PREFIX=$prefix" -+ PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\"" - else - EXTRA_PERL_LIB="# Include from system perl paths only" -- PERL_MM_PARMS= -+ PERL_MM_PARMS="\"INSTALLDIRS=vendor\"" - fi - AC_SUBST(PERL_MM_PARMS) - AC_SUBST(EXTRA_PERL_LIB) diff --git a/distros/debian/patches/series b/distros/debian/patches/series index b479dc507..e69de29bb 100644 --- a/distros/debian/patches/series +++ b/distros/debian/patches/series @@ -1 +0,0 @@ -01_vendor-perl.diff diff --git a/distros/debian8/patches/01_vendor-perl.diff b/distros/debian8/patches/01_vendor-perl.diff deleted file mode 100644 index df4f88d06..000000000 --- a/distros/debian8/patches/01_vendor-perl.diff +++ /dev/null @@ -1,15 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -437,10 +437,10 @@ - PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"` - PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"` - EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path" -- PERL_MM_PARMS="PREFIX=$prefix" -+ PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\"" - else - EXTRA_PERL_LIB="# Include from system perl paths only" -- PERL_MM_PARMS= -+ PERL_MM_PARMS="\"INSTALLDIRS=vendor\"" - fi - AC_SUBST(PERL_MM_PARMS) - AC_SUBST(EXTRA_PERL_LIB) diff --git a/distros/debian8/patches/series b/distros/debian8/patches/series index b479dc507..e69de29bb 100644 --- a/distros/debian8/patches/series +++ b/distros/debian8/patches/series @@ -1 +0,0 @@ -01_vendor-perl.diff From 89a603cf27e53f136237d5fc92e96bcdf295ec82 Mon Sep 17 00:00:00 2001 From: Stephen Arthur Date: Sat, 3 Jan 2015 12:45:18 -0500 Subject: [PATCH 4/4] Modified zmfilter.pl.in to fix #652, crashing while processing background filter with no terms --- scripts/zmfilter.pl.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in index 1d55e0d40..ca380e539 100755 --- a/scripts/zmfilter.pl.in +++ b/scripts/zmfilter.pl.in @@ -278,7 +278,7 @@ sub getFilters my $sql = "select E.Id,E.MonitorId,M.Name as MonitorName,M.DefaultRate,M.DefaultScale,E.Name,E.Cause,E.Notes,E.StartTime,unix_timestamp(E.StartTime) as Time,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived,E.Videoed,E.Uploaded,E.Emailed,E.Messaged,E.Executed from Events as E inner join Monitors as M on M.Id = E.MonitorId"; $db_filter->{Sql} = ''; - if ( @{$filter_expr->{terms}} ) + if ( $filter_expr->{terms} ) { for ( my $i = 0; $i < @{$filter_expr->{terms}}; $i++ ) {