From 49b0714c0cd4c9efb6cc5b4a2e1d59c30a1fa897 Mon Sep 17 00:00:00 2001
From: mebourne <mebourne@fedoraproject.org>
Date: Mon, 15 Dec 2008 21:22:20 +0000
Subject: [PATCH 01/82] - Fix permissions on zm.conf

---
 zoneminder.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 5dc2a60..dec8770 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name: 		zoneminder
 Version: 	1.23.3
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -155,7 +155,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.Fedora jscalendar-doc
-%config(noreplace) %attr(600,%{zmuid_final},%{zmgid_final}) %{_sysconfdir}/zm.conf
+%config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
 %attr(755,root,root) %{_initrddir}/zoneminder
 
@@ -191,6 +191,9 @@ fi
 
 
 %changelog
+* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
+- Fix permissions on zm.conf
+
 * Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
 - Initial attempt at packaging 1.23.
 

From a19727e8ec3c668d055bfa3b5bafc8bf3547953e Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Sat, 24 Jan 2009 15:34:26 +0000
Subject: [PATCH 02/82] rebuild for dependencies

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index dec8770..dd9403c 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name: 		zoneminder
 Version: 	1.23.3
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -191,6 +191,9 @@ fi
 
 
 %changelog
+* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
+- rebuild for dependencies
+
 * Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
 - Fix permissions on zm.conf
 

From 9ac63fc1b5a2e460f89b3c0ca0611652e9b58ed0 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 25 Feb 2009 18:44:44 +0000
Subject: [PATCH 03/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index dd9403c..b5f0cc8 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name: 		zoneminder
 Version: 	1.23.3
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -191,6 +191,9 @@ fi
 
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
 - rebuild for dependencies
 

From b075e8172b80d903be7c94d5e3a365b4d426cc01 Mon Sep 17 00:00:00 2001
From: mebourne <mebourne@fedoraproject.org>
Date: Sat, 14 Mar 2009 23:59:49 +0000
Subject: [PATCH 04/82] Added ZoneMinder-1.24.1.tar.gz archive

---
 .cvsignore | 5 +----
 sources    | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 99733b8..170e5b1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-mootools-1.2-core-yc.js
-jscalendar-1.0.zip
-ZoneMinder-1.23.3.tar.gz
-cambozola-0.68.tar.gz
+ZoneMinder-1.24.1.tar.gz
diff --git a/sources b/sources
index c728b89..53f5838 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-741c1ef4d6602c12a54d8a1b629988c8  mootools-1.2-core-yc.js
-10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
-ee803f0f71d6e67adf602c3557fb6bc9  ZoneMinder-1.23.3.tar.gz
-e4fac8b6ee94c9075b14bb95be4f860b  cambozola-0.68.tar.gz
+1e4ce392d645cbb28037ecebc5a56584  ZoneMinder-1.24.1.tar.gz

From b1334c042729c8d67ca0b92309cd9831faf941e6 Mon Sep 17 00:00:00 2001
From: mebourne <mebourne@fedoraproject.org>
Date: Sun, 15 Mar 2009 00:37:00 +0000
Subject: [PATCH 05/82] - Upgrade to 1.24.1

---
 .cvsignore                                    |  3 ++
 sources                                       |  3 ++
 ...patch => zoneminder-1.24.1-dbinstall.patch | 33 ++++++++++---------
 ....patch => zoneminder-1.24.1-runlevel.patch |  6 ++--
 zoneminder.spec                               | 11 ++++---
 5 files changed, 34 insertions(+), 22 deletions(-)
 rename zoneminder-1.23.3-dbinstall.patch => zoneminder-1.24.1-dbinstall.patch (80%)
 rename zoneminder-1.22.3-runlevel.patch => zoneminder-1.24.1-runlevel.patch (67%)

diff --git a/.cvsignore b/.cvsignore
index 170e5b1..3da56c4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,4 @@
 ZoneMinder-1.24.1.tar.gz
+cambozola-0.68.tar.gz
+mootools-1.2-core-yc.js
+jscalendar-1.0.zip
diff --git a/sources b/sources
index 53f5838..dc97c99 100644
--- a/sources
+++ b/sources
@@ -1 +1,4 @@
 1e4ce392d645cbb28037ecebc5a56584  ZoneMinder-1.24.1.tar.gz
+e4fac8b6ee94c9075b14bb95be4f860b  cambozola-0.68.tar.gz
+741c1ef4d6602c12a54d8a1b629988c8  mootools-1.2-core-yc.js
+10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
diff --git a/zoneminder-1.23.3-dbinstall.patch b/zoneminder-1.24.1-dbinstall.patch
similarity index 80%
rename from zoneminder-1.23.3-dbinstall.patch
rename to zoneminder-1.24.1-dbinstall.patch
index 5033ce1..f89ab4f 100644
--- a/zoneminder-1.23.3-dbinstall.patch
+++ b/zoneminder-1.24.1-dbinstall.patch
@@ -19,22 +19,25 @@
  	zm_update-0.9.8.sql \
 --- scripts/zmupdate.pl.orig	2006-12-27 23:59:20.000000000 +0000
 +++ scripts/zmupdate.pl	2006-12-27 23:59:35.000000000 +0000
-@@ -320,7 +320,7 @@
- 				$command .= " -p".$db_pass;
- 			}
- 		}
--		$command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
-+		$command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
+@@ -402,7 +402,7 @@
+                 $command .= " -p".$db_pass;
+             }
+         }
+-        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
++        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
  
- 		print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
- 		my $output = qx($command);
---- configure.in.orig	2006-12-27 23:55:41.000000000 +0000
-+++ configure.in	2006-12-27 23:59:07.000000000 +0000
-@@ -1,10 +1,8 @@
--AC_INIT(zm,1.23.3,support@zoneminder.com,ZoneMinder)
-+AC_INIT(zm,1.23.3,support@zoneminder.com,zoneminder)
- AC_CONFIG_SRCDIR(src/zm.h)
+         print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
+         my $output = qx($command);
+--- configure.ac.orig	2006-12-27 23:55:41.000000000 +0000
++++ configure.ac	2006-12-27 23:59:07.000000000 +0000
+--- configure.ac.dbinstall      2009-02-23 10:56:58.000000000 +0000
++++ configure.ac        2009-03-15 00:23:05.000000000 +0000
+@@ -1,11 +1,9 @@
+ AC_PREREQ(2.61)
+-AC_INIT(zm,1.24.1,support@zoneminder.com,ZoneMinder)
++AC_INIT(zm,1.24.1,support@zoneminder.com,zoneminder)
  AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR(src/zm.h)
  AM_CONFIG_HEADER(config.h)
  
 -PATH_BUILD=`pwd`
@@ -42,7 +45,7 @@
  TIME_BUILD=`date +'%s'`
  AC_SUBST(TIME_BUILD)
  
-@@ -216,8 +214,10 @@
+@@ -318,8 +316,10 @@
  
  AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
  AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
diff --git a/zoneminder-1.22.3-runlevel.patch b/zoneminder-1.24.1-runlevel.patch
similarity index 67%
rename from zoneminder-1.22.3-runlevel.patch
rename to zoneminder-1.24.1-runlevel.patch
index 1887b88..7e356ba 100644
--- a/zoneminder-1.22.3-runlevel.patch
+++ b/zoneminder-1.24.1-runlevel.patch
@@ -1,8 +1,8 @@
---- scripts/zm.in.runlevel	2008-05-06 22:54:36.000000000 +0100
-+++ scripts/zm.in	2008-05-06 23:01:35.000000000 +0100
+--- scripts/zm.in.runlevel	2009-03-15 00:24:49.000000000 +0000
++++ scripts/zm.in	2009-03-15 00:28:20.000000000 +0000
 @@ -1,6 +1,6 @@
  #!/bin/sh
- # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2006
+ # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
 -# chkconfig: 2345 99 00
 +# chkconfig: - 99 00
  # processname: zmpkg.pl
diff --git a/zoneminder.spec b/zoneminder.spec
index b5f0cc8..21e20f6 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -4,8 +4,8 @@
 %define zmgid_final apache
 
 Name: 		zoneminder
-Version: 	1.23.3
-Release: 	4%{?dist}
+Version: 	1.24.1
+Release: 	1%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -21,8 +21,8 @@ Source3: 	redalert.wav
 Source4: 	README.Fedora
 Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
 Source6:    http://mootools.net/downloads/mootools-1.2-core-yc.js
-Patch1: 	zoneminder-1.23.3-dbinstall.patch
-Patch2:		zoneminder-1.22.3-runlevel.patch
+Patch1: 	zoneminder-1.24.1-dbinstall.patch
+Patch2:		zoneminder-1.24.1-runlevel.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
 
 Conflicts: 	zm <= 1.22.3
@@ -191,6 +191,9 @@ fi
 
 
 %changelog
+* Sun Mar 15 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
+- Upgrade to 1.24.1
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

From cfd761b6a733f756a6c8fa6422a87dceaf05965a Mon Sep 17 00:00:00 2001
From: mebourne <mebourne@fedoraproject.org>
Date: Sat, 21 Mar 2009 21:50:04 +0000
Subject: [PATCH 06/82] - Patch for gcc 4.4 compilation errors - Upgrade to
 1.24.1

---
 zoneminder-1.24.1-gcc44.patch | 10 ++++++++++
 zoneminder.spec               |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 zoneminder-1.24.1-gcc44.patch

diff --git a/zoneminder-1.24.1-gcc44.patch b/zoneminder-1.24.1-gcc44.patch
new file mode 100644
index 0000000..f572f3d
--- /dev/null
+++ b/zoneminder-1.24.1-gcc44.patch
@@ -0,0 +1,10 @@
+--- src/zm_utils.cpp.orig	2009-03-21 21:46:01.000000000 +0000
++++ src/zm_utils.cpp	2009-03-21 21:46:36.000000000 +0000
+@@ -19,6 +19,7 @@
+ 
+ #include "zm_utils.h"
+ 
++#include <cstdio.h>
+ #include <stdarg.h>
+ 
+ const std::string stringtf( const char *format, ... )
diff --git a/zoneminder.spec b/zoneminder.spec
index 21e20f6..a64c7c9 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -24,6 +24,7 @@ Source6:    http://mootools.net/downloads/mootools-1.2-core-yc.js
 Patch1: 	zoneminder-1.24.1-dbinstall.patch
 Patch2:		zoneminder-1.24.1-runlevel.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
+Patch11: 	zoneminder-1.24.1-gcc44.patch
 
 Conflicts: 	zm <= 1.22.3
 
@@ -191,7 +192,8 @@ fi
 
 
 %changelog
-* Sun Mar 15 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
+* Sat Mar 21 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
+- Patch for gcc 4.4 compilation errors
 - Upgrade to 1.24.1
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4

From 361ab5c2461e5f3366b1135a00e4a5a82ea55422 Mon Sep 17 00:00:00 2001
From: mebourne <mebourne@fedoraproject.org>
Date: Sat, 21 Mar 2009 21:57:57 +0000
Subject: [PATCH 07/82] Apply the patch

---
 zoneminder.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zoneminder.spec b/zoneminder.spec
index a64c7c9..e3abd36 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -68,6 +68,7 @@ popd
 %patch1 -p0 -b .dbinstall
 %patch2 -p0 -b .runlevel
 %patch10 -p0 -b .installfix
+%patch11 -p0 -b .gcc44
 gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
 cp %{SOURCE4} README.Fedora
 

From 3e6d69bf7d272e263b211f39a57f5ec7f9c36f01 Mon Sep 17 00:00:00 2001
From: mebourne <mebourne@fedoraproject.org>
Date: Tue, 7 Apr 2009 20:51:58 +0000
Subject: [PATCH 08/82] Fix typo in patch

---
 zoneminder-1.24.1-gcc44.patch | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/zoneminder-1.24.1-gcc44.patch b/zoneminder-1.24.1-gcc44.patch
index f572f3d..144e04a 100644
--- a/zoneminder-1.24.1-gcc44.patch
+++ b/zoneminder-1.24.1-gcc44.patch
@@ -1,10 +1,12 @@
---- src/zm_utils.cpp.orig	2009-03-21 21:46:01.000000000 +0000
-+++ src/zm_utils.cpp	2009-03-21 21:46:36.000000000 +0000
-@@ -19,6 +19,7 @@
+--- src/zm_utils.cpp.gcc44      2008-07-25 10:33:24.000000000 +0100
++++ src/zm_utils.cpp    2009-04-07 21:25:05.000000000 +0100
+@@ -19,7 +19,8 @@
  
  #include "zm_utils.h"
  
-+#include <cstdio.h>
- #include <stdarg.h>
+-#include <stdarg.h>
++#include <cstdio>
++#include <cstdarg>
  
  const std::string stringtf( const char *format, ... )
+ {

From 314f419e693b9ab934113c7eb30237ea97bab5e6 Mon Sep 17 00:00:00 2001
From: mebourne <mebourne@fedoraproject.org>
Date: Sat, 11 Apr 2009 01:19:34 +0000
Subject: [PATCH 09/82] - Update gcc44 patch to disable -frepo, seems to be
 broken with gcc44 - Added noffmpeg patch to make building outside mock easier

---
 zoneminder-1.24.1-gcc44.patch    | 11 +++++++++++
 zoneminder-1.24.1-noffmpeg.patch | 17 +++++++++++++++++
 zoneminder.spec                  |  8 +++++++-
 3 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 zoneminder-1.24.1-noffmpeg.patch

diff --git a/zoneminder-1.24.1-gcc44.patch b/zoneminder-1.24.1-gcc44.patch
index 144e04a..d1b8684 100644
--- a/zoneminder-1.24.1-gcc44.patch
+++ b/zoneminder-1.24.1-gcc44.patch
@@ -10,3 +10,14 @@
  
  const std::string stringtf( const char *format, ... )
  {
+--- src/Makefile.am.frepo	2009-04-11 02:08:57.000000000 +0100
++++ src/Makefile.am	2009-04-11 02:09:07.000000000 +0100
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
+ AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
+-AM_CXXFLAGS = -frepo
++#AM_CXXFLAGS = -frepo
+ 
+ CLEANFILES = *.rpo
+ 
diff --git a/zoneminder-1.24.1-noffmpeg.patch b/zoneminder-1.24.1-noffmpeg.patch
new file mode 100644
index 0000000..db6e67f
--- /dev/null
+++ b/zoneminder-1.24.1-noffmpeg.patch
@@ -0,0 +1,17 @@
+--- configure.ac.noffmpeg	2009-04-11 02:15:30.000000000 +0100
++++ configure.ac	2009-04-11 02:15:52.000000000 +0100
+@@ -245,10 +245,10 @@
+ AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+-AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),[-lavcodec -lavutil])
+-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
++dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),[-lavcodec -lavutil])
++dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+ AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
+ 
+ # Checks for header files.
diff --git a/zoneminder.spec b/zoneminder.spec
index e3abd36..0164532 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -4,7 +4,7 @@
 %define zmgid_final apache
 
 Name: 		zoneminder
-Version: 	1.24.1
+Version: 	1.24.2
 Release: 	1%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
@@ -23,6 +23,7 @@ Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
 Source6:    http://mootools.net/downloads/mootools-1.2-core-yc.js
 Patch1: 	zoneminder-1.24.1-dbinstall.patch
 Patch2:		zoneminder-1.24.1-runlevel.patch
+Patch3:		zoneminder-1.24.1-noffmpeg.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
 Patch11: 	zoneminder-1.24.1-gcc44.patch
 
@@ -67,6 +68,7 @@ popd
 
 %patch1 -p0 -b .dbinstall
 %patch2 -p0 -b .runlevel
+%patch3 -p0 -b .noffmpeg
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
 gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
@@ -193,6 +195,10 @@ fi
 
 
 %changelog
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-2
+- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
+- Added noffmpeg patch to make building outside mock easier
+
 * Sat Mar 21 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
 - Patch for gcc 4.4 compilation errors
 - Upgrade to 1.24.1

From 75f093b5f81fbc2267532ed7f58907571d03eace Mon Sep 17 00:00:00 2001
From: mebourne <mebourne@fedoraproject.org>
Date: Sat, 11 Apr 2009 01:24:27 +0000
Subject: [PATCH 10/82] Fix version/release typo.

---
 zoneminder.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 0164532..ebf680e 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -4,8 +4,8 @@
 %define zmgid_final apache
 
 Name: 		zoneminder
-Version: 	1.24.2
-Release: 	1%{?dist}
+Version: 	1.24.1
+Release: 	2%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/

From 8c19563c5c5f9dc983dcbacefd403e284824a001 Mon Sep 17 00:00:00 2001
From: mebourne <mebourne@fedoraproject.org>
Date: Sat, 11 Apr 2009 18:03:48 +0000
Subject: [PATCH 11/82] - Remove unused Sys::Mmap perl dependency RPM is
 finding

---
 zoneminder-1.24.1-perldep.patch | 12 ++++++++++++
 zoneminder.spec                 |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 zoneminder-1.24.1-perldep.patch

diff --git a/zoneminder-1.24.1-perldep.patch b/zoneminder-1.24.1-perldep.patch
new file mode 100644
index 0000000..aa327b9
--- /dev/null
+++ b/zoneminder-1.24.1-perldep.patch
@@ -0,0 +1,12 @@
+--- scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm.perldep	2009-04-11 19:00:53.000000000 +0100
++++ scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm	2009-04-11 19:00:29.000000000 +0100
+@@ -66,7 +66,8 @@
+ use ZoneMinder::Config qw(:all);
+ use ZoneMinder::Debug qw(:all);
+ 
+-use Sys::Mmap;
++# Remove this, we don't use it but RPM is finding it as a dependency
++# use Sys::Mmap;
+ 
+ sub zmMemKey( $ )
+ {
diff --git a/zoneminder.spec b/zoneminder.spec
index ebf680e..c340cc0 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name: 		zoneminder
 Version: 	1.24.1
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 Summary:        A camera monitoring and analysis tool
 Group:          System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -24,6 +24,7 @@ Source6:    http://mootools.net/downloads/mootools-1.2-core-yc.js
 Patch1: 	zoneminder-1.24.1-dbinstall.patch
 Patch2:		zoneminder-1.24.1-runlevel.patch
 Patch3:		zoneminder-1.24.1-noffmpeg.patch
+Patch4:		zoneminder-1.24.1-perldep.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
 Patch11: 	zoneminder-1.24.1-gcc44.patch
 
@@ -69,6 +70,7 @@ popd
 %patch1 -p0 -b .dbinstall
 %patch2 -p0 -b .runlevel
 %patch3 -p0 -b .noffmpeg
+%patch4 -p0 -b .perldep
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
 gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
@@ -195,6 +197,9 @@ fi
 
 
 %changelog
+* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-3
+- Remove unused Sys::Mmap perl dependency RPM is finding
+
 * Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-2
 - Update gcc44 patch to disable -frepo, seems to be broken with gcc44
 - Added noffmpeg patch to make building outside mock easier

From 2180d71d505e221e6a7acdbe806caf9f116848a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?=
 <tibbs@fedoraproject.org>
Date: Wed, 22 Jul 2009 20:01:54 +0000
Subject: [PATCH 12/82] - Initial update to 1.24.2. - Rebase patches. - Update
 mootools download location. - Update to mootools 1.2.3. - Add additional
 dependencies for some optional features.

---
 .cvsignore                                    |   4 +-
 sources                                       |   4 +-
 ...patch => zoneminder-1.24.2-dbinstall.patch | 124 +++++++++---------
 ...c44.patch => zoneminder-1.24.2-gcc44.patch |  18 +--
 ....patch => zoneminder-1.24.2-noffmpeg.patch |   8 +-
 zoneminder.spec                               |  40 +++---
 6 files changed, 105 insertions(+), 93 deletions(-)
 rename zoneminder-1.24.1-dbinstall.patch => zoneminder-1.24.2-dbinstall.patch (71%)
 rename zoneminder-1.24.1-gcc44.patch => zoneminder-1.24.2-gcc44.patch (53%)
 rename zoneminder-1.24.1-noffmpeg.patch => zoneminder-1.24.2-noffmpeg.patch (86%)

diff --git a/.cvsignore b/.cvsignore
index 3da56c4..38fe763 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-ZoneMinder-1.24.1.tar.gz
 cambozola-0.68.tar.gz
-mootools-1.2-core-yc.js
 jscalendar-1.0.zip
+mootools-1.2.3-core-yc.js
+ZoneMinder-1.24.2.tar.gz
diff --git a/sources b/sources
index dc97c99..39edb8a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-1e4ce392d645cbb28037ecebc5a56584  ZoneMinder-1.24.1.tar.gz
 e4fac8b6ee94c9075b14bb95be4f860b  cambozola-0.68.tar.gz
-741c1ef4d6602c12a54d8a1b629988c8  mootools-1.2-core-yc.js
 10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
+2107736d116f31767cadb15902c6c7fd  mootools-1.2.3-core-yc.js
+550d2f8f08852134028c3b1cf8fa437f  ZoneMinder-1.24.2.tar.gz
diff --git a/zoneminder-1.24.1-dbinstall.patch b/zoneminder-1.24.2-dbinstall.patch
similarity index 71%
rename from zoneminder-1.24.1-dbinstall.patch
rename to zoneminder-1.24.2-dbinstall.patch
index f89ab4f..b43fb83 100644
--- a/zoneminder-1.24.1-dbinstall.patch
+++ b/zoneminder-1.24.2-dbinstall.patch
@@ -1,5 +1,34 @@
---- db/Makefile.am.orig	2006-12-27 23:50:07.000000000 +0000
-+++ db/Makefile.am	2006-12-27 23:50:21.000000000 +0000
+diff -up ./configure.ac.dbinstall ./configure.ac
+--- ./configure.ac.dbinstall	2009-06-24 05:22:23.000000000 -0500
++++ ./configure.ac	2009-07-19 22:40:16.000000000 -0500
+@@ -1,11 +1,9 @@
+ AC_PREREQ(2.59)
+-AC_INIT(zm,1.24.2,support@zoneminder.com,ZoneMinder)
++AC_INIT(zm,1.24.2,support@zoneminder.com,zoneminder)
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR(src/zm.h)
+ AM_CONFIG_HEADER(config.h)
+ 
+-PATH_BUILD=`pwd`
+-AC_SUBST(PATH_BUILD)
+ TIME_BUILD=`date +'%s'`
+ AC_SUBST(TIME_BUILD)
+ 
+@@ -319,8 +317,10 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+ 
+ AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
+ AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
++AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
++AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
+ AC_SUBST(RUNDIR,"/var/run")
+-AC_SUBST(ZM_RUNDIR,"$RUNDIR/zm")
++AC_SUBST(ZM_RUNDIR,"$RUNDIR/$PACKAGE")
+ AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
+ AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
+ AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
+diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
+--- ./db/Makefile.am.dbinstall	2009-03-31 09:06:34.000000000 -0500
++++ ./db/Makefile.am	2009-07-19 22:27:02.000000000 -0500
 @@ -1,7 +1,16 @@
  AUTOMAKE_OPTIONS = gnu
  
@@ -17,61 +46,9 @@
  	zm_update-0.0.1.sql \
  	zm_update-0.9.7.sql \
  	zm_update-0.9.8.sql \
---- scripts/zmupdate.pl.orig	2006-12-27 23:59:20.000000000 +0000
-+++ scripts/zmupdate.pl	2006-12-27 23:59:35.000000000 +0000
-@@ -402,7 +402,7 @@
-                 $command .= " -p".$db_pass;
-             }
-         }
--        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
-+        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
- 
-         print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
-         my $output = qx($command);
---- configure.ac.orig	2006-12-27 23:55:41.000000000 +0000
-+++ configure.ac	2006-12-27 23:59:07.000000000 +0000
---- configure.ac.dbinstall      2009-02-23 10:56:58.000000000 +0000
-+++ configure.ac        2009-03-15 00:23:05.000000000 +0000
-@@ -1,11 +1,9 @@
- AC_PREREQ(2.61)
--AC_INIT(zm,1.24.1,support@zoneminder.com,ZoneMinder)
-+AC_INIT(zm,1.24.1,support@zoneminder.com,zoneminder)
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR(src/zm.h)
- AM_CONFIG_HEADER(config.h)
- 
--PATH_BUILD=`pwd`
--AC_SUBST(PATH_BUILD)
- TIME_BUILD=`date +'%s'`
- AC_SUBST(TIME_BUILD)
- 
-@@ -318,8 +316,10 @@
- 
- AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
- AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
-+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
-+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
- AC_SUBST(RUNDIR,"/var/run")
--AC_SUBST(ZM_RUNDIR,"$RUNDIR/zm")
-+AC_SUBST(ZM_RUNDIR,"$RUNDIR/$PACKAGE")
- AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
- AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
- AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
---- zm.conf.in.orig	2006-12-27 23:53:38.000000000 +0000
-+++ zm.conf.in	2006-12-27 23:59:11.000000000 +0000
-@@ -12,8 +12,8 @@
- # Current version of ZoneMinder
- ZM_VERSION=@VERSION@
- 
--# Path to build directory, used mostly for finding DB upgrade scripts
--ZM_PATH_BUILD=@PATH_BUILD@
-+# Path to installed data directory, used mostly for finding DB upgrade scripts
-+ZM_PATH_DATA=@PKGDATADIR@
- 
- # Build time, used to record when to trigger various checks
- ZM_TIME_BUILD=@TIME_BUILD@
---- scripts/zm.in.dbinstall	2007-04-03 00:41:48.000000000 +0100
-+++ scripts/zm.in	2007-04-03 00:42:46.000000000 +0100
+diff -up ./scripts/zm.in.dbinstall ./scripts/zm.in
+--- ./scripts/zm.in.dbinstall	2009-03-20 07:07:02.000000000 -0500
++++ ./scripts/zm.in	2009-07-19 22:27:02.000000000 -0500
 @@ -6,10 +6,10 @@
  # Source function library.
  . /etc/rc.d/init.d/functions
@@ -85,7 +62,7 @@
  
  loadconf()
  {
-@@ -27,9 +27,8 @@
+@@ -27,9 +27,8 @@ command="$ZM_PATH_BIN/zmpkg.pl"
  start()
  {
  	zmupdate || return $?
@@ -96,7 +73,7 @@
  		&& mkdir -m 774 $pidfile \
  		&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $pidfile
  	#Make sure the folder for the socks file exists or create one
-@@ -49,7 +48,6 @@
+@@ -56,7 +55,6 @@ start()
  
  stop()
  {
@@ -104,7 +81,7 @@
  	echo -n $"Stopping $prog: "
  	$command stop
  	RETVAL=$?
-@@ -60,22 +58,21 @@
+@@ -67,22 +65,21 @@ stop()
  
  zmstatus()
  {
@@ -131,7 +108,7 @@
  	fi
  }
  
-@@ -92,7 +89,6 @@
+@@ -99,7 +96,6 @@ case "$1" in
  		start
  		;;
  	'condrestart')
@@ -139,3 +116,28 @@
  		result=`$ZM_PATH_BIN/zmdc.pl check`
  		if [ "$result" = "running" ]; then
  			$ZM_PATH_BIN/zmdc.pl shutdown > /dev/null
+--- ./scripts/zmupdate.pl.in.dbinstall	2009-06-30 02:42:12.000000000 -0500
++++ ./scripts/zmupdate.pl.in	2009-07-19 22:27:02.000000000 -0500
+@@ -403,7 +403,7 @@ if ( $version )
+                 $command .= " -p".$db_pass;
+             }
+         }
+-        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
++        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
+ 
+         print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
+         my $output = qx($command);
+diff -up ./zm.conf.in.dbinstall ./zm.conf.in
+--- ./zm.conf.in.dbinstall	2009-03-20 07:07:10.000000000 -0500
++++ ./zm.conf.in	2009-07-19 22:27:02.000000000 -0500
+@@ -12,8 +12,8 @@
+ # Current version of ZoneMinder
+ ZM_VERSION=@VERSION@
+ 
+-# Path to build directory, used mostly for finding DB upgrade scripts
+-ZM_PATH_BUILD=@PATH_BUILD@
++# Path to installed data directory, used mostly for finding DB upgrade scripts
++ZM_PATH_DATA=@PKGDATADIR@
+ 
+ # Build time, used to record when to trigger various checks
+ ZM_TIME_BUILD=@TIME_BUILD@
diff --git a/zoneminder-1.24.1-gcc44.patch b/zoneminder-1.24.2-gcc44.patch
similarity index 53%
rename from zoneminder-1.24.1-gcc44.patch
rename to zoneminder-1.24.2-gcc44.patch
index d1b8684..149b922 100644
--- a/zoneminder-1.24.1-gcc44.patch
+++ b/zoneminder-1.24.2-gcc44.patch
@@ -1,7 +1,7 @@
---- src/zm_utils.cpp.gcc44      2008-07-25 10:33:24.000000000 +0100
-+++ src/zm_utils.cpp    2009-04-07 21:25:05.000000000 +0100
-@@ -19,7 +19,8 @@
- 
+--- src/zm_utils.cpp.gcc44	2009-05-28 03:47:59.000000000 -0500
++++ src/zm_utils.cpp	2009-07-20 00:28:43.000000000 -0500
+@@ -20,7 +20,8 @@
+ //#include "zm_debug.h"
  #include "zm_utils.h"
  
 -#include <stdarg.h>
@@ -10,14 +10,14 @@
  
  const std::string stringtf( const char *format, ... )
  {
---- src/Makefile.am.frepo	2009-04-11 02:08:57.000000000 +0100
-+++ src/Makefile.am	2009-04-11 02:09:07.000000000 +0100
+--- src/Makefile.am.frepo       2009-04-11 02:08:57.000000000 +0100
++++ src/Makefile.am     2009-04-11 02:09:07.000000000 +0100
 @@ -1,7 +1,7 @@
  AUTOMAKE_OPTIONS = gnu
- 
+
  AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
 -AM_CXXFLAGS = -frepo
 +#AM_CXXFLAGS = -frepo
- 
+
  CLEANFILES = *.rpo
- 
+
diff --git a/zoneminder-1.24.1-noffmpeg.patch b/zoneminder-1.24.2-noffmpeg.patch
similarity index 86%
rename from zoneminder-1.24.1-noffmpeg.patch
rename to zoneminder-1.24.2-noffmpeg.patch
index db6e67f..c8e81d6 100644
--- a/zoneminder-1.24.1-noffmpeg.patch
+++ b/zoneminder-1.24.2-noffmpeg.patch
@@ -1,6 +1,6 @@
---- configure.ac.noffmpeg	2009-04-11 02:15:30.000000000 +0100
-+++ configure.ac	2009-04-11 02:15:52.000000000 +0100
-@@ -245,10 +245,10 @@
+--- configure.ac.noffmpeg	2009-07-20 00:24:37.000000000 -0500
++++ configure.ac	2009-07-20 00:25:51.000000000 -0500
+@@ -244,10 +244,10 @@
  AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
  fi
  AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
@@ -13,5 +13,5 @@
 +dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),[-lavcodec -lavutil])
 +dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
  AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
+ AC_CHECK_LIB(z,compress,,)
  
- # Checks for header files.
diff --git a/zoneminder.spec b/zoneminder.spec
index c340cc0..03fea11 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -3,16 +3,16 @@
 %define zmuid_final apache
 %define zmgid_final apache
 
