From f54939bedc6ccb0bbf85d38fc9dff3fc7094cb43b586c8fe9a7a4c97c60762f9 Mon Sep 17 00:00:00 2001
From: Marcus Meissner <meissner@suse.com>
Date: Tue, 8 Sep 2020 08:47:50 +0000
Subject: [PATCH] Accepting request 829592 from
 home:oertel:branches:Base:System

- re-add missing hunk to fix bsc#1164907
  parted-type-accept-hex.patch
  type on the cmdline could be specified in hex as 0x82

OBS-URL: https://build.opensuse.org/request/show/829592
OBS-URL: https://build.opensuse.org/package/show/Base:System/parted?expand=0&rev=146
---
 parted-type-accept-hex.patch | 15 +++++++++++++++
 parted.changes               |  7 +++++++
 parted.spec                  |  4 +++-
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 parted-type-accept-hex.patch

diff --git a/parted-type-accept-hex.patch b/parted-type-accept-hex.patch
new file mode 100644
index 0000000..fb59cbd
--- /dev/null
+++ b/parted-type-accept-hex.patch
@@ -0,0 +1,15 @@
+--- parted-3.3/parted/ui.c	2020/08/25 16:28:53	1.1
++++ parted-3.3/parted/ui.c	2020/08/25 16:31:39
+@@ -926,7 +926,11 @@
+                 return 0;
+ 
+         errno = 0;
+-        ret = strtol (input, (char**) NULL, 10);
++
++        if (strstr(input, "0x") == input)
++                ret = strtol (input, (char**) NULL, 16);
++        else
++                ret = strtol (input, (char**) NULL, 10);
+         if (errno)
+                 goto error;
+ 
diff --git a/parted.changes b/parted.changes
index 3c7dcbc..11976b2 100644
--- a/parted.changes
+++ b/parted.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Aug 25 18:24:26 CEST 2020 - ro@suse.de
+
+- re-add missing hunk to fix bsc#1164907
+  parted-type-accept-hex.patch
+  type on the cmdline could be specified in hex as 0x82
+
 -------------------------------------------------------------------
 Wed Apr  8 17:37:47 UTC 2020 - Anna Maresova <anicka@suse.com>
 
diff --git a/parted.spec b/parted.spec
index e1f8489..64ce110 100644
--- a/parted.spec
+++ b/parted.spec
@@ -69,7 +69,8 @@ Patch36:        libparted-linux-pmem-path.patch
 
 # bsc#1164260
 Patch37:        parted-print-max-partitions-for-yast.patch
-
+# bsc#1164907
+Patch64:        parted-type-accept-hex.patch
 # Fatresize
 Patch100:       parted-fatresize-autoconf.patch
 Patch101:       fatresize-fix-getting-dev-name.patch
@@ -158,6 +159,7 @@ to develop applications that require these.
 %patch35 -p1
 %patch36 -p1
 %patch37 -p1
+%patch64 -p1
 %patch100 -p1
 %patch101 -p1
 %patch156 -p1