ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into plugin_support 

Conflicts:
	distros/debian8/changelog
This commit is contained in:
Emmanuel Papin 2015-01-27 19:22:06 +01:00
parent abddb5d916 8e85338eca
commit cd16b7168e
17 changed files with 32 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
INSTALL
View File

@ -49,7 +49,7 @@ Advanced:
ZM_NO_MMAP Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF ZM_NO_MMAP Set to ON to not use mmap shared memory. Shouldn't be enabled unless you experience problems with the shared memory. default: OFF
ZM_NO_FFMPEG Set to ON to skip ffmpeg checks and force building ZM without ffmpeg. default: OFF ZM_NO_FFMPEG Set to ON to skip ffmpeg checks and force building ZM without ffmpeg. default: OFF
ZM_NO_X10 Set to ON to build ZoneMinder without X10 support. default: OFF ZM_NO_X10 Set to ON to build ZoneMinder without X10 support. default: OFF
ZM_PERL_SUBPREFIX Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. lib will be turned into <prefix>/lib, default: <libarch>/perl5 ZM_PERL_SUBPREFIX Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. /lib will be turned into <prefix>/lib, default: <libarch>/perl5
ZM_PERL_USE_PATH Override the include path for zm perl modules. Useful if you are moving the perl modules without using the ZM_PERL_SUBPREFIX option. default: <prefix>/<zmperlsubprefix> ZM_PERL_USE_PATH Override the include path for zm perl modules. Useful if you are moving the perl modules without using the ZM_PERL_SUBPREFIX option. default: <prefix>/<zmperlsubprefix>
@ -89,7 +89,8 @@ NOTE: The database server, database name, user and password can be different and
8) Create an apache virtual host for ZoneMinder. Make sure to use the same paths as ZM_WEBDIR and ZM_CGIDIR in /etc/zm.conf 8) Create an apache virtual host for ZoneMinder. Make sure to use the same paths as ZM_WEBDIR and ZM_CGIDIR in /etc/zm.conf
9) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory 9) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in <prefix>/share/zoneminder/misc or project/misc directory
10) Setup an init script for your system. Its also possible to use "zmpkg.pl start" and "zmpkg.pl stop" if you can't find a one. 10) Setup an appropriate startup script for your system. A generic sys v init script is here: /scripts/zm while a generic systemd service file is here: /misc/zoneminder.service
You must determine which file to use, verify it is correct, and then copy it to the correct location. Consult your distro's documentation.
Basic steps for upgrading ZoneMinder Basic steps for upgrading ZoneMinder
------------------------------------ ------------------------------------

12
distros/debian8/README.source
View File

@ -1,12 +0,0 @@
This package uses quilt to manage all modifications to the upstream source.
Changes are stored in the source package as diffs in debian/patches and applied
during the build.
See /usr/share/doc/quilt/README.source for a detailed explanation.
This package uses the version 3.0 of the debian source package; An upstream
tarball is required to build it. This tarball can be generated automagically by
downloading the sources from the github repository with the following command:
fakeroot debian/rules get-orig-source

9
distros/debian8/changelog
View File

@ -1,9 +1,10 @@
zoneminder (1.28.1-0.1) testing; urgency=medium zoneminder (1.28.0+nmu1) testing; urgency=medium
* Non-maintainer upload. * Non-maintainer upload
* Add plugin support * Split the debian package into several packages
* Switch to native source format
-- Emmanuel Papin <manupap01@gmail.com> Sat, 13 Dec 2014 21:43:14 +0100 -- Emmanuel Papin <manupap01@gmail.com> Thu, 15 Jan 2015 20:00:08 +0100
zoneminder (1.28.0-0.2) testing; urgency=medium zoneminder (1.28.0-0.2) testing; urgency=medium

2
distros/debian8/control
View File

@ -2,7 +2,7 @@ Source: zoneminder
Section: net Section: net
Priority: optional Priority: optional
Maintainer: Isaac Connor <iconnor@connortechnology.com> Maintainer: Isaac Connor <iconnor@connortechnology.com>
Build-Depends: debhelper (>= 9), po-debconf (>= 1.0), dh-systemd (>= 1.5), autoconf, automake, quilt, libphp-serialization-perl, libgnutls28-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev | libgcrypt20-dev, libpolkit-gobject-1-dev, libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl Build-Depends: debhelper (>= 9), po-debconf (>= 1.0), dh-systemd (>= 1.5), autoconf, automake, libphp-serialization-perl, libgnutls28-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev | libgcrypt20-dev, libpolkit-gobject-1-dev, libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl
Standards-Version: 3.9.6 Standards-Version: 3.9.6
Package: zoneminder Package: zoneminder

9
distros/debian8/patches/01_service-file-name.diff
View File

@ -1,9 +0,0 @@
--- a/scripts/zmsystemctl.pl.in
+++ b/scripts/zmsystemctl.pl.in
@@ -50,5 +50,5 @@
}
Info( "Redirecting command through systemctl\n" );
-exec("$path $command zoneminder");
+exec("$path $command zoneminder-core");

1
distros/debian8/patches/series
View File

@ -1 +0,0 @@
01_service-file-name.diff

