Changes - j0ke.net Open Build Service

Changes of Revision 37

[-] [+]	Changed	csync2.spec
@@ -83,7 +83,7 @@ %build export CFLAGS="$RPM_OPT_FLAGS -I/usr/kerberos/include" if ! [ -f configure ]; then ./autogen.sh; fi -%configure +%configure && cat config.h %__make all cd $RPM_BUILD_DIR/sqlite-%{sqliteversion}
[-] [+]	Changed	csync2-1.34-no-gnutls.patch ^
@@ -268,3 +268,47 @@ fi AM_CONDITIONAL([HAVE_LIBGNUTLS], [test "$enable_gnutls" != no ]) +--- csync2.c.orig 2010-07-29 00:47:50.621986517 +0200 ++++ csync2.c 2010-07-29 00:49:01.145848649 +0200 +@@ -539,7 +539,7 @@ + para = cmd ? strtok(0, "\t \r\n") : 0; + + if (cmd && !strcasecmp(cmd, "ssl")) { +-#ifdef HAVE_LIBGNUTLS ++#ifdef HAVE_LIBGNUTLS_OPENSSL + conn_printf("OK (activating_ssl).\n"); + conn_activate_ssl(1); + +--- csync2.h.orig 2010-07-29 00:47:58.418811787 +0200 ++++ csync2.h 2010-07-29 00:48:42.729878322 +0200 +@@ -359,7 +359,7 @@ + + extern int csync_compare_mode; + +-#ifdef HAVE_LIBGNUTLS ++#ifdef HAVE_LIBGNUTLS_OPENSSL + extern int csync_conn_usessl; + #endif + +--- daemon.c.orig 2010-07-29 00:48:03.918017929 +0200 ++++ daemon.c 2010-07-29 00:48:29.129850262 +0200 +@@ -597,7 +597,7 @@ + cmd_error = "Identification failed!"; + break; + } +-#ifdef HAVE_LIBGNUTLS ++#ifdef HAVE_LIBGNUTLS_OPENSSL + if (!csync_conn_usessl) { + struct csync_nossl *t; + for (t = csync_nossl; t; t=t->next) { +--- update.c.orig 2010-07-29 00:48:08.826859601 +0200 ++++ update.c 2010-07-29 00:48:17.422015333 +0200 +@@ -70,7 +70,7 @@ + if ( conn_open(peername) ) return -1; + + if ( use_ssl ) { +-#if HAVE_LIBGNUTLS ++#if HAVE_LIBGNUTLS_OPENSSL + conn_printf("SSL\n"); + if ( read_conn_status(0, peername) ) { + csync_debug(1, "SSL command failed.\n");