rpms/device-mapper-multipath/devel binding_error.patch, NONE, 1.1 directio_message_cleanup.patch, NONE, 1.1 config_space_fix.patch, 1.1, 1.2 device-mapper-multipath.spec, 1.51, 1.52 linking_change.patch, 1.3, 1.4 multipath_rules.patch, 1.1, 1.2 redhatification.patch, 1.1, 1.2 uevent_fix.patch, 1.1, 1.2 directio_fix.patch, 1.1, NONE static_libaio.patch, 1.1, NONE

Benjamin Marzinski bmarzins at fedoraproject.org
Fri Sep 26 23:28:36 UTC 2008 

Author: bmarzins

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

Modified Files:
	config_space_fix.patch device-mapper-multipath.spec 
	linking_change.patch multipath_rules.patch 
	redhatification.patch uevent_fix.patch 
Added Files:
	binding_error.patch directio_message_cleanup.patch 
Removed Files:
	directio_fix.patch static_libaio.patch 
Log Message:
Since libaio is now in /lib, not /usr/lib, multipath no longer needs to
statically link against it. Fixed an error with binding file and WWIDs
that include spaces. Cleaned up the messages from the directio checker
function.  Fixed the udev rules. Fixed a regression in multipath.conf
parsing
Fixed 457530, 457589


binding_error.patch:

