Patches against the 5.7 SDK, reported to NTAP

gcoxmoz · Oct 5, 2017 · 0f3dea2 · 0f3dea2
1 parent 9b7d6dc
commit 0f3dea2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/SDK/NetApp/NetApp-SDK-5.7-perlfix-OCUMAPI.patch b/SDK/NetApp/NetApp-SDK-5.7-perlfix-OCUMAPI.patch
@@ -1,6 +1,6 @@
 #
-# I have not opened a case with NTAP support on this
 # Certain times an empty $flag can make it through, which is noticed under use strict
+# This was reported to NTAP and is BURT 1115364.
 #
 --- lib/perl/NetApp/OCUMAPI-old.pm	2017-04-24 04:43:45.000000000 +0000
 +++ lib/perl/NetApp/OCUMAPI.pm	2017-08-25 03:03:48.316206368 +0000

diff --git a/SDK/NetApp/NetApp-SDK-5.7-perlfix-OntapClusterAPI.patch b/SDK/NetApp/NetApp-SDK-5.7-perlfix-OntapClusterAPI.patch
@@ -0,0 +1,15 @@
+#
+# Certain times an empty $flag can make it through, which is noticed under use strict
+# This was reported to NTAP and is BURT 1115364.
+#
+--- lib/perl/NetApp/OntapClusterAPI-old.pm	2017-04-24 04:43:43.000000000 +0000
++++ lib/perl/NetApp/OntapClusterAPI.pm	2017-09-26 05:02:26.837593834 +0000
+@@ -101229,7 +101229,7 @@
+
+ sub IsArrayFlag {
+     my ($self, $flag) = @_;
+-    return ($flag & FIELD_ARRAY) == FIELD_ARRAY;
++    return $flag ? (($flag & FIELD_ARRAY) == FIELD_ARRAY) : 0;
+ }
+
+ sub IsEncryptedFlag {
diff --git a/SDK/NetApp/NetApp-SDK-5.7.spec b/SDK/NetApp/NetApp-SDK-5.7.spec
@@ -5,11 +5,12 @@
 Summary:   NetApp's SDK for interacting with filers
 Name:      NetApp-SDK
 Version:   5.7
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   NetApp SDK License Agreement v11-04-14
 Group:     Development/Libraries
 Source:    http://mysupport.netapp.com/NOW/download/software/nmsdk/%{version}/netapp-manageability-sdk-%{version}.zip
 Patch0:    %{name}-%{version}-perlfix-OCUMAPI.patch
+Patch1:    %{name}-%{version}-perlfix-OntapClusterAPI.patch
 URL:       http://support.netapp.com
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Vendor:    Mozilla IT
@@ -29,6 +30,7 @@ The NetApp Manageability SDK provides resources to develop applications that mon
 %prep
 %setup -q -n netapp-manageability-sdk-%{version}
 %patch0 -p0
+%patch1 -p0
 
 %build
 
@@ -48,7 +50,7 @@ The NetApp Manageability SDK provides resources to develop applications that mon
 %{perl_vendorlib}/%{name}/*
 
 %changelog
-* Fri Aug 25 2017 Greg Cox <[email protected]> 5.7
+* Fri Sep 26 2017 Greg Cox <[email protected]> 5.7
 - SDK 5.7
 
 * Wed Dec 20 2016 Greg Cox <[email protected]> 5.6