-Name: 		zoneminder
-Version: 	1.24.1
-Release: 	3%{?dist}
-Summary:        A camera monitoring and analysis tool
-Group:          System Environment/Daemons
+Name:       zoneminder
+Version:    1.24.2
+Release:    1%{?dist}
+Summary:    A camera monitoring and analysis tool
+Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
 # Mootools is inder the MIT license: http://mootools.net/
-License:        GPLv2+ and LGPLv2+ and MIT 
-URL:            http://www.zoneminder.com/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+License:    GPLv2+ and LGPLv2+ and MIT 
+URL:        http://www.zoneminder.com/
+BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source:     http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz
 Source1: 	http://www.charliemouse.com/code/cambozola/cambozola-0.68.tar.gz
@@ -20,13 +20,13 @@ Source2: 	zoneminder.conf
 Source3: 	redalert.wav
 Source4: 	README.Fedora
 Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
-Source6:    http://mootools.net/downloads/mootools-1.2-core-yc.js
-Patch1: 	zoneminder-1.24.1-dbinstall.patch
+Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
+Patch1: 	zoneminder-1.24.2-dbinstall.patch
 Patch2:		zoneminder-1.24.1-runlevel.patch
-Patch3:		zoneminder-1.24.1-noffmpeg.patch
+Patch3:		zoneminder-1.24.2-noffmpeg.patch
 Patch4:		zoneminder-1.24.1-perldep.patch
 Patch10: 	zoneminder-1.22.3-installfix.patch
-Patch11: 	zoneminder-1.24.1-gcc44.patch
+Patch11: 	zoneminder-1.24.2-gcc44.patch
 
 Conflicts: 	zm <= 1.22.3
 
@@ -37,9 +37,12 @@ BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
 BuildRequires: 	perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
 BuildRequires: 	perl(MIME::Entity) perl(MIME::Lite)
 BuildRequires:  perl(PHP::Serialization)
+
 Requires: 	httpd php php-mysql
 Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: 	perl(DBD::mysql)
+Requires: 	perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
+Requires:   perl(MIME::Entity) perl(MIME::Lite) perl(Net::SMTP) perl(Net::FTP)
+
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -133,8 +136,8 @@ cp -rp jscalendar-1.0/* $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar
 
 # Install mootools
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/www
-install -m 644 %{SOURCE6} mootools-1.2-core-yc.js
-ln -s mootools-1.2-core-yc.js mootools.js
+install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
+ln -s mootools-1.2.3-core-yc.js mootools.js
 popd
 
 %clean
@@ -197,6 +200,13 @@ fi
 
 
 %changelog
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-1
+- Initial update to 1.24.2.
+- Rebase patches.
+- Update mootools download location.
+- Update to mootools 1.2.3.
+- Add additional dependencies for some optional features.
+
 * Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-3
 - Remove unused Sys::Mmap perl dependency RPM is finding
 

From 0e2845b2acbfeeea739cfb2c418ee1b5048ae3d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jason=20=E3=83=86=E3=82=A3=E3=83=93=E3=83=84?=
 <tibbs@fedoraproject.org>
Date: Wed, 22 Jul 2009 20:18:50 +0000
Subject: [PATCH 13/82] - Bump release since 1.24.2-1 was mistakenly tagged a
 few months ago.

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 03fea11..21746fa 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.24.2
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -200,6 +200,9 @@ fi
 
 
 %changelog
+* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-2
+- Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
+
 * Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-1
 - Initial update to 1.24.2.
 - Rebase patches.

From 3412f5eb2c7963730a57aaa0eacd6fa1a6db53af Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Mon, 27 Jul 2009 09:04:40 +0000
Subject: [PATCH 14/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 21746fa..067d106 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.24.2
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -200,6 +200,9 @@ fi
 
 
 %changelog
+* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-2
 - Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
 

From b1c707c88b0a21064545b29a3fe507764f8e3381 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 22:39:21 +0000
Subject: [PATCH 15/82] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 537d8ee..d82be1e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: zoneminder
-# $Id$
+# $Id: Makefile,v 1.1 2007/06/28 20:07:46 kevin Exp $
 NAME := zoneminder
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON := $(shell $(find-makefile-common))

From 1743cb51c3f414e903310201bc43d47f54d8c12e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= <kasal@fedoraproject.org>
Date: Sun, 6 Dec 2009 23:36:44 +0000
Subject: [PATCH 16/82] - rebuild against perl 5.10.1

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 067d106..b1b6100 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.24.2
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -200,6 +200,9 @@ fi
 
 
 %changelog
+* Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
+- rebuild against perl 5.10.1
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

From 4b630c3bcda32b86fe2ff960f52d81d42f1b7cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= <kasal@fedoraproject.org>
Date: Sun, 6 Dec 2009 23:54:45 +0000
Subject: [PATCH 17/82] - use Perl vendorarch and archlib variables correctly

---
 zoneminder.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index b1b6100..79e7704 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -114,8 +114,7 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run
 make install DESTDIR=$RPM_BUILD_ROOT \
 	     INSTALLDIRS=vendor
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{_lib}/perl5/vendor_perl/*.*/*-*
-rm -rf $RPM_BUILD_ROOT%{_prefix}/%{_lib}/perl5/*.*/*-*
+rm -rf $RPM_BUILD_ROOT%{perl_vendorarch} $RPM_BUILD_ROOT%{perl_archlib}
 rm -f $RPM_BUILD_ROOT%{_bindir}/zmx10.pl
 
 install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/log/zoneminder
@@ -202,6 +201,7 @@ fi
 %changelog
 * Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
 - rebuild against perl 5.10.1
+- use Perl vendorarch and archlib variables correctly
 
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

From d5903e7b46fdd377cd44a4332e10ff54a08b6bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?=
 <mmaslano@fedoraproject.org>
Date: Wed, 2 Jun 2010 10:18:39 +0000
Subject: [PATCH 18/82] - Mass rebuild with perl-5.12.0

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 79e7704..1c8ca12 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.24.2
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -199,6 +199,9 @@ fi
 
 
 %changelog
+* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
+- Mass rebuild with perl-5.12.0
+
 * Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
 - rebuild against perl 5.10.1
 - use Perl vendorarch and archlib variables correctly

From 757adca12c95a2c4d71779b69dcceb93133aed53 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 16:32:38 +0000
Subject: [PATCH 19/82] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index d82be1e..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: zoneminder
-# $Id: Makefile,v 1.1 2007/06/28 20:07:46 kevin Exp $
-NAME := zoneminder
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From d637c48ed54ee392c4086de05fdc6b67562c2a4d Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 22 Jan 2011 00:08:03 -0600
Subject: [PATCH 20/82] Use separately-packaged cambozola jar.

---
 zoneminder.spec | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 1c8ca12..2ed2fce 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.24.2
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -15,7 +15,6 @@ URL:        http://www.zoneminder.com/
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source:     http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz
-Source1: 	http://www.charliemouse.com/code/cambozola/cambozola-0.68.tar.gz
 Source2: 	zoneminder.conf
 Source3: 	redalert.wav
 Source4: 	README.Fedora
@@ -38,7 +37,7 @@ BuildRequires: 	perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
 BuildRequires: 	perl(MIME::Entity) perl(MIME::Lite)
 BuildRequires:  perl(PHP::Serialization)
 
-Requires: 	httpd php php-mysql
+Requires: 	httpd php php-mysql cambozola
 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)
@@ -56,7 +55,7 @@ have attached to a Linux based machine. It is designed to run on kernels which
 support the Video For Linux (V4L) interface and has been tested with cameras
 attached to BTTV cards, various USB cameras and IP network cameras. It is
 designed to support as many cameras as you can attach to your computer without
-too much degradation of performance. This package includes cambozola.jar.
+too much degradation of performance.
 
 
 %prep
@@ -76,7 +75,6 @@ popd
 %patch4 -p0 -b .perldep
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
-gunzip -c %{SOURCE1} | tar xf - cambozola-*/dist/cambozola.jar
 cp %{SOURCE4} README.Fedora
 
 cat <<EOF >> db/zm_create.sql.in
@@ -125,7 +123,6 @@ do
 	ln -sf ../../../..%{_localstatedir}/lib/zoneminder/$dir $RPM_BUILD_ROOT%{_datadir}/%{name}/www/$dir
 done
 install -D -m 755 scripts/zm $RPM_BUILD_ROOT%{_initrddir}/zoneminder
-install -D -m 644 cambozola-*/dist/cambozola.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/www/cambozola.jar
 install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zoneminder.conf
 install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/www/sounds/redalert.wav
 
