[febootstrap] Properly ignore .*.hmac files (accidental reopening of RHBZ#654638).
Richard W.M. Jones
rjones at fedoraproject.org
Mon Dec 6 23:04:03 UTC 2010
commit 01afa87036be52864b238e7596aec1b88d77a27a
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Dec 6 23:03:14 2010 +0000
Properly ignore .*.hmac files (accidental reopening of RHBZ#654638).
...nore-.-.hmac-files-accidental-reopening-o.patch | 25 ++++++++++++++++++++
febootstrap.spec | 7 +++++
2 files changed, 32 insertions(+), 0 deletions(-)
---
diff --git a/0001-Properly-ignore-.-.hmac-files-accidental-reopening-o.patch b/0001-Properly-ignore-.-.hmac-files-accidental-reopening-o.patch
new file mode 100644
index 0000000..e147c96
--- /dev/null
+++ b/0001-Properly-ignore-.-.hmac-files-accidental-reopening-o.patch
@@ -0,0 +1,25 @@
+From d60d959e8bd83793fadc7afe750d5eda94c8994b Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones at redhat.com>
+Date: Mon, 6 Dec 2010 23:00:39 +0000
+Subject: [PATCH] Properly ignore .*.hmac files (accidental reopening of RHBZ#654638).
+
+---
+ febootstrap.ml | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/febootstrap.ml b/febootstrap.ml
+index 8fee7b9..58b2962 100644
+--- a/febootstrap.ml
++++ b/febootstrap.ml
+@@ -151,7 +151,7 @@ let () =
+ );
+
+ (* Split the list of files into ones for hostfiles and ones for base image. *)
+- let p_hmac = Str.regexp "/\\.*\\.hmac$" in
++ let p_hmac = Str.regexp "/\\..*\\.hmac$" in
+
+ let hostfiles = ref []
+ and baseimgfiles = ref [] in
+--
+1.7.3.2
+
diff --git a/febootstrap.spec b/febootstrap.spec
index 567d81c..5da33bc 100644
--- a/febootstrap.spec
+++ b/febootstrap.spec
@@ -29,6 +29,8 @@ Requires: /sbin/insmod.static
#Requires: filelight
#Requires: baobab # Not as nice as filelight.
+# Fix for RHBZ#654638.
+Patch1: 0001-Properly-ignore-.-.hmac-files-accidental-reopening-o.patch
%description
febootstrap is a tool for building supermin appliances. These are
@@ -40,6 +42,8 @@ second when you need to boot one of them.
%prep
%setup -q
+%patch1 -p1
+
%build
%configure
@@ -65,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Dec 6 2010 Richard Jones <rjones at redhat.com> - 3.1-4
+- Properly ignore .*.hmac files (accidental reopening of RHBZ#654638).
+
* Mon Dec 6 2010 Richard Jones <rjones at redhat.com> - 3.1-3
- Uses yumdownloader at runtime, so require yum-utils.
More information about the scm-commits
mailing list