From b85c02f402726d16dd02b34e74478a1e80c14dac Mon Sep 17 00:00:00 2001
From: kn <kn@openbsd.org>
Date: Tue, 8 Sep 2020 21:57:22 +0000
Subject: [PATCH] Upgrade to Puppet 6.18.0

---
 sysutils/ruby-puppet/6/Makefile                             | 4 ++--
 sysutils/ruby-puppet/6/distinfo                             | 4 ++--
 sysutils/ruby-puppet/6/patches/patch-lib_puppet_defaults_rb | 4 ++--
 sysutils/ruby-puppet/6/pkg/PLIST                            | 4 +++-
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sysutils/ruby-puppet/6/Makefile b/sysutils/ruby-puppet/6/Makefile
index 180d3638f34..fcea2b74f56 100644
--- a/sysutils/ruby-puppet/6/Makefile
+++ b/sysutils/ruby-puppet/6/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.6 2020/06/14 15:47:38 kn Exp $
+# $OpenBSD: Makefile,v 1.7 2020/09/08 21:57:22 kn Exp $
 
 PORTROACH=		limit:^6
 
-VERSION=		6.16.0
+VERSION=		6.18.0
 
 RUN_DEPENDS+=		databases/ruby-hiera3,${MODRUBY_FLAVOR} \
 			devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
diff --git a/sysutils/ruby-puppet/6/distinfo b/sysutils/ruby-puppet/6/distinfo
index 916b1f6d12e..e649edbb464 100644
--- a/sysutils/ruby-puppet/6/distinfo
+++ b/sysutils/ruby-puppet/6/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puppet-6.16.0.tar.gz) = OFh6g1MRYgsI542OGBzjSNj/dO/D3aZ6fg0pNYsM92E=
-SIZE (puppet-6.16.0.tar.gz) = 2891986
+SHA256 (puppet-6.18.0.tar.gz) = EVG+JBWywMI+PuEq+D7HxjYbWTL65nqVLvouxb5m/5k=
+SIZE (puppet-6.18.0.tar.gz) = 2911742
diff --git a/sysutils/ruby-puppet/6/patches/patch-lib_puppet_defaults_rb b/sysutils/ruby-puppet/6/patches/patch-lib_puppet_defaults_rb
index 0fd396edb80..0bf9c10f6c9 100644
--- a/sysutils/ruby-puppet/6/patches/patch-lib_puppet_defaults_rb
+++ b/sysutils/ruby-puppet/6/patches/patch-lib_puppet_defaults_rb
@@ -1,4 +1,4 @@
-$OpenBSD: patch-lib_puppet_defaults_rb,v 1.2 2020/05/22 15:23:37 kn Exp $
+$OpenBSD: patch-lib_puppet_defaults_rb,v 1.3 2020/09/08 21:57:23 kn Exp $
 
 Update the user and group to _puppet
 Fix module search path to /var/puppetlabs
@@ -24,7 +24,7 @@ Index: lib/puppet/defaults.rb
      end
    end
  
-@@ -1286,13 +1286,13 @@ EOT
+@@ -1305,13 +1305,13 @@ EOT
  
    settings.define_settings(:master,
      :user => {
diff --git a/sysutils/ruby-puppet/6/pkg/PLIST b/sysutils/ruby-puppet/6/pkg/PLIST
index 62abda16657..c981928e176 100644
--- a/sysutils/ruby-puppet/6/pkg/PLIST
+++ b/sysutils/ruby-puppet/6/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.4 2020/06/14 15:47:39 kn Exp $
+@comment $OpenBSD: PLIST,v 1.5 2020/09/08 21:57:23 kn Exp $
 @option is-branch
 @newgroup _puppet:580
 @newuser _puppet:580:580:daemon:Puppet user:/var/empty:/sbin/nologin
@@ -1171,6 +1171,8 @@ ${MODRUBY_SITEDIR}/puppet/util/windows/com.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/error.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/eventlog.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/file.rb
+${MODRUBY_SITEDIR}/puppet/util/windows/monkey_patches/
+${MODRUBY_SITEDIR}/puppet/util/windows/monkey_patches/dir.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/principal.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/process.rb
 ${MODRUBY_SITEDIR}/puppet/util/windows/registry.rb