This patch adds /usr/share/ieee-data/oui.txt and suggests installation
of `ieee-data' package.
diff -Nru isc-dhcp-4.4.1/debian/changelog isc-dhcp-4.4.1/debian/changelog
--- isc-dhcp-4.4.1/debian/changelog	2020-01-22 16:35:14.000000000 -0500
+++ isc-dhcp-4.4.1/debian/changelog	2020-02-09 01:34:53.000000000 -0500
@@ -1,3 +1,10 @@
+isc-dhcp (4.4.1-2.2) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Utilize oui.txt from `ieee-data' package (closes: #948255).
+
+ -- Andrew Siplas <and...@asiplas.net>  Sun, 09 Feb 2020 01:34:53 -0500
+
 isc-dhcp (4.4.1-2.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru isc-dhcp-4.4.1/debian/control isc-dhcp-4.4.1/debian/control
--- isc-dhcp-4.4.1/debian/control	2020-01-22 16:35:14.000000000 -0500
+++ isc-dhcp-4.4.1/debian/control	2020-02-09 01:34:53.000000000 -0500
@@ -34,6 +34,7 @@
 Replaces:
  isc-dhcp-common (<= 4.3.3-1),
 Suggests:
+ ieee-data,
  policykit-1,
  isc-dhcp-server-ldap,
 Description: ISC DHCP server for automatic IP address assignment
diff -Nru isc-dhcp-4.4.1/debian/patches/ieee-data.patch isc-dhcp-4.4.1/debian/patches/ieee-data.patch
--- isc-dhcp-4.4.1/debian/patches/ieee-data.patch	1969-12-31 19:00:00.000000000 -0500
+++ isc-dhcp-4.4.1/debian/patches/ieee-data.patch	2020-02-09 01:34:53.000000000 -0500
@@ -0,0 +1,23 @@
+Description: Add path for data installed by `ieee-data' package and suggest installation if not present.
+Author: Andrew Siplas <and...@asiplas.net>
+--- a/contrib/dhcp-lease-list.pl
++++ b/contrib/dhcp-lease-list.pl
+@@ -29,8 +29,7 @@
+ my @all_leases;
+ my @leases;
+ 
+-my @OUIS = ('/usr/share/misc/oui.txt', '/usr/local/etc/oui.txt');
+-my $OUI_URL = 'http://standards.ieee.org/regauth/oui/oui.txt';
++my @OUIS = ('/usr/share/ieee-data/oui.txt', '/var/lib/ieee-data/oui.txt', '/usr/share/misc/oui.txt', '/usr/local/etc/oui.txt');
+ my $oui;
+ 
+ my %data;
+@@ -64,8 +63,7 @@
+     }
+ 
+     if (not defined $oui) {
+-	print(STDERR "To get manufacturer names please download $OUI_URL ");
+-	print(STDERR "to /usr/local/etc/oui.txt\n");
++	print(STDERR "To get manufacturer names please install the `ieee-data' package\n");
+     }
+ }
diff -Nru isc-dhcp-4.4.1/debian/patches/series isc-dhcp-4.4.1/debian/patches/series
--- isc-dhcp-4.4.1/debian/patches/series	2020-01-22 16:35:14.000000000 -0500
+++ isc-dhcp-4.4.1/debian/patches/series	2020-02-09 01:34:53.000000000 -0500
@@ -16,3 +16,5 @@
 bind-includes.patch
 
 configure.patch
+
+ieee-data.patch

Reply via email to