testing/util-linux
SHA256
3
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 246534 from Base:System

Browse Source 
- Always mark ipcs/limits and misc/setarch as known failure

- fix parsing of slash in the format string [bnc#889934] (internal)
- added patches:
  * util-linux-slash-in-format-string.patch

- 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).

- Always mark ipcs/limits and misc/setarch as known failure

- fix parsing of slash in the format string [bnc#889934] (internal)
- added patches:
  * util-linux-slash-in-format-string.patch

- 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).

- Always mark ipcs/limits and misc/setarch as known failure

- fix parsing of slash in the format string [bnc#889934] (internal)
- added patches:
  * util-linux-slash-in-format-string.patch

- Remove hacks for format_spec_file and source_validator
  (bnc#891152, bnc#891829).

OBS-URL: https://build.opensuse.org/request/show/246534
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/util-linux?expand=0&rev=191
This commit is contained in:
Stephan Kulow 2014-08-29 15:42:19 +00:00 committed by Git OBS Bridge
parent 6c689062ac
commit fe6c6a0351
10 changed files with 168 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
python-libmount.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
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
- 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 Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz

76
python-libmount.spec
View File

@ -32,19 +32,35 @@ Name: python-libmount
# build_util_linux_systemd: Builds util-linux-systemd and uuidd. # build_util_linux_systemd: Builds util-linux-systemd and uuidd.
# build_python_libmount: Builds python-libmount. # build_python_libmount: Builds python-libmount.
%define build_all 0 %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" %if "%{name}" == "python-libmount"
%define build_util_linux 0 %define build_util_linux 0
%define build_util_linux_systemd 0 %define build_util_linux_systemd 0
%define build_python_libmount 1 %define build_python_libmount 1
# To prevent dependency loops, verify signature only in third stage. # To prevent dependency loops, verify signature only in third stage.
%define verify_sig 1 %define verify_sig 1
%define main_summary %summary_pl
%define main_group %group_pl
%else %else
%if "%{name}" == "util-linux-systemd" %if "%{name}" == "util-linux-systemd"
%define build_util_linux 0 %define build_util_linux 0
%define build_util_linux_systemd 1 %define build_util_linux_systemd 1
%define build_python_libmount 0 %define build_python_libmount 0
%define verify_sig 0 %define verify_sig 0
%define main_summary %summary_uls
%define main_group %group_uls
%else %else
%define main_summary %summary_ul
%define main_group %group_ul
%if %build_all %if %build_all
%define build_util_linux 1 %define build_util_linux 1
%define build_util_linux_systemd 1 %define build_util_linux_systemd 1
@ -58,6 +74,9 @@ Name: python-libmount
%endif %endif
%endif %endif
%endif %endif
Summary: %main_summary
License: GPL-2.0+
Group: %group_pl
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
@ -110,16 +129,6 @@ Release: 0
# these tools as well # these tools as well
#!BuildIgnore: pwdutils #!BuildIgnore: pwdutils
Url: https://www.kernel.org/pub/linux/utils/util-linux/ 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 Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz
Source1: util-linux-rpmlintrc Source1: util-linux-rpmlintrc
Source4: raw.init Source4: raw.init
@ -144,10 +153,6 @@ Source31: addnote.c
# #
Source50: uuidd.rc Source50: uuidd.rc
Source51: blkid.conf 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 ## util-linux patches
## ##
@ -157,6 +162,7 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
Patch12: util-linux-noenc-suse.patch Patch12: util-linux-noenc-suse.patch
# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation.
Patch13: util-linux-bash-completion-blockdev.patch Patch13: util-linux-bash-completion-blockdev.patch
Patch14: util-linux-slash-in-format-string.patch
## ##
## klogconsole ## klogconsole
## ##
@ -172,15 +178,6 @@ Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version} 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} %if %{with enable_eject}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
%endif %endif
@ -216,24 +213,9 @@ Recommends: adjtimex
Recommends: time Recommends: time
Recommends: which Recommends: which
%else %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 %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 %else
%if %build_util_linux_systemd %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) Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -353,9 +335,8 @@ Files to develop applications using the libsmartcols library.
%if %build_util_linux_systemd %if %build_util_linux_systemd
%if %build_util_linux %if %build_util_linux
%package systemd %package systemd
# Do not forget to copy duplicate of this section to the preamble: Summary: %summary_uls
Summary: A collection of basic systemd utilities Group: %group_uls
Group: System/Base
Supplements: packageand(util-linux:systemd) Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -387,9 +368,8 @@ SMP systems.
%if %build_python_libmount %if %build_python_libmount
%if %build_util_linux %if %build_util_linux
%package -n python-libmount %package -n python-libmount
# Do not forget to copy duplicate of this section to the preamble: Summary: %summary_pl
Summary: Python bindings for the libmount library Group: %group_pl
Group: System/Filesystems
%description -n python-libmount %description -n python-libmount
%else %else
@ -407,6 +387,7 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} -
%patch4 -p1 %patch4 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
# #
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .
@ -609,11 +590,10 @@ export TS_OPT_fdisk_bsd_known_fail="yes"
export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes"
%endif %endif
# #
%ifarch armv7l armv7hl aarch64
%if 0%{?suse_version} > 1310 %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" export TS_OPT_misc_setarch_known_fail="yes"
%endif %endif
%endif
# #
%ifarch armv6l armv6hl aarch64 %ifarch armv6l armv6hl aarch64
export TS_OPT_fdisk_gpt_known_fail="yes" export TS_OPT_fdisk_gpt_known_fail="yes"
@ -630,10 +610,8 @@ export TS_OPT_utmpdump_known_fail="yes"
%endif %endif
# FIXME: These sometimes fails: # FIXME: These sometimes fails:
export TS_OPT_libmount_lock_known_fail="yes" export TS_OPT_libmount_lock_known_fail="yes"
%ifarch x86_64 # integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856)
# FIXME: Something is wrong here. This test never fails in SLE12:
export TS_OPT_ipcs_limits2_known_fail="yes" export TS_OPT_ipcs_limits2_known_fail="yes"
%endif
# #
# hacks # hacks
export PATH="$PATH:/sbin:/usr/sbin" export PATH="$PATH:/sbin:/usr/sbin"

