Wed May 6 20:01:31 UTC 2009

Author: msnitzer

Update of /cvs/pkgs/rpms/device-mapper-multipath/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8154

Modified Files:
	.cvsignore device-mapper-multipath.spec 
	directio_message_cleanup.patch mpath_wait.patch 
	multipath_rules.patch redhatification.patch sources 
Added Files:
	lib64_multipath.patch 
Removed Files:
	config_files.patch config_space_fix.patch fix_devt.patch 
	fix_umask.patch linking_change.patch scsi_id_change.patch 
	sparc64fix.patch uevent_fix.patch 
Log Message:
Updated to latest upstream 0.4.9 code: multipath-tools-090429.tgz
(git commit id: 7395bcda3a218df2eab1617df54628af0dc3456e)


lib64_multipath.patch:

--- NEW FILE lib64_multipath.patch ---

diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
index d7f93cb..357c519 100644
--- a/libmultipath/defaults.h
+++ b/libmultipath/defaults.h
@@ -1,6 +1,6 @@
 #define DEFAULT_GETUID		"/lib/udev/scsi_id --whitelisted --device=/dev/%n"
 #define DEFAULT_UDEVDIR		"/dev"
-#define DEFAULT_MULTIPATHDIR	"/lib/multipath"
+#define DEFAULT_MULTIPATHDIR	"/lib64/multipath"
 #define DEFAULT_SELECTOR	"round-robin 0"
 #define DEFAULT_FEATURES	"0"
 #define DEFAULT_HWHANDLER	"0"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- .cvsignore	20 Aug 2008 21:48:41 -0000	1.16
+++ .cvsignore	6 May 2009 20:01:00 -0000	1.17
@@ -1 +1 @@
-multipath-tools-080804.tgz
+multipath-tools-090429.tgz


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- device-mapper-multipath.spec	7 Apr 2009 19:39:27 -0000	1.55
+++ device-mapper-multipath.spec	6 May 2009 20:01:00 -0000	1.56
@@ -1,31 +1,29 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
-Version: 0.4.8
-Release: 10%{?dist}
+Version: 0.4.9
+Release: 1%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
-Source0: multipath-tools-080804.tgz
-Patch0: linking_change.patch
-Patch1: uevent_fix.patch
-Patch2: sparc64fix.patch
-Patch3: config_files.patch
-Patch4: redhatification.patch
-Patch5: mpath_wait.patch
-Patch6: multipath_rules.patch
-Patch7: cciss_id.patch
-Patch8: scsi_id_change.patch
-Patch9: config_space_fix.patch
-Patch10: fix_devt.patch
-Patch11: directio_message_cleanup.patch
-Patch12: binding_error.patch
-Patch13: fix_kpartx.patch
-Patch14: fix_umask.patch
-Requires: kpartx = %{version}-%{release}
+
+Source0: multipath-tools-090429.tgz
+Patch0: lib64_multipath.patch
+Patch1: redhatification.patch
+Patch2: mpath_wait.patch
+Patch3: multipath_rules.patch
+Patch4: cciss_id.patch
+Patch5: directio_message_cleanup.patch
+Patch6: binding_error.patch
+Patch7: fix_kpartx.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: %{name}-libs = %{version}-%{release}
+Requires: kpartx = %{version}-%{release}
+Requires: device-mapper >= 1.02.02-2
 Requires(post): chkconfig
 Requires(preun): chkconfig
-Requires: device-mapper >= 1.02.02-2
+Requires(preun): initscripts
+Requires(postun): initscripts
 BuildRequires: libaio-devel, device-mapper-devel
 BuildRequires: libselinux-devel, libsepol-devel
 BuildRequires: readline-devel, ncurses-devel
@@ -37,6 +35,15 @@ The tools are :
 * multipath :   Scan the system for multipath devices and assemble them.
 * multipathd :  Detects when paths fail and execs multipath to update things.
 
+%package libs
+Summary: %{name} modules and shared library
+License: GPL+
+Group: System Environment/Libraries
+
+%description libs
+%{name}-libs provides the path checker and prioritizer modules. It also
+contains the multipath shared library, libmultipath.
+
 %package -n kpartx
 Summary: Partition device manager for device-mapper devices
 Group: System Environment/Base
