From 0ed736ae020b35eeb441e2d926154c1435961a0f Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alex@linfratech.co.uk>
Date: Sat, 2 Mar 2019 18:19:39 +0000
Subject: [PATCH] Use some newer stdlib types

---
 manifests/host.pp  | 4 ++--
 manifests/init.pp  | 6 +++---
 manifests/pool.pp  | 4 ++--
 manifests/pool6.pp | 5 +----
 metadata.json      | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/manifests/host.pp b/manifests/host.pp
index fa4c36a8b..43eca0c7a 100644
--- a/manifests/host.pp
+++ b/manifests/host.pp
@@ -1,11 +1,11 @@
 # == Define: dhcp::host
 #
 define dhcp::host (
-  Stdlib::Compat::Ip_address $ip,
+  Stdlib::IP::Address $ip,
   Dhcp::Mac $mac,
   String $ddns_hostname = $name,
   Hash $options     = {},
-  String $comment   ='',
+  String $comment   = '',
   Boolean $ignored  = false,
 ) {
 
diff --git a/manifests/init.pp b/manifests/init.pp
index f986dea31..d4c5c23cf 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -2,8 +2,8 @@
 #
 class dhcp (
   Optional[Array[String]] $dnsdomain                      = undef,
-  Array[Stdlib::Compat::Ipv4] $nameservers                = [],
-  Array[Stdlib::Compat::Ipv6] $nameservers_ipv6           = [],
+  Array[Stdlib::IP::Address::V4] $nameservers             = [],
+  Array[Stdlib::IP::Address::V6] $nameservers_ipv6        = [],
   Array[String] $ntpservers                               = [],
   Array[String] $dnssearchdomains                         = [],
   String $dhcp_conf_header                                = 'INTERNAL_TEMPLATE',
@@ -30,7 +30,7 @@
   Integer $max_lease_time                                 = 86400,
   $service_ensure                                         = running,
   $globaloptions                                          = '',
-  Optional[Integer[0,65535]] $omapi_port                  = undef,
+  Optional[Stdlib::Port] $omapi_port                      = undef,
   Optional[String] $omapi_name                            = undef,
   String $omapi_algorithm                                 = 'HMAC-MD5',
   Optional[String] $omapi_key                             = undef,
diff --git a/manifests/pool.pp b/manifests/pool.pp
index 3e66c0b9f..3b62a4178 100644
--- a/manifests/pool.pp
+++ b/manifests/pool.pp
@@ -1,8 +1,8 @@
 # == Define: dhcp::pool
 #
 define dhcp::pool (
-  Stdlib::Compat::Ipv4 $network,
-  Stdlib::Compat::Ipv4 $mask,
+  Stdlib::IP::Address::V4 $network,
+  Stdlib::IP::Address::V4 $mask,
   $gateway                                  = '',
   $range                                    = '',
   $failover                                 = '',
diff --git a/manifests/pool6.pp b/manifests/pool6.pp
index 7ec40bf38..86f0432a7 100644
--- a/manifests/pool6.pp
+++ b/manifests/pool6.pp
@@ -1,10 +1,7 @@
 # == Define: dhcp::pool6
 #
 define dhcp::pool6 (
-  # the ipv6 regex is currently wrong so we can't use it here
-  # https://github.com/puppetlabs/puppetlabs-stdlib/pull/731
-  # Stdlib::Compat::Ipv6 $network,
-  String $network,
+  Stdlib::IP::Address::V6 $network,
   Integer $prefix,
   String $range                             = '',
   String $range_temp                        = '',
diff --git a/metadata.json b/metadata.json
index ccbae5221..bf2178b83 100644
--- a/metadata.json
+++ b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.16.0 < 6.0.0"
+      "version_requirement": ">= 4.25.0 < 6.0.0"
     },
     {
       "name": "puppetlabs/concat",