From 212d78e7ec801720cf8bfc0e6199abdc6a852882 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@fedoraproject.org>
Date: Jan 28 2010 10:43:07 +0000
Subject: Backport unreadable files patch from RHEL 6 / upstream.


---

diff --git a/libguestfs-1.0.81-more-unreadable-files.patch b/libguestfs-1.0.81-more-unreadable-files.patch
new file mode 100644
index 0000000..8885af2
--- /dev/null
+++ b/libguestfs-1.0.81-more-unreadable-files.patch
@@ -0,0 +1,28 @@
+diff --git a/appliance/make.sh.in b/appliance/make.sh.in
+index b3cbe92..677e995 100755
+--- a/appliance/make.sh.in
++++ b/appliance/make.sh.in
+@@ -98,6 +98,23 @@ if [ "@DIST@" = "REDHAT" ]; then
+     /usr/sbin/tcpd \
+     /lib/dbus-1/dbus-daemon-launch-helper \
+     /lib64/dbus-1/dbus-daemon-launch-helper \
++    /etc/passwd- \
++    /etc/group- \
++    /etc/gshadow \
++    /etc/gshadow- \
++    /etc/shadow \
++    /etc/shadow- \
++    /etc/securetty \
++    /etc/sysconfig/iptables-config \
++    /etc/default/useradd \
++    /etc/security/opasswd \
++    /etc/libaudit.conf \
++    /var/log/tallylog \
++    /var/log/maillog \
++    /var/log/secure \
++    /var/log/spooler \
++    /var/log/messages \
++    /var/log/btmp \
+     $(cd initramfs && echo usr/sbin/glibc_post_upgrade.*)
+ 
+   # Kernel modules take up nearly half of the image.  Only include ones
diff --git a/libguestfs.spec b/libguestfs.spec
index 273a88c..c4730bb 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -5,7 +5,7 @@ Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
 Epoch:       1
 Version:     1.0.81
-Release:     6%{?dist}
+Release:     7%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://libguestfs.org/
@@ -19,6 +19,10 @@ Patch0:      libguestfs-1.0.79-no-fuse-test.patch
 # http://git.annexia.org/?p=libguestfs.git;a=commit;h=dab98a0e52b9bb9930048b94d637a2fdb218fc45
 Patch1:      0001-supermin-Add-special-case-for-libgcc_s-.so.N.patch
 
+# Backport unreadable files patch from RHEL 6 / upstream:
+# http://git.annexia.org/?p=libguestfs.git;a=commitdiff;h=3c398c8928d3860ca9e3c413046b6f38318bb6ef
+Patch2:      libguestfs-1.0.81-more-unreadable-files.patch
+
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
 BuildRequires: /usr/bin/pod2text
@@ -339,6 +343,7 @@ Requires:    jpackage-utils
 
 %patch0 -p1
 %patch1 -p1
+%patch1 -p2
 
 mkdir -p daemon/m4
 
@@ -614,8 +619,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Thu Jan 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-6
+* Thu Jan 28 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-7
 - Backport special handling of libgcc_s.so.
+- Backport unreadable files patch from RHEL 6 / upstream.
 
 * Fri Jan 22 2010 Richard W.M. Jones <rjones@redhat.com> - 1.0.81-5
 - Require febootstrap >= 2.6 (RHBZ#557262).