Import of pkgsrc-2015Q3
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
# $NetBSD: Makefile,v 1.18 2014/03/26 14:27:22 taca Exp $
|
||||
# $NetBSD: Makefile,v 1.19 2015/08/17 13:20:43 fhajny Exp $
|
||||
|
||||
DISTNAME= puppet-3.1.1
|
||||
PKGREVISION= 1
|
||||
DISTNAME= puppet-3.8.2
|
||||
CATEGORIES= sysutils
|
||||
#MASTER_SITES= http://puppetlabs.com/downloads/puppet/
|
||||
|
||||
@@ -10,8 +9,8 @@ HOMEPAGE= http://www.puppetlabs.com/
|
||||
COMMENT= Configuration management framework written in Ruby
|
||||
LICENSE= apache-2.0
|
||||
|
||||
DEPENDS+= ${RUBY_PKGPREFIX}-facter>=1.6.18:../../sysutils/ruby-facter
|
||||
DEPENDS+= ${RUBY_PKGPREFIX}-hiera>=1.0.0:../../databases/ruby-hiera
|
||||
DEPENDS+= ${RUBY_PKGPREFIX}-facter>=1.7.0<3:../../sysutils/ruby-facter
|
||||
DEPENDS+= ${RUBY_PKGPREFIX}-hiera>=1.0.0<3:../../databases/ruby-hiera
|
||||
DEPENDS+= ${RUBY_PKGPREFIX}-io-console>=0.3:../../devel/ruby-io-console
|
||||
DEPENDS+= ${RUBY_PKGPREFIX}-json-pure>=0:../../textproc/ruby-json-pure
|
||||
DEPENDS+= ${RUBY_PKGPREFIX}-minitest>=2.5.1:../../devel/ruby-minitest
|
||||
@@ -34,13 +33,10 @@ SUBST_FILES.prefix+= lib/puppet/face/module/uninstall.rb
|
||||
SUBST_FILES.prefix+= lib/puppet/face/module/upgrade.rb
|
||||
SUBST_FILES.prefix+= lib/puppet/parser/functions/extlookup.rb
|
||||
SUBST_FILES.prefix+= lib/puppet/reference/configuration.rb
|
||||
SUBST_FILES.prefix+= lib/puppet/defaults.rb lib/puppet/util/run_mode.rb
|
||||
SUBST_FILES.prefix+= bin/puppet ext/rack/manifest.pp
|
||||
SUBST_FILES.prefix+= ext/rack/files/apache2.conf ext/rack/files/config.ru
|
||||
SUBST_FILES.prefix+= lib/puppet/util/run_mode.rb
|
||||
SUBST_FILES.prefix+= ext/solaris/smf/puppetd.xml
|
||||
SUBST_FILES.prefix+= ext/solaris/smf/puppetmasterd.xml
|
||||
SUBST_FILES.prefix+= man/man5/puppet.conf.5
|
||||
SUBST_FILES.prefix+= man/man8/puppet.8
|
||||
SUBST_FILES.prefix+= man/man8/puppet-apply.8
|
||||
SUBST_FILES.prefix+= man/man8/puppet-device.8
|
||||
SUBST_FILES.prefix+= man/man8/puppet-doc.8
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,10 +1,10 @@
|
||||
$NetBSD: distinfo,v 1.10 2014/01/02 01:41:48 tonnerre Exp $
|
||||
$NetBSD: distinfo,v 1.11 2015/08/17 13:20:43 fhajny Exp $
|
||||
|
||||
SHA1 (puppet-3.1.1.gem) = 4f6adf79ab3ff5204178102375e79ca9e486042d
|
||||
RMD160 (puppet-3.1.1.gem) = 59cb6269f5cf0bcb89f643cb9ed211ab1640ff1d
|
||||
Size (puppet-3.1.1.gem) = 1590272 bytes
|
||||
SHA1 (patch-aa) = 153dcff431d6c642872d3aa2118bc2505c996e94
|
||||
SHA1 (patch-ab) = bc90687cd03181211b6fe3d6f056e653334d96a9
|
||||
SHA1 (puppet-3.8.2.gem) = 08968e6bb5c5a1a043b6e810f448e9e1b579fddd
|
||||
RMD160 (puppet-3.8.2.gem) = 5e4cbb9c57291796298e7132c1d7844948e8ec81
|
||||
Size (puppet-3.8.2.gem) = 2666496 bytes
|
||||
SHA1 (patch-aa) = 8b25b975647023902f5d84cc2980f777f23e789c
|
||||
SHA1 (patch-ab) = 2e80fc9ca8a9326d69c72149e6fd97738cfd2e1e
|
||||
SHA1 (patch-ac) = eda614eeee25b18ab36335fc7147fbe7ab770249
|
||||
SHA1 (patch-ad) = ea451b25483cf371307566b7d4e3110730ffa145
|
||||
SHA1 (patch-ae) = 2bd3354b9cf0ccc2366e66a6022c341c6a8472de
|
||||
SHA1 (patch-ad) = 412b0ccd973e38f38b574e553cab0041a025d4e6
|
||||
SHA1 (patch-ae) = 73d8cb4c58345b09771f08da8bc3b1e46563aa95
|
||||
|
||||
@@ -1,17 +1,17 @@
|
||||
$NetBSD: patch-aa,v 1.5 2013/04/10 21:10:55 tonnerre Exp $
|
||||
$NetBSD: patch-aa,v 1.6 2015/08/17 13:20:43 fhajny Exp $
|
||||
|
||||
Add NetBSD to list of operating systems that the OpenBSD provider is the
|
||||
default for now. In fact, NetBSD's pkg_add provider can do a lot more
|
||||
than OpenBSD's, but for now basic support should suffice.
|
||||
|
||||
--- lib/puppet/provider/package/openbsd.rb.orig 2013-04-01 00:44:50.000000000 +0000
|
||||
--- lib/puppet/provider/package/openbsd.rb.orig 2015-08-14 08:28:22.513689691 +0000
|
||||
+++ lib/puppet/provider/package/openbsd.rb
|
||||
@@ -7,7 +7,7 @@ Puppet::Type.type(:package).provide :ope
|
||||
commands :pkginfo => "pkg_info", :pkgadd => "pkg_add", :pkgdelete => "pkg_delete"
|
||||
@@ -14,7 +14,7 @@ Puppet::Type.type(:package).provide :ope
|
||||
:pkgdelete => "pkg_delete"
|
||||
|
||||
defaultfor :operatingsystem => :openbsd
|
||||
- confine :operatingsystem => :openbsd
|
||||
+ confine :operatingsystem => [:openbsd, :netbsd]
|
||||
|
||||
has_feature :versionable
|
||||
|
||||
has_feature :install_options
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
$NetBSD: patch-ab,v 1.5 2013/04/10 21:10:55 tonnerre Exp $
|
||||
$NetBSD: patch-ab,v 1.6 2015/08/17 13:20:43 fhajny Exp $
|
||||
|
||||
Make the FreeBSD provider the default for NetBSD as well.
|
||||
Omit _enabled for init scripts under NetBSD, which doesn't look for them.
|
||||
|
||||
--- lib/puppet/provider/service/freebsd.rb.orig 2013-04-01 00:44:50.000000000 +0000
|
||||
--- lib/puppet/provider/service/freebsd.rb.orig 2015-08-14 08:28:22.488080198 +0000
|
||||
+++ lib/puppet/provider/service/freebsd.rb
|
||||
@@ -3,7 +3,7 @@ Puppet::Type.type(:service).provide :fre
|
||||
desc "Provider for FreeBSD and DragonFly BSD. Uses the `rcvar` argument of init scripts and parses/edits rc files."
|
||||
@@ -22,5 +22,5 @@ Omit _enabled for init scripts under NetBSD, which doesn't look for them.
|
||||
+ append = "\# Added by Puppet\n#{rcvar}=\"#{yesno}\"\n"
|
||||
+ end
|
||||
# First, try the one-file-per-service style
|
||||
if File.exists?(rcconf_dir)
|
||||
if Puppet::FileSystem.exist?(rcconf_dir)
|
||||
File.open(rcconf_dir + "/#{service}", File::WRONLY | File::APPEND | File::CREAT, 0644) {
|
||||
|
||||
@@ -1,39 +1,15 @@
|
||||
$NetBSD: patch-ad,v 1.4 2014/01/02 01:41:48 tonnerre Exp $
|
||||
$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 2013-04-07 00:25:33.000000000 +0000
|
||||
--- lib/puppet/provider/package/pkgin.rb.orig 2015-08-14 08:28:22.519663101 +0000
|
||||
+++ lib/puppet/provider/package/pkgin.rb
|
||||
@@ -5,9 +5,9 @@ Puppet::Type.type(:package).provide :pkg
|
||||
@@ -5,7 +5,7 @@ Puppet::Type.type(:package).provide :pkg
|
||||
|
||||
commands :pkgin => "pkgin"
|
||||
|
||||
- defaultfor :operatingsystem => :dragonfly
|
||||
+ defaultfor :operatingsystem => [:dragonfly, :netbsd]
|
||||
- defaultfor :operatingsystem => [ :dragonfly , :smartos ]
|
||||
+ defaultfor :operatingsystem => [ :dragonfly , :smartos , :netbsd ]
|
||||
|
||||
- has_feature :installable, :uninstallable
|
||||
+ has_feature :installable, :uninstallable, :upgradeable
|
||||
has_feature :installable, :uninstallable, :upgradeable, :versionable
|
||||
|
||||
def self.parse_pkgin_line(package, force_status=nil)
|
||||
|
||||
@@ -59,4 +59,20 @@ Puppet::Type.type(:package).provide :pkg
|
||||
def uninstall
|
||||
pkgin("-y", :remove, resource[:name])
|
||||
end
|
||||
+
|
||||
+ def update
|
||||
+ pkgin("-y", :install, resource[:name])
|
||||
+ end
|
||||
+
|
||||
+ def latest
|
||||
+ output = pkgin("se", @resource[:name])
|
||||
+ pat = @resource[:name]
|
||||
+
|
||||
+ if output =~ /^#{pat}-(\d\S*)\s/
|
||||
+ return $1
|
||||
+ else
|
||||
+ self.err "Could not find latest version of %s" % pat
|
||||
+ return nil
|
||||
+ end
|
||||
+ end
|
||||
end
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
$NetBSD: patch-ae,v 1.3 2014/01/01 23:46:38 tonnerre Exp $
|
||||
$NetBSD: patch-ae,v 1.4 2015/08/17 13:20:43 fhajny Exp $
|
||||
|
||||
Fix detection of useradd user management under NetBSD.
|
||||
|
||||
NetBSD doesn't have chage but can use the -e and -f flags to passwd to
|
||||
achieve the same.
|
||||
|
||||
--- lib/puppet/provider/user/useradd.rb.orig 2014-01-01 23:22:45.000000000 +0000
|
||||
--- lib/puppet/provider/user/useradd.rb.orig 2015-08-14 08:28:22.481468919 +0000
|
||||
+++ lib/puppet/provider/user/useradd.rb
|
||||
@@ -5,13 +5,16 @@ Puppet::Type.type(:user).provide :userad
|
||||
@@ -9,13 +9,16 @@ Puppet::Type.type(:user).provide :userad
|
||||
install Ruby's shadow password library (often known as `ruby-libshadow`)
|
||||
if you wish to manage user passwords."
|
||||
|
||||
@@ -18,12 +18,12 @@ achieve the same.
|
||||
options :home, :flag => "-d", :method => :dir
|
||||
options :comment, :method => :gecos
|
||||
options :groups, :flag => "-G"
|
||||
- options :password_min_age, :flag => "-m"
|
||||
- options :password_max_age, :flag => "-M"
|
||||
+ options :password_min_age, :flag => "-m" unless %w{NetBSD}.include? Facter.value(:operatingsystem)
|
||||
+ options :password_max_age, :flag => "-M" unless %w{NetBSD}.include? Facter.value(:operatingsystem)
|
||||
- options :password_min_age, :flag => "-m", :method => :sp_min
|
||||
- options :password_max_age, :flag => "-M", :method => :sp_max
|
||||
+ options :password_min_age, :flag => "-m", :method => :sp_min unless %w{NetBSD}.include? Facter.value(:operatingsystem)
|
||||
+ options :password_max_age, :flag => "-M", :method => :sp_max unless %w{NetBSD}.include? Facter.value(:operatingsystem)
|
||||
+ options :password_min_age, :flag => "-e" if %w{NetBSD}.include? Facter.value(:operatingsystem)
|
||||
+ options :password_max_age, :flag => "-f" if %w{NetBSD}.include? Facter.value(:operatingsystem)
|
||||
|
||||
verify :gid, "GID must be an integer" do |value|
|
||||
value.is_a? Integer
|
||||
options :password, :method => :sp_pwdp
|
||||
options :expiry, :method => :sp_expire,
|
||||
:munge => proc { |value|
|
||||
|
||||
Reference in New Issue
Block a user