From 602f703df8f121da88c7923e4a08521d68d7b14a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 10:22:57 -0400 Subject: [PATCH 01/16] roudn up when calculating buffer size for scaled image. Fixes #932 --- src/zm_image.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/zm_image.cpp b/src/zm_image.cpp index 21e190ffb..8f91ab28b 100644 --- a/src/zm_image.cpp +++ b/src/zm_image.cpp @@ -2596,8 +2596,8 @@ void Image::Scale( unsigned int factor ) return; } - unsigned int new_width = (width*factor)/ZM_SCALE_BASE; - unsigned int new_height = (height*factor)/ZM_SCALE_BASE; + unsigned int new_width = (width*factor)/ZM_SCALE_BASE+1; + unsigned int new_height = (height*factor)/ZM_SCALE_BASE+1; size_t scale_buffer_size = new_width * new_height * colours; From 33a9fc617581eedc7ba4b8bfc926bf39e15a0817 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 10:36:31 -0400 Subject: [PATCH 02/16] fix utf8 ' characters --- src/zmf.cpp | 2 +- src/zmu.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/zmf.cpp b/src/zmf.cpp index c7544bcf1..07149c4cc 100644 --- a/src/zmf.cpp +++ b/src/zmf.cpp @@ -37,7 +37,7 @@ zmf - The ZoneMinder Frame daemon This is an optional daemon that can run in concert with the Analysis daemon and whose function it is to actually write captured frames to disk. This frees up the Analysis daemon to do more analysis (!) and so keep up with the Capture -daemon better. If it isn’t running or dies then the Analysis daemon just writes +daemon better. If it isn't running or dies then the Analysis daemon just writes them itself. =head1 OPTIONS diff --git a/src/zmu.cpp b/src/zmu.cpp index 1cecb6d22..a1e8887bd 100644 --- a/src/zmu.cpp +++ b/src/zmu.cpp @@ -33,7 +33,7 @@ zmc - The ZoneMinder Utility =head1 DESCRIPTION -This binary is a handy command line interface to several useful functions. It’s +This binary is a handy command line interface to several useful functions. It's not really meant to be used by anyone except the web page (there's only limited 'help' in it so far) but can be if necessary, especially for debugging video problems. From 7a08127d21cf08c5c1c999262927cfc55557e07a Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 12:02:20 -0400 Subject: [PATCH 03/16] release snapshot 2015071501 --- distros/ubuntu1204/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/distros/ubuntu1204/changelog b/distros/ubuntu1204/changelog index 2dfc8b63c..09571c21b 100644 --- a/distros/ubuntu1204/changelog +++ b/distros/ubuntu1204/changelog @@ -1,3 +1,11 @@ +zoneminder (1.28.1+1-trusty-SNAPSHOT2015071501) trusty; urgency=medium + + * fix for issue #586 and #932 + * fix for db not being upgraded + * version upgraded to .100 + + -- Isaac Connor Wed, 15 Jul 2015 11:56:28 -0400 + zoneminder (1.28.1+1-trusty-SNAPSHOT2015030201) trusty; urgency=medium * maybe fix for RTSP Basic Auth From 4f0466739ffa8d3757c75abf6d065a542e3000da Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 12:04:00 -0400 Subject: [PATCH 04/16] remove generated .debhelpers --- .../zoneminder-core.postinst.debhelper | 15 --------------- .../zoneminder-core.postrm.debhelper | 18 ------------------ .../zoneminder-core.prerm.debhelper | 5 ----- .../zoneminder-database.postrm.debhelper | 6 ------ .../zoneminder-ui-base.postrm.debhelper | 6 ------ 5 files changed, 50 deletions(-) delete mode 100644 distros/ubuntu1504_cmake_split_packages/zoneminder-core.postinst.debhelper delete mode 100644 distros/ubuntu1504_cmake_split_packages/zoneminder-core.postrm.debhelper delete mode 100644 distros/ubuntu1504_cmake_split_packages/zoneminder-core.prerm.debhelper delete mode 100644 distros/ubuntu1504_cmake_split_packages/zoneminder-database.postrm.debhelper delete mode 100644 distros/ubuntu1504_cmake_split_packages/zoneminder-ui-base.postrm.debhelper diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.postinst.debhelper b/distros/ubuntu1504_cmake_split_packages/zoneminder-core.postinst.debhelper deleted file mode 100644 index 888b155f4..000000000 --- a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.postinst.debhelper +++ /dev/null @@ -1,15 +0,0 @@ -# Automatically added by dh_installinit -# In case this system is running systemd, we need to ensure that all -# necessary tmpfiles (if any) are created before starting. -if [ -d /run/systemd/system ] ; then - systemd-tmpfiles --create /usr/lib/tmpfiles.d/zoneminder.conf >/dev/null || true -fi -# End automatically added section -# Automatically added by dh_installinit -if [ -x "/etc/init.d/zoneminder" ]; then - update-rc.d zoneminder defaults >/dev/null -fi -if [ -x "/etc/init.d/zoneminder" ] || [ -e "/etc/init/zoneminder.conf" ]; then - invoke-rc.d zoneminder start || exit $? -fi -# End automatically added section diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.postrm.debhelper b/distros/ubuntu1504_cmake_split_packages/zoneminder-core.postrm.debhelper deleted file mode 100644 index 19b291b3f..000000000 --- a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.postrm.debhelper +++ /dev/null @@ -1,18 +0,0 @@ -# Automatically added by dh_installinit -if [ "$1" = "purge" ] ; then - update-rc.d zoneminder remove >/dev/null -fi - - -# In case this system is running systemd, we make systemd reload the unit files -# to pick up changes. -if [ -d /run/systemd/system ] ; then - systemctl --system daemon-reload >/dev/null || true -fi -# End automatically added section -# Automatically added by dh_installdebconf -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_purge -fi -# End automatically added section diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.prerm.debhelper b/distros/ubuntu1504_cmake_split_packages/zoneminder-core.prerm.debhelper deleted file mode 100644 index 2d7592dc3..000000000 --- a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.prerm.debhelper +++ /dev/null @@ -1,5 +0,0 @@ -# Automatically added by dh_installinit -if [ -x "/etc/init.d/zoneminder" ] || [ -e "/etc/init/zoneminder.conf" ]; then - invoke-rc.d zoneminder stop || exit $? -fi -# End automatically added section diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-database.postrm.debhelper b/distros/ubuntu1504_cmake_split_packages/zoneminder-database.postrm.debhelper deleted file mode 100644 index bc035b98c..000000000 --- a/distros/ubuntu1504_cmake_split_packages/zoneminder-database.postrm.debhelper +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically added by dh_installdebconf -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_purge -fi -# End automatically added section diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-base.postrm.debhelper b/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-base.postrm.debhelper deleted file mode 100644 index bc035b98c..000000000 --- a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-base.postrm.debhelper +++ /dev/null @@ -1,6 +0,0 @@ -# Automatically added by dh_installdebconf -if [ "$1" = purge ] && [ -e /usr/share/debconf/confmodule ]; then - . /usr/share/debconf/confmodule - db_purge -fi -# End automatically added section From 2f3779473b740cb7f1e036eef7511ee12d4c6606 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 15:45:02 -0400 Subject: [PATCH 05/16] release SNAPSHOT2015071501 --- distros/ubuntu1504/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/distros/ubuntu1504/changelog b/distros/ubuntu1504/changelog index 2dfc8b63c..9dea00498 100644 --- a/distros/ubuntu1504/changelog +++ b/distros/ubuntu1504/changelog @@ -1,3 +1,11 @@ +zoneminder (1.28.1+1-vivid-SNAPSHOT2015071501) vivid; urgency=medium + + * fix for issue #586 and #932 + * fix for db not being upgraded + * version upgraded to .100 + + -- Isaac Connor Wed, 15 Jul 2015 11:56:28 -0400 + zoneminder (1.28.1+1-trusty-SNAPSHOT2015030201) trusty; urgency=medium * maybe fix for RTSP Basic Auth From 09efee3be34a60c87b804ade2a7b2228a89165b5 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 15:46:53 -0400 Subject: [PATCH 06/16] limit man install to 8 to not conflict with man pages in libzoneminder-perl --- distros/ubuntu1504_cmake_split_packages/zoneminder-core.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.install b/distros/ubuntu1504_cmake_split_packages/zoneminder-core.install index 97aa76556..bd0a03bc2 100644 --- a/distros/ubuntu1504_cmake_split_packages/zoneminder-core.install +++ b/distros/ubuntu1504_cmake_split_packages/zoneminder-core.install @@ -2,4 +2,4 @@ etc/zm usr/bin usr/share/polkit-1/actions usr/share/polkit-1/rules.d -usr/share/man +usr/share/man/man8 From 4630bad24b2e35292b2fc08f21d7cda99e25cd96 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 15:59:21 -0400 Subject: [PATCH 07/16] add http to control url if it isn't present --- scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm index fd97c5a49..f3fc94754 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/SkyIPCam7xx.pm @@ -107,7 +107,14 @@ sub sendCmd printMsg( $cmd, "Tx" ); - my $req = HTTP::Request->new( GET=>"http://".$self->{Monitor}->{ControlAddress}."$cmd" ); + my $url; + if ( $self->{Monitor}->{ControlAddress} =~ /^http/ ) { + $url = $self->{Monitor}->{ControlAddress}.$cmd; + } else { + $url = 'http://'.$self->{Monitor}->{ControlAddress}.$cmd; + } # en dif + my $req = HTTP::Request->new( GET=>$url ); + my $res = $self->{ua}->request($req); if ( $res->is_success ) From cf3f16078363b48836b482d883625ea6f3d232b8 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 16:02:02 -0400 Subject: [PATCH 08/16] add error handling on failure to open serial port --- scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm index a3709b5bb..ddfc53436 100644 --- a/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm +++ b/scripts/ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm @@ -58,6 +58,12 @@ sub open { my $self = shift; my $device = new Device::SerialPort( $self->{path} ); + if ( ! $device ) + { + Error( "Unable to open $$self{path}: $!" ); + $self->{state} = 'closed'; + return; + } $device->baudrate(9600); $device->databits(8); $device->parity('none'); From e4b3344a8c81b6b62de1805ae72b9c3effe068fb Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 16:06:55 -0400 Subject: [PATCH 09/16] improve log --- scripts/zmcontrol.pl.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in index ee078f9a0..aba1d1c36 100644 --- a/scripts/zmcontrol.pl.in +++ b/scripts/zmcontrol.pl.in @@ -156,7 +156,7 @@ if ( !$server_up ) while (!connect( CLIENT, $saddr )) { $attempts++; - Fatal( "Can't connect: $!" ) if ($attempts > MAX_CONNECT_DELAY); + Fatal( "Can't connect: $! after $attempts attempts to $sock_file" ) if ($attempts > MAX_CONNECT_DELAY); sleep(1); } } From 01518d6aa9e8bd634acdd0e1ef7f9749d299ac30 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Wed, 15 Jul 2015 16:08:02 -0400 Subject: [PATCH 10/16] fix. without this zmc won't restart automatically --- scripts/zmdc.pl.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in index 3284674fe..5e2fb47c7 100644 --- a/scripts/zmdc.pl.in +++ b/scripts/zmdc.pl.in @@ -558,9 +558,9 @@ sub kill_until_dead { sub _stop { my ($final, $process ) = @_; - delete( $cmd_hash{$$process{command}} ); my $pid = send_stop( $final, $process ); return if ! $pid; + delete( $cmd_hash{$$process{command}} ); kill_until_dead( $process ); } From c788d70b9398eae51b9950b8a29bef5539ce1b11 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Thu, 16 Jul 2015 18:35:12 +1000 Subject: [PATCH 11/16] zmtrigger: POD documentation Signed-off-by: Dmitry Smirnov --- scripts/zmtrigger.pl.in | 77 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in index e43b00bbb..56dc24b33 100644 --- a/scripts/zmtrigger.pl.in +++ b/scripts/zmtrigger.pl.in @@ -28,7 +28,82 @@ zmtrigger.pl - ZoneMinder External Trigger Script =head1 DESCRIPTION This script is used to trigger and cancel alarms from external connections -using an arbitrary text based format +using an arbitrary text based format. + +This script offers generic solution to external triggering of alarms. It +can handle external connections via either internet socket, unix socket or +file/device interfaces. You can either use it 'as is' if you can interface +with the existing format, or override connections and channels to customise +it to your needs. + +If enabled by the OPT_TRIGGERS option, Zoneminder service start +zmtrigger.pl which listens for control messages on TCP port 6802. + +=head1 TRIGGER MESSAGE FORMAT + +B|B|B|B|B|B + +=over 4 + +=item B + + is the id number or name of the ZM monitor. + +=item B + + Valid actions are 'on', 'off', 'cancel' or 'show' where + 'on' forces an alarm condition on; + 'off' forces an alarm condition off; + 'cancel' negates the previous 'on' or 'off'. + + The 'show' action merely updates some auxiliary text which can optionally + be displayed in the images captured by the monitor. Ordinarily you would + use 'on' and 'cancel', 'off' would tend to be used to suppress motion + based events. Additionally 'on' and 'off' can take an additional time + offset, e.g. on+20 which automatically 'cancel's the previous action + after that number of seconds. + +=item B + + is the score given to the alarm, usually to indicate it's + importance. For 'on' triggers it should be non-zero, otherwise it should + be zero. + +=item B + + is a 32 char max string indicating the reason for, or source of + the alarm e.g. 'Relay 1 open'. This is saved in the 'Cause' field of the + event. Ignored for 'off' or 'cancel' messages. + +=item B + + is a 256 char max additional info field, which is saved in the + 'Description' field of an event. Ignored for 'off' or 'cancel' messages. + +=item B + + is up to 32 characters of text that can be displayed in the + timestamp that is added to images. The 'show' action is designed to + update this text without affecting alarms but the text is updated, if + present, for any of the actions. This is designed to allow external input + to appear on the images captured, for instance temperature or personnel + identity etc. + +=back + +Note that multiple messages can be sent at once and should be LF or CRLF +delimited. This script is not necessarily intended to be a solution in +itself, but is intended to be used as 'glue' to help ZoneMinder interface +with other systems. It will almost certainly require some customisation +before you can make any use of it. If all you want to do is generate alarms +from external sources then using the ZoneMinder::SharedMem perl module is +likely to be easier. + +=head1 EXAMPLES + + 3|on+10|1|motion|text|showtext + +Triggers "alarm" on camera #3 for 10 seconds with score=1, cause="motion". =cut use strict; From 48fa0c3d420f5cf4414578ae8a275be61631a6a1 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 16 Jul 2015 13:04:28 -0400 Subject: [PATCH 12/16] add some utility db functions --- src/zm_db.cpp | 35 +++++++++++++++++++++++++++++++++++ src/zm_db.h | 3 +++ 2 files changed, 38 insertions(+) diff --git a/src/zm_db.cpp b/src/zm_db.cpp index 4ebc2f11f..0065488f5 100644 --- a/src/zm_db.cpp +++ b/src/zm_db.cpp @@ -75,3 +75,38 @@ void zmDbClose() zmDbConnected = false; } } + +MYSQL_RES * zmDbFetch( const char * query ) { + if ( ! zmDbConnected ) { + Error( "Not connected." ); + return NULL; + } + + if ( mysql_query( &dbconn, query ) ) { + Error( "Can't run query: %s", mysql_error( &dbconn ) ); + return NULL; + } + Debug( 4, "Success running query: %s", query ); + MYSQL_RES *result = mysql_store_result( &dbconn ); + if ( !result ) { + Error( "Can't use query result: %s for query %s", mysql_error( &dbconn ), query ); + return NULL; + } + return result; +} // end MYSQL_RES * zmDbFetch( const char * query ); + +MYSQL_ROW zmDBFetchOne( const char *query ) { + MYSQL_RES *result = zmDbFetch( query ); + int n_rows = mysql_num_rows( result ); + if ( n_rows != 1 ) { + Error( "Bogus number of lines return from query, %d returned for query %s.", n_rows, query ); + return NULL; + } + + MYSQL_ROW dbrow = mysql_fetch_row( result ); + if ( ! dbrow ) { + Error("Error getting row from query %s. Error is %s", query, mysql_error( &dbconn ) ); + return NULL; + } + return dbrow; +} diff --git a/src/zm_db.h b/src/zm_db.h index 07fd188a2..de1a81340 100644 --- a/src/zm_db.h +++ b/src/zm_db.h @@ -32,6 +32,9 @@ extern int zmDbConnected; void zmDbConnect(); void zmDbClose(); +MYSQL_RES * zmDbFetch( const char *query ); +MYSQL_ROW zmDBFetchOne( const char *query ); + #ifdef __cplusplus } /* extern "C" */ #endif From ad239699822f2bffea7aa481d1f7e660e0a3df98 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 16 Jul 2015 13:06:15 -0400 Subject: [PATCH 13/16] add space instead of + to handle old Axis cameras --- scripts/zmtrigger.pl.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in index e43b00bbb..5ffa308cf 100644 --- a/scripts/zmtrigger.pl.in +++ b/scripts/zmtrigger.pl.in @@ -446,7 +446,7 @@ sub handleMessage Debug( "Added timed event '$action_text', expires at $action_time (+$delay secs)\n" ); } } - elsif ( $action =~ /^(on|off)(?:\+(\d+))?$/ ) + elsif ( $action =~ /^(on|off)(?:[ \+](\d+))?$/ ) { next if ( !$monitor->{Enabled} ); From eb5bb641d6df4ecc47f9994830c444bfce0202db Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Thu, 16 Jul 2015 12:15:24 -0500 Subject: [PATCH 14/16] rpm packaging - require php-gd --- distros/fedora/zoneminder.f20.spec | 2 +- distros/fedora/zoneminder.f21.spec | 2 +- distros/redhat/zoneminder.el6.spec | 2 +- distros/redhat/zoneminder.el7.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/distros/fedora/zoneminder.f20.spec b/distros/fedora/zoneminder.f20.spec index b4e5ab9d3..b06db673d 100644 --- a/distros/fedora/zoneminder.f20.spec +++ b/distros/fedora/zoneminder.f20.spec @@ -38,7 +38,7 @@ BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel BuildRequires: httpd polkit-devel %{!?_without_ffmpeg:BuildRequires: ffmpeg} -Requires: httpd php php-mysql cambozola polkit net-tools psmisc +Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc Requires: libjpeg-turbo vlc-core libcurl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) diff --git a/distros/fedora/zoneminder.f21.spec b/distros/fedora/zoneminder.f21.spec index e0424b80e..c1875cf5a 100644 --- a/distros/fedora/zoneminder.f21.spec +++ b/distros/fedora/zoneminder.f21.spec @@ -38,7 +38,7 @@ BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel libv4l-devel BuildRequires: httpd polkit-devel %{!?_without_ffmpeg:BuildRequires: ffmpeg} -Requires: httpd php php-mysql cambozola polkit net-tools psmisc +Requires: httpd php php-gd php-mysql cambozola polkit net-tools psmisc Requires: libjpeg-turbo vlc-core libcurl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec index e50db96e7..3a65a80db 100644 --- a/distros/redhat/zoneminder.el6.spec +++ b/distros/redhat/zoneminder.el6.spec @@ -30,7 +30,7 @@ BuildRequires: libcurl-devel vlc-devel ffmpeg-devel polkit-devel # cmake needs the following installed at build time due to the way it auto-detects certain parameters BuildRequires: httpd ffmpeg -Requires: httpd php php-mysql mysql-server libjpeg-turbo polkit net-tools psmisc +Requires: httpd php php-gd php-mysql mysql-server libjpeg-turbo polkit net-tools psmisc Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec index 78cd64d21..1d53cbdd5 100644 --- a/distros/redhat/zoneminder.el7.spec +++ b/distros/redhat/zoneminder.el7.spec @@ -32,7 +32,7 @@ BuildRequires: ffmpeg ffmpeg-devel perl(X10::ActiveHome) perl(Astro::SunTime) # cmake needs the following installed at build time due to the way it auto-detects certain parameters BuildRequires: httpd polkit-devel -Requires: httpd php php-mysql mariadb-server polkit net-tools psmisc +Requires: httpd php php-gd php-mysql mariadb-server polkit net-tools psmisc Requires: libjpeg-turbo vlc-core libcurl Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) From e3042c59a577716075282b20be2765a4db04423b Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 16 Jul 2015 13:40:16 -0400 Subject: [PATCH 15/16] add php-gd to list of dependencies for debian and ubuntu builds --- distros/debian/control | 2 +- distros/debian8/control | 2 +- distros/debian_cmake/control | 2 +- distros/ubuntu1204/control | 2 +- distros/ubuntu1504/control | 2 +- distros/ubuntu1504_cmake_split_packages/control | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/distros/debian/control b/distros/debian/control index 285c2257c..69b7c7bed 100644 --- a/distros/debian/control +++ b/distros/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Package: zoneminder Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php-gd Recommends: mysql-server|mariadb-server Description: Video camera security and surveillance solution ZoneMinder is intended for use in single or multi-camera video security diff --git a/distros/debian8/control b/distros/debian8/control index efa9ecef2..47613b6a5 100644 --- a/distros/debian8/control +++ b/distros/debian8/control @@ -86,7 +86,7 @@ Section: web Architecture: any Depends: zoneminder-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, debconf, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, - php5, php5-mysql | php5-mysqlnd + php5, php5-mysql | php5-mysqlnd, php-gd Description: Essential files for ZoneMinder's web user interface ZoneMinder is a video camera security and surveillance solution. . diff --git a/distros/debian_cmake/control b/distros/debian_cmake/control index 01adf14df..92d25e897 100644 --- a/distros/debian_cmake/control +++ b/distros/debian_cmake/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Package: zoneminder Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm, php5-mysqlnd | php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client | mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0 +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm, php5-mysqlnd | php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client | mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, php-gd Recommends: mysql-server | mariadb-server Description: Video camera security and surveillance solution ZoneMinder is intended for use in single or multi-camera video security diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control index b1be82b34..599aef4d0 100644 --- a/distros/ubuntu1204/control +++ b/distros/ubuntu1204/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Package: zoneminder Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php-gd Recommends: mysql-server|mariadb-server Description: Video camera security and surveillance solution ZoneMinder is intended for use in single or multi-camera video security diff --git a/distros/ubuntu1504/control b/distros/ubuntu1504/control index 5b63046c3..8922489e5 100644 --- a/distros/ubuntu1504/control +++ b/distros/ubuntu1504/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Package: zoneminder Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice-ffmpeg56, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice-ffmpeg56, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php-gd Recommends: mysql-server|mariadb-server Description: Video camera security and surveillance solution ZoneMinder is intended for use in single or multi-camera video security diff --git a/distros/ubuntu1504_cmake_split_packages/control b/distros/ubuntu1504_cmake_split_packages/control index 1f2b9c3ac..7a3828506 100644 --- a/distros/ubuntu1504_cmake_split_packages/control +++ b/distros/ubuntu1504_cmake_split_packages/control @@ -86,7 +86,7 @@ Section: web Architecture: any Depends: zoneminder-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, debconf, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, - php5, php5-mysql | php5-mysqlnd + php5, php5-mysql | php5-mysqlnd, php-gd Description: Essential files for ZoneMinder's web user interface ZoneMinder is a video camera security and surveillance solution. . From 424b7d50bd9f8cf51ff9aa871b6b688609f90846 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Thu, 16 Jul 2015 13:59:06 -0400 Subject: [PATCH 16/16] php-gd should isntead be php5-gd --- distros/debian/control | 2 +- distros/debian8/control | 2 +- distros/debian_cmake/control | 2 +- distros/ubuntu1204/control | 2 +- distros/ubuntu1504/control | 2 +- distros/ubuntu1504_cmake_split_packages/control | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/distros/debian/control b/distros/debian/control index 69b7c7bed..70d03eaa5 100644 --- a/distros/debian/control +++ b/distros/debian/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Package: zoneminder Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php-gd +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd Recommends: mysql-server|mariadb-server Description: Video camera security and surveillance solution ZoneMinder is intended for use in single or multi-camera video security diff --git a/distros/debian8/control b/distros/debian8/control index 47613b6a5..af5ba9ad0 100644 --- a/distros/debian8/control +++ b/distros/debian8/control @@ -86,7 +86,7 @@ Section: web Architecture: any Depends: zoneminder-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, debconf, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, - php5, php5-mysql | php5-mysqlnd, php-gd + php5, php5-mysql | php5-mysqlnd, php5-gd Description: Essential files for ZoneMinder's web user interface ZoneMinder is a video camera security and surveillance solution. . diff --git a/distros/debian_cmake/control b/distros/debian_cmake/control index 92d25e897..94f612ce7 100644 --- a/distros/debian_cmake/control +++ b/distros/debian_cmake/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Package: zoneminder Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm, php5-mysqlnd | php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client | mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, php-gd +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm, php5-mysqlnd | php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client | mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, php5-gd Recommends: mysql-server | mariadb-server Description: Video camera security and surveillance solution ZoneMinder is intended for use in single or multi-camera video security diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control index 599aef4d0..170504b5a 100644 --- a/distros/ubuntu1204/control +++ b/distros/ubuntu1204/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Package: zoneminder Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php-gd +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd Recommends: mysql-server|mariadb-server Description: Video camera security and surveillance solution ZoneMinder is intended for use in single or multi-camera video security diff --git a/distros/ubuntu1504/control b/distros/ubuntu1504/control index 8922489e5..142ec783c 100644 --- a/distros/ubuntu1504/control +++ b/distros/ubuntu1504/control @@ -7,7 +7,7 @@ Standards-Version: 3.9.4 Package: zoneminder Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice-ffmpeg56, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php-gd +Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice-ffmpeg56, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd Recommends: mysql-server|mariadb-server Description: Video camera security and surveillance solution ZoneMinder is intended for use in single or multi-camera video security diff --git a/distros/ubuntu1504_cmake_split_packages/control b/distros/ubuntu1504_cmake_split_packages/control index 7a3828506..0e16fd5ca 100644 --- a/distros/ubuntu1504_cmake_split_packages/control +++ b/distros/ubuntu1504_cmake_split_packages/control @@ -86,7 +86,7 @@ Section: web Architecture: any Depends: zoneminder-core (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, debconf, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, - php5, php5-mysql | php5-mysqlnd, php-gd + php5, php5-mysql | php5-mysqlnd, php5-gd Description: Essential files for ZoneMinder's web user interface ZoneMinder is a video camera security and surveillance solution. .