Remove old.

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

6 files changed, 9 insertions, 380 deletions

diff --git a/sys-fs/multipath-tools/ChangeLog b/sys-fs/multipath-tools/ChangeLog
index fa577d093a7c..cf878fc646a2 100644
--- a/sys-fs/multipath-tools/ChangeLog
+++ b/sys-fs/multipath-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/multipath-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.68 2014/07/30 19:27:36 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/ChangeLog,v 1.69 2014/12/15 03:08:13 radhermit Exp $
+
+  15 Dec 2014; Tim Harder <radhermit@gentoo.org>
+  -multipath-tools-0.4.9-r5.ebuild,
+  -files/multipath-tools-0.4.8-kparted-ext-partitions.patch,
+  -files/multipath-tools-0.4.9-buffer-overflows.patch,
+  -files/multipath-tools-0.4.9-build.patch,
+  -files/multipath-tools-0.4.9-log_enquery_overflow.patch:
+  Remove old.
 
   30 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   multipath-tools-0.4.9-r5.ebuild, multipath-tools-0.5.0-r1.ebuild:
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.8-kparted-ext-partitions.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.8-kparted-ext-partitions.patch
deleted file mode 100644
index 3f70fd70e4c3..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.8-kparted-ext-partitions.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c421c9282791696264d1333fb2552835140354c3 Mon Sep 17 00:00:00 2001
-From: Robin H. Johnson <robbat2@gentoo.org>
-Date: Thu, 5 Nov 2009 03:44:12 +0000
-Subject: [PATCH] kpartx: Fix broken calculation of extended partitions that caused random devices to be used instead of the correct parent device.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
----
- kpartx/dos.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/kpartx/dos.c b/kpartx/dos.c
-index 1691105..317fc56 100644
---- a/kpartx/dos.c
-+++ b/kpartx/dos.c
-@@ -53,7 +53,9 @@ read_extended_partition(int fd, struct partition *ep, int en,
- 			if (n < ns) {
- 				sp[n].start = here + le32_to_cpu(p.start_sect);
- 				sp[n].size = le32_to_cpu(p.nr_sects);
--				sp[n].container = en + 1;
-+                                // This line seems to have no understandable
-+                                // purpose, and causes the wrong device to be used
-+                                //sp[n].container = en + 1;
- 				n++;
- 			} else {
- 				fprintf(stderr,
--- 
-1.6.4
-
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch
deleted file mode 100644
index 38719acebea6..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-buffer-overflows.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/datacore.c	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/libmultipath/prioritizers/datacore.c	2010-11-28 12:22:12.037228583 -0800
-@@ -94,7 +94,7 @@
- 	if ((io_hdr.info & SG_INFO_OK_MASK) != SG_INFO_OK)
- 		return 0;
- 
--	snprintf(vendor, 9, "%.8s\n", inqBuffp + 8);
-+	snprintf(vendor, 8, "%.8s\n", inqBuffp + 8);
- 	snprintf(product, 17, "%.16s", inqBuffp + 16);
- 	snprintf(luname, 21, "%.19s", inqBuffp + 36);
- 	snprintf(wwpn, 17, "%.16s", inqBuffp + 96);
---- multipath-tools-0.4.9.orig/libmultipath/prioritizers/hds.c	2010-05-22 05:01:58.000000000 -0700
-+++ multipath-tools-0.4.9/libmultipath/prioritizers/hds.c	2010-11-28 12:22:44.199483997 -0800
-@@ -123,7 +123,7 @@
- 		return -1;
- 	}
- 
--	snprintf (vendor, 9, "%.8s", inqBuffp + 8);
-+	snprintf (vendor, 8, "%.8s", inqBuffp + 8);
- 	snprintf (product, 17, "%.16s", inqBuffp + 16);
- 	snprintf (serial, 5, "%.4s", inqBuffp + 40);
- 	snprintf (ldev, 5, "%.4s", inqBuffp + 44);
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
deleted file mode 100644
index 11636b4eb68d..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-build.patch
+++ /dev/null
@@ -1,181 +0,0 @@
---- a/kpartx/Makefile
-+++ b/kpartx/Makefile
-@@ -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)
---- a/Makefile.inc
-+++ b/Makefile.inc
-@@ -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
---- a/multipath/Makefile
-+++ b/multipath/Makefile
-@@ -7,32 +7,30 @@
- OBJS = main.o
- 
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -ldl -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath
- 
- 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)
---- a/multipathd/Makefile
-+++ b/multipathd/Makefile
-@@ -6,8 +6,8 @@
- # basic flags setting
- #
- CFLAGS += -I$(multipathdir)
--LDFLAGS += -lpthread -ldevmapper -lreadline -lncurses -ldl \
--	   -lmultipath -L$(multipathdir)
-+LIBS = -lpthread -ldevmapper -lreadline -ldl \
-+	   -L$(multipathdir) -lmultipath
- 
- #
- # debuging stuff
-@@ -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)
- 
---- a/libmultipath/Makefile
-+++ b/libmultipath/Makefile
-@@ -26,7 +26,7 @@ endif
- all: $(LIBS)
- 
- $(LIBS): $(OBJS)
--	$(CC) $(SHARED_FLAGS) $(LIBDEPS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS)
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ $(CFLAGS) -o $@ $(OBJS) $(LIBDEPS)
- 	ln -sf $@ $(DEVLIB)
- 
- install:
---- a/libmultipath/checkers/Makefile
-+++ b/libmultipath/checkers/Makefile
-@@ -18,10 +18,10 @@ CFLAGS += -I..
- all: $(LIBS)
- 
- libcheckdirectio.so: libsg.o directio.o
--	$(CC) $(SHARED_FLAGS) -o $@ $^ -laio
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^ -laio
- 
- libcheck%.so: libsg.o %.o
--	$(CC) $(SHARED_FLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install:
- 	$(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir)
---- a/libmultipath/prioritizers/Makefile
-+++ b/libmultipath/prioritizers/Makefile
-@@ -20,10 +20,10 @@ CFLAGS += -I..
- all: $(LIBS)
- 
- libprioalua.so: alua.o alua_rtpg.o
--	$(CC) $(SHARED_FLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- libprio%.so: %.o
--	$(CC) $(SHARED_FLAGS) -o $@ $^
-+	$(CC) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $^
- 
- install: $(LIBS)
- 	$(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir)
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-log_enquery_overflow.patch b/sys-fs/multipath-tools/files/multipath-tools-0.4.9-log_enquery_overflow.patch
deleted file mode 100644
index 67367c9f42e0..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.4.9-log_enquery_overflow.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e1d69df0cdd1627676501df3a533b25ffadaeff0 Mon Sep 17 00:00:00 2001
-From: Arkadiusz Miskiewicz <arekm@maven.pl>
-Date: Sat, 27 Nov 2010 19:21:21 +0100
-Subject: [PATCH] multipath-tools overflow
-
-On Saturday 27 of November 2010, you wrote:
-
-[...]
-
-> the whole logarea is memset to 0 by logarea_init(), and each dequeued
-> message is also memset to 0 by log_dequeue(), so it seems normal that
-> msg->str value is 0x0, but it's really its address that matters.
-
-Ok, got it. Pointers, memory areas in my debugging session - are looking
-good then.
-
->
-> It's not clear to me : are you actually hitting a bug or is it your
-> debug session that puzzles you ?
-
-I'm hitting a bug. multipathd dies for me at that strcpy(). Now I think
-the bug is strcpy usage instead of memcpy because I'm building with
--O2 -D_FORTIFY_SOURCE=2 which turns on special glibc overflow
-detection.
-
-That detection seem to be smart enough to know that &str area is not
-a string memory and aborts the program.
-
-Found similar problem discussed here
-http://sourceware.org/ml/binutils/2005-11/msg00308.html
-
-glibc aborts the program:
-[pid 13432] writev(2, [{"*** ", 4}, {"buffer overflow detected", 24},
-{" ***: ", 6}, {"/home/users/arekm/rpm/BUILD/multipath-tools-0.4.9
-/multipathd/multipathd", 71}, {" terminated\n", 12}], 5) = 117
-
-same for valgrind:
-**13436** *** strcpy_chk: buffer overflow detected ***: program terminated
-==13436==    at 0x4024997: VALGRIND_PRINTF_BACKTRACE (valgrind.h:4477)
-==13436==    by 0x40265F8: __strcpy_chk (mc_replace_strmem.c:781)
-==13436==    by 0x40EDC06: log_enqueue (string3.h:107)
-==13436==    by 0x40ED68A: log_safe (log_pthread.c:24)
-==13436==    by 0x40E296A: dlog (debug.c:36)
-==13436==    by 0x804ECEC: pidfile_create (pidfile.c:37)
-==13436==    by 0x804E731: main (main.c:1424)
-
-The bug is not visible if I run multipathd in debug mode (-d).
-
-This patch fixes the problem for me by avoiding false positive on strcpy_chk.
----
- libmultipath/log.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/libmultipath/log.c b/libmultipath/log.c
-index e56e46b..57b7696 100644
---- a/libmultipath/log.c
-+++ b/libmultipath/log.c
-@@ -142,7 +142,7 @@ int log_enqueue (int prio, const char * fmt, va_list ap)
- 	la->empty = 0;
- 	msg = (struct logmsg *)la->tail;
- 	msg->prio = prio;
--	strcpy((void *)&msg->str, buff);
-+	memcpy((void *)&msg->str, buff, strlen(buff) + 1);
- 	lastmsg->next = la->tail;
- 	msg->next = la->head;
- 
--- 
-1.7.6.5
-
diff --git a/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild
deleted file mode 100644
index 16bc6b2e16e1..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/multipath-tools/multipath-tools-0.4.9-r5.ebuild,v 1.12 2014/07/30 19:27:36 ssuominen Exp $
-
-EAPI=4
-inherit base eutils toolchain-funcs udev
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://christophe.varoqui.free.fr/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	dev-libs/libaio
-	sys-libs/readline
-	!<sys-apps/baselayout-2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.9-build.patch
-	"${FILESDIR}"/${PN}-0.4.9-buffer-overflows.patch
-	"${FILESDIR}"/${PN}-0.4.8-kparted-ext-partitions.patch
-	"${FILESDIR}"/${PN}-0.4.9-log_enquery_overflow.patch
-)
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake LIBDM_API_FLUSH=1 CC="$(tc-getCC)"
-}
-
-src_install() {
-	local udevdir="$(get_udevdir)"
-
-	dodir /sbin /usr/share/man/man8
-	emake \
-		DESTDIR="${D}" \
-		libudevdir='${prefix}'/"${udevdir}" \
-		install
-
-	insinto /etc
-	newins "${S}"/multipath.conf.annotated multipath.conf
-	# drop this one it doesnt work with recent udev bug #413063
-	rm "${D}"/etc/udev/rules.d/65-multipath.rules || die
-	# /etc/udev is reserved for user modified rules!
-	mv "${D}"/etc/udev/rules.d "${D}/${udevdir}"/ || die
-	fperms 644 "${udevdir}"/rules.d/66-kpartx.rules
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	dodoc multipath.conf.* AUTHOR ChangeLog FAQ README TODO
-	docinto kpartx
-	dodoc kpartx/ChangeLog kpartx/README
-}
-
-pkg_preinst() {
-	# The dev.d script was previously wrong and is now removed (the udev rules
-	# file does the job instead), but it won't be removed from live systems due
-	# to cfgprotect.
-	# This should help out a little...
-	if [[ -e ${ROOT}/etc/dev.d/block/multipath.dev ]] ; then
-		mkdir -p "${D}"/etc/dev.d/block
-		echo "# Please delete this file. It is obsoleted by /etc/udev/rules.d/65-multipath.rules" \
-			> "${D}"/etc/dev.d/block/multipath.dev
-	fi
-}
-
-pkg_postinst() {
-	elog "If you need multipath on your system, you must"
-	elog "add 'multipath' into your boot runlevel!"
-}