Accepting request 395990 from network:ha-clustering:Factory

1

OBS-URL: https://build.opensuse.org/request/show/395990
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csync2?expand=0&rev=19

csync2-2.0+git.1368794815.cf835a7.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:e9613f71d49c15b3b4b1d4d747f0bc9f397ff0823dd9daaf2743ab93bd298781
-size 91654

csync2-2.0+git.1461714863.10636a4.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6cf2f32ceb24abc08407e1522c28022c026e8982591d786d597221e90971f38a
+size 91136

csync2-librsync-1.0.0.patch

@@ -1,16 +0,0 @@
-Index: csync2-2.0+git.1368794815.cf835a7/rsync.c
-===================================================================
---- csync2-2.0+git.1368794815.cf835a7.orig/rsync.c
-+++ csync2-2.0+git.1368794815.cf835a7/rsync.c
-@@ -461,7 +461,11 @@ int csync_rs_sigfile(const char *filenam
- 		goto out;
- 
- 	csync_debug(3, "Running rs_sig_file() from librsync....\n");
-+#ifdef RS_DEFAULT_STRONG_LEN
- 	result = rs_sig_file(basis_file, sig_file, RS_DEFAULT_BLOCK_LEN, RS_DEFAULT_STRONG_LEN, &stats);
-+#else
-+	result = rs_sig_file(basis_file, sig_file, RS_DEFAULT_BLOCK_LEN, 8, RS_MD4_SIG_MAGIC, &stats);
-+#endif
- 	*sig_file_out = sig_file;
- 	sig_file = NULL;
- 	if (result != RS_DONE)

csync2.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri May  6 21:13:01 UTC 2016 - jengelh@inai.de
+
+- Avoid runtime dependency on systemd, the macros can all deal with
+  its absence.
+- Ensure csync@.service template instances are disabled on package
+  removal.
+
+-------------------------------------------------------------------
+Wed Apr 27 09:49:11 UTC 2016 - kgronlund@suse.com
+
+- Update to csync2-2.0-6-g10636a4:
+  - Document the -N flag to bind csync2 to a specific ip address.
+  - fix diff mode truncation to first 512 byte
+  - fix diff mode prefix substitution
+
+- Drop merged patches:
+  - Remove csync2-librsync-1.0.0.patch
+  - Remove fix-csync2_ssl_cert-filename.patch
+
 -------------------------------------------------------------------
 Thu Mar 26 11:25:01 UTC 2015 - dimstar@opensuse.org
 

csync2.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package csync2
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,7 +21,7 @@ License:        GPL-2.0+
 Group:          Productivity/Clustering/HA
 
 Name:           csync2
-Version:        2.0+git.1368794815.cf835a7
+Version:        2.0+git.1461714863.10636a4
 Release:        0
 Url:            http://oss.linbit.com/csync2/
 #Source0:       http://oss.linbit.com/csync2/%{name}-%{version}.tar.gz
@@ -34,14 +34,10 @@ Source4:        csync2@.service
 Patch0:         csync2-fix-xinetd.patch
 # PATCH-FIX-UPSTREAM -- add-ac_prog_cpp.patch tserong@suse.com -- fix ugly ./configure warnings about missing headers
 Patch10:        add-ac_prog_cpp.patch
-# PATCH-FIX-UPSTREAM -- fix-csync2_ssl_cert-filename.patch tserong@suse.com -- correct csync2 ssl cert filename
-Patch11:        fix-csync2_ssl_cert-filename.patch
 # PATCH-FIX-UPSTREAM -- fix-sonames.patch tserong@suse.com -- use properly versioned sonames in dlopen()
 Patch12:        fix-sonames.patch
 # PATCH-FIX-UPSTREAM -- add-COPYING.patch tserong@suse.com -- ensure COPYING is present in docfiles and thus %doc
 Patch13:        add-COPYING.patch
-# PATCH-FIX-UPSTREAM csync2-librsync-1.0.0.patch dimstar@opensuse.org -- Fix build with librsync 1.0.0
-Patch14:        csync2-librsync-1.0.0.patch
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -55,7 +51,6 @@ BuildRequires:  pkgconfig
 BuildRequires:  sqlite3-devel
 Requires:       openssl
 Requires:       sqlite3
-%{?systemd_requires}
 %if 0%{?suse_version} >= 1210
 BuildRequires:  systemd
 %endif
@@ -64,7 +59,6 @@ BuildRequires:  texlive-latex
 %if 0%{?suse_version} > 1220
 BuildRequires:  texlive-nopageno
 %endif
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -79,10 +73,8 @@ It is expedient for HA-clusters, HPC-clusters, COWs and server farms.
 
 %patch0 -p1
 %patch10 -p1
-%patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 %build
 export CFLAGS="%{optflags}"
@@ -131,7 +123,7 @@ EOF
 fi
 
 %preun
-%service_del_preun csync2.socket
+%service_del_preun csync2.socket csync2@.service
 # Cleanup all databases upon last removal
 if [ $1 -eq 0 ]; then
   rm -f %{_localstatedir}/lib/csync2/*

fix-csync2_ssl_cert-filename.patch

@@ -1,21 +0,0 @@
-commit 456732b
-Author: Tim Serong <tserong@suse.com>
-Date:   Mon Sep 2 16:50:27 2013 +1000
-
-    Fix typo in csync2_ssl_cert.pem filename
-    
-    Signed-off-by: Tim Serong <tserong@suse.com>
-
-diff --git a/conn.c b/conn.c
-index 2b3611d..5e54693 100644
---- a/conn.c
-+++ b/conn.c
-@@ -281,7 +281,7 @@ int conn_activate_ssl(int server_role)
- 		return 0;
- 
- 	ASPRINTF(&ssl_keyfile, "%s/csync2_ssl_key.pem", systemdir);
--	ASPRINTF(&ssl_certfile, "%s/csync_ssl_cert.pem", systemdir);
-+	ASPRINTF(&ssl_certfile, "%s/csync2_ssl_cert.pem", systemdir);
- 
- 	gnutls_global_init();
- 	gnutls_global_set_log_function(ssl_log);