Update puppet to 4.10.1.

Changes from 3.8.7 to 4.10.1 are too many to write here, please refer
<https://docs.puppet.com/puppet/latest/release_notes.html> and its links.
This commit is contained in:
taca 2017-06-12 14:54:53 +00:00
parent dba0620aa1
commit 790a7524f5
5 changed files with 573 additions and 393 deletions

View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.30 2017/05/30 15:13:04 taca Exp $
# $NetBSD: Makefile,v 1.31 2017/06/12 14:54:53 taca Exp $
DISTNAME= puppet-3.8.7
DISTNAME= puppet-4.10.1
CATEGORIES= sysutils
#MASTER_SITES= http://puppetlabs.com/downloads/puppet/
@ -9,10 +9,10 @@ HOMEPAGE= http://www.puppetlabs.com/
COMMENT= Configuration management framework written in Ruby
LICENSE= apache-2.0
DEPENDS+= ${RUBY_PKGPREFIX}-facter>=1.7.0<3:../../sysutils/ruby-facter
DEPENDS+= ${RUBY_PKGPREFIX}-hiera>=1.0.0<3:../../databases/ruby-hiera
RUBY_VERSIONS_ACCEPTED= 21
DEPENDS+= ${RUBY_PKGPREFIX}-facter>=1.7.0<4:../../sysutils/ruby-facter
DEPENDS+= ${RUBY_PKGPREFIX}-hiera>=1.0.0<4:../../databases/ruby-hiera
DEPENDS+= ${RUBY_PKGPREFIX}-gettext-setup<1:../../devel/ruby-gettext-setup
#DEPENDS+= ${RUBY_PKGPREFIX}-locale>=0:../../devel/ruby-locale
OVERRIDE_GEMSPEC= json_pure:json>0
@ -89,8 +89,10 @@ CONF_FILES+= ${EGDIR}/svc/puppetmasterd.xml ${VARBASE}/svc/manifest/puppetmaste
PLIST.sunos= yes
.endif
pre-configure:
cd ${WRKSRC}/bin && ${CHMOD} ${BINMODE} puppet
pre-build:
cd ${WRKSRC} && ${FIND} . -type f -exec ${CHMOD} g-w {} \;
cd ${WRKSRC} && \
${FIND} lib/puppet spec -type f -exec ${CHMOD} -x {} \;
cd ${WRKSRC} && ${RUBY} -Ilib bin/puppet agent \

File diff suppressed because it is too large Load diff

View file

@ -1,12 +1,11 @@
$NetBSD: distinfo,v 1.16 2016/09/01 10:27:24 fhajny Exp $
$NetBSD: distinfo,v 1.17 2017/06/12 14:54:53 taca Exp $
SHA1 (puppet-3.8.7.gem) = 435a077a6d550855f9e0d7f6a582dab23163802e
RMD160 (puppet-3.8.7.gem) = 623d56c4b00d10f6b6ff9e693b754090934bf871
SHA512 (puppet-3.8.7.gem) = 573353553ed5d948d2b3dff294ba0ca536d095bc7da093ce25447eb13601d69264d37464572f04a08acaa81dbce44f5a09de06e2e9bdb489c44839220fc67906
Size (puppet-3.8.7.gem) = 2679296 bytes
SHA1 (puppet-4.10.1.gem) = e9297cfaba4be3620886b36b4b6b8627bbb18f0c
RMD160 (puppet-4.10.1.gem) = 75c44671820e8c433cc2c927fd90d381c167bbb9
SHA512 (puppet-4.10.1.gem) = c94e6b9489ed9432755c67343d68b7311f834f693115615a543272d76fd1f224a47f959e32926d464256ea1e02ef6e5d3bc6d5f95b02877c0c188d9dde5ef494
Size (puppet-4.10.1.gem) = 2963968 bytes
SHA1 (patch-aa) = 8b25b975647023902f5d84cc2980f777f23e789c
SHA1 (patch-ab) = 2e80fc9ca8a9326d69c72149e6fd97738cfd2e1e
SHA1 (patch-ac) = eda614eeee25b18ab36335fc7147fbe7ab770249
SHA1 (patch-ad) = 412b0ccd973e38f38b574e553cab0041a025d4e6
SHA1 (patch-ac) = 38fd0797438e9d6dcbc88e99354dae4ef0b9cba0
SHA1 (patch-ae) = 73d8cb4c58345b09771f08da8bc3b1e46563aa95
SHA1 (patch-lib_puppet_util_command__line.rb) = a15aa55703a6f437b2ee0f7137ee1820318f13e0

View file

@ -1,8 +1,8 @@
$NetBSD: patch-ac,v 1.6 2013/04/10 21:10:55 tonnerre Exp $
$NetBSD: patch-ac,v 1.7 2017/06/12 14:54:53 taca Exp $
NetBSD also has its init scripts in /etc/rc.d.
--- lib/puppet/provider/service/init.rb.orig 2013-04-01 00:44:50.000000000 +0000
--- lib/puppet/provider/service/init.rb.orig 2017-06-07 10:34:56.000000000 +0000
+++ lib/puppet/provider/service/init.rb
@@ -9,7 +9,7 @@ Puppet::Type.type(:service).provide :ini
["/etc/rc.d", "/usr/local/etc/rc.d"]
@ -11,5 +11,5 @@ NetBSD also has its init scripts in /etc/rc.d.
- when "Archlinux"
+ when "Archlinux", "NetBSD"
"/etc/rc.d"
else
"/etc/init.d"
when "AIX"
"/etc/rc.d/init.d"

View file

@ -1,15 +0,0 @@
$NetBSD: patch-ad,v 1.5 2015/08/17 13:20:43 fhajny Exp $
Add NetBSD and update support to the pkgin provider.
--- lib/puppet/provider/package/pkgin.rb.orig 2015-08-14 08:28:22.519663101 +0000
+++ lib/puppet/provider/package/pkgin.rb
@@ -5,7 +5,7 @@ Puppet::Type.type(:package).provide :pkg
commands :pkgin => "pkgin"
- defaultfor :operatingsystem => [ :dragonfly , :smartos ]
+ defaultfor :operatingsystem => [ :dragonfly , :smartos , :netbsd ]
has_feature :installable, :uninstallable, :upgradeable, :versionable