commit csync2 for openSUSE:Factory
Hello community,
here is the log from the commit of package csync2 for openSUSE:Factory checked in at 2019-05-28 09:42:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/csync2 (Old)
and /work/SRC/openSUSE:Factory/.csync2.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "csync2"
Tue May 28 09:42:38 2019 rev:23 rq:705608 version:2.0+git.1542296533.b974921
Changes:
--------
--- /work/SRC/openSUSE:Factory/csync2/csync2.changes 2018-08-20 16:19:07.656797667 +0200
+++ /work/SRC/openSUSE:Factory/.csync2.new.5148/csync2.changes 2019-05-28 09:42:41.365856242 +0200
@@ -1,0 +2,27 @@
+Mon May 27 08:13:02 UTC 2019 - Kristoffer Gronlund
From 2488638523147ff0a4fc0643736153d1cb015334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Mon, 27 May 2019 07:09:16 +0200 Subject: [PATCH 1/3] Add COPYING as docfile
--- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index a938da6..e25d1d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,7 +40,7 @@ CLEANFILES = cfgfile_parser.c cfgfile_parser.h cfgfile_scanner.c \ DISTCLEANFILES = config.status config.h .deps/*.Po stamp-h1 Makefile Makefile.in configure -docfiles = ChangeLog README.adoc AUTHORS.adoc doc/csync2.adoc +docfiles = ChangeLog README.adoc AUTHORS.adoc doc/csync2.adoc COPYING doc_DATA = $(docfiles) dist_doc_DATA = $(docfiles) -- 2.21.0 ++++++ 0002-Patch-sonames.patch ++++++
From 61fc9b93569fd17399404eebe68f8b45b07e1d86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
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 ++++++ 0003-Set-AC_PROG_CPP-in-configure.ac.patch ++++++
From a1b5fdcd3b641717cdb0bfa2342d265831dc86e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20Gr=C3=B6nlund?=
Date: Mon, 27 May 2019 07:11:21 +0200 Subject: [PATCH 3/3] Set AC_PROG_CPP in configure.ac
--- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 3d2c27d..169e302 100644 --- a/configure.ac +++ b/configure.ac @@ -29,6 +29,7 @@ AM_CONFIG_HEADER(config.h) # Checks for programs. AC_PROG_CC +AC_PROG_CPP AC_PROG_INSTALL AC_PROG_YACC AM_PROG_LEX -- 2.21.0 ++++++ csync2-2.0+git.1529072214.b66d298.tar.bz2 -> csync2-2.0+git.1542296533.b974921.tar.bz2 ++++++ ++++ 2804 lines of diff (skipped)
participants (1)
-
root