From caa933871ebdb2d6e06b6e995f8ee261580896fb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Apr 10 2018 05:47:52 +0000 Subject: import clufter-0.77.0-2.el7 --- diff --git a/.clufter.metadata b/.clufter.metadata index c45dafd..c9b9742 100644 --- a/.clufter.metadata +++ b/.clufter.metadata @@ -1,2 +1,2 @@ -f05522052e9ad8f2b75bb53f9b44599615ccbe86 SOURCES/clufter-0.76.0-tests.tar.xz -8ffa22fad43a4d3ea0a04fbe3c5b084fd9341769 SOURCES/clufter-0.76.0.tar.gz +9bba7d491ecc864bba521168e039050e5ac9f2ed SOURCES/clufter-0.77.0-tests.tar.xz +f063247be4eeec9f93e61e2791fcb8e6cd15e8c6 SOURCES/clufter-0.77.0.tar.gz diff --git a/.gitignore b/.gitignore index 064e89f..4469b96 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/clufter-0.76.0-tests.tar.xz -SOURCES/clufter-0.76.0.tar.gz +SOURCES/clufter-0.77.0-tests.tar.xz +SOURCES/clufter-0.77.0.tar.gz diff --git a/SOURCES/a75e1456f11725b7a58bc81148a6d6403b2530d2.patch b/SOURCES/a75e1456f11725b7a58bc81148a6d6403b2530d2.patch new file mode 100644 index 0000000..54e07c4 --- /dev/null +++ b/SOURCES/a75e1456f11725b7a58bc81148a6d6403b2530d2.patch @@ -0,0 +1,61 @@ +From a75e1456f11725b7a58bc81148a6d6403b2530d2 Mon Sep 17 00:00:00 2001 +From: Jan Pokorný +Date: Dec 01 2017 10:47:51 +0000 +Subject: formats/corosync.rng: support nodelist.node.name configuration option + + +This option within corosync configuration was silently established (and +suggested to overcome certain node identification issues) by pacemaker +without any awareness within the former, and hence was completely +foreign also to a detached attempt to formalize this public config, +interface (known as "corosync.conf" file) by the means of RelaxNG +schema describing its XML equivalent and materialized as an in-tree +corosync.rng file. This used to be prone to validation issues with the +cib2pcscmd* commands, but since corosync now acknowledges that option +just as any other native one[*], set the schema to follow suit. + +[*] https://github.com/corosync/corosync/pull/286 + +Resolves: +Signed-off-by: Jan Pokorný + +--- + +diff --git a/formats/corosync/corosync.rng b/formats/corosync/corosync.rng +index 7b12652..f239da8 100644 +--- a/formats/corosync/corosync.rng ++++ b/formats/corosync/corosync.rng +@@ -376,6 +376,19 @@ adjust nodes in the cluster. + + + ++ ++ This optional configuration option ++provides a unified way for the client software (e.g. pacemaker) atop, ++respectively the end users, to guide establishing a nominal ++(self-)identification for each node in case neither respective ++*ringX_addr* specifies a network hostname nor other means are ++available/effective in this process. Option is not used by Corosync ++itself. ++ ++ ++ ++ ++ + + This configuration option is optional when + using IPv4 and required when using IPv6. This is a 32bit value +@@ -395,8 +408,10 @@ is reserved and should not be used. + + + +- This specifies IP address of one of the nodes for particular ring +-as denoted by its number (instead 0, there can be higher numbers). ++ This specifies IP or network hostname ++address of the particular node for particular link as denoted by its ++number (there can be higher numbers instead of 0 that marks the first ++link). + + + + diff --git a/SOURCES/fix-jing-simplified-rng.xsl b/SOURCES/fix-jing-simplified-rng.xsl index 61ca74c..580d192 100644 --- a/SOURCES/fix-jing-simplified-rng.xsl +++ b/SOURCES/fix-jing-simplified-rng.xsl @@ -48,7 +48,20 @@ - + + + + + + + + + + + + + + @@ -75,9 +88,22 @@ + ( + number( + substring-before(substring-after(text(), 'pacemaker-'), '.') + ) > $version-major + or + ( + number( + substring-before(substring-after(text(), 'pacemaker-'), '.') + ) = $version-major + and + number( + concat('0', substring-after(substring-after(text(), 'pacemaker-'), '.')) + ) > $version-minor + + ) + )"/> diff --git a/SOURCES/pacemaker-borrow-schemas b/SOURCES/pacemaker-borrow-schemas index e8d5479..48dab83 100644 --- a/SOURCES/pacemaker-borrow-schemas +++ b/SOURCES/pacemaker-borrow-schemas @@ -22,7 +22,7 @@ consolidate() { for base in $( find "${inputdir}" -regextype posix-egrep -regex "${skipschemas}" -prune \ -o -name 'pacemaker-*.rng' -printf '%P\n' | sort -V \ - | sed -e 'N;/^\(pacemaker-[0-9]\)\.\([0-9]\)\.rng\n\1\.\([0-9]\)\.rng$/!p;D'); do + | sed -e 'N;/^\(pacemaker-[0-9]\)\.\([0-9][0-9]*\)\.rng\n\1\.\([0-9][0-9]*\)\.rng$/!p;D'); do f="${inputdir}/${base}" printf "processing: ${f} ... " test -f "${f}" || continue diff --git a/SPECS/clufter.spec b/SPECS/clufter.spec index cf34ddf..05317bc 100644 --- a/SPECS/clufter.spec +++ b/SPECS/clufter.spec @@ -4,8 +4,8 @@ # python2-clufter -> python-clufter Name: clufter -Version: 0.76.0 -Release: 1%{?dist} +Version: 0.77.0 +Release: 2%{?dist} Group: System Environment/Base Summary: Tool/library for transforming/analyzing cluster configuration formats License: GPLv2+ @@ -39,6 +39,7 @@ Source0: https://people.redhat.com/jpokorny/pkgs/%{name}/%{name}-%{versio Source1: https://people.redhat.com/jpokorny/pkgs/%{name}/%{name}-%{testver}-tests.tar.xz Source2: https://pagure.io/%{name}/raw/v%{version}/f/misc/fix-jing-simplified-rng.xsl Source3: https://pagure.io/%{name}/raw/v%{version}/f/misc/pacemaker-borrow-schemas +Patch0: https://pagure.io/clufter/c/a75e1456f11725b7a58bc81148a6d6403b2530d2.patch # for pacemaker BuildRequires dependency %if 0%{?rhel} > 0 @@ -153,7 +154,14 @@ configuration: either experimental commands or internally unused, reusable formats and filters. %prep -%autosetup -p1 -S git -b 1 +%setup -b 1 +#XXX cannot patch ccs-flatten this way +pushd %{name} >/dev/null +%global __scm git_am +%{expand:%__scm_setup_%{__scm}} +%{__git} config core.whitespace -blank-at-eol +%autopatch -p1 +popd >/dev/null %if "%{testver}" != "%{version}" %{__cp} -a ../"%{name}-%{testver}"/* . @@ -350,11 +358,18 @@ test -x '%{_bindir}/%{name}' && test -f "${bashcomp}" \ %{_datarootdir}/%{name}/ext-plugins/lib-pcs %changelog +* Fri Dec 01 2017 Jan Pokorný - 0.77.0-2 +- fix nodelist.node.name configuration option (originaly devised by pacemaker) + not supported in corosync.conf with the built-in validation schema + [rhbz#1517834] + +* Fri Nov 10 2017 Jan Pokorný - 0.77.0-1 +- bump upstream package, see https://pagure.io/clufter/releases + * Tue Jun 06 2017 Jan Pokorný - 0.76.0-1 - factor "borrow validation schemas from pacemaker" out to a separate script - bump upstream package, see https://pagure.io/clufter/releases - * Fri May 26 2017 Jan Pokorný - 0.75.0-1 - move nano fallback editor dependency to -cli package [PGissue#1] - bump upstream package, see https://pagure.io/clufter/releases