From 9f643f99c9541104e16bdd0f11f6c7a333a8d055 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Nov 07 2005 12:22:20 +0000
Subject: fix mkfs.cramfs


---

diff --git a/util-linux-2.13-cramfs-zerofiles.patch b/util-linux-2.13-cramfs-zerofiles.patch
new file mode 100644
index 0000000..3d97419
--- /dev/null
+++ b/util-linux-2.13-cramfs-zerofiles.patch
@@ -0,0 +1,11 @@
+--- util-linux-2.13-pre5/disk-utils/mkfs.cramfs.c.zerofiles	2005-11-07 13:05:27.000000000 +0100
++++ util-linux-2.13-pre5/disk-utils/mkfs.cramfs.c	2005-11-07 13:06:38.000000000 +0100
+@@ -661,7 +661,7 @@
+                         if (e->same) {
+                                 set_data_offset(e, base, e->same->offset);
+                                 e->offset = e->same->offset;
+-                        } else {
++                        } else if (e->size) {
+                                 set_data_offset(e, base, offset);
+                                 e->offset = offset;
+                                 offset = do_compress(base, offset, e->name,
diff --git a/util-linux.spec b/util-linux.spec
index da44716..0a1c2c5 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -25,7 +25,7 @@ BuildRoot: %{_tmppath}/%{name}-root
 Summary: A collection of basic system utilities.
 Name: util-linux
 Version: 2.13
-Release: 0.9.pre5
+Release: 0.10.pre5
 License: distributable
 Group: System Environment/Base
 
@@ -157,6 +157,8 @@ Patch215: util-linux-2.13-audit-login.patch
 Patch216: util-linux-2.13-ipcs-shmax.patch
 # 171337 - mkfs.cramfs dies creating installer image
 Patch217: util-linux-2.13-cramfs-maxentries.patch
+# [171337 too] - mkfs.cramfs doesn't work correctly with empty files
+Patch218: util-linux-2.13-cramfs-zerofiles.patch
 
 # When adding patches, please make sure that it is easy to find out what bug # the 
 # patch fixes.
@@ -227,6 +229,7 @@ cp %{SOURCE8} %{SOURCE9} .
 %patch215 -p1
 %patch216 -p1
 %patch217 -p1
+%patch218 -p1
 
 %build
 unset LINGUAS || :
@@ -610,6 +613,9 @@ fi
 /sbin/losetup
 
 %changelog
+* Mon Nov  7 2005 Karel Zak <kzak@redhat.com> 2.13-0.10.pre5
+- fix #171337 - mkfs.cramfs doesn't work correctly with empty files
+
 * Fri Oct 28 2005 Karel Zak <kzak@redhat.com> 2.13-0.9.pre5
 - rebuild