[libguestfs/f13/master] Remember to add patch.
Richard W.M. Jones
rjones at fedoraproject.org
Thu Nov 18 15:36:36 UTC 2010
commit 282a180f622e3796595fb4a4ba9981ae7ac0f51f
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Thu Nov 18 15:36:26 2010 +0000
Remember to add patch.
...-.-.hmac-files-from-the-supermin-applianc.patch | 28 ++++++++++++++++++++
libguestfs.spec | 4 +-
2 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/0001-Remove-FIPS-.-.hmac-files-from-the-supermin-applianc.patch b/0001-Remove-FIPS-.-.hmac-files-from-the-supermin-applianc.patch
new file mode 100644
index 0000000..fb10598
--- /dev/null
+++ b/0001-Remove-FIPS-.-.hmac-files-from-the-supermin-applianc.patch
@@ -0,0 +1,28 @@
+From 16e39ac0b8583c60fb1bc3378483b91886ed6f85 Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones at redhat.com>
+Date: Thu, 18 Nov 2010 15:32:05 +0000
+Subject: [PATCH] Remove FIPS .*.hmac files from the supermin appliance (RHBZ#654638).
+
+---
+ appliance/make.sh.in | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/appliance/make.sh.in b/appliance/make.sh.in
+index 36bcd6c..64bcb5a 100755
+--- a/appliance/make.sh.in
++++ b/appliance/make.sh.in
+@@ -128,6 +128,11 @@ if [ "@DIST@" = "REDHAT" ]; then
+ /var/log/yum.log \
+ $(cd initramfs && echo usr/sbin/glibc_post_upgrade.*)
+
++ # Remove all .*.hmac files (RHBZ#654638). These are not used unless
++ # you are using FIPS, and they cause hard dependencies on files
++ # which change whenever a library version is bumped.
++ @FEBOOTSTRAP_RUN@ initramfs -- rm -f $(cd initramfs && find -name '.*.hmac')
++
+ # Kernel modules take up nearly half of the image. Only include ones
+ # which are on the whitelist.
+ exec 5<appliance/kmod.whitelist
+--
+1.7.3.2
+
diff --git a/libguestfs.spec b/libguestfs.spec
index c470891..40ccbc4 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -42,7 +42,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs
Epoch: 1
Version: 1.6.2
-Release: 1%{?dist}.3
+Release: 1%{?dist}.4
License: LGPLv2+
Group: Development/Libraries
URL: http://libguestfs.org/
@@ -742,7 +742,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Thu Nov 18 2010 Richard Jones <rjones at redhat.com> - 1:1.6.2-1.fc13.3
+* Thu Nov 18 2010 Richard Jones <rjones at redhat.com> - 1:1.6.2-1.fc13.4
- New upstream stable branch version 1.6.2.
- This version includes a make install rule that works for Ruby, so
we can remove those instructions in the install section.
More information about the scm-commits
mailing list