From 3e8e83b7555ff4765bf88909c3b4f1d99fdd19f3347b431cc843912d14d6d0b4 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Wed, 27 Apr 2016 10:18:37 +0000 Subject: [PATCH 1/3] - 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 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=39 --- csync2-2.0+git.1368794815.cf835a7.tar.bz2 | 3 --- csync2-2.0+git.1461714863.10636a4.tar.bz2 | 3 +++ csync2-librsync-1.0.0.patch | 16 ---------------- csync2.changes | 12 ++++++++++++ csync2.spec | 10 ++-------- fix-csync2_ssl_cert-filename.patch | 21 --------------------- 6 files changed, 17 insertions(+), 48 deletions(-) delete mode 100644 csync2-2.0+git.1368794815.cf835a7.tar.bz2 create mode 100644 csync2-2.0+git.1461714863.10636a4.tar.bz2 delete mode 100644 csync2-librsync-1.0.0.patch delete mode 100644 fix-csync2_ssl_cert-filename.patch diff --git a/csync2-2.0+git.1368794815.cf835a7.tar.bz2 b/csync2-2.0+git.1368794815.cf835a7.tar.bz2 deleted file mode 100644 index 9f3abd3..0000000 --- a/csync2-2.0+git.1368794815.cf835a7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e9613f71d49c15b3b4b1d4d747f0bc9f397ff0823dd9daaf2743ab93bd298781 -size 91654 diff --git a/csync2-2.0+git.1461714863.10636a4.tar.bz2 b/csync2-2.0+git.1461714863.10636a4.tar.bz2 new file mode 100644 index 0000000..4c94939 --- /dev/null +++ b/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 diff --git a/csync2-librsync-1.0.0.patch b/csync2-librsync-1.0.0.patch deleted file mode 100644 index 3d23037..0000000 --- a/csync2-librsync-1.0.0.patch +++ /dev/null @@ -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) diff --git a/csync2.changes b/csync2.changes index 400ddfc..c8a84cd 100644 --- a/csync2.changes +++ b/csync2.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 diff --git a/csync2.spec b/csync2.spec index 886b268..172ea1b 100644 --- a/csync2.spec +++ b/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 @@ -79,10 +75,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}" diff --git a/fix-csync2_ssl_cert-filename.patch b/fix-csync2_ssl_cert-filename.patch deleted file mode 100644 index 6e69aa7..0000000 --- a/fix-csync2_ssl_cert-filename.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit 456732b -Author: Tim Serong -Date: Mon Sep 2 16:50:27 2013 +1000 - - Fix typo in csync2_ssl_cert.pem filename - - Signed-off-by: Tim Serong - -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); From 99961227a8cc5e80f10980e5f3b571adfffb091afbf3c4db72747545ede3755c Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Fri, 13 May 2016 15:26:06 +0000 Subject: [PATCH 2/3] Accepting request 394099 from home:jengelh:branches:network:ha-clustering:Factory - Avoid runtime dependency on systemd, the macros can all deal with its absence. - Call %systemd_pre/post/etc. on csync@.service template as well. OBS-URL: https://build.opensuse.org/request/show/394099 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=40 --- csync2.changes | 7 +++++++ csync2.spec | 10 ++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/csync2.changes b/csync2.changes index c8a84cd..5ec24ce 100644 --- a/csync2.changes +++ b/csync2.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 6 21:13:01 UTC 2016 - jengelh@inai.de + +- Avoid runtime dependency on systemd, the macros can all deal with + its absence. +- Call %systemd_pre/post/etc. on csync@.service template as well. + ------------------------------------------------------------------- Wed Apr 27 09:49:11 UTC 2016 - kgronlund@suse.com diff --git a/csync2.spec b/csync2.spec index 172ea1b..0fe4171 100644 --- a/csync2.spec +++ b/csync2.spec @@ -51,7 +51,6 @@ BuildRequires: pkgconfig BuildRequires: sqlite3-devel Requires: openssl Requires: sqlite3 -%{?systemd_requires} %if 0%{?suse_version} >= 1210 BuildRequires: systemd %endif @@ -60,7 +59,6 @@ BuildRequires: texlive-latex %if 0%{?suse_version} > 1220 BuildRequires: texlive-nopageno %endif - BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -100,10 +98,10 @@ touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_key.pem touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_cert.pem %pre -%service_add_pre csync2.socket +%service_add_pre csync2.socket csync2@.service %post -%service_add_post csync2.socket +%service_add_post csync2.socket csync2@.service umask 077 if [ ! -f %{_sysconfdir}/csync2/csync2_ssl_key.pem ]; then /usr/bin/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/csync2/csync2_ssl_key.pem 2>/dev/null @@ -125,14 +123,14 @@ 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/* fi %postun -%service_del_postun csync2.socket +%service_del_postun csync2.socket csync2@.service %files %defattr(-,root,root) From a3d0de449ea24a0ab7dd130cdbe13370dd038b65934f96358771a3858f3f24f2 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Mon, 16 May 2016 12:08:29 +0000 Subject: [PATCH 3/3] Accepting request 395514 from home:jengelh:branches:network:ha-clustering:Factory after looking at fedora SRPMS, I decided to do this differently and only list templates on preun (and not have systemd-rpm-macros do the filtering). OBS-URL: https://build.opensuse.org/request/show/395514 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=41 --- csync2.changes | 3 ++- csync2.spec | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/csync2.changes b/csync2.changes index 5ec24ce..4aa1eab 100644 --- a/csync2.changes +++ b/csync2.changes @@ -3,7 +3,8 @@ Fri May 6 21:13:01 UTC 2016 - jengelh@inai.de - Avoid runtime dependency on systemd, the macros can all deal with its absence. -- Call %systemd_pre/post/etc. on csync@.service template as well. +- Ensure csync@.service template instances are disabled on package + removal. ------------------------------------------------------------------- Wed Apr 27 09:49:11 UTC 2016 - kgronlund@suse.com diff --git a/csync2.spec b/csync2.spec index 0fe4171..d33ca87 100644 --- a/csync2.spec +++ b/csync2.spec @@ -98,10 +98,10 @@ touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_key.pem touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_cert.pem %pre -%service_add_pre csync2.socket csync2@.service +%service_add_pre csync2.socket %post -%service_add_post csync2.socket csync2@.service +%service_add_post csync2.socket umask 077 if [ ! -f %{_sysconfdir}/csync2/csync2_ssl_key.pem ]; then /usr/bin/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/csync2/csync2_ssl_key.pem 2>/dev/null @@ -130,7 +130,7 @@ if [ $1 -eq 0 ]; then fi %postun -%service_del_postun csync2.socket csync2@.service +%service_del_postun csync2.socket %files %defattr(-,root,root)