Cleanups to run better.

(Portage version: 2.2.10/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 324 insertions, 3 deletions

diff --git a/sys-block/megactl/ChangeLog b/sys-block/megactl/ChangeLog
index 5e423483a413..b8436b06a9a7 100644
--- a/sys-block/megactl/ChangeLog
+++ b/sys-block/megactl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-block/megactl
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/ChangeLog,v 1.6 2014/07/14 00:52:23 robbat2 Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/ChangeLog,v 1.7 2014/07/15 16:42:16 robbat2 Exp $
+
+*megactl-0.4.1-r2 (15 Jul 2014)
+
+  15 Jul 2014; Robin H. Johnson <robbat2@gentoo.org>
+  +files/megactl-0.4.1-gcc-fixes.patch, +files/megactl-0.4.1-tracefix.patch,
+  +megactl-0.4.1-r2.ebuild:
+  Cleanups to run better.
 
 *megactl-0.4.1-r1 (21 Nov 2009)
 
@@ -19,4 +26,3 @@
   10 Feb 2008; Wolfram Schlich <wschlich@gentoo.org>
   +files/megactl-0.4.1.patch, +metadata.xml, +megactl-0.4.1.ebuild:
   initial import
-
diff --git a/sys-block/megactl/files/megactl-0.4.1-gcc-fixes.patch b/sys-block/megactl/files/megactl-0.4.1-gcc-fixes.patch
new file mode 100644
index 000000000000..7ea6e8cac453
--- /dev/null
+++ b/sys-block/megactl/files/megactl-0.4.1-gcc-fixes.patch
@@ -0,0 +1,46 @@
+diff -Nuar --exclude '*.swp' --exclude '*.o' megactl-0.4.1.orig/src/callinfo.c megactl-0.4.1/src/callinfo.c
+--- megactl-0.4.1.orig/src/callinfo.c	2007-08-21 00:19:53.000000000 -0700
++++ megactl-0.4.1/src/callinfo.c	2014-07-13 22:05:06.585598812 -0700
+@@ -255,7 +255,12 @@
+     { SYS_setfsgid32,		0,	"setfsgid32" },
+     { SYS_pivot_root,		0,	"pivot_root" },
+     { SYS_mincore,		0,	"mincore" },
++#ifdef SYS_madvise
++    { SYS_madvise,		0,	"madvise" },
++#endif
++#ifdef SYS_madvise1
+     { SYS_madvise1,		0,	"madvise1" },
++#endif
+     { SYS_getdents64,		0,	"getdents64" },
+     { SYS_fcntl64,		0,	"fcntl64" },
+     { 222,			0,	NULL },
+diff -Nuar --exclude '*.swp' --exclude '*.o' megactl-0.4.1.orig/src/logpage.c megactl-0.4.1/src/logpage.c
+--- megactl-0.4.1.orig/src/logpage.c	2007-08-21 00:19:53.000000000 -0700
++++ megactl-0.4.1/src/logpage.c	2014-07-13 21:58:34.010848677 -0700
+@@ -20,6 +20,8 @@
+  * Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
++#define __STDC_FORMAT_MACROS
++#include <inttypes.h>
+ 
+ #include	"megaioctl.h"
+ #include	"logpage.h"
+@@ -107,7 +109,7 @@
+ 
+     for (k = 0; (b >= 1024) && (k < sizeof (suffix) / sizeof (suffix[0]) - 1); ++k, b /= 1024)
+ 	;
+-    snprintf (bytes, sizeof bytes, "%3llu%s%s", b, suffix[k], unit);
++    snprintf (bytes, sizeof bytes, "%3" PRIu64 "%s%s", b, suffix[k], unit);
+     return bytes;
+ }
+ 
+@@ -378,7 +380,7 @@
+ 		 default:				result = "unknown result"; notice = 0; break;
+ 		}
+ 		if (verbosity > notice)
+-		    fprintf (f, "    %2d: timestamp %4ud%02uh: %10s %-30s seg:%u lba:%-8lld sk:%u asc:%u ascq:%u vs:%u\n", k, t->timestamp / 24, t->timestamp % 24, test, result, t->number, t->lba, t->sense_key, t->additional_sense_code, t->additional_sense_code_qualifier, t->vendor_specific);
++		    fprintf (f, "    %2d: timestamp %4ud%02uh: %10s %-30s seg:%u lba:%-8"PRIu64" sk:%u asc:%u ascq:%u vs:%u\n", k, t->timestamp / 24, t->timestamp % 24, test, result, t->number, t->lba, t->sense_key, t->additional_sense_code, t->additional_sense_code_qualifier, t->vendor_specific);
+ 	    }
+ 	}
+ 	break;
diff --git a/sys-block/megactl/files/megactl-0.4.1-tracefix.patch b/sys-block/megactl/files/megactl-0.4.1-tracefix.patch
new file mode 100644
index 000000000000..915cc2d2a20d
--- /dev/null
+++ b/sys-block/megactl/files/megactl-0.4.1-tracefix.patch
@@ -0,0 +1,232 @@
+diff -Nuar megactl-0.4.1.orig/src/megactl.c megactl-0.4.1/src/megactl.c
+--- megactl-0.4.1.orig/src/megactl.c	2007-08-21 00:19:53.000000000 -0700
++++ megactl-0.4.1/src/megactl.c	2014-07-14 11:15:14.538745305 -0700
+@@ -45,6 +45,9 @@
+ 
+ ********************************************************************/
+ 
++#define __STDC_FORMAT_MACROS
++#include <inttypes.h>
++
+ #include	"mega.h"
+ #include	"megaioctl.h"
+ #include	"adapter.h"
+@@ -207,7 +210,7 @@
+ 
+     for (k = 0; (b >= 1024) && (k < sizeof (suffix) / sizeof (suffix[0]) - 1); ++k, b /= 1024)
+ 	;
+-    snprintf (bytes, sizeof bytes, "%3llu%s%s", b, suffix[k], unit);
++    snprintf (bytes, sizeof bytes, "%3"PRIu64"%s%s", b, suffix[k], unit);
+     return bytes;
+ }
+ 
+@@ -604,6 +607,8 @@
+ 	fprintf (stderr, "megaraid driver version %x too old.\n", driverVersion);
+ 	return 1;
+     }
++#else
++	driverVersion = 0;
+ #endif
+ 
+     if (megaGetNumAdapters (fd, &numAdapters, sas) < 0)
+diff -Nuar megactl-0.4.1.orig/src/megaioctl.c megactl-0.4.1/src/megaioctl.c
+--- megactl-0.4.1.orig/src/megaioctl.c	2014-07-14 11:30:03.590781305 -0700
++++ megactl-0.4.1/src/megaioctl.c	2014-07-14 11:31:36.410258930 -0700
+@@ -87,7 +87,11 @@
+     m->cmd = cmd;
+     m->opcode = opcode;
+     m->subopcode = subopcode;
++#ifdef __x86_64__
++    m->xferaddr = (uint64_t) data;
++#else
+     m->xferaddr = (uint32_t) data;
++#endif
+     if (data)
+ 	memset (data, 0, len);
+ 
+@@ -115,7 +119,11 @@
+     m->cmd = cmd;
+     m->opcode = opcode;
+     m->subopcode = subopcode;
++#ifdef __x86_64__
++    m->xferaddr = (uint64_t) data;
++#else
+     m->xferaddr = (uint32_t) data;
++#endif
+     if (data)
+ 	memset (data, 0, len);
+ 
+@@ -178,11 +186,19 @@
+ 	u.ui.fcs.adapno = MKADAP(adapter->adapno);
+ 	u.data = data;
+ 	m->cmd = MBOXCMD_PASSTHRU;
++#ifdef __x86_64__
++	m->xferaddr = (uint64_t) p;
++#else
+ 	m->xferaddr = (uint32_t) p;
++#endif
+ 	p->timeout = 3;
+ 	p->ars = 1;
+ 	p->target = target;
+-	p->dataxferaddr = (uint32_t) data;
++#ifdef __x86_64__
++    p->dataxferaddr = (uint64_t) data;
++#else
++    p->dataxferaddr = (uint32_t) data;
++#endif
+ 	p->dataxferlen = len;
+ 	p->scsistatus = 239;	/* HMMM */
+ 	memcpy (p->cdb, cdb, cdblen);
+diff -Nuar megactl-0.4.1.orig/src/megatrace.c megactl-0.4.1/src/megatrace.c
+--- megactl-0.4.1.orig/src/megatrace.c	2014-07-14 01:31:47.704312799 -0700
++++ megactl-0.4.1/src/megatrace.c	2014-07-14 11:37:20.570755832 -0700
+@@ -170,7 +170,11 @@
+ 		    fprintf (stderr, "ptrace:getregs: %s\n", strerror (errno));
+ 		    exit (1);
+ 		}
++#ifdef __x86_64__
++		call = r.orig_rax;
++#else
+ 		call = r.orig_eax;
++#endif
+ 		/*printthis = call == SYS_ioctl;*/
+ 
+ 		if (state == INBOUND)
+@@ -188,18 +192,30 @@
+ 		{
+ 		    if ((call < 0) || (call > callmax) || (callinfo[call].name == NULL))
+ 		    {
++#ifdef __x86_64__
++			fprintf (stderr, "= 0x%08llx\n", (unsigned long long) r.rax);
++#else
+ 			fprintf (stderr, "= 0x%08lx\n", (unsigned long) r.eax);
++#endif
+ 		    }
+ 		    else
+ 		    {
+ 			if (callinfo[call].ptrval)
+ 			{
+ 			    if (printcalls || printthis)
++#ifdef __x86_64__
++				fprintf (stderr, " = 0x%08llx\n", r.rax);
++#else
+ 				fprintf (stderr, " = 0x%08lx\n", r.eax);
++#endif
+ 			}
+ 			else
+ 			{
++#ifdef __x86_64__
++			    long	rv = r.rax;
++#else
+ 			    long	rv = r.eax;
++#endif
+ 			    if (rv < 0)
+ 			    {
+ 				if (printcalls || printthis)
+@@ -219,16 +235,22 @@
+ 		    unsigned int		len = 16;
+ 		    unsigned char		buf[65536];
+ 
++#ifdef __x86_64__
++		    unsigned long long	fd = r.rbx;
++		    unsigned long long	ioc = r.rcx;
++		    unsigned long long	arg = r.rdx;
++#else
+ 		    unsigned long		fd = r.ebx;
+-
+ 		    unsigned long		ioc = r.ecx;
++		    unsigned long		arg = r.edx;
++#endif
++
+ 		    unsigned int		iocdir = _IOC_DIR(ioc);
+ 		    unsigned char		ioctype = _IOC_TYPE(ioc);
+ 		    unsigned int		iocnr = _IOC_NR(ioc);
+ 		    unsigned int		iocsize = _IOC_SIZE(ioc);
+ 		    char			*iocdirname;
+ 
+-		    unsigned long		arg = r.edx;
+ 
+ 		    switch (iocdir)
+ 		    {
+@@ -240,7 +262,11 @@
+ 
+ 		    fprintf (stderr, "%s: ioctl(%ld, _IOC(\"%s\",'%c',0x%02x,0x%02x), 0x%08lx)", tbuf, fd, iocdirname, ioctype, iocnr, iocsize, arg);
+ 		    if (state == OUTBOUND)
++#ifdef __x86_64__
++			fprintf (stderr, " = %lld\n", r.rax);
++#else
+ 			fprintf (stderr, " = %ld\n", r.eax);
++#endif
+ 		    if (getenv ("LOG_INBOUND"))
+ 			fprintf (stderr, "\n");
+ 
+@@ -249,10 +275,18 @@
+ 		    if (len > sizeof buf)
+ 			len = sizeof buf;
+ 
++#ifdef __x86_64__
++		    if (printregs)
++			fprintf (stderr, "    rbx=%08llx rcx=%08llx rdx=%08llx rsi=%08llx rdi=%08llx rbp=%08llx rax=%08llx ds=%08llx es=%08llx fs=%08llx gs=%08llx orig_rax=%08llx rip=%08llx cs=%08llx eflags=%08llx rsp=%08llx ss=%08llx\n", r.rbx, r.rcx, r.rdx, r.rsi, r.rdi, r.rbp, r.rax, r.ds, r.es, r.fs, r.gs, r.orig_rax, r.rip, r.cs, r.eflags, r.rsp, r.ss);
++
++		    copyout (buf, len, pid, r.rdx);
++#else
+ 		    if (printregs)
+ 			fprintf (stderr, "    ebx=%08lx ecx=%08lx edx=%08lx esi=%08lx edi=%08lx ebp=%08lx eax=%08lx xds=%08lx xes=%08lx xfs=%08lx xgs=%08lx orig_eax=%08lx eip=%08lx xcs=%08lx eflags=%08lx esp=%08lx xss=%08lx\n", r.ebx, r.ecx, r.edx, r.esi, r.edi, r.ebp, r.eax, r.xds, r.xes, r.xfs, r.xgs, r.orig_eax, r.eip, r.xcs, r.eflags, r.esp, r.xss);
+ 
+ 		    copyout (buf, len, pid, r.edx);
++#endif
++
+ 
+ 		    if ((ioctype == 'm') && (iocnr == 0) && (iocsize == sizeof (struct uioctl_t)))
+ 		    {
+@@ -405,7 +439,11 @@
+ 			else
+ 			{
+ 			    fprintf (stderr, "    host %d, off 0x%04x, count %d, sense_off 0x%08x, sense_len 0x%08x\n", iocp->host_no, iocp->sgl_off, iocp->sge_count, iocp->sense_off, iocp->sense_len);
++#ifdef __x86_64__
++			    dumpbytes (stderr, buf, len, (void *) r.rdx, NULL);
++#else
+ 			    dumpbytes (stderr, buf, len, (void *) r.edx, NULL);
++#endif
+ 			}
+ 			if (log)
+ 			{
+@@ -427,23 +465,38 @@
+ 		    }
+ 		    else
+ 		    {
++#ifdef __x86_64__
++			dumpbytes (stderr, buf, len, (void *) r.rdx, NULL);
++#else
+ 			dumpbytes (stderr, buf, len, (void *) r.edx, NULL);
++#endif
+ 		    }
+ 		    fprintf (stderr, "\n");
+ 		}
+ 
+ 		switch (state)
+ 		{
++#ifdef __x86_64__
++		    static u64		lastrip = 0;
++#else
+ 		    static u32		lasteip = 0;
++#endif
++
+ 
+ 		 case UNTRACED:
+ 		    /* We don't know whether we were inbound or outbound on the first signal; this
+ 		       appears to differ between kernels. So we defer until we see the same eip in
+ 		       two successive traps, at which point we know we were outbound, so the next
+ 		       trap is inbound. */
++#ifdef __x86_64__
++		    if (lastrip == r.rip)
++			state = INBOUND;
++		    lastrip = r.rip;
++#else
+ 		    if (lasteip == r.eip)
+ 			state = INBOUND;
+ 		    lasteip = r.eip;
++#endif
+ 		    break;
+ 		 case INBOUND:		state = OUTBOUND; break;
+ 		 case OUTBOUND:		state = INBOUND; break;
diff --git a/sys-block/megactl/megactl-0.4.1-r2.ebuild b/sys-block/megactl/megactl-0.4.1-r2.ebuild
new file mode 100644
index 000000000000..41dc4c388a1f
--- /dev/null
+++ b/sys-block/megactl/megactl-0.4.1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/megactl/megactl-0.4.1-r2.ebuild,v 1.1 2014/07/15 16:42:16 robbat2 Exp $
+
+EAPI=2
+
+inherit eutils
+
+IUSE=""
+DESCRIPTION="LSI MegaRAID control utility"
+HOMEPAGE="http://sourceforge.net/projects/megactl/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}.patch
+	epatch "${FILESDIR}"/${P}-Makefile.patch
+	epatch "${FILESDIR}"/${P}-gcc-fixes.patch
+	epatch "${FILESDIR}"/${P}-tracefix.patch
+}
+
+src_compile() {
+	cd src
+	use x86 && MY_MAKEOPTS="ARCH=-m32"
+	use amd64 && MY_MAKEOPTS="ARCH=-m64"
+	emake ${MY_MAKEOPTS} || die "make failed"
+}
+
+src_install() {
+	cd src
+	dosbin megactl megasasctl megarpt megasasrpt
+	# it's not quite fixed yet
+	[ -x megatrace ] && dosbin megatrace
+	dodoc ../README
+}