backport some fixes for "Using a hash as a reference is deprecated" warnings from torrus 2.01, so we can get the actual error messages we do want, RT#15536

4 files changed, 14 insertions, 8 deletions

diff --git a/torrus/FREESIDE_MODIFIED b/torrus/FREESIDE_MODIFIED
index 9e1ec8e3f..3e3f27ba7 100644
--- a/torrus/FREESIDE_MODIFIED
+++ b/torrus/FREESIDE_MODIFIED
@@ -12,3 +12,9 @@ templates/default-rrd.html               # title beautification
 templates/default-dir.html               # add interface popups
 sup/webplain/torrus.css                  # skinning
 bin/srvderive.in                         # --end and commit bugfixes
+
+#backport from torrus 2.01, so not really a modification :)
+perllib/Torrus/Devdiscover/Arbor_E.pm
+perllib/Torrus/Devdiscover/F5BigIP.pm
+perllib/Torrus/Devdiscover/FTPS.pm
+
diff --git a/torrus/perllib/Torrus/DevDiscover/Arbor_E.pm b/torrus/perllib/Torrus/DevDiscover/Arbor_E.pm
index 076d79867..f3f7c8c63 100644
--- a/torrus/perllib/Torrus/DevDiscover/Arbor_E.pm
+++ b/torrus/perllib/Torrus/DevDiscover/Arbor_E.pm
@@ -18,7 +18,7 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 #
-# $Id: Arbor_E.pm,v 1.1 2010-12-27 00:03:52 ivan Exp $
+# $Id: Arbor_E.pm,v 1.2 2011-12-16 22:43:52 ivan Exp $
 # Jon Nistor <nistor at snickers.org>
 #
 # NOTE: This module has been tested against v7.5.x, v7.6.x, v9.0.x, v9.1.x
@@ -1049,7 +1049,7 @@ sub buildConfig
 
             Debug("    Offer: $offerName");
 
-            foreach my $bundleID ( @{%{$offerBundle}->{$offerNameID}} )
+            foreach my $bundleID ( @{$offerBundle->{$offerNameID}} )
             {
                 my @btemplates;
                 my $bundleName =  $data->{'arbor_e'}{'bundleName'}{$bundleID};
diff --git a/torrus/perllib/Torrus/DevDiscover/F5BigIp.pm b/torrus/perllib/Torrus/DevDiscover/F5BigIp.pm
index e0d0770bb..ec8ce3ac2 100644
--- a/torrus/perllib/Torrus/DevDiscover/F5BigIp.pm
+++ b/torrus/perllib/Torrus/DevDiscover/F5BigIp.pm
@@ -14,7 +14,7 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-# $Id: F5BigIp.pm,v 1.1 2010-12-27 00:03:48 ivan Exp $
+# $Id: F5BigIp.pm,v 1.2 2011-12-16 22:43:52 ivan Exp $
 # Shawn Ferry <sferry at sevenspace dot com> <lalartu at obscure dot org>
 
 # F5 BigIp Load Balancer
@@ -167,8 +167,8 @@ sub discover
     my $result = $dd->retrieveSnmpOIDs( '4.x_globalAttrProductCode' );
     my $product_code = $result->{'4.x_globalAttrProductCode'};
 
-    $product_name = %f5_product->{$product_code}->{'product'};
-    if( %f5_product->{$product_code}->{'supported'} )
+    $product_name = $f5_product{$product_code}->{'product'};
+    if( $f5_product{$product_code}->{'supported'} )
     {
         $devdetails->setCap( 'BigIp_' . $product_name );
     }
diff --git a/torrus/perllib/Torrus/DevDiscover/FTOS.pm b/torrus/perllib/Torrus/DevDiscover/FTOS.pm
index 82629e2df..d89c10214 100644
--- a/torrus/perllib/Torrus/DevDiscover/FTOS.pm
+++ b/torrus/perllib/Torrus/DevDiscover/FTOS.pm
@@ -15,7 +15,7 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
-# $Id: FTOS.pm,v 1.1 2010-12-27 00:03:54 ivan Exp $
+# $Id: FTOS.pm,v 1.2 2011-12-16 22:43:52 ivan Exp $
 # Jon Nistor <nistor at snickers.org>
 
 # Force10 Networks Real Time Operating System Software
@@ -165,7 +165,7 @@ sub discover
     if( defined( $chassisSerial ) )
     {
         $data->{'param'}{'comment'} =
-            %f10ChassisType->{$chassisSerial->{'chType'}} .
+            $f10ChassisType{$chassisSerial->{'chType'}} .
             ', Hw Serial#: ' . $chassisSerial->{'chSerialNumber'};
     }
     else
@@ -191,7 +191,7 @@ sub discover
                                      ( $dd->oiddef('chRpmCpuIndex') ) )
             {
                 my $cpuType = $dd->oiddef('chRpmCpuIndex') . "." . $ftosCPUidx;
-                my $cpuName = %f10CPU->{$ftosCpuTable->{$cpuType}};
+                my $cpuName = $f10CPU{$ftosCpuTable->{$cpuType}};
 
                 Debug("FTOS::CPU index $ftosCPUidx, $cpuName");