4 files changed, 68 insertions, 7 deletions
diff --git a/sys-libs/e2fsprogs-libs/ChangeLog b/sys-libs/e2fsprogs-libs/ChangeLog
index 9528bbf01bfb..6c088a89d3a8 100644
--- a/sys-libs/e2fsprogs-libs/ChangeLog
+++ b/sys-libs/e2fsprogs-libs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-libs/e2fsprogs-libs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.1 2008/08/16 04:42:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/ChangeLog,v 1.2 2008/08/16 04:59:44 vapier Exp $
+
+  16 Aug 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/e2fsprogs-libs-1.41.0-null-blkid.patch,
+  e2fsprogs-libs-1.41.0.ebuild:
+  Add fix from upstream for NULL blkids.
 
 *e2fsprogs-libs-1.41.0 (16 Aug 2008)
 
diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index f31b733c04c7..8778da815682 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA1
 
 AUX e2fsprogs-libs-1.41.0-makefile.patch 307 RMD160 1d0e083be1515512a1ebba6943ad5c6adcbe5efd SHA1 3a9e057d5b9e012eaa885db3ce83658a66ee7b4f SHA256 4a844e8ebb82fbaf528280b915067045b9906b423a6a9f3ef38046ade3667fd5
+AUX e2fsprogs-libs-1.41.0-null-blkid.patch 1920 RMD160 e946fb72fb0e929edb7286f4a7db8723fc33fb1b SHA1 672d4c29c59f5ef3bdfa75097031cad4be124ab7 SHA256 a62abfb3fac1fa8424a604afab6928f083862134ab23147f08c3a8befa70e1f1
 DIST e2fsprogs-libs-1.41.0.tar.gz 486616 RMD160 3bd4940bcc2b01348970c82e92c49ba97e9592e4 SHA1 d816781a9f1a5f6f6a6111350ca44aac6e5fa4f2 SHA256 f87088d80485faa850f49fa8758aa575ed1299bd7d026c56a60d9b60e36d461e
-EBUILD e2fsprogs-libs-1.41.0.ebuild 1641 RMD160 4731e7e6c7e72b31aac10194c146bf64a9caaef6 SHA1 fc6077af5ba907fe9890c77b8b9050c50c6b6d20 SHA256 155b5277cb10c9b8e22f4dbd9bbef9b2863c09b1b7b261ac92e0c05db6c3edc1
-MISC ChangeLog 437 RMD160 17bae4cc07481e65945b850b7f7238c931dc7c3f SHA1 0732570c142250b2da51dbcf8e02bd4a2c1f1e9c SHA256 614cffaf1da0802f0338a5548d32a3f0a64c2bb667056cedf43bc257c05336da
+EBUILD e2fsprogs-libs-1.41.0.ebuild 1685 RMD160 3dbe2c85c697cdfcdff425d06a3c769e24006c62 SHA1 af766f59147829c4080a3deb743e59c00faf045a SHA256 a454d25a71e7c2db20ee02705c1ef97f9d630eaafd389fc40f039112d70cffa6
+MISC ChangeLog 610 RMD160 5f06c0f358511eac480faa2f3cf232951be0204d SHA1 af5f9ae4d16753e0bf87ed11a629aee6e985ac3c SHA256 61eda13fe2d730fd9ccbcaad41613da61f24982976028c56837c748a18f7be4a
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkimWq0ACgkQ67wieSYcaxc1wQCg0wericD42F7+DFMLPGWIEfSK
-VGAAnRXVBQkvC9z6zgu5Y4OebA4APhhI
-=a6oP
+iEYEARECAAYFAkimXscACgkQ67wieSYcaxfrTACg39nDZu4PbGIsp3uxIApCdr2L
+z8oAoJYg0l+lN1T88hDppCKka6DX9E6u
+=/WkT
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild
index 2562ec62f107..8f2f8aac6735 100644
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild,v 1.1 2008/08/16 04:42:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.0.ebuild,v 1.2 2008/08/16 04:59:44 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -23,6 +23,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.41.0-makefile.patch
+	epatch "${FILESDIR}"/${P}-null-blkid.patch
 }
 
 src_compile() {
diff --git a/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-null-blkid.patch b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-null-blkid.patch
new file mode 100644
index 000000000000..e07c67c493de
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/files/e2fsprogs-libs-1.41.0-null-blkid.patch
@@ -0,0 +1,54 @@
+commit bb47c2a4aff6ec6b9be7f30cd04cf7c858a84de4
+Author: Theodore Ts'o <tytso@mit.edu>
+Date:   Sun Jul 13 19:10:10 2008 -0400
+
+    libblkid: Make sure we never reference a null dev->bid_type
+    
+    There were a few places where we don't check to make sure
+    dev->bid_type is non-NULL before dereferencing the pointer, mostly in
+    debug code.
+    
+    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
+
+diff --git a/lib/blkid/dev.c b/lib/blkid/dev.c
+index 770632b..5252a8e 100644
+--- a/lib/blkid/dev.c
++++ b/lib/blkid/dev.c
+@@ -34,7 +34,8 @@ void blkid_free_dev(blkid_dev dev)
+ 		return;
+ 
+ 	DBG(DEBUG_DEV,
+-	    printf("  freeing dev %s (%s)\n", dev->bid_name, dev->bid_type));
++	    printf("  freeing dev %s (%s)\n", dev->bid_name, dev->bid_type ?
++		   dev->bid_type : "(null)"));
+ 	DBG(DEBUG_DEV, blkid_debug_dump_dev(dev));
+ 
+ 	list_del(&dev->bid_devs);
+diff --git a/lib/blkid/devname.c b/lib/blkid/devname.c
+index df96859..65c6cca 100644
+--- a/lib/blkid/devname.c
++++ b/lib/blkid/devname.c
+@@ -96,7 +96,8 @@ blkid_dev blkid_get_dev(blkid_cache cache, const char *devname, int flags)
+ 			dev2 = list_entry(p, struct blkid_struct_dev, bid_devs);
+ 			if (dev2->bid_flags & BLKID_BID_FL_VERIFIED)
+ 				continue;
+-			if (strcmp(dev->bid_type, dev2->bid_type))
++			if (!dev->bid_type || !dev2->bid_type ||
++			    strcmp(dev->bid_type, dev2->bid_type))
+ 				continue;
+ 			if (dev->bid_label && dev2->bid_label &&
+ 			    strcmp(dev->bid_label, dev2->bid_label))
+diff --git a/lib/blkid/save.c b/lib/blkid/save.c
+index 76f2f9e..60aa6ce 100644
+--- a/lib/blkid/save.c
++++ b/lib/blkid/save.c
+@@ -34,7 +34,8 @@ static int save_dev(blkid_dev dev, FILE *file)
+ 		return 0;
+ 
+ 	DBG(DEBUG_SAVE,
+-	    printf("device %s, type %s\n", dev->bid_name, dev->bid_type));
++	    printf("device %s, type %s\n", dev->bid_name, dev->bid_type ?
++		   dev->bid_type : "(null)"));
+ 
+ 	fprintf(file,
+ 		"<device DEVNO=\"0x%04lx\" TIME=\"%ld\"",