Fix for bz #451415device-mapper-multipath-0_4_7-16_fc9

/sbin/multipath.static in no longer a symlink to the non-static version.
    However, it still dynamically loads all libraries except libsysfs.
    libsysfs is now statically linked.

2 files changed, 27 insertions, 21 deletions

diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec
index df8424e..22718c5 100644
--- a/device-mapper-multipath.spec
+++ b/device-mapper-multipath.spec
@@ -1,7 +1,7 @@
 Summary: Tools to manage multipath devices using device-mapper
 Name: device-mapper-multipath
 Version: 0.4.7
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPL+
 Group: System Environment/Base
 URL: http://christophe.varoqui.free.fr/
@@ -85,6 +85,12 @@ fi
 %{_mandir}/man8/kpartx.8.gz
 
 %changelog
+* Mon Jun 23 2008 Benjamin Marzinski <bmarzins@redhat.com> -0.4.7-16
+- Fix for bz #451415
+- /sbin/multipath.static in no longer a symlink to the non-static version.
+  However, it still dynamically loads all libraries except libsysfs.
+  libsysfs is now statically linked.
+
 * Wed May 21 2008 Benjamin Marzinski <bmarzins@redhat.com> -0.4.7-15
 - Switch multipath to check "subsystem" instead of "bus"
 - Make static versions of multipath and kpartx symlinks to non-static versions
diff --git a/multipath-tools-0.4.7.head2-nostatic.patch b/multipath-tools-0.4.7.head2-nostatic.patch
index 24fb2f9..fee561a 100644
--- a/multipath-tools-0.4.7.head2-nostatic.patch
+++ b/multipath-tools-0.4.7.head2-nostatic.patch
@@ -1,7 +1,6 @@
-Index: multipath-tools-0.4.7.head2/kpartx/Makefile
-===================================================================
---- multipath-tools-0.4.7.head2.orig/kpartx/Makefile
-+++ multipath-tools-0.4.7.head2/kpartx/Makefile
+diff -urpN multipath-tools-0.4.7.head2/kpartx/Makefile multipath-tools-0.4.7.head2-patched/kpartx/Makefile
+--- multipath-tools-0.4.7.head2/kpartx/Makefile	2008-06-23 15:24:53.000000000 -0500
++++ multipath-tools-0.4.7.head2-patched/kpartx/Makefile	2008-06-23 15:18:35.000000000 -0500
 @@ -24,7 +24,6 @@ all: $(BUILD)
  
  glibc: clean $(OBJS)
@@ -19,25 +18,26 @@ Index: multipath-tools-0.4.7.head2/kpartx/Makefile
  	install -d $(DESTDIR)$(mandir)
  	install -m 644 $(EXEC).8 $(DESTDIR)$(mandir)
  
-Index: multipath-tools-0.4.7.head2/multipath/Makefile
-===================================================================
---- multipath-tools-0.4.7.head2.orig/multipath/Makefile
-+++ multipath-tools-0.4.7.head2/multipath/Makefile
-@@ -21,7 +21,6 @@ all: $(BUILD)
+diff -urpN multipath-tools-0.4.7.head2/multipath/Makefile multipath-tools-0.4.7.head2-patched/multipath/Makefile
+--- multipath-tools-0.4.7.head2/multipath/Makefile	2008-06-23 15:24:53.000000000 -0500
++++ multipath-tools-0.4.7.head2-patched/multipath/Makefile	2008-06-23 15:25:24.000000000 -0500
+@@ -12,7 +12,7 @@ CFLAGS += -I$(multipathdir) -I$(checkers
+ ifeq ($(strip $(BUILD)),klibc)
+ 	OBJS += $(libdm) $(libsysfs)
+ else
+-	LDFLAGS += -ldevmapper -lsysfs
++	LDFLAGS += -ldevmapper
+ endif
+ 
+ EXEC = multipath
+@@ -20,8 +20,8 @@ EXEC = multipath
+ all: $(BUILD)
  
  glibc: clean $(OBJS)
- 	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
+-	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS)
 -	$(CC) $(OBJS) -o $(EXEC).static -static $(LDFLAGS) -lselinux -lsepol
++	$(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) -lsysfs
++	$(CC) $(OBJS) -o $(EXEC).static -Wl,-Bstatic,-lsysfs,-Bdynamic $(LDFLAGS)
  	$(CC) mpath_faker.c -o mpath_ctl $(CFLAGS) -static
  
  klibc: $(OBJS)
-@@ -36,7 +35,8 @@ $(MULTIPATHLIB)-$(BUILD).a:
- 
- install:
- 	install -d $(DESTDIR)$(bindir)
--	install -m 755 $(EXEC) $(EXEC).static mpath_ctl mpath_wait $(DESTDIR)$(bindir)/
-+	install -m 755 $(EXEC) mpath_ctl mpath_wait $(DESTDIR)$(bindir)/
-+	ln -sf $(EXEC) $(DESTDIR)$(bindir)/$(EXEC).static
- 	install -d $(DESTDIR)/etc/udev/rules.d
- 	install -m 644 multipath.rules $(DESTDIR)/etc/udev/rules.d/40-multipath.rules
- 	install -d $(DESTDIR)$(mandir)