Hello community, here is the log from the commit of package util-linux for openSUSE:Factory checked in at 2014-08-29 17:42:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/util-linux (Old) and /work/SRC/openSUSE:Factory/.util-linux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "util-linux" Changes: -------- --- /work/SRC/openSUSE:Factory/util-linux/python-libmount.changes 2014-08-25 12:59:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.util-linux.new/python-libmount.changes 2014-08-29 17:42:30.000000000 +0200 @@ -1,0 +2,20 @@ +Tue Aug 26 12:15:02 UTC 2014 - [email protected] + +- Always mark ipcs/limits and misc/setarch as known failure + +------------------------------------------------------------------- +Tue Aug 26 07:43:16 UTC 2014 - [email protected] + +- 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 - [email protected] + +- 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). + +------------------------------------------------------------------- util-linux-systemd.changes: same change util-linux.changes: same change Old: ---- util-linux.preamble util-linux.python-libmount util-linux.util-linux New: ---- util-linux-slash-in-format-string.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-libmount.spec ++++++ --- /var/tmp/diff_new_pack.IxiZYL/_old 2014-08-29 17:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.IxiZYL/_new 2014-08-29 17:42:33.000000000 +0200 @@ -32,19 +32,35 @@ # 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 @@ %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 @@ # 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 @@ # 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 ## @@ -157,6 +162,7 @@ Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch [email protected] -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -172,15 +178,6 @@ 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 +213,9 @@ 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 +335,8 @@ %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 +368,8 @@ %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 @@ -407,6 +387,7 @@ %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -609,11 +590,10 @@ 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" @@ -630,10 +610,8 @@ %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" ++++++ util-linux-systemd.spec ++++++ --- /var/tmp/diff_new_pack.IxiZYL/_old 2014-08-29 17:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.IxiZYL/_new 2014-08-29 17:42:33.000000000 +0200 @@ -32,19 +32,35 @@ # 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 @@ %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 @@ # 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 @@ # 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 ## @@ -157,6 +162,7 @@ Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch [email protected] -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -172,15 +178,6 @@ 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 +213,9 @@ 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 +335,8 @@ %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 +368,8 @@ %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 @@ -407,6 +387,7 @@ %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -609,11 +590,10 @@ 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" @@ -630,10 +610,8 @@ %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" ++++++ util-linux.spec ++++++ --- /var/tmp/diff_new_pack.IxiZYL/_old 2014-08-29 17:42:33.000000000 +0200 +++ /var/tmp/diff_new_pack.IxiZYL/_new 2014-08-29 17:42:33.000000000 +0200 @@ -32,19 +32,35 @@ # 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 @@ %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 @@ # 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 @@ # 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 ## @@ -157,6 +162,7 @@ Patch12: util-linux-noenc-suse.patch # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch [email protected] -- Fix bash-completion installation. Patch13: util-linux-bash-completion-blockdev.patch +Patch14: util-linux-slash-in-format-string.patch ## ## klogconsole ## @@ -172,15 +178,6 @@ 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 +213,9 @@ 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 +335,8 @@ %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 +368,8 @@ %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 @@ -407,6 +387,7 @@ %patch4 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 # # setctsid cp -p %{S:22} %{S:23} . @@ -609,11 +590,10 @@ 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" @@ -630,10 +610,8 @@ %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" ++++++ util-linux-slash-in-format-string.patch ++++++ >From 82233c2a0a4cce89307061bdc7ffdb58c4936d4f Mon Sep 17 00:00:00 2001 From: HUANG Wei <[email protected]> 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
