diff --git a/lvm2-2_02_53-dmeventd_log_fn.patch b/lvm2-2_02_53-dmeventd_log_fn.patch new file mode 100644 index 0000000..eb0b6e2 --- /dev/null +++ b/lvm2-2_02_53-dmeventd_log_fn.patch @@ -0,0 +1,37 @@ +diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c +--- LVM2.2.02.52/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c 2009-06-30 19:39:31.000000000 +0100 ++++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/mirror/dmeventd_mirror.c 2009-09-17 12:51:29.637533000 +0100 +@@ -126,8 +126,10 @@ + return ME_IGNORE; + } + +-static void _temporary_log_fn(int level, const char *file __attribute((unused)), ++static void _temporary_log_fn(int level, ++ const char *file __attribute((unused)), + int line __attribute((unused)), ++ int dm_errno __attribute((unused)), + const char *format) + { + if (!strncmp(format, "WARNING: ", 9) && (level < 5)) +diff -ru LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c +--- LVM2.2.02.52/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c 2008-10-13 13:06:30.000000000 +0100 ++++ LVM2.2.02.52-new2/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c 2009-09-17 12:51:29.641533000 +0100 +@@ -57,6 +57,7 @@ + static void _temporary_log_fn(int level, + const char *file __attribute((unused)), + int line __attribute((unused)), ++ int dm_errno __attribute((unused)), + const char *format) + { + if (!strncmp(format, "WARNING: ", 9) && (level < 5)) +Only in LVM2.2.02.52/scripts: lvm2_monitoring_init_red_hat.in.lvm2_monitoring +diff -ru LVM2.2.02.52/WHATS_NEW LVM2.2.02.52-new2/WHATS_NEW +--- LVM2.2.02.52/WHATS_NEW 2009-09-17 12:50:42.799264000 +0100 ++++ LVM2.2.02.52-new2/WHATS_NEW 2009-09-17 12:51:51.499101000 +0100 +@@ -1,5 +1,6 @@ + Version 2.02.53 - + ===================================== ++ Fix dmeventd _temporary_log_fn parameters. (2.02.50) + Update lvm2 monitoring script to lvm2_monitoring_init_red_hat.in. + + Version 2.02.52 - 15th September 2009 diff --git a/lvm2.spec b/lvm2.spec index e32e12b..e6afb1c 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -17,6 +17,7 @@ Source0: ftp://sources.redhat.com/pub/lvm2/LVM2.%{version}.tgz # Customise lvmconf.sh for built-in clustered locking in Fedora Patch0: cluster-locking-built-in.patch Patch1: lvm2-2_02_53-lvm2_monitoring_init.patch +Patch2: lvm2-2_02_53-dmeventd_log_fn.patch BuildRequires: libselinux-devel >= 1.30.19-4, libsepol-devel BuildRequires: ncurses-devel @@ -46,6 +47,7 @@ or more physical volumes and creating one or more logical volumes %setup -q -n LVM2.%{version} %patch0 -p1 -b .locking %patch1 -p1 -b .lvm2_monitoring +%patch2 -p1 -b .dmeventd_log_fn %build %define _exec_prefix /