@@ -133,6 +130,11 @@ install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/www/sounds/redal
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar
 cp -rp jscalendar-1.0/* $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar
 
+# Set up cambozola
+pushd %{buildroot}/%{_datadir}/%{name}/www
+ln -s ../../java/cambozola.jar
+popd
+
 # Install mootools
 pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/www
 install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
@@ -199,6 +201,9 @@ fi
 
 
 %changelog
+* Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
+- Unbundle mootools; instead link to the separately pacakged copy.
+
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
 - Mass rebuild with perl-5.12.0
 

From 0e7fe5a768866b3fc2b4168b46a9319f6db81813 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 22 Jan 2011 00:09:54 -0600
Subject: [PATCH 21/82] Remove some things unnecessary on modern Fedora.

---
 zoneminder.spec | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 2ed2fce..7af1af0 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -12,7 +12,6 @@ Group:      System Environment/Daemons
 # Mootools is inder the MIT license: http://mootools.net/
 License:    GPLv2+ and LGPLv2+ and MIT 
 URL:        http://www.zoneminder.com/
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source:     http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz
 Source2: 	zoneminder.conf
@@ -107,8 +106,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run
 make install DESTDIR=$RPM_BUILD_ROOT \
 	     INSTALLDIRS=vendor
@@ -141,9 +138,6 @@ install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
 ln -s mootools-1.2.3-core-yc.js mootools.js
 popd
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 
 %post
 /sbin/chkconfig --add zoneminder
@@ -203,6 +197,7 @@ fi
 %changelog
 * Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
 - Unbundle mootools; instead link to the separately pacakged copy.
+- Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
 
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
 - Mass rebuild with perl-5.12.0

From d7d790c83ce8825cb2790625b9effb6295af8e74 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 22 Jan 2011 00:25:27 -0600
Subject: [PATCH 22/82] Fix mixed space/tab usage.

---
 zoneminder.spec | 93 +++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 46 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 7af1af0..cee9bfb 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -14,31 +14,31 @@ License:    GPLv2+ and LGPLv2+ and MIT
 URL:        http://www.zoneminder.com/
 
 Source:     http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz
-Source2: 	zoneminder.conf
-Source3: 	redalert.wav
-Source4: 	README.Fedora
+Source2:    zoneminder.conf
+Source3:    redalert.wav
+Source4:    README.Fedora
 Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
 Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
-Patch1: 	zoneminder-1.24.2-dbinstall.patch
-Patch2:		zoneminder-1.24.1-runlevel.patch
-Patch3:		zoneminder-1.24.2-noffmpeg.patch
-Patch4:		zoneminder-1.24.1-perldep.patch
-Patch10: 	zoneminder-1.22.3-installfix.patch
-Patch11: 	zoneminder-1.24.2-gcc44.patch
+Patch1:     zoneminder-1.24.2-dbinstall.patch
+Patch2:     zoneminder-1.24.1-runlevel.patch
+Patch3:     zoneminder-1.24.2-noffmpeg.patch
+Patch4:     zoneminder-1.24.1-perldep.patch
+Patch10:    zoneminder-1.22.3-installfix.patch
+Patch11:    zoneminder-1.24.2-gcc44.patch
 
-Conflicts: 	zm <= 1.22.3
+Conflicts:  zm <= 1.22.3
 
-BuildRequires: 	automake gnutls-devel
-BuildRequires: 	mysql-devel pcre-devel libjpeg-devel
-BuildRequires: 	perl(Archive::Tar) perl(Archive::Zip)
+BuildRequires:  automake gnutls-devel
+BuildRequires:  mysql-devel pcre-devel libjpeg-devel
+BuildRequires:  perl(Archive::Tar) perl(Archive::Zip)
 BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
-BuildRequires: 	perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
-BuildRequires: 	perl(MIME::Entity) perl(MIME::Lite)
+BuildRequires:  perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
+BuildRequires:  perl(MIME::Entity) perl(MIME::Lite)
 BuildRequires:  perl(PHP::Serialization)
 
-Requires: 	httpd php php-mysql cambozola
-Requires: 	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: 	perl(DBD::mysql) perl(Archive::Tar) perl(Archive::Zip)
+Requires:   httpd php php-mysql cambozola
+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)
 
 Requires(post): /sbin/chkconfig
@@ -88,44 +88,44 @@ autoreconf
 
 OPTS=""
 %ifnarch %{ix86} x86_64
-	OPTS="$OPTS --disable-crashtrace"
+    OPTS="$OPTS --disable-crashtrace"
 %endif
 
 %configure \
-	--with-libarch=%{_lib} \
-	--with-mysql=%{_prefix} \
-	--with-webdir=%{_datadir}/%{name}/www \
-	--with-cgidir=%{_libexecdir}/%{name}/cgi-bin \
-	--with-webuser=%{zmuid} \
-	--with-webgroup=%{zmgid} \
-	--disable-debug \
-	$OPTS
+    --with-libarch=%{_lib} \
+    --with-mysql=%{_prefix} \
+    --with-webdir=%{_datadir}/%{name}/www \
+    --with-cgidir=%{_libexecdir}/%{name}/cgi-bin \
+    --with-webuser=%{zmuid} \
+    --with-webgroup=%{zmgid} \
+    --disable-debug \
+    $OPTS
 make %{?_smp_mflags}
 %{__perl} -pi -e 's/(ZM_WEB_USER=).*$/${1}%{zmuid_final}/;' \
-	      -e 's/(ZM_WEB_GROUP=).*$/${1}%{zmgid_final}/;' zm.conf
+          -e 's/(ZM_WEB_GROUP=).*$/${1}%{zmgid_final}/;' zm.conf
 
 
 %install
-install -d $RPM_BUILD_ROOT%{_localstatedir}/run
-make install DESTDIR=$RPM_BUILD_ROOT \
-	     INSTALLDIRS=vendor
-rm -rf $RPM_BUILD_ROOT%{perl_vendorarch} $RPM_BUILD_ROOT%{perl_archlib}
-rm -f $RPM_BUILD_ROOT%{_bindir}/zmx10.pl
+install -d %{buildroot}/%{_localstatedir}/run
+make install DESTDIR=%{buildroot} \
+    INSTALLDIRS=vendor
+rm -rf %{buildroot}/%{perl_vendorarch} %{buildroot}/%{perl_archlib}
+rm -f %{buildroot}/%{_bindir}/zmx10.pl
 
-install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/log/zoneminder
+install -m 755 -d %{buildroot}/%{_localstatedir}/log/zoneminder
 for dir in events images temp
 do
-	install -m 755 -d $RPM_BUILD_ROOT%{_localstatedir}/lib/zoneminder/$dir
-	rmdir $RPM_BUILD_ROOT%{_datadir}/%{name}/www/$dir
-	ln -sf ../../../..%{_localstatedir}/lib/zoneminder/$dir $RPM_BUILD_ROOT%{_datadir}/%{name}/www/$dir
+    install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/$dir
+    rmdir %{buildroot}/%{_datadir}/%{name}/www/$dir
+    ln -sf ../../../..%{_localstatedir}/lib/zoneminder/$dir %{buildroot}/%{_datadir}/%{name}/www/$dir
 done
-install -D -m 755 scripts/zm $RPM_BUILD_ROOT%{_initrddir}/zoneminder
-install -D -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/zoneminder.conf
-install -D -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}/www/sounds/redalert.wav
+install -D -m 755 scripts/zm %{buildroot}/%{_initrddir}/zoneminder
+install -D -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zoneminder.conf
+install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}/www/sounds/redalert.wav
 
 # Install jscalendar - this really should be in its own package
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar
-cp -rp jscalendar-1.0/* $RPM_BUILD_ROOT%{_datadir}/%{name}/www/jscalendar
+install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar
+cp -rp jscalendar-1.0/* %{buildroot}/%{_datadir}/%{name}/www/jscalendar
 
 # Set up cambozola
 pushd %{buildroot}/%{_datadir}/%{name}/www
@@ -133,7 +133,7 @@ ln -s ../../java/cambozola.jar
 popd
 
 # Install mootools
-pushd $RPM_BUILD_ROOT%{_datadir}/%{name}/www
+pushd %{buildroot}/%{_datadir}/%{name}/www
 install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
 ln -s mootools-1.2.3-core-yc.js mootools.js
 popd
@@ -145,14 +145,14 @@ popd
 
 %preun
 if [ $1 -eq 0 ]; then
-	/sbin/service zoneminder stop > /dev/null 2>&1 || :
-	/sbin/chkconfig --del zoneminder
+    /sbin/service zoneminder stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del zoneminder
 fi
 
 
 %postun
 if [ $1 -ge 1 ]; then
-	/sbin/service zoneminder condrestart > /dev/null 2>&1 || :
+    /sbin/service zoneminder condrestart > /dev/null 2>&1 || :
 fi
 
 
@@ -198,6 +198,7 @@ fi
 * Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
 - Unbundle mootools; instead link to the separately pacakged copy.
 - Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
+- Git rid of mixed space/tab usage by removing all tabs.
 
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
 - Mass rebuild with perl-5.12.0

From 85647fc4867eca5a1dc855438cfce6d41aa97cc2 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 22 Jan 2011 00:26:06 -0600
Subject: [PATCH 23/82] Remove unnecessary Conflicts:

---
 zoneminder.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index cee9bfb..ba8ca42 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -26,8 +26,6 @@ Patch4:     zoneminder-1.24.1-perldep.patch
 Patch10:    zoneminder-1.22.3-installfix.patch
 Patch11:    zoneminder-1.24.2-gcc44.patch
 
-Conflicts:  zm <= 1.22.3
-
 BuildRequires:  automake gnutls-devel
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
 BuildRequires:  perl(Archive::Tar) perl(Archive::Zip)
@@ -199,6 +197,7 @@ fi
 - Unbundle mootools; instead link to the separately pacakged copy.
 - Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
 - Git rid of mixed space/tab usage by removing all tabs.
+- Remove unnecessary Conflicts: line.
 
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
 - Mass rebuild with perl-5.12.0

From 3d9ed97c5b4b4876e86a6be05336c101fbe772ab Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 22 Jan 2011 10:26:15 -0600
Subject: [PATCH 24/82] Fix thinko in changelog.

---
 zoneminder.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index ba8ca42..c6adab0 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -194,7 +194,7 @@ fi
 
 %changelog
 * Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
-- Unbundle mootools; instead link to the separately pacakged copy.
+- Unbundle cambozola; instead link to the separately pacakged copy.
 - Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
 - Git rid of mixed space/tab usage by removing all tabs.
 - Remove unnecessary Conflicts: line.

From f391cc557595b6c578f3b2a0a4ce18aa4216a4e4 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 22 Jan 2011 10:31:58 -0600
Subject: [PATCH 25/82] Attempt to force short_open_tag on.

---
 zoneminder.conf | 3 +++
 zoneminder.spec | 1 +
 2 files changed, 4 insertions(+)

diff --git a/zoneminder.conf b/zoneminder.conf
index 3e61dcc..4a4d932 100644
--- a/zoneminder.conf
+++ b/zoneminder.conf
@@ -18,6 +18,9 @@ Alias /zm "/usr/share/zoneminder/www"
     AllowOverride All
     Order allow,deny
     Allow from all
+    # The code unfortunately uses short tags in many places
+    php_value short_open_tag 1
+
 Deny from all # DELETE THIS LINE
 </Directory>
 
diff --git a/zoneminder.spec b/zoneminder.spec
index c6adab0..2032f25 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -198,6 +198,7 @@ fi
 - Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
 - Git rid of mixed space/tab usage by removing all tabs.
 - Remove unnecessary Conflicts: line.
+- Attempt to force short_open_tag on for the code directories.
 
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
 - Mass rebuild with perl-5.12.0

From b8ca1475c7ee1409b29321779a5a99b314d93bf9 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 22 Jan 2011 16:07:30 -0600
Subject: [PATCH 26/82] Relocate some directories to please selinux.

---
 zoneminder.spec | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/zoneminder.spec b/zoneminder.spec
index 2032f25..a2adc0b 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -75,7 +75,14 @@ popd
 cp %{SOURCE4} README.Fedora
 
 cat <<EOF >> db/zm_create.sql.in
+# Fedora change:
+# Alter some default paths to match the default URL and selinux expectations
 update Config set Value = '/cgi-bin/zm/nph-zms' where Name = 'ZM_PATH_ZMS';
+update Config set Value = '/var/log/zoneminder' where Name = 'ZM_PATH_LOGS';
+update Config set Value = '/var/log/zoneminder/zm_debug_log+' where Name = 'ZM_EXTRA_DEBUG_LOG';
+update Config set Value = '/var/lib/zoneminder/sock' where Name = 'ZM_PATH_SOCKS';
+update Config set Value = '/var/lib/zoneminder/swap' where Name = 'ZM_PATH_SWAP';
+update Config set Value = '/var/spool/zoneminder-upload' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
 use mysql;
 grant select,insert,update,delete on zm.* to 'zmuser'@localhost identified by 'zmpass';
 EOF
@@ -117,6 +124,10 @@ do
     rmdir %{buildroot}/%{_datadir}/%{name}/www/$dir
     ln -sf ../../../..%{_localstatedir}/lib/zoneminder/$dir %{buildroot}/%{_datadir}/%{name}/www/$dir
 done
+install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/sock
+install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/swap
+install -m 755 -d %{buildroot}/%{_localstatedir}/spool/zoneminder-upload
+
 install -D -m 755 scripts/zm %{buildroot}/%{_initrddir}/zoneminder
 install -D -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zoneminder.conf
 install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}/www/sounds/redalert.wav
@@ -188,8 +199,11 @@ fi
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/events
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/images
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/sock
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/swap
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/temp
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
 
 
 %changelog
@@ -199,6 +213,8 @@ fi
 - Git rid of mixed space/tab usage by removing all tabs.
 - Remove unnecessary Conflicts: line.
 - Attempt to force short_open_tag on for the code directories.
+- Move default location of sockets, swaps, logfiles and some temporary files to
+  make more sense and allow things to work better with a future selinux policy.
 
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
 - Mass rebuild with perl-5.12.0

From 0778c78812dbd09196b439704fbd6aba69a8128e Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 22 Jan 2011 16:21:53 -0600
Subject: [PATCH 27/82] Fix errors in README.Fedora.

---
 README.Fedora   | 3 ++-
 zoneminder.spec | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.Fedora b/README.Fedora
index 254f60f..8a6ab42 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -5,11 +5,12 @@ New installs
    remotely you will need to ensure that the server is installed:
 
      yum install mysql-server
+     service mysql start
 
 2. You will need to create the ZoneMinder database. These commands should do
    the trick:
 
-     mysql mysql < /usr/share/zoneminder/db/zm_create.sql
+     mysql < /usr/share/zoneminder/db/zm_create.sql
      mysqladmin reload
 
 3. The ZoneMinder web interface is disabled by default, you will need to edit
diff --git a/zoneminder.spec b/zoneminder.spec
index a2adc0b..ccd6657 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -215,6 +215,7 @@ fi
 - Attempt to force short_open_tag on for the code directories.
 - Move default location of sockets, swaps, logfiles and some temporary files to
   make more sense and allow things to work better with a future selinux policy.
+- Fix errors in README.Fedora.
 
 * Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
 - Mass rebuild with perl-5.12.0

From 5ba46bbd45b54f085394c00aef4e9f2c63a057ef Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 22 Jan 2011 18:00:20 -0600
Subject: [PATCH 28/82] No need for cambozola in sources.

---
 sources | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sources b/sources
index 39edb8a..aad7e42 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-e4fac8b6ee94c9075b14bb95be4f860b  cambozola-0.68.tar.gz
 10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
 2107736d116f31767cadb15902c6c7fd  mootools-1.2.3-core-yc.js
 550d2f8f08852134028c3b1cf8fa437f  ZoneMinder-1.24.2.tar.gz

From cba1166e6b11f94d5410fcd7ca23f6e5fdfdd806 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 25 Jan 2011 16:55:13 -0600
Subject: [PATCH 29/82] Update to 1.24.3 and try to build without v4l1

Note that this won't build, but it's no worse than before this work.
---
 zoneminder-1.22.3-installfix.patch            |  15 --
 zoneminder-1.24.2-dbinstall.patch             | 143 ------------------
 zoneminder-1.24.2-gcc44.patch                 |  23 ---
 zoneminder-1.24.3-dbinstall.patch             |  67 ++++++++
 zoneminder-1.24.3-gcc44.patch                 |  26 ++++
 zoneminder-1.24.3-installfix.patch            |  18 +++
 ....patch => zoneminder-1.24.3-noffmpeg.patch |  17 ++-
 ....patch => zoneminder-1.24.3-runlevel.patch |  19 +--
 zoneminder-1.24.3-v4l2.patch                  |  12 ++
 zoneminder.spec                               |  23 ++-
 10 files changed, 159 insertions(+), 204 deletions(-)
 delete mode 100644 zoneminder-1.22.3-installfix.patch
 delete mode 100644 zoneminder-1.24.2-dbinstall.patch
 delete mode 100644 zoneminder-1.24.2-gcc44.patch
 create mode 100644 zoneminder-1.24.3-dbinstall.patch
 create mode 100644 zoneminder-1.24.3-gcc44.patch
 create mode 100644 zoneminder-1.24.3-installfix.patch
 rename zoneminder-1.24.2-noffmpeg.patch => zoneminder-1.24.3-noffmpeg.patch (52%)
 rename zoneminder-1.24.1-runlevel.patch => zoneminder-1.24.3-runlevel.patch (66%)
 create mode 100644 zoneminder-1.24.3-v4l2.patch

diff --git a/zoneminder-1.22.3-installfix.patch b/zoneminder-1.22.3-installfix.patch
deleted file mode 100644
index 516d634..0000000
--- a/zoneminder-1.22.3-installfix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- Makefile.am.orig	2006-12-25 01:21:07.000000000 +0000
-+++ Makefile.am	2006-12-25 01:22:04.000000000 +0000
-@@ -23,9 +23,9 @@
- # Yes, you are correct. This is a HACK!
- install-data-hook:
- 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
--	-( if ! test -e $(RUNDIR); then mkdir $(RUNDIR); fi )
--	( if ! test -e $(ZM_RUNDIR); then mkdir $(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR) )
-+	-( if ! test -e $(DESTDIR)$(RUNDIR); then mkdir $(DESTDIR)$(RUNDIR); fi )
-+	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir $(DESTDIR)$(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR) )
- 
- uninstall-hook:
- 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
--	@-( rm -rf $(ZM_RUNDIR) )
-+	@-( rm -rf $(DESTDIR)$(ZM_RUNDIR) )
diff --git a/zoneminder-1.24.2-dbinstall.patch b/zoneminder-1.24.2-dbinstall.patch
deleted file mode 100644
index b43fb83..0000000
--- a/zoneminder-1.24.2-dbinstall.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-diff -up ./configure.ac.dbinstall ./configure.ac
---- ./configure.ac.dbinstall	2009-06-24 05:22:23.000000000 -0500
-+++ ./configure.ac	2009-07-19 22:40:16.000000000 -0500
-@@ -1,11 +1,9 @@
- AC_PREREQ(2.59)
--AC_INIT(zm,1.24.2,support@zoneminder.com,ZoneMinder)
-+AC_INIT(zm,1.24.2,support@zoneminder.com,zoneminder)
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR(src/zm.h)
- AM_CONFIG_HEADER(config.h)
- 
--PATH_BUILD=`pwd`
--AC_SUBST(PATH_BUILD)
- TIME_BUILD=`date +'%s'`
- AC_SUBST(TIME_BUILD)
- 
-@@ -319,8 +317,10 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
- 
- AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
- AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
-+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
-+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
- AC_SUBST(RUNDIR,"/var/run")
--AC_SUBST(ZM_RUNDIR,"$RUNDIR/zm")
-+AC_SUBST(ZM_RUNDIR,"$RUNDIR/$PACKAGE")
- AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
- AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
- AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
-diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
---- ./db/Makefile.am.dbinstall	2009-03-31 09:06:34.000000000 -0500
-+++ ./db/Makefile.am	2009-07-19 22:27:02.000000000 -0500
-@@ -1,7 +1,16 @@
- AUTOMAKE_OPTIONS = gnu
- 
-+zmdbdatadir = $(pkgdatadir)/db
-+
- EXTRA_DIST = \
- 	zm_create.sql.in \
-+	$(dbupgrade_scripts)
-+
-+dist_zmdbdata_DATA = \
-+	zm_create.sql \
-+	$(dbupgrade_scripts)
-+
-+dbupgrade_scripts = \
- 	zm_update-0.0.1.sql \
- 	zm_update-0.9.7.sql \
- 	zm_update-0.9.8.sql \
-diff -up ./scripts/zm.in.dbinstall ./scripts/zm.in
---- ./scripts/zm.in.dbinstall	2009-03-20 07:07:02.000000000 -0500
-+++ ./scripts/zm.in	2009-07-19 22:27:02.000000000 -0500
-@@ -6,10 +6,10 @@
- # Source function library.
- . /etc/rc.d/init.d/functions
- 
--prog=ZoneMinder
-+prog="@PACKAGE@"
- ZM_CONFIG="@ZM_CONFIG@"
- pidfile="@ZM_RUNDIR@"
--LOCKFILE=/var/lock/subsys/zm
-+LOCKFILE=/var/lock/subsys/$prog
- 
- loadconf()
- {
-@@ -27,9 +27,8 @@ command="$ZM_PATH_BIN/zmpkg.pl"
- start()
- {
- 	zmupdate || return $?
--	loadconf || return $?
- 	#Make sure the directory for our PID folder exists or create one.
--	[ ! -d /var/run/zm ] \
-+	[ ! -d $pidfile ] \
- 		&& mkdir -m 774 $pidfile \
- 		&& chown $ZM_WEB_USER:$ZM_WEB_GROUP $pidfile
- 	#Make sure the folder for the socks file exists or create one
-@@ -56,7 +55,6 @@ start()
- 
- stop()
- {
--	loadconf
- 	echo -n $"Stopping $prog: "
- 	$command stop
- 	RETVAL=$?
-@@ -67,22 +65,21 @@ stop()
- 
- zmstatus()
- {
--	loadconf
- 	result=`$command status`
- 	if [ "$result" = "running" ]; then
--		echo "ZoneMinder is running"
-+		echo "$prog is running"
- 		$ZM_PATH_BIN/zmu -l
- 		RETVAL=0
- 	else
--		echo "ZoneMinder is stopped"
-+		echo "$prog is stopped"
- 		RETVAL=1
- 	fi
- }
- 
- zmupdate()
- {
--	if [ -x $ZM_PATH_BIN/zm_update ]; then
--		$ZM_PATH_BIN/zm_update noi
-+	if [ -x $ZM_PATH_BIN/zmupdate.pl ]; then
-+		$ZM_PATH_BIN/zmupdate.pl --freshen >/dev/null
- 	fi
- }
- 
-@@ -99,7 +96,6 @@ case "$1" in
- 		start
- 		;;
- 	'condrestart')
--		loadconf
- 		result=`$ZM_PATH_BIN/zmdc.pl check`
- 		if [ "$result" = "running" ]; then
- 			$ZM_PATH_BIN/zmdc.pl shutdown > /dev/null
---- ./scripts/zmupdate.pl.in.dbinstall	2009-06-30 02:42:12.000000000 -0500
-+++ ./scripts/zmupdate.pl.in	2009-07-19 22:27:02.000000000 -0500
-@@ -403,7 +403,7 @@ if ( $version )
-                 $command .= " -p".$db_pass;
-             }
-         }
--        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
-+        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
- 
-         print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
-         my $output = qx($command);
-diff -up ./zm.conf.in.dbinstall ./zm.conf.in
---- ./zm.conf.in.dbinstall	2009-03-20 07:07:10.000000000 -0500
-+++ ./zm.conf.in	2009-07-19 22:27:02.000000000 -0500
-@@ -12,8 +12,8 @@
- # Current version of ZoneMinder
- ZM_VERSION=@VERSION@
- 
--# Path to build directory, used mostly for finding DB upgrade scripts
--ZM_PATH_BUILD=@PATH_BUILD@
-+# Path to installed data directory, used mostly for finding DB upgrade scripts
-+ZM_PATH_DATA=@PKGDATADIR@
- 
- # Build time, used to record when to trigger various checks
- ZM_TIME_BUILD=@TIME_BUILD@
diff --git a/zoneminder-1.24.2-gcc44.patch b/zoneminder-1.24.2-gcc44.patch
deleted file mode 100644
index 149b922..0000000
--- a/zoneminder-1.24.2-gcc44.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/zm_utils.cpp.gcc44	2009-05-28 03:47:59.000000000 -0500
-+++ src/zm_utils.cpp	2009-07-20 00:28:43.000000000 -0500
-@@ -20,7 +20,8 @@
- //#include "zm_debug.h"
- #include "zm_utils.h"
- 
--#include <stdarg.h>
-+#include <cstdio>
-+#include <cstdarg>
- 
- const std::string stringtf( const char *format, ... )
- {
---- src/Makefile.am.frepo       2009-04-11 02:08:57.000000000 +0100
-+++ src/Makefile.am     2009-04-11 02:09:07.000000000 +0100
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = gnu
-
- AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
--AM_CXXFLAGS = -frepo
-+#AM_CXXFLAGS = -frepo
-
- CLEANFILES = *.rpo
-
diff --git a/zoneminder-1.24.3-dbinstall.patch b/zoneminder-1.24.3-dbinstall.patch
new file mode 100644
index 0000000..1981005
--- /dev/null
+++ b/zoneminder-1.24.3-dbinstall.patch
@@ -0,0 +1,67 @@
+diff -up ./configure.ac.dbinstall ./configure.ac
+--- ./configure.ac.dbinstall	2011-01-20 12:29:50.000000000 -0600
++++ ./configure.ac	2011-01-24 12:36:27.744207538 -0600
+@@ -4,8 +4,6 @@ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR(src/zm.h)
+ AM_CONFIG_HEADER(config.h)
+ 
+-PATH_BUILD=`pwd`
+-AC_SUBST(PATH_BUILD)
+ TIME_BUILD=`date +'%s'`
+ AC_SUBST(TIME_BUILD)
+ 
+@@ -347,6 +345,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+ 
+ AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
+ AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
++AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
++AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
+ AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
+ AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
+ AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
+diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
+--- ./db/Makefile.am.dbinstall	2009-09-28 09:19:56.000000000 -0500
++++ ./db/Makefile.am	2011-01-24 11:40:24.311956165 -0600
+@@ -1,7 +1,16 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
++zmdbdatadir = $(pkgdatadir)/db
++
+ EXTRA_DIST = \
+ 	zm_create.sql.in \
++	$(dbupgrade_scripts)
++
++dist_zmdbdata_DATA = \
++	zm_create.sql \
++	$(dbupgrade_scripts)
++
++dbupgrade_scripts = \
+ 	zm_update-0.0.1.sql \
+ 	zm_update-0.9.7.sql \
+ 	zm_update-0.9.8.sql \
+diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
+--- ./scripts/zmupdate.pl.in.dbinstall	2011-01-17 12:21:37.000000000 -0600
++++ ./scripts/zmupdate.pl.in	2011-01-24 11:40:24.311956165 -0600
+@@ -403,7 +403,7 @@ if ( $version )
+                 $command .= " -p".$db_pass;
+             }
+         }
+-        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
++        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
+ 
+         print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
+         my $output = qx($command);
+diff -up ./zm.conf.in.dbinstall ./zm.conf.in
+--- ./zm.conf.in.dbinstall	2008-07-25 04:48:17.000000000 -0500
++++ ./zm.conf.in	2011-01-24 11:40:24.313004813 -0600
+@@ -12,8 +12,8 @@
+ # Current version of ZoneMinder
+ ZM_VERSION=@VERSION@
+ 
+-# Path to build directory, used mostly for finding DB upgrade scripts
+-ZM_PATH_BUILD=@PATH_BUILD@
++# Path to installed data directory, used mostly for finding DB upgrade scripts
++ZM_PATH_DATA=@PKGDATADIR@
+ 
+ # Build time, used to record when to trigger various checks
+ ZM_TIME_BUILD=@TIME_BUILD@
diff --git a/zoneminder-1.24.3-gcc44.patch b/zoneminder-1.24.3-gcc44.patch
new file mode 100644
index 0000000..c1d39bd
--- /dev/null
+++ b/zoneminder-1.24.3-gcc44.patch
@@ -0,0 +1,26 @@
+diff -up ./src/Makefile.am.gcc44 ./src/Makefile.am
+--- ./src/Makefile.am.gcc44	2011-01-06 12:09:40.000000000 -0600
++++ ./src/Makefile.am	2011-01-23 23:23:07.697087069 -0600
+@@ -1,7 +1,7 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
+ AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
+-AM_CXXFLAGS = -frepo
++#AM_CXXFLAGS = -frepo
+ 
+ CLEANFILES = *.rpo
+ 
+diff -up ./src/zm_utils.cpp.gcc44 ./src/zm_utils.cpp
+--- ./src/zm_utils.cpp.gcc44	2009-11-24 05:41:16.000000000 -0600
++++ ./src/zm_utils.cpp	2011-01-23 23:24:34.117082494 -0600
+@@ -20,8 +20,8 @@
+ //#include "zm_debug.h"
+ #include "zm_utils.h"
+ 
+-#include <stdio.h>
+-#include <stdarg.h>
++#include <cstdio>
++#include <cstdarg>
+ 
+ const std::string stringtf( const char *format, ... )
+ {
diff --git a/zoneminder-1.24.3-installfix.patch b/zoneminder-1.24.3-installfix.patch
new file mode 100644
index 0000000..32e0dac
--- /dev/null
+++ b/zoneminder-1.24.3-installfix.patch
@@ -0,0 +1,18 @@
+diff -up ./Makefile.am.installfix ./Makefile.am
+--- ./Makefile.am.installfix	2011-01-06 13:07:00.000000000 -0600
++++ ./Makefile.am	2011-01-23 17:38:32.408147528 -0600
+@@ -20,10 +20,10 @@ EXTRA_DIST = \
+ # Yes, you are correct. This is a HACK!
+ install-data-hook:
+ 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
+-	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR) )
+-	( if ! test -e $(ZM_TMPDIR); then mkdir -p $(ZM_TMPDIR); fi; chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR) )
+-	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR) )
++	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR) )
++	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -p $(DESTDIR)$(ZM_TMPDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR) )
++	( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_LOGDIR); chmod u+w $(DESTDIR)$(ZM_LOGDIR) )
+ 
+ uninstall-hook:
+ 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
+-	@-( rm -rf $(ZM_RUNDIR) $(ZM_TMPDIR) $(ZM_LOGDIR) )
++	@-( rm -rf $(DESTDIR)$(ZM_RUNDIR) $(DESTDIR)$(ZM_TMPDIR) $(DESTDIR)$(ZM_LOGDIR) )
diff --git a/zoneminder-1.24.2-noffmpeg.patch b/zoneminder-1.24.3-noffmpeg.patch
similarity index 52%
rename from zoneminder-1.24.2-noffmpeg.patch
rename to zoneminder-1.24.3-noffmpeg.patch
index c8e81d6..0a4419a 100644
--- a/zoneminder-1.24.2-noffmpeg.patch
+++ b/zoneminder-1.24.3-noffmpeg.patch
@@ -1,16 +1,21 @@
---- configure.ac.noffmpeg	2009-07-20 00:24:37.000000000 -0500
-+++ configure.ac	2009-07-20 00:25:51.000000000 -0500
-@@ -244,10 +244,10 @@
- AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+diff -up ./configure.ac.noffmpeg ./configure.ac
+--- ./configure.ac.noffmpeg	2011-01-23 16:44:11.000000000 -0600
++++ ./configure.ac	2011-01-23 16:51:13.288146918 -0600
+@@ -269,12 +269,12 @@ AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_
  fi
  AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
 -AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+-AC_CHECK_LIB(avcore,av_image_copy,,AC_MSG_WARN(libavcore.a may be required for MPEG streaming))
 -AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
--AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),[-lavcodec -lavutil])
+-AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+-AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
 -AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
 +dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(avcore,av_image_copy,,AC_MSG_WARN(libavcore.a may be required for MPEG streaming))
 +dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-+dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming),[-lavcodec -lavutil])
++dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
 +dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
  AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
  AC_CHECK_LIB(z,compress,,)
diff --git a/zoneminder-1.24.1-runlevel.patch b/zoneminder-1.24.3-runlevel.patch
similarity index 66%
rename from zoneminder-1.24.1-runlevel.patch
rename to zoneminder-1.24.3-runlevel.patch
index 7e356ba..f2dd107 100644
--- a/zoneminder-1.24.1-runlevel.patch
+++ b/zoneminder-1.24.3-runlevel.patch
@@ -1,10 +1,11 @@
---- scripts/zm.in.runlevel	2009-03-15 00:24:49.000000000 +0000
-+++ scripts/zm.in	2009-03-15 00:28:20.000000000 +0000
+diff -up ./scripts/zm.in.runlevel ./scripts/zm.in
+--- ./scripts/zm.in.runlevel	2010-11-28 15:22:05.000000000 -0600
++++ ./scripts/zm.in	2011-01-23 16:43:51.927147491 -0600
 @@ -1,6 +1,6 @@
- #!/bin/sh
- # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
--# chkconfig: 2345 99 00
-+# chkconfig: - 99 00
- # processname: zmpkg.pl
- 
- # Source function library.
+ #!/bin/sh
+ # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
+-# chkconfig: 2345 99 00
++# chkconfig: - 99 00
+ # processname: zmpkg.pl
+ 
+ # Source function library.
diff --git a/zoneminder-1.24.3-v4l2.patch b/zoneminder-1.24.3-v4l2.patch
new file mode 100644
index 0000000..543ace5
--- /dev/null
+++ b/zoneminder-1.24.3-v4l2.patch
@@ -0,0 +1,12 @@
+diff -up ./configure.ac.v4l2 ./configure.ac
+--- ./configure.ac.v4l2	2011-01-24 12:49:16.092209967 -0600
++++ ./configure.ac	2011-01-24 12:58:58.823207570 -0600
+@@ -282,7 +282,7 @@ AC_CHECK_LIB(z,compress,,)
+ AC_FUNC_ALLOCA
+ AC_HEADER_STDC
+ AC_CHECK_HEADERS([fcntl.h limits.h memory.h netdb.h netinet/in.h stddef.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h values.h])
+-AC_CHECK_HEADERS(linux/videodev.h,,AC_MSG_ERROR(zm requires Video4Linux to be installed),)
++AC_CHECK_HEADERS(linux/videodev.h,,AC_MSG_WARN(zm requires Video4Linux to be installed for V4L1 support),)
+ AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_V4L2,"1"),AC_MSG_WARN(zm requires Video4Linux2 to be installed for V4L2 support),)
+ AC_CHECK_HEADERS(jpeglib.h,,AC_MSG_ERROR(zm requires libjpeg headers to be installed),)
+ AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)
diff --git a/zoneminder.spec b/zoneminder.spec
index ccd6657..a9d9e14 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -4,8 +4,8 @@
 %define zmgid_final apache
 
 Name:       zoneminder
-Version:    1.24.2
-Release:    6%{?dist}
+Version:    1.24.3
+Release:    1%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -19,12 +19,13 @@ Source3:    redalert.wav
 Source4:    README.Fedora
 Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
 Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
-Patch1:     zoneminder-1.24.2-dbinstall.patch
-Patch2:     zoneminder-1.24.1-runlevel.patch
-Patch3:     zoneminder-1.24.2-noffmpeg.patch
+Patch1:     zoneminder-1.24.3-dbinstall.patch
+Patch2:     zoneminder-1.24.3-runlevel.patch
+Patch3:     zoneminder-1.24.3-noffmpeg.patch
 Patch4:     zoneminder-1.24.1-perldep.patch
-Patch10:    zoneminder-1.22.3-installfix.patch
-Patch11:    zoneminder-1.24.2-gcc44.patch
+Patch10:    zoneminder-1.24.3-installfix.patch
+Patch11:    zoneminder-1.24.3-gcc44.patch
+Patch12:    zoneminder-1.24.3-v4l2.patch
 
 BuildRequires:  automake gnutls-devel
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
@@ -32,7 +33,7 @@ BuildRequires:  perl(Archive::Tar) perl(Archive::Zip)
 BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
 BuildRequires:  perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
 BuildRequires:  perl(MIME::Entity) perl(MIME::Lite)
-BuildRequires:  perl(PHP::Serialization)
+BuildRequires:  perl(PHP::Serialization) perl(Sys::Mmap)
 
 Requires:   httpd php php-mysql cambozola
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -72,6 +73,7 @@ popd
 %patch4 -p0 -b .perldep
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
+%patch12 -p0 -b .v4l2
 cp %{SOURCE4} README.Fedora
 
 cat <<EOF >> db/zm_create.sql.in
@@ -207,6 +209,11 @@ fi
 
 
 %changelog
+* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-1
+- Update to latest upstream version.
+- Rebase patches.
+- Initial incomplete attempt to disable v4l1 support.
+
 * Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
 - Unbundle cambozola; instead link to the separately pacakged copy.
 - Remove BuildRoot:, %%clean and buildroot cleaning in %%install.

From 547511fbee2a2f57d78baaaf5d1b3b12d4d9eb65 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 8 Feb 2011 03:13:55 -0600
Subject: [PATCH 30/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index a9d9e14..6105db2 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.24.3
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -209,6 +209,9 @@ fi
 
 
 %changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-1
 - Update to latest upstream version.
 - Rebase patches.

From 6b446b40a5726739b47af17cb54f2a044491e758 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Thu, 10 Feb 2011 12:17:03 -0600
Subject: [PATCH 31/82] Update sources.

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 38fe763..35c4418 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ cambozola-0.68.tar.gz
 jscalendar-1.0.zip
 mootools-1.2.3-core-yc.js
 ZoneMinder-1.24.2.tar.gz
+/ZoneMinder-1.24.3.tar.gz
diff --git a/sources b/sources
index aad7e42..86e965e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
 2107736d116f31767cadb15902c6c7fd  mootools-1.2.3-core-yc.js
-550d2f8f08852134028c3b1cf8fa437f  ZoneMinder-1.24.2.tar.gz
+d66068db4496329883d21d843bcbd567  ZoneMinder-1.24.3.tar.gz

From 3b324907c27ccfcb8be8b4c3b0cced83923c2932 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Wed, 23 Mar 2011 19:59:42 +0100
Subject: [PATCH 32/82] rebuilt for mysql 5.5.10 (soname bump in
 libmysqlclient)

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 6105db2..3e39bed 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.24.3
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -209,6 +209,9 @@ fi
 
 
 %changelog
+* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.24.3-3
+- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 8185da404196745ea41c2ab83afee889ca9a9726 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Fri, 25 Mar 2011 00:19:27 -0500
Subject: [PATCH 33/82] Update to 1.24.3 snapshot.

---
 .gitignore                        |  1 +
 sources                           |  2 +-
 zoneminder-1.24.3-dbinstall.patch | 22 +++++++++++++---------
 zoneminder-1.24.3-gcc44.patch     | 12 ------------
 zoneminder-1.24.3-noffmpeg.patch  | 13 +++++++------
 zoneminder-1.24.3-runlevel.patch  | 16 ++++++++--------
 zoneminder-svn-checkout.sh        | 10 ++++++++++
 zoneminder.spec                   | 21 +++++++++++++++------
 8 files changed, 55 insertions(+), 42 deletions(-)
 create mode 100755 zoneminder-svn-checkout.sh

diff --git a/.gitignore b/.gitignore
index 35c4418..a8b8dbb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ jscalendar-1.0.zip
 mootools-1.2.3-core-yc.js
 ZoneMinder-1.24.2.tar.gz
 /ZoneMinder-1.24.3.tar.gz
+/zoneminder-20110324svn.tar.xz
diff --git a/sources b/sources
index 86e965e..8c2ce91 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
 2107736d116f31767cadb15902c6c7fd  mootools-1.2.3-core-yc.js
-d66068db4496329883d21d843bcbd567  ZoneMinder-1.24.3.tar.gz
+d0161a6d909e38ea3f858c7c606ecf84  zoneminder-20110324svn.tar.xz
diff --git a/zoneminder-1.24.3-dbinstall.patch b/zoneminder-1.24.3-dbinstall.patch
index 1981005..75180a0 100644
--- a/zoneminder-1.24.3-dbinstall.patch
+++ b/zoneminder-1.24.3-dbinstall.patch
@@ -1,7 +1,11 @@
 diff -up ./configure.ac.dbinstall ./configure.ac
---- ./configure.ac.dbinstall	2011-01-20 12:29:50.000000000 -0600
-+++ ./configure.ac	2011-01-24 12:36:27.744207538 -0600
-@@ -4,8 +4,6 @@ AM_INIT_AUTOMAKE
+--- ./configure.ac.dbinstall	2011-02-15 15:59:06.000000000 -0600
++++ ./configure.ac	2011-03-24 22:50:36.615225107 -0500
+@@ -1,11 +1,9 @@
+ AC_PREREQ(2.59)
+-AC_INIT(zm,1.24.3,support@zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
++AC_INIT(zm,1.24.3,support@zoneminder.com,zoneminder,http://www.zoneminder.com/downloads.html)
+ AM_INIT_AUTOMAKE
  AC_CONFIG_SRCDIR(src/zm.h)
  AM_CONFIG_HEADER(config.h)
  
@@ -10,7 +14,7 @@ diff -up ./configure.ac.dbinstall ./configure.ac
  TIME_BUILD=`date +'%s'`
  AC_SUBST(TIME_BUILD)
  
-@@ -347,6 +345,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+@@ -354,6 +352,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
  
  AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
  AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
@@ -20,8 +24,8 @@ diff -up ./configure.ac.dbinstall ./configure.ac
  AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
  AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
 diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
---- ./db/Makefile.am.dbinstall	2009-09-28 09:19:56.000000000 -0500
-+++ ./db/Makefile.am	2011-01-24 11:40:24.311956165 -0600
+--- ./db/Makefile.am.dbinstall	2009-10-14 04:42:46.000000000 -0500
++++ ./db/Makefile.am	2011-03-24 22:50:14.173912137 -0500
 @@ -1,7 +1,16 @@
  AUTOMAKE_OPTIONS = gnu
  
@@ -41,7 +45,7 @@ diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
  	zm_update-0.9.8.sql \
 diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
 --- ./scripts/zmupdate.pl.in.dbinstall	2011-01-17 12:21:37.000000000 -0600
-+++ ./scripts/zmupdate.pl.in	2011-01-24 11:40:24.311956165 -0600
++++ ./scripts/zmupdate.pl.in	2011-03-24 22:50:14.174912107 -0500
 @@ -403,7 +403,7 @@ if ( $version )
                  $command .= " -p".$db_pass;
              }
@@ -52,8 +56,8 @@ diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
          print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
          my $output = qx($command);
 diff -up ./zm.conf.in.dbinstall ./zm.conf.in
---- ./zm.conf.in.dbinstall	2008-07-25 04:48:17.000000000 -0500
-+++ ./zm.conf.in	2011-01-24 11:40:24.313004813 -0600
+--- ./zm.conf.in.dbinstall	2008-07-25 04:48:16.000000000 -0500
++++ ./zm.conf.in	2011-03-24 22:50:14.175912077 -0500
 @@ -12,8 +12,8 @@
  # Current version of ZoneMinder
  ZM_VERSION=@VERSION@
diff --git a/zoneminder-1.24.3-gcc44.patch b/zoneminder-1.24.3-gcc44.patch
index c1d39bd..a021c47 100644
--- a/zoneminder-1.24.3-gcc44.patch
+++ b/zoneminder-1.24.3-gcc44.patch
@@ -1,15 +1,3 @@
-diff -up ./src/Makefile.am.gcc44 ./src/Makefile.am
---- ./src/Makefile.am.gcc44	2011-01-06 12:09:40.000000000 -0600
-+++ ./src/Makefile.am	2011-01-23 23:23:07.697087069 -0600
-@@ -1,7 +1,7 @@
- AUTOMAKE_OPTIONS = gnu
- 
- AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
--AM_CXXFLAGS = -frepo
-+#AM_CXXFLAGS = -frepo
- 
- CLEANFILES = *.rpo
- 
 diff -up ./src/zm_utils.cpp.gcc44 ./src/zm_utils.cpp
 --- ./src/zm_utils.cpp.gcc44	2009-11-24 05:41:16.000000000 -0600
 +++ ./src/zm_utils.cpp	2011-01-23 23:24:34.117082494 -0600
diff --git a/zoneminder-1.24.3-noffmpeg.patch b/zoneminder-1.24.3-noffmpeg.patch
index 0a4419a..7b89060 100644
--- a/zoneminder-1.24.3-noffmpeg.patch
+++ b/zoneminder-1.24.3-noffmpeg.patch
@@ -1,18 +1,19 @@
 diff -up ./configure.ac.noffmpeg ./configure.ac
---- ./configure.ac.noffmpeg	2011-01-23 16:44:11.000000000 -0600
-+++ ./configure.ac	2011-01-23 16:51:13.288146918 -0600
-@@ -269,12 +269,12 @@ AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_
+--- ./configure.ac.noffmpeg	2011-03-24 21:41:02.000000000 -0500
++++ ./configure.ac	2011-03-24 21:42:40.497276440 -0500
+@@ -269,13 +269,13 @@ AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_
  fi
  AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
  AC_CHECK_LIB(x264,x264_predict_16x16_init)
 -AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
--AC_CHECK_LIB(avcore,av_image_copy,,AC_MSG_WARN(libavcore.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
 -AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
 -AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
 -AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
 -AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
-+dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
-+dnl AC_CHECK_LIB(avcore,av_image_copy,,AC_MSG_WARN(libavcore.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(avcore,av_image_copy,,)
 +dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
 +dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
 +dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
diff --git a/zoneminder-1.24.3-runlevel.patch b/zoneminder-1.24.3-runlevel.patch
index f2dd107..de7b49b 100644
--- a/zoneminder-1.24.3-runlevel.patch
+++ b/zoneminder-1.24.3-runlevel.patch
@@ -1,11 +1,11 @@
 diff -up ./scripts/zm.in.runlevel ./scripts/zm.in
 --- ./scripts/zm.in.runlevel	2010-11-28 15:22:05.000000000 -0600
-+++ ./scripts/zm.in	2011-01-23 16:43:51.927147491 -0600
++++ ./scripts/zm.in	2011-03-24 21:39:01.973010160 -0500
 @@ -1,6 +1,6 @@
- #!/bin/sh
- # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
--# chkconfig: 2345 99 00
-+# chkconfig: - 99 00
- # processname: zmpkg.pl
- 
- # Source function library.
+ #!/bin/sh
+ # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
+-# chkconfig: 2345 99 00
++# chkconfig: - 99 00
+ # processname: zmpkg.pl
+ 
+ # Source function library.
diff --git a/zoneminder-svn-checkout.sh b/zoneminder-svn-checkout.sh
new file mode 100755
index 0000000..e30ff4a
--- /dev/null
+++ b/zoneminder-svn-checkout.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+DATE=$(date +%Y%m%d)
+
+set -x
+
+rm -rf zm
+svn export http://svn.zoneminder.com/svn/zm/trunk zm
+tar cJf zoneminder-${DATE}svn.tar.xz zm
+
+rm -rf zm
diff --git a/zoneminder.spec b/zoneminder.spec
index 3e39bed..c42db7c 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -1,3 +1,6 @@
+%define svndate 20110324
+%define svnrev 3310
+
 %define zmuid $(id -un)
 %define zmgid $(id -gn)
 %define zmuid_final apache
@@ -5,7 +8,7 @@
 
 Name:       zoneminder
 Version:    1.24.3
-Release:    3%{?dist}
+Release:    4.%{svndate}svn%{svnrev}%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -13,7 +16,8 @@ Group:      System Environment/Daemons
 License:    GPLv2+ and LGPLv2+ and MIT 
 URL:        http://www.zoneminder.com/
 
-Source:     http://www.zoneminder.com/fileadmin/downloads/ZoneMinder-%{version}.tar.gz
+#Source:     http://www.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
+Source0:    zoneminder-%{svndate}svn.tar.xz
 Source2:    zoneminder.conf
 Source3:    redalert.wav
 Source4:    README.Fedora
@@ -25,7 +29,6 @@ Patch3:     zoneminder-1.24.3-noffmpeg.patch
 Patch4:     zoneminder-1.24.1-perldep.patch
 Patch10:    zoneminder-1.24.3-installfix.patch
 Patch11:    zoneminder-1.24.3-gcc44.patch
-Patch12:    zoneminder-1.24.3-v4l2.patch
 
 BuildRequires:  automake gnutls-devel
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
@@ -57,10 +60,10 @@ too much degradation of performance.
 
 
 %prep
-%setup -q -n ZoneMinder-%{version}
+%setup -q -n zm
 
 # Unpack jscalendar and move some files around
-%setup -q -D -T -a 5 -n ZoneMinder-%{version}
+%setup -q -D -T -a 5 -n zm
 mkdir jscalendar-doc
 pushd jscalendar-1.0
 mv *html *php doc/* README ../jscalendar-doc
@@ -73,7 +76,6 @@ popd
 %patch4 -p0 -b .perldep
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
-%patch12 -p0 -b .v4l2
 cp %{SOURCE4} README.Fedora
 
 cat <<EOF >> db/zm_create.sql.in
@@ -105,6 +107,7 @@ OPTS=""
     --with-cgidir=%{_libexecdir}/%{name}/cgi-bin \
     --with-webuser=%{zmuid} \
     --with-webgroup=%{zmgid} \
+    --enable-mmap=yes \
     --disable-debug \
     $OPTS
 make %{?_smp_mflags}
@@ -183,6 +186,7 @@ fi
 %{_bindir}/zmfilter.pl
 %attr(4755,root,root) %{_bindir}/zmfix
 %{_bindir}/zmpkg.pl
+%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
@@ -209,6 +213,11 @@ fi
 
 
 %changelog
+* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-4.20110324svn3310
+- Update to latest 1.24.3 subversion.  Turns out that what upstream was calling
+  1.24.3 is really just an occasionally updated devel snapshot.
+- Rebase various patches.
+
 * Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.24.3-3
 - rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
 

From 9e3e74d2486b99f87a62ca7a685d80bbcd5cc3ee Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Mon, 9 May 2011 12:38:14 -0500
Subject: [PATCH 34/82] Bump for gnutls update.

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index c42db7c..5f41a11 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -8,7 +8,7 @@
 
 Name:       zoneminder
 Version:    1.24.3
-Release:    4.%{svndate}svn%{svnrev}%{?dist}
+Release:    5.%{svndate}svn%{svnrev}%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -213,6 +213,9 @@ fi
 
 
 %changelog
+* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
+- Bump for gnutls update.
+
 * Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-4.20110324svn3310
 - Update to latest 1.24.3 subversion.  Turns out that what upstream was calling
   1.24.3 is really just an occasionally updated devel snapshot.

From 558b70197b7769d8d2337c3ce4e730850a6fba2b Mon Sep 17 00:00:00 2001
From: Petr Sabata <contyk@redhat.com>
Date: Wed, 20 Jul 2011 01:55:59 +0200
Subject: [PATCH 35/82] Perl mass rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 5f41a11..cf13d6c 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -8,7 +8,7 @@
 
 Name:       zoneminder
 Version:    1.24.3
-Release:    5.%{svndate}svn%{svnrev}%{?dist}
+Release:    6.%{svndate}svn%{svnrev}%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -213,6 +213,9 @@ fi
 
 
 %changelog
+* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
+- Perl mass rebuild
+
 * Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
 - Bump for gnutls update.
 

From c3fbfeb2f2515f3bc196fb43e45972720aa85160 Mon Sep 17 00:00:00 2001
From: Petr Sabata <contyk@redhat.com>
Date: Thu, 21 Jul 2011 15:20:09 +0200
Subject: [PATCH 36/82] Perl mass rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index cf13d6c..5ca26ae 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -8,7 +8,7 @@
 
 Name:       zoneminder
 Version:    1.24.3
-Release:    6.%{svndate}svn%{svnrev}%{?dist}
+Release:    7.%{svndate}svn%{svnrev}%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -213,6 +213,9 @@ fi
 
 
 %changelog
+* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-7.20110324svn3310
+- Perl mass rebuild
+
 * Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
 - Perl mass rebuild
 

From 0ebeb3586ca5bfe8c999cd049c3cc89bb36d7cc7 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sun, 14 Aug 2011 09:18:45 -0500
Subject: [PATCH 37/82] Update to 1.24.4.

Initial attempt to upgrade to 1.24.4.
Add patch from BZ 460310 to build against libgcrypt instead of requiring the
gnutls openssl libs.
---
 zoneminder-1.24.3-installfix.patch            | 18 -----
 ...patch => zoneminder-1.24.4-dbinstall.patch | 29 +++------
 zoneminder-1.24.4-gcrypt.patch                | 65 +++++++++++++++++++
 zoneminder-1.24.4-installfix.patch            | 22 +++++++
 zoneminder.spec                               | 26 +++++---
 5 files changed, 112 insertions(+), 48 deletions(-)
 delete mode 100644 zoneminder-1.24.3-installfix.patch
 rename zoneminder-1.24.3-dbinstall.patch => zoneminder-1.24.4-dbinstall.patch (58%)
 create mode 100644 zoneminder-1.24.4-gcrypt.patch
 create mode 100644 zoneminder-1.24.4-installfix.patch

diff --git a/zoneminder-1.24.3-installfix.patch b/zoneminder-1.24.3-installfix.patch
deleted file mode 100644
index 32e0dac..0000000
--- a/zoneminder-1.24.3-installfix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -up ./Makefile.am.installfix ./Makefile.am
---- ./Makefile.am.installfix	2011-01-06 13:07:00.000000000 -0600
-+++ ./Makefile.am	2011-01-23 17:38:32.408147528 -0600
-@@ -20,10 +20,10 @@ EXTRA_DIST = \
- # Yes, you are correct. This is a HACK!
- install-data-hook:
- 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
--	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR) )
--	( if ! test -e $(ZM_TMPDIR); then mkdir -p $(ZM_TMPDIR); fi; chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR) )
--	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR) )
-+	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR) )
-+	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -p $(DESTDIR)$(ZM_TMPDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR) )
-+	( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_LOGDIR); chmod u+w $(DESTDIR)$(ZM_LOGDIR) )
- 
- uninstall-hook:
- 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
--	@-( rm -rf $(ZM_RUNDIR) $(ZM_TMPDIR) $(ZM_LOGDIR) )
-+	@-( rm -rf $(DESTDIR)$(ZM_RUNDIR) $(DESTDIR)$(ZM_TMPDIR) $(DESTDIR)$(ZM_LOGDIR) )
diff --git a/zoneminder-1.24.3-dbinstall.patch b/zoneminder-1.24.4-dbinstall.patch
similarity index 58%
rename from zoneminder-1.24.3-dbinstall.patch
rename to zoneminder-1.24.4-dbinstall.patch
index 75180a0..c7a3a0f 100644
--- a/zoneminder-1.24.3-dbinstall.patch
+++ b/zoneminder-1.24.4-dbinstall.patch
@@ -1,10 +1,10 @@
 diff -up ./configure.ac.dbinstall ./configure.ac
---- ./configure.ac.dbinstall	2011-02-15 15:59:06.000000000 -0600
-+++ ./configure.ac	2011-03-24 22:50:36.615225107 -0500
+--- ./configure.ac.dbinstall	2011-06-24 11:22:44.000000000 -0500
++++ ./configure.ac	2011-08-13 20:11:32.798360728 -0500
 @@ -1,11 +1,9 @@
  AC_PREREQ(2.59)
--AC_INIT(zm,1.24.3,support@zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
-+AC_INIT(zm,1.24.3,support@zoneminder.com,zoneminder,http://www.zoneminder.com/downloads.html)
+-AC_INIT(zm,1.24.4,support@zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
++AC_INIT(zm,1.24.4,support@zoneminder.com,zoneminder,http://www.zoneminder.com/downloads.html)
  AM_INIT_AUTOMAKE
  AC_CONFIG_SRCDIR(src/zm.h)
  AM_CONFIG_HEADER(config.h)
@@ -14,7 +14,7 @@ diff -up ./configure.ac.dbinstall ./configure.ac
  TIME_BUILD=`date +'%s'`
  AC_SUBST(TIME_BUILD)
  
-@@ -354,6 +352,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+@@ -353,6 +351,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
  
  AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
  AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
@@ -24,8 +24,8 @@ diff -up ./configure.ac.dbinstall ./configure.ac
  AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
  AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
 diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
---- ./db/Makefile.am.dbinstall	2009-10-14 04:42:46.000000000 -0500
-+++ ./db/Makefile.am	2011-03-24 22:50:14.173912137 -0500
+--- ./db/Makefile.am.dbinstall	2011-06-19 15:51:12.000000000 -0500
++++ ./db/Makefile.am	2011-08-13 19:25:20.504156586 -0500
 @@ -1,7 +1,16 @@
  AUTOMAKE_OPTIONS = gnu
  
@@ -44,20 +44,9 @@ diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
  	zm_update-0.9.7.sql \
  	zm_update-0.9.8.sql \
 diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
---- ./scripts/zmupdate.pl.in.dbinstall	2011-01-17 12:21:37.000000000 -0600
-+++ ./scripts/zmupdate.pl.in	2011-03-24 22:50:14.174912107 -0500
-@@ -403,7 +403,7 @@ if ( $version )
-                 $command .= " -p".$db_pass;
-             }
-         }
--        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_BUILD."/db/zm_update-".$version.".sql";
-+        $command .= " ".ZM_DB_NAME." < ".ZM_PATH_DATA."/db/zm_update-".$version.".sql";
- 
-         print( "Executing '$command'\n" ) if ( DBG_LEVEL > 0 );
-         my $output = qx($command);
 diff -up ./zm.conf.in.dbinstall ./zm.conf.in
---- ./zm.conf.in.dbinstall	2008-07-25 04:48:16.000000000 -0500
-+++ ./zm.conf.in	2011-03-24 22:50:14.175912077 -0500
+--- ./zm.conf.in.dbinstall	2011-06-19 15:51:14.000000000 -0500
++++ ./zm.conf.in	2011-08-13 19:25:20.512156338 -0500
 @@ -12,8 +12,8 @@
  # Current version of ZoneMinder
  ZM_VERSION=@VERSION@
diff --git a/zoneminder-1.24.4-gcrypt.patch b/zoneminder-1.24.4-gcrypt.patch
new file mode 100644
index 0000000..0c30005
--- /dev/null
+++ b/zoneminder-1.24.4-gcrypt.patch
@@ -0,0 +1,65 @@
+diff -up ./configure.ac.gcrypt ./configure.ac
+--- ./configure.ac.gcrypt	2011-08-13 21:52:38.004585396 -0500
++++ ./configure.ac	2011-08-13 21:56:49.861786449 -0500
+@@ -11,7 +11,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
+ AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
+ AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
+ AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
+-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
++AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
+ AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
+ AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
+ AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
+@@ -30,7 +30,7 @@ if test "$ZM_DB_PASS" == ""; then
+ 	AC_SUBST(ZM_DB_PASS,[zmpass])
+ fi
+ if test "$ZM_SSL_LIB" == ""; then
+-	AC_SUBST(ZM_SSL_LIB,gnutls)
++	AC_SUBST(ZM_SSL_LIB,libgcrypt)
+ fi
+ if test "$ZM_MYSQL_ENGINE" == ""; then
+ 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
+@@ -261,11 +261,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
+ AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+ AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
+ if test "$ZM_SSL_LIB" == "openssl"; then
+-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
++AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
+ else
+-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
++AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
+ AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
+@@ -316,9 +315,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
+ if test "$ZM_SSL_LIB" == "openssl"; then
+ AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
+ #include <openssl/md5.h>])
+-else
+-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+-#include <gnutls/openssl.h>])
+ fi
+ AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
+ 
+diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
+diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
+--- ./src/zm_user.h.gcrypt	2011-06-19 15:51:13.000000000 -0500
++++ ./src/zm_user.h	2011-08-13 21:52:38.014585086 -0500
+@@ -23,14 +23,11 @@
+ #ifndef ZM_USER_H
+ #define ZM_USER_H
+ 
+-#if HAVE_LIBGNUTLS_OPENSSL
+-#include <gnutls/openssl.h>
+ #if HAVE_GCRYPT_H
+ #include <gcrypt.h>
+-#endif // HAVE_GCRYPT_H
+ #elif HAVE_LIBCRYPTO
+ #include <openssl/md5.h>
+-#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO
++#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
+ 
+ class User
+ {
diff --git a/zoneminder-1.24.4-installfix.patch b/zoneminder-1.24.4-installfix.patch
new file mode 100644
index 0000000..8831d59
--- /dev/null
+++ b/zoneminder-1.24.4-installfix.patch
@@ -0,0 +1,22 @@
+diff -up ./Makefile.am.installfix ./Makefile.am
+--- ./Makefile.am.installfix	2011-06-19 15:51:14.000000000 -0500
++++ ./Makefile.am	2011-08-13 20:33:30.288587436 -0500
+@@ -21,12 +21,12 @@ EXTRA_DIST = \
+ # Yes, you are correct. This is a HACK!
+ install-data-hook:
+ 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
+-	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )
+-	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )
+-	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )
++	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
++	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )
++	( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_LOGDIR); chmod u+w $(DESTDIR)$(ZM_LOGDIR); fi )
+ 
+ uninstall-hook:
+ 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
+-	@-( if test "$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(ZM_RUNDIR); fi )
+-	@-( if test "$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(ZM_TMPDIR); fi )
+-	@-( if test "$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(ZM_LOGDIR); fi )
++	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
++	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
++	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )
diff --git a/zoneminder.spec b/zoneminder.spec
index 5ca26ae..90a4bc4 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -1,5 +1,5 @@
-%define svndate 20110324
-%define svnrev 3310
+#define svndate 20110324
+#define svnrev 3310
 
 %define zmuid $(id -un)
 %define zmgid $(id -gn)
@@ -7,8 +7,8 @@
 %define zmgid_final apache
 
 Name:       zoneminder
-Version:    1.24.3
-Release:    7.%{svndate}svn%{svnrev}%{?dist}
+Version:    1.24.4
+Release:    1
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -16,19 +16,19 @@ Group:      System Environment/Daemons
 License:    GPLv2+ and LGPLv2+ and MIT 
 URL:        http://www.zoneminder.com/
 
-#Source:     http://www.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
-Source0:    zoneminder-%{svndate}svn.tar.xz
+Source:     http://www.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
 Source2:    zoneminder.conf
 Source3:    redalert.wav
 Source4:    README.Fedora
 Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
 Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
-Patch1:     zoneminder-1.24.3-dbinstall.patch
+Patch1:     zoneminder-1.24.4-dbinstall.patch
 Patch2:     zoneminder-1.24.3-runlevel.patch
 Patch3:     zoneminder-1.24.3-noffmpeg.patch
 Patch4:     zoneminder-1.24.1-perldep.patch
-Patch10:    zoneminder-1.24.3-installfix.patch
+Patch10:    zoneminder-1.24.4-installfix.patch
 Patch11:    zoneminder-1.24.3-gcc44.patch
+Patch12:    zoneminder-1.24.4-gcrypt.patch
 
 BuildRequires:  automake gnutls-devel
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
@@ -60,10 +60,10 @@ too much degradation of performance.
 
 
 %prep
-%setup -q -n zm
+%setup -q -n ZoneMinder-%{version}
 
 # Unpack jscalendar and move some files around
-%setup -q -D -T -a 5 -n zm
+%setup -q -D -T -a 5 -n ZoneMinder-%{version}
 mkdir jscalendar-doc
 pushd jscalendar-1.0
 mv *html *php doc/* README ../jscalendar-doc
@@ -76,6 +76,7 @@ popd
 %patch4 -p0 -b .perldep
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
+%patch12 -p0 -b .gcrypt
 cp %{SOURCE4} README.Fedora
 
 cat <<EOF >> db/zm_create.sql.in
@@ -213,6 +214,11 @@ fi
 
 
 %changelog
+* Sun Aug 14 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-1
+- Initial attempt to upgrade to 1.24.4.
+- Add patch from BZ 460310 to build against libgcrypt instead of requiring the
+  gnutls openssl libs.
+
 * Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-7.20110324svn3310
 - Perl mass rebuild
 

From 29ddbffb10a44fe5a7bb39a65d9ea4dd5b3ce240 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sun, 14 Aug 2011 11:58:04 -0500
Subject: [PATCH 38/82] Forgot to update sources.  Ugh.

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 8c2ce91..2c10d3e 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
 2107736d116f31767cadb15902c6c7fd  mootools-1.2.3-core-yc.js
-d0161a6d909e38ea3f858c7c606ecf84  zoneminder-20110324svn.tar.xz
+946452cd3c89072eaef4b37f8ab07f7c  ZoneMinder-1.24.4.tar.gz

From a869364df4ee8e00946646afc5e408deac6f4d90 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sun, 14 Aug 2011 12:10:53 -0500
Subject: [PATCH 39/82] And the .gitignore file.  Ugh.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index a8b8dbb..8de7cb6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ mootools-1.2.3-core-yc.js
 ZoneMinder-1.24.2.tar.gz
 /ZoneMinder-1.24.3.tar.gz
 /zoneminder-20110324svn.tar.xz
+/ZoneMinder-1.24.4.tar.gz

From 898c96a052f89a02ea7ca0d16ed64acef213c3b5 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Thu, 15 Sep 2011 17:00:10 -0500
Subject: [PATCH 40/82] Get things back in order

- Add patch for bug 711780 - fix syntax issue in Mapped.pm.
- Undo that patch, and undo another which was the cause of the whole
  mess.
- Fix up other patches so ZM_PATH_BUILD is both defined and useful.
- Make sure database creation mods actually take.
- Update Fedora-specific docs with some additional info.
- Use bundled mootools (javascript, so no guideline violation).
- Update download location.
- Update the gcrypt patch to actually work.
- Upstream changed the tarball without changing the version to patch a
  vulnerability, so redownload.
---
 README.Fedora                     | 58 ++++++++++++++++++++++++++-----
 zoneminder-1.24.1-perldep.patch   | 12 -------
 zoneminder-1.24.4-dbinstall.patch | 26 +++++++-------
 zoneminder-1.24.4-gcrypt.patch    | 34 +++++++++++++-----
 zoneminder.spec                   | 58 +++++++++++++++++++------------
 5 files changed, 123 insertions(+), 65 deletions(-)
 delete mode 100644 zoneminder-1.24.1-perldep.patch

diff --git a/README.Fedora b/README.Fedora
index 8a6ab42..1c58446 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -2,31 +2,71 @@ New installs
 ============
 
 1. Unless you are already using the MySQL server or you are running it
-   remotely you will need to ensure that the server is installed:
+   remotely you will need to ensure that the server is installed and secured:
 
      yum install mysql-server
+     chkconfig mysql on
      service mysql start
+     mysql_secure_installation
 
 2. You will need to create the ZoneMinder database. These commands should do
-   the trick:
+   the trick, assuming your database server is local:
 
-     mysql < /usr/share/zoneminder/db/zm_create.sql
+     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
      mysqladmin reload
 
-3. The ZoneMinder web interface is disabled by default, you will need to edit
-   this file to enable it:
+3. The database needs a user.  One is not created by default because this would
+   introduce an obvious security issue.  The following should set this up:
 
-     /etc/httpd/conf.d/zoneminder.conf
+     mysql -u root -p
+     grant select,insert,update,delete on zm.* to 'zmuser'@localhost identified by 'zmpass';
 
-4. This package probably does not work with SELinux enabled at the moment. It
+   Obviously, change at least zmpass to an actual, secure password or
+   passphrase.  You can change zmuser as well if you like.
+
+4. Edit /etc/zm.conf and, at the bottom, change ZM_DB_PASS and perhaps
+   ZM_DB_USER to match.
+
+5. This package probably does not work with SELinux enabled at the moment. It
    may be necessary to disable SELinux for httpd, or even completely for
-   ZoneMinder to function. This will be addressed in a later release.
+   ZoneMinder to function. This will be addressed in a later release.  Run
+
+     setenforce 0
+
+   for testing, and edit /etc/sysconfig/selinux to disable it at boot time.
+
+6. Enable and start the zoneminder service:
+
+     chkconfig zoneminder on
+     service zoneminder start
+
+7. The ZoneMinder web interface is disabled by default (which makes it rather
+   useless but also secure by default), you will need to edit
+   /etc/httpd/conf.d/zoneminder.conf to enable it.  Afterwards, you can start
+   the web server:
+
+     chkconfig httpd on
+     service httpd start
+
+8. You should immediately visit http://localhost/zm and secure the system if
+   you wish for it to be network facing.  To do this:
+
+   a) click Options, then System.
+   b) check OPT_USE_AUTH.
+   c) set AUTH_HASH_SECRET to a random string.
+   d) click Save and refresh the main browser window.
+   e) You should be prompted to log in; the default username/password is admin/admin.
+   f) Open Options again, choose the newly visible Users tab.
+   g) click the admin user and set a password.
 
 
 Upgrades
 ========
 
-1. You will need to upgrade the ZoneMinder database as described in the
+1. Check for any new settings in /etc/zm.conf.  Specifically, zmupdate.pl may
+   fail if ZM_PATH_BUILD is not set.
+
+2. You will need to upgrade the ZoneMinder database as described in the
    manual. This command should be sufficient:
 
      zmupdate.pl --version=<from version>
diff --git a/zoneminder-1.24.1-perldep.patch b/zoneminder-1.24.1-perldep.patch
deleted file mode 100644
index aa327b9..0000000
--- a/zoneminder-1.24.1-perldep.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm.perldep	2009-04-11 19:00:53.000000000 +0100
-+++ scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm	2009-04-11 19:00:29.000000000 +0100
-@@ -66,7 +66,8 @@
- use ZoneMinder::Config qw(:all);
- use ZoneMinder::Debug qw(:all);
- 
--use Sys::Mmap;
-+# Remove this, we don't use it but RPM is finding it as a dependency
-+# use Sys::Mmap;
- 
- sub zmMemKey( $ )
- {
diff --git a/zoneminder-1.24.4-dbinstall.patch b/zoneminder-1.24.4-dbinstall.patch
index c7a3a0f..a591b08 100644
--- a/zoneminder-1.24.4-dbinstall.patch
+++ b/zoneminder-1.24.4-dbinstall.patch
@@ -1,7 +1,7 @@
 diff -up ./configure.ac.dbinstall ./configure.ac
 --- ./configure.ac.dbinstall	2011-06-24 11:22:44.000000000 -0500
-+++ ./configure.ac	2011-08-13 20:11:32.798360728 -0500
-@@ -1,11 +1,9 @@
++++ ./configure.ac	2011-09-08 17:30:00.009282471 -0500
+@@ -1,10 +1,10 @@
  AC_PREREQ(2.59)
 -AC_INIT(zm,1.24.4,support@zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
 +AC_INIT(zm,1.24.4,support@zoneminder.com,zoneminder,http://www.zoneminder.com/downloads.html)
@@ -10,11 +10,11 @@ diff -up ./configure.ac.dbinstall ./configure.ac
  AM_CONFIG_HEADER(config.h)
  
 -PATH_BUILD=`pwd`
--AC_SUBST(PATH_BUILD)
++PATH_BUILD=/usr/share/zoneminder
+ AC_SUBST(PATH_BUILD)
  TIME_BUILD=`date +'%s'`
  AC_SUBST(TIME_BUILD)
- 
-@@ -353,6 +351,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+@@ -353,6 +353,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
  
  AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
  AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
@@ -25,7 +25,7 @@ diff -up ./configure.ac.dbinstall ./configure.ac
  AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
 diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
 --- ./db/Makefile.am.dbinstall	2011-06-19 15:51:12.000000000 -0500
-+++ ./db/Makefile.am	2011-08-13 19:25:20.504156586 -0500
++++ ./db/Makefile.am	2011-09-08 17:29:19.171528213 -0500
 @@ -1,7 +1,16 @@
  AUTOMAKE_OPTIONS = gnu
  
@@ -43,18 +43,16 @@ diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
  	zm_update-0.0.1.sql \
  	zm_update-0.9.7.sql \
  	zm_update-0.9.8.sql \
-diff -up ./scripts/zmupdate.pl.in.dbinstall ./scripts/zmupdate.pl.in
 diff -up ./zm.conf.in.dbinstall ./zm.conf.in
 --- ./zm.conf.in.dbinstall	2011-06-19 15:51:14.000000000 -0500
-+++ ./zm.conf.in	2011-08-13 19:25:20.512156338 -0500
-@@ -12,8 +12,8 @@
- # Current version of ZoneMinder
- ZM_VERSION=@VERSION@
++++ ./zm.conf.in	2011-09-08 17:30:22.154604007 -0500
+@@ -15,6 +15,9 @@ ZM_VERSION=@VERSION@
+ # Path to build directory, used mostly for finding DB upgrade scripts
+ ZM_PATH_BUILD=@PATH_BUILD@
  
--# Path to build directory, used mostly for finding DB upgrade scripts
--ZM_PATH_BUILD=@PATH_BUILD@
 +# Path to installed data directory, used mostly for finding DB upgrade scripts
 +ZM_PATH_DATA=@PKGDATADIR@
- 
++
  # Build time, used to record when to trigger various checks
  ZM_TIME_BUILD=@TIME_BUILD@
+ 
diff --git a/zoneminder-1.24.4-gcrypt.patch b/zoneminder-1.24.4-gcrypt.patch
index 0c30005..a70fd1d 100644
--- a/zoneminder-1.24.4-gcrypt.patch
+++ b/zoneminder-1.24.4-gcrypt.patch
@@ -1,6 +1,5 @@
-diff -up ./configure.ac.gcrypt ./configure.ac
---- ./configure.ac.gcrypt	2011-08-13 21:52:38.004585396 -0500
-+++ ./configure.ac	2011-08-13 21:56:49.861786449 -0500
+--- configure.ac	2011-08-02 16:25:43.000000000 +0200
++++ configure.ac.gcrypt	2011-08-02 16:37:56.000000000 +0200
 @@ -11,7 +11,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
  AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
  AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
@@ -43,11 +42,30 @@ diff -up ./configure.ac.gcrypt ./configure.ac
  fi
  AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
  
-diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
-diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
---- ./src/zm_user.h.gcrypt	2011-06-19 15:51:13.000000000 -0500
-+++ ./src/zm_user.h	2011-08-13 21:52:38.014585086 -0500
-@@ -23,14 +23,11 @@
+--- src/zm_user.cpp	2010-11-11 13:22:35.000000000 +0100
++++ src/zm_user.cpp.gcrypt	2011-08-02 16:31:39.000000000 +0200
+@@ -144,6 +144,18 @@ User *zmLoadUser( const char *username, 
+ 	return( user );
+ }
+ 
++#ifdef HAVE_GCRYPT_H
++#define HAVE_DECL_MD5 1
++#define MD5_DIGEST_LENGTH 16
++static unsigned char *MD5(const unsigned char *data, unsigned long len,
++                         unsigned char *md)
++{
++    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
++
++    return md;
++}
++#endif
++
+ // Function to validate an authentication string
+ User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
+ {
+--- src/zm_user.h	2010-11-11 13:11:06.000000000 +0100
++++ src/zm_user.h.gcrypt	2011-08-02 16:33:21.000000000 +0200
+@@ -23,14 +23,11 @@ 
  #ifndef ZM_USER_H
  #define ZM_USER_H
  
diff --git a/zoneminder.spec b/zoneminder.spec
index 90a4bc4..b8f5ad2 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -8,7 +8,7 @@
 
 Name:       zoneminder
 Version:    1.24.4
-Release:    1
+Release:    2
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -16,16 +16,19 @@ Group:      System Environment/Daemons
 License:    GPLv2+ and LGPLv2+ and MIT 
 URL:        http://www.zoneminder.com/
 
-Source:     http://www.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
+Source:     http://www2.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
 Source2:    zoneminder.conf
 Source3:    redalert.wav
 Source4:    README.Fedora
 Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
-Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
+# Need to unravel the proper mootools files to grab from upstream, since the
+# number of them keeps multiplying.  In the meantime, rely on the ones bundled
+# with zoneminder.  As these are javascript, there is no guideline violation
+# here.
+#Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
 Patch1:     zoneminder-1.24.4-dbinstall.patch
 Patch2:     zoneminder-1.24.3-runlevel.patch
 Patch3:     zoneminder-1.24.3-noffmpeg.patch
-Patch4:     zoneminder-1.24.1-perldep.patch
 Patch10:    zoneminder-1.24.4-installfix.patch
 Patch11:    zoneminder-1.24.3-gcc44.patch
 Patch12:    zoneminder-1.24.4-gcrypt.patch
@@ -73,25 +76,11 @@ popd
 %patch1 -p0 -b .dbinstall
 %patch2 -p0 -b .runlevel
 %patch3 -p0 -b .noffmpeg
-%patch4 -p0 -b .perldep
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc44
 %patch12 -p0 -b .gcrypt
 cp %{SOURCE4} README.Fedora
 
-cat <<EOF >> db/zm_create.sql.in
-# Fedora change:
-# Alter some default paths to match the default URL and selinux expectations
-update Config set Value = '/cgi-bin/zm/nph-zms' where Name = 'ZM_PATH_ZMS';
-update Config set Value = '/var/log/zoneminder' where Name = 'ZM_PATH_LOGS';
-update Config set Value = '/var/log/zoneminder/zm_debug_log+' where Name = 'ZM_EXTRA_DEBUG_LOG';
-update Config set Value = '/var/lib/zoneminder/sock' where Name = 'ZM_PATH_SOCKS';
-update Config set Value = '/var/lib/zoneminder/swap' where Name = 'ZM_PATH_SWAP';
-update Config set Value = '/var/spool/zoneminder-upload' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
-use mysql;
-grant select,insert,update,delete on zm.* to 'zmuser'@localhost identified by 'zmpass';
-EOF
-
 
 %build
 autoreconf
@@ -111,6 +100,19 @@ OPTS=""
     --enable-mmap=yes \
     --disable-debug \
     $OPTS
+
+# Have to do this now because the configure script wipes out modifications made to this file
+cat <<EOF >> db/zm_create.sql
+# Fedora change:
+# Alter some default paths to match the default URL and selinux expectations
+update Config set Value = '/cgi-bin/zm/nph-zms' where Name = 'ZM_PATH_ZMS';
+update Config set Value = '/var/log/zoneminder' where Name = 'ZM_PATH_LOGS';
+update Config set Value = '/var/log/zoneminder/zm_debug_log+' where Name = 'ZM_EXTRA_DEBUG_LOG';
+update Config set Value = '/var/lib/zoneminder/sock' where Name = 'ZM_PATH_SOCKS';
+update Config set Value = '/var/lib/zoneminder/swap' where Name = 'ZM_PATH_SWAP';
+update Config set Value = '/var/spool/zoneminder-upload' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
+EOF
+
 make %{?_smp_mflags}
 %{__perl} -pi -e 's/(ZM_WEB_USER=).*$/${1}%{zmuid_final}/;' \
           -e 's/(ZM_WEB_GROUP=).*$/${1}%{zmgid_final}/;' zm.conf
@@ -148,10 +150,10 @@ ln -s ../../java/cambozola.jar
 popd
 
 # Install mootools
-pushd %{buildroot}/%{_datadir}/%{name}/www
-install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
-ln -s mootools-1.2.3-core-yc.js mootools.js
-popd
+#pushd %{buildroot}/%{_datadir}/%{name}/www
+#install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
+#ln -s mootools-1.2.3-core-yc.js mootools.js
+#popd
 
 
 %post
@@ -214,6 +216,18 @@ fi
 
 
 %changelog
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-2
+- Add patch for bug 711780 - fix syntax issue in Mapped.pm.
+- Undo that patch, and undo another which was the cause of the whole mess.
+- Fix up other patches so ZM_PATH_BUILD is both defined and useful.
+- Make sure database creation mods actually take.
+- Update Fedora-specific docs with some additional info.
+- Use bundled mootools (javascript, so no guideline violation).
+- Update download location.
+- Update the gcrypt patch to actually work.
+- Upstream changed the tarball without changing the version to patch a
+  vulnerability, so redownload.
+
 * Sun Aug 14 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-1
 - Initial attempt to upgrade to 1.24.4.
 - Add patch from BZ 460310 to build against libgcrypt instead of requiring the

From 131373ec6308dd62c5a9177c1a4ce16f93f04c98 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Thu, 15 Sep 2011 17:47:26 -0500
Subject: [PATCH 41/82] Updated sources.

---
 sources | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sources b/sources
index 2c10d3e..be980e6 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
 10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
-2107736d116f31767cadb15902c6c7fd  mootools-1.2.3-core-yc.js
-946452cd3c89072eaef4b37f8ab07f7c  ZoneMinder-1.24.4.tar.gz
+733629e1eda99be53f37c7554d169c84  ZoneMinder-1.24.4.tar.gz

From c0b340de9e2adc62b6a26c8b85e09ea3146d643a Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Thu, 15 Sep 2011 18:17:01 -0500
Subject: [PATCH 42/82] Re-add the dist tag.

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index b8f5ad2..5b5e568 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -8,7 +8,7 @@
 
 Name:       zoneminder
 Version:    1.24.4
-Release:    2
+Release:    3%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -216,6 +216,9 @@ fi
 
 
 %changelog
+* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
+- Re-add the dist-tag that somehow got lost.
+
 * Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-2
 - Add patch for bug 711780 - fix syntax issue in Mapped.pm.
 - Undo that patch, and undo another which was the cause of the whole mess.

From cea30f41028d85c9fefe949ddb20de0b0869b3ca Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 14 Jan 2012 03:39:29 -0600
Subject: [PATCH 43/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 5b5e568..5624fe0 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -8,7 +8,7 @@
 
 Name:       zoneminder
 Version:    1.24.4
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -216,6 +216,9 @@ fi
 
 
 %changelog
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
 - Re-add the dist-tag that somehow got lost.
 

From 587c797f645374e18d10538dbed8af4e82800828 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Thu, 19 Jan 2012 14:15:12 -0600
Subject: [PATCH 44/82] Update to 1.25.0 and fix gcc 4.7 build issues.

---
 .gitignore                        |  1 +
 sources                           |  2 +-
 zoneminder-1.24.3-gcc44.patch     | 14 ------
 zoneminder-1.24.3-noffmpeg.patch  | 23 ---------
 zoneminder-1.24.3-v4l2.patch      | 12 -----
 zoneminder-1.24.4-dbinstall.patch | 58 ---------------------
 zoneminder-1.24.4-gcrypt.patch    | 83 -------------------------------
 zoneminder.spec                   | 26 ++++++----
 8 files changed, 18 insertions(+), 201 deletions(-)
 delete mode 100644 zoneminder-1.24.3-gcc44.patch
 delete mode 100644 zoneminder-1.24.3-noffmpeg.patch
 delete mode 100644 zoneminder-1.24.3-v4l2.patch
 delete mode 100644 zoneminder-1.24.4-dbinstall.patch
 delete mode 100644 zoneminder-1.24.4-gcrypt.patch

diff --git a/.gitignore b/.gitignore
index 8de7cb6..1ebc556 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ ZoneMinder-1.24.2.tar.gz
 /ZoneMinder-1.24.3.tar.gz
 /zoneminder-20110324svn.tar.xz
 /ZoneMinder-1.24.4.tar.gz
+/ZoneMinder-1.25.0.tar.gz
diff --git a/sources b/sources
index be980e6..c61a1cd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
-733629e1eda99be53f37c7554d169c84  ZoneMinder-1.24.4.tar.gz
+eaefa14befd482154970541252aa1a39  ZoneMinder-1.25.0.tar.gz
diff --git a/zoneminder-1.24.3-gcc44.patch b/zoneminder-1.24.3-gcc44.patch
deleted file mode 100644
index a021c47..0000000
--- a/zoneminder-1.24.3-gcc44.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ./src/zm_utils.cpp.gcc44 ./src/zm_utils.cpp
---- ./src/zm_utils.cpp.gcc44	2009-11-24 05:41:16.000000000 -0600
-+++ ./src/zm_utils.cpp	2011-01-23 23:24:34.117082494 -0600
-@@ -20,8 +20,8 @@
- //#include "zm_debug.h"
- #include "zm_utils.h"
- 
--#include <stdio.h>
--#include <stdarg.h>
-+#include <cstdio>
-+#include <cstdarg>
- 
- const std::string stringtf( const char *format, ... )
- {
diff --git a/zoneminder-1.24.3-noffmpeg.patch b/zoneminder-1.24.3-noffmpeg.patch
deleted file mode 100644
index 7b89060..0000000
--- a/zoneminder-1.24.3-noffmpeg.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up ./configure.ac.noffmpeg ./configure.ac
---- ./configure.ac.noffmpeg	2011-03-24 21:41:02.000000000 -0500
-+++ ./configure.ac	2011-03-24 21:42:40.497276440 -0500
-@@ -269,13 +269,13 @@ AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_
- fi
- AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
- AC_CHECK_LIB(x264,x264_predict_16x16_init)
--AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
-+dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
- # Don't bother to warn about this one
--AC_CHECK_LIB(avcore,av_image_copy,,)
--AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
--AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
--AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
--AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
-+dnl AC_CHECK_LIB(avcore,av_image_copy,,)
-+dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-+dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
-+dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
-+dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
- AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
- AC_CHECK_LIB(z,compress,,)
- 
diff --git a/zoneminder-1.24.3-v4l2.patch b/zoneminder-1.24.3-v4l2.patch
deleted file mode 100644
index 543ace5..0000000
--- a/zoneminder-1.24.3-v4l2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./configure.ac.v4l2 ./configure.ac
---- ./configure.ac.v4l2	2011-01-24 12:49:16.092209967 -0600
-+++ ./configure.ac	2011-01-24 12:58:58.823207570 -0600
-@@ -282,7 +282,7 @@ AC_CHECK_LIB(z,compress,,)
- AC_FUNC_ALLOCA
- AC_HEADER_STDC
- AC_CHECK_HEADERS([fcntl.h limits.h memory.h netdb.h netinet/in.h stddef.h stdlib.h string.h strings.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h values.h])
--AC_CHECK_HEADERS(linux/videodev.h,,AC_MSG_ERROR(zm requires Video4Linux to be installed),)
-+AC_CHECK_HEADERS(linux/videodev.h,,AC_MSG_WARN(zm requires Video4Linux to be installed for V4L1 support),)
- AC_CHECK_HEADERS(linux/videodev2.h,AC_SUBST(ZM_V4L2,"1"),AC_MSG_WARN(zm requires Video4Linux2 to be installed for V4L2 support),)
- AC_CHECK_HEADERS(jpeglib.h,,AC_MSG_ERROR(zm requires libjpeg headers to be installed),)
- AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)
diff --git a/zoneminder-1.24.4-dbinstall.patch b/zoneminder-1.24.4-dbinstall.patch
deleted file mode 100644
index a591b08..0000000
--- a/zoneminder-1.24.4-dbinstall.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -up ./configure.ac.dbinstall ./configure.ac
---- ./configure.ac.dbinstall	2011-06-24 11:22:44.000000000 -0500
-+++ ./configure.ac	2011-09-08 17:30:00.009282471 -0500
-@@ -1,10 +1,10 @@
- AC_PREREQ(2.59)
--AC_INIT(zm,1.24.4,support@zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
-+AC_INIT(zm,1.24.4,support@zoneminder.com,zoneminder,http://www.zoneminder.com/downloads.html)
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR(src/zm.h)
- AM_CONFIG_HEADER(config.h)
- 
--PATH_BUILD=`pwd`
-+PATH_BUILD=/usr/share/zoneminder
- AC_SUBST(PATH_BUILD)
- TIME_BUILD=`date +'%s'`
- AC_SUBST(TIME_BUILD)
-@@ -353,6 +353,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
- 
- AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
- AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
-+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
-+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
- AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
- AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
- AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
-diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
---- ./db/Makefile.am.dbinstall	2011-06-19 15:51:12.000000000 -0500
-+++ ./db/Makefile.am	2011-09-08 17:29:19.171528213 -0500
-@@ -1,7 +1,16 @@
- AUTOMAKE_OPTIONS = gnu
- 
-+zmdbdatadir = $(pkgdatadir)/db
-+
- EXTRA_DIST = \
- 	zm_create.sql.in \
-+	$(dbupgrade_scripts)
-+
-+dist_zmdbdata_DATA = \
-+	zm_create.sql \
-+	$(dbupgrade_scripts)
-+
-+dbupgrade_scripts = \
- 	zm_update-0.0.1.sql \
- 	zm_update-0.9.7.sql \
- 	zm_update-0.9.8.sql \
-diff -up ./zm.conf.in.dbinstall ./zm.conf.in
---- ./zm.conf.in.dbinstall	2011-06-19 15:51:14.000000000 -0500
-+++ ./zm.conf.in	2011-09-08 17:30:22.154604007 -0500
-@@ -15,6 +15,9 @@ ZM_VERSION=@VERSION@
- # Path to build directory, used mostly for finding DB upgrade scripts
- ZM_PATH_BUILD=@PATH_BUILD@
- 
-+# Path to installed data directory, used mostly for finding DB upgrade scripts
-+ZM_PATH_DATA=@PKGDATADIR@
-+
- # Build time, used to record when to trigger various checks
- ZM_TIME_BUILD=@TIME_BUILD@
- 
diff --git a/zoneminder-1.24.4-gcrypt.patch b/zoneminder-1.24.4-gcrypt.patch
deleted file mode 100644
index a70fd1d..0000000
--- a/zoneminder-1.24.4-gcrypt.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- configure.ac	2011-08-02 16:25:43.000000000 +0200
-+++ configure.ac.gcrypt	2011-08-02 16:37:56.000000000 +0200
-@@ -11,7 +11,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
- AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
- AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
- AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
--AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
-+AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
- AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
- AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
- AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
-@@ -30,7 +30,7 @@ if test "$ZM_DB_PASS" == ""; then
- 	AC_SUBST(ZM_DB_PASS,[zmpass])
- fi
- if test "$ZM_SSL_LIB" == ""; then
--	AC_SUBST(ZM_SSL_LIB,gnutls)
-+	AC_SUBST(ZM_SSL_LIB,libgcrypt)
- fi
- if test "$ZM_MYSQL_ENGINE" == ""; then
- 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
-@@ -261,11 +261,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
- AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
- AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
- if test "$ZM_SSL_LIB" == "openssl"; then
--AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
-+AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
- else
--AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
-+AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
- AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
--AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
- fi
- AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
- AC_CHECK_LIB(x264,x264_predict_16x16_init)
-@@ -316,9 +315,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
- if test "$ZM_SSL_LIB" == "openssl"; then
- AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
- #include <openssl/md5.h>])
--else
--AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
--#include <gnutls/openssl.h>])
- fi
- AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
- 
---- src/zm_user.cpp	2010-11-11 13:22:35.000000000 +0100
-+++ src/zm_user.cpp.gcrypt	2011-08-02 16:31:39.000000000 +0200
-@@ -144,6 +144,18 @@ User *zmLoadUser( const char *username, 
- 	return( user );
- }
- 
-+#ifdef HAVE_GCRYPT_H
-+#define HAVE_DECL_MD5 1
-+#define MD5_DIGEST_LENGTH 16
-+static unsigned char *MD5(const unsigned char *data, unsigned long len,
-+                         unsigned char *md)
-+{
-+    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
-+
-+    return md;
-+}
-+#endif
-+
- // Function to validate an authentication string
- User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
- {
---- src/zm_user.h	2010-11-11 13:11:06.000000000 +0100
-+++ src/zm_user.h.gcrypt	2011-08-02 16:33:21.000000000 +0200
-@@ -23,14 +23,11 @@ 
- #ifndef ZM_USER_H
- #define ZM_USER_H
- 
--#if HAVE_LIBGNUTLS_OPENSSL
--#include <gnutls/openssl.h>
- #if HAVE_GCRYPT_H
- #include <gcrypt.h>
--#endif // HAVE_GCRYPT_H
- #elif HAVE_LIBCRYPTO
- #include <openssl/md5.h>
--#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO
-+#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
- 
- class User
- {
diff --git a/zoneminder.spec b/zoneminder.spec
index 5624fe0..22b03af 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -1,14 +1,11 @@
-#define svndate 20110324
-#define svnrev 3310
-
 %define zmuid $(id -un)
 %define zmgid $(id -gn)
 %define zmuid_final apache
 %define zmgid_final apache
 
 Name:       zoneminder
-Version:    1.24.4
-Release:    4%{?dist}
+Version:    1.25.0
+Release:    1%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -26,12 +23,12 @@ Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
 # with zoneminder.  As these are javascript, there is no guideline violation
 # here.
 #Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
-Patch1:     zoneminder-1.24.4-dbinstall.patch
+Patch1:     zoneminder-1.25.0-dbinstall.patch
 Patch2:     zoneminder-1.24.3-runlevel.patch
-Patch3:     zoneminder-1.24.3-noffmpeg.patch
+Patch3:     zoneminder-1.25.0-noffmpeg.patch
 Patch10:    zoneminder-1.24.4-installfix.patch
-Patch11:    zoneminder-1.24.3-gcc44.patch
-Patch12:    zoneminder-1.24.4-gcrypt.patch
+Patch11:    zoneminder-1.25.0-gcc47.patch
+Patch12:    zoneminder-1.25.0-gcrypt.patch
 
 BuildRequires:  automake gnutls-devel
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
@@ -77,7 +74,7 @@ popd
 %patch2 -p0 -b .runlevel
 %patch3 -p0 -b .noffmpeg
 %patch10 -p0 -b .installfix
-%patch11 -p0 -b .gcc44
+%patch11 -p0 -b .gcc47
 %patch12 -p0 -b .gcrypt
 cp %{SOURCE4} README.Fedora
 
@@ -90,6 +87,8 @@ OPTS=""
     OPTS="$OPTS --disable-crashtrace"
 %endif
 
+export ZM_RUNDIR=/var/run/zoneminder
+export ZM_TMPDIR=/var/lib/zoneminder/temp
 %configure \
     --with-libarch=%{_lib} \
     --with-mysql=%{_prefix} \
@@ -216,6 +215,13 @@ fi
 
 
 %changelog
+* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0
+- Update to 1.25.0
+- Fix gcc4.7 build problems.
+- Drop gcc4.4 build fixes; for whatever reason they now break the build.
+- Clean up old patches.
+- Force setting of ZM_TMPDIR and ZM_RUNDIR.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

From a6f1399eaefa4ccd5f1ed0f6bc55aea7f712e923 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Thu, 19 Jan 2012 14:19:27 -0600
Subject: [PATCH 45/82] Forgot to add the new patches; doh.

---
 zoneminder-1.25.0-dbinstall.patch | 58 +++++++++++++++++++++
 zoneminder-1.25.0-gcc47.patch     | 33 ++++++++++++
 zoneminder-1.25.0-gcrypt.patch    | 86 +++++++++++++++++++++++++++++++
 zoneminder-1.25.0-noffmpeg.patch  | 23 +++++++++
 4 files changed, 200 insertions(+)
 create mode 100644 zoneminder-1.25.0-dbinstall.patch
 create mode 100644 zoneminder-1.25.0-gcc47.patch
 create mode 100644 zoneminder-1.25.0-gcrypt.patch
 create mode 100644 zoneminder-1.25.0-noffmpeg.patch

diff --git a/zoneminder-1.25.0-dbinstall.patch b/zoneminder-1.25.0-dbinstall.patch
new file mode 100644
index 0000000..8aba378
--- /dev/null
+++ b/zoneminder-1.25.0-dbinstall.patch
@@ -0,0 +1,58 @@
+diff -up ./configure.ac.dbinstall ./configure.ac
+--- ./configure.ac.dbinstall	2011-08-23 10:10:32.000000000 -0500
++++ ./configure.ac	2012-01-19 12:52:29.201006160 -0600
+@@ -1,10 +1,10 @@
+ AC_PREREQ(2.59)
+-AC_INIT(zm,1.25.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
++AC_INIT(zm,1.25.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
+ AM_INIT_AUTOMAKE
+ AC_CONFIG_SRCDIR(src/zm.h)
+ AM_CONFIG_HEADER(config.h)
+ 
+-PATH_BUILD=`pwd`
++PATH_BUILD=/usr/share/zoneminder
+ AC_SUBST(PATH_BUILD)
+ TIME_BUILD=`date +'%s'`
+ AC_SUBST(TIME_BUILD)
+@@ -358,6 +358,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
+ 
+ AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
+ AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
++AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
++AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
+ AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
+ AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
+ AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
+diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
+--- ./db/Makefile.am.dbinstall	2011-06-21 02:40:11.000000000 -0500
++++ ./db/Makefile.am	2012-01-19 12:15:03.871582792 -0600
+@@ -1,7 +1,16 @@
+ AUTOMAKE_OPTIONS = gnu
+ 
++zmdbdatadir = $(pkgdatadir)/db
++
+ EXTRA_DIST = \
+ 	zm_create.sql.in \
++	$(dbupgrade_scripts)
++
++dist_zmdbdata_DATA = \
++	zm_create.sql \
++	$(dbupgrade_scripts)
++
++dbupgrade_scripts = \
+ 	zm_update-0.0.1.sql \
+ 	zm_update-0.9.7.sql \
+ 	zm_update-0.9.8.sql \
+diff -up ./zm.conf.in.dbinstall ./zm.conf.in
+--- ./zm.conf.in.dbinstall	2008-07-25 04:48:17.000000000 -0500
++++ ./zm.conf.in	2012-01-19 12:15:03.872582761 -0600
+@@ -15,6 +15,9 @@ ZM_VERSION=@VERSION@
+ # Path to build directory, used mostly for finding DB upgrade scripts
+ ZM_PATH_BUILD=@PATH_BUILD@
+ 
++# Path to installed data directory, used mostly for finding DB upgrade scripts
++ZM_PATH_DATA=@PKGDATADIR@
++
+ # Build time, used to record when to trigger various checks
+ ZM_TIME_BUILD=@TIME_BUILD@
+ 
diff --git a/zoneminder-1.25.0-gcc47.patch b/zoneminder-1.25.0-gcc47.patch
new file mode 100644
index 0000000..a083c6d
--- /dev/null
+++ b/zoneminder-1.25.0-gcc47.patch
@@ -0,0 +1,33 @@
+diff -up ./src/zm_local_camera.cpp.gcc47 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.gcc47	2011-06-21 04:19:10.000000000 -0500
++++ ./src/zm_local_camera.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+diff -up ./src/zm_logger.cpp.gcc47 ./src/zm_logger.cpp
+--- ./src/zm_logger.cpp.gcc47	2011-06-28 06:07:35.000000000 -0500
++++ ./src/zm_logger.cpp	2012-01-19 13:43:49.142440717 -0600
+@@ -33,6 +33,7 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+diff -up ./src/zm_thread.h.gcc47 ./src/zm_thread.h
+--- ./src/zm_thread.h.gcc47	2012-01-19 13:44:43.082766722 -0600
++++ ./src/zm_thread.h	2012-01-19 13:44:56.966335869 -0600
+@@ -21,6 +21,7 @@
+ #define ZM_THREAD_H
+ 
+ #include <pthread.h>
++#include <unistd.h>
+ #include "zm_exception.h"
+ #include "zm_utils.h"
+ 
diff --git a/zoneminder-1.25.0-gcrypt.patch b/zoneminder-1.25.0-gcrypt.patch
new file mode 100644
index 0000000..21f197e
--- /dev/null
+++ b/zoneminder-1.25.0-gcrypt.patch
@@ -0,0 +1,86 @@
+diff -up ./configure.ac.gcrypt ./configure.ac
+--- ./configure.ac.gcrypt	2012-01-19 12:58:20.647123209 -0600
++++ ./configure.ac	2012-01-19 13:12:34.186669577 -0600
+@@ -13,7 +13,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
+ AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
+ AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
+ AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
+-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
++AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
+ AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
+ AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
+ AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
+@@ -32,7 +32,7 @@ if test "$ZM_DB_PASS" == ""; then
+ 	AC_SUBST(ZM_DB_PASS,[zmpass])
+ fi
+ if test "$ZM_SSL_LIB" == ""; then
+-	AC_SUBST(ZM_SSL_LIB,gnutls)
++	AC_SUBST(ZM_SSL_LIB,libgcrypt)
+ fi
+ if test "$ZM_MYSQL_ENGINE" == ""; then
+ 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
+@@ -264,11 +264,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
+ AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+ AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
+ if test "$ZM_SSL_LIB" == "openssl"; then
+-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
++AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
+ else
+-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
++AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
+ AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+@@ -320,9 +319,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
+ if test "$ZM_SSL_LIB" == "openssl"; then
+ AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
+ #include <openssl/md5.h>])
+-else
+-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+-#include <gnutls/openssl.h>])
+ fi
+ AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
+ 
+diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
+--- ./src/zm_user.cpp.gcrypt	2011-08-03 06:31:06.000000000 -0500
++++ ./src/zm_user.cpp	2012-01-19 12:58:20.654122992 -0600
+@@ -140,6 +140,18 @@ User *zmLoadUser( const char *username, 
+ 	return( user );
+ }
+ 
++#ifdef HAVE_GCRYPT_H
++#define HAVE_DECL_MD5 1
++#define MD5_DIGEST_LENGTH 16
++static unsigned char *MD5(const unsigned char *data, unsigned long len,
++                         unsigned char *md)
++{
++    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
++
++    return md;
++}
++#endif
++
+ // Function to validate an authentication string
+ User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
+ {
+diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
+--- ./src/zm_user.h.gcrypt	2010-11-11 06:11:07.000000000 -0600
++++ ./src/zm_user.h	2012-01-19 13:14:11.200654694 -0600
+@@ -23,14 +23,11 @@
+ #ifndef ZM_USER_H
+ #define ZM_USER_H
+ 
+-#if HAVE_LIBGNUTLS_OPENSSL
+-#include <gnutls/openssl.h>
+ #if HAVE_GCRYPT_H
+ #include <gcrypt.h>
+-#endif // HAVE_GCRYPT_H
+ #elif HAVE_LIBCRYPTO
+ #include <openssl/md5.h>
+-#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO
++#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
+ 
+ class User
+ {
diff --git a/zoneminder-1.25.0-noffmpeg.patch b/zoneminder-1.25.0-noffmpeg.patch
new file mode 100644
index 0000000..032222d
--- /dev/null
+++ b/zoneminder-1.25.0-noffmpeg.patch
@@ -0,0 +1,23 @@
+diff -up ./configure.ac.noffmpeg ./configure.ac
+--- ./configure.ac.noffmpeg	2012-01-19 12:53:04.000000000 -0600
++++ ./configure.ac	2012-01-19 12:54:29.575278231 -0600
+@@ -273,13 +273,13 @@ fi
+ AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
+ AC_CHECK_LIB(z,zlibVersion)
+ AC_CHECK_LIB(x264,x264_predict_16x16_init)
+-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
+ # Don't bother to warn about this one
+-AC_CHECK_LIB(avcore,av_image_copy,,)
+-AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+-AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+-AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
+-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
++dnl AC_CHECK_LIB(avcore,av_image_copy,,)
++dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
++dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
+ AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
+ AC_CHECK_LIB(z,compress,,)
+ 

From a943b9333adb0b2fe3dffdf6aa0eddb6eba50945 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Thu, 9 Feb 2012 14:23:38 -0600
Subject: [PATCH 46/82] Rebuild for new pcre.

---
 zoneminder.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 22b03af..4cb226a 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -215,7 +215,10 @@ fi
 
 
 %changelog
-* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0
+* Thu Feb 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-2
+- Rebuild for new pcre.
+
+* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-1
 - Update to 1.25.0
 - Fix gcc4.7 build problems.
 - Drop gcc4.4 build fixes; for whatever reason they now break the build.

From 34995c5295be9bca254829ae3cf77ad3f53fb796 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Wed, 22 Feb 2012 19:20:46 -0600
Subject: [PATCH 47/82] Minor updates

- Update README.Fedora to reference systemctl and mention timezone info in
  php.ini.
- Add proper default for EYEZM_LOG_TO_FILE.
---
 README.Fedora   | 31 ++++++++++++++++++++-----------
 zoneminder.spec |  9 ++++++++-
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/README.Fedora b/README.Fedora
index 1c58446..438ef7f 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -27,7 +27,15 @@ New installs
 4. Edit /etc/zm.conf and, at the bottom, change ZM_DB_PASS and perhaps
    ZM_DB_USER to match.
 
-5. This package probably does not work with SELinux enabled at the moment. It
+5. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
+   timezone.  For whatever reason, PHP will complain loudly if this is not set,
+   or if it is set incorrectly, and these complaints will show up in the
+   zoneminder logging system as errors.
+
+   If you are not sure of the proper timezone specification to use, look in
+   /etc/sysconfig/clock.
+
+6. This package probably does not work with SELinux enabled at the moment. It
    may be necessary to disable SELinux for httpd, or even completely for
    ZoneMinder to function. This will be addressed in a later release.  Run
 
@@ -35,20 +43,20 @@ New installs
 
    for testing, and edit /etc/sysconfig/selinux to disable it at boot time.
 
-6. Enable and start the zoneminder service:
+7. Enable and start the zoneminder service:
 
-     chkconfig zoneminder on
-     service zoneminder start
+     systemctl enable zoneminder.service
+     systemctl start zoneminder.service
 
-7. The ZoneMinder web interface is disabled by default (which makes it rather
+8. The ZoneMinder web interface is disabled by default (which makes it rather
    useless but also secure by default), you will need to edit
    /etc/httpd/conf.d/zoneminder.conf to enable it.  Afterwards, you can start
    the web server:
 
-     chkconfig httpd on
-     service httpd start
+     systemctl enable httpd.service
+     systemctl start httpd.service
 
-8. You should immediately visit http://localhost/zm and secure the system if
+9. You should immediately visit http://localhost/zm and secure the system if
    you wish for it to be network facing.  To do this:
 
    a) click Options, then System.
@@ -63,10 +71,11 @@ New installs
 Upgrades
 ========
 
-1. Check for any new settings in /etc/zm.conf.  Specifically, zmupdate.pl may
-   fail if ZM_PATH_BUILD is not set.
+1. Update /etc/zm.conf.  Check for any new settings and update the version
+   information.  Comparing /etc/zm.conf and /etc/zm.conf.rpmnew should help to
+   do this.
 
 2. You will need to upgrade the ZoneMinder database as described in the
-   manual. This command should be sufficient:
+   manual. This command should be sufficient when run as root:
 
      zmupdate.pl --version=<from version>
diff --git a/zoneminder.spec b/zoneminder.spec
index 4cb226a..7fa76e4 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -107,6 +107,7 @@ cat <<EOF >> db/zm_create.sql
 update Config set Value = '/cgi-bin/zm/nph-zms' where Name = 'ZM_PATH_ZMS';
 update Config set Value = '/var/log/zoneminder' where Name = 'ZM_PATH_LOGS';
 update Config set Value = '/var/log/zoneminder/zm_debug_log+' where Name = 'ZM_EXTRA_DEBUG_LOG';
+update Config set Value = '/var/log/zoneminder/zm_xml.log';
 update Config set Value = '/var/lib/zoneminder/sock' where Name = 'ZM_PATH_SOCKS';
 update Config set Value = '/var/lib/zoneminder/swap' where Name = 'ZM_PATH_SWAP';
 update Config set Value = '/var/spool/zoneminder-upload' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
@@ -215,6 +216,12 @@ fi
 
 
 %changelog
+* Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
+- Update README.Fedora to reference systemctl and mention timezone info in
+  php.ini.
+- Add proper default for EYEZM_LOG_TO_FILE.
+
+
 * Thu Feb 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-2
 - Rebuild for new pcre.
 

From fb5277dfec7c168d03bcb5a8d79ce4e4e08372bd Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Fri, 24 Feb 2012 23:43:18 -0600
Subject: [PATCH 48/82] COnvert to systemd.

---
 README.Fedora      |  2 +-
 zoneminder.service | 11 +++++++++++
 zoneminder.spec    | 47 +++++++++++++++++++++++++++++++---------------
 3 files changed, 44 insertions(+), 16 deletions(-)
 create mode 100644 zoneminder.service

diff --git a/README.Fedora b/README.Fedora
index 438ef7f..f1a4b58 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -57,7 +57,7 @@ New installs
      systemctl start httpd.service
 
 9. You should immediately visit http://localhost/zm and secure the system if
-   you wish for it to be network facing.  To do this:
+   it is network facing.  To do this:
 
    a) click Options, then System.
    b) check OPT_USE_AUTH.
diff --git a/zoneminder.service b/zoneminder.service
new file mode 100644
index 0000000..a4bd277
--- /dev/null
+++ b/zoneminder.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Video security and surveillance system
+
+[Service]
+Type=forking
+ExecStart=/usr/bin/zmpkg.pl start
+PIDFile=/run/zoneminder/zm.pid
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/zoneminder.spec b/zoneminder.spec
index 7fa76e4..e551b6b 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -18,6 +18,7 @@ Source2:    zoneminder.conf
 Source3:    redalert.wav
 Source4:    README.Fedora
 Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
+Source6:    zoneminder.service
 # Need to unravel the proper mootools files to grab from upstream, since the
 # number of them keeps multiplying.  In the meantime, rely on the ones bundled
 # with zoneminder.  As these are javascript, there is no guideline violation
@@ -43,10 +44,9 @@ 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)
 
-Requires(post): /sbin/chkconfig
-Requires(preun): /sbin/chkconfig
-Requires(preun): /sbin/service
-Requires(postun): /sbin/service
+Requires(post): systemd-units systemd-sysv
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 
 %description
@@ -136,9 +136,9 @@ install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/sock
 install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/swap
 install -m 755 -d %{buildroot}/%{_localstatedir}/spool/zoneminder-upload
 
-install -D -m 755 scripts/zm %{buildroot}/%{_initrddir}/zoneminder
 install -D -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zoneminder.conf
 install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}/www/sounds/redalert.wav
+install -D -m 644 %{SOURCE6} %{buildroot}/%{_unitdir}/zoneminder.service
 
 # Install jscalendar - this really should be in its own package
 install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar
@@ -157,28 +157,41 @@ popd
 
 
 %post
-/sbin/chkconfig --add zoneminder
-
+if [ $1 -eq 1 ] ; then
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 %preun
-if [ $1 -eq 0 ]; then
-    /sbin/service zoneminder stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del zoneminder
+if [ $1 -eq 0 ] ; then
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
+    /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
 fi
 
-
 %postun
-if [ $1 -ge 1 ]; then
-    /sbin/service zoneminder condrestart > /dev/null 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
 fi
 
+%triggerun -- zoneminder < 2.6-25
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply zoneminder
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
+/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
+
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.Fedora jscalendar-doc
 %config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
-%attr(755,root,root) %{_initrddir}/zoneminder
 
 %{_bindir}/zma
 %{_bindir}/zmaudit.pl
@@ -214,8 +227,12 @@ fi
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
 
+%{_unitdir}/zoneminder.service
 
 %changelog
+* Fri Feb 24 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
+- Convert to systemd.
+
 * Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
 - Update README.Fedora to reference systemctl and mention timezone info in
   php.ini.

From 3334d2a550397092662416ebfb13417901450120 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 25 Feb 2012 00:19:38 -0600
Subject: [PATCH 49/82] Add tmpfiles.d config.

---
 zoneminder.spec | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/zoneminder.spec b/zoneminder.spec
index e551b6b..83c6590 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -155,6 +155,11 @@ popd
 #ln -s mootools-1.2.3-core-yc.js mootools.js
 #popd
 
+install -d -m 755 %{buildroot}/etc/tmpfiles.d
+cat > %{buildroot}/etc/tmpfiles.d/zoneminder <<EOF
+d   /run/zoneminder     0755    %{zmuid_final}  %{zmgid_final}
+EOF
+
 
 %post
 if [ $1 -eq 1 ] ; then
@@ -228,10 +233,13 @@ fi
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
 
 %{_unitdir}/zoneminder.service
+%config(noreplace) /etc/tmpfiles.d/zoneminder
 
 %changelog
 * Fri Feb 24 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
 - Convert to systemd.
+- Add tmpfiles.d configuration since the initscript isn't around to create
+  /run/zoneminder.
 
 * Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
 - Update README.Fedora to reference systemctl and mention timezone info in

From c3e85c3516f2826a69f277317c7f12d2ccfc2fd7 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 25 Feb 2012 00:23:49 -0600
Subject: [PATCH 50/82] Remove spurious executable perms.

---
 zoneminder.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zoneminder.spec b/zoneminder.spec
index 83c6590..9229621 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -77,6 +77,7 @@ popd
 %patch11 -p0 -b .gcc47
 %patch12 -p0 -b .gcrypt
 cp %{SOURCE4} README.Fedora
+chmod -x src/zm_event.cpp src/zm_user.h
 
 
 %build
@@ -240,6 +241,7 @@ fi
 - Convert to systemd.
 - Add tmpfiles.d configuration since the initscript isn't around to create
   /run/zoneminder.
+- Remove some pointless executable permissions.
 
 * Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
 - Update README.Fedora to reference systemctl and mention timezone info in

From 32f0cfc99e4f757498ec478ee6a65b04d09b5666 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 25 Feb 2012 12:18:14 -0600
Subject: [PATCH 51/82] Doh, fix version in systemd conversion trigger.

---
 zoneminder.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 9229621..e33f09f 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -182,7 +182,7 @@ if [ $1 -ge 1 ] ; then
     /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
 fi
 
-%triggerun -- zoneminder < 2.6-25
+%triggerun -- zoneminder < 1.25.0-4
 # Save the current service runlevel info
 # User must manually run systemd-sysv-convert --apply zoneminder
 # to migrate them to systemd targets

From 205e49448907de587fd6856e21757b477ac3e6a9 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 25 Feb 2012 15:19:53 -0600
Subject: [PATCH 52/82] Add logrotate file.

---
 zoneminder.logrotate |  8 ++++++++
 zoneminder.spec      | 13 +++++++++----
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 zoneminder.logrotate

diff --git a/zoneminder.logrotate b/zoneminder.logrotate
new file mode 100644
index 0000000..7bd1d18
--- /dev/null
+++ b/zoneminder.logrotate
@@ -0,0 +1,8 @@
+/var/log/zoneminder/*.log {
+    missingok
+    notifempty
+    sharedscripts
+    postrotate
+        /usr/bin/zmpkg.pl logrot 2> /dev/null > /dev/null || :
+    endscript
+}
diff --git a/zoneminder.spec b/zoneminder.spec
index e33f09f..ca36e61 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -19,11 +19,12 @@ Source3:    redalert.wav
 Source4:    README.Fedora
 Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
 Source6:    zoneminder.service
+Source7:    zoneminder.logrotate
 # Need to unravel the proper mootools files to grab from upstream, since the
 # number of them keeps multiplying.  In the meantime, rely on the ones bundled
 # with zoneminder.  As these are javascript, there is no guideline violation
 # here.
-#Source6:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
+#Source8:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
 Patch1:     zoneminder-1.25.0-dbinstall.patch
 Patch2:     zoneminder-1.24.3-runlevel.patch
 Patch3:     zoneminder-1.25.0-noffmpeg.patch
@@ -140,6 +141,7 @@ install -m 755 -d %{buildroot}/%{_localstatedir}/spool/zoneminder-upload
 install -D -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zoneminder.conf
 install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}/www/sounds/redalert.wav
 install -D -m 644 %{SOURCE6} %{buildroot}/%{_unitdir}/zoneminder.service
+install -D -m 644 %{SOURCE7} %{buildroot}/etc/logrotate.d/zoneminder
 
 # Install jscalendar - this really should be in its own package
 install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar
@@ -198,6 +200,10 @@ fi
 %doc AUTHORS COPYING README README.Fedora jscalendar-doc
 %config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
+%config(noreplace) /etc/tmpfiles.d/zoneminder
+%config(noreplace) /etc/logrotate.d/zoneminder
+
+%{_unitdir}/zoneminder.service
 
 %{_bindir}/zma
 %{_bindir}/zmaudit.pl
@@ -233,15 +239,14 @@ fi
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
 
-%{_unitdir}/zoneminder.service
-%config(noreplace) /etc/tmpfiles.d/zoneminder
 
 %changelog
-* Fri Feb 24 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
 - Convert to systemd.
 - Add tmpfiles.d configuration since the initscript isn't around to create
   /run/zoneminder.
 - Remove some pointless executable permissions.
+- Add logrotate file.
 
 * Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
 - Update README.Fedora to reference systemctl and mention timezone info in

From 708033ca21f41c2ecfe44379632dcf2079c39774 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 25 Feb 2012 17:40:38 -0600
Subject: [PATCH 53/82] More systemd fixes.

Add ExecReload to the service file.
BR: systemd-units for _unitdir.
---
 zoneminder.service | 1 +
 zoneminder.spec    | 8 +-------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/zoneminder.service b/zoneminder.service
index a4bd277..d59fc67 100644
--- a/zoneminder.service
+++ b/zoneminder.service
@@ -4,6 +4,7 @@ Description=Video security and surveillance system
 [Service]
 Type=forking
 ExecStart=/usr/bin/zmpkg.pl start
+ExecReload=/usr/bin/zmpkg.pl reload
 PIDFile=/run/zoneminder/zm.pid
 
 [Install]
diff --git a/zoneminder.spec b/zoneminder.spec
index ca36e61..8cd1523 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -32,7 +32,7 @@ Patch10:    zoneminder-1.24.4-installfix.patch
 Patch11:    zoneminder-1.25.0-gcc47.patch
 Patch12:    zoneminder-1.25.0-gcrypt.patch
 
-BuildRequires:  automake gnutls-devel
+BuildRequires:  automake gnutls-devel systemd-units
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
 BuildRequires:  perl(Archive::Tar) perl(Archive::Zip)
 BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
@@ -152,12 +152,6 @@ pushd %{buildroot}/%{_datadir}/%{name}/www
 ln -s ../../java/cambozola.jar
 popd
 
-# Install mootools
-#pushd %{buildroot}/%{_datadir}/%{name}/www
-#install -m 644 %{SOURCE6} mootools-1.2.3-core-yc.js
-#ln -s mootools-1.2.3-core-yc.js mootools.js
-#popd
-
 install -d -m 755 %{buildroot}/etc/tmpfiles.d
 cat > %{buildroot}/etc/tmpfiles.d/zoneminder <<EOF
 d   /run/zoneminder     0755    %{zmuid_final}  %{zmgid_final}

From c6cc53b71b813f0657050df01aeca91fef6c34c9 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 25 Feb 2012 17:49:01 -0600
Subject: [PATCH 54/82] Fix name of tmpfiles.d conffile.

---
 zoneminder.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 8cd1523..bd7df46 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -153,7 +153,7 @@ ln -s ../../java/cambozola.jar
 popd
 
 install -d -m 755 %{buildroot}/etc/tmpfiles.d
-cat > %{buildroot}/etc/tmpfiles.d/zoneminder <<EOF
+cat > %{buildroot}/etc/tmpfiles.d/zoneminder.conf <<EOF
 d   /run/zoneminder     0755    %{zmuid_final}  %{zmgid_final}
 EOF
 
@@ -194,7 +194,7 @@ fi
 %doc AUTHORS COPYING README README.Fedora jscalendar-doc
 %config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf
 %config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
-%config(noreplace) /etc/tmpfiles.d/zoneminder
+%config(noreplace) /etc/tmpfiles.d/zoneminder.conf
 %config(noreplace) /etc/logrotate.d/zoneminder
 
 %{_unitdir}/zoneminder.service

From 348b9587260a18280aebd627fd99cf1c921795a1 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 25 Feb 2012 18:35:20 -0600
Subject: [PATCH 55/82] Properly install /run/zoneminder with the package.

---
 redalert.wav    | Bin
 zoneminder.spec |   2 ++
 2 files changed, 2 insertions(+)
 mode change 100755 => 100644 redalert.wav

diff --git a/redalert.wav b/redalert.wav
old mode 100755
new mode 100644
diff --git a/zoneminder.spec b/zoneminder.spec
index bd7df46..7901692 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -156,6 +156,7 @@ install -d -m 755 %{buildroot}/etc/tmpfiles.d
 cat > %{buildroot}/etc/tmpfiles.d/zoneminder.conf <<EOF
 d   /run/zoneminder     0755    %{zmuid_final}  %{zmgid_final}
 EOF
+install -m 755 -d %{buildroot}/run/zoneminder
 
 
 %post
@@ -232,6 +233,7 @@ fi
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/temp
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
 
 
 %changelog

From 06e52f2a78f7d787da98ea78397cf354800cd0eb Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Sat, 25 Feb 2012 18:52:03 -0600
Subject: [PATCH 56/82] Clean up macro usage.

---
 zoneminder.spec | 57 ++++++++++++++++++++++++++-----------------------
 1 file changed, 30 insertions(+), 27 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 7901692..428b614 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -127,28 +127,28 @@ make install DESTDIR=%{buildroot} \
 rm -rf %{buildroot}/%{perl_vendorarch} %{buildroot}/%{perl_archlib}
 rm -f %{buildroot}/%{_bindir}/zmx10.pl
 
-install -m 755 -d %{buildroot}/%{_localstatedir}/log/zoneminder
+install -m 755 -d %{buildroot}/var/log/zoneminder
 for dir in events images temp
 do
-    install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/$dir
-    rmdir %{buildroot}/%{_datadir}/%{name}/www/$dir
-    ln -sf ../../../..%{_localstatedir}/lib/zoneminder/$dir %{buildroot}/%{_datadir}/%{name}/www/$dir
+    install -m 755 -d %{buildroot}/var/lib/zoneminder/$dir
+    rmdir %{buildroot}/%{_datadir}/zoneminder/www/$dir
+    ln -sf ../../../../var/lib/zoneminder/$dir %{buildroot}/%{_datadir}/zoneminder/www/$dir
 done
-install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/sock
-install -m 755 -d %{buildroot}/%{_localstatedir}/lib/zoneminder/swap
-install -m 755 -d %{buildroot}/%{_localstatedir}/spool/zoneminder-upload
+install -m 755 -d %{buildroot}/var/lib/zoneminder/sock
+install -m 755 -d %{buildroot}/var/lib/zoneminder/swap
+install -m 755 -d %{buildroot}/var/spool/zoneminder-upload
 
-install -D -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/zoneminder.conf
-install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/%{name}/www/sounds/redalert.wav
+install -D -m 644 %{SOURCE2} %{buildroot}/etc/httpd/conf.d/zoneminder.conf
+install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/zoneminder/www/sounds/redalert.wav
 install -D -m 644 %{SOURCE6} %{buildroot}/%{_unitdir}/zoneminder.service
 install -D -m 644 %{SOURCE7} %{buildroot}/etc/logrotate.d/zoneminder
 
 # Install jscalendar - this really should be in its own package
 install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar
-cp -rp jscalendar-1.0/* %{buildroot}/%{_datadir}/%{name}/www/jscalendar
+cp -rp jscalendar-1.0/* %{buildroot}/%{_datadir}/zoneminder/www/jscalendar
 
 # Set up cambozola
-pushd %{buildroot}/%{_datadir}/%{name}/www
+pushd %{buildroot}/%{_datadir}/zoneminder/www
 ln -s ../../java/cambozola.jar
 popd
 
@@ -193,8 +193,8 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README README.Fedora jscalendar-doc
-%config(noreplace) %attr(640,root,%{zmgid_final}) %{_sysconfdir}/zm.conf
-%config(noreplace) %attr(644,root,root) %{_sysconfdir}/httpd/conf.d/zoneminder.conf
+%config(noreplace) %attr(640,root,%{zmgid_final}) /etc/zm.conf
+%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
 %config(noreplace) /etc/logrotate.d/zoneminder
 
@@ -219,24 +219,27 @@ fi
 
 %{perl_vendorlib}/ZoneMinder*
 %{_mandir}/man*/*