@@ -47,28 +54,29 @@ kpartx manages partition creation and re
 
 %prep
 %setup -q -n multipath-tools
-%patch0 -p1 -b .linking_change
-%patch1 -p1 -b .uevent_fix
-%patch2 -p1 -b .sparc64fix
-%patch3 -p1 -b .config_files
-%patch4 -p1 -b .redhatification
-%patch5 -p1 -b .mpath_wait
-%patch6 -p1 -b .multipath_rules
-%patch7 -p1 -b .cciss_id
-%patch8 -p1 -b .scsi_id_change
-%patch9 -p1 -b .config_space_fix
-%patch10 -p1 -b .fix_devt
-%patch11 -p1 -b .directio_message
-%patch12 -p1 -b .binding_error
-%patch13 -p1 -b .ext_part
-%patch14 -p1 -b .umask
+%if %{_lib} == "lib64"
+%patch0 -p1 -b .lib64_multipath
+%endif
+%patch1 -p1 -b .redhatification
+%patch2 -p1 -b .mpath_wait
+%patch3 -p1 -b .multipath_rules
+%patch4 -p1 -b .cciss_id
+%patch5 -p1 -b .directio_message
+%patch6 -p1 -b .binding_error
+%patch7 -p1 -b .fix_kpartx
 
 %build
-make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT
+%define _sbindir /sbin
+%define _libdir /%{_lib}
+%define _libmpathdir %{_libdir}/multipath
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT bindir=/sbin rcdir=/etc/rc.d/init.d
+make install DESTDIR=$RPM_BUILD_ROOT bindir=%{_sbindir} syslibdir=%{_libdir} libdir=%{_libmpathdir} rcdir=%{_initrddir}
+install -m 0644 multipath/multipath.conf.redhat $RPM_BUILD_ROOT/etc/multipath.conf
+install -m 0755 multipathd/multipathd.init.redhat $RPM_BUILD_ROOT/%{_initrddir}/multipathd
+install -d $RPM_BUILD_ROOT/var/lib/multipath
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -79,25 +87,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun
 if [ "$1" = 0 ]; then
-	/sbin/service multipathd stop /dev/null 2>&1
+        /sbin/service multipathd stop /dev/null 2>&1
         /sbin/chkconfig --del multipathd
 fi
 
 %postun
 /sbin/ldconfig
 if [ "$1" -ge "1" ]; then
-	/sbin/service multipathd condrestart >/dev/null 2>&1 || :
+        /sbin/service multipathd condrestart >/dev/null 2>&1 || :
 fi
 
 %files
 %defattr(-,root,root,-)
-/sbin/multipath
-/sbin/multipathd
-/sbin/cciss_id
-/sbin/mpath_wait
-/lib/libmultipath.so
-/lib/multipath
-/etc/rc.d/init.d/multipathd
+%{_sbindir}/multipath
+%{_sbindir}/multipathd
+%{_sbindir}/cciss_id
+%{_sbindir}/mpath_wait
+%{_initrddir}/multipathd
 %{_mandir}/man5/multipath.conf.5.gz
 %{_mandir}/man8/multipath.8.gz
 %{_mandir}/man8/multipathd.8.gz
@@ -106,6 +112,11 @@ fi
 %doc AUTHOR COPYING README* FAQ multipath.conf.annotated multipath.conf.defaults multipath.conf.synthetic
 %dir /var/lib/multipath
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libmultipath.so
+%{_libmpathdir}
+%dir %{_libmpathdir}
 
 %files -n kpartx
 %defattr(-,root,root,-)
@@ -113,6 +124,12 @@ fi
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Thu Apr 29 2009 Mike Snitzer <snitzer at redhat.com> - 0.4.9-1
+- Updated to latest upstream 0.4.9 code: multipath-tools-090429.tgz
+  (git commit id: 7395bcda3a218df2eab1617df54628af0dc3456e)
+- split the multipath libs out to a device-mapper-multipath-libs package
+- if appropriate, install multipath libs in /lib64 and /lib64/multipath
+
 * Thu Apr 7 2009 Milan Broz <mbroz at redhat.com> - 0.4.8-10
 - Fix insecure permissions on multipathd.sock (CVE-2009-0115)
 
