| 1 |
commit: ab561fcf57a0ba7e776aca6be5627d0a85044751 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed May 1 00:03:56 2019 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 1 00:15:12 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab561fcf |
| 7 |
|
| 8 |
app-admin/puppet-agent: 5.5.14 and 6.4.2 bump |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 12 |
|
| 13 |
app-admin/puppet-agent/Manifest | 6 ++++-- |
| 14 |
...{puppet-agent-6.4.1.ebuild => puppet-agent-5.5.14.ebuild} | 12 +++++++++--- |
| 15 |
.../{puppet-agent-6.4.1.ebuild => puppet-agent-6.4.2.ebuild} | 0 |
| 16 |
3 files changed, 13 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest |
| 19 |
index 4a36d0086d0..49d8e11ec93 100644 |
| 20 |
--- a/app-admin/puppet-agent/Manifest |
| 21 |
+++ b/app-admin/puppet-agent/Manifest |
| 22 |
@@ -1,8 +1,10 @@ |
| 23 |
+DIST puppet-agent_5.5.14-1stretch_amd64.deb 17369338 BLAKE2B bc0544d49f704b07fe058164eb9e1f3f9dc8613337942043a1f4d1359105c986b3b170fda076e8bb4fb74a4d0a423c434d27669410edefe7834ab633217e1ff6 SHA512 410f3e76a571f48456ce6e6b83a957fe33391db72c428d2518001ccce23d29e4911d740cb9c70903050f9a69c815fce8988caa1ba469742b334b1f61229f1a31 |
| 24 |
+DIST puppet-agent_5.5.14-1stretch_i386.deb 18294894 BLAKE2B 928ea0c7113dc6789a37b83f4499485d17f09cf7ac1ace5c3aad87f0a93e4143cd4763f61e42d35a7561d5438d7b5d70d6181ab7233f72eaccb67cc4d5388d18 SHA512 8ae02257cf729ce41e6437d9ee2f221884b0e49dda7b3fc04ef200487c937f258075f563817bb064a19c30ec19b790f4d9d03e240d8a363f2942cd613c579c1b |
| 25 |
DIST puppet-agent_5.5.7-1stretch_amd64.deb 17300432 BLAKE2B 4c3b13361b9a97734a7b63ad94d1e96d9bcad284372d0b63a085c4415fa7c0433e66546bd43c99a82839837ed5a8683c6d2739d47b629f5580b8007219f06010 SHA512 fa17413afc2f2872963e241b38c2d7abe06ed37b0f01f2ace3cc6c31e53451291fe98905957377940b16d1b6926991ef39b556a4697e9ba06f10f62583f72c9e |
| 26 |
DIST puppet-agent_5.5.7-1stretch_i386.deb 18222282 BLAKE2B b9ce9269cc59d79450cb66c9c3e545ad4267ad1a43905df4ca57b45ad1213dd11c9ddcffb77719a151f52eb60d6792a486823ea4a29b2f4e83a2d62960c9691a SHA512 b65ecaf27c2bcc6556d7d43a0b78e282a64c72eed3b672af5d2e23c34eefe8134b6d4c60505f9d7c6e5b40ed4a1ad391128933c27710819f5078ec7d8680b6d4 |
| 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.3.0-1stretch_amd64.deb 18716014 BLAKE2B 914686e0229b40ea2e4f29c31556fdd289e7f556c471ea3e3a8cec887e1e1175ab5e23fc2605e3c156f9f571a8ff47b1a77b4f1173e41b923d7bd59592b575ed SHA512 fd5f39c4cb2fb040e45a0b2316857ad9da311532a9d1659f9df07ad57f85daec2e7674109c63885325c809e839b017b7b3d5ac57f9439e03b569203bf301851d |
| 30 |
DIST puppet-agent_6.3.0-1stretch_i386.deb 19243158 BLAKE2B 52c36e54ecb2e1fcc9ef5add8393533f68a21fde0f449b558d1fe58b066519138092e15c851e33580e9c2b943ef7a58b323cdd7bc1997faa273db4f518292465 SHA512 aba93bb2290879f5512f2429af658b137a3b5ae51ce9817fb701086be7abe4043b54d242fdc1310876b42124819885f8ab97c9fb6cc9113a50115bc071d42736 |
| 31 |
-DIST puppet-agent_6.4.1-1stretch_amd64.deb 18772178 BLAKE2B 6355578e7254965213bb0bc7df43def6faffeafc7f16aba22eafc0a9abed75d30d7e73f78c8641931526f775037ab6b07a1d3f47367a42545b585c48299550ee SHA512 b1d71c44a2d674529b94619b407cd5386bdfbe334fbe68e666361e8e91275487a2d841e9cb90002c768291b045447fb61d010de7cb0e068cabacbba3c601a960 |
| 32 |
-DIST puppet-agent_6.4.1-1stretch_i386.deb 19258406 BLAKE2B 8c29b8ac9a9afcc3540ac68488242ab6f6d2d1548c8f8b66adcf1874fa2ca0077b76d6de67ceac5091e1118cdcbff410639b8ea4fd022f396dc663a6851407af SHA512 a5c039581c5d3c52de9e960f7e5d314751e18184028ea6bc98e89af9a141c54f29dc4499db3d9fdf6e2db6ea6b4a8ffa691877d458a31c0d8660e49b28209597 |
| 33 |
+DIST puppet-agent_6.4.2-1stretch_amd64.deb 18776024 BLAKE2B d8fd52357abb9649d74c9b7e54eb0f599cc2b6b1cbe8a4bdd3bd21c69904379dcda2fdea4e642d3f86bef846d1bdfb14eb8c3daed50958ad3add46bde96fe5d2 SHA512 b1bdbcb1cb87bbf4391073b0596d759e1386bd5b93046d25be112f1ddad6a0d4da162116dc9f85908de67bfd3d956a1c418faf39a85c3ed0d02f9891d4d9906c |
| 34 |
+DIST puppet-agent_6.4.2-1stretch_i386.deb 19250972 BLAKE2B 8424047586f7747daf24901f7ba134bfcd1fc4db094fd458f4298251880b0446221575cc463c511a32a6f7cf4c635c95b6132631640b5091e48b1e7cec67b844 SHA512 0041b1e3ff1401b21f7d9ab3b3aee66d76e30acd4748571ff3ff595d7006008e0d9d3f4c28db85cccece0cf08595cf4a3342353f5b18ea3e02ae02a094e42e41 |
| 35 |
|
| 36 |
diff --git a/app-admin/puppet-agent/puppet-agent-6.4.1.ebuild b/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild |
| 37 |
similarity index 80% |
| 38 |
copy from app-admin/puppet-agent/puppet-agent-6.4.1.ebuild |
| 39 |
copy to app-admin/puppet-agent/puppet-agent-5.5.14.ebuild |
| 40 |
index a72df734d6b..388141a5324 100644 |
| 41 |
--- a/app-admin/puppet-agent/puppet-agent-6.4.1.ebuild |
| 42 |
+++ b/app-admin/puppet-agent/puppet-agent-5.5.14.ebuild |
| 43 |
@@ -1,12 +1,12 @@ |
| 44 |
# Copyright 1999-2019 Gentoo Authors |
| 45 |
# Distributed under the terms of the GNU General Public License v2 |
| 46 |
|
| 47 |
-EAPI=7 |
| 48 |
+EAPI=6 |
| 49 |
inherit eutils systemd unpacker user |
| 50 |
|
| 51 |
-DESCRIPTION="general puppet client utils along with hiera and facter" |
| 52 |
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter" |
| 53 |
HOMEPAGE="https://puppetlabs.com/" |
| 54 |
-SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch" |
| 55 |
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch" |
| 56 |
SRC_URI=" |
| 57 |
amd64? ( ${SRC_BASE}_amd64.deb ) |
| 58 |
x86? ( ${SRC_BASE}_i386.deb )" |
| 59 |
@@ -18,6 +18,7 @@ IUSE="puppetdb selinux" |
| 60 |
RESTRICT="strip" |
| 61 |
|
| 62 |
CDEPEND="!app-admin/augeas |
| 63 |
+ !app-admin/mcollective |
| 64 |
!app-admin/puppet |
| 65 |
!dev-ruby/hiera |
| 66 |
!dev-ruby/facter |
| 67 |
@@ -47,6 +48,7 @@ pkg_setup() { |
| 68 |
src_install() { |
| 69 |
# conf.d |
| 70 |
doconfd etc/default/puppet |
| 71 |
+ doconfd etc/default/mcollective |
| 72 |
doconfd etc/default/pxp-agent |
| 73 |
# logrotate.d |
| 74 |
insinto /etc/logrotate.d |
| 75 |
@@ -64,7 +66,9 @@ src_install() { |
| 76 |
fperms 0750 /opt/puppetlabs/puppet/cache |
| 77 |
# init |
| 78 |
newinitd "${FILESDIR}/puppet.initd" puppet |
| 79 |
+ newinitd "${FILESDIR}/mcollective.initd" mcollective |
| 80 |
systemd_dounit lib/systemd/system/puppet.service |
| 81 |
+ systemd_dounit lib/systemd/system/mcollective.service |
| 82 |
systemd_dounit lib/systemd/system/pxp-agent.service |
| 83 |
systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf |
| 84 |
# symlinks |
| 85 |
@@ -72,7 +76,9 @@ src_install() { |
| 86 |
chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" |
| 87 |
dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter |
| 88 |
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera |
| 89 |
+ dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco |
| 90 |
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet |
| 91 |
+ dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived |
| 92 |
dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what |
| 93 |
dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse |
| 94 |
dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool |
| 95 |
|
| 96 |
diff --git a/app-admin/puppet-agent/puppet-agent-6.4.1.ebuild b/app-admin/puppet-agent/puppet-agent-6.4.2.ebuild |
| 97 |
similarity index 100% |
| 98 |
rename from app-admin/puppet-agent/puppet-agent-6.4.1.ebuild |
| 99 |
rename to app-admin/puppet-agent/puppet-agent-6.4.2.ebuild |
Archives