pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/puppet Update Puppet to version 3.1.1 (from 0...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/2e5dd3892ffa
branches:  trunk
changeset: 617135:2e5dd3892ffa
user:      tonnerre <tonnerre%pkgsrc.org@localhost>
date:      Wed Apr 10 21:10:54 2013 +0000

description:
Update Puppet to version 3.1.1 (from 0.25.5!).

Changes are extremely numerous, but your old Puppet rules should still work.

diffstat:

 sysutils/puppet/Makefile               |    53 +-
 sysutils/puppet/PLIST                  |  2028 ++++++++++++++++++++-----------
 sysutils/puppet/distinfo               |    16 +-
 sysutils/puppet/files/puppetd.sh       |     8 +-
 sysutils/puppet/files/puppetmasterd.sh |     8 +-
 sysutils/puppet/patches/patch-aa       |    20 +-
 sysutils/puppet/patches/patch-ab       |    41 +-
 sysutils/puppet/patches/patch-ac       |    18 +-
 sysutils/puppet/patches/patch-ad       |    39 +
 9 files changed, 1405 insertions(+), 826 deletions(-)

diffs (truncated from 2792 to 300 lines):

diff -r fb403132c8f4 -r 2e5dd3892ffa sysutils/puppet/Makefile
--- a/sysutils/puppet/Makefile  Wed Apr 10 21:06:23 2013 +0000
+++ b/sysutils/puppet/Makefile  Wed Apr 10 21:10:54 2013 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2012/10/23 19:51:20 asau Exp $
+# $NetBSD: Makefile,v 1.14 2013/04/10 21:10:54 tonnerre Exp $
 
-DISTNAME=              puppet-0.25.5
-PKGREVISION=           1
+DISTNAME=              puppet-3.1.1
 CATEGORIES=            sysutils
 #MASTER_SITES=         http://puppetlabs.com/downloads/puppet/
 
@@ -10,7 +9,12 @@
 COMMENT=               Configuration management framework written in Ruby
 LICENSE=               gnu-gpl-v2
 
-DEPENDS+=              ${RUBY_PKGPREFIX}-facter>=1.3.8:../../sysutils/ruby-facter
+DEPENDS+=              ${RUBY_PKGPREFIX}-facter>=1.6.18:../../sysutils/ruby-facter
+DEPENDS+=              ${RUBY_PKGPREFIX}-hiera>=1.0.0:../../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
+DEPENDS+=              ${RUBY_PKGPREFIX}-shadow>=2.0.0:../../security/ruby-shadow
 
 CONFLICTS+=            ruby[1-9][0-9]-puppet-[0-9]* puppet-[0-9]*
 
@@ -19,14 +23,29 @@
 
 SUBST_CLASSES+=                prefix
 SUBST_STAGE.prefix=    post-patch
-SUBST_FILES.prefix=    lib/puppet/reference/configuration.rb
-SUBST_FILES.prefix+=   lib/puppet/defaults.rb spec/unit/util/selinux.rb
-SUBST_FILES.prefix+=   bin/puppetrun bin/puppet bin/puppetdoc
-SUBST_FILES.prefix+=   ext/puppetstoredconfigclean.rb ext/puppetlast
+SUBST_FILES.prefix=    install.rb
+SUBST_FILES.prefix+=   lib/puppet/face/module/changes.rb
+SUBST_FILES.prefix+=   lib/puppet/face/module/install.rb
+SUBST_FILES.prefix+=   lib/puppet/face/module/list.rb
+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+=   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+=   conf/solaris/smf/puppetd.xml
-SUBST_FILES.prefix+=   conf/solaris/smf/puppetmasterd.xml
-SUBST_FILES.prefix+=   man/man8/puppetrun.8 man/man8/puppet.conf.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
+SUBST_FILES.prefix+=   man/man8/puppet-module.8
+SUBST_FILES.prefix+=   man/man8/puppet-parser.8
+SUBST_FILES.prefix+=   spec/unit/util/run_mode_spec.rb
+SUBST_FILES.prefix+=   spec/unit/util/selinux_spec.rb
+SUBST_FILES.prefix+=   spec/unit/indirector/catalog/static_compiler_spec.rb
 SUBST_SED.prefix=      -e "s|/etc/puppet|${PKG_SYSCONFDIR}|g"
 SUBST_SED.prefix+=     -e "s|/opt/csw/lib|${PREFIX}/lib|g"
 
@@ -70,8 +89,8 @@
 pre-build:
        cd ${WRKSRC} && ${FIND} . -type f -exec ${CHMOD} g-w {} \;
        cd ${WRKSRC} && \
-               ${FIND} lib/puppet spec test -type f -exec ${CHMOD} -x {} \;
-       cd ${WRKSRC} && ${RUBY} -Ilib bin/puppetmasterd                 \
+               ${FIND} lib/puppet spec -type f -exec ${CHMOD} -x {} \;
+       cd ${WRKSRC} && ${RUBY} -Ilib bin/puppet agent                  \
                --confdir=${PKG_SYSCONFDIR:Q} --rundir=${VARBASE:Q}/run \
                --genconfig |                                           \
                ${SED} -e 's/genconfig = true/# genconfig = false/'     \
@@ -81,13 +100,13 @@
        ${INSTALL_DATA} ${WRKSRC}/examples/puppet.conf                  \
                ${DESTDIR}${PREFIX}/${EGDIR}
 .if ${OPSYS} == "SunOS"
-       ${INSTALL_DATA} ${WRKSRC}/conf/solaris/smf/puppetd.xml          \
+       ${INSTALL_DATA} ${WRKSRC}/ext/solaris/smf/puppetd.xml           \
                ${DESTDIR}${PREFIX}/${EGDIR}/svc
-       ${INSTALL_DATA} ${WRKSRC}/conf/solaris/smf/puppetmasterd.xml    \
+       ${INSTALL_DATA} ${WRKSRC}/ext/solaris/smf/puppetmasterd.xml     \
                ${DESTDIR}${PREFIX}/${EGDIR}/svc
-       ${INSTALL_SCRIPT} ${WRKSRC}/conf/solaris/smf/svc-puppetd        \
+       ${INSTALL_SCRIPT} ${WRKSRC}/ext/solaris/smf/svc-puppetd         \
                ${DESTDIR}${PREFIX}/lib/svc/method
-       ${INSTALL_SCRIPT} ${WRKSRC}/conf/solaris/smf/svc-puppetmasterd  \
+       ${INSTALL_SCRIPT} ${WRKSRC}/ext/solaris/smf/svc-puppetmasterd   \
                ${DESTDIR}${PREFIX}/lib/svc/method
 .endif
 
diff -r fb403132c8f4 -r 2e5dd3892ffa sysutils/puppet/PLIST
--- a/sysutils/puppet/PLIST     Wed Apr 10 21:06:23 2013 +0000
+++ b/sysutils/puppet/PLIST     Wed Apr 10 21:10:54 2013 +0000
@@ -1,166 +1,236 @@
-@comment $NetBSD: PLIST,v 1.12 2012/02/06 10:32:47 fhajny Exp $
-bin/filebucket
-bin/pi
+@comment $NetBSD: PLIST,v 1.13 2013/04/10 21:10:54 tonnerre Exp $
 bin/puppet
-bin/puppetca
-bin/puppetd
-bin/puppetdoc
-bin/puppetmasterd
-bin/puppetqd
-bin/puppetrun
-bin/ralsh
 ${PLIST.sunos}lib/svc/method/svc-puppetd
 ${PLIST.sunos}lib/svc/method/svc-puppetmasterd
-${GEM_HOME}/cache/puppet-${PKGVERSION}.gem
-${GEM_LIBDIR}/CHANGELOG
-${GEM_LIBDIR}/CHANGELOG.old
-${GEM_LIBDIR}/COPYING
+${GEM_HOME}/cache/${GEM_NAME}.gem
+${GEM_LIBDIR}/COMMITTERS.md
+${GEM_LIBDIR}/CONTRIBUTING.md
+${GEM_LIBDIR}/Gemfile
 ${GEM_LIBDIR}/LICENSE
-${GEM_LIBDIR}/README
-${GEM_LIBDIR}/README.queueing
-${GEM_LIBDIR}/README.rst
+${GEM_LIBDIR}/README.md
+${GEM_LIBDIR}/README_DEVELOPER.md
 ${GEM_LIBDIR}/Rakefile
-${GEM_LIBDIR}/bin/filebucket
-${GEM_LIBDIR}/bin/pi
+${GEM_LIBDIR}/bin/extlookup2hiera
 ${GEM_LIBDIR}/bin/puppet
-${GEM_LIBDIR}/bin/puppetca
-${GEM_LIBDIR}/bin/puppetd
-${GEM_LIBDIR}/bin/puppetdoc
-${GEM_LIBDIR}/bin/puppetmasterd
-${GEM_LIBDIR}/bin/puppetqd
-${GEM_LIBDIR}/bin/puppetrun
-${GEM_LIBDIR}/bin/ralsh
 ${GEM_LIBDIR}/conf/auth.conf
-${GEM_LIBDIR}/conf/epm.list
-${GEM_LIBDIR}/conf/freebsd/puppetd
-${GEM_LIBDIR}/conf/freebsd/puppetmasterd
-${GEM_LIBDIR}/conf/gentoo/conf.d/puppet
-${GEM_LIBDIR}/conf/gentoo/conf.d/puppetmaster
-${GEM_LIBDIR}/conf/gentoo/init.d/puppet
-${GEM_LIBDIR}/conf/gentoo/init.d/puppetmaster
-${GEM_LIBDIR}/conf/gentoo/puppet/fileserver.conf
-${GEM_LIBDIR}/conf/gentoo/puppet/puppet.conf
-${GEM_LIBDIR}/conf/namespaceauth.conf
-${GEM_LIBDIR}/conf/osx/PackageInfo.plist
-${GEM_LIBDIR}/conf/osx/createpackage.sh
-${GEM_LIBDIR}/conf/osx/preflight
-${GEM_LIBDIR}/conf/puppet-queue.conf
-${GEM_LIBDIR}/conf/redhat/client.init
-${GEM_LIBDIR}/conf/redhat/client.sysconfig
-${GEM_LIBDIR}/conf/redhat/fileserver.conf
-${GEM_LIBDIR}/conf/redhat/logrotate
-${GEM_LIBDIR}/conf/redhat/puppet.conf
-${GEM_LIBDIR}/conf/redhat/puppet.spec
-${GEM_LIBDIR}/conf/redhat/rundir-perms.patch
-${GEM_LIBDIR}/conf/redhat/server.init
-${GEM_LIBDIR}/conf/redhat/server.sysconfig
-${GEM_LIBDIR}/conf/solaris/pkginfo
-${GEM_LIBDIR}/conf/solaris/smf/puppetd.xml
-${GEM_LIBDIR}/conf/solaris/smf/puppetmasterd.xml
-${GEM_LIBDIR}/conf/solaris/smf/svc-puppetd
-${GEM_LIBDIR}/conf/solaris/smf/svc-puppetmasterd
-${GEM_LIBDIR}/conf/suse/client.init
-${GEM_LIBDIR}/conf/suse/puppet.spec
-${GEM_LIBDIR}/conf/suse/puppet.suse.patch
-${GEM_LIBDIR}/conf/suse/server.init
-${GEM_LIBDIR}/examples/allatonce
-${GEM_LIBDIR}/examples/assignments
-${GEM_LIBDIR}/examples/components
-${GEM_LIBDIR}/examples/etc/init.d/sleeper
-${GEM_LIBDIR}/examples/etc/otherfile
-${GEM_LIBDIR}/examples/etc/puppet/fileserver.conf
-${GEM_LIBDIR}/examples/etc/puppet/namespaceauth.conf
-${GEM_LIBDIR}/examples/etc/puppet/puppet.conf
-${GEM_LIBDIR}/examples/etc/puppet/tagmail.conf
-${GEM_LIBDIR}/examples/execs
-${GEM_LIBDIR}/examples/file.bl
-${GEM_LIBDIR}/examples/filedefaults
-${GEM_LIBDIR}/examples/fileparsing
-${GEM_LIBDIR}/examples/filerecursion
-${GEM_LIBDIR}/examples/functions
-${GEM_LIBDIR}/examples/groups
-${GEM_LIBDIR}/examples/head
-${GEM_LIBDIR}/examples/importing
+${GEM_LIBDIR}/conf/fileserver.conf
+${GEM_LIBDIR}/conf/tagmail.conf
+${GEM_LIBDIR}/examples/hiera/README.md
+${GEM_LIBDIR}/examples/hiera/etc/hiera.yaml
+${GEM_LIBDIR}/examples/hiera/etc/hieradb/common.yaml
+${GEM_LIBDIR}/examples/hiera/etc/hieradb/dc1.yaml
+${GEM_LIBDIR}/examples/hiera/etc/hieradb/development.yaml
+${GEM_LIBDIR}/examples/hiera/etc/puppet.conf
+${GEM_LIBDIR}/examples/hiera/modules/data/manifests/common.pp
+${GEM_LIBDIR}/examples/hiera/modules/ntp/manifests/config.pp
+${GEM_LIBDIR}/examples/hiera/modules/ntp/manifests/data.pp
+${GEM_LIBDIR}/examples/hiera/modules/ntp/templates/ntp.conf.erb
+${GEM_LIBDIR}/examples/hiera/modules/users/manifests/common.pp
+${GEM_LIBDIR}/examples/hiera/modules/users/manifests/dc1.pp
+${GEM_LIBDIR}/examples/hiera/modules/users/manifests/development.pp
+${GEM_LIBDIR}/examples/hiera/site.pp
 ${GEM_LIBDIR}/examples/mac_automount.pp
-${GEM_LIBDIR}/examples/mac_dscl.pp
-${GEM_LIBDIR}/examples/mac_dscl_revert.pp
-${GEM_LIBDIR}/examples/mac_pkgdmg.pp
 ${GEM_LIBDIR}/examples/mcx_dock_absent.pp
 ${GEM_LIBDIR}/examples/mcx_dock_default.pp
 ${GEM_LIBDIR}/examples/mcx_dock_full.pp
 ${GEM_LIBDIR}/examples/mcx_dock_invalid.pp
 ${GEM_LIBDIR}/examples/mcx_nogroup.pp
 ${GEM_LIBDIR}/examples/mcx_notexists_absent.pp
-${GEM_LIBDIR}/examples/modules/sample-module.pp
-${GEM_LIBDIR}/examples/modules/sample-module/README.txt
-${GEM_LIBDIR}/examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
-${GEM_LIBDIR}/examples/modules/sample-module/manifests/init.pp
-${GEM_LIBDIR}/examples/modules/sample-module/templates/sample.erb
-${GEM_LIBDIR}/examples/nodes
-${GEM_LIBDIR}/examples/one
-${GEM_LIBDIR}/examples/relationships
-${GEM_LIBDIR}/examples/selectors
-${GEM_LIBDIR}/examples/simpletests
-${GEM_LIBDIR}/examples/svncommit
 ${GEM_LIBDIR}/ext/autotest/Rakefile
 ${GEM_LIBDIR}/ext/autotest/config
 ${GEM_LIBDIR}/ext/autotest/readme.rst
+${GEM_LIBDIR}/ext/build_defaults.yaml
+${GEM_LIBDIR}/ext/cert_inspector
 ${GEM_LIBDIR}/ext/dbfix.sql
+${GEM_LIBDIR}/ext/debian/README.Debian
+${GEM_LIBDIR}/ext/debian/README.source
+${GEM_LIBDIR}/ext/debian/TODO.Debian
+${GEM_LIBDIR}/ext/debian/changelog.erb
+${GEM_LIBDIR}/ext/debian/compat
+${GEM_LIBDIR}/ext/debian/control
+${GEM_LIBDIR}/ext/debian/copyright
+${GEM_LIBDIR}/ext/debian/docs
+${GEM_LIBDIR}/ext/debian/fileserver.conf
+${GEM_LIBDIR}/ext/debian/puppet-common.dirs
+${GEM_LIBDIR}/ext/debian/puppet-common.install
+${GEM_LIBDIR}/ext/debian/puppet-common.lintian-overrides
+${GEM_LIBDIR}/ext/debian/puppet-common.manpages
+${GEM_LIBDIR}/ext/debian/puppet-common.postinst
+${GEM_LIBDIR}/ext/debian/puppet-common.postrm
+${GEM_LIBDIR}/ext/debian/puppet-el.dirs
+${GEM_LIBDIR}/ext/debian/puppet-el.emacsen-install
+${GEM_LIBDIR}/ext/debian/puppet-el.emacsen-remove
+${GEM_LIBDIR}/ext/debian/puppet-el.emacsen-startup
+${GEM_LIBDIR}/ext/debian/puppet-el.install
+${GEM_LIBDIR}/ext/debian/puppet-testsuite.install
+${GEM_LIBDIR}/ext/debian/puppet-testsuite.lintian-overrides
+${GEM_LIBDIR}/ext/debian/puppet.conf
+${GEM_LIBDIR}/ext/debian/puppet.default
+${GEM_LIBDIR}/ext/debian/puppet.init
+${GEM_LIBDIR}/ext/debian/puppet.lintian-overrides
+${GEM_LIBDIR}/ext/debian/puppet.logrotate
+${GEM_LIBDIR}/ext/debian/puppet.manpages
+${GEM_LIBDIR}/ext/debian/puppet.postinst
+${GEM_LIBDIR}/ext/debian/puppet.postrm
+${GEM_LIBDIR}/ext/debian/puppet.preinst
+${GEM_LIBDIR}/ext/debian/puppetmaster-common.install
+${GEM_LIBDIR}/ext/debian/puppetmaster-common.manpages
+${GEM_LIBDIR}/ext/debian/puppetmaster-common.puppetqd.default
+${GEM_LIBDIR}/ext/debian/puppetmaster-common.puppetqd.init
+${GEM_LIBDIR}/ext/debian/puppetmaster-passenger.dirs
+${GEM_LIBDIR}/ext/debian/puppetmaster-passenger.postinst
+${GEM_LIBDIR}/ext/debian/puppetmaster-passenger.postrm
+${GEM_LIBDIR}/ext/debian/puppetmaster.README.debian
+${GEM_LIBDIR}/ext/debian/puppetmaster.default
+${GEM_LIBDIR}/ext/debian/puppetmaster.init
+${GEM_LIBDIR}/ext/debian/puppetmaster.lintian-overrides
+${GEM_LIBDIR}/ext/debian/puppetmaster.postinst
+${GEM_LIBDIR}/ext/debian/puppetmaster.postrm
+${GEM_LIBDIR}/ext/debian/puppetmaster.preinst
+${GEM_LIBDIR}/ext/debian/rules
+${GEM_LIBDIR}/ext/debian/source/format
+${GEM_LIBDIR}/ext/debian/source/options
+${GEM_LIBDIR}/ext/debian/vim-puppet.README.Debian
+${GEM_LIBDIR}/ext/debian/vim-puppet.dirs
+${GEM_LIBDIR}/ext/debian/vim-puppet.yaml
+${GEM_LIBDIR}/ext/debian/watch
 ${GEM_LIBDIR}/ext/emacs/puppet-mode-init.el
 ${GEM_LIBDIR}/ext/emacs/puppet-mode.el
-${GEM_LIBDIR}/ext/extlookup.rb
+${GEM_LIBDIR}/ext/envpuppet
+${GEM_LIBDIR}/ext/envpuppet.bat
+${GEM_LIBDIR}/ext/freebsd/puppetd
+${GEM_LIBDIR}/ext/freebsd/puppetmasterd
+${GEM_LIBDIR}/ext/gentoo/conf.d/puppet
+${GEM_LIBDIR}/ext/gentoo/conf.d/puppetmaster
+${GEM_LIBDIR}/ext/gentoo/init.d/puppet
+${GEM_LIBDIR}/ext/gentoo/init.d/puppetmaster
+${GEM_LIBDIR}/ext/gentoo/puppet/fileserver.conf
+${GEM_LIBDIR}/ext/gentoo/puppet/puppet.conf
+${GEM_LIBDIR}/ext/ips/puppet-agent
+${GEM_LIBDIR}/ext/ips/puppet-master
+${GEM_LIBDIR}/ext/ips/puppet.conf
+${GEM_LIBDIR}/ext/ips/puppet.p5m.erb



Home | Main Index | Thread Index | Old Index