main/multipath-tools: upgrade to 0.4.9

(cherry picked from commit 6357b52c57da471f95feb20292baaa9d0d35cdc6)

2 files changed, 150 insertions, 12 deletions

diff --git a/main/multipath-tools/APKBUILD b/main/multipath-tools/APKBUILD
index 621351ca4e..776ffc72c7 100644
--- a/main/multipath-tools/APKBUILD
+++ b/main/multipath-tools/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Leonardo Arena <rnalrd@gmail.com>
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname="multipath-tools"
-pkgver=0.4.8
-pkgrel=6
+pkgver=0.4.9
+pkgrel=0
 pkgdesc="Device Mapper Multipathing Driver"
 url="http://christophe.varoqui.free.fr/"
 license="GPL"
@@ -11,12 +11,14 @@ makedepends="lvm2-dev libaio-dev readline-dev ncurses-dev udev-dev"
 install=
 subpackages="$pkgname-doc"
 source="http://christophe.varoqui.free.fr/$pkgname/$pkgname-$pkgver.tar.bz2
-        multipath-tools-0.4.8-udev-scsi_id-changes.patch
-        multipath-tools-0.4.8-socket-cve-2009-0115.patch
-        multipath-tools-0.4.8-r1-kpartx.patch
+        multipath-tools-0.4.9-build.patch
         multipath-tools-0.4.8-kparted-ext-partitions.patch"
 
-_builddir="$srcdir/$pkgname-$pkgver"
+# multipath-tools-0.4.8-r1-kpartx.patch
+# multipath-tools-0.4.8-socket-cve-2009-0115.patch
+# multipath-tools-0.4.8-udev-scsi_id-changes.patch
+
+_builddir="$srcdir"
 
 prepare() {
         cd $_builddir
@@ -39,12 +41,10 @@ build() {
 package() {
         cd $_builddir
         make DESTDIR="$pkgdir" install
-        install -D -m644 ../../$pkgname.conf $pkgdir/etc/multipath.conf
-        install -D -m755 ../../$pkgname.initd $pkgdir/etc/init.d/multipathd
+        install -D -m644 ../$pkgname.conf $pkgdir/etc/multipath.conf
+        install -D -m755 ../$pkgname.initd $pkgdir/etc/init.d/multipathd
 }
 
-md5sums="3563b863b408d07c46929b6e8c2c248c  multipath-tools-0.4.8.tar.bz2
-b39a63e65de16cf086618de6916bd98f  multipath-tools-0.4.8-udev-scsi_id-changes.patch
-2070c01a98d01833b9eee771fce3a22c  multipath-tools-0.4.8-socket-cve-2009-0115.patch
-0febb1f512681b8de8c2f0287e260efd  multipath-tools-0.4.8-r1-kpartx.patch
+md5sums="a6d4b48afc28f1f50f5ee4b1b06d2765  multipath-tools-0.4.9.tar.bz2
+751a7e079fef26cced73e2fc31ad7f11  multipath-tools-0.4.9-build.patch
 68ea053e02e9f5c4883b24b3f9bb2bf1  multipath-tools-0.4.8-kparted-ext-partitions.patch"
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 0000000000..8c4b1da45d
--- /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)
+