[zoneminder/f16] use patch from rawhide

[Tom Callaway]

commit 58aa9f120ac29bfa99fd069ab1aa3c4cdac3db84
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Fri Aug 26 16:47:55 2011 -0400

    use patch from rawhide

 zoneminder-1.24.4-gcrypt.patch |   65 ++++++++++++++++++++++++++++++++++++++++
 zoneminder.spec                |    4 ++
 2 files changed, 69 insertions(+), 0 deletions(-)
---
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.spec b/zoneminder.spec
index d9d23b7..616e8ba 100644
--- a/zoneminder.spec
+++ b/zoneminder.spec
@@ -29,6 +29,7 @@ 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.4-gcrypt.patch
 
 BuildRequires:  automake gnutls-devel
 BuildRequires:  mysql-devel pcre-devel libjpeg-devel
@@ -76,6 +77,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
@@ -215,6 +217,8 @@ fi
 %changelog
 * Fri Aug 26 2011 Tom Callaway <spot at fedoraproject.org> - 1.24.3-8.20110324svn3310
 - bump for gnutls
+- 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