[zoneminder] Update to 1.24.4.
Jason Tibbitts
tibbs at fedoraproject.org
Sun Aug 14 14:19:30 UTC 2011
commit 0ebeb3586ca5bfe8c999cd049c3cc89bb36d7cc7
Author: Jason Tibbitts <tibbs at math.uh.edu>
Date: Sun Aug 14 09:18:45 2011 -0500
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 ------
...tall.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(-)
---
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 at zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
-+AC_INIT(zm,1.24.3,support at zoneminder.com,zoneminder,http://www.zoneminder.com/downloads.html)
+-AC_INIT(zm,1.24.4,support at zoneminder.com,ZoneMinder,http://www.zoneminder.com/downloads.html)
++AC_INIT(zm,1.24.4,support at 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 at 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 at redhat.com> - 1.24.3-7.20110324svn3310
- Perl mass rebuild
More information about the scm-commits
mailing list