[Pkg-ofed-commits] [ibutils] 05/08: sync with upstream
Ana Beatriz Guerrero López
ana at moszumanska.debian.org
Tue Jul 1 14:26:43 UTC 2014
This is an automated email from the git hooks/post-receive script.
ana pushed a commit to branch master
in repository ibutils.
commit 4e4d916df7f209bad142b45cea9b4b607d186e15
Author: Ana Guerrero López <ana at ekaia.org>
Date: Tue Jul 1 15:18:56 2014 +0200
sync with upstream
---
debian/changelog | 3 +++
debian/patches/git-05a9d1a.patch | 24 ++++++++++++++++++++
debian/patches/git-bd7e502.patch | 47 ++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 2 ++
4 files changed, 76 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 8c7da2c..00112fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ ibutils (1.5.7-2) UNRELEASED; urgency=medium
- Add build depend on dpkg-dev (>= 1.16.0).
- Update debian/rules to find multiarch tk-lib.
Thanks to Sergei Golovan. (Closes: #724998)
+ * Sync with upstream. They have released two new versions with the same
+ version number but adding two commits. Add patches with these commits:
+ git-05a9d1a.patch and git-bd7e502.patch.
* Remove all current Uploaders, they're welcome back anytime. Add myself
to Uploaders.
* Update Homepage.
diff --git a/debian/patches/git-05a9d1a.patch b/debian/patches/git-05a9d1a.patch
new file mode 100644
index 0000000..affa0bc
--- /dev/null
+++ b/debian/patches/git-05a9d1a.patch
@@ -0,0 +1,24 @@
+commit 05a9d1a0c235410cc9d8fcb00e1827697bc5c9ac
+Author: Aviad Yehezkel <aviadye at mellanox.co.il>
+Date: Thu Jul 28 11:39:55 2011 +0300
+
+ Fixed compilation problem becuase set_link_speed_sup function not exists anymore.
+
+ This function not exists anymore because the field is RO.
+
+ Signed-off-by: Aviad Yehezkel <aviadye at mellanox.co.il>
+ Signed-off-by: Yevgeny Kliteynik <kliteyn at dev.mellanox.co.il>
+
+diff --git a/ibmgtsim/src/sma.cpp b/ibmgtsim/src/sma.cpp
+index 58c8d7d..be9f90c 100644
+--- a/ibmgtsim/src/sma.cpp
++++ b/ibmgtsim/src/sma.cpp
+@@ -490,7 +490,7 @@ void IBMSSma::initPortInfo()
+ }
+ // LinkSpeedSupported and PortState
+ ib_port_info_set_port_state( &tmpPortInfo, IB_LINK_INIT);
+- ib_port_info_set_link_speed_sup( linkSpeed, &tmpPortInfo);
++ tmpPortInfo.state_info1 |= (tmpPortInfo.state_info1 & 0x0f) | (linkSpeed << 4);
+ // LinkSpeedEnabled and LinkSpeedActive
+ tmpPortInfo.link_speed = linkSpeed | (pNodePortData->speed << 4);
+
diff --git a/debian/patches/git-bd7e502.patch b/debian/patches/git-bd7e502.patch
new file mode 100644
index 0000000..9e1c876
--- /dev/null
+++ b/debian/patches/git-bd7e502.patch
@@ -0,0 +1,47 @@
+commit bd7e50228316124502505599009048d79b9bfdb6
+Author: Daniel Klein <danielk at mellanox.com>
+Date: Wed Mar 19 18:59:09 2014 +0200
+
+ ibutils\ibis: fix ibis_get_local_ports_info uninitialized variable
+
+ Initialize attr_array before calling osm_vendor_get_all_port_attr
+
+ Signed-off-by: Eitan Zahavi <eitan at mellanox.co.il>
+ Signed-off-by: Daniel Klein <danielk at mellanox.com>
+
+diff --git a/ibis/src/ibis.i b/ibis/src/ibis.i
+index 8fc4440..28a0912 100644
+--- a/ibis/src/ibis.i
++++ b/ibis/src/ibis.i
+@@ -385,6 +385,7 @@ ibisp_is_debug(void)
+ static char res[128];
+ Tcl_Obj *p_obj;
+
++ memset(attr_array, 0, MAX_LOCAL_IBPORTS*sizeof(ib_port_attr_t));
+ if (!IbisObj.initialized)
+ {
+ Tcl_SetStringObj(
+diff --git a/ibis/src/ibis_wrap.c b/ibis/src/ibis_wrap.c
+index 5098c2a..ee97601 100644
+--- a/ibis/src/ibis_wrap.c
++++ b/ibis/src/ibis_wrap.c
+@@ -3209,6 +3209,7 @@ typedef struct {
+ static char res[128];
+ Tcl_Obj *p_obj;
+
++ memset(attr_array, 0, MAX_LOCAL_IBPORTS*sizeof(ib_port_attr_t));
+ if (!IbisObj.initialized)
+ {
+ Tcl_SetStringObj(
+diff --git a/ibis/src/ibissh_wrap.cpp b/ibis/src/ibissh_wrap.cpp
+index f75cde6..917904f 100644
+--- a/ibis/src/ibissh_wrap.cpp
++++ b/ibis/src/ibissh_wrap.cpp
+@@ -3209,6 +3209,7 @@ typedef struct {
+ static char res[128];
+ Tcl_Obj *p_obj;
+
++ memset(attr_array, 0, MAX_LOCAL_IBPORTS*sizeof(ib_port_attr_t));
+ if (!IbisObj.initialized)
+ {
+ Tcl_SetStringObj(
diff --git a/debian/patches/series b/debian/patches/series
index cc19bc6..299bc42 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
01-fix-with_osm_libs.patch
02-fix-format-warning.patch
03-remove-rpath.patch
+git-05a9d1a.patch
+git-bd7e502.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ofed/ibutils.git
More information about the Pkg-ofed-commits
mailing list