Bug#805923: Updated patch

[Ivan Kohler]

Here is an updated patch which includes a changelog, puts the changes in 
Debian's debian/patches directory instead of applying directly, fixes 
one more new place in the test suite that uses the network, and fixes an 
upstream bug in the load_cache method itself so loading our own copy of 
oui.txt works at all.

diff -urN libnet-mac-vendor-perl-1.25/debian/changelog libnet-mac-vendor-perl-1.25-ieee-data/debian/changelog
--- libnet-mac-vendor-perl-1.25/debian/changelog	2015-11-08 10:25:02.000000000 -0800
+++ libnet-mac-vendor-perl-1.25-ieee-data/debian/changelog	2015-11-23 21:37:45.885082752 -0800
@@ -1,3 +1,13 @@
+libnet-mac-vendor-perl (1.25-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * Found one more place that uses the network.
+  * Depend on ieee-data and patch the module to use its copy of oui.txt, which
+    is updated monthly (Closes: #805923).
+  * Fix the load_cache method.
+
+ -- Ivan Kohler <ivan-debian at 420.am>  Mon, 23 Nov 2015 20:25:42 -0800
+
 libnet-mac-vendor-perl (1.25-1) unstable; urgency=medium
 
   * Team upload.
diff -urN libnet-mac-vendor-perl-1.25/debian/control libnet-mac-vendor-perl-1.25-ieee-data/debian/control
--- libnet-mac-vendor-perl-1.25/debian/control	2015-11-08 10:25:02.000000000 -0800
+++ libnet-mac-vendor-perl-1.25-ieee-data/debian/control	2015-11-23 17:32:36.173054912 -0800
@@ -22,7 +22,8 @@
 Depends: ${misc:Depends},
          ${perl:Depends},
          libmojolicious-perl,
-         libwww-perl
+         libwww-perl,
+         ieee-data
 Description: module to look up the vendor by OUI
  The Institute of Electrical and Electronics Engineers (IEEE) assigns an
  Organizational Unique Identifier (OUI) to manufacturers of network
diff -urN libnet-mac-vendor-perl-1.25/debian/patches/fix-load_cache libnet-mac-vendor-perl-1.25-ieee-data/debian/patches/fix-load_cache
--- libnet-mac-vendor-perl-1.25/debian/patches/fix-load_cache	1969-12-31 16:00:00.000000000 -0800
+++ libnet-mac-vendor-perl-1.25-ieee-data/debian/patches/fix-load_cache	2015-11-23 21:36:30.993952197 -0800
@@ -0,0 +1,23 @@
+Description: Fix the load_cache method.
+ Fix a bug in the load_cache method.
+Author: Ivan Kohler <ivan-debian at 420.am>
+Bug-Debian: https://bugs.debian.org/805923
+
+--- libnet-mac-vendor-perl-1.25.orig/lib/Net/MAC/Vendor.pm
++++ libnet-mac-vendor-perl-1.25/lib/Net/MAC/Vendor.pm
+@@ -476,7 +476,7 @@ sub load_cache {
+ 	foreach my $entry ( @entries ) {
+ 		$entry =~ s/^\s+//;
+ 		my $oui = substr $entry, 0, 8;
+-		__PACKAGE__->add_to_cache( parse_oui( $entry ) );
++		__PACKAGE__->add_to_cache( $oui, parse_oui( $entry ) );
+ 		}
+ 
+ 	return 1;
diff -urN libnet-mac-vendor-perl-1.25/debian/patches/no-network-tests-load_cache_default libnet-mac-vendor-perl-1.25-ieee-data/debian/patches/no-network-tests-load_cache_default
--- libnet-mac-vendor-perl-1.25/debian/patches/no-network-tests-load_cache_default	1969-12-31 16:00:00.000000000 -0800
+++ libnet-mac-vendor-perl-1.25-ieee-data/debian/patches/no-network-tests-load_cache_default	2015-11-23 20:47:56.594683997 -0800
@@ -0,0 +1,26 @@
+Description: Skip load_cache test that needs internet access, if NO_NETWORK is set
+Author: Ivan Kohler <ivan-debian at 420.am>
+Bug-Debian: https://bugs.debian.org/805923
+
+--- libnet-mac-vendor-perl-1.25.orig/t/load_cache.t
++++ libnet-mac-vendor-perl-1.25/t/load_cache.t
+@@ -16,10 +16,13 @@ subtest bad_source => sub {
+ 	};
+ 
+ subtest load_cache_default => sub {
++	SKIP: {
++	skip 'Tests require internet', 1 if $ENV{NO_NETWORK};
+ 	local *STDERR;
+ 	open STDERR, ">", \my $output;
+ 	my $rc = Net::MAC::Vendor::load_cache();
+ 	ok( $rc, "load_cache returns true for default source");
++        }
+ 	};
+ 
+ my ($fh, $filename) = tempfile( UNLINK => 1 );
diff -urN libnet-mac-vendor-perl-1.25/debian/patches/series libnet-mac-vendor-perl-1.25-ieee-data/debian/patches/series
--- libnet-mac-vendor-perl-1.25/debian/patches/series	2015-11-08 10:25:02.000000000 -0800
+++ libnet-mac-vendor-perl-1.25-ieee-data/debian/patches/series	2015-11-23 21:35:11.722873594 -0800
@@ -1 +1,4 @@
 no-network-tests.patch
+use-ieee-data-oui.txt
+no-network-tests-load_cache_default
+fix-load_cache
diff -urN libnet-mac-vendor-perl-1.25/debian/patches/use-ieee-data-oui.txt libnet-mac-vendor-perl-1.25-ieee-data/debian/patches/use-ieee-data-oui.txt
--- libnet-mac-vendor-perl-1.25/debian/patches/use-ieee-data-oui.txt	1969-12-31 16:00:00.000000000 -0800
+++ libnet-mac-vendor-perl-1.25-ieee-data/debian/patches/use-ieee-data-oui.txt	2015-11-23 21:06:51.293884184 -0800
@@ -0,0 +1,25 @@
+Description: Use ieee-data's copy of oui.txt, updated monthly
+ A small patch to the module to use ieee-data's copy of oui.txt instead of
+ retreiving it from the network on-demand.
+Author: Ivan Kohler <ivan-debian at 420.am>
+Bug-Debian: https://bugs.debian.org/805923
+
+--- libnet-mac-vendor-perl-1.25.orig/lib/Net/MAC/Vendor.pm
++++ libnet-mac-vendor-perl-1.25/lib/Net/MAC/Vendor.pm
+@@ -530,6 +530,10 @@ were using the old C<$Cached> package va
+ =cut
+ 
+ sub get_cache_hash { $Cached }
++
++my $file = '/var/lib/ieee-data/oui.txt'; #Debian
++-s $file and load_cache($file);
++
+ }
+ 
+ =back


-- 
Ivan Kohler
President and Head Geek, Freeside Internet Services, Inc.  http://freeside.biz/
Debian GNU/Linux developer  |  CPAN author  |  cat person  |  ski addict