From 3c433e79280df0964e5ba31376ecc3d9bfcfeb71 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 1 May 2020 17:26:19 +0200 Subject: [PATCH] - updated to 4.5.0 - updated bash,ac patches - removed obsolete sizeof patch --- resource-agents-ac.patch | 11 ++++++----- resource-agents-bash.patch | 9 --------- resource-agents-sizeof.patch | 11 ----------- resource-agents.spec | 16 ++++++++++------ 4 files changed, 16 insertions(+), 31 deletions(-) delete mode 100644 resource-agents-sizeof.patch diff --git a/resource-agents-ac.patch b/resource-agents-ac.patch index 39723a9..739ed87 100644 --- a/resource-agents-ac.patch +++ b/resource-agents-ac.patch @@ -1,16 +1,17 @@ ---- ClusterLabs-resource-agents-ac806fd/configure.ac.orig 2013-09-07 15:50:34.699654985 +0200 -+++ ClusterLabs-resource-agents-ac806fd/configure.ac 2013-09-07 15:50:52.606320896 +0200 -@@ -23,14 +23,13 @@ +--- resource-agents-4.5.0/configure.ac.orig 2020-05-01 15:46:08.451797734 +0200 ++++ resource-agents-4.5.0/configure.ac 2020-05-01 15:51:52.173268968 +0200 +@@ -23,8 +23,6 @@ m4_esyscmd([make/git-version-gen .tarball-version]), - [to_be_defined@foobar.org]) + [developers@clusterlabs.org]) -AC_USE_SYSTEM_EXTENSIONS - CRM_DTD_VERSION="1.0" PKG_FEATURES="" +@@ -33,6 +31,7 @@ + AC_CONFIG_MACRO_DIR([m4]) - AC_CONFIG_AUX_DIR(.) AC_CANONICAL_HOST +AC_USE_SYSTEM_EXTENSIONS diff --git a/resource-agents-bash.patch b/resource-agents-bash.patch index d6bb903..2ec6666 100644 --- a/resource-agents-bash.patch +++ b/resource-agents-bash.patch @@ -7,15 +7,6 @@ diff -dur resource-agents-3.9.7.orig/heartbeat/apache resource-agents-3.9.7/hear # # High-Availability Apache/IBMhttp control script # -diff -dur resource-agents-3.9.7.orig/heartbeat/CTDB resource-agents-3.9.7/heartbeat/CTDB ---- resource-agents-3.9.7.orig/heartbeat/CTDB 2016-02-03 11:57:55.000000000 +0100 -+++ resource-agents-3.9.7/heartbeat/CTDB 2016-11-28 10:10:14.000000000 +0100 -@@ -1,4 +1,4 @@ --#!/bin/sh -+#!/bin/bash - # - # OCF Resource Agent for managing CTDB - # diff -dur resource-agents-3.9.7.orig/heartbeat/dhcpd resource-agents-3.9.7/heartbeat/dhcpd --- resource-agents-3.9.7.orig/heartbeat/dhcpd 2016-02-03 11:57:55.000000000 +0100 +++ resource-agents-3.9.7/heartbeat/dhcpd 2016-11-28 10:10:14.000000000 +0100 diff --git a/resource-agents-sizeof.patch b/resource-agents-sizeof.patch deleted file mode 100644 index 8bf4ff3..0000000 --- a/resource-agents-sizeof.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- resource-agents-4.1.1/tools/sfex_lib.c.orig 2018-03-05 10:25:31.000000000 +0100 -+++ resource-agents-4.1.1/tools/sfex_lib.c 2018-09-02 20:08:37.594025340 +0200 -@@ -426,7 +426,7 @@ - return -1; - } - ldata->count = atoi ((char *) (block->count)); -- strncpy ((char *) (ldata->nodename), (const char *) (block->nodename), sizeof(block->nodename)); -+ strncpy ((char *) (ldata->nodename), (const char *) (block->nodename), sizeof(ldata->nodename)); - - #ifdef SFEX_DEBUG - cl_log(LOG_INFO, "status: %c\n", ldata->status); diff --git a/resource-agents.spec b/resource-agents.spec index b1e026d..a28ea7c 100644 --- a/resource-agents.spec +++ b/resource-agents.spec @@ -1,19 +1,18 @@ Summary: Reusable cluster resource scripts Summary(pl.UTF-8): Skrypty wielokrotnego użytku do obsługi zasobów klastrowych Name: resource-agents -Version: 4.1.1 +Version: 4.5.0 Release: 1 License: GPL v2+, LGPL v2.1+ Group: Daemons #Source0Download: https://github.com/ClusterLabs/resource-agents/releases Source0: https://github.com/ClusterLabs/resource-agents/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 82e3a335f942347f1b7c27b9f8e8e984 +# Source0-md5: 265fd01a2b4119b7b733c829c4c36d32 Source1: ldirectord.init Source2: %{name}.tmpfiles Patch0: %{name}-no_header_parsing.patch Patch1: %{name}-bash.patch Patch2: %{name}-ac.patch -Patch3: %{name}-sizeof.patch URL: http://www.linux-ha.org/ BuildRequires: autoconf >= 2.63 BuildRequires: automake >= 1:1.10.1 @@ -26,10 +25,12 @@ BuildRequires: libxslt-progs BuildRequires: openssl-tools BuildRequires: perl-tools-pod BuildRequires: pkgconfig -BuildRequires: python-devel +BuildRequires: python-devel >= 1:2.7 BuildRequires: rpm-perlprov +BuildRequires: sed >= 4.0 BuildRequires: which Requires: cluster-glue +Requires: python >= 1:2.7 Obsoletes: heartbeat-resources < 3.0 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -82,13 +83,14 @@ współpracuje z kodem heartbeat (http://www.linux-ha.org/). %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build -%{__aclocal} +%{__aclocal} -I m4 %{__autoconf} %{__autoheader} %{__automake} +# with strict alasing tools/tickle_tcp.c emits "maybe uninitialized" warnings +CFLAGS="%{rpmcflags} -fno-strict-aliasing" %configure \ FSCK=/sbin/fsck \ FUSER=/bin/fuser \ @@ -96,6 +98,7 @@ współpracuje z kodem heartbeat (http://www.linux-ha.org/). MAILCMD=/bin/mail \ MOUNT=/bin/mount \ PING=/bin/ping \ + PYTHON="%{__python}" \ --docdir=%{_docdir}/%{name}-%{version} \ --enable-fatal-warnings \ --with-initdir=/etc/rc.d/init.d \ @@ -161,6 +164,7 @@ fi %dir %{_prefix}/lib/ocf/lib %dir %{_prefix}/lib/ocf/lib/heartbeat %{_prefix}/lib/ocf/lib/heartbeat/ocf-* +%{_prefix}/lib/ocf/lib/heartbeat/ocf.py %{_prefix}/lib/ocf/lib/heartbeat/*.sh %dir %{_prefix}/lib/ocf/resource.d %dir %{_prefix}/lib/ocf/resource.d/heartbeat -- 2.44.0