From 9f55eb0d6d059e75017ee18d30fa465932c9e566412e4ea139d1b0d39f7318af Mon Sep 17 00:00:00 2001 From: Kristoffer Gronlund Date: Mon, 27 May 2019 08:44:38 +0000 Subject: [PATCH] Accepting request 705600 from home:KGronlund:branches:network:ha-clustering:Factory - 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 --- 0001-Add-COPYING-as-docfile.patch | 25 ++++++++++++ fix-sonames.patch => 0002-Patch-sonames.patch | 38 +++++++++++++------ 0003-Set-AC_PROG_CPP-in-configure.ac.patch | 24 ++++++++++++ add-COPYING.patch | 13 ------- add-ac_prog_cpp.patch | 12 ------ csync2-2.0+git.1529072214.b66d298.tar.bz2 | 3 -- csync2-2.0+git.1542296533.b974921.tar.bz2 | 3 ++ csync2.changes | 11 ++++++ csync2.spec | 33 +++++++--------- 9 files changed, 103 insertions(+), 59 deletions(-) create mode 100644 0001-Add-COPYING-as-docfile.patch rename fix-sonames.patch => 0002-Patch-sonames.patch (78%) create mode 100644 0003-Set-AC_PROG_CPP-in-configure.ac.patch delete mode 100644 add-COPYING.patch delete mode 100644 add-ac_prog_cpp.patch delete mode 100644 csync2-2.0+git.1529072214.b66d298.tar.bz2 create mode 100644 csync2-2.0+git.1542296533.b974921.tar.bz2 diff --git a/0001-Add-COPYING-as-docfile.patch b/0001-Add-COPYING-as-docfile.patch new file mode 100644 index 0000000..b61374d --- /dev/null +++ b/0001-Add-COPYING-as-docfile.patch @@ -0,0 +1,25 @@ +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 + diff --git a/fix-sonames.patch b/0002-Patch-sonames.patch similarity index 78% rename from fix-sonames.patch rename to 0002-Patch-sonames.patch index 22bc252..e5f4d46 100644 --- a/fix-sonames.patch +++ b/0002-Patch-sonames.patch @@ -1,7 +1,18 @@ -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 +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) @@ -23,10 +34,10 @@ Index: csync2-2.0+git.1368794815.cf835a7/db_mysql.c 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 +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) @@ -48,10 +59,10 @@ 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_sqlite2.c -=================================================================== ---- csync2-2.0+git.1368794815.cf835a7.orig/db_sqlite2.c -+++ csync2-2.0+git.1368794815.cf835a7/db_sqlite2.c +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) @@ -77,3 +88,6 @@ Index: csync2-2.0+git.1368794815.cf835a7/db_sqlite2.c LOOKUP_SYMBOL(dl_handle, sqlite_open); LOOKUP_SYMBOL(dl_handle, sqlite_close); +-- +2.21.0 + diff --git a/0003-Set-AC_PROG_CPP-in-configure.ac.patch b/0003-Set-AC_PROG_CPP-in-configure.ac.patch new file mode 100644 index 0000000..d6ddab6 --- /dev/null +++ b/0003-Set-AC_PROG_CPP-in-configure.ac.patch @@ -0,0 +1,24 @@ +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 + diff --git a/add-COPYING.patch b/add-COPYING.patch deleted file mode 100644 index b415a99..0000000 --- a/add-COPYING.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: csync2-2.0+git.1368794815.cf835a7/Makefile.am -=================================================================== ---- csync2-2.0+git.1368794815.cf835a7.orig/Makefile.am -+++ csync2-2.0+git.1368794815.cf835a7/Makefile.am -@@ -40,7 +40,7 @@ CLEANFILES = cfgfile_parser.c cfgfile_pa - - DISTCLEANFILES = config.status config.h .deps/*.Po stamp-h1 Makefile Makefile.in configure - --docfiles = ChangeLog README AUTHORS -+docfiles = ChangeLog README AUTHORS COPYING - - if HAVE_PDFLATEX - diff --git a/add-ac_prog_cpp.patch b/add-ac_prog_cpp.patch deleted file mode 100644 index 2aa3f07..0000000 --- a/add-ac_prog_cpp.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: csync2-2.0+git.1368794815.cf835a7/configure.ac -=================================================================== ---- csync2-2.0+git.1368794815.cf835a7.orig/configure.ac -+++ csync2-2.0+git.1368794815.cf835a7/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 diff --git a/csync2-2.0+git.1529072214.b66d298.tar.bz2 b/csync2-2.0+git.1529072214.b66d298.tar.bz2 deleted file mode 100644 index 426697c..0000000 --- a/csync2-2.0+git.1529072214.b66d298.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:517a27932a058f7262ef3d453bb5f5b274369fc0193b8c4a1fb0874caa19d00a -size 91690 diff --git a/csync2-2.0+git.1542296533.b974921.tar.bz2 b/csync2-2.0+git.1542296533.b974921.tar.bz2 new file mode 100644 index 0000000..0987db4 --- /dev/null +++ b/csync2-2.0+git.1542296533.b974921.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a5b0dfcc0aa2c9231e88b489e9d2cdcd5d1a08b62fe7cd513566a160fdeb485 +size 91448 diff --git a/csync2.changes b/csync2.changes index 8cde54d..21920bc 100644 --- a/csync2.changes +++ b/csync2.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon May 27 08:13:02 UTC 2019 - Kristoffer Gronlund + +- 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 + ------------------------------------------------------------------- Wed Aug 15 14:20:12 UTC 2018 - kgronlund@suse.com diff --git a/csync2.spec b/csync2.spec index 12e6eeb..2f4c212 100644 --- a/csync2.spec +++ b/csync2.spec @@ -1,7 +1,7 @@ # # spec file for package csync2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: csync2 -Version: 2.0+git.1529072214.b66d298 +Version: 2.0+git.1542296533.b974921 Release: 0 Summary: Cluster synchronization tool License: GPL-2.0-or-later @@ -29,12 +29,12 @@ Source1: csync2-README.quickstart Source2: csync2-rm-ssl-cert Source3: csync2.socket Source4: csync2@.service -# PATCH-FIX-UPSTREAM -- add-ac_prog_cpp.patch tserong@suse.com -- fix ugly ./configure warnings about missing headers -Patch10: add-ac_prog_cpp.patch -# PATCH-FIX-UPSTREAM -- fix-sonames.patch tserong@suse.com -- use properly versioned sonames in dlopen() -Patch12: fix-sonames.patch -# PATCH-FIX-UPSTREAM -- add-COPYING.patch tserong@suse.com -- ensure COPYING is present in docfiles and thus %doc -Patch13: add-COPYING.patch +# PATCH-FIX-UPSTREAM -- tserong@suse.com -- fix ugly ./configure warnings about missing headers +Patch10: 0003-Set-AC_PROG_CPP-in-configure.ac.patch +# PATCH-FIX-UPSTREAM -- tserong@suse.com -- use properly versioned sonames in dlopen() +Patch12: 0002-Patch-sonames.patch +# PATCH-FIX-UPSTREAM -- tserong@suse.com -- ensure COPYING is present in docfiles and thus %doc +Patch13: 0001-Add-COPYING-as-docfile.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -90,22 +90,17 @@ touch %{buildroot}%{_sysconfdir}/csync2/csync2_ssl_cert.pem %service_add_post csync2.socket umask 077 if [ ! -f %{_sysconfdir}/csync2/csync2_ssl_key.pem ]; then -%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 1024 > %{_sysconfdir}/csync2/csync2_ssl_key.pem 2>/dev/null + %{_bindir}/openssl genrsa -out %{_sysconfdir}/csync2/csync2_ssl_key.pem 1024 fi FQDN=`hostname` if [ "x${FQDN}" = "x" ]; then FQDN=localhost.localdomain fi if [ ! -f %{_sysconfdir}/csync2/csync2_ssl_cert.pem ]; then -cat << EOF | %{_bindir}/openssl req -new -key %{_sysconfdir}/csync2/csync2_ssl_key.pem -x509 -days 3000 -out %{_sysconfdir}/csync2/csync2_ssl_cert.pem 2>/dev/null --- -SomeState -SomeCity -SomeOrganization -SomeOrganization -SomeName -name@example.com -EOF + yes '' | %{_bindir}/openssl req -new -key %{_sysconfdir}/csync2/csync2_ssl_key.pem -out %{_sysconfdir}/csync2/csync2_ssl_cert.csr + %{_bindir}/openssl x509 -req -days 3000 -in %{_sysconfdir}/csync2/csync2_ssl_cert.csr -signkey %{_sysconfdir}/csync2/csync2_ssl_key.pem \ + -out %{_sysconfdir}/csync2/csync2_ssl_cert.pem + rm %{_sysconfdir}/csync2/csync2_ssl_cert.csr fi %preun