From ef5a94c9518bb30fd2e5c6e4ae3459f2ec4bf65c Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Tue, 14 Nov 2023 19:07:52 +0000
Subject: [PATCH] release 2.070000

---
 Build.PL            |  2 ++
 Changes             |  6 ++++++
 MANIFEST            |  3 +++
 META.json           | 11 ++++++++---
 META.yml            | 10 +++++++---
 lib/App/Netdisco.pm |  2 +-
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Build.PL b/Build.PL
index 1528311d..e62c3e77 100644
--- a/Build.PL
+++ b/Build.PL
@@ -97,6 +97,8 @@ Module::Build->new(
     'Template::Plugin::Number::Format' => '1.02',
     'Term::ReadLine' => '0',
     'Term::UI' => '0',
+    'Text::CSV' => '0',
+    'Text::CSV_XS' => '0',
     'Try::Tiny' => '0',
     'URI' => '0',
     'URI::Based' => '0',
diff --git a/Changes b/Changes
index 9e4782e5..b148547e 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+2.070000 - 2023-11-14
+
+  [NEW FEATURES]
+
+  * #1111 Support for OUI28/MA-M and OUI36/MA-S (replace oui with manufacturer)
+
 2.069000 - 2023-11-12
 
   [NEW FEATURES]
diff --git a/MANIFEST b/MANIFEST
index 20f6c5af..5bae461d 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,3 +1,4 @@
+bin/ieee-oui-import
 bin/nd-dbic-versions
 bin/nd-import-topology
 bin/netdisco-backend
@@ -41,6 +42,7 @@ lib/App/Netdisco/DB/Result/DeviceSkip.pm
 lib/App/Netdisco/DB/Result/DeviceSnapshot.pm
 lib/App/Netdisco/DB/Result/DeviceVlan.pm
 lib/App/Netdisco/DB/Result/Log.pm
+lib/App/Netdisco/DB/Result/Manufacturer.pm
 lib/App/Netdisco/DB/Result/NetmapPositions.pm
 lib/App/Netdisco/DB/Result/Node.pm
 lib/App/Netdisco/DB/Result/NodeIp.pm
@@ -496,6 +498,7 @@ share/schema_versions/App-Netdisco-DB-80-81-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-81-82-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-82-83-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-83-84-PostgreSQL.sql
+share/schema_versions/App-Netdisco-DB-84-85-PostgreSQL.sql
 share/schema_versions/App-Netdisco-DB-9-10-PostgreSQL.sql
 share/views/admintask.tt
 share/views/ajax/admintask/duplicatedevices.tt
diff --git a/META.json b/META.json
index d53e60ab..650c609b 100644
--- a/META.json
+++ b/META.json
@@ -111,6 +111,8 @@
             "Template::Plugin::Number::Format" : "1.02",
             "Term::ReadLine" : "0",
             "Term::UI" : "0",
+            "Text::CSV" : "0",
+            "Text::CSV_XS" : "0",
             "Try::Tiny" : "0",
             "URI" : "0",
             "URI::Based" : "0",
@@ -136,7 +138,7 @@
    "provides" : {
       "App::Netdisco" : {
          "file" : "lib/App/Netdisco.pm",
-         "version" : "2.069000"
+         "version" : "2.070000"
       },
       "App::Netdisco::AnyEvent::Nbtstat" : {
          "file" : "lib/App/Netdisco/AnyEvent/Nbtstat.pm"
@@ -158,7 +160,7 @@
       },
       "App::Netdisco::DB" : {
          "file" : "lib/App/Netdisco/DB.pm",
-         "version" : "84"
+         "version" : "85"
       },
       "App::Netdisco::DB::ExplicitLocking" : {
          "file" : "lib/App/Netdisco/DB/ExplicitLocking.pm"
@@ -220,6 +222,9 @@
       "App::Netdisco::DB::Result::Log" : {
          "file" : "lib/App/Netdisco/DB/Result/Log.pm"
       },
+      "App::Netdisco::DB::Result::Manufacturer" : {
+         "file" : "lib/App/Netdisco/DB/Result/Manufacturer.pm"
+      },
       "App::Netdisco::DB::Result::NetmapPositions" : {
          "file" : "lib/App/Netdisco/DB/Result/NetmapPositions.pm"
       },
@@ -956,6 +961,6 @@
       "x_IRC" : "irc://irc.libera.chat/#netdisco",
       "x_MailingList" : "https://lists.sourceforge.net/lists/listinfo/netdisco-users"
    },
-   "version" : "2.069000",
+   "version" : "2.070000",
    "x_serialization_backend" : "JSON::PP version 4.16"
 }
diff --git a/META.yml b/META.yml
index 5b6ddc21..a599cb7a 100644
--- a/META.yml
+++ b/META.yml
@@ -23,7 +23,7 @@ name: App-Netdisco
 provides:
   App::Netdisco:
     file: lib/App/Netdisco.pm
-    version: '2.069000'
+    version: '2.070000'
   App::Netdisco::AnyEvent::Nbtstat:
     file: lib/App/Netdisco/AnyEvent/Nbtstat.pm
   App::Netdisco::Backend::Job:
@@ -38,7 +38,7 @@ provides:
     file: lib/App/Netdisco/Configuration.pm
   App::Netdisco::DB:
     file: lib/App/Netdisco/DB.pm
-    version: '84'
+    version: '85'
   App::Netdisco::DB::ExplicitLocking:
     file: lib/App/Netdisco/DB/ExplicitLocking.pm
   App::Netdisco::DB::Result:
@@ -79,6 +79,8 @@ provides:
     file: lib/App/Netdisco/DB/Result/DeviceVlan.pm
   App::Netdisco::DB::Result::Log:
     file: lib/App/Netdisco/DB/Result/Log.pm
+  App::Netdisco::DB::Result::Manufacturer:
+    file: lib/App/Netdisco/DB/Result/Manufacturer.pm
   App::Netdisco::DB::Result::NetmapPositions:
     file: lib/App/Netdisco/DB/Result/NetmapPositions.pm
   App::Netdisco::DB::Result::Node:
@@ -641,6 +643,8 @@ requires:
   Template::Plugin::Number::Format: '1.02'
   Term::ReadLine: '0'
   Term::UI: '0'
+  Text::CSV: '0'
+  Text::CSV_XS: '0'
   Try::Tiny: '0'
   URI: '0'
   URI::Based: '0'
@@ -659,5 +663,5 @@ resources:
   homepage: http://netdisco.org/
   license: http://opensource.org/licenses/BSD-3-Clause
   repository: https://github.com/netdisco/netdisco
-version: '2.069000'
+version: '2.070000'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/lib/App/Netdisco.pm b/lib/App/Netdisco.pm
index 3f027d6b..ec85e8ee 100644
--- a/lib/App/Netdisco.pm
+++ b/lib/App/Netdisco.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 use 5.010_000;
 
-our $VERSION = '2.069000';
+our $VERSION = '2.070000';
 use App::Netdisco::Configuration;
 
 =head1 NAME