| 1 |
radhermit 10/11/28 21:35:00 |
| 2 |
|
| 3 |
Modified: multipath-tools-0.4.9-build.patch |
| 4 |
Added: multipath-tools-0.4.9-buffer-overflows.patch |
| 5 |
Log: |
| 6 |
Revbump and remove old. Specify the library directory before the library name (fixes bug #346345 by Benjamin Schulz) and fix buffer overflows (bug #329049 by vapier). |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha5/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.2 sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch?rev=1.2&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch?rev=1.2&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch?r1=1.1&r2=1.2 |
| 16 |
|
| 17 |
Index: multipath-tools-0.4.9-build.patch |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch,v |
| 20 |
retrieving revision 1.1 |
| 21 |
retrieving revision 1.2 |
| 22 |
diff -u -r1.1 -r1.2 |
| 23 |
--- multipath-tools-0.4.9-build.patch 28 Oct 2010 06:28:41 -0000 1.1 |
| 24 |
+++ multipath-tools-0.4.9-build.patch 28 Nov 2010 21:34:59 -0000 1.2 |
| 25 |
@@ -1,5 +1,5 @@ |
| 26 |
--- multipath-tools-0.4.9.orig/kpartx/Makefile 2010-05-22 05:01:58.000000000 -0700 |
| 27 |
-+++ multipath-tools-0.4.9/kpartx/Makefile 2010-10-22 00:48:25.615627572 -0700 |
| 28 |
++++ multipath-tools-0.4.9/kpartx/Makefile 2010-11-28 12:14:25.763531104 -0800 |
| 29 |
@@ -6,7 +6,7 @@ |
| 30 |
|
| 31 |
CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 |
| 32 |
@@ -39,7 +39,7 @@ |
| 33 |
- rm -f core *.o $(EXEC) *.gz |
| 34 |
+ rm -f core *.o $(EXEC) |
| 35 |
--- multipath-tools-0.4.9.orig/Makefile.inc 2010-05-22 05:01:58.000000000 -0700 |
| 36 |
-+++ multipath-tools-0.4.9/Makefile.inc 2010-10-21 23:51:12.768868148 -0700 |
| 37 |
++++ multipath-tools-0.4.9/Makefile.inc 2010-11-28 12:14:25.763531104 -0800 |
| 38 |
@@ -32,11 +32,10 @@ |
| 39 |
syslibdir = $(prefix)/$(LIB) |
| 40 |
libdir = $(prefix)/$(LIB)/multipath |
| 41 |
@@ -55,13 +55,13 @@ |
| 42 |
|
| 43 |
%.o: %.c |
| 44 |
--- multipath-tools-0.4.9.orig/multipath/Makefile 2010-05-22 05:01:58.000000000 -0700 |
| 45 |
-+++ multipath-tools-0.4.9/multipath/Makefile 2010-10-22 00:47:13.952010117 -0700 |
| 46 |
++++ multipath-tools-0.4.9/multipath/Makefile 2010-11-28 12:14:46.718697048 -0800 |
| 47 |
@@ -7,32 +7,30 @@ |
| 48 |
OBJS = main.o |
| 49 |
|
| 50 |
CFLAGS += -I$(multipathdir) |
| 51 |
-LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) |
| 52 |
-+LIBS = -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir) |
| 53 |
++LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath |
| 54 |
|
| 55 |
EXEC = multipath |
| 56 |
|
| 57 |
@@ -100,16 +100,18 @@ |
| 58 |
- rm -f core *.o $(EXEC) *.gz |
| 59 |
+ rm -f core *.o $(EXEC) |
| 60 |
--- multipath-tools-0.4.9.orig/multipathd/Makefile 2010-05-22 05:01:58.000000000 -0700 |
| 61 |
-+++ multipath-tools-0.4.9/multipathd/Makefile 2010-10-22 00:48:02.502428428 -0700 |
| 62 |
-@@ -6,7 +6,7 @@ |
| 63 |
++++ multipath-tools-0.4.9/multipathd/Makefile 2010-11-28 12:15:46.624171566 -0800 |
| 64 |
+@@ -6,8 +6,8 @@ |
| 65 |
# basic flags setting |
| 66 |
# |
| 67 |
CFLAGS += -I$(multipathdir) |
| 68 |
-LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ |
| 69 |
-+LIBS += -lpthread -ldevmapper -lreadline -lncurses -ldl \ |
| 70 |
- -lmultipath -L$(multipathdir) |
| 71 |
+- -lmultipath -L$(multipathdir) |
| 72 |
++LIBS = -lpthread -ldevmapper -lreadline -lncurses -ldl \ |
| 73 |
++ -L$(multipathdir) -lmultipath |
| 74 |
|
| 75 |
# |
| 76 |
+ # debuging stuff |
| 77 |
@@ -28,21 +28,20 @@ |
| 78 |
all : $(EXEC) |
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
|
| 83 |
1.1 sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch |
| 84 |
|
| 85 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch?rev=1.1&view=markup |
| 86 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch?rev=1.1&content-type=text/plain |
| 87 |
|
| 88 |
Index: multipath-tools-0.4.9-buffer-overflows.patch |
| 89 |
=================================================================== |
| 90 |
--- multipath-tools-0.4.9.orig/libmultipath/prioritizers/datacore.c 2010-05-22 05:01:58.000000000 -0700 |
| 91 |
+++ multipath-tools-0.4.9/libmultipath/prioritizers/datacore.c 2010-11-28 12:22:12.037228583 -0800 |
| 92 |
@@ -94,7 +94,7 @@ |
| 93 |
if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK) |
| 94 |
return 0; |
| 95 |
|
| 96 |
- snprintf(vendor, 9, "%.8s\n", inqBuffp + 8); |
| 97 |
+ snprintf(vendor, 8, "%.8s\n", inqBuffp + 8); |
| 98 |
snprintf(product, 17, "%.16s", inqBuffp + 16); |
| 99 |
snprintf(luname, 21, "%.19s", inqBuffp + 36); |
| 100 |
snprintf(wwpn, 17, "%.16s", inqBuffp + 96); |
| 101 |
--- multipath-tools-0.4.9.orig/libmultipath/prioritizers/hds.c 2010-05-22 05:01:58.000000000 -0700 |
| 102 |
+++ multipath-tools-0.4.9/libmultipath/prioritizers/hds.c 2010-11-28 12:22:44.199483997 -0800 |
| 103 |
@@ -123,7 +123,7 @@ |
| 104 |
return -1; |
| 105 |
} |
| 106 |
|
| 107 |
- snprintf (vendor, 9, "%.8s", inqBuffp + 8); |
| 108 |
+ snprintf (vendor, 8, "%.8s", inqBuffp + 8); |
| 109 |
snprintf (product, 17, "%.16s", inqBuffp + 16); |
| 110 |
snprintf (serial, 5, "%.4s", inqBuffp + 40); |
| 111 |
snprintf (ldev, 5, "%.4s", inqBuffp + 44); |
Archives