Refresh patches

7 files changed, 34 insertions, 27 deletions

diff --git a/debian/changelog b/debian/changelog
index 1d6f9bb..ee5938d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ipmitool (1.8.16-1) UNRELEASED; urgency=medium
+
+  * New upstram release.
+  * Refresh patches.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Sat, 20 Feb 2016 02:13:33 +0100
+
 ipmitool (1.8.15-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/101_fix_buf_overflow.patch b/debian/patches/0100-fix_buf_overflow.patch
index f479558..174d205 100644
--- a/debian/patches/101_fix_buf_overflow.patch
+++ b/debian/patches/0100-fix_buf_overflow.patch
@@ -11,7 +11,7 @@ Index: trunk/lib/ipmi_tsol.c
 ===================================================================
 --- trunk.orig/lib/ipmi_tsol.c
 +++ trunk/lib/ipmi_tsol.c
-@@ -374,7 +374,7 @@ ipmi_tsol_main(struct ipmi_intf *intf, i
+@@ -375,7 +375,7 @@ ipmi_tsol_main(struct ipmi_intf *intf, i
  	char *recvip = NULL;
  	char in_buff[IPMI_BUF_SIZE];
  	char out_buff[IPMI_BUF_SIZE * 8];
diff --git a/debian/patches/112_fix_CVE-2011-4339.patch b/debian/patches/0500-fix_CVE-2011-4339.patch
index 9354c47..48bfe8c 100644
--- a/debian/patches/112_fix_CVE-2011-4339.patch
+++ b/debian/patches/0500-fix_CVE-2011-4339.patch
@@ -11,7 +11,7 @@ Index: trunk/lib/helper.c
 ===================================================================
 --- trunk.orig/lib/helper.c
 +++ trunk/lib/helper.c
-@@ -658,7 +658,6 @@ ipmi_start_daemon(struct ipmi_intf *intf
+@@ -659,7 +659,6 @@ ipmi_start_daemon(struct ipmi_intf *intf
  #endif
  
  	chdir("/");
diff --git a/debian/patches/096-manpage_longlines.patch b/debian/patches/0600-manpage_longlines.patch
index 4acf71a..8fae0a9 100644
--- a/debian/patches/096-manpage_longlines.patch
+++ b/debian/patches/0600-manpage_longlines.patch
@@ -7,9 +7,9 @@ Last-Update: 2014-05-20
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/doc/ipmitool.1
 ===================================================================
---- trunk.orig/doc/ipmitool.1	2014-05-27 19:38:41.000000000 +0200
-+++ trunk/doc/ipmitool.1	2014-05-27 19:38:41.000000000 +0200
-@@ -1034,7 +1034,7 @@
+--- trunk.orig/doc/ipmitool.1
++++ trunk/doc/ipmitool.1
+@@ -1035,7 +1035,7 @@ Display point to point physical connecti
        AMC slot B2 topology:
           Port 0 =====> On Carrier Device ID 0, Port 3
           Port 2 =====> AMC slot B1, Port 2
@@ -18,7 +18,7 @@ Index: trunk/doc/ipmitool.1
     From Carrier file: carrierfru
        On Carrier Device ID 0 topology:
           Port 0 =====> AMC slot B1, Port 4
-@@ -1090,7 +1090,7 @@
+@@ -1091,7 +1091,7 @@ and an AMC module or between 2 AMC modul
      \-Link Type: AMC.2 Ethernet
      \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
      \-Link Group ID: 0 || Link Asym. Match: exact match
@@ -27,7 +27,7 @@ Index: trunk/doc/ipmitool.1
    AMC slot B1 port 1 ==> On-Carrier Device 0 port 12
     Matching Result
     - From On-Carrier Device ID 0
-@@ -1103,7 +1103,7 @@
+@@ -1104,7 +1104,7 @@ and an AMC module or between 2 AMC modul
      \-Link Type: AMC.2 Ethernet
      \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
      \-Link Group ID: 0 || Link Asym. Match: exact match
@@ -36,7 +36,7 @@ Index: trunk/doc/ipmitool.1
   On-Carrier Device vs AMC slot A2
    AMC slot A2 port 0 ==> On-Carrier Device 0 port 3
     Matching Result
-@@ -1117,7 +1117,7 @@
+@@ -1118,7 +1118,7 @@ and an AMC module or between 2 AMC modul
      \-Link Type: AMC.2 Ethernet
      \-Link Type extension: 1000BASE-BX (SerDES Gigabit) Ethernet link
      \-Link Group ID: 0 || Link Asym. Match: exact match
@@ -45,7 +45,7 @@ Index: trunk/doc/ipmitool.1
   AMC slot B1 vs AMC slot A2
    AMC slot A2 port 2 ==> AMC slot B1 port 2
     Matching Result
-@@ -1131,7 +1131,7 @@
+@@ -1132,7 +1132,7 @@ and an AMC module or between 2 AMC modul
      \-Link Type: AMC.3 Storage
      \-Link Type extension: Serial Attached SCSI (SAS/SATA)
      \-Link Group ID: 0 || Link Asym. Match: FC or SAS interface {exact match}
diff --git a/debian/patches/098-manpage_typo.patch b/debian/patches/0605-manpage_typo.patch
index c667278..982036c 100644
--- a/debian/patches/098-manpage_typo.patch
+++ b/debian/patches/0605-manpage_typo.patch
@@ -5,9 +5,9 @@ Last-Update: 2014-05-19
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 Index: trunk/doc/ipmitool.1
 ===================================================================
---- trunk.orig/doc/ipmitool.1	2014-05-19 14:51:15.664997239 +0200
-+++ trunk/doc/ipmitool.1	2014-05-19 14:54:07.340072131 +0200
-@@ -10,47 +10,47 @@
+--- trunk.orig/doc/ipmitool.1
++++ trunk/doc/ipmitool.1
+@@ -10,47 +10,47 @@ ipmitool [ <options> ] <command> [ <sub-
  Any recognized option is accepted. Conditional options may be ignored or it's usage postponed until shell or exec processes relevant command.
  .br
  
@@ -73,7 +73,7 @@ Index: trunk/doc/ipmitool.1
  
  
  .SH "DESCRIPTION"
-@@ -120,7 +120,7 @@
+@@ -120,7 +120,7 @@ option is absent, or if password_file is
  will default to NULL.
  .TP 
  \fB\-g\fR
@@ -82,7 +82,7 @@ Index: trunk/doc/ipmitool.1
  .TP 
  \fB\-h\fR
  Get basic usage help from the command line.
-@@ -151,7 +151,7 @@
+@@ -151,7 +151,7 @@ combined with \fI-t target address\fP.
  .TP 
  \fB\-m\fR <\fIlocal_address\fP>
  Set the local IPMB address.  The local address defaults to 0x20
@@ -91,7 +91,7 @@ Index: trunk/doc/ipmitool.1
  There should be no need to change the local address for normal operation.
  .TP 
  \fB\-N\fR <\fIsec\fP>
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ Command \fIraw\fP uses fixed value of on
  Command \fIhpm\fP uses fixed value of 10 retries.
  .TP 
  \fB\-s\fR
@@ -100,7 +100,7 @@ Index: trunk/doc/ipmitool.1
  .TP 
  \fB\-S\fR <\fIsdr_cache_file\fP>
  Use local file for remote SDR cache.  Using a local SDR cache
-@@ -223,7 +223,7 @@
+@@ -223,7 +223,7 @@ Display version information.
  \fB\-y\fR <\fIhex key\fP>
  Use supplied Kg key for IPMIv2.0 authentication. The key is expected in
  hexadecimal format and can be used to specify keys with non-printable
@@ -109,7 +109,7 @@ Index: trunk/doc/ipmitool.1
  equivalent.
  The default is not to use any Kg key.
  .TP 
-@@ -1051,7 +1051,7 @@
+@@ -1052,7 +1052,7 @@ Display point to point physical connecti
  \fIpower\fP <\fBxx=filename1\fR> <\fBxx=filename2\fR> \fB...\fr
  .br
  
@@ -118,7 +118,7 @@ Index: trunk/doc/ipmitool.1
  .TP
  \fIall\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr
  .br
-@@ -1063,7 +1063,7 @@
+@@ -1064,7 +1064,7 @@ modules.
  .TP
  \fIfrushow\fP <\fBxx=filename\fR>
  .br
@@ -127,7 +127,7 @@ Index: trunk/doc/ipmitool.1
  more display information.
  
  .RE
-@@ -1081,56 +1081,56 @@
+@@ -1082,56 +1082,56 @@ and an AMC module or between 2 AMC modul
    AMC slot B1 port 0 ==> On-Carrier Device 0 port 16
     Matching Result
     - From On-Carrier Device ID 0
@@ -216,7 +216,7 @@ Index: trunk/doc/ipmitool.1
   *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
  .TP
  \fIunmatch\fP <\fBxx=filename\fR> <\fBxx=filename\fR> \fB...\fr
-@@ -2981,7 +2981,7 @@
+@@ -3269,7 +3269,7 @@ I2C Master Write\-Read IPMI command.
  
  Execute the service processor command line interface commands.
  Without any command string, an interactive session is started
@@ -225,7 +225,7 @@ Index: trunk/doc/ipmitool.1
  command string is specified, the command string is executed
  on the service processor and the connection is closed.
  .TP
-@@ -3376,7 +3376,7 @@
+@@ -3664,7 +3664,7 @@ encryption algorightms.
  The ipmitool \fIfree\fP interface utilizes the FreeIPMI libfreeipmi
  drivers.  
  .LP
@@ -234,7 +234,7 @@ Index: trunk/doc/ipmitool.1
  .PP
  ipmitool \fB\-I\fR \fIfree\fP <\fIcommand\fP>
  
-@@ -3386,7 +3386,7 @@
+@@ -3674,7 +3674,7 @@ ipmitool \fB\-I\fR \fIfree\fP <\fIcomman
  The ipmitool \fIimb\fP interface supports the Intel IMB (Intel
  Inter-module Bus) Interface through the /dev/imb device.  
  .LP
diff --git a/debian/patches/099_readme_typo b/debian/patches/0610-readme_typo.patch
index 89fb104..89fb104 100644
--- a/debian/patches/099_readme_typo
+++ b/debian/patches/0610-readme_typo.patch
diff --git a/debian/patches/series b/debian/patches/series
index db22c50..48d1d23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
-098-manpage_typo.patch
-101_fix_buf_overflow.patch
-112_fix_CVE-2011-4339.patch
-099_readme_typo
-096-manpage_longlines.patch
+0605-manpage_typo.patch
+0100-fix_buf_overflow.patch
+0500-fix_CVE-2011-4339.patch
+0610-readme_typo.patch
+0600-manpage_longlines.patch