--- NEW FILE binding_error.patch ---
Index: multipath-tools/libmultipath/alias.c
===================================================================
--- multipath-tools.orig/libmultipath/alias.c
+++ multipath-tools/libmultipath/alias.c
@@ -243,7 +243,7 @@ lookup_binding(FILE *f, char *map_wwid, 
 		curr_id = scan_devname(alias);
 		if (curr_id >= id)
 			id = curr_id + 1;
-		wwid = strtok(NULL, " \t");
+		wwid = strtok(NULL, "");
 		if (!wwid){
 			condlog(3,
 				"Ignoring malformed line %u in bindings file",

directio_message_cleanup.patch:

--- NEW FILE directio_message_cleanup.patch ---
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
 	}
 	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) {

config_space_fix.patch:

Index: config_space_fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/config_space_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- config_space_fix.patch	20 Aug 2008 21:48:41 -0000	1.1
+++ config_space_fix.patch	26 Sep 2008 23:28:35 -0000	1.2
@@ -7,14 +7,14 @@
  			else
  				in_string = 1;
 +		} else if (!in_string && (*cp == '{' || *cp == '}')) {
-+			cp++;
 +			token = MALLOC(2);
-+
+ 
 +			if (!token)
 +				goto out;
- 
++
 +			*(token) = *cp;
 +			*(token + 1) = '\0';
++			cp++;
  		} else {
  			while ((in_string ||
  				(!isspace((int) *cp) && isascii((int) *cp) &&


Index: device-mapper-multipath.spec
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/device-mapper-multipath.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- device-mapper-multipath.spec	20 Aug 2008 21:48:41 -0000	1.51
+++ device-mapper-multipath.spec	26 Sep 2008 23:28:35 -0000	1.52
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.8
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -9,16 +9,16 @@
 Patch0: linking_change.patch
 Patch1: uevent_fix.patch
 Patch2: sparc64fix.patch
-Patch3: directio_fix.patch
-Patch4: config_files.patch
-Patch5: redhatification.patch
-Patch6: mpath_wait.patch
-Patch7: multipath_rules.patch
-Patch8: cciss_id.patch
-Patch9: scsi_id_change.patch
-Patch10: static_libaio.patch
-Patch11: config_space_fix.patch
-Patch12: fix_devt.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
 Requires: kpartx = %{version}-%{release}
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): chkconfig
@@ -48,16 +48,16 @@
 %patch0 -p1 -b .linking_change
 %patch1 -p1 -b .uevent_fix
 %patch2 -p1 -b .sparc64fix
-%patch3 -p1 -b .directio_fix
-%patch4 -p1 -b .config_files
-%patch5 -p1 -b .redhatification
-%patch6 -p1 -b .mpath_wait
-%patch7 -p1 -b .multipath_rules
-%patch8 -p1 -b .cciss_id
-%patch9 -p1 -b .scsi_id_change
-%patch10 -p1 -b .static_libaio
-%patch11 -p1 -b .config_space_fix
-%patch12 -p1 -b .fix_devt
+%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
 
 %build
 make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT
@@ -109,6 +109,14 @@
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Fri Sep 26 2008 Benjamin Marzinski <bmarzins at redhat.com> 0.4.8-7
+- Since libaio is now in /lib, not /usr/lib, multipath no longer needs to
+  statically link against it. Fixed an error with binding file and WWIDs
+  that include spaces. Cleaned up the messages from the directio checker
+  function.  Fixed the udev rules. Fixed a regression in multipath.conf
+  parsing
+- Fixed 457530, 457589
+
 * Wed Aug 20 2008 Benjamin Marzinski <bmarzins at redhat.com> 0.4.8-6
 - Updated to latest upstream 0.4.8 code: multipath-tools-080804.tgz
   (git commit id: eb87cbd0df8adf61d1c74c025f7326d833350f78)

linking_change.patch:

Index: linking_change.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/linking_change.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linking_change.patch	20 May 2008 06:30:55 -0000	1.3
+++ linking_change.patch	26 Sep 2008 23:28:35 -0000	1.4
@@ -1,7 +1,7 @@
-Index: multipath-tools-080519/libmultipath/Makefile
+Index: multipath-tools/libmultipath/Makefile
 ===================================================================
---- multipath-tools-080519.orig/libmultipath/Makefile
-+++ multipath-tools-080519/libmultipath/Makefile
+--- multipath-tools.orig/libmultipath/Makefile
++++ multipath-tools/libmultipath/Makefile
 @@ -23,14 +23,15 @@ endif
  all: $(LIBS)
  
@@ -21,29 +21,48 @@
  
  clean:
  	rm -f core *.a *.o *.gz *.so
-Index: multipath-tools-080519/multipath/Makefile
+Index: multipath-tools/multipath/Makefile
 ===================================================================
---- multipath-tools-080519.orig/multipath/Makefile
-+++ multipath-tools-080519/multipath/Makefile
-@@ -6,7 +6,7 @@ include ../Makefile.inc
+--- multipath-tools.orig/multipath/Makefile
++++ multipath-tools/multipath/Makefile
+@@ -6,9 +6,8 @@ include ../Makefile.inc
  
  OBJS = main.o
  
 -CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir)
+-LDFLAGS += -lpthread -ldevmapper -laio -ldl \
+-	   -lmultipath -L$(multipathdir)
 +CFLAGS += -I$(multipathdir)
- LDFLAGS += -lpthread -ldevmapper -laio -ldl \
- 	   -lmultipath -L$(multipathdir)
++LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
+ 
+ EXEC = multipath
  
-Index: multipath-tools-080519/multipathd/Makefile
+Index: multipath-tools/multipathd/Makefile
 ===================================================================
---- multipath-tools-080519.orig/multipathd/Makefile
-+++ multipath-tools-080519/multipathd/Makefile
-@@ -5,7 +5,7 @@ include ../Makefile.inc
+--- multipath-tools.orig/multipathd/Makefile
++++ multipath-tools/multipathd/Makefile
+@@ -5,8 +5,8 @@ include ../Makefile.inc
  #
  # basic flags setting
  #
 -CFLAGS += -I$(multipathdir) -Wl,-rpath,$(libdir)
+-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -laio -ldl \
 +CFLAGS += -I$(multipathdir)
- LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -laio -ldl \
++LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
  	   -lmultipath -L$(multipathdir)
  
+ #
+Index: multipath-tools/libmultipath/checkers/Makefile
+===================================================================
+--- multipath-tools.orig/libmultipath/checkers/Makefile
++++ multipath-tools/libmultipath/checkers/Makefile
+@@ -17,6 +17,9 @@ CFLAGS += -I..
+ 
+ all: $(LIBS)
+ 
++libcheckdirectio.so: libsg.o directio.o
++	$(CC) $(SHARED_FLAGS) -o $@ $^ -laio
++
+ libcheck%.so: libsg.o %.o
+ 	$(CC) $(SHARED_FLAGS) -o $@ $^
+ 

multipath_rules.patch:

Index: multipath_rules.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/multipath_rules.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- multipath_rules.patch	20 May 2008 04:37:41 -0000	1.1
+++ multipath_rules.patch	26 Sep 2008 23:28:36 -0000	1.2
@@ -1,7 +1,7 @@
-Index: multipath-tools-080515/multipath/Makefile
+Index: multipath-tools/multipath/Makefile
 ===================================================================
---- multipath-tools-080515.orig/multipath/Makefile
-+++ multipath-tools-080515/multipath/Makefile
+--- multipath-tools.orig/multipath/Makefile
++++ multipath-tools/multipath/Makefile
 @@ -23,7 +23,7 @@ install:
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
  	$(INSTALL_PROGRAM) -m 755 $(EXEC) mpath_wait $(DESTDIR)$(bindir)/
@@ -20,24 +20,22 @@
  	rm $(DESTDIR)$(bindir)/$(EXEC)
  	rm $(DESTDIR)$(bindir)/mpath_wait
  	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
-Index: multipath-tools-080515/multipath/multipath.rules
+Index: multipath-tools/multipath/multipath.rules
 ===================================================================
---- multipath-tools-080515.orig/multipath/multipath.rules
-+++ multipath-tools-080515/multipath/multipath.rules
-@@ -1,7 +1,9 @@
+--- multipath-tools.orig/multipath/multipath.rules
++++ multipath-tools/multipath/multipath.rules
+@@ -1,7 +1,8 @@
 -#
 -# udev rules for multipathing.
 -# The persistent symlinks are created with the kpartx rules
 -#
 -
 -# socket for uevents
--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"
-+KERNEL!="dm-[0-9]*", ACTION=="add", PROGRAM=="/bin/bash -c '/sbin/lsmod | /bin/grep ^dm_multipath'", RUN+="/sbin/multipath -v0 %M:%m"
+ 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"
-+PROGRAM!="/bin/bash -c '/sbin/dmsetup info -c --noheadings -j %M -m %m | /bin/grep -q .*:.*:.*:.*:.*:.*:.*:part[0-9]*-mpath-'", GOTO="end_mpath"
 +LABEL="end_mpath"

redhatification.patch:

Index: redhatification.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/redhatification.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redhatification.patch	20 May 2008 04:37:41 -0000	1.1
+++ redhatification.patch	26 Sep 2008 23:28:36 -0000	1.2
@@ -1,17 +1,17 @@
-Index: multipath-tools-080519/libmultipath/defaults.h
+Index: multipath-tools/libmultipath/defaults.h
 ===================================================================
---- multipath-tools-080519.orig/libmultipath/defaults.h
-+++ multipath-tools-080519/libmultipath/defaults.h
+--- 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-080519/libmultipath/hwtable.c
+Index: multipath-tools/libmultipath/hwtable.c
 ===================================================================
---- multipath-tools-080519.orig/libmultipath/hwtable.c
-+++ multipath-tools-080519/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",
@@ -39,7 +39,7 @@
  		.features      = "1 queue_if_no_path",
  		.hwhandler     = DEFAULT_HWHANDLER,
  		.selector      = DEFAULT_SELECTOR,
-@@ -705,6 +705,22 @@ static struct hwentry default_hw[] = {
+@@ -722,6 +722,22 @@ static struct hwentry default_hw[] = {
  		.checker_name  = RDAC,
  		.prio_name     = PRIO_RDAC,
  	},
@@ -62,10 +62,10 @@
  	/*
  	 * EOL
  	 */
-Index: multipath-tools-080519/multipath.conf.annotated
+Index: multipath-tools/multipath.conf.annotated
 ===================================================================
---- multipath-tools-080519.orig/multipath.conf.annotated
-+++ multipath-tools-080519/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 
@@ -87,10 +87,10 @@
  #
  #		#
  #		# name    : path_selector
-Index: multipath-tools-080519/multipath.conf.defaults
+Index: multipath-tools/multipath.conf.defaults
 ===================================================================
---- multipath-tools-080519.orig/multipath.conf.defaults
-+++ multipath-tools-080519/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"
@@ -452,10 +452,10 @@
 +#		prio			rdac
 +#	}
  #}
-Index: multipath-tools-080519/multipath.conf.synthetic
+Index: multipath-tools/multipath.conf.synthetic
 ===================================================================
---- multipath-tools-080519.orig/multipath.conf.synthetic
-+++ multipath-tools-080519/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"
@@ -474,10 +474,10 @@
  #		path_checker		directio
  #		path_selector		"round-robin 0"
  #		hardware_handler	"0"
-Index: multipath-tools-080519/Makefile.inc
+Index: multipath-tools/Makefile.inc
 ===================================================================
---- multipath-tools-080519.orig/Makefile.inc
-+++ multipath-tools-080519/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
@@ -487,10 +487,10 @@
  libdir	    = $(prefix)/lib/multipath
  
  GZIP        = /bin/gzip -9 -c
-Index: multipath-tools-080519/multipathd/Makefile
+Index: multipath-tools/multipathd/Makefile
 ===================================================================
---- multipath-tools-080519.orig/multipathd/Makefile
-+++ multipath-tools-080519/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)
@@ -499,10 +499,10 @@
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
  	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
  
-Index: multipath-tools-080519/multipathd/multipathd.init.redhat
+Index: multipath-tools/multipathd/multipathd.init.redhat
 ===================================================================
---- multipath-tools-080519.orig/multipathd/multipathd.init.redhat
-+++ multipath-tools-080519/multipathd/multipathd.init.redhat
+--- multipath-tools.orig/multipathd/multipathd.init.redhat
++++ multipath-tools/multipathd/multipathd.init.redhat
 @@ -1,13 +1,9 @@
  #!/bin/bash
 -
@@ -561,10 +561,10 @@
  esac
  
  exit $RETVAL
-Index: multipath-tools-080519/multipath/Makefile
+Index: multipath-tools/multipath/Makefile
 ===================================================================
---- multipath-tools-080519.orig/multipath/Makefile
-+++ multipath-tools-080519/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)
@@ -576,10 +576,10 @@
  
  uninstall:
  	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
-Index: multipath-tools-080519/multipath/multipath.conf.redhat
+Index: multipath-tools/multipath/multipath.conf.redhat
 ===================================================================
 --- /dev/null
-+++ multipath-tools-080519/multipath/multipath.conf.redhat
++++ multipath-tools/multipath/multipath.conf.redhat
 @@ -0,0 +1,97 @@
 +# This is a basic configuration file with some examples, for device mapper
 +# multipath.
@@ -678,10 +678,10 @@
 +#		path_grouping_policy	multibus
 +#	}
 +#}
-Index: multipath-tools-080519/kpartx/Makefile
+Index: multipath-tools/kpartx/Makefile
 ===================================================================
---- multipath-tools-080519.orig/kpartx/Makefile
-+++ multipath-tools-080519/kpartx/Makefile
+--- multipath-tools.orig/kpartx/Makefile
++++ multipath-tools/kpartx/Makefile
 @@ -20,10 +20,10 @@ $(EXEC): $(OBJS)
  install: $(EXEC) $(EXEC).8
  	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)

uevent_fix.patch:

Index: uevent_fix.patch
===================================================================
RCS file: /cvs/pkgs/rpms/device-mapper-multipath/devel/uevent_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uevent_fix.patch	20 May 2008 04:37:41 -0000	1.1
+++ uevent_fix.patch	26 Sep 2008 23:28:36 -0000	1.2
@@ -1,8 +1,8 @@
-Index: multipath-tools-080515/multipathd/main.c
+Index: multipath-tools/multipathd/main.c
 ===================================================================
---- multipath-tools-080515.orig/multipathd/main.c
-+++ multipath-tools-080515/multipathd/main.c
-@@ -619,14 +619,20 @@ uxsock_trigger (char * str, char ** repl
+--- multipath-tools.orig/multipathd/main.c
++++ multipath-tools/multipathd/main.c
+@@ -602,14 +602,20 @@ uxsock_trigger (char * str, char ** repl
  static int
  uev_discard(char * devpath)
  {


--- directio_fix.patch DELETED ---


--- static_libaio.patch DELETED ---

More information about the fedora-extras-commits mailing list