Hi,
find below the update to Puppet 5.5.8, works for me on my master as well as
on clients. Skipping 5.5.7, since kn@ reported some problem with it, which
is apparently fixed in the 5.5.8.
While there, add a portroach marker to limit to the 5.X versions.
If noone objects, I'd go ahead with it in a few days.
comments, tests or OKs?
cheers,
Sebastian
Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/5/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile 26 Oct 2018 16:16:24 -0000 1.11
+++ Makefile 7 Nov 2018 09:43:39 -0000
@@ -1,7 +1,8 @@
# $OpenBSD: Makefile,v 1.11 2018/10/26 16:16:24 jeremy Exp $
-VERSION= 5.5.6
-REVISION= 0
+PORTROACH= limit:^5
+
+VERSION= 5.5.8
RUN_DEPENDS+= databases/ruby-hiera3,${MODRUBY_FLAVOR} \
devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/5/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 18 Sep 2018 21:09:46 -0000 1.6
+++ distinfo 7 Nov 2018 09:43:39 -0000
@@ -1,2 +1,2 @@
-SHA256 (puppet-5.5.6.tar.gz) = CsX1tzfHmAyzeAnCBJE3DV9gnzyiLcJlUGjTliRDPtA=
-SIZE (puppet-5.5.6.tar.gz) = 3026301
+SHA256 (puppet-5.5.8.tar.gz) = r58GqLVdM3mCb5PYOShYRU1puPTTOmoZmR5nOQ8CYjo=
+SIZE (puppet-5.5.8.tar.gz) = 3056987
Index: patches/patch-lib_puppet_defaults_rb
===================================================================
RCS file:
/cvs/ports/sysutils/ruby-puppet/5/patches/patch-lib_puppet_defaults_rb,v
retrieving revision 1.4
diff -u -r1.4 patch-lib_puppet_defaults_rb
--- patches/patch-lib_puppet_defaults_rb 18 Sep 2018 21:09:46 -0000
1.4
+++ patches/patch-lib_puppet_defaults_rb 7 Nov 2018 09:43:39 -0000
@@ -2,7 +2,7 @@
Index: lib/puppet/defaults.rb
--- lib/puppet/defaults.rb.orig
+++ lib/puppet/defaults.rb
-@@ -1211,13 +1211,13 @@ EOT
+@@ -1209,13 +1209,13 @@ EOT
define_settings(:master,
:user => {
Index: patches/patch-lib_puppet_type_package_rb
===================================================================
RCS file:
/cvs/ports/sysutils/ruby-puppet/5/patches/patch-lib_puppet_type_package_rb,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-lib_puppet_type_package_rb
--- patches/patch-lib_puppet_type_package_rb 20 Nov 2017 12:45:17 -0000
1.1.1.1
+++ patches/patch-lib_puppet_type_package_rb 7 Nov 2018 09:43:39 -0000
@@ -3,8 +3,9 @@
add new feature flavorable, and switch handling the flavor
as a property instead of a parameter
---- lib/puppet/type/package.rb.orig Thu Apr 28 12:20:14 2016
-+++ lib/puppet/type/package.rb Thu Apr 28 12:20:48 2016
+Index: lib/puppet/type/package.rb
+--- lib/puppet/type/package.rb.orig
++++ lib/puppet/type/package.rb
@@ -65,6 +65,7 @@ module Puppet
provider-specific.",
:methods => [:package_settings_insync?, :package_settings,
:package_settings=]
@@ -13,7 +14,7 @@
ensurable do
desc <<-EOT
-@@ -442,7 +443,7 @@ module Puppet
+@@ -441,7 +442,7 @@ module Puppet
newvalues(:true, :false)
end
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/ruby-puppet/5/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST 20 Sep 2018 17:55:23 -0000 1.10
+++ pkg/PLIST 7 Nov 2018 09:43:39 -0000
@@ -797,7 +797,7 @@
${MODRUBY_SITEDIR}/puppet/property/ordered_list.rb
${MODRUBY_SITEDIR}/puppet/provider/
${MODRUBY_SITEDIR}/puppet/provider.rb
-${MODRUBY_SITEDIR}/puppet/provider/aixobject.rb
+${MODRUBY_SITEDIR}/puppet/provider/aix_object.rb
${MODRUBY_SITEDIR}/puppet/provider/augeas/
${MODRUBY_SITEDIR}/puppet/provider/augeas/augeas.rb
${MODRUBY_SITEDIR}/puppet/provider/cisco.rb
@@ -1229,6 +1229,7 @@
${MODRUBY_SITEDIR}/puppet/util/windows/root_certs.rb
${MODRUBY_SITEDIR}/puppet/util/windows/security.rb
${MODRUBY_SITEDIR}/puppet/util/windows/security_descriptor.rb
+${MODRUBY_SITEDIR}/puppet/util/windows/service.rb
${MODRUBY_SITEDIR}/puppet/util/windows/sid.rb
${MODRUBY_SITEDIR}/puppet/util/windows/string.rb
${MODRUBY_SITEDIR}/puppet/util/windows/taskscheduler.rb
