diff --git a/SDK/NetApp/NetApp-SDK-5.4P2-perlfix.patch b/SDK/NetApp/NetApp-SDK-5.4P2-perlfix.patch deleted file mode 100644 index 8118ce2..0000000 --- a/SDK/NetApp/NetApp-SDK-5.4P2-perlfix.patch +++ /dev/null @@ -1,14 +0,0 @@ -# -# I opened a case with NTAP support on this -# $response is double-declared and will error at you under use strict -# ---- lib/perl/NetApp/NaServer-old.pm 2016-02-11 11:48:26.000000000 +0000 -+++ lib/perl/NetApp/NaServer.pm 2016-05-04 21:24:34.812545512 +0000 -@@ -870,7 +870,6 @@ - my $line; - my $sock_err = undef; - my $content_length = 0; -- my $response; - my $hex_length; - - ## Perl socket timeout has no effect during socket read. diff --git a/SDK/NetApp/NetApp-SDK-5.4P2.spec b/SDK/NetApp/NetApp-SDK-5.4P2.spec deleted file mode 100644 index 2386059..0000000 --- a/SDK/NetApp/NetApp-SDK-5.4P2.spec +++ /dev/null @@ -1,53 +0,0 @@ -# $Id$ -%define debug_package %{nil} -%define perl_vendorlib /usr/lib64/perl5/vendor_perl - -Summary: NetApp's SDK for interacting with filers -Name: NetApp-SDK -Version: 5.4P2 -Release: 2%{?dist} -License: NetApp SDK License Agreement v11-04-14 -Group: Development/Libraries -Source: netapp-manageability-sdk-%{version}.zip -Patch0: %{name}-%{version}-perlfix.patch -URL: http://support.netapp.com -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Vendor: Mozilla IT - -%description -Empty placeholder - - -%package Perl -Summary: A Perl SDK for interacting with NetApp filers -BuildArch: noarch -Prefix: %{perl_vendorlib} - -%description Perl -The NetApp Manageability SDK provides resources to develop applications that monitor and manage NetApp storage systems. - -%prep -%setup -q -n netapp-manageability-sdk-%{version} -%patch0 -p0 - -%build - -%install -%{__mkdir} -p $RPM_BUILD_ROOT%{perl_vendorlib}/%{name} -%{__cp} lib/perl/NetApp/NaServer.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name} -%{__cp} lib/perl/NetApp/NaElement.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name} - -%clean -%{__rm} -rf $RPM_BUILD_ROOT - -%files Perl -%defattr(-,root,root,-) -%{perl_vendorlib}/%{name}/* - -%changelog -* Wed Oct 24 2016 Greg Cox 5.4P2 -- Changed patch name so I can have multiple patches sitting around. - -* Wed May 4 2016 Greg Cox 5.4P2 -- SDK 5.4P2 - diff --git a/SDK/NetApp/NetApp-SDK-5.6-perlfix.patch b/SDK/NetApp/NetApp-SDK-5.6-perlfix.patch index 2df2207..855fbe0 100644 --- a/SDK/NetApp/NetApp-SDK-5.6-perlfix.patch +++ b/SDK/NetApp/NetApp-SDK-5.6-perlfix.patch @@ -12,3 +12,14 @@ my $hex_length; ## Perl socket timeout has no effect during socket read. +--- lib/perl/NetApp/OCUMAPI-old.pm 2016-09-27 17:06:10.000000000 +0000 ++++ lib/perl/NetApp/OCUMAPI.pm 2016-11-18 19:05:55.794856254 +0000 +@@ -5375,7 +5375,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.6.spec b/SDK/NetApp/NetApp-SDK-5.6.spec index d914b59..e810401 100644 --- a/SDK/NetApp/NetApp-SDK-5.6.spec +++ b/SDK/NetApp/NetApp-SDK-5.6.spec @@ -5,7 +5,7 @@ Summary: NetApp's SDK for interacting with filers Name: NetApp-SDK Version: 5.6 -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 @@ -36,6 +36,9 @@ The NetApp Manageability SDK provides resources to develop applications that mon %{__mkdir} -p $RPM_BUILD_ROOT%{perl_vendorlib}/%{name} %{__cp} lib/perl/NetApp/NaServer.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name} %{__cp} lib/perl/NetApp/NaElement.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name} +%{__cp} lib/perl/NetApp/OCUMAPI.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name} +%{__cp} lib/perl/NetApp/OntapClusterAPI.pm $RPM_BUILD_ROOT%{perl_vendorlib}/%{name} +# You could add more files here, maybe even wildcard it. But I like a tidy directory. %clean %{__rm} -rf $RPM_BUILD_ROOT