sbrabec/util-linux
SHA256
1
0
Fork 0
forked from pool/util-linux
Code Pull Requests Activity

Accepting request 246438 from home:pgajdos

Browse Source 
- 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
This commit is contained in:
Marcus Meissner 2014-08-26 13:58:36 +00:00 committed by Git OBS Bridge
parent bb283f3de6
commit fc2658a44f
5 changed files with 41 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python-libmount.spec
View File

@ -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

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

2
util-linux-systemd.spec
View File

@ -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

7
util-linux.changes
View File

@ -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

2
util-linux.spec
View File

@ -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} .