From c94fb3f9e1f537da068b4cf974053f7a7ea28366 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Fri, 9 May 2014 21:47:13 +0100
Subject: [PATCH] New upstream version 5.1.8.

- Remove patches which are now upstream.
---
 ...nd-parameter-when-calling-external-m.patch | 37 ---------------
 0001-bin2s-Mark-stack-as-non-executable.patch | 47 -------------------
 sources                                       |  2 +-
 supermin.spec                                 | 14 +++---
 4 files changed, 7 insertions(+), 93 deletions(-)
 delete mode 100644 0001-Add-quoting-around-parameter-when-calling-external-m.patch
 delete mode 100644 0001-bin2s-Mark-stack-as-non-executable.patch

diff --git a/0001-Add-quoting-around-parameter-when-calling-external-m.patch b/0001-Add-quoting-around-parameter-when-calling-external-m.patch
deleted file mode 100644
index 749cf99..0000000
--- a/0001-Add-quoting-around-parameter-when-calling-external-m.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ae88217aa64f1924ff88941d2ad0ce1aa6ad7fc4 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Mon, 7 Apr 2014 12:44:09 +0100
-Subject: [PATCH] Add quoting around parameter when calling external mke2fs
- (RHBZ#1084921).
-
-If you tried to write the appliance to a path containing a space, it
-would fail like this:
-
-supermin: ext2: creating empty ext2 filesystem '/media/bigon/Little disk/.guestfs-1000/appliance.d.p4ovrvj6/root'
-mke2fs: invalid blocks 'disk/.guestfs-1000/appliance.d.p4ovrvj6/root' on device '/media/bigon/Little'
-
-This is because there was missing quoting around the parameter passed
-to mke2fs.
-
-Thanks: Laurent Bigonville
-https://bugzilla.redhat.com/show_bug.cgi?id=1084921
----
- src/ext2.ml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/ext2.ml b/src/ext2.ml
-index c9c8933..bccf3a7 100644
---- a/src/ext2.ml
-+++ b/src/ext2.ml
-@@ -49,7 +49,7 @@ let build_ext2 debug basedir files modpath kernel_version appliance =
-     sprintf "%s %s ext2 -F%s %s"
-       Config.mke2fs Config.mke2fs_t_option
-       (if debug >= 2 then "" else "q")
--      appliance in
-+      (quote appliance) in
-   run_command cmd;
- 
-   let fs = ext2fs_open appliance in
--- 
-1.8.5.3
-
diff --git a/0001-bin2s-Mark-stack-as-non-executable.patch b/0001-bin2s-Mark-stack-as-non-executable.patch
deleted file mode 100644
index 66bd948..0000000
--- a/0001-bin2s-Mark-stack-as-non-executable.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c9f7a7998021e1cbe22a8ec325d43e2bdc3eff5a Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Thu, 1 May 2014 09:42:11 +0100
-Subject: [PATCH] bin2s: Mark stack as non-executable.
-
-Every object file linked to supermin has to be marked as having a
-non-executable stack.  The object generated by bin2s was not being
-marked this way, thus the final supermin binary ended up as having an
-executable stack (wrongly).
-
-Before this change:
-
-$ execstack -q src/supermin
-X src/supermin
-
-After applying this patch and rebuilding:
-
-$ execstack -q src/supermin
-- src/supermin
-
-See also:
-
-http://gcc.gnu.org/ml/gcc-patches/2007-07/msg01155.html
-https://wiki.gentoo.org/wiki/Project:Hardened/GNU_stack_quickstart
-http://caml.inria.fr/mantis/print_bug_page.php?bug_id=4564
----
- src/bin2s.pl | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/bin2s.pl b/src/bin2s.pl
-index 2c78b5e..1b1c253 100755
---- a/src/bin2s.pl
-+++ b/src/bin2s.pl
-@@ -18,6 +18,10 @@ open my $ofh, '>', $outfile or die "open $outfile: $!";
- print $ofh <<"EOF";
- /* This file has been automatically generated from $infile by $0 */
- 
-+/* Mark stack as non-executable for GNU tools. */
-+\t.section .note.GNU-stack,"",%progbits
-+\t.previous
-+
- \t.globl\t_binary_${infile}_start
- \t.globl\t_binary_${infile}_end
- \t.globl\t_binary_${infile}_size
--- 
-1.9.0
-
diff --git a/sources b/sources
index cc0e67a..b3a9630 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0692c5627f6ee5030cf24033fa6ad7f2  supermin-5.1.7.tar.gz
+f10ff5a4c40cce1778c2aea50f682323  supermin-5.1.8.tar.gz
diff --git a/supermin.spec b/supermin.spec
index 90acdbd..77dfe7a 100644
--- a/supermin.spec
+++ b/supermin.spec
@@ -1,7 +1,7 @@
 Summary:       Tool for creating supermin appliances
 Name:          supermin
-Version:       5.1.7
-Release:       3%{?dist}
+Version:       5.1.8
+Release:       1%{?dist}
 License:       GPLv2+
 
 %if 0%{?rhel} >= 7
@@ -11,9 +11,6 @@ ExclusiveArch: x86_64
 URL:           http://people.redhat.com/~rjones/supermin/
 Source0:       http://libguestfs.org/download/supermin/%{name}-%{version}.tar.gz
 
-Patch1:        0001-Add-quoting-around-parameter-when-calling-external-m.patch
-Patch2:        0001-bin2s-Mark-stack-as-non-executable.patch
-
 BuildRequires: /usr/bin/pod2man
 BuildRequires: rpm
 BuildRequires: yum-utils
@@ -52,9 +49,6 @@ second when you need to boot one of them.
 %prep
 %setup -q
 
-%patch1 -p1
-%patch2 -p1
-
 
 %build
 %configure --disable-network-tests
@@ -79,6 +73,10 @@ make check || {
 
 
 %changelog
+* Fri May  9 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.8-1
+- New upstream version 5.1.8.
+- Remove patches which are now upstream.
+
 * Thu May  1 2014 Richard W.M. Jones <rjones@redhat.com> - 5.1.7-3
 - Add upstream patch which removes need to run execstack (RHBZ#1093261).