rpms/e2fsprogs/devel e2fsprogs-1.38-blkid-devmapper.patch, 1.1, 1.2 e2fsprogs.spec, 1.53, 1.54
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Tue Mar 21 22:01:58 UTC 2006
Author: kzak
Update of /cvs/dist/rpms/e2fsprogs/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv12838
Modified Files:
e2fsprogs-1.38-blkid-devmapper.patch e2fsprogs.spec
Log Message:
Prevent error messages to stderr caused by libblkid calling libdevmapper
e2fsprogs-1.38-blkid-devmapper.patch:
MCONFIG.in | 3
configure.in | 30 ++++++++
e2fsck/Makefile.in | 2
lib/blkid/Makefile.in | 4 -
lib/blkid/blkid.pc.in | 2
lib/blkid/blkidP.h | 1
lib/blkid/devname.c | 176 ++++++++++++++++++++++++++++++++++++++++++++++++++
7 files changed, 214 insertions(+), 4 deletions(-)
Index: e2fsprogs-1.38-blkid-devmapper.patch
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs-1.38-blkid-devmapper.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- e2fsprogs-1.38-blkid-devmapper.patch 11 Jan 2006 15:41:36 -0000 1.1
+++ e2fsprogs-1.38-blkid-devmapper.patch 21 Mar 2006 22:01:01 -0000 1.2
@@ -1,5 +1,5 @@
--- e2fsprogs-1.38/configure.in.dm 2005-04-06 20:44:15.000000000 +0200
-+++ e2fsprogs-1.38/configure.in 2006-01-11 14:50:39.000000000 +0100
++++ e2fsprogs-1.38/configure.in 2006-03-21 22:39:36.000000000 +0100
@@ -480,6 +480,36 @@
)
AC_SUBST(E2INITRD_PROG)
@@ -37,8 +37,8 @@
dnl
dnl
MAKEFILE_LIBRARY=$srcdir/lib/Makefile.library
---- e2fsprogs-1.38/MCONFIG.in.dm 2006-01-11 14:02:41.000000000 +0100
-+++ e2fsprogs-1.38/MCONFIG.in 2006-01-11 14:03:18.000000000 +0100
+--- e2fsprogs-1.38/MCONFIG.in.dm 2005-02-04 16:43:57.000000000 +0100
++++ e2fsprogs-1.38/MCONFIG.in 2006-03-21 22:39:36.000000000 +0100
@@ -74,6 +74,9 @@
LIBINTL = @LIBINTL@
DEPLIBUUID = $(LIB)/libuuid at LIB_EXT@
@@ -49,8 +49,8 @@
STATIC_LIBSS = $(LIB)/libss at STATIC_LIB_EXT@
STATIC_LIBCOM_ERR = $(LIB)/libcom_err at STATIC_LIB_EXT@
STATIC_LIBE2P = $(LIB)/libe2p at STATIC_LIB_EXT@
---- e2fsprogs-1.38/lib/blkid/blkid.pc.in.dm 2006-01-11 13:25:32.000000000 +0100
-+++ e2fsprogs-1.38/lib/blkid/blkid.pc.in 2006-01-11 14:48:57.000000000 +0100
+--- e2fsprogs-1.38/lib/blkid/blkid.pc.in.dm 2005-01-26 18:13:25.000000000 +0100
++++ e2fsprogs-1.38/lib/blkid/blkid.pc.in 2006-03-21 22:39:36.000000000 +0100
@@ -6,6 +6,6 @@
Name: blkid
Description: Block device id library
@@ -60,7 +60,7 @@
Cflags: -I${includedir}
Libs: -L${libdir} -lblkid
--- e2fsprogs-1.38/lib/blkid/Makefile.in.dm 2005-06-29 19:39:54.000000000 +0200
-+++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-01-11 14:10:44.000000000 +0100
++++ e2fsprogs-1.38/lib/blkid/Makefile.in 2006-03-21 22:39:36.000000000 +0100
@@ -37,7 +37,7 @@
ELF_IMAGE = libblkid
ELF_MYDIR = blkid
@@ -80,7 +80,7 @@
.c.o:
--- e2fsprogs-1.38/lib/blkid/devname.c.dm 2005-05-07 21:26:03.000000000 +0200
-+++ e2fsprogs-1.38/lib/blkid/devname.c 2006-01-11 14:29:47.000000000 +0100
++++ e2fsprogs-1.38/lib/blkid/devname.c 2006-03-21 22:45:17.000000000 +0100
@@ -11,6 +11,8 @@
* %End-Header%
*/
@@ -123,11 +123,17 @@
if (tmp->bid_devno == devno) {
if (only_if_new)
return;
-@@ -137,6 +151,155 @@
+@@ -137,6 +151,165 @@
return;
}
+#ifdef HAVE_DEVMAPPER
++static void dm_quiet_log(int level, const char *file, int line,
++ const char *f, ...)
++{
++ return;
++}
++
+/*
+ * device-mapper support
+ */
@@ -177,9 +183,11 @@
+ unsigned int next = 0;
+ int n, ret = 1;
+
++ dm_log_init(dm_quiet_log);
+ task = dm_task_create(DM_DEVICE_LIST);
+ if (!task)
+ return 1;
++ dm_log_init(0);
+
+ dm_task_run(task);
+ names = dm_task_get_names(task);
@@ -236,9 +244,11 @@
+ unsigned int next = 0;
+ int n;
+
++ dm_log_init(dm_quiet_log);
+ task = dm_task_create(DM_DEVICE_LIST);
+ if (!task)
+ return;
++ dm_log_init(0);
+
+ dm_task_run(task);
+ names = dm_task_get_names(task);
@@ -279,7 +289,7 @@
#define PROC_PARTITIONS "/proc/partitions"
#define VG_DIR "/proc/lvm/VGs"
-@@ -290,6 +453,9 @@
+@@ -290,6 +463,9 @@
return 0;
blkid_read_cache(cache);
@@ -290,7 +300,7 @@
#ifdef VG_DIR
lvm_probe_all(cache, only_if_new);
--- e2fsprogs-1.38/lib/blkid/blkidP.h.dm 2005-05-07 20:16:09.000000000 +0200
-+++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-01-11 13:24:54.000000000 +0100
++++ e2fsprogs-1.38/lib/blkid/blkidP.h 2006-03-21 22:39:36.000000000 +0100
@@ -118,6 +118,7 @@
/*
* Priority settings for different types of devices
@@ -300,7 +310,7 @@
#define BLKID_PRI_LVM 20
#define BLKID_PRI_MD 10
--- e2fsprogs-1.38/e2fsck/Makefile.in.dm 2005-06-29 19:42:20.000000000 +0200
-+++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-01-11 14:04:35.000000000 +0100
++++ e2fsprogs-1.38/e2fsck/Makefile.in 2006-03-21 22:39:36.000000000 +0100
@@ -20,7 +20,7 @@
DEPLIBS= $(LIBEXT2FS) $(LIBCOM_ERR) $(LIBBLKID) $(DEPLIBUUID)
Index: e2fsprogs.spec
===================================================================
RCS file: /cvs/dist/rpms/e2fsprogs/devel/e2fsprogs.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- e2fsprogs.spec 13 Mar 2006 12:53:54 -0000 1.53
+++ e2fsprogs.spec 21 Mar 2006 22:01:02 -0000 1.54
@@ -4,7 +4,7 @@
Summary: Utilities for managing the second extended (ext2) filesystem.
Name: e2fsprogs
Version: 1.38
-Release: 13
+Release: 14
License: GPL
Group: System Environment/Base
Source: ftp://download.sourceforge.net/pub/sourceforge/e2fsprogs/e2fsprogs-%{version}.tar.gz
@@ -310,6 +310,9 @@
%{_mandir}/man3/uuid_unparse.3*
%changelog
+* Tue Mar 21 2006 Karel Zak <kzak at redhat.com> - 1.38-14
+- prevent error messages to stderr caused by libblkid calling libdevmapper
+
* Mon Mar 13 2006 Karel Zak <kzak at redhat.com> - 1.38-13
- used upstream version of the blkid-epoch patch (by Theodore Tso, #182188)
More information about the fedora-cvs-commits
mailing list