File csync2-1.34.99-gnutls.patch of Package csync2

File csync2-1.34.99-gnutls.patch of Package csync2 (Revision 0780940d9d9158a3e9df54d70190a8ff)

Currently displaying revision 0780940d9d9158a3e9df54d70190a8ff, show latest

--- update.c.orig	2010-07-27 19:44:37.465862066 +0200
+++ update.c	2010-07-27 19:44:47.497862215 +0200
@@ -70,7 +70,7 @@
 	if ( conn_open(peername) ) return -1;
 
 	if ( use_ssl ) {
-#if HAVE_LIBGNUTLS
+#ifdef HAVE_LIBGNUTLS
 		conn_printf("SSL\n");
 		if ( read_conn_status(0, peername) ) {
 			csync_debug(1, "SSL command failed.\n");
--- configure.ac.orig	2010-07-28 22:09:01.548845860 +0200
+++ configure.ac	2010-07-28 22:28:45.525535875 +0200
@@ -32,6 +32,7 @@
 AC_PROG_INSTALL
 AC_PROG_YACC
 AM_PROG_LEX
+PKG_PROG_PKG_CONFIG
 
 # check for large file support
 AC_SYS_LARGEFILE
@@ -79,7 +80,7 @@
 then
 	# Check for gnuTLS.
 	AM_PATH_LIBGNUTLS(1.0.0, , [ AC_MSG_ERROR([[gnutls not found; install gnutls, gnutls-openssl and libtasn1 packages for your system or run configure with --disable-gnutls]]) ])
-
+	PKG_CHECK_MODULES([LIBGNUTLS], [gnutls] , [AC_DEFINE(HAVE_LIBGNUTLS, 1, [Define to 1 if GnuTLS is available])])
 	## This is a bloody hack for fedora core
 	CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
 	LIBS="$LIBS $LIBGNUTLS_LIBS -ltasn1"
--- conn.c.orig	2010-07-28 22:49:43.897539352 +0200
+++ conn.c	2010-07-28 22:52:03.281691948 +0200
@@ -166,8 +166,7 @@
 			"SSL: failed to use key file %s and/or certificate file %s: %s (%s)\n",
 			ssl_keyfile,
 			ssl_certfile,
-			gnutls_strerror(err),
-			gnutls_strerror_name(err)
+			gnutls_strerror(err)
 		);
 	}
 
@@ -231,8 +230,7 @@
 
 		csync_fatal(
 			"SSL: handshake failed: %s (%s)\n",
-			gnutls_strerror(err),
-			gnutls_strerror_name(err)
+			gnutls_strerror(err)
 		);
 	}