05f91abe90
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/csync2?expand=0&rev=50
80 lines
3.1 KiB
Diff
80 lines
3.1 KiB
Diff
Index: csync2-2.0+git.1368794815.cf835a7/db_mysql.c
|
|
===================================================================
|
|
--- csync2-2.0+git.1368794815.cf835a7.orig/db_mysql.c
|
|
+++ csync2-2.0+git.1368794815.cf835a7/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);
|
|
Index: csync2-2.0+git.1368794815.cf835a7/db_postgres.c
|
|
===================================================================
|
|
--- csync2-2.0+git.1368794815.cf835a7.orig/db_postgres.c
|
|
+++ csync2-2.0+git.1368794815.cf835a7/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);
|
|
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/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);
|