@@ -144,7 +161,7 @@ fi
 
 * Mon May 19 2008 Benjamin Marzinksi <bmarzins at redhat.com> 0.4.8-3
 - Fixed ownership build error.
-	
+
 * Mon May 19 2008 Benjamin Marzinksi <bmarzins at redhat.com> 0.4.8-2
 - Forgot to commit some patches.
 

directio_message_cleanup.patch:

Index: directio_message_cleanup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/directio_message_cleanup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- directio_message_cleanup.patch	26 Sep 2008 23:28:35 -0000	1.1
+++ directio_message_cleanup.patch	6 May 2009 20:01:01 -0000	1.2
@@ -1,15 +1,17 @@
-Index: multipath-tools/libmultipath/checkers/directio.c
-===================================================================
---- multipath-tools.orig/libmultipath/checkers/directio.c
-+++ multipath-tools/libmultipath/checkers/directio.c
-@@ -148,8 +148,9 @@ check_state(int fd, struct directio_cont
+diff --git a/libmultipath/checkers/directio.c b/libmultipath/checkers/directio.c
+index 4728424..7624c4e 100644
+--- a/libmultipath/checkers/directio.c
++++ b/libmultipath/checkers/directio.c
+@@ -148,10 +148,11 @@ check_state(int fd, struct directio_context *ct, int sync)
  	}
  	ct->running++;
  
 +	errno = 0;
  	r = io_getevents(ct->ioctx, 1L, 1L, &event, &timeout);
--	LOG(3, "async io getevents returns %li (errno=%s)", r, strerror(errno));
-+	LOG(3, "async io_getevents returns %li (%s)", r, strerror(errno));
  
