release 2.9.4-1debian/2.9.4-1

7 files changed, 246 insertions, 4 deletions

diff --git a/debian/README.source b/debian/README.source
index 46283aa..4bc7a31 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -5,4 +5,9 @@ ipmiutil for Debian
     parameter enable-landesk=yes does not work:
       ipmiapi not found
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 26 May 2014 13:11:06 +0200
+- copyright
+    Files: hpiutil/SaHpi.*
+      On the site http://www.saforum.org/Page/16627~375335 the file are
+      published under the Artistic License 2.0.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 29 Oct 2014 16:12:18 +0100
diff --git a/debian/changelog b/debian/changelog
index 5824248..431ab37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ ipmiutil (2.9.4-1) unstable; urgency=low
 
   * Initial release (Closes: #753881).
 
- -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Mon, 26 May 2014 13:11:06 +0200
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 29 Oct 2014 16:12:18 +0100
diff --git a/debian/control b/debian/control
index 4294212..9570bf7 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends:
  dh-systemd (>= 1.5),
  libfreeipmi-dev (>= 1.1.5) | libopenipmi-dev (>=2.0.18),
  libssl-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: https://sourceforge.net/projects/ipmiutil/
 Vcs-Git: git://anonscm.debian.org/collab-maint/ipmiutil.git
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/ipmiutil.git
diff --git a/debian/copyright b/debian/copyright
index 87740a2..0389a7f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,6 +25,182 @@ Files: util/md5.c
 Copyright: 1999-2002 Aladdin Enterprises
 License: Zlib
 
+Files: hpiutil/SaHpi.*
+Copyright: 2002-2004 Service Availability(TM) Forum.
+License: Artistic-2.0
+
+License: Artistic-2.0
+ Everyone is permitted to copy and distribute verbatim copies of this license
+ document, but changing it is not allowed.
+ .
+ Preamble
+ .
+ This license establishes the terms under which a given free software Package
+ may be copied, modified, distributed, and/or redistributed. The intent is that
+ the Copyright Holder maintains some artistic control over the development of
+ that Package while still keeping the Package available as open source and free
+ software.
+ .
+ You are always permitted to make arrangements wholly outside of this license
+ directly with the Copyright Holder of a given Package. If the terms of this
+ license do not permit the full use that you propose to make of the Package,
+ you should contact the Copyright Holder and seek a different licensing
+ arrangement.
+ .
+ Definitions
+ .
+ "Copyright Holder" means the individual(s) or organization(s) named in the
+ copyright notice for the entire Package.
+ .
+ "Contributor" means any party that has contributed code or other material to
+ the Package, in accordance with the Copyright Holder's procedures.
+ .
+ "You" and "your" means any person who would like to copy, distribute, or
+ modify the Package.
+ .
+ "Package" means the collection of files distributed by the Copyright Holder,
+ and derivatives of that collection and/or of those files. A given Package may
+ consist of either the Standard Version, or a Modified Version.
+ .
+ "Distribute" means providing a copy of the Package or making it accessible to
+ anyone else, or in the case of a company or organization, to others outside of
+ your company or organization.
+ .
+ "Distributor Fee" means any fee that you charge for Distributing this Package
+ or providing support for this Package to another party. It does not mean
+ licensing fees.
+ .
+ "Standard Version" refers to the Package if it has not been modified, or has
+ been modified only in ways explicitly requested by the Copyright Holder.
+ .
+ "Modified Version" means the Package, if it has been changed, and such changes
+ were not explicitly requested by the Copyright Holder.
+ .
+ "Original License" means this Artistic License as Distributed with the
+ Standard Version of the Package, in its current version or as it may be
+ modified by The Perl Foundation in the future.
+ .
+ "Source" form means the source code, documentation source, and configuration
+ files for the Package.
+ .
+ "Compiled" form means the compiled bytecode, object code, binary, or any other
+ form resulting from mechanical transformation or translation of the Source form.
+ .
+ Permission for Use and Modification Without Distribution
+ .
+ (1) You are permitted to use the Standard Version and create and use Modified
+ Versions for any purpose without restriction, provided that you do not
+ Distribute the Modified Version.
+ .
+ Permissions for Redistribution of the Standard Version
+ .
+ (2) You may Distribute verbatim copies of the Source form of the Standard
+ Version of this Package in any medium without restriction, either gratis or
+ for a Distributor Fee, provided that you duplicate all of the original
+ copyright notices and associated disclaimers. At your discretion, such
+ verbatim copies may or may not include a Compiled form of the Package.
+ .
+ (3) You may apply any bug fixes, portability changes, and other modifications
+ made available from the Copyright Holder. The resulting Package will still be
+ considered the Standard Version, and as such will be subject to the Original
+ License.
+ .
+ Distribution of Modified Versions of the Package as Source
+ .
+ (4) You may Distribute your Modified Version as Source (either gratis or for a
+ Distributor Fee, and with or without a Compiled form of the Modified Version)
+ provided that you clearly document how it differs from the Standard Version,
+ including, but not limited to, documenting any non-standard features,
+ executables, or modules, and provided that you do at least ONE of the
+ following:
+ .
+ (a) make the Modified Version available to the Copyright Holder of the
+ Standard Version, under the Original License, so that the Copyright Holder may
+ include your modifications in the Standard Version.
+ (b) ensure that installation of your Modified Version does not prevent the
+ user installing or running the Standard Version. In addition, the Modified
+ Version must bear a name that is different from the name of the Standard
+ Version.
+ (c) allow anyone who receives a copy of the Modified Version to make the
+ Source form of the Modified Version available to others under
+ (i) the Original License or
+ (ii) a license that permits the licensee to freely copy, modify and
+ redistribute the Modified Version using the same licensing terms that apply to
+ the copy that the licensee received, and requires that the Source form of the
+ Modified Version, and of any works derived from it, be made freely available
+ in that license fees are prohibited but Distributor Fees are allowed.
+ .
+ Distribution of Compiled Forms of the Standard Version or Modified Versions
+ without the Source
+ .
+ (5) You may Distribute Compiled forms of the Standard Version without the
+ Source, provided that you include complete instructions on how to get the
+ Source of the Standard Version. Such instructions must be valid at the time of
+ your distribution. If these instructions, at any time while you are carrying
+ out such distribution, become invalid, you must provide new instructions on
+ demand or cease further distribution. If you provide valid instructions or
+ cease distribution within thirty days after you become aware that the
+ instructions are invalid, then you do not forfeit any of your rights under
+ this license.
+ .
+ (6) You may Distribute a Modified Version in Compiled form without the Source,
+ provided that you comply with Section 4 with respect to the Source of the
+ Modified Version.
+ .
+ Aggregating or Linking the Package
+ .
+ (7) You may aggregate the Package (either the Standard Version or Modified
+ Version) with other packages and Distribute the resulting aggregation provided
+ that you do not charge a licensing fee for the Package. Distributor Fees are
+ permitted, and licensing fees for other components in the aggregation are
+ permitted. The terms of this license apply to the use and Distribution of the
+ Standard or Modified Versions as included in the aggregation.
+ .
+ (8) You are permitted to link Modified and Standard Versions with other works,
+ to embed the Package in a larger work of your own, or to build stand-alone
+ binary or bytecode versions of applications that include the Package, and
+ Distribute the result without restriction, provided the result does not expose
+ a direct interface to the Package.
+ .
+ Items That are Not Considered Part of a Modified Version
+ .
+ (9) Works (including, but not limited to, modules and scripts) that merely
+ extend or make use of the Package, do not, by themselves, cause the Package to
+ be a Modified Version. In addition, such works are not considered parts of the
+ Package itself, and are not subject to the terms of this license.
+ .
+ General Provisions
+ .
+ (10) Any use, modification, and distribution of the Standard or Modified
+ Versions is governed by this Artistic License. By using, modifying or
+ distributing the Package, you accept this license. Do not use, modify, or
+ distribute the Package, if you do not accept this license.
+ .
+ (11) If your Modified Version has been derived from a Modified Version made by
+ someone other than you, you are nevertheless required to ensure that your
+ Modified Version complies with the requirements of this license.
+ .
+ (12) This license does not grant you the right to use any trademark, service
+ mark, tradename, or logo of the Copyright Holder.
+ .
+ (13) This license includes the non-exclusive, worldwide, free-of-charge patent
+ license to make, have made, use, offer to sell, sell, import and otherwise
+ transfer the Package with respect to any patent claims licensable by the
+ Copyright Holder that are necessarily infringed by the Package. If you
+ institute patent litigation (including a cross-claim or counterclaim) against
+ any party alleging that the Package constitutes direct or contributory patent
+ infringement, then this Artistic License to you shall terminate on the date
+ that such litigation is filed.
+ .
+ (14) Disclaimer of Warranty:
+ THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS' AND
+ WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE
+ DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW,
+ NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE
+ PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 License: BSD-3-clause
  All rights reserved.
  .
diff --git a/debian/patches/100-out-of-bounds.patch b/debian/patches/100-out-of-bounds.patch
new file mode 100644
index 0000000..19ba67b
--- /dev/null
+++ b/debian/patches/100-out-of-bounds.patch
@@ -0,0 +1,61 @@
+Description: prevent out-of-bounds
+Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
+Forwarded: https://sourceforge.net/p/ipmiutil/mailman/ipmiutil-developers/?viewmonth=201410
+Last-Update: 2014-10-29
+---
+Index: trunk/util/ievents.c
+===================================================================
+--- trunk.orig/util/ievents.c
++++ trunk/util/ievents.c
+@@ -193,10 +193,10 @@ static const char *sensor_types[NSTYPES]
+ /* 2Eh */ "ME"    /* 0xDC == ME Node Manager */
+ };
+ 
+-#define NFWERRS  15
++#define NFWERRS  14
+ static struct {    /* See Table 36-3, type 0Fh, offset 00h */
+   int code; char *msg; 
+-  } fwerrs[NFWERRS] = {
++  } fwerrs[NFWERRS + 1] = {
+  { 0x00, "Unspecified"},
+  { 0x01, "No system memory"},
+  { 0x02, "No usable memory"},
+@@ -214,10 +214,10 @@ static struct {    /* See Table 36-3, ty
+  { 0x0E, "Reserved" }
+ };
+ 
+-#define NFWSTAT  27
++#define NFWSTAT  26
+ static struct {    /* See Table 36-3, type 0Fh, offset 01h & 02h */
+   int code; char *msg; 
+-  } fwstat[NFWSTAT] = {
++  } fwstat[NFWSTAT + 1] = {
+  { 0x00, "Unspecified"},
+  { 0x01, "Memory init"},
+  { 0x02, "Hard disk init"},
+Index: trunk/util/ifirewall.h
+===================================================================
+--- trunk.orig/util/ifirewall.h
++++ trunk/util/ifirewall.h
+@@ -82,7 +82,7 @@ struct lun_netfn_support {
+ };
+ struct lun_support {
+ 	unsigned char support;
+-	struct lun_netfn_support netfn[MAX_NETFN_PAIR];
++	struct lun_netfn_support netfn[MAX_NETFN];
+ };
+ struct bmc_fn_support {
+ 	struct lun_support lun[MAX_LUN];
+Index: trunk/util/iconfig.c
+===================================================================
+--- trunk.orig/util/iconfig.c
++++ trunk/util/iconfig.c
+@@ -1765,7 +1765,7 @@ int SerialIsOptional(int bparam)
+    int optvals[9] = { 5, 9, 10, 11, 12, 13, 14, 20, 21 };
+    int rv = 0;
+    int i;
+-   for (i = 0; i < sizeof(optvals); i++) {
++   for (i = 0; i < (sizeof(optvals) / sizeof(int)); i++) {
+       if (optvals[i] == bparam) { rv = 1; break; }
+    }
+    return(rv);
diff --git a/debian/patches/series b/debian/patches/series
index 9f3fe5c..618af75 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+100-out-of-bounds.patch
 005-init.patch
 003-typo-man.patch
diff --git a/debian/rules b/debian/rules
index 39e135d..6356e68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-
 %:
 	dh $@  --with autotools-dev --with systemd