27
util-linux-slash-in-format-string.patch Normal file
View File

@ -0,0 +1,27 @@
From 82233c2a0a4cce89307061bdc7ffdb58c4936d4f Mon Sep 17 00:00:00 2001
From: HUANG Wei <weih@opera.com>
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

20
util-linux-systemd.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
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
- 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 Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz

76
util-linux-systemd.spec
View File

@ -32,19 +32,35 @@ Name: util-linux-systemd
# build_util_linux_systemd: Builds util-linux-systemd and uuidd. # build_util_linux_systemd: Builds util-linux-systemd and uuidd.
# build_python_libmount: Builds python-libmount. # build_python_libmount: Builds python-libmount.
%define build_all 0 %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" %if "%{name}" == "python-libmount"
%define build_util_linux 0 %define build_util_linux 0
%define build_util_linux_systemd 0 %define build_util_linux_systemd 0
%define build_python_libmount 1 %define build_python_libmount 1
# To prevent dependency loops, verify signature only in third stage. # To prevent dependency loops, verify signature only in third stage.
%define verify_sig 1 %define verify_sig 1
%define main_summary %summary_pl
%define main_group %group_pl
%else %else
%if "%{name}" == "util-linux-systemd" %if "%{name}" == "util-linux-systemd"
%define build_util_linux 0 %define build_util_linux 0
%define build_util_linux_systemd 1 %define build_util_linux_systemd 1
%define build_python_libmount 0 %define build_python_libmount 0
%define verify_sig 0 %define verify_sig 0
%define main_summary %summary_uls
%define main_group %group_uls
%else %else
%define main_summary %summary_ul
%define main_group %group_ul
%if %build_all %if %build_all
%define build_util_linux 1 %define build_util_linux 1
%define build_util_linux_systemd 1 %define build_util_linux_systemd 1
@ -58,6 +74,9 @@ Name: util-linux-systemd
%endif %endif
%endif %endif
%endif %endif
Summary: %main_summary
License: GPL-2.0+
Group: %main_group
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
@ -110,16 +129,6 @@ Release: 0
# these tools as well # these tools as well
#!BuildIgnore: pwdutils #!BuildIgnore: pwdutils
Url: https://www.kernel.org/pub/linux/utils/util-linux/ 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 Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz
Source1: util-linux-rpmlintrc Source1: util-linux-rpmlintrc
Source4: raw.init Source4: raw.init
@ -144,10 +153,6 @@ Source31: addnote.c
# #
Source50: uuidd.rc Source50: uuidd.rc
Source51: blkid.conf 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 ## util-linux patches
## ##
@ -157,6 +162,7 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
Patch12: util-linux-noenc-suse.patch Patch12: util-linux-noenc-suse.patch
# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation.
Patch13: util-linux-bash-completion-blockdev.patch Patch13: util-linux-bash-completion-blockdev.patch
Patch14: util-linux-slash-in-format-string.patch
## ##
## klogconsole ## klogconsole
## ##
@ -172,15 +178,6 @@ Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version} 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} %if %{with enable_eject}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
%endif %endif
@ -216,24 +213,9 @@ Recommends: adjtimex
Recommends: time Recommends: time
Recommends: which Recommends: which
%else %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 %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 %else
%if %build_util_linux_systemd %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) Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -353,9 +335,8 @@ Files to develop applications using the libsmartcols library.
%if %build_util_linux_systemd %if %build_util_linux_systemd
%if %build_util_linux %if %build_util_linux
%package systemd %package systemd
# Do not forget to copy duplicate of this section to the preamble: Summary: %summary_uls
Summary: A collection of basic systemd utilities Group: %group_uls
Group: System/Base
Supplements: packageand(util-linux:systemd) Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -387,9 +368,8 @@ SMP systems.
%if %build_python_libmount %if %build_python_libmount
%if %build_util_linux %if %build_util_linux
%package -n python-libmount %package -n python-libmount
# Do not forget to copy duplicate of this section to the preamble: Summary: %summary_pl
Summary: Python bindings for the libmount library Group: %group_pl
Group: System/Filesystems
%description -n python-libmount %description -n python-libmount
%else %else
@ -407,6 +387,7 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} -
%patch4 -p1 %patch4 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
# #
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .
@ -609,11 +590,10 @@ export TS_OPT_fdisk_bsd_known_fail="yes"
export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes"
%endif %endif
# #
%ifarch armv7l armv7hl aarch64
%if 0%{?suse_version} > 1310 %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" export TS_OPT_misc_setarch_known_fail="yes"
%endif %endif
%endif
# #
%ifarch armv6l armv6hl aarch64 %ifarch armv6l armv6hl aarch64
export TS_OPT_fdisk_gpt_known_fail="yes" export TS_OPT_fdisk_gpt_known_fail="yes"
@ -630,10 +610,8 @@ export TS_OPT_utmpdump_known_fail="yes"
%endif %endif
# FIXME: These sometimes fails: # FIXME: These sometimes fails:
export TS_OPT_libmount_lock_known_fail="yes" export TS_OPT_libmount_lock_known_fail="yes"
%ifarch x86_64 # integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856)
# FIXME: Something is wrong here. This test never fails in SLE12:
export TS_OPT_ipcs_limits2_known_fail="yes" export TS_OPT_ipcs_limits2_known_fail="yes"
%endif
# #
# hacks # hacks
export PATH="$PATH:/sbin:/usr/sbin" export PATH="$PATH:/sbin:/usr/sbin"

