update compat

Upstream version 0.4.1.1

debian/changelog

@@ -1,4 +1,11 @@
-megactl (0.4.1+svn20090725.r6-6) unstable; urgency=medium
+megactl (0.4.1.1-1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * megatrace in own package
+
+ -- Mario Fetka <mario.fetka@gmail.com>  Sat, 22 Apr 2017 16:52:02 +0200
+
+megactl (0.4.1-6) unstable; urgency=medium
 
   * Update 003-Fix_disk_enumeration_loop patch (fix issues with PERC6e).
 

debian/compat

@@ -1 +1 @@
-4
+7

debian/control

@@ -2,7 +2,7 @@ Source: megactl
 Section: admin
 Priority: optional
 Maintainer: Adam Cécile (Le_Vert) <gandalf@le-vert.net>
-Build-Depends: debhelper (>= 4), dpatch
+Build-Depends: debhelper (>= 4), dpatch, libc6-dev-i386 [amd64], gcc-multilib [amd64] | libc6-dev-i386 (<< 2.7) [amd64]
 Standards-Version: 3.8.2
 Homepage: http://sourceforge.net/projects/megactl
 
@@ -15,3 +15,13 @@ Description: LSI MegaRAID SCSI/SAS reporting tool
  .
  It reports status and informations about the adapter itself, it's
  logical disks and the physical disks attached.
+
+Package: megatrace
+Architecture: i386 amd64
+Depends: ${shlibs:Depends}, ${misc:Depends}, libc6-i386 [amd64], megactl
+Description: LSI MegaRAID SCSI/SAS reporting tool
+ This package contains both megactl and megasasctl tools that can be used
+ to query LSI's MegaRAID adapters status.
+ .
+ It reports status and informations about the adapter itself, it's
+ logical disks and the physical disks attached.

debian/man/megatrace/megatrace.8

@@ -0,0 +1,39 @@
+.TH MEGATRACE "8" "September 2007" "0.4.1" "User Commands"
+
+.SH NAME
+megatrace - a debugging program which can be used to trace LSI MegaRAID-related ioctl() system calls.
+
+.SH DESCRIPTION
+.B megatrace
+is debugging program which can be used to trace LSI MegaRAID-related ioctl() system calls.
+.br
+You won't need that unless you're trying to add features to megactl, or are exceptionally curious.
+.br
+This program uses ptrace(2) and can inspect and modify data structures to help you suss out what's going on in dellmgr and MegaCli.
+.PP
+If you're not developer, please check megactl(8) or megactlsas(8).
+
+.SH SYNOPSIS
+.B megatrace
+<command_to_trace>
+.PP
+You may really consider tracing a command that access MegaRAID card, like Dell's dellmgr or LSI's megacli.
+
+.SH OPTIONS
+.B megatrace
+has no options.
+
+.SH "SEE ALSO"
+Homepage: http://sourceforge.net/projects/megactl
+.br
+Some examples scripts (Debian systems): /usr/share/doc/megactl/examples/
+.br
+megactl(8): Reporting tool for SCSI adapters.
+megasasctl(8): Reporting tool for SAS adapters.
+
+.SH AUTHOR
+This manual page was written by Adam Cécile (Le_Vert) <gandalf@le-vert.net> for the Debian system (but may be used by others).
+.br
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation
+.br
+On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL.

debian/manpages

@@ -1 +0,0 @@
-debian/man/*

debian/megactl.manpages

@@ -0,0 +1 @@
+debian/man/megactl/*

debian/megatrace.install

@@ -0,0 +1,2 @@
+src/megatrace                           usr/lib/megactl
+debian/wrappers/megatrace               usr/sbin

debian/megatrace.manpages

@@ -0,0 +1 @@
+debian/man/megatrace/*

debian/patches/008-device_id.dpatch

@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 008-device_id.dpatch by Mario Fetka (geos_one) <mario.fetka@gmail.com>
+##
+## DP: add device_id to output
+## DP: thx. to gentoo devs
+
+@DPATCH@
+--- megactl/src/adapter.c.orig	2017-04-22 17:15:55.068000000 +0200
++++ megactl/src/adapter.c	2017-04-22 17:17:17.624000000 +0200
+@@ -193,9 +193,9 @@
+ 	d->id = info->slot;
+ 
+ 	if (d->channel == DISK_NOENC)
+-	    snprintf (d->name, sizeof (d->name), "%se*s%u", a->name, d->id);
++	    snprintf (d->name, sizeof (d->name), "d%u%se*s%u", info->device_id, a->name, d->id);
+ 	else
+-	    snprintf (d->name, sizeof (d->name), "%se%us%u", a->name, d->channel, d->id);
++	    snprintf (d->name, sizeof (d->name), "d%u%se%us%u", info->device_id, a->name, d->channel, d->id);
+ 
+ 	d->inquiry = info->inquiry.inq;
+ 	strncpy (d->vendor, d->inquiry.vendor_info, sizeof (d->vendor) - 1);

debian/patches/00list

@@ -5,3 +5,4 @@
 005-Makefile.dpatch
 006-gcc-fixes.dpatch
 007-tracefix.dpatch
+008-device_id.dpatch

debian/rules

@@ -16,15 +16,21 @@ endif
 
 ifeq ($(ARCH),i386)
 	MY_MAKEOPTS="ARCH=-m32"
+	MT_MAKEOPTS="ARCH=-m32"
 else
 	MY_MAKEOPTS="ARCH=-m64"
+	MT_MAKEOPTS="ARCH=-m32"
 endif
 #	$(MAKE) CFLAGS="$(CFLAGS) \$$(INC) \$$(ARCH)" -C src/
 
 build: build-stamp
 build-stamp: patch-stamp
 	dh_testdir
+	$(MAKE) $(MT_MAKEOPTS) CFLAGS="$(CFLAGS) \$$(INC) \$$(ARCH)" -C src/ megatrace
+	mv src/megatrace src/megatrace.i386
+	$(MAKE) clean -C src/
 	$(MAKE) $(MY_MAKEOPTS) CFLAGS="$(CFLAGS) \$$(INC) \$$(ARCH)" -C src/
+	mv src/megatrace.i386 src/megatrace
 	touch $@
 
 clean: unpatch

debian/wrappers/megatrace

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Author: Adam Cécile (Le_Vert) <gandalf@le-vert.net>
+# License: Public domain
+
+. /usr/lib/megactl/create-devices-nodes
+
+create_node
+create_node_sas
+
+/usr/lib/megactl/megatrace $@