main/multipath-tools: upgrade to 0.4.9

1 files changed, 138 insertions, 0 deletions

diff --git a/main/multipath-tools/multipath-tools-0.4.9-build.patch b/main/multipath-tools/multipath-tools-0.4.9-build.patch
new file mode 100644
index 000000000..8c4b1da45
--- /dev/null
+++ b/main/multipath-tools/multipath-tools-0.4.9-build.patch
@@ -0,0 +1,138 @@
+--- multipath-tools-0.4.9.orig/kpartx/Makefile	2010-05-22 05:01:58.000000000 -0700
++++ multipath-tools-0.4.9/kpartx/Makefile	2010-10-22 00:48:25.615627572 -0700
+@@ -6,7 +6,7 @@
+ 
+ CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+-LDFLAGS = -ldevmapper
++LIBS = -ldevmapper
+ OBJS = bsd.o dos.o kpartx.o solaris.o unixware.o dasd.o sun.o \
+        gpt.o mac.o crc32.o lopart.o xstrncpy.o devmapper.o
+ EXEC = kpartx
+@@ -14,8 +14,7 @@
+ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+-	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
+ 	
+ install: $(EXEC) $(EXEC).8
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+@@ -23,13 +22,14 @@
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(libudevdir)
+ 	$(INSTALL_PROGRAM) -m 755 kpartx_id $(DESTDIR)$(libudevdir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
+-	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/
++	$(INSTALL_PROGRAM) -m 644 kpartx.rules $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
+-	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
++	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
++	rm -f $(DESTDIR)/etc/udev/rules.d/66-kpartx.rules
+ 
+ clean:
+-	rm -f core *.o $(EXEC) *.gz
++	rm -f core *.o $(EXEC)
+--- multipath-tools-0.4.9.orig/Makefile.inc	2010-05-22 05:01:58.000000000 -0700
++++ multipath-tools-0.4.9/Makefile.inc	2010-10-21 23:51:12.768868148 -0700
+@@ -32,11 +32,10 @@
+ syslibdir   = $(prefix)/$(LIB)
+ libdir	    = $(prefix)/$(LIB)/multipath
+ 
+-GZIP        = /bin/gzip -9 -c
+ INSTALL_PROGRAM = install
+ 
+-OPTFLAGS     = -pipe -g -Wall -Wunused -Wstrict-prototypes
+-CFLAGS	     = $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
++OPTFLAGS     = -Wall -Wunused -Wstrict-prototypes
++CFLAGS	     += $(OPTFLAGS) -fPIC -DLIB_STRING=\"${LIB}\"
+ SHARED_FLAGS = -shared
+ 
+ %.o:	%.c
+--- multipath-tools-0.4.9.orig/multipath/Makefile	2010-05-22 05:01:58.000000000 -0700
++++ multipath-tools-0.4.9/multipath/Makefile	2010-10-22 00:47:13.952010117 -0700
+@@ -7,32 +7,30 @@
+ OBJS = main.o
+ 
+ CFLAGS += -I$(multipathdir)
+-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
++LIBS = -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
+ 
+ EXEC = multipath
+ 
+ all: $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+-	$(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
+-	$(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)/
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)/etc/udev/rules.d
+-	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/
++	$(INSTALL_PROGRAM) -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(man5dir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5 $(DESTDIR)$(man5dir)
+ 
+ uninstall:
+-	rm $(DESTDIR)/etc/udev/rules.d/multipath.rules
+-	rm $(DESTDIR)$(bindir)/$(EXEC)
+-	rm $(DESTDIR)$(mandir)/$(EXEC).8.gz
+-	rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz
++	rm -f $(DESTDIR)/etc/udev/rules.d/65-multipath.rules
++	rm -f $(DESTDIR)$(bindir)/$(EXEC)
++	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
++	rm -f $(DESTDIR)$(man5dir)/$(EXEC).conf.5
+ 
+ clean:
+-	rm -f core *.o $(EXEC) *.gz
++	rm -f core *.o $(EXEC)
+--- multipath-tools-0.4.9.orig/multipathd/Makefile	2010-05-22 05:01:58.000000000 -0700
++++ multipath-tools-0.4.9/multipathd/Makefile	2010-10-22 00:48:02.502428428 -0700
+@@ -6,7 +6,7 @@
+ # basic flags setting
+ #
+ CFLAGS += -I$(multipathdir)
+-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
++LIBS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
+ 	   -lmultipath -L$(multipathdir)
+ 
+ #
+@@ -28,21 +28,20 @@
+ all : $(EXEC)
+ 
+ $(EXEC): $(OBJS)
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $(EXEC) $(OBJS)
+-	$(GZIP) $(EXEC).8 > $(EXEC).8.gz
++	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o $(EXEC)
+ 
+ install:
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -m 755 $(EXEC) $(DESTDIR)$(bindir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(rcdir)
+ 	$(INSTALL_PROGRAM) -d $(DESTDIR)$(mandir)
+-	$(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir)
++	$(INSTALL_PROGRAM) -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(bindir)/$(EXEC)
+ 	rm -f $(DESTDIR)$(rcdir)/$(EXEC)
+-	rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz
++	rm -f $(DESTDIR)$(mandir)/$(EXEC).8
+ 
+ clean:
+-	rm -f core *.o $(EXEC) *.gz
++	rm -f core *.o $(EXEC)
+