1 |
commit: d844c528958bc3ad7361388452ec582dc9ccaf19 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Mar 1 02:56:45 2020 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Mar 1 02:57:17 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d844c528 |
7 |
|
8 |
app-admin/puppet: 6.13.0 fast stable for CVE-2020-7942 |
9 |
|
10 |
With Cleanup |
11 |
|
12 |
Bug: https://bugs.gentoo.org/711138 |
13 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
14 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
15 |
|
16 |
app-admin/puppet/Manifest | 1 - |
17 |
app-admin/puppet/puppet-6.12.0.ebuild | 139 ---------------------------------- |
18 |
app-admin/puppet/puppet-6.13.0.ebuild | 2 +- |
19 |
3 files changed, 1 insertion(+), 141 deletions(-) |
20 |
|
21 |
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest |
22 |
index 6d885f33145..327449701fe 100644 |
23 |
--- a/app-admin/puppet/Manifest |
24 |
+++ b/app-admin/puppet/Manifest |
25 |
@@ -1,4 +1,3 @@ |
26 |
DIST puppet-5.5.17.tar.gz 3090402 BLAKE2B 7722ec4196ee766c29eddd7dc73539a4a5a0e4cc781a84af25210488328b5ae01178ca64e8eef14152cbeca06dc8fe145b5e39ce6a120d7689fc32cbbbe16f9f SHA512 95c6cd836a9f732ccfe2d8b83096e79c32428c43390c0826663f896ca1388e1fe3b55d93a5a7548831e95de85247db717866c36786d591e207341c734d70168b |
27 |
DIST puppet-5.5.18.tar.gz 2984835 BLAKE2B d5a1d023d3d26e04ccc81efa772131c06fc7ace8ec59c7efa97bddb775bb492d3256290824a87d54df5c28862cbba98c58cf41bb4a0c27a4128701652c06eee0 SHA512 86f210ee783ca36340b22463cd4ac237d8dc1c6a35526530af0696bb3f0373b0b22f690d3e3f8e31655ea182a33eb60b66b5826bd6c4d1b0059a8e46152416e6 |
28 |
-DIST puppet-6.12.0.tar.gz 2825392 BLAKE2B fdb7007ca337654f5ee89cd6f3beae300c3eb952570eaf1aa9baad407b84b418916e42aed63855bbb250f1d367be12f98261df54253f6438d33950134ef01cce SHA512 bcb77699f4a4a058ea0fa47ee2b449f19053e3ae859e3e30c65a57ad65fc052a4f05d7a932b9cc4b9974b36dc343ac482258ad8d5a44a151362df474b82c11fe |
29 |
DIST puppet-6.13.0.tar.gz 2837171 BLAKE2B dc64b23fa2d5fcb978cfb03bf67f89ff0ae084883320f267bbb7fd613fd8948193658d717ecbf30f73e313c4530f872617a186675547509db9492589e4f226d6 SHA512 fb7abc9cf79a3de1daf597c0c1768ab4abcc11a236beb8294c5fc69d07ae23149216f7c8d33599365d3c10485f3fb3f8f5fe492e0e7312d19ffdaa0bc8b87d0c |
30 |
|
31 |
diff --git a/app-admin/puppet/puppet-6.12.0.ebuild b/app-admin/puppet/puppet-6.12.0.ebuild |
32 |
deleted file mode 100644 |
33 |
index c07935b87c8..00000000000 |
34 |
--- a/app-admin/puppet/puppet-6.12.0.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,139 +0,0 @@ |
37 |
-# Copyright 1999-2020 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI="6" |
41 |
- |
42 |
-USE_RUBY="ruby23 ruby24 ruby25" |
43 |
- |
44 |
-RUBY_FAKEGEM_RECIPE_TEST="rspec3" |
45 |
- |
46 |
-RUBY_FAKEGEM_TASK_DOC="doc:all" |
47 |
- |
48 |
-RUBY_FAKEGEM_EXTRAINSTALL="locales" |
49 |
- |
50 |
-inherit eutils user ruby-fakegem eapi7-ver |
51 |
- |
52 |
-DESCRIPTION="A system automation and configuration management software." |
53 |
-HOMEPAGE="https://puppet.com/" |
54 |
-SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
55 |
- |
56 |
-LICENSE="Apache-2.0 GPL-2" |
57 |
-SLOT="0" |
58 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
59 |
-IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
60 |
-RESTRICT="test" |
61 |
- |
62 |
-ruby_add_rdepend " |
63 |
- dev-ruby/hiera |
64 |
- dev-ruby/json:= |
65 |
- dev-ruby/semantic_puppet |
66 |
- >=dev-ruby/facter-3.0.0 |
67 |
- dev-ruby/concurrent-ruby |
68 |
- augeas? ( dev-ruby/ruby-augeas ) |
69 |
- diff? ( dev-ruby/diff-lcs ) |
70 |
- doc? ( dev-ruby/rdoc ) |
71 |
- ldap? ( dev-ruby/ruby-ldap ) |
72 |
- shadow? ( dev-ruby/ruby-shadow ) |
73 |
- sqlite? ( dev-ruby/sqlite3 ) |
74 |
- virtual/ruby-ssl |
75 |
- dev-ruby/hocon" |
76 |
- |
77 |
-ruby_add_bdepend " |
78 |
- doc? ( dev-ruby/yard ) |
79 |
- test? ( |
80 |
- dev-ruby/mocha |
81 |
- dev-ruby/rack |
82 |
- dev-ruby/rspec-its |
83 |
- )" |
84 |
-# this should go in the above lists, but isn't because of test deps not being keyworded |
85 |
-# dev-ruby/rspec-collection_matchers |
86 |
- |
87 |
-RDEPEND+=" ${RDEPEND} |
88 |
- rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) |
89 |
- selinux? ( |
90 |
- sys-libs/libselinux[ruby] |
91 |
- sec-policy/selinux-puppet |
92 |
- ) |
93 |
- vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) |
94 |
- >=app-portage/eix-0.18.0" |
95 |
-PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )" |
96 |
- |
97 |
-pkg_setup() { |
98 |
- enewgroup puppet |
99 |
- enewuser puppet -1 -1 /var/lib/puppet puppet |
100 |
-} |
101 |
- |
102 |
-all_ruby_prepare() { |
103 |
- # Avoid spec that require unpackaged json-schema. |
104 |
- rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
105 |
- |
106 |
- # can't be run within portage. |
107 |
- epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch" |
108 |
- |
109 |
- # fix systemd path |
110 |
- epatch "${FILESDIR}/puppet-systemd.patch" |
111 |
- |
112 |
- # Avoid specs that can only run in the puppet.git repository. This |
113 |
- # should be narrowed down to the specific specs. |
114 |
- rm spec/integration/parser/compiler_spec.rb || die |
115 |
- |
116 |
- # Avoid failing spec that need further investigation. |
117 |
- rm spec/unit/module_tool/metadata_spec.rb || die |
118 |
-} |
119 |
- |
120 |
-each_ruby_install() { |
121 |
- each_fakegem_install |
122 |
-# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}" |
123 |
-} |
124 |
- |
125 |
-all_ruby_install() { |
126 |
- all_fakegem_install |
127 |
- |
128 |
- # systemd stuffs |
129 |
- insinto /usr/lib/systemd/system |
130 |
- doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service" |
131 |
- |
132 |
- # tmpfiles stuff |
133 |
- insinto /usr/lib/tmpfiles.d |
134 |
- newins "${FILESDIR}/tmpfiles.d" "puppet.conf" |
135 |
- |
136 |
- # openrc init stuff |
137 |
- newinitd "${FILESDIR}"/puppet.init-4.x puppet |
138 |
- |
139 |
- keepdir /etc/puppetlabs/puppet/ssl |
140 |
- |
141 |
- keepdir /var/lib/puppet/facts |
142 |
- keepdir /var/lib/puppet/files |
143 |
- fowners -R puppet:puppet /var/lib/puppet |
144 |
- |
145 |
- fperms 0750 /var/lib/puppet |
146 |
- |
147 |
- fperms 0750 /etc/puppetlabs |
148 |
- fperms 0750 /etc/puppetlabs/puppet |
149 |
- fperms 0750 /etc/puppetlabs/puppet/ssl |
150 |
- fowners -R :puppet /etc/puppetlabs |
151 |
- fowners -R :puppet /var/lib/puppet |
152 |
- |
153 |
- if use ldap ; then |
154 |
- insinto /etc/openldap/schema; doins ext/ldap/puppet.schema |
155 |
- fi |
156 |
- |
157 |
- # ext and examples files |
158 |
- for f in $(find ext examples -type f) ; do |
159 |
- docinto "$(dirname ${f})"; dodoc "${f}" |
160 |
- done |
161 |
-} |
162 |
- |
163 |
-pkg_postinst() { |
164 |
- elog |
165 |
- elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could" |
166 |
- elog "cause puppet to hang while installing packages." |
167 |
- elog |
168 |
- elog "Portage Puppet module with Gentoo-specific resources:" |
169 |
- elog "http://forge.puppetlabs.com/gentoo/portage" |
170 |
- elog |
171 |
- elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" |
172 |
- elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" |
173 |
- elog "not already done so." |
174 |
- elog |
175 |
-} |
176 |
|
177 |
diff --git a/app-admin/puppet/puppet-6.13.0.ebuild b/app-admin/puppet/puppet-6.13.0.ebuild |
178 |
index e60e40c04d6..ed3d22541cb 100644 |
179 |
--- a/app-admin/puppet/puppet-6.13.0.ebuild |
180 |
+++ b/app-admin/puppet/puppet-6.13.0.ebuild |
181 |
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
182 |
|
183 |
LICENSE="Apache-2.0 GPL-2" |
184 |
SLOT="0" |
185 |
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
186 |
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
187 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
188 |
RESTRICT="test" |