From 53244aff0db7cdd32cfcfe3c5749903dcded60d2 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 7 Jan 2015 16:01:38 -0600 Subject: [PATCH 1/9] Don't fail if an unexpected rtp packet type is received --- src/zm_rtp_ctrl.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/zm_rtp_ctrl.cpp b/src/zm_rtp_ctrl.cpp index 618d09f19..016a5ecfe 100644 --- a/src/zm_rtp_ctrl.cpp +++ b/src/zm_rtp_ctrl.cpp @@ -150,10 +150,15 @@ int RtpCtrlThread::recvPacket( const unsigned char *packet, ssize_t packetLen ) break; } case RTCP_RR : + { + Error( "Received RTCP_APP packet." ); + return( -1 ); + } default : { - Error( "Received unexpected packet type %d, ignoring", pt ); - return( -1 ); + // Ignore unknown packet types. Some cameras do this by design. + Debug( 5, "Received unexpected packet type %d, ignoring", pt ); + break; } } consumed = sizeof(uint32_t)*(len+1); From f1fa8a3d92aa57789029ab3b5e4bbea335afbeb2 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Thu, 8 Jan 2015 12:48:19 -0600 Subject: [PATCH 2/9] fix typo --- src/zm_rtp_ctrl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_rtp_ctrl.cpp b/src/zm_rtp_ctrl.cpp index 016a5ecfe..96d4fa2f5 100644 --- a/src/zm_rtp_ctrl.cpp +++ b/src/zm_rtp_ctrl.cpp @@ -151,7 +151,7 @@ int RtpCtrlThread::recvPacket( const unsigned char *packet, ssize_t packetLen ) } case RTCP_RR : { - Error( "Received RTCP_APP packet." ); + Error( "Received RTCP_RR packet." ); return( -1 ); } default : From 3b418bb4558f4ff335f91925473fe043976aa6b3 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 13 Jan 2015 08:15:02 -0600 Subject: [PATCH 3/9] Update zoneminder.cmake.f20.spec net-tools is the package that contains the arp command --- distros/fedora/zoneminder.cmake.f20.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/fedora/zoneminder.cmake.f20.spec b/distros/fedora/zoneminder.cmake.f20.spec index 003371f69..29da79014 100644 --- a/distros/fedora/zoneminder.cmake.f20.spec +++ b/distros/fedora/zoneminder.cmake.f20.spec @@ -38,7 +38,7 @@ BuildRequires: gcc gcc-c++ vlc-devel libcurl-devel BuildRequires: httpd polkit-devel %{!?_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: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip) From 7c99886af2e9093f83a7fde2de91f3291ef38be1 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 13 Jan 2015 08:16:05 -0600 Subject: [PATCH 4/9] Update zoneminder.cmake.el6.spec net-tools is the package that contains the arp command. --- distros/redhat/zoneminder.cmake.el6.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distros/redhat/zoneminder.cmake.el6.spec b/distros/redhat/zoneminder.cmake.el6.spec index 9e0bcaee0..5cec87a80 100644 --- a/distros/redhat/zoneminder.cmake.el6.spec +++ b/distros/redhat/zoneminder.cmake.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 +Requires: httpd php php-mysql mysql-server libjpeg-turbo polkit net-tools 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) From 010fd69b0b90d8717b8f6a61df080f6919961a56 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 13 Jan 2015 08:17:20 -0600 Subject: [PATCH 5/9] Rename zoneminder.cmake.el6.spec to zoneminder.el6.spec --- distros/redhat/{zoneminder.cmake.el6.spec => zoneminder.el6.spec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename distros/redhat/{zoneminder.cmake.el6.spec => zoneminder.el6.spec} (100%) diff --git a/distros/redhat/zoneminder.cmake.el6.spec b/distros/redhat/zoneminder.el6.spec similarity index 100% rename from distros/redhat/zoneminder.cmake.el6.spec rename to distros/redhat/zoneminder.el6.spec From 44606942fa695f12829e7a89525157ff7b2ed722 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Tue, 13 Jan 2015 08:17:42 -0600 Subject: [PATCH 6/9] Rename zoneminder.cmake.f20.spec to zoneminder.f20.spec --- distros/fedora/{zoneminder.cmake.f20.spec => zoneminder.f20.spec} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename distros/fedora/{zoneminder.cmake.f20.spec => zoneminder.f20.spec} (100%) diff --git a/distros/fedora/zoneminder.cmake.f20.spec b/distros/fedora/zoneminder.f20.spec similarity index 100% rename from distros/fedora/zoneminder.cmake.f20.spec rename to distros/fedora/zoneminder.f20.spec From d8df44fefe4ea0266e270fd5de0d2e149cda1980 Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Wed, 14 Jan 2015 21:42:18 -0600 Subject: [PATCH 7/9] Update INSTALL --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index e8e9569d1..ad6e956a4 100644 --- a/INSTALL +++ b/INSTALL @@ -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_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_PERL_SUBPREFIX Use a different directory for the zm perl modules. NOTE: This is a subprefix, e.g. lib will be turned into /lib, default: /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 /lib, default: /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: / From c6c4e70a36eac140101bf776884299e053e83f53 Mon Sep 17 00:00:00 2001 From: Emmanuel Papin Date: Thu, 15 Jan 2015 21:32:01 +0100 Subject: [PATCH 8/9] Switch debian8 folder to native source format --- distros/debian8/README.source | 12 ------------ distros/debian8/changelog | 8 ++++++++ distros/debian8/control | 2 +- .../debian8/patches/01_service-file-name.diff | 9 --------- distros/debian8/patches/series | 1 - distros/debian8/rules | 17 ++++++++++++----- distros/debian8/source/format | 2 +- distros/debian8/source/local-options | 2 -- distros/debian8/watch | 3 --- distros/debian8/zoneminder-core.postinst | 2 +- ...ore.init => zoneminder-core.zoneminder.init} | 0 ...rvice => zoneminder-core.zoneminder.service} | 0 ...pfile => zoneminder-core.zoneminder.tmpfile} | 0 13 files changed, 23 insertions(+), 35 deletions(-) delete mode 100644 distros/debian8/README.source delete mode 100644 distros/debian8/patches/01_service-file-name.diff delete mode 100644 distros/debian8/patches/series delete mode 100644 distros/debian8/watch rename distros/debian8/{zoneminder-core.init => zoneminder-core.zoneminder.init} (100%) rename distros/debian8/{zoneminder-core.service => zoneminder-core.zoneminder.service} (100%) rename distros/debian8/{zoneminder-core.tmpfile => zoneminder-core.zoneminder.tmpfile} (100%) diff --git a/distros/debian8/README.source b/distros/debian8/README.source deleted file mode 100644 index b546508b2..000000000 --- a/distros/debian8/README.source +++ /dev/null @@ -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 diff --git a/distros/debian8/changelog b/distros/debian8/changelog index 410e17821..0035f1e36 100644 --- a/distros/debian8/changelog +++ b/distros/debian8/changelog @@ -1,3 +1,11 @@ +zoneminder (1.28.0+nmu1) testing; urgency=medium + + * Non-maintainer upload + * Split the debian package into several packages + * Switch to native source format + + -- Emmanuel Papin Thu, 15 Jan 2015 20:00:08 +0100 + zoneminder (1.28.0-0.2) testing; urgency=medium * Non-maintainer upload. diff --git a/distros/debian8/control b/distros/debian8/control index 455ec5e90..efa9ecef2 100644 --- a/distros/debian8/control +++ b/distros/debian8/control @@ -2,7 +2,7 @@ Source: zoneminder Section: net Priority: optional Maintainer: Isaac Connor -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 Package: zoneminder diff --git a/distros/debian8/patches/01_service-file-name.diff b/distros/debian8/patches/01_service-file-name.diff deleted file mode 100644 index 6473af782..000000000 --- a/distros/debian8/patches/01_service-file-name.diff +++ /dev/null @@ -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"); - diff --git a/distros/debian8/patches/series b/distros/debian8/patches/series deleted file mode 100644 index 2e4111e41..000000000 --- a/distros/debian8/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_service-file-name.diff diff --git a/distros/debian8/rules b/distros/debian8/rules index 10df6d451..3364d8750 100755 --- a/distros/debian8/rules +++ b/distros/debian8/rules @@ -38,12 +38,12 @@ BRANCH = $(shell git rev-parse --abbrev-ref HEAD) HEAD = $(shell git rev-parse HEAD) PKD = $(abspath $(dir $(MAKEFILE_LIST))) 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 = TARBALL = ../$(PKG)_$(VER)$(DTYPE).orig.tar.xz %: - dh $@ --with quilt,autoreconf,systemd + dh $@ --with autoreconf,systemd override_dh_auto_configure: CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- \ @@ -89,6 +89,16 @@ override_dh_install: # The link stuff for /usr/share/zoneminder/cgi-bin has been moved to # 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: dh_fixperms # @@ -99,9 +109,6 @@ override_dh_fixperms: override_dh_auto_test: # do not run tests... -override_dh_systemd_start: - dh_systemd_start --restart-after-upgrade - .PHONY: override_dh_strip override_dh_strip: dh_strip --dbg-package=zoneminder-core-dbg diff --git a/distros/debian8/source/format b/distros/debian8/source/format index 163aaf8d8..89ae9db8f 100644 --- a/distros/debian8/source/format +++ b/distros/debian8/source/format @@ -1 +1 @@ -3.0 (quilt) +3.0 (native) diff --git a/distros/debian8/source/local-options b/distros/debian8/source/local-options index 9cdfca9f9..e69de29bb 100644 --- a/distros/debian8/source/local-options +++ b/distros/debian8/source/local-options @@ -1,2 +0,0 @@ -unapply-patches -abort-on-upstream-changes diff --git a/distros/debian8/watch b/distros/debian8/watch deleted file mode 100644 index 5a8a9c4d7..000000000 --- a/distros/debian8/watch +++ /dev/null @@ -1,3 +0,0 @@ -version=3 -http://www.zoneminder.com/downloads.html \ - .*/ZoneMinder-(.*).tar.gz diff --git a/distros/debian8/zoneminder-core.postinst b/distros/debian8/zoneminder-core.postinst index 56645db5c..b1552e73b 100644 --- a/distros/debian8/zoneminder-core.postinst +++ b/distros/debian8/zoneminder-core.postinst @@ -68,7 +68,7 @@ fi if [ "$dbc_install" = "true" ] && [ "$1" = "configure" ]; then # Ensure zoneminder is stopped - deb-systemd-invoke stop zoneminder-core.service || exit $? + deb-systemd-invoke stop zoneminder.service || exit $? # Run the ZoneMinder update tool zmupdate.pl --nointeractive diff --git a/distros/debian8/zoneminder-core.init b/distros/debian8/zoneminder-core.zoneminder.init similarity index 100% rename from distros/debian8/zoneminder-core.init rename to distros/debian8/zoneminder-core.zoneminder.init diff --git a/distros/debian8/zoneminder-core.service b/distros/debian8/zoneminder-core.zoneminder.service similarity index 100% rename from distros/debian8/zoneminder-core.service rename to distros/debian8/zoneminder-core.zoneminder.service diff --git a/distros/debian8/zoneminder-core.tmpfile b/distros/debian8/zoneminder-core.zoneminder.tmpfile similarity index 100% rename from distros/debian8/zoneminder-core.tmpfile rename to distros/debian8/zoneminder-core.zoneminder.tmpfile From 987f98152a98fc87858b917514652ed0e9fd40ab Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Sat, 24 Jan 2015 13:54:29 -0600 Subject: [PATCH 9/9] Update INSTALL --- INSTALL | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index ad6e956a4..f334cd30e 100644 --- a/INSTALL +++ b/INSTALL @@ -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 9) Create other config if desired (e.g. rsyslog, logrotate and such). Some of this can be found in /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 ------------------------------------