forked from pool/csync2
9f55eb0d6d
- Update patches * Add 0001-Add-COPYING-as-docfile.patch * Add 0002-Patch-sonames.patch * Add 0003-Set-AC_PROG_CPP-in-configure.ac.patch * Remove add-COPYING.patch * Remove add-ac_prog_cpp.patch * Remove fix-sonames.patch - 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) - Remove systemd dep in favor of systemd-rpm-macros - Format a bit with spec-cleaner - Add proper dependency over openssl - Remove all the tex deps as we now reduce from 300 to 160 buildrequires - Remove xinetd service and use only socket activation to keep only one tool for the job * Also remove patch csync2-fix-xinetd.patch - Requires(post) hostname|openssl - Avoid runtime dependency on systemd, the macros can all deal with its absence. - Ensure csync@.service template instances are disabled on package removal. - 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 - Add csync2-librsync-1.0.0.patch: Fix build with librsync 1.0.0. - Ensure COPYING file is included in package + Added add-COPYING.patch - Update to upstream version 2.0-rc2. Changes since 1.34 too numerous to list, but include: + Database abstraction layer (default build uses sqlite3) + IPv6 support + Native GnuTLS support + tempdir and lock-timeout config options + do-local-only config option for actions - Reworked patches and extra source being carried in openSUSE: + Added csync2.socket and csync2@.service for use via systemd + Added add-ac_prog_cpp.patch + Added fix-csync2_ssl_cert-filename.patch + Added fix-sonames.patch + Updated csync2-fix-xinetd.patch + Updated README.quickstart + Removed fix-missing-sentinels.diff (upstream) + Removed csync2-1.34-pure-gnutls-r2.patch (obsolete) + Removed force-debug-stderr-off-inetd.patch (obsolete) + Removed bind-to-local-hostname.patch (obsolete) - Try to bind to "local" IP explicitly to avoid "identification failed" errors with multiple IPs on same subnet (bnc#757327) + Added bind-to-local-hostname.patch - update license to new format - Drop requirement on libgnutls-extra-devel (unnecessary on openSUSE) - Force debug output off completely when running under xinetd (fixes protocol breakage when target directories don't exist; bnc#752563) - factory has librsync split into devel package - Remove explicit lib dependencies from spec file - Add csync2-rm-ssl-cert helper script (bnc#709811) - Remove redundant tags/sections from specfile - Fix build against gnutls 2.8 in factory (integrated patch from http://bugs.gentoo.org/show_bug.cgi?id=274213) - fix build against current openssl - Init import of csync2 for DRBD configuration file sync (fate#307419) OBS-URL: https://build.opensuse.org/request/show/705600 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=52
94 lines
3.1 KiB
Diff
94 lines
3.1 KiB
Diff
From 61fc9b93569fd17399404eebe68f8b45b07e1d86 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?= <krig@koru.se>
|
|
Date: Mon, 27 May 2019 07:10:23 +0200
|
|
Subject: [PATCH 2/3] Patch sonames
|
|
|
|
---
|
|
db_mysql.c | 8 ++++----
|
|
db_postgres.c | 8 ++++----
|
|
db_sqlite2.c | 11 ++++-------
|
|
3 files changed, 12 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/db_mysql.c b/db_mysql.c
|
|
index 9570fd0..21e5887 100644
|
|
--- a/db_mysql.c
|
|
+++ b/db_mysql.c
|
|
@@ -53,16 +53,16 @@ static void *dl_handle;
|
|
|
|
static void db_mysql_dlopen(void)
|
|
{
|
|
- csync_debug(2, "Opening shared library libmysqlclient.so\n");
|
|
- dl_handle = dlopen("libmysqlclient.so", RTLD_LAZY);
|
|
+ csync_debug(2, "Opening shared library libmysqlclient.so.18\n");
|
|
+ dl_handle = dlopen("libmysqlclient.so.18", RTLD_LAZY);
|
|
if (dl_handle == NULL) {
|
|
csync_fatal
|
|
- ("Could not open libmysqlclient.so: %s\n"
|
|
+ ("Could not open libmysqlclient.so.18: %s\n"
|
|
"Please install Mysql client library (libmysqlclient) or use other database (sqlite, postgres)\n",
|
|
dlerror());
|
|
}
|
|
|
|
- csync_debug(2, "Reading symbols from shared library libmysqlclient.so\n");
|
|
+ csync_debug(2, "Reading symbols from shared library libmysqlclient.so.18\n");
|
|
|
|
LOOKUP_SYMBOL(dl_handle, mysql_init);
|
|
LOOKUP_SYMBOL(dl_handle, mysql_real_connect);
|
|
diff --git a/db_postgres.c b/db_postgres.c
|
|
index 5aa3355..beea8ae 100644
|
|
--- a/db_postgres.c
|
|
+++ b/db_postgres.c
|
|
@@ -58,16 +58,16 @@ static void *dl_handle;
|
|
|
|
static void db_postgres_dlopen(void)
|
|
{
|
|
- csync_debug(2, "Opening shared library libpq.so\n");
|
|
+ csync_debug(2, "Opening shared library libpq.so.5\n");
|
|
|
|
- dl_handle = dlopen("libpq.so", RTLD_LAZY);
|
|
+ dl_handle = dlopen("libpq.so.5", RTLD_LAZY);
|
|
if (dl_handle == NULL) {
|
|
csync_fatal
|
|
- ("Could not open libpq.so: %s\n"
|
|
+ ("Could not open libpq.so.5: %s\n"
|
|
"Please install postgres client library (libpg) or use other database (sqlite, mysql)\n",
|
|
dlerror());
|
|
}
|
|
- csync_debug(2, "Reading symbols from shared library libpq.so\n");
|
|
+ csync_debug(2, "Reading symbols from shared library libpq.so.5\n");
|
|
|
|
LOOKUP_SYMBOL(dl_handle, PQconnectdb);
|
|
LOOKUP_SYMBOL(dl_handle, PQstatus);
|
|
diff --git a/db_sqlite2.c b/db_sqlite2.c
|
|
index 577cbcb..485b065 100644
|
|
--- a/db_sqlite2.c
|
|
+++ b/db_sqlite2.c
|
|
@@ -54,20 +54,17 @@ static void *dl_handle;
|
|
|
|
static void db_sqlite_dlopen(void)
|
|
{
|
|
- csync_debug(2, "Opening shared library libsqlite.so\n");
|
|
+ csync_debug(2, "Opening shared library libsqlite.so.0\n");
|
|
|
|
- dl_handle = dlopen("libsqlite.so", RTLD_LAZY);
|
|
+ dl_handle = dlopen("libsqlite.so.0", RTLD_LAZY);
|
|
if (dl_handle == NULL) {
|
|
- csync_debug(1, "Libsqlite.so not found, trying libsqlite.so.0\n");
|
|
- dl_handle = dlopen("libsqlite.so.0", RTLD_LAZY);
|
|
- if (dl_handle == NULL) {
|
|
csync_fatal
|
|
- ("Could not open libsqlite.so: %s\n"
|
|
+ ("Could not open libsqlite.so.0: %s\n"
|
|
"Please install sqlite client library (libsqlite) or use other database (postgres, mysql)\n",
|
|
dlerror());
|
|
}
|
|
}
|
|
- csync_debug(2, "Opening shared library libsqlite.so\n");
|
|
+ csync_debug(2, "Opening shared library libsqlite.so.0\n");
|
|
|
|
LOOKUP_SYMBOL(dl_handle, sqlite_open);
|
|
LOOKUP_SYMBOL(dl_handle, sqlite_close);
|
|
--
|
|
2.21.0
|
|
|