new release 1.8.15, Debian bug #766418), some other work

author: Jörg Frings-Fürst <debian@jff-webhosting.net> 2014-12-02 08:52:40 +0100
committer: Jörg Frings-Fürst <debian@jff-webhosting.net> 2014-12-02 08:52:40 +0100
commit: af16369cd594e64abec0d662f0fdbfe487c212d5 (patch)
tree: 6ad054d0ac2d95f392cf3d4994b8d204e3c2c4bf
parent: 096a497b36f208fb68a12c7ae7576ca0a69f919d (diff)
22 files changed, 131 insertions, 490 deletions
diff --git a/debian/changelog b/debian/changelog
index b591089..6ac6778 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,42 @@
+ipmitool (1.8.15-1) unstable; urgency=medium
+
+  * New upstream release.
+  * debian/patches:
+    - Remove patches (including in upstream):
+      - 120-Dell-13G.patch
+      - 115-lib_declarations.patch
+      - 097-source_typo.patch
+    - Refresh patches:
+      - 099_readme_typo
+      - 101_fix_buf_overflow.patch
+      - 112_fix_CVE-2011-4339.patch
+  * debian/contol:
+    - bump Standards-Version to 3.9.6 (no changes required).
+    - Change Vcs-* to new cgit based repository viewer.
+    - Add libfreeipmi-dev to Build-Depends to enable freeipmi interface.
+  * debian/source/options:
+    - Removed because xz is now standard compression.
+  * debian/rules:
+    - Remove oldstyle debhelper parts.
+    - Add "--with autotools-dev".
+  * debian/watch:
+    - Add xz for searching upstream tarballs.
+  * debian/copyright:
+    - Add missing section for debian/*.
+  * New package ipmitool-ctrl:
+    - move program ipmitool from ipmitool to ipmitool-ctrl (Closes: #766418).
+  * debian/ipmitool.postrm:
+    - Escape the double quote around false.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 01 Dec 2014 23:03:36 +0100
+
+ipmitool (1.8.14-4~bpo70+1) wheezy-backports; urgency=medium
+
+  * Rebuild for wheezy-backports (Closes: #757375).
+    - Add support for Dell 13G server.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 10 Sep 2014 14:41:50 +0200
+
 ipmitool (1.8.14-4) unstable; urgency=medium
 
   * New debian/patches/120-Dell-13G.patch:
diff --git a/debian/control b/debian/control
index 219e010..cc2db75 100644
--- a/debian/control
+++ b/debian/control
@@ -3,22 +3,27 @@ Section: utils
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Build-Depends:
- autotools-dev, 
+ autotools-dev,
  debhelper (>> 9),
  dh-systemd (>= 1.5),
- libncurses-dev, 
+ libncurses-dev,
+ libfreeipmi-dev,
  libreadline-dev,
- libssl-dev 
-Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/ipmitool.git
+ libssl-dev
+Standards-Version: 3.9.6
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/ipmitool.git
 Vcs-Git: git://anonscm.debian.org/collab-maint/ipmitool.git
 Homepage: http://sourceforge.net/projects/ipmitool/
 
 Package: ipmitool
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base
+Depends: 
+ ${misc:Depends},
+ ${shlibs:Depends},
+ lsb-base
 Recommends: openipmi
-Description: utility for IPMI control with kernel driver or LAN interface
+Suggests: ipmitool-ctrl
+Description: utility for IPMI control with kernel driver or LAN interface (daemon)
  A utility for managing and configuring devices that support the
  Intelligent Platform Management Interface.  IPMI is an open standard
  for monitoring, logging, recovery, inventory, and control of hardware
@@ -33,4 +38,32 @@ Description: utility for IPMI control with kernel driver or LAN interface
  Event Log (SEL), print Field Replaceable Unit (FRU) inventory
  information, read and set LAN configuration parameters, and perform
  remote chassis power control.
+ .
+ This package contains the daemon.
 
+Package: ipmitool-ctrl
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ lsb-base
+Recommends: openipmi
+Replaces: ipmitool (<< 1.8.15-1)
+Breaks: ipmitool (<< 1.8.15-1)
+Description: utility for IPMI control with kernel driver or LAN interface
+ A utility for managing and configuring devices that support the
+ Intelligent Platform Management Interface.  IPMI is an open standard
+ for monitoring, logging, recovery, inventory, and control of hardware
+ that is implemented independent of the main CPU, BIOS, and OS.  The
+ service processor (or Baseboard Management Controller, BMC) is the
+ brain behind platform management and its primary purpose is to handle
+ the autonomous sensor monitoring and event logging features.
+ .
+ The ipmitool program provides a simple command-line interface to this
+ BMC.  It features the ability to read the sensor data repository
+ (SDR) and print sensor values, display the contents of the System
+ Event Log (SEL), print Field Replaceable Unit (FRU) inventory
+ information, read and set LAN configuration parameters, and perform
+ remote chassis power control.
+ .
+ This package contains the control utility.
diff --git a/debian/copyright b/debian/copyright
index eb6858d..6c263d6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -19,6 +19,24 @@ Copyright: 1999-2002 Aladdin Enterprises
            2014      Jörg Frings-Fürst
 License: BSD-3-clause
 
+Files: debian/*
+Copyright: 2003-2005 Duncan Laurie <duncan@sun.com>
+           2005      Seth Goldberg <sethmeisterg@hotmail.com>
+           2005-2007 Petter Reinholdtsen <pere@debian.org>
+           2007      Julien Cristau <jcristau@debian.org>
+           2008-2009 Matthew Johnson <mjj29@debian.org>
+           2009      Chuck Short <zulcss@ubuntu.com>
+           2010      Lorenzo De Liso <blackz@ubuntu.com>
+           2010      Stefano Rivera <stefano@rivera.za.net>
+           2011      Jeff Lane <jeff@ubuntu.com>
+           2011      Colin Watson <cjwatson@ubuntu.com>
+           2011      Michael Casadevall <mcasadevall@ubuntu.com>
+           2011-2013 Luk Claes <luk@debian.org>
+           2012      Leo Iannacone <l3on@ubuntu.com>
+           2013      Robie Basak <robie.basak@canonical.com>
+           2014      JörgFrings-Fürst <debian@jff-webhosting.net>
+License: BSD-3-clause
+
 License: BSD-3-clause
  All rights reserved.
  .
@@ -44,4 +62,3 @@ License: BSD-3-clause
  LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
-
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 03d0b5b..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/modules-load.d/
-\ No newline at end of file
diff --git a/debian/ipmitool-ctrl.docs b/debian/ipmitool-ctrl.docs
new file mode 100644
index 0000000..55bc0a6
--- /dev/null
+++ b/debian/ipmitool-ctrl.docs
@@ -0,0 +1,2 @@
+README
+AUTHORS
diff --git a/debian/ipmitool-ctrl.install b/debian/ipmitool-ctrl.install
new file mode 100644
index 0000000..1df36c6
--- /dev/null
+++ b/debian/ipmitool-ctrl.install
@@ -0,0 +1 @@
+usr/bin/*
diff --git a/debian/ipmitool-ctrl.manpages b/debian/ipmitool-ctrl.manpages
new file mode 100644
index 0000000..3a233b1
--- /dev/null
+++ b/debian/ipmitool-ctrl.manpages
@@ -0,0 +1 @@
+doc/ipmitool.1
diff --git a/debian/ipmitool.dirs b/debian/ipmitool.dirs
new file mode 100644
index 0000000..1c4a8e3
--- /dev/null
+++ b/debian/ipmitool.dirs
@@ -0,0 +1 @@
+usr/lib/modules-load.d/
diff --git a/debian/ipmitool.docs b/debian/ipmitool.docs
new file mode 100644
index 0000000..55bc0a6
--- /dev/null
+++ b/debian/ipmitool.docs
@@ -0,0 +1,2 @@
+README
+AUTHORS
diff --git a/debian/ipmitool.install b/debian/ipmitool.install
new file mode 100644
index 0000000..78027ec
--- /dev/null
+++ b/debian/ipmitool.install
@@ -0,0 +1 @@
+usr/sbin/ipmievd
diff --git a/debian/ipmitool.manpages b/debian/ipmitool.manpages
new file mode 100644
index 0000000..e837070
--- /dev/null
+++ b/debian/ipmitool.manpages
@@ -0,0 +1 @@
+doc/ipmievd.8
diff --git a/debian/ipmitool.postinst b/debian/ipmitool.postinst
index fb978c4..7064f87 100644
--- a/debian/ipmitool.postinst
+++ b/debian/ipmitool.postinst
@@ -6,11 +6,11 @@ set -e
 ipmievd_initd_failed() {
 	echo "Unable to start ipmievd during installation.  Trying to disable."
 	if [ -f /etc/default/ipmievd ] && \
-           grep -q ^ENABLED=false /etc/default/ipmievd ; then
+           grep -q ^ENABLED=\"false\" /etc/default/ipmievd ; then
 	    :
 	else
 	    touch /etc/default/ipmievd
-	    echo "ENABLED=false" >> /etc/default/ipmievd
+	    echo "ENABLED=\"false\"" >> /etc/default/ipmievd
 	fi
 }
 
diff --git a/debian/patches/097-source_typo.patch b/debian/patches/097-source_typo.patch
deleted file mode 100644
index 1323caf..0000000
--- a/debian/patches/097-source_typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: typo in source
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Forwarded: https://sourceforge.net/p/ipmitool/patches/101/
-Last-Update: 2014-05-19
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/lib/ipmi_fwum.c
-===================================================================
---- trunk.orig/lib/ipmi_fwum.c	2014-03-28 13:36:21.000000000 +0100
-+++ trunk/lib/ipmi_fwum.c	2014-05-19 14:58:48.313044838 +0200
-@@ -892,14 +892,14 @@
- 		}
- 		if (rc == 0) {
- 			if ((address % 1024) == 0) {
--				KfwumShowProgress("Writting Firmware in Flash",
-+				KfwumShowProgress("Writing Firmware in Flash",
- 						address, totalSize);
- 			}
- 			sequenceNumber++;
- 		}
- 	} while ((rc == 0) && (address < totalSize));
- 	if (rc == 0) {
--		KfwumShowProgress("Writting Firmware in Flash",
-+		KfwumShowProgress("Writing Firmware in Flash",
- 				100, 100);
- 	}
- 	return rc;
diff --git a/debian/patches/099_readme_typo b/debian/patches/099_readme_typo
index 732fc43..89fb104 100644
--- a/debian/patches/099_readme_typo
+++ b/debian/patches/099_readme_typo
@@ -1,9 +1,11 @@
 ## 99_readme_typo.dpatch by dann frazier <dannf@hp.com>
 ##
 ## Typo in README. Closes: #508231
---- a/README
-+++ b/README
-@@ -24,7 +24,7 @@
+Index: trunk/README
+===================================================================
+--- trunk.orig/README
++++ trunk/README
+@@ -24,7 +24,7 @@ Background
  ==========
  I originally wrote ipmitool while between projects and employeed at Sun
  Microsystems.  Sun had just embarked on a new line of general-purpose x86
@@ -12,9 +14,11 @@
  It started with an idea that remote chassis power control would be a handy
  feature for my systems in the lab and from there it grew into a multi-
  purpose tool that lots of people found useful.  I decided to release it
---- a/doc/ipmitool.1
-+++ b/doc/ipmitool.1
-@@ -44,7 +44,7 @@
+Index: trunk/doc/ipmitool.1
+===================================================================
+--- trunk.orig/doc/ipmitool.1
++++ trunk/doc/ipmitool.1
+@@ -63,7 +63,7 @@ chassis power control.
  IPMI management of a local system interface requires a compatible IPMI
  kernel driver to be installed and configured.  On Linux this driver is
  called \fIOpenIPMI\fP and it is included in standard distributions.
diff --git a/debian/patches/101_fix_buf_overflow.patch b/debian/patches/101_fix_buf_overflow.patch
index 68f05d8..f479558 100644
--- a/debian/patches/101_fix_buf_overflow.patch
+++ b/debian/patches/101_fix_buf_overflow.patch
@@ -4,17 +4,17 @@ Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Bug: TSOL buffer overflow
 Bug-ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipmitool/+bug/633054
 Forwarded: https://sourceforge.net/p/ipmitool/patches/100/
-Last-Update: 2014-05-18
+Last-Update: 2014-12-01
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/lib/ipmi_tsol.c
 ===================================================================
---- trunk.orig/lib/ipmi_tsol.c	2014-05-18 19:36:46.059192272 +0200
-+++ trunk/lib/ipmi_tsol.c	2014-05-18 19:37:36.028189246 +0200
-@@ -385,7 +385,7 @@
- 	socklen_t mylen;
+--- trunk.orig/lib/ipmi_tsol.c
++++ trunk/lib/ipmi_tsol.c
+@@ -374,7 +374,7 @@ ipmi_tsol_main(struct ipmi_intf *intf, i
  	char *recvip = NULL;
- 	char out_buff[IPMI_BUF_SIZE * 8], in_buff[IPMI_BUF_SIZE];
+ 	char in_buff[IPMI_BUF_SIZE];
+ 	char out_buff[IPMI_BUF_SIZE * 8];
 -	char buff[IPMI_BUF_SIZE + 4];
 +	char buff[IPMI_BUF_SIZE * 8 + 4];
  	int fd_socket, result, i;
diff --git a/debian/patches/112_fix_CVE-2011-4339.patch b/debian/patches/112_fix_CVE-2011-4339.patch
index f67b845..9354c47 100644
--- a/debian/patches/112_fix_CVE-2011-4339.patch
+++ b/debian/patches/112_fix_CVE-2011-4339.patch
@@ -4,14 +4,14 @@ Description: CVE-2011-4339
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651917
 Forwarded: https://sourceforge.net/p/ipmitool/patches/99/
-Last-Update: 2014-05-18
+Last-Update: 2014-12-01
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/lib/helper.c
 ===================================================================
---- trunk.orig/lib/helper.c	2014-05-18 18:50:55.000000000 +0200
-+++ trunk/lib/helper.c	2014-05-18 19:30:41.275908129 +0200
-@@ -657,7 +657,6 @@
+--- trunk.orig/lib/helper.c
++++ trunk/lib/helper.c
+@@ -658,7 +658,6 @@ ipmi_start_daemon(struct ipmi_intf *intf
  #endif
  
  	chdir("/");
diff --git a/debian/patches/115-lib_declarations.patch b/debian/patches/115-lib_declarations.patch
deleted file mode 100644
index 8fc1356..0000000
--- a/debian/patches/115-lib_declarations.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Correct function declarations
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749913
-Last-Update: 2014-05-31
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/lib/ipmi_kontronoem.c
-===================================================================
---- trunk.orig/lib/ipmi_kontronoem.c	2014-03-28 13:36:21.000000000 +0100
-+++ trunk/lib/ipmi_kontronoem.c	2014-05-31 10:25:10.583475442 +0200
-@@ -53,9 +53,9 @@
-                          uint8_t id, uint32_t offset, uint32_t length, 
-                          uint8_t *frubuf);
- extern int write_fru_area(struct ipmi_intf * intf, struct fru_info *fru, 
--                          unsigned char id, unsigned int soffset,  
--                          unsigned int doffset,  unsigned int length, 
--                          unsigned char *pFrubuf);
-+                          uint8_t id, uint16_t soffset,  
-+                          uint16_t doffset,  uint16_t length, 
-+                          uint8_t *pFrubuf);
- 
- extern char * get_fru_area_str(uint8_t * data, uint32_t * offset);
- 
diff --git a/debian/patches/120-Dell-13G.patch b/debian/patches/120-Dell-13G.patch
deleted file mode 100644
index 0f4ef9b..0000000
--- a/debian/patches/120-Dell-13G.patch
+++ /dev/null
@@ -1,401 +0,0 @@
-Description: Add support for Dell 13G server.
- Add support for upcoming Dell PowerEdge 13G server 
- and replace multiple if statments. 
- Based on patch from  SriniG <srinivas_g_gowda@dell.com>
-Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Origin: based on patch from SriniG <srinivas_g_gowda@dell.com>
-Bug: http://sourceforge.net/p/ipmitool/patches/102/
-Bug-debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756555
-Forwarded: http://sourceforge.net/p/ipmitool/patches/102/
-Reviewed-by: 2014-08-07 SriniG <srinivas_g_gowda@dell.com>
-Last-Update: 2014-08-07
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/include/ipmitool/ipmi_delloem.h
-===================================================================
---- trunk.orig/include/ipmitool/ipmi_delloem.h	2014-08-04 17:24:11.291429804 +0200
-+++ trunk/include/ipmitool/ipmi_delloem.h	2014-08-04 17:24:11.279429542 +0200
-@@ -72,6 +72,7 @@
- 
- #define	IDRAC_11G					1
- #define	IDRAC_12G					2
-+#define	IDRAC_13G					3
- // Return Error code for license
- #define	LICENSE_NOT_SUPPORTED		0x6F
- #define	VFL_NOT_LICENSED			0x33
-@@ -184,6 +185,9 @@
- #define IMC_IDRAC_12G_MONOLITHIC 	(uint8_t) (0x10)
- #define IMC_IDRAC_12G_MODULAR 		(uint8_t) (0x11)
- 
-+#define IMC_IDRAC_13G_MONOLITHIC 	(uint8_t) (0x20)
-+#define IMC_IDRAC_13G_MODULAR 		(uint8_t) (0x21)
-+#define IMC_IDRAC_13G_DCS	 		(uint8_t) (0x22)
- 
- 
- typedef struct
-Index: trunk/lib/ipmi_delloem.c
-===================================================================
---- trunk.orig/lib/ipmi_delloem.c	2014-08-04 17:24:11.291429804 +0200
-+++ trunk/lib/ipmi_delloem.c	2014-08-04 17:24:11.279429542 +0200
-@@ -123,6 +123,16 @@
- 
- static int current_arg =0;
- uint8_t iDRAC_FLAG=0;
-+
-+/*
-+ * new flags for
-+ * 11G || 12G || 13G  -> _ALL
-+ * 12G || 13G -> _12_13
-+ *
-+ */
-+uint8_t iDRAC_FLAG_ALL=0;
-+uint8_t iDRAC_FLAG_12_13=0;
-+
- LCD_MODE lcd_mode;
- static uint8_t LcdSupported=0;
- static uint8_t SetLEDSupported=0;
-@@ -358,7 +368,7 @@
- 		lprintf(LOG_ERR, "lcd is not supported on this system.");
- 		return -1;
- 	} else if (strncmp(argv[current_arg], "info\0", 5) == 0) {
--		if ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G)) {
-+		if (iDRAC_FLAG_ALL) {
- 			rc = ipmi_lcd_get_info_wh(intf);
- 		} else {
- 			rc = ipmi_lcd_get_info(intf);
-@@ -392,7 +402,7 @@
- 			}
- 		}
- 		if ((strncmp(argv[current_arg], "mode\0", 5) == 0)
--				&& ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G))) {
-+				&& (iDRAC_FLAG_ALL)) {
- 			current_arg++;
- 			if (argc <= current_arg) {
- 				ipmi_lcd_usage();
-@@ -446,7 +456,7 @@
- 				ipmi_lcd_usage();
- 			}
- 		} else if ((strncmp(argv[current_arg], "lcdqualifier\0", 13) == 0)
--				&& ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G))) {
-+				&& (iDRAC_FLAG_ALL)) {
- 			current_arg++;
- 			if (argc <= current_arg) {
- 				ipmi_lcd_usage();
-@@ -470,7 +480,7 @@
- 				ipmi_lcd_usage();
- 			}
- 		} else if ((strncmp(argv[current_arg], "errordisplay\0", 13) == 0)
--				&& ((iDRAC_FLAG==IDRAC_11G) || (iDRAC_FLAG==IDRAC_12G))) {
-+				&& (iDRAC_FLAG_ALL)) {
- 			current_arg++;
- 			if (argc <= current_arg) {
- 				ipmi_lcd_usage();
-@@ -635,17 +645,33 @@
- 		val2str(rsp->ccode, completion_code_vals));  */
- 		return -1;
- 	}
-+	/*
-+	 * Set the new flags to 0
-+	 */
-+	iDRAC_FLAG_ALL = 0;
-+	iDRAC_FLAG_12_13 = 0;
- 	/* Support the 11G Monolithic, modular, Maisy and Coaster */
- 	if ((IMC_IDRAC_11G_MONOLITHIC == data[10])
- 			|| (IMC_IDRAC_11G_MODULAR == data[10])
- 			|| (IMC_MASER_LITE_BMC == data[10])
- 			|| (IMC_MASER_LITE_NU == data[10])) {
- 		iDRAC_FLAG=IDRAC_11G;
-+		iDRAC_FLAG_ALL = 1;
- 	} else if((IMC_IDRAC_12G_MONOLITHIC == data[10])
- 			|| (IMC_IDRAC_12G_MODULAR == data[10])) {
- 		iDRAC_FLAG = IDRAC_12G;
-+		iDRAC_FLAG_ALL = 1;
-+		iDRAC_FLAG_12_13 = 1;
-+	} else if( (IMC_IDRAC_13G_MONOLITHIC == data[10])
-+			|| (IMC_IDRAC_13G_MODULAR == data[10])
-+			|| (IMC_IDRAC_13G_DCS == data[10]) ) {
-+		iDRAC_FLAG=IDRAC_13G;
-+		iDRAC_FLAG_ALL = 1;
-+		iDRAC_FLAG_12_13 = 1;
- 	} else {
- 		iDRAC_FLAG = 0;
-+		iDRAC_FLAG_ALL = 0;
-+		iDRAC_FLAG_12_13 = 0;
- 	}
- 	IMC_Type = data[10];
- 	return 0;
-@@ -1394,7 +1420,7 @@
- 	lprintf(LOG_NOTICE,
- "");
- 	lprintf(LOG_NOTICE,
--"iDRAC 11g or iDRAC 12g:");
-+"iDRAC 11g or iDRAC 12g or  iDRAC 13g :");
- 	lprintf(LOG_NOTICE,
- "   lcd set {mode}|{lcdqualifier}|{errordisplay}");
- 	lprintf(LOG_NOTICE,
-@@ -1561,7 +1587,9 @@
- 		return -1;
- 	}
- 	if ((IMC_IDRAC_12G_MODULAR == IMC_Type)
--			|| (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)) {
-+			|| (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)
-+			|| (IMC_IDRAC_13G_MODULAR == IMC_Type)
-+			|| (IMC_IDRAC_13G_MONOLITHIC== IMC_Type)) {
- 		/* Get the Chasiss Assigned MAC Addresss for 12g Only */
- 		memcpy(VirtualMacAddress, ((rsp->data) + 1), MACADDRESSLENGH);
- 		for (i = 0; i < MACADDRESSLENGH; i++) {
-@@ -1599,6 +1627,9 @@
- 	} else if ((IMC_IDRAC_12G_MODULAR == IMC_Type)
- 			|| (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)) {
- 		printf("\niDRAC7 MAC Address ");
-+	} else if ((IMC_IDRAC_13G_MODULAR == IMC_Type)
-+			|| (IMC_IDRAC_13G_MONOLITHIC== IMC_Type))	 {
-+			printf ("\niDRAC8 MAC Address ");
- 	} else if ((IMC_MASER_LITE_BMC== IMC_Type)
- 			|| (IMC_MASER_LITE_NU== IMC_Type)) {
- 		printf("\nBMC MAC Address ");
-@@ -1668,6 +1699,9 @@
- 	} else if ((IMC_IDRAC_12G_MODULAR == IMC_Type)
- 			|| (IMC_IDRAC_12G_MONOLITHIC== IMC_Type)) {
- 		printf("\niDRAC7 MAC Address ");
-+	} else if ((IMC_IDRAC_13G_MODULAR == IMC_Type)
-+			|| (IMC_IDRAC_13G_MONOLITHIC== IMC_Type))	 {
-+			printf ("\niDRAC8 MAC Address ");
- 	} else if ((IMC_MASER_LITE_BMC== IMC_Type)
- 			|| (IMC_MASER_LITE_NU== IMC_Type)) {
- 		printf("\n\rBMC MAC Address ");
-@@ -1879,6 +1913,8 @@
- 				|| IMC_IDRAC_11G_MONOLITHIC == IMC_Type)
- 			|| (IMC_IDRAC_12G_MODULAR == IMC_Type
- 				|| IMC_IDRAC_12G_MONOLITHIC == IMC_Type)
-+			|| (IMC_IDRAC_13G_MODULAR == IMC_Type
-+				|| IMC_IDRAC_13G_MONOLITHIC == IMC_Type)
- 			|| (IMC_MASER_LITE_NU == IMC_Type || IMC_MASER_LITE_BMC== IMC_Type)) {
- 		return ipmi_macinfo_11g(intf,NicNum);
- 	} else {
-@@ -1946,7 +1982,7 @@
- 			ipmi_lan_usage();
- 			return -1;
- 		}
--		if (iDRAC_FLAG == IDRAC_12G) {
-+		if (iDRAC_FLAG_12_13)  {
- 			nic_selection = get_nic_selection_mode_12g(intf, current_arg, argv,
- 					nic_set);
- 			if (INVALID == nic_selection) {
-@@ -2063,7 +2099,7 @@
- 	}
- 	if (argv[current_arg] != NULL
- 			&& strncmp(argv[current_arg], "lom1\0", 5) == 0) {
--		if (IMC_IDRAC_12G_MODULAR == IMC_Type) {
-+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) ||  (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
- 			return INVAILD_SHARED_MODE;
- 		}
- 		if (failover) {
-@@ -2082,7 +2118,7 @@
- 		return 0;
- 	} else if (argv[current_arg] != NULL
- 			&& strncmp(argv[current_arg], "lom2\0", 5) == 0) {
--		if (IMC_IDRAC_12G_MODULAR == IMC_Type) {
-+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) ||  (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
- 			return INVAILD_SHARED_MODE;
- 		}
- 		if (failover) {
-@@ -2101,7 +2137,7 @@
- 		return 0;
- 	} else if (argv[current_arg] != NULL
- 			&& strncmp(argv[current_arg], "lom3\0", 5) == 0) {
--		if (IMC_IDRAC_12G_MODULAR == IMC_Type) {
-+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) ||  (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
- 			return INVAILD_SHARED_MODE;
- 		}
- 		if (failover) {
-@@ -2120,7 +2156,7 @@
- 		return 0;
- 	} else if (argv[current_arg] != NULL
- 			&& strncmp(argv[current_arg], "lom4\0", 5) == 0) {
--		if (IMC_IDRAC_12G_MODULAR == IMC_Type) {
-+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) ||  (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
- 			return INVAILD_SHARED_MODE;
- 		}
- 		if (failover) {
-@@ -2139,7 +2175,7 @@
- 		return 0;
- 	} else if (failover && argv[current_arg] != NULL
- 			&& strncmp(argv[current_arg], "none\0", 5) == 0) {
--		if (IMC_IDRAC_12G_MODULAR == IMC_Type) {
-+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) ||  (IMC_IDRAC_13G_MODULAR == IMC_Type) ) {
- 			return INVAILD_SHARED_MODE;
- 		}
- 		if (failover) {
-@@ -2159,7 +2195,7 @@
- 	current_arg++;
- 	if (failover && argv[current_arg] != NULL
- 			&& strncmp(argv[current_arg], "loms\0", 5) == 0) {
--		if (IMC_IDRAC_12G_MODULAR == IMC_Type) {
-+		if ((IMC_IDRAC_12G_MODULAR == IMC_Type) ||  (IMC_IDRAC_13G_MODULAR == IMC_Type)) {
- 			return INVAILD_SHARED_MODE;
- 		}
- 		if (nic_set[0] == 1) {
-@@ -2242,7 +2278,8 @@
- 		lprintf(LOG_ERR, "Error in setting nic selection");
- 		return -1;
- 	} else if( (nic_selection[0] == 1)
--			&& ((iDRAC_FLAG == IDRAC_12G) && (rsp->ccode == LICENSE_NOT_SUPPORTED))) {
-+			&& (( iDRAC_FLAG_12_13 )
-+			&& (rsp->ccode == LICENSE_NOT_SUPPORTED))) {
- 		/* Check license only for setting the dedicated nic. */
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
-@@ -2297,7 +2334,7 @@
- 	input_length = 0;
- 	req.msg.netfn = DELL_OEM_NETFN;
- 	req.msg.lun = 0;
--	if (iDRAC_FLAG == IDRAC_12G) {
-+	if( iDRAC_FLAG_12_13 ) {
- 		req.msg.cmd = GET_NIC_SELECTION_12G_CMD;
- 	} else {
- 		req.msg.cmd = GET_NIC_SELECTION_CMD;
-@@ -2314,7 +2351,7 @@
- 		return -1;
- 	}
- 	nic_selection = rsp->data[0];
--	if (iDRAC_FLAG == IDRAC_12G) {
-+	if( iDRAC_FLAG_12_13 ) {
- 		nic_selection_failover = rsp->data[1];
- 		if ((nic_selection < 6) && (nic_selection > 0)
- 				&& (nic_selection_failover < 7)) {
-@@ -2413,7 +2450,7 @@
- 	lprintf(LOG_NOTICE,
- "      sets the NIC Selection Mode :");
- 	lprintf(LOG_NOTICE,
--"          on iDRAC12g :");
-+"          on iDRAC12g OR iDRAC13g  :");
- 	lprintf(LOG_NOTICE,
- "              dedicated, shared with lom1, shared with lom2,shared with lom3,shared");
- 	lprintf(LOG_NOTICE,
-@@ -2433,7 +2470,7 @@
- 	lprintf(LOG_NOTICE,
- "   lan get ");
- 	lprintf(LOG_NOTICE,
--"          on iDRAC12g :");
-+"          on iDRAC12g or iDRAC13g  :");
- 	lprintf(LOG_NOTICE,
- "              returns the current NIC Selection Mode (dedicated, shared with lom1, shared");
- 	lprintf(LOG_NOTICE,
-@@ -2662,7 +2699,7 @@
- 	if (rsp == NULL) {
- 		lprintf(LOG_ERR, "Error getting powercap status");
- 		return -1;
--	} else if((iDRAC_FLAG == IDRAC_12G) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
-+	} else if(( iDRAC_FLAG_12_13 ) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
- 		return -1; /* Return Error as unlicensed */
-@@ -2713,7 +2750,7 @@
- 	if (rsp == NULL) {
- 		lprintf(LOG_ERR, "Error setting powercap status");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
-+	} else if ((iDRAC_FLAG_12_13) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
- 		return -1; /* return unlicensed Error code */
-@@ -2807,7 +2844,7 @@
- 		return -1;
- 	}
- 
--	if((iDRAC_FLAG == IDRAC_12G) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
-+	if((iDRAC_FLAG_12_13) && (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
- 		return -1;
-@@ -2910,7 +2947,7 @@
- 	if (rsp == NULL) {
- 		lprintf(LOG_ERR, "Error clearing power values.");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G)
-+	} else if ((iDRAC_FLAG_12_13)
- 			&& (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
-@@ -2988,7 +3025,7 @@
- 	if (rsp == NULL) {
- 		lprintf(LOG_ERR, "Error getting power headroom status");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G)
-+	} else if ((iDRAC_FLAG_12_13)
- 			&& (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
-@@ -3122,7 +3159,7 @@
- 	if (rsp == NULL) {
- 		lprintf(LOG_ERR, "Error getting instantaneous power consumption data .");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G)
-+	} else if ((iDRAC_FLAG_12_13)
- 			&& (rsp->ccode == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
-@@ -3215,7 +3252,7 @@
- 		lprintf(LOG_ERR,
- 				"Error getting average power consumption history data.");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G) &&  (rc == LICENSE_NOT_SUPPORTED)) {
-+	} else if ((iDRAC_FLAG_12_13) &&  (rc == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
- 		return -1;
-@@ -3264,7 +3301,7 @@
- 	if (rc < 0) {
- 		lprintf(LOG_ERR, "Error getting  peak power consumption history data.");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) {
-+	} else if ((iDRAC_FLAG_12_13) && (rc == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
- 		return -1;
-@@ -3321,7 +3358,7 @@
- 	if (rc < 0) {
- 		lprintf(LOG_ERR, "Error getting  peak power consumption history data .");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G) &&  (rc == LICENSE_NOT_SUPPORTED)) {
-+	} else if ((iDRAC_FLAG_12_13) &&  (rc == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
- 		return -1;
-@@ -3518,7 +3555,7 @@
- 	if (rc < 0) {
- 		lprintf(LOG_ERR, "Error getting power cap.");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) {
-+	} else if ((iDRAC_FLAG_12_13) && (rc == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
- 		return -1;
-@@ -3618,7 +3655,7 @@
- 	if (rc < 0) {
- 		lprintf(LOG_ERR, "Error getting power cap.");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) {
-+	} else if ((iDRAC_FLAG_12_13) && (rc == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
- 		return -1;
-@@ -3698,7 +3735,7 @@
- 	if (rc < 0) {
- 		lprintf(LOG_ERR, "Error setting power cap");
- 		return -1;
--	} else if ((iDRAC_FLAG == IDRAC_12G) && (rc == LICENSE_NOT_SUPPORTED)) {
-+	} else if ((iDRAC_FLAG_12_13) && (rc == LICENSE_NOT_SUPPORTED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
- 		return -1;
-@@ -3860,7 +3897,7 @@
- 
- 	sdcardinfoblock = (IPMI_DELL_SDCARD_INFO *) (void *) rsp->data;
- 
--	if ((iDRAC_FLAG == IDRAC_12G)
-+	if ((iDRAC_FLAG_12_13)
- 			&& (sdcardinfoblock->vflashcompcode == VFL_NOT_LICENSED)) {
- 		lprintf(LOG_ERR,
- 				"FM001 : A required license is missing or expired");
diff --git a/debian/patches/series b/debian/patches/series
index 1239814..db22c50 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-120-Dell-13G.patch
-115-lib_declarations.patch
-097-source_typo.patch
 098-manpage_typo.patch
 101_fix_buf_overflow.patch
 112_fix_CVE-2011-4339.patch
diff --git a/debian/rules b/debian/rules
index f2c9474..b2ed159 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,9 @@ export DH_OPTIONS
 # Hardening
 #
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
-
 
 %:
-	dh $@ --with systemd
+	dh $@ --with systemd,autotools-dev
 
 override_dh_auto_install:
 	dh_auto_install
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index 22a4de9..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1,2 +0,0 @@
-compression = xz
-compression-level = 9
diff --git a/debian/watch b/debian/watch
index d6990ab..54a846e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
-opts=uversionmangle=s/\.(tar.*|tgz|zip|gz|bz2)$// \
-http://sf.net/ipmitool/ipmitool-?_?([\d+\.]+|\d+)\.(tar.*|tgz|zip|gz|bz2) debian uupdate
+opts=uversionmangle=s/\.(tar.*|xz|tgz|zip|gz|bz2)$// \
+http://sf.net/ipmitool/ipmitool-?_?([\d+\.]+|\d+)\.(tar.*|xz|tgz|zip|gz|bz2) debian uupdate
author	Jörg Frings-Fürst <debian@jff-webhosting.net>	2014-12-02 08:52:40 +0100
committer	Jörg Frings-Fürst <debian@jff-webhosting.net>	2014-12-02 08:52:40 +0100
commit	af16369cd594e64abec0d662f0fdbfe487c212d5 (patch)
tree	6ad054d0ac2d95f392cf3d4994b8d204e3c2c4bf
parent	096a497b36f208fb68a12c7ae7576ca0a69f919d (diff)