Accepting request 42351 from home:jengelh:sparc

Copy from home:jengelh:sparc/multipath-tools via accept of submit request 42351 revision 2.
Request was accepted with message:
Reviewed ok

OBS-URL: https://build.opensuse.org/request/show/42351
OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=14

fixbuffers.diff

@@ -0,0 +1,13 @@
+Index: multipath-tools-0.4.8/libmultipath/configure.c
+===================================================================
+--- multipath-tools-0.4.8.orig/libmultipath/configure.c	2010-02-26 13:34:41.000000000 +0100
++++ multipath-tools-0.4.8/libmultipath/configure.c	2010-02-26 13:35:31.000000000 +0100
+@@ -167,7 +167,7 @@ select_action (struct multipath * mpp, v
+ 	if (!find_mp_by_wwid(curmp, mpp->wwid)) {
+ 		condlog(2, "%s: remove (wwid changed)", cmpp->alias);
+ 		dm_flush_map(mpp->alias);
+-		strncat(cmpp->wwid, mpp->wwid, WWID_SIZE);
++		strncat(cmpp->wwid, mpp->wwid, WWID_SIZE-strlen(cmpp->wwid)-1);
+ 		drop_multipath(curmp, cmpp->wwid, KEEP_PATHS);
+ 		mpp->action = ACT_CREATE;
+ 		condlog(3, "%s: set ACT_CREATE (map wwid change)",

libdir.diff

@@ -0,0 +1,23 @@
+
+Ouch, ouch, ouch!
+Since when is the presence of a directory an indicator for whether
+a 64- or 32-bit library is to be built. Or inspected, for that
+matter.
+
+---
+ libmultipath/Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: multipath-tools-0.4.8/libmultipath/Makefile
+===================================================================
+--- multipath-tools-0.4.8.orig/libmultipath/Makefile
++++ multipath-tools-0.4.8/libmultipath/Makefile
+@@ -14,7 +14,7 @@ OBJS = memory.o parser.o vector.o devmap
+        log.o configure.o structs_vec.o sysfs.o prio.o checkers.o \
+        lock.o waiter.o
+ 
+-LIBDM_API_FLUSH = $(shell if test -d /lib64 ; then objdump -T /lib64/libdevmapper.so* ; else objdump -T /lib/libdevmapper.so.* ; fi | grep -c dm_task_no_flush)
++LIBDM_API_FLUSH = $(shell objdump -T ${LIB}/libdevmapper.so* | grep -c dm_task_no_flush)
+ 
+ CFLAGS += -D_GNU_SOURCE
+ ifneq ($(strip $(LIBDM_API_FLUSH)),0)

mpt-ucred.diff

@@ -0,0 +1,30 @@
+
+We need _GNU_SOURCE even when dmapi is not there.
+
+cc -O2 -g -m32 -mtune=ultrasparc -fPIC -DLIB_STRING=\"lib64\"
+-c -o uevent.o uevent.c
+uevent.c: In function 'uevent_listen':
+uevent.c:262: error: invalid application of 'sizeof' to
+incomplete type 'struct ucred'
+uevent.c:290: error: dereferencing pointer to incomplete type
+uevent.c:291: error: dereferencing pointer to incomplete type
+
+---
+ libmultipath/Makefile |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+Index: multipath-tools-0.4.8/libmultipath/Makefile
+===================================================================
+--- multipath-tools-0.4.8.orig/libmultipath/Makefile
++++ multipath-tools-0.4.8/libmultipath/Makefile
+@@ -16,8 +16,9 @@ OBJS = memory.o parser.o vector.o devmap
+ 
+ LIBDM_API_FLUSH = $(shell if test -d /lib64 ; then objdump -T /lib64/libdevmapper.so* ; else objdump -T /lib/libdevmapper.so.* ; fi | grep -c dm_task_no_flush)
+ 
++CFLAGS += -D_GNU_SOURCE
+ ifneq ($(strip $(LIBDM_API_FLUSH)),0)
+-	CFLAGS += -DLIBDM_API_FLUSH -D_GNU_SOURCE
++	CFLAGS += -DLIBDM_API_FLUSH
+ endif
+ 
+ all: $(LIBS)

multipath-tools.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Jun 30 16:19:00 UTC 2010 - jengelh@medozas.de
+
+- fix compilation on bi-arch by specifying LIB=%_lib
+  (Makefiles would erroneously assume a 64-bit target just by the
+  sheer presence of lib64, which is wrong)
+- always add in -D_GNU_SOURCE to get at struct ucred
+
+-------------------------------------------------------------------
+Fri Feb 26 12:37:10 UTC 2010 - coolo@novell.com
+
+- fix buffer overflow in strncat
+
 -------------------------------------------------------------------
 Wed Jan 27 16:16:12 CST 2010 - cmeng@novell.com
 

multipath-tools.spec

@@ -27,12 +27,15 @@ Requires:       device-mapper kpartx
 PreReq:         %insserv_prereq %fillup_prereq coreutils grep
 AutoReqProv:    on
 Version:        0.4.8
-Release:        45
+Release:        46
 Summary:        Tools to Manage Multipathed Devices with the device-mapper
 Source:         multipath-tools-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Patch0:         %{name}-%{version}-opensuse-11.2.diff.bz2
 Patch1:         remove-stacked-partitions.diff
+Patch2:         fixbuffers.diff
+Patch3:		mpt-ucred.diff
+Patch4:		libdir.diff
 
 %description
 This package provides the tools to manage multipathed devices by
@@ -75,15 +78,17 @@ Authors:
 %setup -q -n multipath-tools-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch -P 3 -P 4 -p1
 
 %build
 # This package failed when testing with -Wl,-as-needed being default.
 # So we disable it here, if you want to retest, just delete this comment and the line below.
 export SUSE_ASNEEDED=0
-make OPTFLAGS="$RPM_OPT_FLAGS"
+make OPTFLAGS="$RPM_OPT_FLAGS" LIB=%_lib
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=$RPM_BUILD_ROOT LIB=%_lib install
 mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
 
 %clean