- 	if (r < 1L) {
- 		if (ct->running > ASYNC_TIMEOUT_SEC || sync) {
+ 	if (r < 0 ) {
+-		LOG(3, "async io getevents returned %li (errno=%s)", r,
++		LOG(3, "async io getevents returned %li (%s)", r,
+ 		    strerror(errno));
+ 		rc = PATH_UNCHECKED;
+ 	} else if (r < 1L) {

mpath_wait.patch:

Index: mpath_wait.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/mpath_wait.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mpath_wait.patch	20 May 2008 04:37:41 -0000	1.1
+++ mpath_wait.patch	6 May 2009 20:01:01 -0000	1.2
@@ -1,8 +1,8 @@
-Index: multipath-tools-080515/multipath/Makefile
-===================================================================
---- multipath-tools-080515.orig/multipath/Makefile
-+++ multipath-tools-080515/multipath/Makefile
-@@ -21,7 +21,7 @@ $(EXEC): $(OBJS)
+diff --git a/multipath/Makefile b/multipath/Makefile
+index e0031a2..fe377d8 100644
+--- a/multipath/Makefile
++++ b/multipath/Makefile
+@@ -20,7 +20,7 @@ $(EXEC): $(OBJS)
  
  install:
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
@@ -11,7 +11,7 @@ Index: multipath-tools-080515/multipath/
  	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
  	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
-@@ -36,6 +36,7 @@ install:
+@@ -31,6 +31,7 @@ install:
  uninstall:
  	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
  	rm $(DESTDIR)$(bindir)/$(EXEC)
@@ -19,10 +19,11 @@ Index: multipath-tools-080515/multipath/
  	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
  	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
  
-Index: multipath-tools-080515/multipath/mpath_wait
-===================================================================
+diff --git a/multipath/mpath_wait b/multipath/mpath_wait
+new file mode 100644
+index 0000000..d4047cc
 --- /dev/null
-+++ multipath-tools-080515/multipath/mpath_wait
++++ b/multipath/mpath_wait
 @@ -0,0 +1,17 @@
 +#!/bin/bash
 +

multipath_rules.patch:

Index: multipath_rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/multipath_rules.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- multipath_rules.patch	26 Sep 2008 23:28:36 -0000	1.2
+++ multipath_rules.patch	6 May 2009 20:01:01 -0000	1.3
@@ -1,8 +1,8 @@
-Index: multipath-tools/multipath/Makefile
-===================================================================
---- multipath-tools.orig/multipath/Makefile
-+++ multipath-tools/multipath/Makefile
-@@ -23,7 +23,7 @@ install:
+diff --git a/multipath/Makefile b/multipath/Makefile
+index fe377d8..b2c4fa6 100644
+--- a/multipath/Makefile
++++ b/multipath/Makefile
+@@ -22,14 +22,14 @@ install:
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
  	$(INSTALL_PROGRAM) -m 755 $(EXEC) mpath_wait $(DESTDIR)$(bindir)/
  	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
@@ -11,8 +11,7 @@ Index: multipath-tools/multipath/Makefil
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
  	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
-@@ -34,7 +34,7 @@ install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)/var/lib/multipath
+ 	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
  
  uninstall:
 -	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
@@ -20,10 +19,10 @@ Index: multipath-tools/multipath/Makefil
  	rm $(DESTDIR)$(bindir)/$(EXEC)
  	rm $(DESTDIR)$(bindir)/mpath_wait
  	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
-Index: multipath-tools/multipath/multipath.rules
-===================================================================
---- multipath-tools.orig/multipath/multipath.rules
-+++ multipath-tools/multipath/multipath.rules
+diff --git a/multipath/multipath.rules b/multipath/multipath.rules
+index ac97749..ad2ff2a 100644
+--- a/multipath/multipath.rules
++++ b/multipath/multipath.rules
 @@ -1,7 +1,8 @@
 -#
 -# udev rules for multipathing.
@@ -31,10 +30,11 @@ Index: multipath-tools/multipath/multipa
 -#
 -
 -# socket for uevents
+-SUBSYSTEM=="block", RUN+="socket:/org/kernel/dm/multipath_event"
 +# multipath wants the devmaps presented as meaninglful device names
 +# so name them after their devmap name
 +SUBSYSTEM!="block", GOTO="end_mpath"
- RUN+="socket:/org/kernel/dm/multipath_event"
++RUN+="socket:/org/kernel/dm/multipath_event"
 +KERNEL!="dm-[0-9]*", GOTO="end_mpath"
 +PROGRAM!="/sbin/mpath_wait %M %m", GOTO="end_mpath"
 +ACTION=="add", RUN+="/sbin/dmsetup ls --target multipath --exec '/sbin/kpartx -a -p p' -j %M -m %m"

redhatification.patch:

Index: redhatification.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/redhatification.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- redhatification.patch	26 Sep 2008 23:28:36 -0000	1.2
+++ redhatification.patch	6 May 2009 20:01:01 -0000	1.3
@@ -1,36 +1,8 @@
-Index: multipath-tools/libmultipath/defaults.h
+Index: multipath-tools-090407/libmultipath/hwtable.c
 ===================================================================
---- multipath-tools.orig/libmultipath/defaults.h
-+++ multipath-tools/libmultipath/defaults.h
-@@ -1,4 +1,4 @@
--#define DEFAULT_GETUID		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#define DEFAULT_GETUID		"/sbin/scsi_id -g -u -s /block/%n"
- #define DEFAULT_UDEVDIR		"/dev"
- #define DEFAULT_MULTIPATHDIR	"/lib/multipath"
- #define DEFAULT_SELECTOR	"round-robin 0"
-Index: multipath-tools/libmultipath/hwtable.c
-===================================================================
---- multipath-tools.orig/libmultipath/hwtable.c
-+++ multipath-tools/libmultipath/hwtable.c
-@@ -172,7 +172,7 @@ static struct hwentry default_hw[] = {
- 		/* HP Smart Array */
- 		.vendor        = "HP",
- 		.product       = "LOGICAL VOLUME.*",
--		.getuid        = "/lib/udev/scsi_id -n -g -u -s /block/%n",
-+		.getuid        = "/sbin/scsi_id -n -g -u -s /block/%n",
- 		.features      = DEFAULT_FEATURES,
- 		.hwhandler     = DEFAULT_HWHANDLER,
- 		.selector      = DEFAULT_SELECTOR,
-@@ -214,7 +214,7 @@ static struct hwentry default_hw[] = {
- 	{
- 		.vendor        = "EMC",
- 		.product       = "SYMMETRIX",
--		.getuid        = "/lib/udev/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
-+		.getuid        = "/sbin/scsi_id -g -u -ppre-spc3-83 -s /block/%n",
- 		.features      = DEFAULT_FEATURES,
- 		.hwhandler     = DEFAULT_HWHANDLER,
- 		.selector      = DEFAULT_SELECTOR,
-@@ -485,7 +485,7 @@ static struct hwentry default_hw[] = {
+--- multipath-tools-090407.orig/libmultipath/hwtable.c	2009-04-07 15:21:33.000000000 -0500
++++ multipath-tools-090407/libmultipath/hwtable.c	2009-04-07 09:16:31.000000000 -0500
+@@ -554,7 +554,7 @@ static struct hwentry default_hw[] = {
  		.vendor        = "IBM",
  		.product       = "S/390 DASD ECKD",
  		.bl_product       = "S/390.*",
@@ -39,558 +11,21 @@ Index: multipath-tools/libmultipath/hwta
  		.features      = "1 queue_if_no_path",
  		.hwhandler     = DEFAULT_HWHANDLER,
  		.selector      = DEFAULT_SELECTOR,
-@@ -722,6 +722,22 @@ static struct hwentry default_hw[] = {
- 		.checker_name  = RDAC,
- 		.prio_name     = PRIO_RDAC,
- 	},
-+	/* DELL arrays */
-+	{
-+		.vendor        = "DELL",
-+		.product       = "MD3000",
-+		.getuid        = DEFAULT_GETUID,
-+		.features      = DEFAULT_FEATURES,
-+		.hwhandler     = "1 rdac",
-+		.selector      = DEFAULT_SELECTOR,
-+		.pgpolicy      = GROUP_BY_PRIO,
-+		.pgfailback    = -FAILBACK_MANUAL,
-+		.rr_weight     = RR_WEIGHT_NONE,
-+		.no_path_retry = NO_PATH_RETRY_UNDEF,
-+		.minio         = DEFAULT_MINIO,
-+		.checker_name  = RDAC,
-+		.prio_name     = PRIO_RDAC,
-+	},
- 	/*
- 	 * EOL
- 	 */
-Index: multipath-tools/multipath.conf.annotated
-===================================================================
---- multipath-tools.orig/multipath.conf.annotated
-+++ multipath-tools/multipath.conf.annotated
-@@ -55,9 +55,9 @@
- #	# scope   : multipath
- #	# desc    : the default program and args to callout to obtain a unique 
- #	#           path identifier. Absolute path required
--#	# default : /lib/udev/scsi_id -g -u -s
-+#	# default : /sbin/scsi_id -g -u -s
- #	#
--#	getuid_callout	"/lib/udev/scsi_id -g -u -s /block/%n"
-+#	getuid_callout	"/sbin/scsi_id -g -u -s /block/%n"
- #
- #	#
- #	# name    : prio
-@@ -336,7 +336,7 @@
- #		# desc    : the program and args to callout to obtain a unique 
- #		#           path identifier. Absolute path required
- #		#
--#		getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout          "/sbin/scsi_id -g -u -s /block/%n"
- #
- #		#
- #		# name    : path_selector
-Index: multipath-tools/multipath.conf.defaults
-===================================================================
---- multipath-tools.orig/multipath.conf.defaults
-+++ multipath-tools/multipath.conf.defaults
-@@ -6,7 +6,7 @@
- #	polling_interval	5
- #	selector		"round-robin 0"
- #	path_grouping_policy	failover
--#	getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#	getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #	prio			const
- #	path_checker		directio
- #	rr_min_io		1000
-@@ -26,7 +26,7 @@
- #	device {
- #		vendor			"APPLE*"
- #		product			"Xserve RAID"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -39,7 +39,7 @@
- #	device {
- #		vendor			"3PARdata"
- #		product			"VV"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -52,7 +52,7 @@
- #	device {
- #		vendor			"DEC"
- #		product			"HSG80"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"1 hp-sw"
- #		path_selector		"round-robin 0"
-@@ -65,7 +65,7 @@
- #	device {
- #		vendor			"HP"
- #		product			"A6189A"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -79,7 +79,7 @@
- #	device {
- #		vendor			"(COMPAQ|HP)"
- #		product			"(MSA|HSV)1.0.*"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"1 hp-sw"
- #		path_selector		"round-robin 0"
-@@ -93,7 +93,7 @@
- #	device {
- #		vendor			"HP"
- #		product			"MSA VOLUME"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -123,7 +123,7 @@
- #	device {
- #		vendor			"(COMPAQ|HP)"
- #		product			"HSV1[01]1|HSV2[01]0|HSV300"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -138,7 +138,7 @@
- #	device {
- #		vendor			"HP"
- #		product			"MSA2[02]12*"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -153,7 +153,7 @@
- #	device {
- #		vendor			"HP"
- #		product			"LOGICAL VOLUME.*"
--#		getuid_callout		"/lib/udev/scsi_id -n -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -n -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -168,7 +168,7 @@
- #	device {
- #		vendor			"DDN"
- #		product			"SAN DataDirector"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -181,7 +181,7 @@
- #	device {
- #		vendor			"EMC"
- #		product			"SYMMETRIX"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -ppre-spc3-83 -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -ppre-spc3-83 -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -195,7 +195,7 @@
- #		vendor			"DGC"
- #		product			".*"
- #		product_blacklist	"LUNZ"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		prio_callout		"/sbin/mpath_prio_emc /dev/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"1 emc"
-@@ -211,7 +211,7 @@
- #	device {
- #		vendor			"FSC"
- #		product			"CentricStor"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -224,7 +224,7 @@
- #	device {
- #		vendor			"(HITACHI|HP)"
- #		product			"OPEN-.*"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -237,7 +237,7 @@
- #	device {
- #		vendor			"HITACHI"
- #		product			"DF.*"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -251,7 +251,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"ProFibre 4000R"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -264,7 +264,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"1722-600"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"1 rdac"
- #		path_selector		"round-robin 0"
-@@ -279,7 +279,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"1742"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"1 rdac"
- #		path_selector		"round-robin 0"
-@@ -294,7 +294,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"1814"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"1 rdac"
- #		path_selector		"round-robin 0"
-@@ -309,7 +309,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"1815"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"1 rdac"
- #		path_selector		"round-robin 0"
-@@ -324,7 +324,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"3526"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"1 rdac"
- #		path_selector		"round-robin 0"
-@@ -339,7 +339,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"3542"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -352,7 +352,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"2105(800|F20)"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -365,7 +365,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"1750500"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -379,7 +379,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"2107900"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -392,7 +392,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"2145"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -407,7 +407,7 @@
- #		vendor			"IBM"
- #		product			"S/390 DASD ECKD"
- #		product_blacklist	"S/390.*"
--#		getuid_callout		"/sbin/dasdinfo -u -b %n"
-+#		getuid_callout		"/sbin/dasd_id /dev/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -420,7 +420,7 @@
- #	device {
- #		vendor			"NETAPP"
- #		product			"LUN.*"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -434,7 +434,7 @@
- #	device {
- #		vendor			"IBM"
- #		product			"Nseries.*"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"1 queue_if_no_path"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -448,7 +448,7 @@
- #	device {
- #		vendor			"Pillar"
- #		product			"Axiom.*"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -461,7 +461,7 @@
- #	device {
- #		vendor			"SGI"
- #		product			"TP9[13]00"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -474,7 +474,7 @@
- #	device {
- #		vendor			"SGI"
- #		product			"TP9[45]00"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"1 rdac"
- #		path_selector		"round-robin 0"
-@@ -489,7 +489,7 @@
- #	device {
- #		vendor			"SGI"
- #		product			"IS.*"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"1 rdac"
- #		path_selector		"round-robin 0"
-@@ -504,7 +504,7 @@
- #	device {
- #		vendor			"STK"
- #		product			"OPENstorage D280"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -518,7 +518,7 @@
- #	device {
- #		vendor			"SUN"
- #		product			"(StorEdge 3510|T4)"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"0"
- #		path_selector		"round-robin 0"
-@@ -544,7 +544,7 @@
- #	device {
- #		vendor			"SUN"
- #		product			"CSM200_R"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"1 rdac"
- #		path_selector		"round-robin 0"
-@@ -559,7 +559,7 @@
- #	device {
- #		vendor			"SUN"
- #		product			"LCSM100_F"
--#		getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #		features		"0"
- #		hardware_handler	"1 rdac"
- #		path_selector		"round-robin 0"
-@@ -571,4 +571,18 @@
- #		path_checker		rdac
- #		prio			rdac
- #	}
-+#	device {
-+#		vendor			"DELL"
-+#		product			"MD3000"
-+#		getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
-+#		features		"0"
-+#		hardware_handler	"1 rdac"
-+#		path_selector		"round-robin 0"
-+#		path_grouping_policy	group_by_prio
-+#		failback		manual
-+#		rr_weight		uniform
-+#		rr_min_io		1000
-+#		path_checker		rdac
-+#		prio			rdac
-+#	}
- #}
-Index: multipath-tools/multipath.conf.synthetic
-===================================================================
---- multipath-tools.orig/multipath.conf.synthetic
-+++ multipath-tools/multipath.conf.synthetic
-@@ -7,7 +7,7 @@
- #	polling_interval 	10
- #	selector		"round-robin 0"
- #	path_grouping_policy	multibus
--#	getuid_callout		"/lib/udev/scsi_id -g -u -s /block/%n"
-+#	getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
- #	prio			const
- #	path_checker		directio
- #	rr_min_io		100
-@@ -52,7 +52,7 @@
- #		vendor			"COMPAQ  "
- #		product			"HSV110 (C)COMPAQ"
- #		path_grouping_policy	multibus
--#		getuid_callout          "/lib/udev/scsi_id -g -u -s /block/%n"
-+#		getuid_callout          "/sbin/scsi_id -g -u -s /block/%n"
- #		path_checker		directio
- #		path_selector		"round-robin 0"
- #		hardware_handler	"0"
-Index: multipath-tools/Makefile.inc
-===================================================================
---- multipath-tools.orig/Makefile.inc
-+++ multipath-tools/Makefile.inc
-@@ -20,7 +20,7 @@ libudevdir  = ${prefix}/lib/udev
- multipathdir = $(TOPDIR)/libmultipath
- mandir      = $(prefix)/usr/share/man/man8
- man5dir     = $(prefix)/usr/share/man/man5
--rcdir	    = $(prefix)/etc/init.d
-+rcdir	    = $(prefix)/etc/rc.d/init.d
- libdir	    = $(prefix)/lib/multipath
- 
- GZIP        = /bin/gzip -9 -c
-Index: multipath-tools/multipathd/Makefile
-===================================================================
---- multipath-tools.orig/multipathd/Makefile
-+++ multipath-tools/multipathd/Makefile
-@@ -35,6 +35,7 @@ install:
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
-+	$(INSTALL_PROGRAM) -m 755 multipathd.init.redhat $(DESTDIR)$(rcdir)/$(EXEC)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
- 
-Index: multipath-tools/multipathd/multipathd.init.redhat
-===================================================================
---- multipath-tools.orig/multipathd/multipathd.init.redhat
-+++ multipath-tools/multipathd/multipathd.init.redhat
-@@ -1,13 +1,9 @@
- #!/bin/bash
--
--#
--#	/etc/rc.d/init.d/multipathd
- #
--# Starts the multipath daemon
-+# multipathd	Starts the multipath daemon
- #
- # chkconfig: - 13 87
--# description: Manage device-mapper multipath devices
--# processname: multipathd
-+# description: Manages device-mapper multipath devices
- 
- DAEMON=/sbin/multipathd
- prog=`basename $DAEMON`
-@@ -16,14 +12,8 @@ lockdir=/var/lock/subsys
- sysconfig=/etc/sysconfig
- 
-  
--system=redhat
-- 
--if [ $system = redhat ]; then
--	# Source function library.
--	. $initdir/functions
--fi
-+. $initdir/functions
-  
--test -x $DAEMON || exit 0
- test -r $sysconfig/$prog && . $sysconfig/$prog
- 
- RETVAL=0
-@@ -33,6 +23,7 @@ RETVAL=0
- #
- 
- start() {
-+	test -x $DAEMON || exit 5
- 	echo -n $"Starting $prog daemon: "
- 	daemon $DAEMON
- 	RETVAL=$?
-@@ -74,7 +65,7 @@ reload)
- restart)
- 	restart
- 	;;
--condrestart)
-+condrestart|try-restart)
- 	if [ -f $lockdir/$prog ]; then
- 	    restart
- 	fi
-@@ -85,7 +76,7 @@ status)
- 	;;
- *)
- 	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
--	RETVAL=1
-+	RETVAL=2
- esac
- 
- exit $RETVAL
-Index: multipath-tools/multipath/Makefile
-===================================================================
---- multipath-tools.orig/multipath/Makefile
-+++ multipath-tools/multipath/Makefile
-@@ -28,6 +28,10 @@ install:
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
- 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
- 	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
-+	if [ ! -e $(DESTDIR)//etc/multipath.conf ]; then \
-+		$(INSTALL_PROGRAM) -m 644 multipath.conf.redhat $(DESTDIR)/etc/multipath.conf; \
-+	fi
-+	$(INSTALL_PROGRAM) -d $(DESTDIR)/var/lib/multipath
- 
- uninstall:
- 	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
-Index: multipath-tools/multipath/multipath.conf.redhat
+Index: multipath-tools-090407/multipath/multipath.conf.redhat
 ===================================================================
---- /dev/null
-+++ multipath-tools/multipath/multipath.conf.redhat
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ multipath-tools-090407/multipath/multipath.conf.redhat	2009-04-07 09:16:31.000000000 -0500
 @@ -0,0 +1,97 @@
 +# This is a basic configuration file with some examples, for device mapper
 +# multipath.
 +# For a complete list of the default configuration values, see
-+# /usr/share/doc/device-mapper-multipath-0.4.8/multipath.conf.defaults
++# /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf.defaults
 +# For a list of configuration options with descriptions, see
-+# /usr/share/doc/device-mapper-multipath-0.4.8/multipath.conf.annotated
++# /usr/share/doc/device-mapper-multipath-0.4.9/multipath.conf.annotated
 +
 +
 +# Blacklist all devices by default. Remove this to enable multipathing
-+# on the default devices. 
++# on the default devices.
 +blacklist {
 +        devnode "*"
 +}
@@ -618,7 +53,7 @@ Index: multipath-tools/multipath/multipa
 +#	polling_interval 	10
 +#	selector		"round-robin 0"
 +#	path_grouping_policy	multibus
-+#	getuid_callout		"/sbin/scsi_id -g -u -s /block/%n"
++#	getuid_callout		"/lib/udev/scsi_id --whitelisted --device=/dev/%n"
 +#	prio			alua
 +#	path_checker		readsector0
 +#	rr_min_io		100
@@ -664,7 +99,7 @@ Index: multipath-tools/multipath/multipa
 +#		vendor			"COMPAQ  "
 +#		product			"HSV110 (C)COMPAQ"
 +#		path_grouping_policy	multibus
-+#		getuid_callout          "/sbin/scsi_id -g -u -s /block/%n"
++#		getuid_callout          "/lib/udev/scsi_id --whitelisted --device=/dev/%n"
 +#		path_checker		readsector0
 +#		path_selector		"round-robin 0"
 +#		hardware_handler	"0"
@@ -678,10 +113,10 @@ Index: multipath-tools/multipath/multipa
 +#		path_grouping_policy	multibus
 +#	}
 +#}
-Index: multipath-tools/kpartx/Makefile
+Index: multipath-tools-090407/kpartx/Makefile
 ===================================================================
---- multipath-tools.orig/kpartx/Makefile
-+++ multipath-tools/kpartx/Makefile
+--- multipath-tools-090407.orig/kpartx/Makefile	2009-04-07 15:21:33.000000000 -0500
++++ multipath-tools-090407/kpartx/Makefile	2009-04-07 09:16:31.000000000 -0500
 @@ -20,10 +20,10 @@ $(EXEC): $(OBJS)
  install: $(EXEC) $(EXEC).8
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- sources	20 Aug 2008 21:48:41 -0000	1.17
+++ sources	6 May 2009 20:01:01 -0000	1.18
@@ -1 +1 @@
-3ffa9a7f768fab9749689fe2624a8551  multipath-tools-080804.tgz
+450d0715048f3a8c82082ad2b9e5a2b3  multipath-tools-090429.tgz


--- config_files.patch DELETED ---


--- config_space_fix.patch DELETED ---


--- fix_devt.patch DELETED ---


--- fix_umask.patch DELETED ---


--- linking_change.patch DELETED ---


--- scsi_id_change.patch DELETED ---


--- sparc64fix.patch DELETED ---


--- uevent_fix.patch DELETED ---


