From 5ae4f018c0fb942cdbba5b400c5ddfbbb37b6b42487fdd18ab80ea9e572be276 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Thu, 21 Aug 2014 20:06:54 +0000 Subject: [PATCH 1/7] - Remove hacks for format_spec_file and source_validator (bnc#891152, bnc#891829). - Use macro defined summary that passes both SLE and openSUSE check-in QA scripts (invented by Ruediger Oertel). OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=250 --- python-libmount.changes | 8 +++++ python-libmount.spec | 68 ++++++++++++++------------------------ util-linux-systemd.changes | 8 +++++ util-linux-systemd.spec | 67 +++++++++++++------------------------ util-linux.changes | 8 +++++ util-linux.preamble | 1 - util-linux.python-libmount | 2 -- util-linux.spec | 67 +++++++++++++------------------------ util-linux.util-linux | 2 -- 9 files changed, 94 insertions(+), 137 deletions(-) delete mode 100644 util-linux.preamble delete mode 100644 util-linux.python-libmount delete mode 100644 util-linux.util-linux diff --git a/python-libmount.changes b/python-libmount.changes index 2eaed7c..2ce4429 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz + +- Remove hacks for format_spec_file and source_validator + (bnc#891152, bnc#891829). +- Use macro defined summary that passes both SLE and openSUSE + check-in QA scripts (invented by Ruediger Oertel). + ------------------------------------------------------------------- Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz diff --git a/python-libmount.spec b/python-libmount.spec index d6c54fa..7ec4ded 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -32,19 +32,35 @@ Name: python-libmount # build_util_linux_systemd: Builds util-linux-systemd and uuidd. # build_python_libmount: Builds python-libmount. %define build_all 0 +# definitions for the main packages +# This two level indirect definition of Summary and Group is needed to +# simplify parsing of spec file by format_spec_file, +# source_validator and check-in QA scripts). +%define summary_ul A collection of basic system utilities +%define summary_uls A collection of basic system utilities +%define summary_pl Python bindings for the libmount library +%define group_ul System/Base +%define group_uls System/Base +%define group_pl System/Filesystems %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 %define build_python_libmount 1 # To prevent dependency loops, verify signature only in third stage. %define verify_sig 1 +%define main_summary %summary_pl +%define main_group %group_pl %else %if "%{name}" == "util-linux-systemd" %define build_util_linux 0 %define build_util_linux_systemd 1 %define build_python_libmount 0 %define verify_sig 0 +%define main_summary %summary_uls +%define main_group %group_uls %else +%define main_summary %summary_ul +%define main_group %group_ul %if %build_all %define build_util_linux 1 %define build_util_linux_systemd 1 @@ -58,6 +74,9 @@ Name: python-libmount %endif %endif %endif +Summary: %main_summary +License: GPL-2.0+ +Group: %group_pl BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -110,16 +129,6 @@ Release: 0 # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -License: GPL-2.0+ -Group: System/Filesystems -%endif -# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.preamble -#END UGLY HACK Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz Source1: util-linux-rpmlintrc Source4: raw.init @@ -144,10 +153,6 @@ Source31: addnote.c # Source50: uuidd.rc Source51: blkid.conf -# detachec parts of spec file -Source100: util-linux.preamble -Source101: util-linux.util-linux -Source102: util-linux.python-libmount ## ## util-linux patches ## @@ -172,15 +177,6 @@ Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Filesystems -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.util-linux -#END UGLY HACK %if %{with enable_eject} Provides: eject = 2.1.0-166.8 %endif @@ -216,24 +212,9 @@ Recommends: adjtimex Recommends: time Recommends: which %else -# Exact copy of headers below is needed for spec cleaner that does not support -# if condition across preamble and subsequent sections. %if %build_python_libmount -# Exact copy of the %%package tag from python-libmount section below: -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Filesystems -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.python-libmount -#END UGLY HACK %else %if %build_util_linux_systemd -# Exact copy of the %%package tag from systemd section below: -Summary: A collection of basic systemd utilities -Group: System/Filesystems Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -353,9 +334,8 @@ Files to develop applications using the libsmartcols library. %if %build_util_linux_systemd %if %build_util_linux %package systemd -# Do not forget to copy duplicate of this section to the preamble: -Summary: A collection of basic systemd utilities -Group: System/Base +Summary: %summary_uls +Group: %group_uls Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -387,9 +367,9 @@ SMP systems. %if %build_python_libmount %if %build_util_linux %package -n python-libmount -# Do not forget to copy duplicate of this section to the preamble: -Summary: Python bindings for the libmount library -Group: System/Filesystems +Summary: %summary_pl +License: GPL-2.0+ +Group: %group_pl %description -n python-libmount %else diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 2eaed7c..2ce4429 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz + +- Remove hacks for format_spec_file and source_validator + (bnc#891152, bnc#891829). +- Use macro defined summary that passes both SLE and openSUSE + check-in QA scripts (invented by Ruediger Oertel). + ------------------------------------------------------------------- Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 5dbc183..79f9b59 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -32,19 +32,35 @@ Name: util-linux-systemd # build_util_linux_systemd: Builds util-linux-systemd and uuidd. # build_python_libmount: Builds python-libmount. %define build_all 0 +# definitions for the main packages +# This two level indirect definition of Summary and Group is needed to +# simplify parsing of spec file by format_spec_file, +# source_validator and check-in QA scripts). +%define summary_ul A collection of basic system utilities +%define summary_uls A collection of basic system utilities +%define summary_pl Python bindings for the libmount library +%define group_ul System/Base +%define group_uls System/Base +%define group_pl System/Filesystems %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 %define build_python_libmount 1 # To prevent dependency loops, verify signature only in third stage. %define verify_sig 1 +%define main_summary %summary_pl +%define main_group %group_pl %else %if "%{name}" == "util-linux-systemd" %define build_util_linux 0 %define build_util_linux_systemd 1 %define build_python_libmount 0 %define verify_sig 0 +%define main_summary %summary_uls +%define main_group %group_uls %else +%define main_summary %summary_ul +%define main_group %group_ul %if %build_all %define build_util_linux 1 %define build_util_linux_systemd 1 @@ -58,6 +74,9 @@ Name: util-linux-systemd %endif %endif %endif +Summary: %main_summary +License: GPL-2.0+ +Group: %main_group BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -110,16 +129,6 @@ Release: 0 # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -License: GPL-2.0+ -Group: System/Base -%endif -# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.preamble -#END UGLY HACK Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz Source1: util-linux-rpmlintrc Source4: raw.init @@ -144,10 +153,6 @@ Source31: addnote.c # Source50: uuidd.rc Source51: blkid.conf -# detachec parts of spec file -Source100: util-linux.preamble -Source101: util-linux.util-linux -Source102: util-linux.python-libmount ## ## util-linux patches ## @@ -172,15 +177,6 @@ Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Base -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.util-linux -#END UGLY HACK %if %{with enable_eject} Provides: eject = 2.1.0-166.8 %endif @@ -216,24 +212,9 @@ Recommends: adjtimex Recommends: time Recommends: which %else -# Exact copy of headers below is needed for spec cleaner that does not support -# if condition across preamble and subsequent sections. %if %build_python_libmount -# Exact copy of the %%package tag from python-libmount section below: -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Base -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.python-libmount -#END UGLY HACK %else %if %build_util_linux_systemd -# Exact copy of the %%package tag from systemd section below: -Summary: A collection of basic systemd utilities -Group: System/Base Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -353,9 +334,8 @@ Files to develop applications using the libsmartcols library. %if %build_util_linux_systemd %if %build_util_linux %package systemd -# Do not forget to copy duplicate of this section to the preamble: -Summary: A collection of basic systemd utilities -Group: System/Base +Summary: %summary_uls +Group: %group_uls Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -387,9 +367,8 @@ SMP systems. %if %build_python_libmount %if %build_util_linux %package -n python-libmount -# Do not forget to copy duplicate of this section to the preamble: -Summary: Python bindings for the libmount library -Group: System/Filesystems +Summary: %summary_pl +Group: %group_pl %description -n python-libmount %else diff --git a/util-linux.changes b/util-linux.changes index 2eaed7c..2ce4429 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz + +- Remove hacks for format_spec_file and source_validator + (bnc#891152, bnc#891829). +- Use macro defined summary that passes both SLE and openSUSE + check-in QA scripts (invented by Ruediger Oertel). + ------------------------------------------------------------------- Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz diff --git a/util-linux.preamble b/util-linux.preamble deleted file mode 100644 index 4360fb4..0000000 --- a/util-linux.preamble +++ /dev/null @@ -1 +0,0 @@ -License: GPL-2.0+ diff --git a/util-linux.python-libmount b/util-linux.python-libmount deleted file mode 100644 index 495db08..0000000 --- a/util-linux.python-libmount +++ /dev/null @@ -1,2 +0,0 @@ -Summary: Python bindings for the libmount library -Group: System/Filesystems diff --git a/util-linux.spec b/util-linux.spec index da3f510..123e63a 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -32,19 +32,35 @@ Name: util-linux # build_util_linux_systemd: Builds util-linux-systemd and uuidd. # build_python_libmount: Builds python-libmount. %define build_all 0 +# definitions for the main packages +# This two level indirect definition of Summary and Group is needed to +# simplify parsing of spec file by format_spec_file, +# source_validator and check-in QA scripts). +%define summary_ul A collection of basic system utilities +%define summary_uls A collection of basic system utilities +%define summary_pl Python bindings for the libmount library +%define group_ul System/Base +%define group_uls System/Base +%define group_pl System/Filesystems %if "%{name}" == "python-libmount" %define build_util_linux 0 %define build_util_linux_systemd 0 %define build_python_libmount 1 # To prevent dependency loops, verify signature only in third stage. %define verify_sig 1 +%define main_summary %summary_pl +%define main_group %group_pl %else %if "%{name}" == "util-linux-systemd" %define build_util_linux 0 %define build_util_linux_systemd 1 %define build_python_libmount 0 %define verify_sig 0 +%define main_summary %summary_uls +%define main_group %group_uls %else +%define main_summary %summary_ul +%define main_group %group_ul %if %build_all %define build_util_linux 1 %define build_util_linux_systemd 1 @@ -58,6 +74,9 @@ Name: util-linux %endif %endif %endif +Summary: %main_summary +License: GPL-2.0+ +Group: %main_group BuildRequires: audit-devel BuildRequires: bc BuildRequires: binutils-devel @@ -110,16 +129,6 @@ Release: 0 # these tools as well #!BuildIgnore: pwdutils Url: https://www.kernel.org/pub/linux/utils/util-linux/ -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -License: GPL-2.0+ -Group: System/Base -%endif -# UGLY HACK: License tag is errorneously moved here on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.preamble -#END UGLY HACK Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz Source1: util-linux-rpmlintrc Source4: raw.init @@ -144,10 +153,6 @@ Source31: addnote.c # Source50: uuidd.rc Source51: blkid.conf -# detachec parts of spec file -Source100: util-linux.preamble -Source101: util-linux.util-linux -Source102: util-linux.python-libmount ## ## util-linux patches ## @@ -172,15 +177,6 @@ Provides: util-linux(fake+no-canonicalize) PreReq: %install_info_prereq permissions PreReq: %insserv_prereq %fillup_prereq /bin/sed Recommends: %{name}-lang = %{version} -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Base -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.util-linux -#END UGLY HACK %if %{with enable_eject} Provides: eject = 2.1.0-166.8 %endif @@ -216,24 +212,9 @@ Recommends: adjtimex Recommends: time Recommends: which %else -# Exact copy of headers below is needed for spec cleaner that does not support -# if condition across preamble and subsequent sections. %if %build_python_libmount -# Exact copy of the %%package tag from python-libmount section below: -#BEGIN UGLY HACK -%if 0 -# UGLY HACK: Real tags are moved to include file to prevent damage done by format_spec_file. This is just a trap for format_spec_file. (bnc#891152) -Summary: TRAP -Group: System/Base -%endif -# UGLY HACK: Group tag is updated to bad value on every call of format_spec_file. %%include cannot be broken by format_spec_file. -%include %{_sourcedir}/util-linux.python-libmount -#END UGLY HACK %else %if %build_util_linux_systemd -# Exact copy of the %%package tag from systemd section below: -Summary: A collection of basic systemd utilities -Group: System/Base Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -353,9 +334,8 @@ Files to develop applications using the libsmartcols library. %if %build_util_linux_systemd %if %build_util_linux %package systemd -# Do not forget to copy duplicate of this section to the preamble: -Summary: A collection of basic systemd utilities -Group: System/Base +Summary: %summary_uls +Group: %group_uls Supplements: packageand(util-linux:systemd) # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 Provides: util-linux:/usr/lib/systemd/system/fstrim.service @@ -387,9 +367,8 @@ SMP systems. %if %build_python_libmount %if %build_util_linux %package -n python-libmount -# Do not forget to copy duplicate of this section to the preamble: -Summary: Python bindings for the libmount library -Group: System/Filesystems +Summary: %summary_pl +Group: %group_pl %description -n python-libmount %else diff --git a/util-linux.util-linux b/util-linux.util-linux deleted file mode 100644 index 8a98094..0000000 --- a/util-linux.util-linux +++ /dev/null @@ -1,2 +0,0 @@ -Summary: A collection of basic system utilities -Group: System/Base From bb283f3de6f999b95bef7c034e51bab0dd04048d4146ff894980f2fc8867210d Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 22 Aug 2014 08:37:10 +0000 Subject: [PATCH 2/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=251 --- python-libmount.spec | 1 - util-linux.spec | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python-libmount.spec b/python-libmount.spec index 7ec4ded..bcc1b85 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -368,7 +368,6 @@ SMP systems. %if %build_util_linux %package -n python-libmount Summary: %summary_pl -License: GPL-2.0+ Group: %group_pl %description -n python-libmount diff --git a/util-linux.spec b/util-linux.spec index 123e63a..674e972 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -624,7 +624,8 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit "$result" +exit 0 +#exit "$result" %install %if %build_util_linux From fc2658a44f66113718b45d6bd56ceb605b79824dd1175b591f78eb19354c307c Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 26 Aug 2014 13:58:36 +0000 Subject: [PATCH 3/7] Accepting request 246438 from home:pgajdos - fix parsing of slash in the format string [bnc#889934] (internal) - added patches: * util-linux-slash-in-format-string.patch OBS-URL: https://build.opensuse.org/request/show/246438 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=253 --- python-libmount.spec | 3 +++ util-linux-slash-in-format-string.patch | 27 +++++++++++++++++++++++++ util-linux-systemd.spec | 2 ++ util-linux.changes | 7 +++++++ util-linux.spec | 2 ++ 5 files changed, 41 insertions(+) create mode 100644 util-linux-slash-in-format-string.patch diff --git a/python-libmount.spec b/python-libmount.spec index bcc1b85..b39a06b 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -167,6 +167,7 @@ Patch13: util-linux-bash-completion-blockdev.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff +Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -368,6 +369,7 @@ SMP systems. %if %build_util_linux %package -n python-libmount Summary: %summary_pl +License: GPL-2.0+ Group: %group_pl %description -n python-libmount @@ -393,6 +395,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 +%patch57 popd %build diff --git a/util-linux-slash-in-format-string.patch b/util-linux-slash-in-format-string.patch new file mode 100644 index 0000000..49b7a05 --- /dev/null +++ b/util-linux-slash-in-format-string.patch @@ -0,0 +1,27 @@ +From 82233c2a0a4cce89307061bdc7ffdb58c4936d4f Mon Sep 17 00:00:00 2001 +From: HUANG Wei +Date: Wed, 6 Aug 2014 12:20:18 +0800 +Subject: [PATCH] hexdump: Fix parse format of "byte count without repetition + count" + +--- + text-utils/hexdump-parse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/text-utils/hexdump-parse.c b/text-utils/hexdump-parse.c +index 37e7086..8d14c5b 100644 +--- a/text-utils/hexdump-parse.c ++++ b/text-utils/hexdump-parse.c +@@ -141,7 +141,7 @@ void add_fmt(const char *fmt, struct hexdump *hex) + + /* Skip slash and trailing white space. */ + if (*p == '/') +- p = skip_space(p); ++ p = skip_space(++p); + + /* byte count */ + if (isdigit(*p)) { +-- +2.0.4 + + diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 79f9b59..a998004 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -167,6 +167,7 @@ Patch13: util-linux-bash-completion-blockdev.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff +Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -393,6 +394,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 +%patch57 popd %build diff --git a/util-linux.changes b/util-linux.changes index 2ce4429..22eb54b 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Aug 26 07:43:16 UTC 2014 - pgajdos@suse.com + +- fix parsing of slash in the format string [bnc#889934] (internal) +- added patches: + * util-linux-slash-in-format-string.patch + ------------------------------------------------------------------- Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz diff --git a/util-linux.spec b/util-linux.spec index 674e972..3993d8a 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -162,6 +162,7 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -386,6 +387,7 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . From f4901b361d14ed28f6d47399efb1c2cb11a19439c2167b6e50d712b144671da1 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 26 Aug 2014 14:12:01 +0000 Subject: [PATCH 4/7] Accepting request 246531 from home:Andreas_Schwab:Factory - Always mark ipcs/limits and misc/setarch as known failure OBS-URL: https://build.opensuse.org/request/show/246531 OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=254 --- python-libmount.changes | 12 ++++++++++++ python-libmount.spec | 14 ++++++-------- util-linux-systemd.changes | 12 ++++++++++++ util-linux-systemd.spec | 14 ++++++-------- util-linux.changes | 5 +++++ util-linux.spec | 7 ++----- 6 files changed, 43 insertions(+), 21 deletions(-) diff --git a/python-libmount.changes b/python-libmount.changes index 2ce4429..0ba302d 100644 --- a/python-libmount.changes +++ b/python-libmount.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 26 12:15:02 UTC 2014 - schwab@suse.de + +- Always mark ipcs/limits and misc/setarch as known failure + +------------------------------------------------------------------- +Tue Aug 26 07:43:16 UTC 2014 - pgajdos@suse.com + +- fix parsing of slash in the format string [bnc#889934] (internal) +- added patches: + * util-linux-slash-in-format-string.patch + ------------------------------------------------------------------- Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz diff --git a/python-libmount.spec b/python-libmount.spec index b39a06b..e6278cd 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -162,12 +162,12 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff -Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -388,6 +388,7 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -395,7 +396,6 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 popd %build @@ -591,11 +591,10 @@ export TS_OPT_fdisk_bsd_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes" %endif # -%ifarch armv7l armv7hl aarch64 %if 0%{?suse_version} > 1310 +# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO export TS_OPT_misc_setarch_known_fail="yes" %endif -%endif # %ifarch armv6l armv6hl aarch64 export TS_OPT_fdisk_gpt_known_fail="yes" @@ -612,10 +611,8 @@ export TS_OPT_utmpdump_known_fail="yes" %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -%ifarch x86_64 -# FIXME: Something is wrong here. This test never fails in SLE12: +# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856) export TS_OPT_ipcs_limits2_known_fail="yes" -%endif # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -627,7 +624,8 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit "$result" +exit 0 +#exit "$result" %install %if %build_util_linux diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes index 2ce4429..0ba302d 100644 --- a/util-linux-systemd.changes +++ b/util-linux-systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Aug 26 12:15:02 UTC 2014 - schwab@suse.de + +- Always mark ipcs/limits and misc/setarch as known failure + +------------------------------------------------------------------- +Tue Aug 26 07:43:16 UTC 2014 - pgajdos@suse.com + +- fix parsing of slash in the format string [bnc#889934] (internal) +- added patches: + * util-linux-slash-in-format-string.patch + ------------------------------------------------------------------- Thu Aug 21 18:34:59 CEST 2014 - sbrabec@suse.cz diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index a998004..5327133 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -162,12 +162,12 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff -Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -387,6 +387,7 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} - %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -394,7 +395,6 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 popd %build @@ -590,11 +590,10 @@ export TS_OPT_fdisk_bsd_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes" %endif # -%ifarch armv7l armv7hl aarch64 %if 0%{?suse_version} > 1310 +# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO export TS_OPT_misc_setarch_known_fail="yes" %endif -%endif # %ifarch armv6l armv6hl aarch64 export TS_OPT_fdisk_gpt_known_fail="yes" @@ -611,10 +610,8 @@ export TS_OPT_utmpdump_known_fail="yes" %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -%ifarch x86_64 -# FIXME: Something is wrong here. This test never fails in SLE12: +# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856) export TS_OPT_ipcs_limits2_known_fail="yes" -%endif # # hacks export PATH="$PATH:/sbin:/usr/sbin" @@ -626,7 +623,8 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit "$result" +exit 0 +#exit "$result" %install %if %build_util_linux diff --git a/util-linux.changes b/util-linux.changes index 22eb54b..0ba302d 100644 --- a/util-linux.changes +++ b/util-linux.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Aug 26 12:15:02 UTC 2014 - schwab@suse.de + +- Always mark ipcs/limits and misc/setarch as known failure + ------------------------------------------------------------------- Tue Aug 26 07:43:16 UTC 2014 - pgajdos@suse.com diff --git a/util-linux.spec b/util-linux.spec index 3993d8a..0532162 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -590,11 +590,10 @@ export TS_OPT_fdisk_bsd_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes" %endif # -%ifarch armv7l armv7hl aarch64 %if 0%{?suse_version} > 1310 +# glibc requires kernel >= 3.0, thus setarch --uname-2.6 fails on platforms without VDSO export TS_OPT_misc_setarch_known_fail="yes" %endif -%endif # %ifarch armv6l armv6hl aarch64 export TS_OPT_fdisk_gpt_known_fail="yes" @@ -611,10 +610,8 @@ export TS_OPT_utmpdump_known_fail="yes" %endif # FIXME: These sometimes fails: export TS_OPT_libmount_lock_known_fail="yes" -%ifarch x86_64 -# FIXME: Something is wrong here. This test never fails in SLE12: +# integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856) export TS_OPT_ipcs_limits2_known_fail="yes" -%endif # # hacks export PATH="$PATH:/sbin:/usr/sbin" From 962cc353cccf95694c3677f5fa9450eb9dc0f6b48e7d7f56f565f44690018e90 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 26 Aug 2014 14:14:33 +0000 Subject: [PATCH 5/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=255 --- python-libmount.spec | 6 +++--- util-linux-systemd.spec | 5 +++-- util-linux.spec | 5 +++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/python-libmount.spec b/python-libmount.spec index e6278cd..6bb3819 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -168,6 +168,7 @@ Patch14: util-linux-slash-in-format-string.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff +Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -369,7 +370,6 @@ SMP systems. %if %build_util_linux %package -n python-libmount Summary: %summary_pl -License: GPL-2.0+ Group: %group_pl %description -n python-libmount @@ -396,6 +396,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 +%patch57 -p1 popd %build @@ -624,8 +625,7 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit 0 -#exit "$result" +exit "$result" %install %if %build_util_linux diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 5327133..665f441 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -168,6 +168,7 @@ Patch14: util-linux-slash-in-format-string.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff +Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -395,6 +396,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 +%patch57 -p1 popd %build @@ -623,8 +625,7 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit 0 -#exit "$result" +exit "$result" %install %if %build_util_linux diff --git a/util-linux.spec b/util-linux.spec index 0532162..f2c47a5 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -168,6 +168,7 @@ Patch14: util-linux-slash-in-format-string.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff +Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -395,6 +396,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 +%patch57 -p1 popd %build @@ -623,8 +625,7 @@ make %{?_smp_mflags} check || result="1" # always show test diffs (inclusive known_fail) and exit result diffs_files="$(find tests/diff -type f | sort)" echo "$diffs_files" | xargs -r cat -exit 0 -#exit "$result" +exit "$result" %install %if %build_util_linux From a54ad330cfc4e7e2ffa422ef7e35680edabb307c1d19abc92f0628ced42f5735 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 26 Aug 2014 14:19:11 +0000 Subject: [PATCH 6/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=256 --- python-libmount.spec | 2 +- util-linux-systemd.spec | 2 +- util-linux.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python-libmount.spec b/python-libmount.spec index 6bb3819..67389fc 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -396,7 +396,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 -p1 +%patch57 popd %build diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index 665f441..f27556c 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -396,7 +396,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 -p1 +%patch57 popd %build diff --git a/util-linux.spec b/util-linux.spec index f2c47a5..0a3b7cb 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -396,7 +396,7 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 -p1 +%patch57 popd %build From 3267442cd60667c310f72b65d5129c36af4fc58fd5266efa53faef9ca6381a25 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Tue, 26 Aug 2014 14:26:36 +0000 Subject: [PATCH 7/7] OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=257 --- python-libmount.spec | 2 -- util-linux-systemd.spec | 2 -- util-linux.spec | 2 -- 3 files changed, 6 deletions(-) diff --git a/python-libmount.spec b/python-libmount.spec index 67389fc..7b60de9 100644 --- a/python-libmount.spec +++ b/python-libmount.spec @@ -168,7 +168,6 @@ Patch14: util-linux-slash-in-format-string.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff -Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -396,7 +395,6 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 popd %build diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec index f27556c..93a7f36 100644 --- a/util-linux-systemd.spec +++ b/util-linux-systemd.spec @@ -168,7 +168,6 @@ Patch14: util-linux-slash-in-format-string.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff -Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -396,7 +395,6 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 popd %build diff --git a/util-linux.spec b/util-linux.spec index 0a3b7cb..539e1b0 100644 --- a/util-linux.spec +++ b/util-linux.spec @@ -168,7 +168,6 @@ Patch14: util-linux-slash-in-format-string.patch ## Patch55: klogconsole-quiet.patch Patch56: klogconsole.diff -Patch57: util-linux-slash-in-format-string.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # %if %build_util_linux @@ -396,7 +395,6 @@ cp -p %{S:22} %{S:23} . pushd ../klogconsole %patch55 -p1 %patch56 -p1 -%patch57 popd %build