1 |
commit: b355f0495a75050fb8ac821d310370b7bc8286b6 |
2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 20 15:33:00 2021 +0000 |
4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 20 15:34:16 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b355f049 |
7 |
|
8 |
app-admin/puppet-agent: 6.19.1 7.10.0 clean up |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
12 |
|
13 |
app-admin/puppet-agent/Manifest | 2 - |
14 |
.../puppet-agent/puppet-agent-6.19.1-r2.ebuild | 91 ---------------------- |
15 |
.../puppet-agent/puppet-agent-7.10.0-r1.ebuild | 90 --------------------- |
16 |
3 files changed, 183 deletions(-) |
17 |
|
18 |
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest |
19 |
index 2afbe64897c..7faf77d14c1 100644 |
20 |
--- a/app-admin/puppet-agent/Manifest |
21 |
+++ b/app-admin/puppet-agent/Manifest |
22 |
@@ -1,4 +1,2 @@ |
23 |
-DIST puppet-agent_6.19.1-1focal_amd64.deb 22221600 BLAKE2B 22b03ef1f86b34955e8bad7c63a2022d2832dadd554316baf75419d6543e8a569902fb92a81a3dcc817401f06aa7dd47143a6cbd383f0e531c465cd3203dc4ed SHA512 4819a3509066516b0be76bc0f2afe94611405f7ac52fe50890d57c86a8a9c6c70787d46cb4b77085666f3e74bcb83a11acf1fef5d1e6ed3151ea06cbb8df3170 |
24 |
-DIST puppet-agent_7.10.0-1focal_amd64.deb 20964600 BLAKE2B 160a5abf3dccb57b325283f9ec6f908be73aaa065787bc6cefe2db0fbfd67145a42cab1a763e2e14c64b7902c50814b09a4b4763aaa504536f289b485cd41a6b SHA512 88c2907e47ad3009c9ce9089d3fb91da68c6c80d9d50fbf714332f2f637ad69adc122a88042cac020ae9c637b07e6569ffab7998ca08aa57a67254748cce5d30 |
25 |
DIST puppet-agent_7.11.0-1focal_amd64.deb 20968988 BLAKE2B 41c1464290fc38b9bb2a79384c6c427ec8cd1332b3ccba155cb26d43a87b36931415d3a54a10ae8f6a1322f02eeaef27147d4af7304f541ce38e668b072cc03c SHA512 38024f80af5ef69a1db22f9ed90b7b00af5183988b2029fa63a8b2fa1de1c189ba164d8cd450156c4d822a3e6404e5933ca09efdd4eeee7188c99791991a9921 |
26 |
DIST puppet-agent_7.12.0-1focal_amd64.deb 20971412 BLAKE2B afb9af877e578b6ae24566e0688d14fa67fdb133a3fd9e15dc2473ea76f61a6551bd69a6fad18b6b555eea2afa8fd858a005f2c1cf6681c28f4422129211dea9 SHA512 f5fdab728baa7813f31ba174b0ee7e9dee3f5f954ed46a2f6740cf6ad075c8f36a1b6cb28e7c6223eb4aad02400252114a5dcede0085f7a7e7ba079bad2aedf9 |
27 |
|
28 |
diff --git a/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild b/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild |
29 |
deleted file mode 100644 |
30 |
index 8ef74d148ca..00000000000 |
31 |
--- a/app-admin/puppet-agent/puppet-agent-6.19.1-r2.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,91 +0,0 @@ |
34 |
-# Copyright 1999-2021 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=7 |
38 |
-inherit systemd unpacker tmpfiles |
39 |
- |
40 |
-DESCRIPTION="general puppet client utils along with hiera and facter" |
41 |
-HOMEPAGE="https://puppetlabs.com/" |
42 |
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb" |
43 |
- |
44 |
-LICENSE="Apache-2.0" |
45 |
-SLOT="0" |
46 |
-KEYWORDS="amd64" |
47 |
-IUSE="puppetdb selinux" |
48 |
-RESTRICT="strip" |
49 |
- |
50 |
-# virtual/libcrypt:= is in here despite being a pre-built package |
51 |
-# to ensure that the has_version logic for the symlink doesn't become stale |
52 |
-CDEPEND="!app-admin/puppet |
53 |
- !dev-ruby/hiera |
54 |
- !dev-ruby/facter |
55 |
- !app-emulation/virt-what |
56 |
- acct-user/puppet |
57 |
- acct-group/puppet |
58 |
- virtual/libcrypt:=" |
59 |
-DEPEND=" |
60 |
- ${CDEPEND} |
61 |
- app-admin/augeas" |
62 |
-RDEPEND="${CDEPEND} |
63 |
- app-portage/eix |
64 |
- sys-apps/dmidecode |
65 |
- sys-libs/libselinux |
66 |
- sys-libs/glibc |
67 |
- sys-libs/readline:0/8 |
68 |
- sys-libs/libxcrypt |
69 |
- sys-libs/ncurses:0[tinfo] |
70 |
- selinux? ( |
71 |
- sys-libs/libselinux[ruby] |
72 |
- sec-policy/selinux-puppet |
73 |
- ) |
74 |
- puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" |
75 |
- |
76 |
-S=${WORKDIR} |
77 |
- |
78 |
-QA_PREBUILT="*" |
79 |
- |
80 |
-src_install() { |
81 |
- # conf.d |
82 |
- doconfd etc/default/puppet |
83 |
- doconfd etc/default/pxp-agent |
84 |
- # logrotate.d |
85 |
- insinto /etc/logrotate.d |
86 |
- doins etc/logrotate.d/pxp-agent |
87 |
- # puppet itself |
88 |
- insinto /etc/puppetlabs |
89 |
- doins -r etc/puppetlabs/* |
90 |
- # logdir for systemd |
91 |
- dodir var/log/puppetlabs/puppet/ |
92 |
- fperms 0750 var/log/puppetlabs/puppet/ |
93 |
- # the rest |
94 |
- insinto /opt |
95 |
- dodir opt/puppetlabs/puppet/cache |
96 |
- doins -r opt/* |
97 |
- fperms 0750 /opt/puppetlabs/puppet/cache |
98 |
- # init |
99 |
- newinitd "${FILESDIR}/puppet.initd2" puppet |
100 |
- systemd_dounit lib/systemd/system/puppet.service |
101 |
- systemd_dounit lib/systemd/system/pxp-agent.service |
102 |
- newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf |
103 |
- # symlinks |
104 |
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" |
105 |
- chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper" |
106 |
- dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter |
107 |
- dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera |
108 |
- dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet |
109 |
- dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what |
110 |
- |
111 |
- # Handling of the path to the crypt library during the ongoing migration |
112 |
- # from glibc[crypt] to libxcrypt |
113 |
- # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html |
114 |
- if has_version "sys-libs/glibc[crypt]"; then |
115 |
- local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' |
116 |
- else |
117 |
- local crypt_target='../../../../usr/lib/libcrypt.so.1' |
118 |
- fi |
119 |
- dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 |
120 |
-} |
121 |
- |
122 |
-pkg_postinst() { |
123 |
- tmpfiles_process puppet-agent.conf |
124 |
-} |
125 |
|
126 |
diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild |
127 |
deleted file mode 100644 |
128 |
index 77dd8d3fbcf..00000000000 |
129 |
--- a/app-admin/puppet-agent/puppet-agent-7.10.0-r1.ebuild |
130 |
+++ /dev/null |
131 |
@@ -1,90 +0,0 @@ |
132 |
-# Copyright 1999-2021 Gentoo Authors |
133 |
-# Distributed under the terms of the GNU General Public License v2 |
134 |
- |
135 |
-EAPI=7 |
136 |
-inherit systemd unpacker tmpfiles |
137 |
- |
138 |
-DESCRIPTION="general puppet client utils along with hiera and facter" |
139 |
-HOMEPAGE="https://puppetlabs.com/" |
140 |
-SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1focal_amd64.deb" |
141 |
- |
142 |
-LICENSE="Apache-2.0" |
143 |
-SLOT="0" |
144 |
-KEYWORDS="amd64" |
145 |
-IUSE="puppetdb selinux" |
146 |
-RESTRICT="strip" |
147 |
- |
148 |
-# virtual/libcrypt:= is in here despite being a pre-built package |
149 |
-# to ensure that the has_version logic for the symlink doesn't become stale |
150 |
-CDEPEND="!app-admin/puppet |
151 |
- !dev-ruby/hiera |
152 |
- !dev-ruby/facter |
153 |
- app-emulation/virt-what |
154 |
- acct-user/puppet |
155 |
- acct-group/puppet |
156 |
- virtual/libcrypt:=" |
157 |
- |
158 |
-DEPEND=" |
159 |
- ${CDEPEND} |
160 |
- app-admin/augeas" |
161 |
-RDEPEND="${CDEPEND} |
162 |
- app-portage/eix |
163 |
- sys-apps/dmidecode |
164 |
- sys-libs/libselinux |
165 |
- sys-libs/glibc |
166 |
- sys-libs/readline:0/8 |
167 |
- sys-libs/libxcrypt[compat] |
168 |
- sys-libs/ncurses:0[tinfo] |
169 |
- selinux? ( |
170 |
- sys-libs/libselinux[ruby] |
171 |
- sec-policy/selinux-puppet |
172 |
- ) |
173 |
- puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )" |
174 |
- |
175 |
-S=${WORKDIR} |
176 |
- |
177 |
-QA_PREBUILT="*" |
178 |
- |
179 |
-src_install() { |
180 |
- # conf.d |
181 |
- doconfd etc/default/puppet |
182 |
- doconfd etc/default/pxp-agent |
183 |
- # logrotate.d |
184 |
- insinto /etc/logrotate.d |
185 |
- doins etc/logrotate.d/pxp-agent |
186 |
- # puppet itself |
187 |
- insinto /etc/puppetlabs |
188 |
- doins -r etc/puppetlabs/* |
189 |
- # logdir for systemd |
190 |
- keepdir var/log/puppetlabs/puppet/ |
191 |
- chmod 0750 var/log/puppetlabs/puppet/ |
192 |
- # the rest |
193 |
- insinto /opt |
194 |
- dodir opt/puppetlabs/puppet/cache |
195 |
- doins -r opt/* |
196 |
- fperms 0750 /opt/puppetlabs/puppet/cache |
197 |
- # init |
198 |
- newinitd "${FILESDIR}/puppet.initd2" puppet |
199 |
- systemd_dounit lib/systemd/system/puppet.service |
200 |
- systemd_dounit lib/systemd/system/pxp-agent.service |
201 |
- newtmpfiles usr/lib/tmpfiles.d/puppet-agent.conf puppet-agent.conf |
202 |
- # symlinks |
203 |
- chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/" |
204 |
- dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter |
205 |
- dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera |
206 |
- dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet |
207 |
- |
208 |
- # Handling of the path to the crypt library during the ongoing migration |
209 |
- # from glibc[crypt] to libxcrypt |
210 |
- # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html |
211 |
- if has_version "sys-libs/glibc[crypt]"; then |
212 |
- local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' |
213 |
- else |
214 |
- local crypt_target='../../../../usr/lib/libcrypt.so.1' |
215 |
- fi |
216 |
- dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 |
217 |
-} |
218 |
- |
219 |
-pkg_postinst() { |
220 |
- tmpfiles_process puppet-agent.conf |
221 |
-} |