| 1 |
commit: a633c58179b3369151dbd84410eab7a308d6b47b |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 15 17:30:23 2019 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 15 17:30:23 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a633c581 |
| 7 |
|
| 8 |
app-admin/puppet-agent: 6.1.0 stable amd64 andx86 with 5.5.8 bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.51, Repoman-2.3.12 |
| 11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 12 |
|
| 13 |
app-admin/puppet-agent/Manifest | 4 ++-- |
| 14 |
...puppet-agent-6.0.3.ebuild => puppet-agent-5.5.8.ebuild} | 14 ++++++++++---- |
| 15 |
app-admin/puppet-agent/puppet-agent-6.1.0.ebuild | 4 ++-- |
| 16 |
3 files changed, 14 insertions(+), 8 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest |
| 19 |
index 08199c68a59..206c7477de0 100644 |
| 20 |
--- a/app-admin/puppet-agent/Manifest |
| 21 |
+++ b/app-admin/puppet-agent/Manifest |
| 22 |
@@ -1,6 +1,6 @@ |
| 23 |
DIST puppet-agent_5.5.7-1stretch_amd64.deb 17300432 BLAKE2B 4c3b13361b9a97734a7b63ad94d1e96d9bcad284372d0b63a085c4415fa7c0433e66546bd43c99a82839837ed5a8683c6d2739d47b629f5580b8007219f06010 SHA512 fa17413afc2f2872963e241b38c2d7abe06ed37b0f01f2ace3cc6c31e53451291fe98905957377940b16d1b6926991ef39b556a4697e9ba06f10f62583f72c9e |
| 24 |
DIST puppet-agent_5.5.7-1stretch_i386.deb 18222282 BLAKE2B b9ce9269cc59d79450cb66c9c3e545ad4267ad1a43905df4ca57b45ad1213dd11c9ddcffb77719a151f52eb60d6792a486823ea4a29b2f4e83a2d62960c9691a SHA512 b65ecaf27c2bcc6556d7d43a0b78e282a64c72eed3b672af5d2e23c34eefe8134b6d4c60505f9d7c6e5b40ed4a1ad391128933c27710819f5078ec7d8680b6d4 |
| 25 |
-DIST puppet-agent_6.0.3-1stretch_amd64.deb 17876404 BLAKE2B 06f4a951270b96e93ff72c5e0e1deb8c2e21588a424e06d9619397586d2c92367debab0d552df0c88bd2ccc53644c53b1117f2826d01e2feeab94934505e3700 SHA512 1dfbd1a9266f0d092d71071e9d6c271e2ca9ff6a8457699a9561a8f5ad2be05ef779f80d5dac3dbe3744dad30b66bd98dd593ca7e7f2696183eb30edb430bf4c |
| 26 |
-DIST puppet-agent_6.0.3-1stretch_i386.deb 18615216 BLAKE2B 8fd3e6344fd9773dae7bc1bd94543cfbe7f71158423b00aac01be4c3e911c6576ea159fc5cbf88ff5342e8b7e13d14fa23524771b33688ac828b40df508bd613 SHA512 9aea3b90693a566fe9f285da60772f739c07d7cc40abaa6a98bc0e4d2d2eba1178c01a6e8d4b2a48b6f0009d3bef8434412b2eeb5876966249fd872ef8bda159 |
| 27 |
+DIST puppet-agent_5.5.8-1stretch_amd64.deb 17302932 BLAKE2B 4ff925477f74e5ecb7737cd41712bcd8b0b54d244784fd874ad160bc7cd33327af615ec117fc28cd45d59f275c51aa71f80de204f1f395ef89c7162d5acc3cef SHA512 f30cf250855c4f5adfe58f8c3c7dcdcf155ba97a9a805449555134fb9fedcf6c4d4ab54483d4c1530ae09583e6ca78d1af446cc7fc62760c4aa839c1e9d42bc8 |
| 28 |
+DIST puppet-agent_5.5.8-1stretch_i386.deb 18221644 BLAKE2B fcacbae34bdb6fa18eff344123908880de2e5025ccddd25ee751c5c2b229ff8b63c66d482d4e8139b0d263edeff78771459cd90beff36136a553b039a7c417a9 SHA512 e00c04eacea360619f9fa4e016b8421fbf44127f979ed772e06cef21a15261a7d201abb9bcde30d8bb4e36a4b37d38d67814b2c1077b33ee6e6404c898c53e32 |
| 29 |
DIST puppet-agent_6.1.0-1stretch_amd64.deb 17902402 BLAKE2B 4fb8a0e85fc4dcee0ad08ca45b90ddafca3ae3f605bc9b461be2e2b31a35412c23229f8ea58a7c2ce97df2f3951598529df874911bc446d7f5f41a1f36b0cc0d SHA512 6f5ae6ee3479021ff455c7b9344cd54a3d0a7ecf57b2403343297b1d1d017e995eacf0fed210976db799b9e833b26557917ca4319ffd01dffeb92d2a9418b7c9 |
| 30 |
DIST puppet-agent_6.1.0-1stretch_i386.deb 18652482 BLAKE2B 42c03e6c1c6c86d54875a6fd79c4a67b9b83daef42415cd9c7f1fc445912f051be3c2cd21f804318779169eeabd1ec15b9a2fb5389601416aea44c2533c7a879 SHA512 d78e2fb3ec28bb60a46ba1dae8d4e1292ac9346a7471aa29af6cea1a249496c4d96e7ff006700482b08338d3155dbba653d86be0d65dc31c522dd8fb4b5b4dfa |
| 31 |
|
| 32 |
diff --git a/app-admin/puppet-agent/puppet-agent-6.0.3.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.8.ebuild |
| 33 |
similarity index 78% |
| 34 |
rename from app-admin/puppet-agent/puppet-agent-6.0.3.ebuild |
| 35 |
rename to app-admin/puppet-agent/puppet-agent-5.5.8.ebuild |
| 36 |
index 54c238bc455..388141a5324 100644 |
| 37 |
--- a/app-admin/puppet-agent/puppet-agent-6.0.3.ebuild |
| 38 |
+++ b/app-admin/puppet-agent/puppet-agent-5.5.8.ebuild |
| 39 |
@@ -1,23 +1,24 @@ |
| 40 |
-# Copyright 1999-2018 Gentoo Authors |
| 41 |
+# Copyright 1999-2019 Gentoo Authors |
| 42 |
# Distributed under the terms of the GNU General Public License v2 |
| 43 |
|
| 44 |
EAPI=6 |
| 45 |
inherit eutils systemd unpacker user |
| 46 |
|
| 47 |
-DESCRIPTION="general puppet client utils along with hiera and facter" |
| 48 |
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter" |
| 49 |
HOMEPAGE="https://puppetlabs.com/" |
| 50 |
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch" |
| 51 |
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch" |
| 52 |
SRC_URI=" |
| 53 |
amd64? ( ${SRC_BASE}_amd64.deb ) |
| 54 |
x86? ( ${SRC_BASE}_i386.deb )" |
| 55 |
|
| 56 |
LICENSE="Apache-2.0" |
| 57 |
SLOT="0" |
| 58 |
-KEYWORDS="amd64 x86" |
| 59 |
+KEYWORDS="~amd64 ~x86" |
| 60 |
IUSE="puppetdb selinux" |
| 61 |
RESTRICT="strip" |
| 62 |
|
| 63 |
CDEPEND="!app-admin/augeas |
| 64 |
+ !app-admin/mcollective |
| 65 |
!app-admin/puppet |
| 66 |
!dev-ruby/hiera |
| 67 |
!dev-ruby/facter |
| 68 |
@@ -47,6 +48,7 @@ pkg_setup() { |
| 69 |
src_install() { |
| 70 |
# conf.d |
| 71 |
doconfd etc/default/puppet |
| 72 |
+ doconfd etc/default/mcollective |
| 73 |
doconfd etc/default/pxp-agent |
| 74 |
# logrotate.d |
| 75 |
insinto /etc/logrotate.d |
| 76 |
@@ -64,7 +66,9 @@ src_install() { |
| 77 |
fperms 0750 /opt/puppetlabs/puppet/cache |
| 78 |
# init |
| 79 |
newinitd "${FILESDIR}/puppet.initd" puppet |
| 80 |
+ newinitd "${FILESDIR}/mcollective.initd" mcollective |
| 81 |
systemd_dounit lib/systemd/system/puppet.service |
| 82 |
+ systemd_dounit lib/systemd/system/mcollective.service |
| 83 |
systemd_dounit lib/systemd/system/pxp-agent.service |
| 84 |
systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf |
| 85 |
# symlinks |
| 86 |
@@ -72,7 +76,9 @@ src_install() { |
| 87 |
chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" |
| 88 |
dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter |
| 89 |
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera |
| 90 |
+ dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco |
| 91 |
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet |
| 92 |
+ dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived |
| 93 |
dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what |
| 94 |
dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse |
| 95 |
dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool |
| 96 |
|
| 97 |
diff --git a/app-admin/puppet-agent/puppet-agent-6.1.0.ebuild b/app-admin/puppet-agent/puppet-agent-6.1.0.ebuild |
| 98 |
index 4ad0513947d..528983f6faf 100644 |
| 99 |
--- a/app-admin/puppet-agent/puppet-agent-6.1.0.ebuild |
| 100 |
+++ b/app-admin/puppet-agent/puppet-agent-6.1.0.ebuild |
| 101 |
@@ -1,4 +1,4 @@ |
| 102 |
-# Copyright 1999-2018 Gentoo Authors |
| 103 |
+# Copyright 1999-2019 Gentoo Authors |
| 104 |
# Distributed under the terms of the GNU General Public License v2 |
| 105 |
|
| 106 |
EAPI=6 |
| 107 |
@@ -13,7 +13,7 @@ SRC_URI=" |
| 108 |
|
| 109 |
LICENSE="Apache-2.0" |
| 110 |
SLOT="0" |
| 111 |
-KEYWORDS="~amd64 ~x86" |
| 112 |
+KEYWORDS="amd64 x86" |
| 113 |
IUSE="puppetdb selinux" |
| 114 |
RESTRICT="strip" |
Archives