diff options
| -rw-r--r-- | app-admin/puppet/ChangeLog | 8 | ||||
| -rw-r--r-- | app-admin/puppet/Manifest | 28 | ||||
| -rw-r--r-- | app-admin/puppet/files/tmpfiles.d | 1 | ||||
| -rw-r--r-- | app-admin/puppet/puppet-3.3.0.ebuild | 160 | ||||
| -rw-r--r-- | app-admin/puppet/puppet-3.3.2-r1.ebuild (renamed from app-admin/puppet/puppet-3.3.1.ebuild) | 20 |
5 files changed, 34 insertions, 183 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog index dbaf98b4287f..a6c272fb6872 100644 --- a/app-admin/puppet/ChangeLog +++ b/app-admin/puppet/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-admin/puppet # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.178 2013/11/19 10:07:26 nimiux Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.179 2013/12/23 00:01:03 prometheanfire Exp $ + +*puppet-3.3.2-r1 (23 Dec 2013) + + 23 Dec 2013; Matthew Thode <prometheanfire@gentoo.org> +files/tmpfiles.d, + +puppet-3.3.2-r1.ebuild, -puppet-3.3.0.ebuild, -puppet-3.3.1.ebuild: + adding systemd support for bug 489860 19 Nov 2013; Chema Alonso <nimiux@gentoo.org> puppet-3.2.4.ebuild: Stable for amd64 wrt bug #486002 diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest index 089a56f7bdfc..7fb2f650ecc0 100644 --- a/app-admin/puppet/Manifest +++ b/app-admin/puppet/Manifest @@ -8,26 +8,30 @@ AUX puppet.init-r1 609 SHA256 1ba2b2c08e056adcb261bce51acf47dba6200246f199f25cdf AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058 AUX puppetmaster.init 1089 SHA256 8e4ae53b115ec5379961af6e9f822b2d8cfa59241d7d62d3bb8f81600fcd98d9 SHA512 3cedb45ec1c9b29b6c4e8392aa610b866c99fb2204c70d5c149090478bc42ac9454091bdec5155358b662167964a61c82307243839f923f5b15eca9e28a360e6 WHIRLPOOL cb86be91131d65e6f6a54b330e82f551dadb46725b7c882ca0fae3a501adf68f0069204351c57e2b6d69f6704846c9f7ab1aa2c3162ffd9afa93cce386ca991e AUX puppetmaster.init-r1 920 SHA256 00a66031624de13e28b43c186765c36f02632a614b868192e6cf4e6f1f392830 SHA512 b0b08592464111791470b126fef0ba20863dbcb011752cccc7c24303544cbbaf12fefb37eb17ad88551ced4d5d6bf2a4f81fd93e84506411f7b8b51053d34e42 WHIRLPOOL 4027629f5d188ba1a96fb0796ff5a8c8c2887936f2f9a5a4fc41a719be9a48ad4c114b2918437e6b812f01bfcbf22e2b4617092bff84b2b76c107db4c5dfc29b +AUX tmpfiles.d 39 SHA256 bc0c1f0aa01e1df559fa6e0b8bb686a8fc83b1272bcf4f6671fbb2a9b48aaa6f SHA512 2dfec45e6f762ce0431d55b1a826e707e970defacbe050df838b66b347e7423eac78a35248c74908e7b52fa84cde5129ce3f562f64dac357f0368a3bc0b719a1 WHIRLPOOL 5dc356a6ae94e262cb0a0bdbc120351bce40e81ac79e6a5122c6eff3022ddfd53724f9230c7553dcbd4648f640c4a912baf300ea5b2cb22fa7100b33de4f4909 DIST puppet-2.7.23.tar.gz 2025639 SHA256 73bc0d5a2334dc484148141a32274703b65b78bf87ca41f7e2da1c38518ba490 SHA512 d6173b596744b438a132a3772ed39195670d509481b5fbd30b098e8df3fceb31097369e6670587303b490f35842a39955d77ad500ab88535d43f08cc8d9dc86c WHIRLPOOL 65164214bc421b78359858258fa1e4242161ec406a20d73e5f44a5b14e74a6ed5973fcd4cd752a8817698aee8840ce67b92b12dfe487f964a736a68ae158ae80 DIST puppet-3.2.4.tar.gz 1786216 SHA256 8b38f4adee6237b8dd7b1956d90af97f2d0091245d6e30b708bbc8e333001358 SHA512 31a22cf926c6fe866e7ed1ca294dd78228bfb34b0465d44cc985dc6f737879710b5c27e1519f53c9fd9622320386950f290d774d709559b66be79e43dac1dd5e WHIRLPOOL 86bb44bd6ee5a4c31892e909a95fcea52ced289b891281bae5535dac891006d9c1a5d4613210a0ba550ab6428f206dcf9ab3fafb3c90297a64e8bad3c06509be -DIST puppet-3.3.0.tar.gz 1894901 SHA256 72a8579332b379f8dfe03d39ac961891db9d1e41919be98ac64caa0e3e2d31a0 SHA512 806bfd76d58a3abb7d717e1a4f46f0569e61aa92bc9961c7e2b314669849865c74907c93b4455d4ed0f0eb9ec88ec02f8f2c83a6821549b590c86797c99cac7a WHIRLPOOL 4b10f7c6054cf547496165b24589f15b13fc0bd8db8b4f710725605fbf1a50f7b8b77453e0a16e5f0e290fc04727997de6bbd5d94dc495175d999508099edf43 -DIST puppet-3.3.1.tar.gz 1896023 SHA256 152f9eaa6767c5f6cbd52befff891bd54e074d2f6487a649373da0113c09e284 SHA512 323dcd31a7029439edb3663501bce11fe7aa75b80efbd133abb82ea2c1584ce395a70ad2203f52d4fda8cadf18db7d6f6f2d4a3b285fa69b19b930d46e85a2d4 WHIRLPOOL a6d4b97efd5859b89d5fc81a857ecf837da540f140f33a252e552306843164e94cd94e0ca10b6bcfa3310fc0c03db9d2908100ed8f6c58d0c49ab5970202d01c DIST puppet-3.3.2.tar.gz 1897677 SHA256 8e8019617bc00a583a1062e125d3ce76bc40968ebf1fdd9fff67ac5321952637 SHA512 afdc06f0d3a6edbf44a313e6c4937bcc9e3cf84b3500e9df9484901becb902e9f96ba438cfdd9938e98a4a896720e1e88dd0f499815b27209e4693d9af7b0bb9 WHIRLPOOL 889584028738573d32b73a220f80dbf6aa1ac77dae3c943dfb13f396b745702abca24ede233d0b0b55f1b5506df356b55e4771f17e685f19b6974f242fb982f3 EBUILD puppet-2.7.23.ebuild 4819 SHA256 2dd746a070446e53ce9b62aff8ef28d9b2906f3ed1673f085a5e0c0f2cd7adef SHA512 4db1abf2648378c164bab5d0a5a9925c16bef561acbef1c2ebd27fccc2f2336ca9096d40184a6d6d835621afac4c4c7365d4aa721ed6e3d626cd6e7d0b92e3ab WHIRLPOOL 41f1c00ddda305c758c5ee6c4e4a977b2f8ec0dc4d9ed6b7c55ba13dfebe502d58bf626f2c3d1c13380ec48433c30e9a6c14d77cdb5581bfec9932c809d392d0 EBUILD puppet-3.2.4.ebuild 4295 SHA256 d23b57b1f6bf1a13e9adcddcb59730f02699510f5e0e92b7cf10aaa0ed11cde0 SHA512 0fd8a88f3d86cc3b73cc77964bf3ba68f52e09b0ee275730651c5a51964052d4f9adaede50eb85421e836f589da22dbbe9c169bbb38b8e0bec9db82b4e2230f5 WHIRLPOOL af106c3e65f71d44277044a4f01ca4f10a3e104c0333b9416272577d6a4ace7a4aca495eb206e4d344b216a784bc923e11c7862743e040e51c61f470ff68f6f0 -EBUILD puppet-3.3.0.ebuild 4306 SHA256 f1709a18b379ba87e7efecaa40ca5cf9282554b685d27ca3228a2244c3260adf SHA512 3efd09d67f0efeeabc3419902257374cca2da54827afb2d3f1468116e925d981f7aa6de56f857100631e8062925e96912762597c3e84900d3309b5f92d4cabb3 WHIRLPOOL 63aab9a2d75436e599528ecb266d9d5105cc2b401ded72bc848e771b314c3bf501c8f3bfa0cd39085dc059e2c634a9e99fdf8cc755e50406b913a11da329a374 -EBUILD puppet-3.3.1.ebuild 4356 SHA256 84007fdb75e368d8d2d65156217b957b046c4d8827125eee3f1f2c1e40006b0c SHA512 e8e944920c7c03da1a3ff91bd74ab641a80c5d667b354822da995a36dd08d2e822e56ef2fd3103ca89219ca8aac678817e80c743b06f5236b2f65efe5cd082db WHIRLPOOL 8fdb34cf31c2ef6d8f6d68fd391971921cbe0bf481cb5ae1ce66b324f4747869b4702a1098e512bc902c667c7df648a5c6059c125020c4cfc8fa2d029a44e390 +EBUILD puppet-3.3.2-r1.ebuild 4230 SHA256 b600b8ce0b077800bab7030876aa1f280f83d8a5cf47e1aa3c3ddea9c7064d05 SHA512 1d01602a675e779827309a199c23a1abee7cc77ce934c0a58e0ae539023ff5fc4e259bb9d349ebd2423a15ad122d0bfe3000cb33db1b6de48d8cfcaf22e39b21 WHIRLPOOL e180104acb2a62ebb2137f94c24f2befb3ff69f090385a0c1940cb578b0669ca04792f439a056138290fc54aa63b1ab97b6e10c64025860b2425295f33397596 EBUILD puppet-3.3.2.ebuild 3944 SHA256 fccf6ee7cf74d0e0962fe3cbfecbe65fedcb763cbb0f571db4a52418a19093d0 SHA512 9f471643d212ed3064e38419f6fe2a04027aaa165e086f9b029c7312e10adc23e8e97094b52fa158c7c2670ed8b600ee7fe6b75a7a160c59ff7c59f8f9349aa9 WHIRLPOOL fc33b391ca7a2255d3544c804766474008a0c5340bae2745b9d2e2237b84c19d03986e28e86e142da7d3c16a467606a5efbc744852837327dd44f7858a003f58 -MISC ChangeLog 29223 SHA256 cb0c397371e81565629ccc66fabf30624871839673baae96cbc6d9524e686f35 SHA512 6d928cbe9e4594c4bd106279c01b4f2e867e3b8b9cb1f4b9fd7f854fc8e851bb5e9f500ce40d37b7671fc6b09fba6377c7ff06a9978f16416aa8142f1a33bbe3 WHIRLPOOL 1ac7d9701ac37d8674b787835fb93a40b8b0ce1424c151c56ca8a63885a663149615907d5f347e1bbc50cdc3c07b557bfdb852f9b67694ea562ee0f8d28cb5ea +MISC ChangeLog 29451 SHA256 1297f96518f2fb18894b1c0b6c49a2ba4695ecaf01b13f84db12136eded8acae SHA512 6058fc5837cc8bd604585be67e06f4ab33f46b046965fa4ea2106eea95b6abdf3a8090cba09f811846c005ed78f18b3b29a922edb5c7bbed9e5fc4b1afc242bc WHIRLPOOL e4d51f27fef97a38d1216106d2139272af86d4e2b7f61476d4ddf0cbdf8b1b2df8865af0388b7f424fc71e6bf728efb8ae3e1bc335b1cbdffb4148f7ffc101c9 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQEcBAEBCAAGBQJSizicAAoJEA2sAkrWKOU27coH/1ln8XJ6S9TKl5LIL0SznKWC -fPMQl6XqozP3xzDZYKnAy4txtX7IvOaycxac/yokEufNhbX1H0Tul1kOdaCDFeNt -/2fo/anctYR26FDdtkCKYkCY54vIKgu999n01ec+h1iAj3nM2SxzQnKH7vk4zqzl -9hEqhCs9LShZht4sNBqhd9S1l8wAbA4sujbfEbMyzt4RZnAcuHXe3RacMMYqxUvC -AjGnZPAVjo/M7rTIB194sitwg1mYZC6+mxKQ8VNy+CRaXYrqYyVWZLQ1iCUMXAa5 -g5sy+RWLMIRD8QMk9myeaSrbIySW3SwKip5Q7BqpfqG7IX0Fewn7XvnZAOpyZCA= -=OgIr +iQIcBAEBCAAGBQJSt31ZAAoJECRx6z5ArFrD/HAP/2L4+aK5OK/P2RYg0M97yq7F +EN8QHhCg2dhwVbavRLEUtZewzTfAy6+yOb9K0tIePfjOTS7FzOV5E4UZu5eFC121 +SJ7Rl4sedEJn0CWrzXLCDNrBJm98+73y+CJ4e1Nvy3VHpTHHIl/TOSNDxNN3uJU0 +b7+wIajLhwnrve0/Z9y3hMAKRTXO+WxA3dMtzVf9fLJO2PI8rO93diuKzaSAf6iR +qCK0Jz6fYUHIg1Piwn7LEel+eObve2EoDLn6jnevE3K+AheMBN5QJzfFbjhVikYk +b8enac6moE0SYX0tmK2EwCncx8+Z4vOtcSGP3lbtxGn9zkqKhO9F7RTaR3e6B9Kd +u9M7FPaKFXSo9R8gQTjUnNwU+mry/3Sf2Z2fGfw6hHFp5gXsa4PlopWiz8EZ4XWL +qm/ybSDbp3eAzVod+RfoL/hb4PS0U3Vv64OPe92LY4vk+E8/z5BteOHUw67akLNd +o5BzVljO327SZJvs3UXI5jJlSP2Zo6mABsRwTqOLBpBa2p2X9+qVSdXSRHbLm/z2 +bhNeMYa+31YQgtgpmhNSdwkNvr7XtHIQoeoRR2VwxeHwTLAi8ItRgH73pVynMiu1 +n8IQ5v/i2vuY/irlAv4l3BIFNQkJ4AAbUN20OgTdyoJwOQi52NPwmkk/sYWjo0qY +UflCNW5ElI/uUzh4qBL8 +=UfJh -----END PGP SIGNATURE----- diff --git a/app-admin/puppet/files/tmpfiles.d b/app-admin/puppet/files/tmpfiles.d new file mode 100644 index 000000000000..cd33231df7f7 --- /dev/null +++ b/app-admin/puppet/files/tmpfiles.d @@ -0,0 +1 @@ +D /var/run/puppet 0755 puppet puppet - diff --git a/app-admin/puppet/puppet-3.3.0.ebuild b/app-admin/puppet/puppet-3.3.0.ebuild deleted file mode 100644 index 25648f23738e..000000000000 --- a/app-admin/puppet/puppet-3.3.0.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.3.0.ebuild,v 1.2 2013/09/17 15:00:49 prometheanfire Exp $ - -EAPI="5" - -USE_RUBY="ruby18 ruby19" - -inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator - -DESCRIPTION="A system automation and configuration management software" -HOMEPAGE="http://puppetlabs.com/" -SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz" - -LICENSE="Apache-2.0 GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86" -IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs" - -ruby_add_rdepend " - dev-ruby/hiera - >=dev-ruby/facter-1.6.2 - augeas? ( dev-ruby/ruby-augeas ) - diff? ( dev-ruby/diff-lcs ) - doc? ( dev-ruby/rdoc ) - ldap? ( dev-ruby/ruby-ldap ) - shadow? ( dev-ruby/ruby-shadow ) - sqlite3? ( dev-ruby/sqlite3 ) - virtual/ruby-ssl" - -DEPEND="${DEPEND} - ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) - emacs? ( virtual/emacs ) - xemacs? ( app-editors/xemacs )" -RDEPEND="${RDEPEND} - ruby_targets_ruby19? ( dev-lang/ruby:1.9[yaml] ) - rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) - selinux? ( - sys-libs/libselinux[ruby] - sec-policy/selinux-puppet - ) - vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) - >=app-portage/eix-0.18.0" - -SITEFILE="50${PN}-mode-gentoo.el" - -#RUBY_PATCHES=( "${FILESDIR}/puppet-openrc-status-fix.patch" ) - -pkg_setup() { - enewgroup puppet - enewuser puppet -1 -1 /var/lib/puppet puppet -} - -all_ruby_compile() { - if use emacs ; then - elisp-compile ext/emacs/puppet-mode.el - fi - - if use xemacs ; then - # Create a separate version for xemacs to be able to install - # emacs and xemacs in parallel. - mkdir ext/xemacs - cp ext/emacs/* ext/xemacs/ - xemacs-elisp-compile ext/xemacs/puppet-mode.el - fi -} - -each_ruby_install() { - ${RUBY} install.rb --destdir="${D}" install || die -} - -all_ruby_install() { - newinitd "${FILESDIR}"/puppet.init-r1 puppet - - # Initial configuration files - insinto /etc/puppet - - # Location of log and data files - keepdir /var/log/puppet - fowners -R puppet:puppet /var/log/puppet - - if use minimal ; then - rm "${ED}/etc/puppet/auth.conf" - else - newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster - newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster - - insinto /etc/puppet - - keepdir /etc/puppet/manifests - keepdir /etc/puppet/modules - - keepdir /var/lib/puppet/ssl - keepdir /var/lib/puppet/facts - keepdir /var/lib/puppet/files - fowners -R puppet:puppet /var/lib/puppet - fi - - if use emacs ; then - elisp-install ${PN} ext/emacs/puppet-mode.el* - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - if use xemacs ; then - xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el* - xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - if use ldap ; then - insinto /etc/openldap/schema; doins ext/ldap/puppet.schema - fi - - # ext and examples files - for f in $(find ext examples -type f) ; do - docinto "$(dirname ${f})"; dodoc "${f}" - done -} - -pkg_postinst() { - elog - elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" - elog "cause puppet to hang while installing packages." - elog - elog "Puppet uses eix to get information about currently installed packages," - elog "so please keep the eix metadata cache updated so puppet is able to properly" - elog "handle package installations." - elog - elog "Currently puppet only supports adding and removing services to the default" - elog "runlevel, if you want to add/remove a service from another runlevel you may" - elog "do so using symlinking." - elog - - if [ \ - -f "${EPREFIX}/etc/puppet/puppetd.conf" -o \ - -f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \ - -f "${EPREFIX}/etc/puppet/puppetca.conf" \ - ] ; then - elog - elog "Please remove deprecated config files." - elog " /etc/puppet/puppetca.conf" - elog " /etc/puppet/puppetd.conf" - elog " /etc/puppet/puppetmasterd.conf" - elog - fi - - if [ "$(get_major_version $REPLACING_VERSIONS)" = "2" ]; then - elog - elog "If you're upgrading from 2.x then we strongly suggest you to read:" - elog "http://docs.puppetlabs.com/guides/upgrading.html" - elog - fi - - use emacs && elisp-site-regen - use xemacs && xemacs-elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen - use xemacs && xemacs-elisp-site-regen -} diff --git a/app-admin/puppet/puppet-3.3.1.ebuild b/app-admin/puppet/puppet-3.3.2-r1.ebuild index 0832f9c0b664..19a237811a7b 100644 --- a/app-admin/puppet/puppet-3.3.1.ebuild +++ b/app-admin/puppet/puppet-3.3.2-r1.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.3.1.ebuild,v 1.1 2013/10/12 10:37:36 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.3.2-r1.ebuild,v 1.1 2013/12/23 00:01:03 prometheanfire Exp $ EAPI="5" -USE_RUBY="ruby18 ruby19" +USE_RUBY="ruby19" inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator @@ -68,6 +68,12 @@ each_ruby_install() { } all_ruby_install() { + #systemd stuffs + insinto /usr/lib/systemd/system + doins "${WORKDIR}/all/${P}/ext/systemd/puppetagent.service" + insinto /usr/lib/tmpfiles.d + newins "${FILESDIR}/tmpfiles.d" "puppet.conf" + newinitd "${FILESDIR}"/puppet.init-r1 puppet # Initial configuration files @@ -80,6 +86,8 @@ all_ruby_install() { if use minimal ; then rm "${ED}/etc/puppet/auth.conf" else + insinto /usr/lib/systemd/system + doins "${WORKDIR}/all/${P}/ext/systemd/puppetmaster.service" newinitd "${FILESDIR}"/puppetmaster.init-r1 puppetmaster newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster @@ -119,14 +127,6 @@ pkg_postinst() { elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" elog "cause puppet to hang while installing packages." elog - elog "Puppet uses eix to get information about currently installed packages," - elog "so please keep the eix metadata cache updated so puppet is able to properly" - elog "handle package installations." - elog - elog "Currently puppet only supports adding and removing services to the default" - elog "runlevel, if you want to add/remove a service from another runlevel you may" - elog "do so using symlinking." - elog elog "Portage Puppet module with Gentoo-specific resources:" elog "http://forge.puppetlabs.com/gentoo/portage" elog |