rpm/csync2
SHA256
1
0
Fork 0
forked from pool/csync2
Code Pull Requests Activity

Accepting request 293253 from network:ha-clustering:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/293253
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csync2?expand=0&rev=18
This commit is contained in:
Dominique Leuenberger 2015-03-28 17:38:40 +00:00 committed by Git OBS Bridge
commit 326b1ee002
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
csync2-librsync-1.0.0.patch Normal file
View File

@ -0,0 +1,16 @@
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)

5
csync2.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Mar 26 11:25:01 UTC 2015 - dimstar@opensuse.org
- Add csync2-librsync-1.0.0.patch: Fix build with librsync 1.0.0.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 26 09:07:40 UTC 2013 - tserong@suse.com Thu Sep 26 09:07:40 UTC 2013 - tserong@suse.com

7
csync2.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package csync2 # spec file for package csync2
# #
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -40,6 +40,8 @@ Patch11: fix-csync2_ssl_cert-filename.patch
Patch12: fix-sonames.patch Patch12: fix-sonames.patch
# PATCH-FIX-UPSTREAM -- add-COPYING.patch tserong@suse.com -- ensure COPYING is present in docfiles and thus %doc # PATCH-FIX-UPSTREAM -- add-COPYING.patch tserong@suse.com -- ensure COPYING is present in docfiles and thus %doc
Patch13: add-COPYING.patch 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: autoconf
BuildRequires: automake BuildRequires: automake
@ -59,7 +61,9 @@ BuildRequires: systemd
%endif %endif
# texlive is for pdflatex to build PDF version of the manual # texlive is for pdflatex to build PDF version of the manual
BuildRequires: texlive-latex BuildRequires: texlive-latex
%if 0%{?suse_version} > 1220
BuildRequires: texlive-nopageno BuildRequires: texlive-nopageno
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -78,6 +82,7 @@ It is expedient for HA-clusters, HPC-clusters, COWs and server farms.
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
%build %build
export CFLAGS="%{optflags}" export CFLAGS="%{optflags}"