From ef5120f4679dd3ec4b7ee20fdd9f698cfe309288386833d31fe40a7606465d08 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Tue, 14 Aug 2018 14:10:54 +0000 Subject: [PATCH 1/4] - Avoid systemd service removal errors when uninstalling (bsc#1093165) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=47 --- csync2.changes | 5 +++++ csync2.spec | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/csync2.changes b/csync2.changes index c608f4f..c2f2f9a 100644 --- a/csync2.changes +++ b/csync2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 14 14:10:16 UTC 2018 - kgronlund@suse.com + +- Avoid systemd service removal errors when uninstalling (bsc#1093165) + ------------------------------------------------------------------- Thu Jul 19 13:46:24 UTC 2017 - tchvatal@suse.com diff --git a/csync2.spec b/csync2.spec index b8a8a3f..f07f33d 100644 --- a/csync2.spec +++ b/csync2.spec @@ -1,7 +1,7 @@ # # spec file for package csync2 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -20,7 +20,7 @@ Name: csync2 Version: 2.0+git.1461714863.10636a4 Release: 0 Summary: Cluster synchronization tool -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Clustering/HA Url: http://oss.linbit.com/csync2/ #Source0: http://oss.linbit.com/csync2/%{name}-%{version}.tar.gz @@ -109,7 +109,7 @@ EOF fi %preun -%service_del_preun csync2.socket csync2@.service +%service_del_preun csync2.socket # Cleanup all databases upon last removal if [ $1 -eq 0 ]; then rm -f %{_localstatedir}/lib/csync2/* From ca14e7e3cdffe8b6ec87d72b97aa6462f2cb153f5ea7f9b331616115ca1b135d Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Wed, 15 Aug 2018 14:16:30 +0000 Subject: [PATCH 2/4] Avoid systemd service removal errors when uninstalling (bsc#1093165) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=48 --- _service | 2 +- csync2-2.0+git.1461714863.10636a4.tar.bz2 | 3 --- csync2-2.0+git.1529072214.b66d298.tar.bz2 | 3 +++ csync2.spec | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 csync2-2.0+git.1461714863.10636a4.tar.bz2 create mode 100644 csync2-2.0+git.1529072214.b66d298.tar.bz2 diff --git a/_service b/_service index a4fe9ef..9ecd214 100644 --- a/_service +++ b/_service @@ -1,6 +1,6 @@ - git://git.linbit.com/csync2.git + https://github.com/LINBIT/csync2.git git .git 2.0+git.%ct.%h diff --git a/csync2-2.0+git.1461714863.10636a4.tar.bz2 b/csync2-2.0+git.1461714863.10636a4.tar.bz2 deleted file mode 100644 index 4c94939..0000000 --- a/csync2-2.0+git.1461714863.10636a4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6cf2f32ceb24abc08407e1522c28022c026e8982591d786d597221e90971f38a -size 91136 diff --git a/csync2-2.0+git.1529072214.b66d298.tar.bz2 b/csync2-2.0+git.1529072214.b66d298.tar.bz2 new file mode 100644 index 0000000..426697c --- /dev/null +++ b/csync2-2.0+git.1529072214.b66d298.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:517a27932a058f7262ef3d453bb5f5b274369fc0193b8c4a1fb0874caa19d00a +size 91690 diff --git a/csync2.spec b/csync2.spec index f07f33d..12e6eeb 100644 --- a/csync2.spec +++ b/csync2.spec @@ -17,7 +17,7 @@ Name: csync2 -Version: 2.0+git.1461714863.10636a4 +Version: 2.0+git.1529072214.b66d298 Release: 0 Summary: Cluster synchronization tool License: GPL-2.0-or-later From 08cc63c233df202958bfff91fbabd3078a7b770c6c98834176fd039b580adb28 Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Wed, 15 Aug 2018 14:20:37 +0000 Subject: [PATCH 3/4] update to latest upstream OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=49 --- csync2.changes | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/csync2.changes b/csync2.changes index c2f2f9a..8cde54d 100644 --- a/csync2.changes +++ b/csync2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 15 14:20:12 UTC 2018 - kgronlund@suse.com + +- comparison of peer names provided via command line should not be case sensitive (bsc#1082576) +- fix for inetd stderr >& stdout +- fix log message when generating backup files, demote log level +- document -l and -N switches + ------------------------------------------------------------------- Tue Aug 14 14:10:16 UTC 2018 - kgronlund@suse.com From 05f91abe90936e583e0b032c9140b7b70ecc438116a27be31438b4af37a5226b Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Wed, 15 Aug 2018 14:28:33 +0000 Subject: [PATCH 4/4] update fix-sonames.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=50 --- fix-sonames.patch | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/fix-sonames.patch b/fix-sonames.patch index ba0b555..22bc252 100644 --- a/fix-sonames.patch +++ b/fix-sonames.patch @@ -48,31 +48,6 @@ Index: csync2-2.0+git.1368794815.cf835a7/db_postgres.c LOOKUP_SYMBOL(dl_handle, PQconnectdb); LOOKUP_SYMBOL(dl_handle, PQstatus); -Index: csync2-2.0+git.1368794815.cf835a7/db_sqlite.c -=================================================================== ---- csync2-2.0+git.1368794815.cf835a7.orig/db_sqlite.c -+++ csync2-2.0+git.1368794815.cf835a7/db_sqlite.c -@@ -56,16 +56,16 @@ static void *dl_handle; - - static void db_sqlite3_dlopen(void) - { -- csync_debug(2, "Opening shared library libsqlite3.so\n"); -+ csync_debug(2, "Opening shared library libsqlite3.so.0\n"); - -- dl_handle = dlopen("libsqlite3.so", RTLD_LAZY); -+ dl_handle = dlopen("libsqlite3.so.0", RTLD_LAZY); - if (dl_handle == NULL) { - csync_fatal -- ("Could not open libsqlite3.so: %s\n" -+ ("Could not open libsqlite3.so.0: %s\n" - "Please install sqlite3 client library (libsqlite3) or use other database (postgres, mysql)\n", - dlerror()); - } -- csync_debug(2, "Reading symbols from shared library libsqlite3.so\n"); -+ csync_debug(2, "Reading symbols from shared library libsqlite3.so.0\n"); - - LOOKUP_SYMBOL(dl_handle, sqlite3_open); - LOOKUP_SYMBOL(dl_handle, sqlite3_close); Index: csync2-2.0+git.1368794815.cf835a7/db_sqlite2.c =================================================================== --- csync2-2.0+git.1368794815.cf835a7.orig/db_sqlite2.c