-%dir %{_libexecdir}/%{name}
-%{_libexecdir}/%{name}/cgi-bin
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/db
-%{_datadir}/%{name}/www
+%dir %{_libexecdir}/zoneminder
+%{_libexecdir}/zoneminder/cgi-bin
+%dir %{_datadir}/zoneminder
+%{_datadir}/zoneminder/db
+%{_datadir}/zoneminder/www
 
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/events
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/images
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/sock
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/swap
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/lib/zoneminder/temp
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/log/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) %{_localstatedir}/spool/zoneminder-upload
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder
+%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload
 %dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
 
 
 %changelog
+* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
+- Clean up macro usage.
+
 * Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
 - Convert to systemd.
 - Add tmpfiles.d configuration since the initscript isn't around to create

From 21efc1a028552692269988a085b1167c55604cc8 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Wed, 21 Mar 2012 18:59:56 -0500
Subject: [PATCH 57/82] Fix stupid thinko in sql modifications.

---
 zoneminder.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 428b614..d763c0e 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -109,7 +109,7 @@ cat <<EOF >> db/zm_create.sql
 update Config set Value = '/cgi-bin/zm/nph-zms' where Name = 'ZM_PATH_ZMS';
 update Config set Value = '/var/log/zoneminder' where Name = 'ZM_PATH_LOGS';
 update Config set Value = '/var/log/zoneminder/zm_debug_log+' where Name = 'ZM_EXTRA_DEBUG_LOG';