17
distros/debian8/rules
View File

@ -38,12 +38,12 @@ BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
HEAD = $(shell git rev-parse HEAD) HEAD = $(shell git rev-parse HEAD)
PKD = $(abspath $(dir $(MAKEFILE_LIST))) PKD = $(abspath $(dir $(MAKEFILE_LIST)))
PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source)) PKG = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-\d+.*)};') VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-|\+nmu\d+.*)};')
DTYPE = DTYPE =
TARBALL = ../$(PKG)_$(VER)$(DTYPE).orig.tar.xz TARBALL = ../$(PKG)_$(VER)$(DTYPE).orig.tar.xz
%: %:
dh $@ --with quilt,autoreconf,systemd dh $@ --with autoreconf,systemd
override_dh_auto_configure: override_dh_auto_configure:
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- \ CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- \
@ -94,6 +94,16 @@ override_dh_install:
# The link stuff for /usr/share/zoneminder/cgi-bin has been moved to # The link stuff for /usr/share/zoneminder/cgi-bin has been moved to
# zoneminder-ui-base.links file # zoneminder-ui-base.links file
override_dh_installinit:
dh_installinit --package=zoneminder-core --name=zoneminder
override_dh_systemd_start:
dh_systemd_start --package=zoneminder-core --name=zoneminder \
--restart-after-upgrade
override_dh_systemd_enable:
dh_systemd_enable --package=zoneminder-core --name=zoneminder
override_dh_fixperms: override_dh_fixperms:
dh_fixperms dh_fixperms
# #
@ -104,9 +114,6 @@ override_dh_fixperms:
override_dh_auto_test: override_dh_auto_test:
# do not run tests... # do not run tests...
override_dh_systemd_start:
dh_systemd_start --restart-after-upgrade
.PHONY: override_dh_strip .PHONY: override_dh_strip
override_dh_strip: override_dh_strip:
dh_strip --dbg-package=zoneminder-core-dbg dh_strip --dbg-package=zoneminder-core-dbg

2
distros/debian8/source/format
View File

@ -1 +1 @@
3.0 (quilt) 3.0 (native)

2
distros/debian8/source/local-options
View File

@ -1,2 +0,0 @@
unapply-patches
abort-on-upstream-changes

3
distros/debian8/watch
View File

@ -1,3 +0,0 @@
version=3
http://www.zoneminder.com/downloads.html \
.*/ZoneMinder-(.*).tar.gz

2
distros/debian8/zoneminder-core.postinst
View File

@ -68,7 +68,7 @@ fi
if [ "$dbc_install" = "true" ] && [ "$1" = "configure" ]; then if [ "$dbc_install" = "true" ] && [ "$1" = "configure" ]; then
# Ensure zoneminder is stopped # Ensure zoneminder is stopped
deb-systemd-invoke stop zoneminder-core.service || exit $? deb-systemd-invoke stop zoneminder.service || exit $?
# Run the ZoneMinder update tool # Run the ZoneMinder update tool
zmupdate.pl --nointeractive zmupdate.pl --nointeractive

0
distros/debian8/zoneminder-core.init → distros/debian8/zoneminder-core.zoneminder.init
View File

0
distros/debian8/zoneminder-core.service → distros/debian8/zoneminder-core.zoneminder.service
View File

0
distros/debian8/zoneminder-core.tmpfile → distros/debian8/zoneminder-core.zoneminder.tmpfile
View File

2
distros/fedora/zoneminder.cmake.f20.spec → distros/fedora/zoneminder.f20.spec
View File

@ -38,7 +38,7 @@ BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel
BuildRequires: httpd polkit-devel BuildRequires: httpd polkit-devel
%{!?_without_ffmpeg:BuildRequires: ffmpeg} %{!?_without_ffmpeg:BuildRequires: ffmpeg}
Requires: httpd php php-mysql cambozola polkit Requires: httpd php php-mysql cambozola polkit net-tools
Requires: libjpeg-turbo vlc-core libcurl Requires: libjpeg-turbo vlc-core libcurl
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)

2
distros/redhat/zoneminder.cmake.el6.spec → distros/redhat/zoneminder.el6.spec
View File

@ -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 # cmake needs the following installed at build time due to the way it auto-detects certain parameters
BuildRequires: httpd ffmpeg BuildRequires: httpd ffmpeg
Requires: httpd php php-mysql mysql-server libjpeg-turbo polkit Requires: httpd php php-mysql mysql-server libjpeg-turbo polkit net-tools
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP) Requires: perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)

9
src/zm_rtp_ctrl.cpp
View File

@ -150,10 +150,15 @@ int RtpCtrlThread::recvPacket( const unsigned char *packet, ssize_t packetLen )
break; break;
} }
case RTCP_RR : case RTCP_RR :
{
Error( "Received RTCP_RR packet." );
return( -1 );
}
default : default :
{ {
Error( "Received unexpected packet type %d, ignoring", pt ); // Ignore unknown packet types. Some cameras do this by design.
return( -1 ); Debug( 5, "Received unexpected packet type %d, ignoring", pt );
break;
} }
} }
consumed = sizeof(uint32_t)*(len+1); consumed = sizeof(uint32_t)*(len+1);