20
util-linux.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
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
- 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 Fri Aug 8 22:17:29 CEST 2014 - sbrabec@suse.cz

1
util-linux.preamble
View File

@ -1 +0,0 @@
License: GPL-2.0+

2
util-linux.python-libmount
View File

@ -1,2 +0,0 @@
Summary: Python bindings for the libmount library
Group: System/Filesystems

76
util-linux.spec
View File

@ -32,19 +32,35 @@ Name: util-linux
# build_util_linux_systemd: Builds util-linux-systemd and uuidd. # build_util_linux_systemd: Builds util-linux-systemd and uuidd.
# build_python_libmount: Builds python-libmount. # build_python_libmount: Builds python-libmount.
%define build_all 0 %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" %if "%{name}" == "python-libmount"
%define build_util_linux 0 %define build_util_linux 0
%define build_util_linux_systemd 0 %define build_util_linux_systemd 0
%define build_python_libmount 1 %define build_python_libmount 1
# To prevent dependency loops, verify signature only in third stage. # To prevent dependency loops, verify signature only in third stage.
%define verify_sig 1 %define verify_sig 1
%define main_summary %summary_pl
%define main_group %group_pl
%else %else
%if "%{name}" == "util-linux-systemd" %if "%{name}" == "util-linux-systemd"
%define build_util_linux 0 %define build_util_linux 0
%define build_util_linux_systemd 1 %define build_util_linux_systemd 1
%define build_python_libmount 0 %define build_python_libmount 0
%define verify_sig 0 %define verify_sig 0
%define main_summary %summary_uls
%define main_group %group_uls
%else %else
%define main_summary %summary_ul
%define main_group %group_ul
%if %build_all %if %build_all
%define build_util_linux 1 %define build_util_linux 1
%define build_util_linux_systemd 1 %define build_util_linux_systemd 1
@ -58,6 +74,9 @@ Name: util-linux
%endif %endif
%endif %endif
%endif %endif
Summary: %main_summary
License: GPL-2.0+
Group: %main_group
BuildRequires: audit-devel BuildRequires: audit-devel
BuildRequires: bc BuildRequires: bc
BuildRequires: binutils-devel BuildRequires: binutils-devel
@ -110,16 +129,6 @@ Release: 0
# these tools as well # these tools as well
#!BuildIgnore: pwdutils #!BuildIgnore: pwdutils
Url: https://www.kernel.org/pub/linux/utils/util-linux/ 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 Source: ftp://ftp.kernel.org/pub/linux/utils/util-linux/v2.25/%{_name}-%{version}.tar.xz
Source1: util-linux-rpmlintrc Source1: util-linux-rpmlintrc
Source4: raw.init Source4: raw.init
@ -144,10 +153,6 @@ Source31: addnote.c
# #
Source50: uuidd.rc Source50: uuidd.rc
Source51: blkid.conf 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 ## util-linux patches
## ##
@ -157,6 +162,7 @@ Patch4: make-sure-sbin-resp-usr-sbin-are-in-PATH.diff
Patch12: util-linux-noenc-suse.patch Patch12: util-linux-noenc-suse.patch
# PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation. # PATCH-FIX-UPSTREAM util-linux-bash-completion-blockdev.patch sbrabec@suse.cz -- Fix bash-completion installation.
Patch13: util-linux-bash-completion-blockdev.patch Patch13: util-linux-bash-completion-blockdev.patch
Patch14: util-linux-slash-in-format-string.patch
## ##
## klogconsole ## klogconsole
## ##
@ -172,15 +178,6 @@ Provides: util-linux(fake+no-canonicalize)
PreReq: %install_info_prereq permissions PreReq: %install_info_prereq permissions
PreReq: %insserv_prereq %fillup_prereq /bin/sed PreReq: %insserv_prereq %fillup_prereq /bin/sed
Recommends: %{name}-lang = %{version} 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} %if %{with enable_eject}
Provides: eject = 2.1.0-166.8 Provides: eject = 2.1.0-166.8
%endif %endif
@ -216,24 +213,9 @@ Recommends: adjtimex
Recommends: time Recommends: time
Recommends: which Recommends: which
%else %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 %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 %else
%if %build_util_linux_systemd %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) Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -353,9 +335,8 @@ Files to develop applications using the libsmartcols library.
%if %build_util_linux_systemd %if %build_util_linux_systemd
%if %build_util_linux %if %build_util_linux
%package systemd %package systemd
# Do not forget to copy duplicate of this section to the preamble: Summary: %summary_uls
Summary: A collection of basic systemd utilities Group: %group_uls
Group: System/Base
Supplements: packageand(util-linux:systemd) Supplements: packageand(util-linux:systemd)
# Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1 # Split-provides for upgrade from SLE < 12 and openSUSE <= 13.1
Provides: util-linux:/usr/lib/systemd/system/fstrim.service Provides: util-linux:/usr/lib/systemd/system/fstrim.service
@ -387,9 +368,8 @@ SMP systems.
%if %build_python_libmount %if %build_python_libmount
%if %build_util_linux %if %build_util_linux
%package -n python-libmount %package -n python-libmount
# Do not forget to copy duplicate of this section to the preamble: Summary: %summary_pl
Summary: Python bindings for the libmount library Group: %group_pl
Group: System/Filesystems
%description -n python-libmount %description -n python-libmount
%else %else
@ -407,6 +387,7 @@ xzcat %{S:0} | %gpg_verify -p %{_name} %{S:12} -
%patch4 -p1 %patch4 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1
# #
# setctsid # setctsid
cp -p %{S:22} %{S:23} . cp -p %{S:22} %{S:23} .
@ -609,11 +590,10 @@ export TS_OPT_fdisk_bsd_known_fail="yes"
export TS_OPT_misc_setarch_known_fail="yes" export TS_OPT_misc_setarch_known_fail="yes"
%endif %endif
# #
%ifarch armv7l armv7hl aarch64
%if 0%{?suse_version} > 1310 %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" export TS_OPT_misc_setarch_known_fail="yes"
%endif %endif
%endif
# #
%ifarch armv6l armv6hl aarch64 %ifarch armv6l armv6hl aarch64
export TS_OPT_fdisk_gpt_known_fail="yes" export TS_OPT_fdisk_gpt_known_fail="yes"
@ -630,10 +610,8 @@ export TS_OPT_utmpdump_known_fail="yes"
%endif %endif
# FIXME: These sometimes fails: # FIXME: These sometimes fails:
export TS_OPT_libmount_lock_known_fail="yes" export TS_OPT_libmount_lock_known_fail="yes"
%ifarch x86_64 # integer overflow (https://github.com/karelzak/util-linux/commit/3a9ec12d6664527fad9c56347c88f3447d6c0856)
# FIXME: Something is wrong here. This test never fails in SLE12:
export TS_OPT_ipcs_limits2_known_fail="yes" export TS_OPT_ipcs_limits2_known_fail="yes"
%endif
# #
# hacks # hacks
export PATH="$PATH:/sbin:/usr/sbin" export PATH="$PATH:/sbin:/usr/sbin"

2
util-linux.util-linux
View File

@ -1,2 +0,0 @@
Summary: A collection of basic system utilities
Group: System/Base