-update Config set Value = '/var/log/zoneminder/zm_xml.log';
+update Config set Value = '/var/log/zoneminder/zm_xml.log' where Name = 'ZM_EYEZM_LOG_FILE';
 update Config set Value = '/var/lib/zoneminder/sock' where Name = 'ZM_PATH_SOCKS';
 update Config set Value = '/var/lib/zoneminder/swap' where Name = 'ZM_PATH_SWAP';
 update Config set Value = '/var/spool/zoneminder-upload' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
@@ -237,6 +237,9 @@ fi
 
 
 %changelog
+* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
+- Fix stupid thinko in sql modifications.
+
 * Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
 - Clean up macro usage.
 

From 895553fb0a4496865fa785c2c951820f7a71e0d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Sat, 23 Jun 2012 06:01:56 +0200
Subject: [PATCH 58/82] Perl 5.16 rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index d763c0e..c832e9c 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    6%{?dist}
+Release:    7%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -237,6 +237,9 @@ fi
 
 
 %changelog
+* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
+- Perl 5.16 rebuild
+
 * Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
 - Fix stupid thinko in sql modifications.
 

From f89d2a7bf17e97d3f0377402af4d2e79a9947280 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 22 Jul 2012 03:32:26 -0500
Subject: [PATCH 59/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index c832e9c..1e545af 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    7%{?dist}
+Release:    8%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -237,6 +237,9 @@ fi
 
 
 %changelog
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
 - Perl 5.16 rebuild
 

From b4e5abd74063b1e99567d78ae30ef29121f01d9b Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Thu, 9 Aug 2012 20:34:21 -0500
Subject: [PATCH 60/82] Work around v4l2 api breakage in 3.5 kernel.

---
 zoneminder-1.25.0-kernel35.patch | 21 +++++++++++++++++++++
 zoneminder.spec                  |  7 ++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 zoneminder-1.25.0-kernel35.patch

diff --git a/zoneminder-1.25.0-kernel35.patch b/zoneminder-1.25.0-kernel35.patch
new file mode 100644
index 0000000..51bc128
--- /dev/null
+++ b/zoneminder-1.25.0-kernel35.patch
@@ -0,0 +1,21 @@
+diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp
+--- ./src/zm_local_camera.cpp.kernel35	2012-07-16 15:01:22.182614878 -0500
++++ ./src/zm_local_camera.cpp	2012-07-16 15:02:16.491941730 -0500
+@@ -740,7 +740,7 @@ void LocalCamera::Terminate()
+     {
+         Debug( 3, "Terminating video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
+             Error( "Failed to stop capture stream: %s", strerror(errno) );
+ 
+@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture()
+ 
+         Debug( 3, "Starting video stream" );
+         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+-        enum v4l2_buf_type type = v4l2_data.fmt.type;
++        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+         if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
+             Fatal( "Failed to start capture stream: %s", strerror(errno) );
+     }
diff --git a/zoneminder.spec b/zoneminder.spec
index 1e545af..b275d55 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    8%{?dist}
+Release:    9%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -31,6 +31,7 @@ Patch3:     zoneminder-1.25.0-noffmpeg.patch
 Patch10:    zoneminder-1.24.4-installfix.patch
 Patch11:    zoneminder-1.25.0-gcc47.patch
 Patch12:    zoneminder-1.25.0-gcrypt.patch
+Patch13:    zoneminder-1.25.0-kernel35.patch
 
 BuildRequires:  automake gnutls-devel systemd-units
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
@@ -77,6 +78,7 @@ popd
 %patch10 -p0 -b .installfix
 %patch11 -p0 -b .gcc47
 %patch12 -p0 -b .gcrypt
+%patch13 -p0 -b .kernel35
 cp %{SOURCE4} README.Fedora
 chmod -x src/zm_event.cpp src/zm_user.h
 
@@ -237,6 +239,9 @@ fi
 
 
 %changelog
+* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
+- Add patch to work around v4l2 api breakage in 3.5 kernel.
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From e5baff393d912dcd2ac6aa35bfdf1371d75e78c4 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Fri, 21 Dec 2012 20:45:01 +0100
Subject: [PATCH 61/82] rebuild against new libjpeg

Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index b275d55..b3a3a0f 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    9%{?dist}
+Release:    10%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -239,6 +239,9 @@ fi
 
 
 %changelog
+* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
+- rebuild against new libjpeg
+
 * Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
 - Add patch to work around v4l2 api breakage in 3.5 kernel.
 

From ae3d33f9c6b326a5f72f6631c0e8edca26141472 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 7 Jan 2013 14:56:59 +0100
Subject: [PATCH 62/82] fix configuration file for httpd 2.4, #871502

---
 zoneminder.conf | 26 +++++++++++++++++++-------
 zoneminder.spec |  5 ++++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/zoneminder.conf b/zoneminder.conf
index 4a4d932..597ea2b 100644
--- a/zoneminder.conf
+++ b/zoneminder.conf
@@ -14,20 +14,32 @@
 
 Alias /zm "/usr/share/zoneminder/www"
 <Directory "/usr/share/zoneminder/www">
-    Options -Indexes MultiViews FollowSymLinks
+    Options -Indexes +MultiViews +FollowSymLinks
     AllowOverride All
-    Order allow,deny
-    Allow from all
+    <IfModule mod_authz_core.c>
+       # Apache 2.4
+       Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
     # The code unfortunately uses short tags in many places
     php_value short_open_tag 1
-
-Deny from all # DELETE THIS LINE
 </Directory>
 
 ScriptAlias /cgi-bin/zm "/usr/libexec/zoneminder/cgi-bin"
 <Directory "/usr/libexec/zoneminder/cgi-bin">
     AllowOverride All
     Options ExecCGI
-    Order allow,deny
-    Allow from all
+    <IfModule mod_authz_core.c>
+       # Apache 2.4
+       Require all granted
+    </IfModule>
+    <IfModule !mod_authz_core.c>
+        # Apache 2.2
+        Order deny,allow
+        Allow from all
+    </IfModule>
 </Directory>
diff --git a/zoneminder.spec b/zoneminder.spec
index b3a3a0f..b8c618c 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    10%{?dist}
+Release:    11%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -239,6 +239,9 @@ fi
 
 
 %changelog
+* Mon Jan  7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
+- fix configuration file for httpd 2.4, #871502
+
 * Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
 - rebuild against new libjpeg
 

From 44ae8e1fac5858e17349857de130b13fb9e2ad50 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Mon, 21 Jan 2013 18:10:55 +0100
Subject: [PATCH 63/82] Rebuild due to "jpeg8-ABI" feature drop

Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index b8c618c..cde2316 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    11%{?dist}
+Release:    12%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -239,6 +239,9 @@ fi
 
 
 %changelog
+* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
+- rebuild due to "jpeg8-ABI" feature drop
+
 * Mon Jan  7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
 - fix configuration file for httpd 2.4, #871502
 

From 8c2fe5801976b27af8bde5775687d3015181d289 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 14 Feb 2013 22:24:18 -0600
Subject: [PATCH 64/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index cde2316..b4aceed 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    12%{?dist}
+Release:    13%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -239,6 +239,9 @@ fi
 
 
 %changelog
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
 - rebuild due to "jpeg8-ABI" feature drop
 

From 6fc9c4e10db44453d945011c8109d56301c7ffc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 29 Jul 2013 07:40:56 +0200
Subject: [PATCH 65/82] Perl 5.18 rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index b4aceed..a792a91 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    13%{?dist}
+Release:    14%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -239,6 +239,9 @@ fi
 
 
 %changelog
+* Mon Jul 29 2013 Petr Pisar <ppisar@redhat.com> - 1.25.0-14
+- Perl 5.18 rebuild
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From f21f07da5e5d93023d275b29747b54fd9f9c0524 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 29 Jul 2013 11:08:05 +0200
Subject: [PATCH 66/82] zoneminder

---
 zoneminder.spec | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index a792a91..e668bc2 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -35,11 +35,20 @@ Patch13:    zoneminder-1.25.0-kernel35.patch
 
 BuildRequires:  automake gnutls-devel systemd-units
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
-BuildRequires:  perl(Archive::Tar) perl(Archive::Zip)
-BuildRequires:  perl(Date::Manip) perl(DBD::mysql)
-BuildRequires:  perl(ExtUtils::MakeMaker) perl(LWP::UserAgent)
-BuildRequires:  perl(MIME::Entity) perl(MIME::Lite)
-BuildRequires:  perl(PHP::Serialization) perl(Sys::Mmap)
+BuildRequires:  perl(Archive::Tar)
+BuildRequires:  perl(Archive::Zip)
+BuildRequires:  perl(Date::Manip)
+BuildRequires:  perl(DBD::mysql)
+BuildRequires:  perl(DBI)
+BuildRequires:  perl(ExtUtils::MakeMaker)
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(LWP::UserAgent)
+BuildRequires:  perl(MIME::Entity)
+BuildRequires:  perl(MIME::Lite)
+BuildRequires:  perl(PHP::Serialization)
+BuildRequires:  perl(Sys::Mmap)
+BuildRequires:  perl(Sys::Syslog)
+BuildRequires:  perl(Time::HiRes)
 
 Requires:   httpd php php-mysql cambozola
 Requires:   perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -241,6 +250,7 @@ fi
 %changelog
 * Mon Jul 29 2013 Petr Pisar <ppisar@redhat.com> - 1.25.0-14
 - Perl 5.18 rebuild
+- Specify mandatory perl dependencies
 
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

From e0072264249f29203214230292edf101134a4978 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sun, 4 Aug 2013 04:59:18 -0500
Subject: [PATCH 67/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index e668bc2..058764f 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    14%{?dist}
+Release:    15%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -248,6 +248,9 @@ fi
 
 
 %changelog
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Mon Jul 29 2013 Petr Pisar <ppisar@redhat.com> - 1.25.0-14
 - Perl 5.18 rebuild
 - Specify mandatory perl dependencies

From 293328f0c84c721f198c3d9e9735ad66862f4774 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 13:17:15 -0500
Subject: [PATCH 68/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 058764f..1da98e2 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    15%{?dist}
+Release:    16%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -248,6 +248,9 @@ fi
 
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-16
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From ec5a5a820047ada762bee0211c148fe6abd01a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 12 Jun 2014 15:06:04 +0200
Subject: [PATCH 69/82] Allow autotools to install missing files

---
 zoneminder.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 1da98e2..3aa40ce 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    16%{?dist}
+Release:    17%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -93,7 +93,7 @@ chmod -x src/zm_event.cpp src/zm_user.h
 
 
 %build
-autoreconf
+autoreconf --install
 
 OPTS=""
 %ifnarch %{ix86} x86_64
@@ -248,6 +248,9 @@ fi
 
 
 %changelog
+* Thu Jun 12 2014 Petr Pisar <ppisar@redhat.com> - 1.25.0-17
+- Allow autotools to install missing files (bug #1059131)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From e5eb56a503ce4218a9a21a2f5a19a7eaa541a9d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Thu, 12 Jun 2014 15:25:00 +0200
Subject: [PATCH 70/82] Fix a format-security warning

---
 ...1.25.0-Fix-some-compilation-warnings.patch | 28 +++++++++++++++++++
 zoneminder.spec                               |  4 +++
 2 files changed, 32 insertions(+)
 create mode 100644 zoneminder-1.25.0-Fix-some-compilation-warnings.patch

diff --git a/zoneminder-1.25.0-Fix-some-compilation-warnings.patch b/zoneminder-1.25.0-Fix-some-compilation-warnings.patch
new file mode 100644
index 0000000..2dacc64
--- /dev/null
+++ b/zoneminder-1.25.0-Fix-some-compilation-warnings.patch
@@ -0,0 +1,28 @@
+From ac7f7f08a7d78f5046e4855f3bd1c121f884aa64 Mon Sep 17 00:00:00 2001
+From: mastertheknife <mastertheknife@gmail.com>
+Date: Tue, 24 Sep 2013 07:31:02 +0300
+Subject: [PATCH] Fix some compilation warnings
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+
+Petr Pisar: Ported to 1.25.0.
+
+diff --git a/src/zm_signal.cpp b/src/zm_signal.cpp
+index 5bb000f..dc6144a 100644
+--- a/src/zm_signal.cpp
++++ b/src/zm_signal.cpp
+@@ -110,7 +110,7 @@ RETSIGTYPE zm_die_handler( int signal )
+ 	char **messages = backtrace_symbols( trace, trace_size );
+     if ( size_t offset = strcspn( messages[trace_size-1], " " ) )
+     {
+-        snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), messages[trace_size-1] );
++        snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), "%s", messages[trace_size-1] );
+         cmd_ptr += offset;
+     }
+     else
+-- 
+1.9.3
+
diff --git a/zoneminder.spec b/zoneminder.spec
index 3aa40ce..7e62a5d 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -32,6 +32,8 @@ Patch10:    zoneminder-1.24.4-installfix.patch
 Patch11:    zoneminder-1.25.0-gcc47.patch
 Patch12:    zoneminder-1.25.0-gcrypt.patch
 Patch13:    zoneminder-1.25.0-kernel35.patch
+# Fix a format-security warning, in upstream after 1.26.3
+Patch14:    zoneminder-1.25.0-Fix-some-compilation-warnings.patch
 
 BuildRequires:  automake gnutls-devel systemd-units
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
@@ -88,6 +90,7 @@ popd
 %patch11 -p0 -b .gcc47
 %patch12 -p0 -b .gcrypt
 %patch13 -p0 -b .kernel35
+%patch14 -p1 -b .format
 cp %{SOURCE4} README.Fedora
 chmod -x src/zm_event.cpp src/zm_user.h
 
@@ -250,6 +253,7 @@ fi
 %changelog
 * Thu Jun 12 2014 Petr Pisar <ppisar@redhat.com> - 1.25.0-17
 - Allow autotools to install missing files (bug #1059131)
+- Fix a format-security warning
 
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

From 59ff8671b4d4995715a1eaff8570d97c3d46ebfa Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Mon, 18 Aug 2014 11:47:29 +0000
Subject: [PATCH 71/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 7e62a5d..068fead 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    17%{?dist}
+Release:    18%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -251,6 +251,9 @@ fi
 
 
 %changelog
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Thu Jun 12 2014 Petr Pisar <ppisar@redhat.com> - 1.25.0-17
 - Allow autotools to install missing files (bug #1059131)
 - Fix a format-security warning

From 7b2e61cb64c0b7c045f6e62ffa8099ee21575618 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 21 Aug 2014 11:55:58 -0600
Subject: [PATCH 72/82] Rebuild for rpm bug 1131960

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 068fead..b21e93e 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    18%{?dist}
+Release:    19%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -251,6 +251,9 @@ fi
 
 
 %changelog
+* Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 1.25.0-19
+- Rebuild for rpm bug 1131960
+
 * Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From 52c37beda3aa9abb8e6eb44a5e2f08723c238454 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Mon, 1 Sep 2014 08:28:40 +0200
Subject: [PATCH 73/82] Perl 5.20 rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index b21e93e..1566cad 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.25.0
-Release:    19%{?dist}
+Release:    20%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -251,6 +251,9 @@ fi
 
 
 %changelog
+* Mon Sep 01 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.25.0-20
+- Perl 5.20 rebuild
+
 * Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 1.25.0-19
 - Rebuild for rpm bug 1131960
 

From 6539dcfdebd2155f7368e1d24c29f158e480e960 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 10 Mar 2015 11:52:12 -0500
Subject: [PATCH 74/82] Commit some old uncommitted changes.

---
 README.Fedora | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/README.Fedora b/README.Fedora
index f1a4b58..961aadd 100644
--- a/README.Fedora
+++ b/README.Fedora
@@ -5,8 +5,8 @@ New installs
    remotely you will need to ensure that the server is installed and secured:
 
      yum install mysql-server
-     chkconfig mysql on
-     service mysql start
+     systemctl enable mysqld
+     systemctl start mysqld
      mysql_secure_installation
 
 2. You will need to create the ZoneMinder database. These commands should do
@@ -32,12 +32,13 @@ New installs
    or if it is set incorrectly, and these complaints will show up in the
    zoneminder logging system as errors.
 
-   If you are not sure of the proper timezone specification to use, look in
-   /etc/sysconfig/clock.
+   If you are not sure of the proper timezone specification to use, run
+   timedatectl.
 
 6. This package probably does not work with SELinux enabled at the moment. It
    may be necessary to disable SELinux for httpd, or even completely for
-   ZoneMinder to function. This will be addressed in a later release.  Run
+   ZoneMinder to function. The policy is being worked on and the issues will be
+   addressed in a later release.  Run
 
      setenforce 0
 
@@ -45,8 +46,8 @@ New installs
 
 7. Enable and start the zoneminder service:
 
-     systemctl enable zoneminder.service
-     systemctl start zoneminder.service
+     systemctl enable zoneminder
+     systemctl start zoneminder
 
 8. The ZoneMinder web interface is disabled by default (which makes it rather
    useless but also secure by default), you will need to edit

From 45a36809a079dbe6fd9324261ce84a793abeea17 Mon Sep 17 00:00:00 2001
From: Jason Tibbitts <tibbs@math.uh.edu>
Date: Tue, 10 Mar 2015 11:55:51 -0500
Subject: [PATCH 75/82] Begin working on 1.28.1.

---
 .gitignore      | 3 +++
 sources         | 2 +-
 zoneminder.spec | 8 ++++----
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ebc556..c289abc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,6 @@ ZoneMinder-1.24.2.tar.gz
 /zoneminder-20110324svn.tar.xz
 /ZoneMinder-1.24.4.tar.gz
 /ZoneMinder-1.25.0.tar.gz
+/v1.28.1.tar.gz
+*.rpm
+ZoneMinder-*/
diff --git a/sources b/sources
index c61a1cd..9ca0223 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
-eaefa14befd482154970541252aa1a39  ZoneMinder-1.25.0.tar.gz
+e8b27b818e074e5739b2bad8c57671a1  v1.28.1.tar.gz
diff --git a/zoneminder.spec b/zoneminder.spec
index 1566cad..30b2690 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -4,16 +4,16 @@
 %define zmgid_final apache
 
 Name:       zoneminder
-Version:    1.25.0
-Release:    20%{?dist}
+Version:    1.28.1
+Release:    1%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
 # Mootools is inder the MIT license: http://mootools.net/
-License:    GPLv2+ and LGPLv2+ and MIT 
+License:    GPLv2+ and LGPLv2+ and MIT
 URL:        http://www.zoneminder.com/
 
-Source:     http://www2.zoneminder.com/downloads/ZoneMinder-%{version}.tar.gz
+Source:     https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
 Source2:    zoneminder.conf
 Source3:    redalert.wav
 Source4:    README.Fedora

From 8400183b388aac30d0e4d4fdd830a2b754f6cbb0 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Sat, 6 Jun 2015 18:03:48 +0200
Subject: [PATCH 76/82] Perl 5.22 rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 30b2690..e36c42e 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.28.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -251,6 +251,9 @@ fi
 
 
 %changelog
+* Sat Jun 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.28.1-2
+- Perl 5.22 rebuild
+
 * Mon Sep 01 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.25.0-20
 - Perl 5.20 rebuild
 

From 82ba890782fe22ac68df2e62ee9b7abea05a75a5 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@wpi.edu>
Date: Fri, 12 Jun 2015 13:44:44 -0400
Subject: [PATCH 77/82] Fix build

---
 zoneminder-1.24.4-installfix.patch            | 22 -----
 ...1.25.0-Fix-some-compilation-warnings.patch | 28 ------
 zoneminder-1.25.0-dbinstall.patch             | 58 ------------
 zoneminder-1.25.0-gcc47.patch                 | 33 -------
 zoneminder-1.25.0-kernel35.patch              | 21 -----
 zoneminder-1.28.1-gcc47.patch                 | 23 +++++
 ...pt.patch => zoneminder-1.28.1-gcrypt.patch | 89 +++++++++++--------
 ....patch => zoneminder-1.28.1-noffmpeg.patch | 24 ++---
 ....patch => zoneminder-1.28.1-runlevel.patch |  8 +-
 zoneminder.spec                               | 41 ++++-----
 10 files changed, 115 insertions(+), 232 deletions(-)
 delete mode 100644 zoneminder-1.24.4-installfix.patch
 delete mode 100644 zoneminder-1.25.0-Fix-some-compilation-warnings.patch
 delete mode 100644 zoneminder-1.25.0-dbinstall.patch
 delete mode 100644 zoneminder-1.25.0-gcc47.patch
 delete mode 100644 zoneminder-1.25.0-kernel35.patch
 create mode 100644 zoneminder-1.28.1-gcc47.patch
 rename zoneminder-1.25.0-gcrypt.patch => zoneminder-1.28.1-gcrypt.patch (52%)
 rename zoneminder-1.25.0-noffmpeg.patch => zoneminder-1.28.1-noffmpeg.patch (50%)
 rename zoneminder-1.24.3-runlevel.patch => zoneminder-1.28.1-runlevel.patch (51%)

diff --git a/zoneminder-1.24.4-installfix.patch b/zoneminder-1.24.4-installfix.patch
deleted file mode 100644
index 8831d59..0000000
--- a/zoneminder-1.24.4-installfix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -up ./Makefile.am.installfix ./Makefile.am
---- ./Makefile.am.installfix	2011-06-19 15:51:14.000000000 -0500
-+++ ./Makefile.am	2011-08-13 20:33:30.288587436 -0500
-@@ -21,12 +21,12 @@ EXTRA_DIST = \
- # Yes, you are correct. This is a HACK!
- install-data-hook:
- 	( cd $(DESTDIR)$(sysconfdir); chown $(webuser):$(webgroup) $(sysconf_DATA); chmod 600 $(sysconf_DATA) )
--	( if ! test -e $(ZM_RUNDIR); then mkdir -p $(ZM_RUNDIR); fi; if test "$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(ZM_RUNDIR); chmod u+w $(ZM_RUNDIR); fi )
--	( if ! test -e $(ZM_TMPDIR); then mkdir -m 700 -p $(ZM_TMPDIR); fi; if test "$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(ZM_TMPDIR); chmod u+w $(ZM_TMPDIR); fi )
--	( if ! test -e $(ZM_LOGDIR); then mkdir -p $(ZM_LOGDIR); fi; if test "$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(ZM_LOGDIR); chmod u+w $(ZM_LOGDIR); fi )
-+	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
-+	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )
-+	( if ! test -e $(DESTDIR)$(ZM_LOGDIR); then mkdir -p $(DESTDIR)$(ZM_LOGDIR); fi; if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_LOGDIR); chmod u+w $(DESTDIR)$(ZM_LOGDIR); fi )
- 
- uninstall-hook:
- 	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
--	@-( if test "$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(ZM_RUNDIR); fi )
--	@-( if test "$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(ZM_TMPDIR); fi )
--	@-( if test "$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(ZM_LOGDIR); fi )
-+	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
-+	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
-+	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )
diff --git a/zoneminder-1.25.0-Fix-some-compilation-warnings.patch b/zoneminder-1.25.0-Fix-some-compilation-warnings.patch
deleted file mode 100644
index 2dacc64..0000000
--- a/zoneminder-1.25.0-Fix-some-compilation-warnings.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From ac7f7f08a7d78f5046e4855f3bd1c121f884aa64 Mon Sep 17 00:00:00 2001
-From: mastertheknife <mastertheknife@gmail.com>
-Date: Tue, 24 Sep 2013 07:31:02 +0300
-Subject: [PATCH] Fix some compilation warnings
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
-
-Petr Pisar: Ported to 1.25.0.
-
-diff --git a/src/zm_signal.cpp b/src/zm_signal.cpp
-index 5bb000f..dc6144a 100644
---- a/src/zm_signal.cpp
-+++ b/src/zm_signal.cpp
-@@ -110,7 +110,7 @@ RETSIGTYPE zm_die_handler( int signal )
- 	char **messages = backtrace_symbols( trace, trace_size );
-     if ( size_t offset = strcspn( messages[trace_size-1], " " ) )
-     {
--        snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), messages[trace_size-1] );
-+        snprintf( cmd_ptr, sizeof(cmd)-(cmd_ptr-cmd), "%s", messages[trace_size-1] );
-         cmd_ptr += offset;
-     }
-     else
--- 
-1.9.3
-
diff --git a/zoneminder-1.25.0-dbinstall.patch b/zoneminder-1.25.0-dbinstall.patch
deleted file mode 100644
index 8aba378..0000000
--- a/zoneminder-1.25.0-dbinstall.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -up ./configure.ac.dbinstall ./configure.ac
---- ./configure.ac.dbinstall	2011-08-23 10:10:32.000000000 -0500
-+++ ./configure.ac	2012-01-19 12:52:29.201006160 -0600
-@@ -1,10 +1,10 @@
- AC_PREREQ(2.59)
--AC_INIT(zm,1.25.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],ZoneMinder,http://www.zoneminder.com/downloads.html)
-+AC_INIT(zm,1.25.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
- AM_INIT_AUTOMAKE
- AC_CONFIG_SRCDIR(src/zm.h)
- AM_CONFIG_HEADER(config.h)
- 
--PATH_BUILD=`pwd`
-+PATH_BUILD=/usr/share/zoneminder
- AC_SUBST(PATH_BUILD)
- TIME_BUILD=`date +'%s'`
- AC_SUBST(TIME_BUILD)
-@@ -358,6 +358,8 @@ AC_PROG_PERL_MODULES(X10::ActiveHome,,AC
- 
- AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
- AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
-+AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
-+AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
- AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
- AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
- AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
-diff -up ./db/Makefile.am.dbinstall ./db/Makefile.am
---- ./db/Makefile.am.dbinstall	2011-06-21 02:40:11.000000000 -0500
-+++ ./db/Makefile.am	2012-01-19 12:15:03.871582792 -0600
-@@ -1,7 +1,16 @@
- AUTOMAKE_OPTIONS = gnu
- 
-+zmdbdatadir = $(pkgdatadir)/db
-+
- EXTRA_DIST = \
- 	zm_create.sql.in \
-+	$(dbupgrade_scripts)
-+
-+dist_zmdbdata_DATA = \
-+	zm_create.sql \
-+	$(dbupgrade_scripts)
-+
-+dbupgrade_scripts = \
- 	zm_update-0.0.1.sql \
- 	zm_update-0.9.7.sql \
- 	zm_update-0.9.8.sql \
-diff -up ./zm.conf.in.dbinstall ./zm.conf.in
---- ./zm.conf.in.dbinstall	2008-07-25 04:48:17.000000000 -0500
-+++ ./zm.conf.in	2012-01-19 12:15:03.872582761 -0600
-@@ -15,6 +15,9 @@ ZM_VERSION=@VERSION@
- # Path to build directory, used mostly for finding DB upgrade scripts
- ZM_PATH_BUILD=@PATH_BUILD@
- 
-+# Path to installed data directory, used mostly for finding DB upgrade scripts
-+ZM_PATH_DATA=@PKGDATADIR@
-+
- # Build time, used to record when to trigger various checks
- ZM_TIME_BUILD=@TIME_BUILD@
- 
diff --git a/zoneminder-1.25.0-gcc47.patch b/zoneminder-1.25.0-gcc47.patch
deleted file mode 100644
index a083c6d..0000000
--- a/zoneminder-1.25.0-gcc47.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up ./src/zm_local_camera.cpp.gcc47 ./src/zm_local_camera.cpp
---- ./src/zm_local_camera.cpp.gcc47	2011-06-21 04:19:10.000000000 -0500
-+++ ./src/zm_local_camera.cpp	2012-01-19 13:43:49.142440717 -0600
-@@ -26,6 +26,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <sys/mman.h>
- #include <errno.h>
-diff -up ./src/zm_logger.cpp.gcc47 ./src/zm_logger.cpp
---- ./src/zm_logger.cpp.gcc47	2011-06-28 06:07:35.000000000 -0500
-+++ ./src/zm_logger.cpp	2012-01-19 13:43:49.142440717 -0600
-@@ -33,6 +33,7 @@
- #include <signal.h>
- #include <stdarg.h>
- #include <errno.h>
-+#include <unistd.h>
- 
- bool Logger::smInitialised = false;
- Logger *Logger::smInstance = 0;
-diff -up ./src/zm_thread.h.gcc47 ./src/zm_thread.h
---- ./src/zm_thread.h.gcc47	2012-01-19 13:44:43.082766722 -0600
-+++ ./src/zm_thread.h	2012-01-19 13:44:56.966335869 -0600
-@@ -21,6 +21,7 @@
- #define ZM_THREAD_H
- 
- #include <pthread.h>
-+#include <unistd.h>
- #include "zm_exception.h"
- #include "zm_utils.h"
- 
diff --git a/zoneminder-1.25.0-kernel35.patch b/zoneminder-1.25.0-kernel35.patch
deleted file mode 100644
index 51bc128..0000000
--- a/zoneminder-1.25.0-kernel35.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ./src/zm_local_camera.cpp.kernel35 ./src/zm_local_camera.cpp
---- ./src/zm_local_camera.cpp.kernel35	2012-07-16 15:01:22.182614878 -0500
-+++ ./src/zm_local_camera.cpp	2012-07-16 15:02:16.491941730 -0500
-@@ -740,7 +740,7 @@ void LocalCamera::Terminate()
-     {
-         Debug( 3, "Terminating video stream" );
-         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--        enum v4l2_buf_type type = v4l2_data.fmt.type;
-+        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
-         if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
-             Error( "Failed to stop capture stream: %s", strerror(errno) );
- 
-@@ -1520,7 +1520,7 @@ int LocalCamera::PrimeCapture()
- 
-         Debug( 3, "Starting video stream" );
-         //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
--        enum v4l2_buf_type type = v4l2_data.fmt.type;
-+        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
-         if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
-             Fatal( "Failed to start capture stream: %s", strerror(errno) );
-     }
diff --git a/zoneminder-1.28.1-gcc47.patch b/zoneminder-1.28.1-gcc47.patch
new file mode 100644
index 0000000..c1e2dd5
--- /dev/null
+++ b/zoneminder-1.28.1-gcc47.patch
@@ -0,0 +1,23 @@
+diff -up ZoneMinder-1.28.1/src/zm_local_camera.cpp.gcc47 ZoneMinder-1.28.1/src/zm_local_camera.cpp
+--- ZoneMinder-1.28.1/src/zm_local_camera.cpp.gcc47	2015-02-04 21:52:37.000000000 -0500
++++ ZoneMinder-1.28.1/src/zm_local_camera.cpp	2015-06-12 11:07:38.295420171 -0400
+@@ -26,6 +26,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <fcntl.h>
++#include <limits.h>
+ #include <unistd.h>
+ #include <sys/mman.h>
+ #include <errno.h>
+diff -up ZoneMinder-1.28.1/src/zm_logger.cpp.gcc47 ZoneMinder-1.28.1/src/zm_logger.cpp
+--- ZoneMinder-1.28.1/src/zm_logger.cpp.gcc47	2015-02-04 21:52:37.000000000 -0500
++++ ZoneMinder-1.28.1/src/zm_logger.cpp	2015-06-12 11:07:38.296420176 -0400
+@@ -31,6 +31,7 @@
+ #include <signal.h>
+ #include <stdarg.h>
+ #include <errno.h>
++#include <unistd.h>
+ 
+ bool Logger::smInitialised = false;
+ Logger *Logger::smInstance = 0;
+diff -up ZoneMinder-1.28.1/src/zm_thread.h.gcc47 ZoneMinder-1.28.1/src/zm_thread.h
diff --git a/zoneminder-1.25.0-gcrypt.patch b/zoneminder-1.28.1-gcrypt.patch
similarity index 52%
rename from zoneminder-1.25.0-gcrypt.patch
rename to zoneminder-1.28.1-gcrypt.patch
index 21f197e..0f18ae6 100644
--- a/zoneminder-1.25.0-gcrypt.patch
+++ b/zoneminder-1.28.1-gcrypt.patch
@@ -1,16 +1,16 @@
-diff -up ./configure.ac.gcrypt ./configure.ac
---- ./configure.ac.gcrypt	2012-01-19 12:58:20.647123209 -0600
-+++ ./configure.ac	2012-01-19 13:12:34.186669577 -0600
-@@ -13,7 +13,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
+diff -up ZoneMinder-1.28.1/configure.ac.gcrypt ZoneMinder-1.28.1/configure.ac
+--- ZoneMinder-1.28.1/configure.ac.gcrypt	2015-06-12 11:10:08.256091967 -0400
++++ ZoneMinder-1.28.1/configure.ac	2015-06-12 11:19:51.190736931 -0400
+@@ -40,7 +40,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
  AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
  AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
  AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
 -AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
 +AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
- AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default MyISAM])
+ AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default InnoDB])
  AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
- AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /tmp/zm])
-@@ -32,7 +32,7 @@ if test "$ZM_DB_PASS" == ""; then
+ AC_ARG_VAR(ZM_SOCKDIR,[Location of Unix domain socket files, default /var/run/zm])
+@@ -64,7 +64,7 @@ if test "$ZM_DB_PASS" == ""; then
  	AC_SUBST(ZM_DB_PASS,[zmpass])
  fi
  if test "$ZM_SSL_LIB" == ""; then
@@ -18,35 +18,48 @@ diff -up ./configure.ac.gcrypt ./configure.ac
 +	AC_SUBST(ZM_SSL_LIB,libgcrypt)
  fi
  if test "$ZM_MYSQL_ENGINE" == ""; then
- 	AC_SUBST(ZM_MYSQL_ENGINE,MyISAM)
-@@ -264,11 +264,10 @@ AC_CHECK_LIB(jpeg,jpeg_start_compress,,A
- AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
+ 	AC_SUBST(ZM_MYSQL_ENGINE,InnoDB)
+@@ -314,19 +314,10 @@ AC_CHECK_LIB(pthread,pthread_create,,AC_
  AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
  if test "$ZM_SSL_LIB" == "openssl"; then
+ AC_CHECK_HEADERS(openssl/md5.h,,AC_MSG_WARN(zm requires openssl/md5.h header to be installed for openssl),)
 -AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
 +AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
  else
+-AC_CHECK_HEADERS(gnutls/openssl.h,AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,1),AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,0),)
+-AC_CHECK_HEADERS(gnutls/gnutls.h,AC_SUBST(ZM_HAS_GNUTLS,1),AC_SUBST(ZM_HAS_GNUTLS,0),)
+-if test "$ZM_HAS_GNUTLS_OPENSSL" == "0" && test "$ZM_HAS_GNUTLS" == "0"; then
+-AC_MSG_WARN(gnutls is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead)
+-fi
 -AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
 +AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
  AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
--AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-AC_CHECK_LIB(gnutls,gnutls_fingerprint,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
+-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
+-fi
  fi
  AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
  AC_CHECK_LIB(z,zlibVersion)
-@@ -320,9 +319,6 @@ AC_CHECK_DECLS(round,,,[#include <math.h
+@@ -386,14 +377,6 @@ AC_CHECK_HEADERS(curl/curl.h,,,)
  if test "$ZM_SSL_LIB" == "openssl"; then
  AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
  #include <openssl/md5.h>])
 -else
+-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
 -AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
 -#include <gnutls/openssl.h>])
+-else
+-AC_CHECK_DECLS(gnutls_fingerprint,,AC_MSG_ERROR([zm requires gnutls/gnutls.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
+-#include <gnutls/gnutls.h>])
+-fi
  fi
  AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
- 
-diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
---- ./src/zm_user.cpp.gcrypt	2011-08-03 06:31:06.000000000 -0500
-+++ ./src/zm_user.cpp	2012-01-19 12:58:20.654122992 -0600
-@@ -140,6 +140,18 @@ User *zmLoadUser( const char *username, 
+ AC_CHECK_DECLS(backtrace_symbols,,,[#include <execinfo.h>])
+diff -up ZoneMinder-1.28.1/src/zm_user.cpp.gcrypt ZoneMinder-1.28.1/src/zm_user.cpp
+--- ZoneMinder-1.28.1/src/zm_user.cpp.gcrypt	2015-02-04 21:52:37.000000000 -0500
++++ ZoneMinder-1.28.1/src/zm_user.cpp	2015-06-12 11:10:08.256091967 -0400
+@@ -144,6 +144,18 @@ User *zmLoadUser( const char *username,
  	return( user );
  }
  
@@ -65,22 +78,26 @@ diff -up ./src/zm_user.cpp.gcrypt ./src/zm_user.cpp
  // Function to validate an authentication string
  User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
  {
-diff -up ./src/zm_user.h.gcrypt ./src/zm_user.h
---- ./src/zm_user.h.gcrypt	2010-11-11 06:11:07.000000000 -0600
-+++ ./src/zm_user.h	2012-01-19 13:14:11.200654694 -0600
-@@ -23,14 +23,11 @@
- #ifndef ZM_USER_H
- #define ZM_USER_H
- 
--#if HAVE_LIBGNUTLS_OPENSSL
--#include <gnutls/openssl.h>
- #if HAVE_GCRYPT_H
- #include <gcrypt.h>
--#endif // HAVE_GCRYPT_H
- #elif HAVE_LIBCRYPTO
- #include <openssl/md5.h>
--#endif // HAVE_LIBGNUTLS_OPENSSL || HAVE_LIBCRYPTO
-+#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
- 
- class User
- {
+diff -up ZoneMinder-1.28.1/src/zm_user.h.gcrypt ZoneMinder-1.28.1/src/zm_user.h
+--- ZoneMinder-1.28.1/src/zm_user.h.gcrypt	2015-06-12 11:10:08.257091972 -0400
++++ ZoneMinder-1.28.1/src/zm_user.h	2015-06-12 11:22:11.503378854 -0400
+@@ -23,18 +23,11 @@
+ #ifndef ZM_USER_H
+ #define ZM_USER_H
+ 
+-#if HAVE_GNUTLS_OPENSSL_H
+-#include <gnutls/openssl.h>
+-#endif
+-#if HAVE_GNUTLS_GNUTLS_H
+-#include <gnutls/gnutls.h>
+-#endif
+-
+ #if HAVE_GCRYPT_H
+ #include <gcrypt.h>
+ #elif HAVE_LIBCRYPTO
+ #include <openssl/md5.h>
+-#endif // HAVE_L || HAVE_LIBCRYPTO
++#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
+ 
+ class User
+ {
diff --git a/zoneminder-1.25.0-noffmpeg.patch b/zoneminder-1.28.1-noffmpeg.patch
similarity index 50%
rename from zoneminder-1.25.0-noffmpeg.patch
rename to zoneminder-1.28.1-noffmpeg.patch
index 032222d..fab1a30 100644
--- a/zoneminder-1.25.0-noffmpeg.patch
+++ b/zoneminder-1.28.1-noffmpeg.patch
@@ -1,7 +1,7 @@
-diff -up ./configure.ac.noffmpeg ./configure.ac
---- ./configure.ac.noffmpeg	2012-01-19 12:53:04.000000000 -0600
-+++ ./configure.ac	2012-01-19 12:54:29.575278231 -0600
-@@ -273,13 +273,13 @@ fi
+diff -up ZoneMinder-1.28.1/configure.ac.noffmpeg ZoneMinder-1.28.1/configure.ac
+--- ZoneMinder-1.28.1/configure.ac.noffmpeg	2015-06-12 11:01:37.147798556 -0400
++++ ZoneMinder-1.28.1/configure.ac	2015-06-12 11:04:39.315618375 -0400
+@@ -331,16 +331,16 @@ fi
  AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
  AC_CHECK_LIB(z,zlibVersion)
  AC_CHECK_LIB(x264,x264_predict_16x16_init)
@@ -9,15 +9,19 @@ diff -up ./configure.ac.noffmpeg ./configure.ac
 +dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
  # Don't bother to warn about this one
 -AC_CHECK_LIB(avcore,av_image_copy,,)
--AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
--AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+-AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+-AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avcore,av_image_copy,,)
++dnl AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
++dnl AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+ #AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
+ #AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
 -AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
 -AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
-+dnl AC_CHECK_LIB(avcore,av_image_copy,,)
-+dnl AC_CHECK_LIB(avcodec,avcodec_init,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-+dnl AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
+-AC_CHECK_LIB(vlc,libvlc_new,,AC_MSG_WARN(libvlc.a may be required for streaming))
 +dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
 +dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
++dnl AC_CHECK_LIB(vlc,libvlc_new,,AC_MSG_WARN(libvlc.a may be required for streaming))
  AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
  AC_CHECK_LIB(z,compress,,)
- 
+ AC_CHECK_LIB(curl,curl_global_init,,)
diff --git a/zoneminder-1.24.3-runlevel.patch b/zoneminder-1.28.1-runlevel.patch
similarity index 51%
rename from zoneminder-1.24.3-runlevel.patch
rename to zoneminder-1.28.1-runlevel.patch
index de7b49b..427cf34 100644
--- a/zoneminder-1.24.3-runlevel.patch
+++ b/zoneminder-1.28.1-runlevel.patch
@@ -1,6 +1,6 @@
-diff -up ./scripts/zm.in.runlevel ./scripts/zm.in
---- ./scripts/zm.in.runlevel	2010-11-28 15:22:05.000000000 -0600
-+++ ./scripts/zm.in	2011-03-24 21:39:01.973010160 -0500
+diff -up ZoneMinder-1.28.1/scripts/zm.in.runlevel ZoneMinder-1.28.1/scripts/zm.in
+--- ZoneMinder-1.28.1/scripts/zm.in.runlevel	2015-06-12 10:58:22.477921885 -0400
++++ ZoneMinder-1.28.1/scripts/zm.in	2015-06-12 10:59:53.869333454 -0400
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
@@ -8,4 +8,4 @@ diff -up ./scripts/zm.in.runlevel ./scripts/zm.in
 +# chkconfig: - 99 00
  # processname: zmpkg.pl
  
- # Source function library.
+ # This script is intended for use with legacy SysV init environments ONLY
diff --git a/zoneminder.spec b/zoneminder.spec
index e36c42e..48180f0 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.28.1
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -25,18 +25,14 @@ Source7:    zoneminder.logrotate
 # with zoneminder.  As these are javascript, there is no guideline violation
 # here.
 #Source8:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
-Patch1:     zoneminder-1.25.0-dbinstall.patch
-Patch2:     zoneminder-1.24.3-runlevel.patch
-Patch3:     zoneminder-1.25.0-noffmpeg.patch
-Patch10:    zoneminder-1.24.4-installfix.patch
-Patch11:    zoneminder-1.25.0-gcc47.patch
-Patch12:    zoneminder-1.25.0-gcrypt.patch
-Patch13:    zoneminder-1.25.0-kernel35.patch
-# Fix a format-security warning, in upstream after 1.26.3
-Patch14:    zoneminder-1.25.0-Fix-some-compilation-warnings.patch
+Patch2:     zoneminder-1.28.1-runlevel.patch
+Patch3:     zoneminder-1.28.1-noffmpeg.patch
+Patch11:    zoneminder-1.28.1-gcc47.patch
+Patch12:    zoneminder-1.28.1-gcrypt.patch
 
 BuildRequires:  automake gnutls-devel systemd-units
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
+BuildRequires:  polkit-devel
 BuildRequires:  perl(Archive::Tar)
 BuildRequires:  perl(Archive::Zip)
 BuildRequires:  perl(Date::Manip)
@@ -83,14 +79,10 @@ mv *html *php doc/* README ../jscalendar-doc
 rmdir doc
 popd
 
-%patch1 -p0 -b .dbinstall
-%patch2 -p0 -b .runlevel
-%patch3 -p0 -b .noffmpeg
-%patch10 -p0 -b .installfix
-%patch11 -p0 -b .gcc47
-%patch12 -p0 -b .gcrypt
-%patch13 -p0 -b .kernel35
-%patch14 -p1 -b .format
+%patch2 -p1 -b .runlevel
+%patch3 -p1 -b .noffmpeg
+%patch11 -p1 -b .gcc47
+%patch12 -p1 -b .gcrypt
 cp %{SOURCE4} README.Fedora
 chmod -x src/zm_event.cpp src/zm_user.h
 
@@ -206,24 +198,27 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README README.Fedora jscalendar-doc
+%doc AUTHORS COPYING README.md README.Fedora jscalendar-doc
 %config(noreplace) %attr(640,root,%{zmgid_final}) /etc/zm.conf
 %config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
 %config(noreplace) /etc/tmpfiles.d/zoneminder.conf
 %config(noreplace) /etc/logrotate.d/zoneminder
 
 %{_unitdir}/zoneminder.service
+%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
+%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
 
 %{_bindir}/zma
 %{_bindir}/zmaudit.pl
 %{_bindir}/zmc
+%{_bindir}/zmcamtool.pl
 %{_bindir}/zmcontrol.pl
 %{_bindir}/zmdc.pl
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
-%attr(4755,root,root) %{_bindir}/zmfix
 %{_bindir}/zmpkg.pl
 %{_bindir}/zmstreamer
+%{_bindir}/zmsystemctl.pl
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
@@ -251,6 +246,12 @@ fi
 
 
 %changelog
+* Fri Jun 12 2015 Charles R. Anderson <cra@wpi.edu> - 1.28.1-3
+- Update patches to apply against 1.28.1
+- Remove unneeded patches
+- zmfix no longer provided
+- zmcamtool.pl and zmsystemctl.pl added
+
 * Sat Jun 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.28.1-2
 - Perl 5.22 rebuild
 

From 5ca5e1a30d51331cf92cf61c71810e9daabb05c3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 19 Jun 2015 04:50:03 +0000
Subject: [PATCH 78/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 48180f0..f23125a 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.28.1
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -246,6 +246,9 @@ fi
 
 
 %changelog
+* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.28.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Fri Jun 12 2015 Charles R. Anderson <cra@wpi.edu> - 1.28.1-3
 - Update patches to apply against 1.28.1
 - Remove unneeded patches

From 91475aef518b1ff5b82dc94826d664f5af52febd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 5 Feb 2016 04:08:34 +0000
Subject: [PATCH 79/82] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index f23125a..5e59fda 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.28.1
-Release:    4%{?dist}
+Release:    5%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -246,6 +246,9 @@ fi
 
 
 %changelog
+* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.28.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 

From fcc625e70b9f7558708b00b68ebad0882b6adf05 Mon Sep 17 00:00:00 2001
From: Jitka Plesnikova <jplesnik@redhat.com>
Date: Mon, 16 May 2016 17:03:45 +0200
Subject: [PATCH 80/82] Perl 5.24 rebuild

---
 zoneminder.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/zoneminder.spec b/zoneminder.spec
index 5e59fda..9c4f544 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -5,7 +5,7 @@
 
 Name:       zoneminder
 Version:    1.28.1
-Release:    5%{?dist}
+Release:    6%{?dist}
 Summary:    A camera monitoring and analysis tool
 Group:      System Environment/Daemons
 # jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
@@ -246,6 +246,9 @@ fi
 
 
 %changelog
+* Mon May 16 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.28.1-6
+- Perl 5.24 rebuild
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 9465aeb66bd0db0303f6813981251ad17fa121a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 24 Jun 2016 09:53:36 +0200
Subject: [PATCH 81/82] Mandatory Perl build-requires added
 <https://fedoraproject.org/wiki/Changes/Build_Root_Without_Perl>

---
 zoneminder.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zoneminder.spec b/zoneminder.spec
index 9c4f544..030d971 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -33,6 +33,7 @@ Patch12:    zoneminder-1.28.1-gcrypt.patch
 BuildRequires:  automake gnutls-devel systemd-units
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
 BuildRequires:  polkit-devel
+BuildRequires:  perl-generators
 BuildRequires:  perl(Archive::Tar)
 BuildRequires:  perl(Archive::Zip)
 BuildRequires:  perl(Date::Manip)

From 8f7f5a9a6d0aa2f9e2ee72e5e0c8294eb2a61828 Mon Sep 17 00:00:00 2001
From: "Charles R. Anderson" <cra@wpi.edu>
Date: Fri, 6 Jan 2017 11:38:11 -0500
Subject: [PATCH 82/82] Moving to rpmfusion repo

---
 .gitignore                       |  11 -
 README.Fedora                    |  82 ------
 dead.package                     |   1 +
 redalert.wav                     | Bin 45404 -> 0 bytes
 sources                          |   2 -
 zoneminder-1.28.1-gcc47.patch    |  23 --
 zoneminder-1.28.1-gcrypt.patch   | 103 -------
 zoneminder-1.28.1-noffmpeg.patch |  27 --
 zoneminder-1.28.1-runlevel.patch |  11 -
 zoneminder-svn-checkout.sh       |  10 -
 zoneminder.conf                  |  45 ---
 zoneminder.logrotate             |   8 -
 zoneminder.service               |  12 -
 zoneminder.spec                  | 483 -------------------------------
 14 files changed, 1 insertion(+), 817 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 README.Fedora
 create mode 100644 dead.package
 delete mode 100644 redalert.wav
 delete mode 100644 sources
 delete mode 100644 zoneminder-1.28.1-gcc47.patch
 delete mode 100644 zoneminder-1.28.1-gcrypt.patch
 delete mode 100644 zoneminder-1.28.1-noffmpeg.patch
 delete mode 100644 zoneminder-1.28.1-runlevel.patch
 delete mode 100755 zoneminder-svn-checkout.sh
 delete mode 100644 zoneminder.conf
 delete mode 100644 zoneminder.logrotate
 delete mode 100644 zoneminder.service
 delete mode 100644 zoneminder.spec

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c289abc..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-cambozola-0.68.tar.gz
-jscalendar-1.0.zip
-mootools-1.2.3-core-yc.js
-ZoneMinder-1.24.2.tar.gz
-/ZoneMinder-1.24.3.tar.gz
-/zoneminder-20110324svn.tar.xz
-/ZoneMinder-1.24.4.tar.gz
-/ZoneMinder-1.25.0.tar.gz
-/v1.28.1.tar.gz
-*.rpm
-ZoneMinder-*/
diff --git a/README.Fedora b/README.Fedora
deleted file mode 100644
index 961aadd..0000000
--- a/README.Fedora
+++ /dev/null
@@ -1,82 +0,0 @@
-New installs
-============
-
-1. Unless you are already using the MySQL server or you are running it
-   remotely you will need to ensure that the server is installed and secured:
-
-     yum install mysql-server
-     systemctl enable mysqld
-     systemctl start mysqld
-     mysql_secure_installation
-
-2. You will need to create the ZoneMinder database. These commands should do
-   the trick, assuming your database server is local:
-
-     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
-     mysqladmin reload
-
-3. The database needs a user.  One is not created by default because this would
-   introduce an obvious security issue.  The following should set this up:
-
-     mysql -u root -p
-     grant select,insert,update,delete on zm.* to 'zmuser'@localhost identified by 'zmpass';
-
-   Obviously, change at least zmpass to an actual, secure password or
-   passphrase.  You can change zmuser as well if you like.
-
-4. Edit /etc/zm.conf and, at the bottom, change ZM_DB_PASS and perhaps
-   ZM_DB_USER to match.
-
-5. Edit /etc/php.ini, uncomment the date.timezone line, and add your local
-   timezone.  For whatever reason, PHP will complain loudly if this is not set,
-   or if it is set incorrectly, and these complaints will show up in the
-   zoneminder logging system as errors.
-
-   If you are not sure of the proper timezone specification to use, run
-   timedatectl.
-
-6. This package probably does not work with SELinux enabled at the moment. It
-   may be necessary to disable SELinux for httpd, or even completely for
-   ZoneMinder to function. The policy is being worked on and the issues will be
-   addressed in a later release.  Run
-
-     setenforce 0
-
-   for testing, and edit /etc/sysconfig/selinux to disable it at boot time.
-
-7. Enable and start the zoneminder service:
-
-     systemctl enable zoneminder
-     systemctl start zoneminder
-
-8. The ZoneMinder web interface is disabled by default (which makes it rather
-   useless but also secure by default), you will need to edit
-   /etc/httpd/conf.d/zoneminder.conf to enable it.  Afterwards, you can start
-   the web server:
-
-     systemctl enable httpd.service
-     systemctl start httpd.service
-
-9. You should immediately visit http://localhost/zm and secure the system if
-   it is network facing.  To do this:
-
-   a) click Options, then System.
-   b) check OPT_USE_AUTH.
-   c) set AUTH_HASH_SECRET to a random string.
-   d) click Save and refresh the main browser window.
-   e) You should be prompted to log in; the default username/password is admin/admin.
-   f) Open Options again, choose the newly visible Users tab.
-   g) click the admin user and set a password.
-
-
-Upgrades
-========
-
-1. Update /etc/zm.conf.  Check for any new settings and update the version
-   information.  Comparing /etc/zm.conf and /etc/zm.conf.rpmnew should help to
-   do this.
-
-2. You will need to upgrade the ZoneMinder database as described in the
-   manual. This command should be sufficient when run as root:
-
-     zmupdate.pl --version=<from version>
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..d82fb65
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Moving to rpmfusion repo
diff --git a/redalert.wav b/redalert.wav
deleted file mode 100644
index 41e23e0794bdc42f187e51b454767b51727346c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 45404
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
Yb^cf8|M$^<Mf{J#|3Uw%83dyL1?r+^qW}N^

diff --git a/sources b/sources
deleted file mode 100644
index 9ca0223..0000000
--- a/sources
+++ /dev/null
@@ -1,2 +0,0 @@
-10f2160fe68294013efcd1473cd36f72  jscalendar-1.0.zip
-e8b27b818e074e5739b2bad8c57671a1  v1.28.1.tar.gz
diff --git a/zoneminder-1.28.1-gcc47.patch b/zoneminder-1.28.1-gcc47.patch
deleted file mode 100644
index c1e2dd5..0000000
--- a/zoneminder-1.28.1-gcc47.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -up ZoneMinder-1.28.1/src/zm_local_camera.cpp.gcc47 ZoneMinder-1.28.1/src/zm_local_camera.cpp
---- ZoneMinder-1.28.1/src/zm_local_camera.cpp.gcc47	2015-02-04 21:52:37.000000000 -0500
-+++ ZoneMinder-1.28.1/src/zm_local_camera.cpp	2015-06-12 11:07:38.295420171 -0400
-@@ -26,6 +26,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-+#include <limits.h>
- #include <unistd.h>
- #include <sys/mman.h>
- #include <errno.h>
-diff -up ZoneMinder-1.28.1/src/zm_logger.cpp.gcc47 ZoneMinder-1.28.1/src/zm_logger.cpp
---- ZoneMinder-1.28.1/src/zm_logger.cpp.gcc47	2015-02-04 21:52:37.000000000 -0500
-+++ ZoneMinder-1.28.1/src/zm_logger.cpp	2015-06-12 11:07:38.296420176 -0400
-@@ -31,6 +31,7 @@
- #include <signal.h>
- #include <stdarg.h>
- #include <errno.h>
-+#include <unistd.h>
- 
- bool Logger::smInitialised = false;
- Logger *Logger::smInstance = 0;
-diff -up ZoneMinder-1.28.1/src/zm_thread.h.gcc47 ZoneMinder-1.28.1/src/zm_thread.h
diff --git a/zoneminder-1.28.1-gcrypt.patch b/zoneminder-1.28.1-gcrypt.patch
deleted file mode 100644
index 0f18ae6..0000000
--- a/zoneminder-1.28.1-gcrypt.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -up ZoneMinder-1.28.1/configure.ac.gcrypt ZoneMinder-1.28.1/configure.ac
---- ZoneMinder-1.28.1/configure.ac.gcrypt	2015-06-12 11:10:08.256091967 -0400
-+++ ZoneMinder-1.28.1/configure.ac	2015-06-12 11:19:51.190736931 -0400
-@@ -40,7 +40,7 @@ AC_ARG_VAR(ZM_DB_HOST,[Hostname where Zo
- AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
- AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
- AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
--AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
-+AC_ARG_VAR(ZM_SSL_LIB,[Library to use for MD5 function, default libgcrypt])
- AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default InnoDB])
- AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
- AC_ARG_VAR(ZM_SOCKDIR,[Location of Unix domain socket files, default /var/run/zm])
-@@ -64,7 +64,7 @@ if test "$ZM_DB_PASS" == ""; then
- 	AC_SUBST(ZM_DB_PASS,[zmpass])
- fi
- if test "$ZM_SSL_LIB" == ""; then
--	AC_SUBST(ZM_SSL_LIB,gnutls)
-+	AC_SUBST(ZM_SSL_LIB,libgcrypt)
- fi
- if test "$ZM_MYSQL_ENGINE" == ""; then
- 	AC_SUBST(ZM_MYSQL_ENGINE,InnoDB)
-@@ -314,19 +314,10 @@ AC_CHECK_LIB(pthread,pthread_create,,AC_
- AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
- if test "$ZM_SSL_LIB" == "openssl"; then
- AC_CHECK_HEADERS(openssl/md5.h,,AC_MSG_WARN(zm requires openssl/md5.h header to be installed for openssl),)
--AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
-+AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select libgcrypt instead]))
- else
--AC_CHECK_HEADERS(gnutls/openssl.h,AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,1),AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,0),)
--AC_CHECK_HEADERS(gnutls/gnutls.h,AC_SUBST(ZM_HAS_GNUTLS,1),AC_SUBST(ZM_HAS_GNUTLS,0),)
--if test "$ZM_HAS_GNUTLS_OPENSSL" == "0" && test "$ZM_HAS_GNUTLS" == "0"; then
--AC_MSG_WARN(gnutls is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead)
--fi
--AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
-+AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed),)
- AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
--AC_CHECK_LIB(gnutls,gnutls_fingerprint,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
--if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
--AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
--fi
- fi
- AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
- AC_CHECK_LIB(z,zlibVersion)
-@@ -386,14 +377,6 @@ AC_CHECK_HEADERS(curl/curl.h,,,)
- if test "$ZM_SSL_LIB" == "openssl"; then
- AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
- #include <openssl/md5.h>])
--else
--if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
--AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
--#include <gnutls/openssl.h>])
--else
--AC_CHECK_DECLS(gnutls_fingerprint,,AC_MSG_ERROR([zm requires gnutls/gnutls.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
--#include <gnutls/gnutls.h>])
--fi
- fi
- AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
- AC_CHECK_DECLS(backtrace_symbols,,,[#include <execinfo.h>])
-diff -up ZoneMinder-1.28.1/src/zm_user.cpp.gcrypt ZoneMinder-1.28.1/src/zm_user.cpp
---- ZoneMinder-1.28.1/src/zm_user.cpp.gcrypt	2015-02-04 21:52:37.000000000 -0500
-+++ ZoneMinder-1.28.1/src/zm_user.cpp	2015-06-12 11:10:08.256091967 -0400
-@@ -144,6 +144,18 @@ User *zmLoadUser( const char *username,
- 	return( user );
- }
- 
-+#ifdef HAVE_GCRYPT_H
-+#define HAVE_DECL_MD5 1
-+#define MD5_DIGEST_LENGTH 16
-+static unsigned char *MD5(const unsigned char *data, unsigned long len,
-+                         unsigned char *md)
-+{
-+    gcry_md_hash_buffer(GCRY_MD_MD5, md, data, len);
-+
-+    return md;
-+}
-+#endif
-+
- // Function to validate an authentication string
- User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
- {
-diff -up ZoneMinder-1.28.1/src/zm_user.h.gcrypt ZoneMinder-1.28.1/src/zm_user.h
---- ZoneMinder-1.28.1/src/zm_user.h.gcrypt	2015-06-12 11:10:08.257091972 -0400
-+++ ZoneMinder-1.28.1/src/zm_user.h	2015-06-12 11:22:11.503378854 -0400
-@@ -23,18 +23,11 @@
- #ifndef ZM_USER_H
- #define ZM_USER_H
- 
--#if HAVE_GNUTLS_OPENSSL_H
--#include <gnutls/openssl.h>
--#endif
--#if HAVE_GNUTLS_GNUTLS_H
--#include <gnutls/gnutls.h>
--#endif
--
- #if HAVE_GCRYPT_H
- #include <gcrypt.h>
- #elif HAVE_LIBCRYPTO
- #include <openssl/md5.h>
--#endif // HAVE_L || HAVE_LIBCRYPTO
-+#endif // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
- 
- class User
- {
diff --git a/zoneminder-1.28.1-noffmpeg.patch b/zoneminder-1.28.1-noffmpeg.patch
deleted file mode 100644
index fab1a30..0000000
--- a/zoneminder-1.28.1-noffmpeg.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up ZoneMinder-1.28.1/configure.ac.noffmpeg ZoneMinder-1.28.1/configure.ac
---- ZoneMinder-1.28.1/configure.ac.noffmpeg	2015-06-12 11:01:37.147798556 -0400
-+++ ZoneMinder-1.28.1/configure.ac	2015-06-12 11:04:39.315618375 -0400
-@@ -331,16 +331,16 @@ fi
- AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
- AC_CHECK_LIB(z,zlibVersion)
- AC_CHECK_LIB(x264,x264_predict_16x16_init)
--AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
-+dnl AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
- # Don't bother to warn about this one
--AC_CHECK_LIB(avcore,av_image_copy,,)
--AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
--AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
-+dnl AC_CHECK_LIB(avcore,av_image_copy,,)
-+dnl AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-+dnl AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
- #AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
- #AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
--AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
--AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
--AC_CHECK_LIB(vlc,libvlc_new,,AC_MSG_WARN(libvlc.a may be required for streaming))
-+dnl AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
-+dnl AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
-+dnl AC_CHECK_LIB(vlc,libvlc_new,,AC_MSG_WARN(libvlc.a may be required for streaming))
- AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
- AC_CHECK_LIB(z,compress,,)
- AC_CHECK_LIB(curl,curl_global_init,,)
diff --git a/zoneminder-1.28.1-runlevel.patch b/zoneminder-1.28.1-runlevel.patch
deleted file mode 100644
index 427cf34..0000000
--- a/zoneminder-1.28.1-runlevel.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up ZoneMinder-1.28.1/scripts/zm.in.runlevel ZoneMinder-1.28.1/scripts/zm.in
---- ZoneMinder-1.28.1/scripts/zm.in.runlevel	2015-06-12 10:58:22.477921885 -0400
-+++ ZoneMinder-1.28.1/scripts/zm.in	2015-06-12 10:59:53.869333454 -0400
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # description: ZoneMinder is the top Linux video camera security and surveillance solution. ZoneMinder is intended for use in single or multi-camera video security applications.Copyright: Philip Coombes, Corey DeLasaux 2003-2008
--# chkconfig: 2345 99 00
-+# chkconfig: - 99 00
- # processname: zmpkg.pl
- 
- # This script is intended for use with legacy SysV init environments ONLY
diff --git a/zoneminder-svn-checkout.sh b/zoneminder-svn-checkout.sh
deleted file mode 100755
index e30ff4a..0000000
--- a/zoneminder-svn-checkout.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-DATE=$(date +%Y%m%d)
-
-set -x
-
-rm -rf zm
-svn export http://svn.zoneminder.com/svn/zm/trunk zm
-tar cJf zoneminder-${DATE}svn.tar.xz zm
-
-rm -rf zm
diff --git a/zoneminder.conf b/zoneminder.conf
deleted file mode 100644
index 597ea2b..0000000
--- a/zoneminder.conf
+++ /dev/null
@@ -1,45 +0,0 @@
-# The Zoneminder web interface has been disabled by default due to a small
-# security issue in the default install.
-#
-# When using Zoneminder's own authentication, recorded CCTV images are
-# accessible from the web directly without passing the authentication. This
-# means any attacker could see your CCTV images without a password. In order
-# to avoid this you can disable Zoneminder's authentication and configure
-# standard Apache authentication (see the Apache documentation for details on
-# this).
-#
-# If you still wish to use Zoneminder's own authentication, or have an
-# internal site which needs no authentication, you need to delete the line
-# marked below and restart Apache.
-
-Alias /zm "/usr/share/zoneminder/www"
-<Directory "/usr/share/zoneminder/www">
-    Options -Indexes +MultiViews +FollowSymLinks
-    AllowOverride All
-    <IfModule mod_authz_core.c>
-       # Apache 2.4
-       Require all granted
-    </IfModule>
-    <IfModule !mod_authz_core.c>
-        # Apache 2.2
-        Order deny,allow
-        Allow from all
-    </IfModule>
-    # The code unfortunately uses short tags in many places
-    php_value short_open_tag 1
-</Directory>
-
-ScriptAlias /cgi-bin/zm "/usr/libexec/zoneminder/cgi-bin"
-<Directory "/usr/libexec/zoneminder/cgi-bin">
-    AllowOverride All
-    Options ExecCGI
-    <IfModule mod_authz_core.c>
-       # Apache 2.4
-       Require all granted
-    </IfModule>
-    <IfModule !mod_authz_core.c>
-        # Apache 2.2
-        Order deny,allow
-        Allow from all
-    </IfModule>
-</Directory>
diff --git a/zoneminder.logrotate b/zoneminder.logrotate
deleted file mode 100644
index 7bd1d18..0000000
--- a/zoneminder.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/zoneminder/*.log {
-    missingok
-    notifempty
-    sharedscripts
-    postrotate
-        /usr/bin/zmpkg.pl logrot 2> /dev/null > /dev/null || :
-    endscript
-}
diff --git a/zoneminder.service b/zoneminder.service
deleted file mode 100644
index d59fc67..0000000
--- a/zoneminder.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Video security and surveillance system
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/zmpkg.pl start
-ExecReload=/usr/bin/zmpkg.pl reload
-PIDFile=/run/zoneminder/zm.pid
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/zoneminder.spec b/zoneminder.spec
deleted file mode 100644
index 030d971..0000000
--- a/zoneminder.spec
+++ /dev/null
@@ -1,483 +0,0 @@
-%define zmuid $(id -un)
-%define zmgid $(id -gn)
-%define zmuid_final apache
-%define zmgid_final apache
-
-Name:       zoneminder
-Version:    1.28.1
-Release:    6%{?dist}
-Summary:    A camera monitoring and analysis tool
-Group:      System Environment/Daemons
-# jscalendar is LGPL (any version):  http://www.dynarch.com/projects/calendar/
-# Mootools is inder the MIT license: http://mootools.net/
-License:    GPLv2+ and LGPLv2+ and MIT
-URL:        http://www.zoneminder.com/
-
-Source:     https://github.com/ZoneMinder/ZoneMinder/archive/v%{version}.tar.gz
-Source2:    zoneminder.conf
-Source3:    redalert.wav
-Source4:    README.Fedora
-Source5:    http://downloads.sourceforge.net/jscalendar/jscalendar-1.0.zip
-Source6:    zoneminder.service
-Source7:    zoneminder.logrotate
-# Need to unravel the proper mootools files to grab from upstream, since the
-# number of them keeps multiplying.  In the meantime, rely on the ones bundled
-# with zoneminder.  As these are javascript, there is no guideline violation
-# here.
-#Source8:    http://mootools.net/download/get/mootools-1.2.3-core-yc.js
-Patch2:     zoneminder-1.28.1-runlevel.patch
-Patch3:     zoneminder-1.28.1-noffmpeg.patch
-Patch11:    zoneminder-1.28.1-gcc47.patch
-Patch12:    zoneminder-1.28.1-gcrypt.patch
-
-BuildRequires:  automake gnutls-devel systemd-units
-BuildRequires:  mysql-devel pcre-devel libjpeg-devel
-BuildRequires:  polkit-devel
-BuildRequires:  perl-generators
-BuildRequires:  perl(Archive::Tar)
-BuildRequires:  perl(Archive::Zip)
-BuildRequires:  perl(Date::Manip)
-BuildRequires:  perl(DBD::mysql)
-BuildRequires:  perl(DBI)
-BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Getopt::Long)
-BuildRequires:  perl(LWP::UserAgent)
-BuildRequires:  perl(MIME::Entity)
-BuildRequires:  perl(MIME::Lite)
-BuildRequires:  perl(PHP::Serialization)
-BuildRequires:  perl(Sys::Mmap)
-BuildRequires:  perl(Sys::Syslog)
-BuildRequires:  perl(Time::HiRes)
-
-Requires:   httpd php php-mysql cambozola
-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)
-
-Requires(post): systemd-units systemd-sysv
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-
-
-%description
-ZoneMinder is a set of applications which is intended to provide a complete
-solution allowing you to capture, analyse, record and monitor any cameras you
-have attached to a Linux based machine. It is designed to run on kernels which
-support the Video For Linux (V4L) interface and has been tested with cameras
-attached to BTTV cards, various USB cameras and IP network cameras. It is
-designed to support as many cameras as you can attach to your computer without
-too much degradation of performance.
-
-
-%prep
-%setup -q -n ZoneMinder-%{version}
-
-# Unpack jscalendar and move some files around
-%setup -q -D -T -a 5 -n ZoneMinder-%{version}
-mkdir jscalendar-doc
-pushd jscalendar-1.0
-mv *html *php doc/* README ../jscalendar-doc
-rmdir doc
-popd
-
-%patch2 -p1 -b .runlevel
-%patch3 -p1 -b .noffmpeg
-%patch11 -p1 -b .gcc47
-%patch12 -p1 -b .gcrypt
-cp %{SOURCE4} README.Fedora
-chmod -x src/zm_event.cpp src/zm_user.h
-
-
-%build
-autoreconf --install
-
-OPTS=""
-%ifnarch %{ix86} x86_64
-    OPTS="$OPTS --disable-crashtrace"
-%endif
-
-export ZM_RUNDIR=/var/run/zoneminder
-export ZM_TMPDIR=/var/lib/zoneminder/temp
-%configure \
-    --with-libarch=%{_lib} \
-    --with-mysql=%{_prefix} \
-    --with-webdir=%{_datadir}/%{name}/www \
-    --with-cgidir=%{_libexecdir}/%{name}/cgi-bin \
-    --with-webuser=%{zmuid} \
-    --with-webgroup=%{zmgid} \
-    --enable-mmap=yes \
-    --disable-debug \
-    $OPTS
-
-# Have to do this now because the configure script wipes out modifications made to this file
-cat <<EOF >> db/zm_create.sql
-# Fedora change:
-# Alter some default paths to match the default URL and selinux expectations
-update Config set Value = '/cgi-bin/zm/nph-zms' where Name = 'ZM_PATH_ZMS';
-update Config set Value = '/var/log/zoneminder' where Name = 'ZM_PATH_LOGS';
-update Config set Value = '/var/log/zoneminder/zm_debug_log+' where Name = 'ZM_EXTRA_DEBUG_LOG';
-update Config set Value = '/var/log/zoneminder/zm_xml.log' where Name = 'ZM_EYEZM_LOG_FILE';
-update Config set Value = '/var/lib/zoneminder/sock' where Name = 'ZM_PATH_SOCKS';
-update Config set Value = '/var/lib/zoneminder/swap' where Name = 'ZM_PATH_SWAP';
-update Config set Value = '/var/spool/zoneminder-upload' where Name = 'ZM_UPLOAD_FTP_LOC_DIR';
-EOF
-
-make %{?_smp_mflags}
-%{__perl} -pi -e 's/(ZM_WEB_USER=).*$/${1}%{zmuid_final}/;' \
-          -e 's/(ZM_WEB_GROUP=).*$/${1}%{zmgid_final}/;' zm.conf
-
-
-%install
-install -d %{buildroot}/%{_localstatedir}/run
-make install DESTDIR=%{buildroot} \
-    INSTALLDIRS=vendor
-rm -rf %{buildroot}/%{perl_vendorarch} %{buildroot}/%{perl_archlib}
-rm -f %{buildroot}/%{_bindir}/zmx10.pl
-
-install -m 755 -d %{buildroot}/var/log/zoneminder
-for dir in events images temp
-do
-    install -m 755 -d %{buildroot}/var/lib/zoneminder/$dir
-    rmdir %{buildroot}/%{_datadir}/zoneminder/www/$dir
-    ln -sf ../../../../var/lib/zoneminder/$dir %{buildroot}/%{_datadir}/zoneminder/www/$dir
-done
-install -m 755 -d %{buildroot}/var/lib/zoneminder/sock
-install -m 755 -d %{buildroot}/var/lib/zoneminder/swap
-install -m 755 -d %{buildroot}/var/spool/zoneminder-upload
-
-install -D -m 644 %{SOURCE2} %{buildroot}/etc/httpd/conf.d/zoneminder.conf
-install -D -m 755 %{SOURCE3} %{buildroot}/%{_datadir}/zoneminder/www/sounds/redalert.wav
-install -D -m 644 %{SOURCE6} %{buildroot}/%{_unitdir}/zoneminder.service
-install -D -m 644 %{SOURCE7} %{buildroot}/etc/logrotate.d/zoneminder
-
-# Install jscalendar - this really should be in its own package
-install -d -m 755 %{buildroot}/%{_datadir}/%{name}/www/jscalendar
-cp -rp jscalendar-1.0/* %{buildroot}/%{_datadir}/zoneminder/www/jscalendar
-
-# Set up cambozola
-pushd %{buildroot}/%{_datadir}/zoneminder/www
-ln -s ../../java/cambozola.jar
-popd
-
-install -d -m 755 %{buildroot}/etc/tmpfiles.d
-cat > %{buildroot}/etc/tmpfiles.d/zoneminder.conf <<EOF
-d   /run/zoneminder     0755    %{zmuid_final}  %{zmgid_final}
-EOF
-install -m 755 -d %{buildroot}/run/zoneminder
-
-
-%post
-if [ $1 -eq 1 ] ; then
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-
-%preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable zoneminder.service > /dev/null 2>&1 || :
-    /bin/systemctl stop zoneminder.service > /dev/null 2>&1 || :
-fi
-
-%postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
-fi
-
-%triggerun -- zoneminder < 1.25.0-4
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply zoneminder
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save zoneminder >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del zoneminder >/dev/null 2>&1 || :
-/bin/systemctl try-restart zoneminder.service >/dev/null 2>&1 || :
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README.md README.Fedora jscalendar-doc
-%config(noreplace) %attr(640,root,%{zmgid_final}) /etc/zm.conf
-%config(noreplace) %attr(644,root,root) /etc/httpd/conf.d/zoneminder.conf
-%config(noreplace) /etc/tmpfiles.d/zoneminder.conf
-%config(noreplace) /etc/logrotate.d/zoneminder
-
-%{_unitdir}/zoneminder.service
-%{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
-%{_datadir}/polkit-1/rules.d/com.zoneminder.systemctl.rules
-
-%{_bindir}/zma
-%{_bindir}/zmaudit.pl
-%{_bindir}/zmc
-%{_bindir}/zmcamtool.pl
-%{_bindir}/zmcontrol.pl
-%{_bindir}/zmdc.pl
-%{_bindir}/zmf
-%{_bindir}/zmfilter.pl
-%{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
-%{_bindir}/zmsystemctl.pl
-%{_bindir}/zmtrack.pl
-%{_bindir}/zmtrigger.pl
-%{_bindir}/zmu
-%{_bindir}/zmupdate.pl
-%{_bindir}/zmvideo.pl
-%{_bindir}/zmwatch.pl
-
-%{perl_vendorlib}/ZoneMinder*
-%{_mandir}/man*/*
-%dir %{_libexecdir}/zoneminder
-%{_libexecdir}/zoneminder/cgi-bin
-%dir %{_datadir}/zoneminder
-%{_datadir}/zoneminder/db
-%{_datadir}/zoneminder/www
-
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/events
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/images
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/sock
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/swap
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/lib/zoneminder/temp
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/log/zoneminder
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /var/spool/zoneminder-upload
-%dir %attr(755,%{zmuid_final},%{zmgid_final}) /run/zoneminder
-
-
-%changelog
-* Mon May 16 2016 Jitka Plesnikova <jplesnik@redhat.com> - 1.28.1-6
-- Perl 5.24 rebuild
-
-* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.28.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.28.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri Jun 12 2015 Charles R. Anderson <cra@wpi.edu> - 1.28.1-3
-- Update patches to apply against 1.28.1
-- Remove unneeded patches
-- zmfix no longer provided
-- zmcamtool.pl and zmsystemctl.pl added
-
-* Sat Jun 06 2015 Jitka Plesnikova <jplesnik@redhat.com> - 1.28.1-2
-- Perl 5.22 rebuild
-
-* Mon Sep 01 2014 Jitka Plesnikova <jplesnik@redhat.com> - 1.25.0-20
-- Perl 5.20 rebuild
-
-* Thu Aug 21 2014 Kevin Fenzi <kevin@scrye.com> - 1.25.0-19
-- Rebuild for rpm bug 1131960
-
-* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-18
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Thu Jun 12 2014 Petr Pisar <ppisar@redhat.com> - 1.25.0-17
-- Allow autotools to install missing files (bug #1059131)
-- Fix a format-security warning
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon Jul 29 2013 Petr Pisar <ppisar@redhat.com> - 1.25.0-14
-- Perl 5.18 rebuild
-- Specify mandatory perl dependencies
-
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Mon Jan 21 2013 Adam Tkac <atkac redhat com> - 1.25.0-12
-- rebuild due to "jpeg8-ABI" feature drop
-
-* Mon Jan  7 2013 Remi Collet <rcollet@redhat.com> - 1.25.0-11
-- fix configuration file for httpd 2.4, #871502
-
-* Fri Dec 21 2012 Adam Tkac <atkac redhat com> - 1.25.0-10
-- rebuild against new libjpeg
-
-* Thu Aug 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-9
-- Add patch to work around v4l2 api breakage in 3.5 kernel.
-
-* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.25.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jun 23 2012 Petr Pisar <ppisar@redhat.com> - 1.25.0-7
-- Perl 5.16 rebuild
-
-* Wed Mar 21 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-6
-- Fix stupid thinko in sql modifications.
-
-* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-5
-- Clean up macro usage.
-
-* Sat Feb 25 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-4
-- Convert to systemd.
-- Add tmpfiles.d configuration since the initscript isn't around to create
-  /run/zoneminder.
-- Remove some pointless executable permissions.
-- Add logrotate file.
-
-* Wed Feb 22 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-3
-- Update README.Fedora to reference systemctl and mention timezone info in
-  php.ini.
-- Add proper default for EYEZM_LOG_TO_FILE.
-
-
-* Thu Feb 09 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-2
-- Rebuild for new pcre.
-
-* Thu Jan 19 2012 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.25.0-1
-- Update to 1.25.0
-- Fix gcc4.7 build problems.
-- Drop gcc4.4 build fixes; for whatever reason they now break the build.
-- Clean up old patches.
-- Force setting of ZM_TMPDIR and ZM_RUNDIR.
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-3
-- Re-add the dist-tag that somehow got lost.
-
-* Thu Sep 15 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-2
-- Add patch for bug 711780 - fix syntax issue in Mapped.pm.
-- Undo that patch, and undo another which was the cause of the whole mess.
-- Fix up other patches so ZM_PATH_BUILD is both defined and useful.
-- Make sure database creation mods actually take.
-- Update Fedora-specific docs with some additional info.
-- Use bundled mootools (javascript, so no guideline violation).
-- Update download location.
-- Update the gcrypt patch to actually work.
-- Upstream changed the tarball without changing the version to patch a
-  vulnerability, so redownload.
-
-* Sun Aug 14 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.4-1
-- Initial attempt to upgrade to 1.24.4.
-- Add patch from BZ 460310 to build against libgcrypt instead of requiring the
-  gnutls openssl libs.
-
-* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-7.20110324svn3310
-- Perl mass rebuild
-
-* Wed Jul 20 2011 Petr Sabata <contyk@redhat.com> - 1.24.3-6.20110324svn3310
-- Perl mass rebuild
-
-* Mon May 09 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-5.20110324svn3310
-- Bump for gnutls update.
-
-* Thu Mar 24 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-4.20110324svn3310
-- Update to latest 1.24.3 subversion.  Turns out that what upstream was calling
-  1.24.3 is really just an occasionally updated devel snapshot.
-- Rebase various patches.
-
-* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 1.24.3-3
-- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Jan 25 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.3-1
-- Update to latest upstream version.
-- Rebase patches.
-- Initial incomplete attempt to disable v4l1 support.
-
-* Fri Jan 21 2011 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-6
-- Unbundle cambozola; instead link to the separately pacakged copy.
-- Remove BuildRoot:, %%clean and buildroot cleaning in %%install.
-- Git rid of mixed space/tab usage by removing all tabs.
-- Remove unnecessary Conflicts: line.
-- Attempt to force short_open_tag on for the code directories.
-- Move default location of sockets, swaps, logfiles and some temporary files to
-  make more sense and allow things to work better with a future selinux policy.
-- Fix errors in README.Fedora.
-
-* Wed Jun 02 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.24.2-5
-- Mass rebuild with perl-5.12.0
-
-* Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.24.2-4
-- rebuild against perl 5.10.1
-- use Perl vendorarch and archlib variables correctly
-
-* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.24.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-2
-- Bump release since 1.24.2-1 was mistakenly tagged a few months ago.
-
-* Wed Jul 22 2009 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.24.2-1
-- Initial update to 1.24.2.
-- Rebase patches.
-- Update mootools download location.
-- Update to mootools 1.2.3.
-- Add additional dependencies for some optional features.
-
-* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-3
-- Remove unused Sys::Mmap perl dependency RPM is finding
-
-* Sat Apr 11 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-2
-- Update gcc44 patch to disable -frepo, seems to be broken with gcc44
-- Added noffmpeg patch to make building outside mock easier
-
-* Sat Mar 21 2009 Martin Ebourne <martin@zepler.org> - 1.24.1-1
-- Patch for gcc 4.4 compilation errors
-- Upgrade to 1.24.1
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.23.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sat Jan 24 2009 Caolán McNamara <caolanm@redhat.com> - 1.23.3-3
-- rebuild for dependencies
-
-* Mon Dec 15 2008 Martin Ebourne <martin@zepler.org> - 1.23.3-2
-- Fix permissions on zm.conf
-
-* Fri Jul 11 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.23.3-1
-- Initial attempt at packaging 1.23.
-
-* Tue Jul  1 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-15
-- Add perl module compat dependency, bz #453590
-
-* Tue May  6 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-14
-- Remove default runlevel, bz #441315
-
-* Mon Apr 28 2008 Jason L Tibbitts III <tibbs@math.uh.edu> - 1.22.3-13
-- Backport patch for CVE-2008-1381 from 1.23.3 to 1.22.3.
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.22.3-12
-- Autorebuild for GCC 4.3
-
-* Thu Jan  3 2008 Martin Ebourne <martin@zepler.org> - 1.22.3-11
-- Fix compilation on gcc 4.3
-
-* Thu Dec  6 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-10
-- Rebuild for new openssl
-
-* Thu Aug  2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-8
-- Fix licence tag
-
-* Thu Jul 12 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-7
-- Fixes from testing by Jitz including missing dependencies and database creation
-
-* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-6
-- Disable crashtrace on ppc
-
-* Sat Jun 30 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-5
-- Fix uid for directories in /var/lib/zoneminder
-
-* Tue Jun 26 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-4
-- Added perl Archive::Tar dependency
-- Disabled web interface due to lack of access control on the event images
-
-* Sun Jun 10 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-3
-- Changes recommended in review by Jason Tibbitts
-
-* Mon Apr  2 2007 Martin Ebourne <martin@zepler.org> - 1.22.3-2
-- Standardised on package name of zoneminder
-
-* Thu Dec 28 2006 Martin Ebourne <martin@zepler.org> - 1.22.3-1
-- First version. Uses some parts from zm-1.20.1 by Corey DeLasaux and Serg Oskin