Accepting request 629416 from network:ha-clustering:Factory

- 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
 

- Avoid systemd service removal errors when uninstalling (bsc#1093165)

OBS-URL: https://build.opensuse.org/request/show/629416
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/csync2?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2018-08-20 14:19:05 +00:00 committed by Git OBS Bridge
commit 87796e93c5
6 changed files with 21 additions and 33 deletions

View File

@ -1,6 +1,6 @@
<services> <services>
<service name="tar_scm" mode="disabled"> <service name="tar_scm" mode="disabled">
<param name="url">git://git.linbit.com/csync2.git</param> <param name="url">https://github.com/LINBIT/csync2.git</param>
<param name="scm">git</param> <param name="scm">git</param>
<param name="exclude">.git</param> <param name="exclude">.git</param>
<param name="versionformat">2.0+git.%ct.%h</param> <param name="versionformat">2.0+git.%ct.%h</param>

View File

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

View File

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

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
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
- Avoid systemd service removal errors when uninstalling (bsc#1093165)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 19 13:46:24 UTC 2017 - tchvatal@suse.com Thu Jul 19 13:46:24 UTC 2017 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package csync2 # 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 # 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
@ -17,10 +17,10 @@
Name: csync2 Name: csync2
Version: 2.0+git.1461714863.10636a4 Version: 2.0+git.1529072214.b66d298
Release: 0 Release: 0
Summary: Cluster synchronization tool Summary: Cluster synchronization tool
License: GPL-2.0+ License: GPL-2.0-or-later
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Url: http://oss.linbit.com/csync2/ Url: http://oss.linbit.com/csync2/
#Source0: http://oss.linbit.com/csync2/%{name}-%{version}.tar.gz #Source0: http://oss.linbit.com/csync2/%{name}-%{version}.tar.gz
@ -109,7 +109,7 @@ EOF
fi fi
%preun %preun
%service_del_preun csync2.socket csync2@.service %service_del_preun csync2.socket
# Cleanup all databases upon last removal # Cleanup all databases upon last removal
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
rm -f %{_localstatedir}/lib/csync2/* rm -f %{_localstatedir}/lib/csync2/*

View File

@ -48,31 +48,6 @@ Index: csync2-2.0+git.1368794815.cf835a7/db_postgres.c
LOOKUP_SYMBOL(dl_handle, PQconnectdb); LOOKUP_SYMBOL(dl_handle, PQconnectdb);
LOOKUP_SYMBOL(dl_handle, PQstatus); 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 Index: csync2-2.0+git.1368794815.cf835a7/db_sqlite2.c
=================================================================== ===================================================================
--- csync2-2.0+git.1368794815.cf835a7.orig/db_sqlite2.c --- csync2-2.0+git.1368794815.cf835a7.orig/db_sqlite2.c