| 1 |
commit: 0aebebe63403f65f997b0c2e5e0d1f7b5eb2de21 |
| 2 |
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 2 02:33:57 2018 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 2 02:36:28 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aebebe6 |
| 7 |
|
| 8 |
app-admin/puppet: 5.5.8 and 6.0.4 bump |
| 9 |
|
| 10 |
puppet master / server was removed in 6.x :( |
| 11 |
|
| 12 |
Fixes: https://bugs.gentoo.org/670118 |
| 13 |
|
| 14 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 15 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
| 16 |
|
| 17 |
app-admin/puppet/Manifest | 2 ++ |
| 18 |
.../{puppet-6.0.2.ebuild => puppet-5.5.8.ebuild} | 10 +++++----- |
| 19 |
.../{puppet-6.0.2.ebuild => puppet-6.0.2-r1.ebuild} | 15 ++++----------- |
| 20 |
.../{puppet-6.0.2.ebuild => puppet-6.0.4.ebuild} | 19 ++++++------------- |
| 21 |
4 files changed, 17 insertions(+), 29 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest |
| 24 |
index 19db39fefce..a7bed2c8ea1 100644 |
| 25 |
--- a/app-admin/puppet/Manifest |
| 26 |
+++ b/app-admin/puppet/Manifest |
| 27 |
@@ -3,4 +3,6 @@ DIST puppet-4.10.12.tar.gz 3022218 BLAKE2B 03757857868b1544078ae5e40d6e438631c78 |
| 28 |
DIST puppet-5.5.3.tar.gz 3040000 BLAKE2B d2534da5956806e5280c59e82332f1ffca79e72f73b1abb460f155aac936a5ba1719f18dc5742c85fca365ff6b03a602ca0ceaa04714091045ab2afac1b57823 SHA512 14a711002c64f0598930f64e9e2b81c03daddda750860acb349271c1cc9d04c0d149b14817b200dda26f0ca75c3f79593990ecf28a5cca83220a3f5a16eac34d |
| 29 |
DIST puppet-5.5.6.tar.gz 3026301 BLAKE2B eb05a0c4eed99ce1ce7a77be76da069be1e4b4f8917206b3811a3a7378c2e39b9c84b560bbcce0bee180ddb502251efb48362dd1c2494c79e6f441cde41a2707 SHA512 53bccc4cf3d4dde3079d96cd28b4cf380d004fdf67da8eaeaf70706ca5e1fe611910042f1aa03453fb29419bb9888a0eeef9a9d64e8f0cfe5d8d7a73e5bf5850 |
| 30 |
DIST puppet-5.5.7.tar.gz 3058343 BLAKE2B b3a1ef97c3da94f82e872485047da165ad7f2d98240f6ff1d691e1d5c3864b1d00235f71a91fe5f0564ae565f3e665fa2fcf9597a57b0e8ab1ec0e2acc18d69a SHA512 ef1e8542280948cabf711354a397c22aaf8e7ae853c829f6363c1b8adb3534e76865fcdf03f4a6cc6dc156b166cb0d87cdb64204702e369c0169f05dcaa8e49e |
| 31 |
+DIST puppet-5.5.8.tar.gz 3056987 BLAKE2B cfb0599f5a9a6f254b0e853ece390dcc4fb3e8cd40956955b81e9dd9ae3c3c39c18a0f5f010b269c8c21f1b288f50c354e4c40cd0cbd3ad3128dd95c3c7d0cca SHA512 2ed960c0fcd4f6b0a7eacfffd8bc3ca88387bade0ce5ac6cbb247752f18927959286b1238c146d3d2bda7f8bee171fc502b44b129c4778feafbda90d993ee816 |
| 32 |
DIST puppet-6.0.2.tar.gz 2796833 BLAKE2B a3d09dfd7dd0cadb2f752b4836336abd98c8cf6350f4e8b503a7e6b3029e59ff235f3567033b20bc3724708a9504db9ee87ac4c8374f0488862a7205a8a65069 SHA512 f32298d2884927f02f5316dde1d3d9bf33b89f6d011e2eab7f935b730a16d39277b5c17b2986eab91c19aefd5071b5fcbba62550ddd60e3b964f33f4029ac25a |
| 33 |
+DIST puppet-6.0.4.tar.gz 2804651 BLAKE2B d2e685938b57ec896446a658d6a115f999b2254064711ceb6a139da3c5ffe488ba2dbd2da39b3a6c889027d971f44ff4fc99f87ceec95cc8b79eefc86f43f614 SHA512 fcfc0a9e1a707945c89e3080c1795511fd28143576886552d8e3635d62f526d0b3f9ed2a400ecc0084b63906246cb86e176b288ac049d01d0f9cf47fc65fe332 |
| 34 |
|
| 35 |
diff --git a/app-admin/puppet/puppet-6.0.2.ebuild b/app-admin/puppet/puppet-5.5.8.ebuild |
| 36 |
similarity index 94% |
| 37 |
copy from app-admin/puppet/puppet-6.0.2.ebuild |
| 38 |
copy to app-admin/puppet/puppet-5.5.8.ebuild |
| 39 |
index 11f3fa690f1..fb4ab3b1efc 100644 |
| 40 |
--- a/app-admin/puppet/puppet-6.0.2.ebuild |
| 41 |
+++ b/app-admin/puppet/puppet-5.5.8.ebuild |
| 42 |
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_DOC="doc:all" |
| 43 |
|
| 44 |
RUBY_FAKEGEM_EXTRAINSTALL="locales" |
| 45 |
|
| 46 |
-inherit eutils user ruby-fakegem versionator |
| 47 |
+inherit eutils user ruby-fakegem eapi7-ver |
| 48 |
|
| 49 |
DESCRIPTION="A system automation and configuration management software." |
| 50 |
HOMEPAGE="http://puppetlabs.com/" |
| 51 |
@@ -19,14 +19,13 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
| 52 |
|
| 53 |
LICENSE="Apache-2.0 GPL-2" |
| 54 |
SLOT="0" |
| 55 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
| 56 |
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
| 57 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
| 58 |
RESTRICT="test" |
| 59 |
|
| 60 |
ruby_add_rdepend " |
| 61 |
dev-ruby/hiera |
| 62 |
dev-ruby/json:= |
| 63 |
- dev-ruby/semantic_puppet |
| 64 |
>=dev-ruby/facter-3.0.0 |
| 65 |
augeas? ( dev-ruby/ruby-augeas ) |
| 66 |
diff? ( dev-ruby/diff-lcs ) |
| 67 |
@@ -67,7 +66,7 @@ all_ruby_prepare() { |
| 68 |
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die |
| 69 |
|
| 70 |
# can't be run within portage. |
| 71 |
- epatch "${FILESDIR}/puppet-fix-tests-6.0.0.patch" |
| 72 |
+ epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch" |
| 73 |
|
| 74 |
# fix systemd path |
| 75 |
epatch "${FILESDIR}/puppet-systemd.patch" |
| 76 |
@@ -135,7 +134,8 @@ pkg_postinst() { |
| 77 |
elog |
| 78 |
|
| 79 |
for v in ${REPLACING_VERSIONS}; do |
| 80 |
- if [ "$(get_major_version $v)" = "4" ]; then |
| 81 |
+ v=$(ver_cut "4.0.0" "$v") |
| 82 |
+ if [ ver_test "$v" -eq "4" ]; then |
| 83 |
elog |
| 84 |
elog "Please see the following url for the release notes for puppet-5" |
| 85 |
elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x" |
| 86 |
|
| 87 |
diff --git a/app-admin/puppet/puppet-6.0.2.ebuild b/app-admin/puppet/puppet-6.0.2-r1.ebuild |
| 88 |
similarity index 89% |
| 89 |
copy from app-admin/puppet/puppet-6.0.2.ebuild |
| 90 |
copy to app-admin/puppet/puppet-6.0.2-r1.ebuild |
| 91 |
index 11f3fa690f1..3079ab5dd7e 100644 |
| 92 |
--- a/app-admin/puppet/puppet-6.0.2.ebuild |
| 93 |
+++ b/app-admin/puppet/puppet-6.0.2-r1.ebuild |
| 94 |
@@ -98,8 +98,6 @@ all_ruby_install() { |
| 95 |
|
| 96 |
# openrc init stuff |
| 97 |
newinitd "${FILESDIR}"/puppet.init-4.x puppet |
| 98 |
- newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster |
| 99 |
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
| 100 |
|
| 101 |
keepdir /etc/puppetlabs/puppet/ssl |
| 102 |
|
| 103 |
@@ -133,13 +131,8 @@ pkg_postinst() { |
| 104 |
elog "Portage Puppet module with Gentoo-specific resources:" |
| 105 |
elog "http://forge.puppetlabs.com/gentoo/portage" |
| 106 |
elog |
| 107 |
- |
| 108 |
- for v in ${REPLACING_VERSIONS}; do |
| 109 |
- if [ "$(get_major_version $v)" = "4" ]; then |
| 110 |
- elog |
| 111 |
- elog "Please see the following url for the release notes for puppet-5" |
| 112 |
- elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x" |
| 113 |
- elog |
| 114 |
- fi |
| 115 |
- done |
| 116 |
+ elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" |
| 117 |
+ elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" |
| 118 |
+ elog "not already done so." |
| 119 |
+ elog |
| 120 |
} |
| 121 |
|
| 122 |
diff --git a/app-admin/puppet/puppet-6.0.2.ebuild b/app-admin/puppet/puppet-6.0.4.ebuild |
| 123 |
similarity index 87% |
| 124 |
rename from app-admin/puppet/puppet-6.0.2.ebuild |
| 125 |
rename to app-admin/puppet/puppet-6.0.4.ebuild |
| 126 |
index 11f3fa690f1..863d46f28da 100644 |
| 127 |
--- a/app-admin/puppet/puppet-6.0.2.ebuild |
| 128 |
+++ b/app-admin/puppet/puppet-6.0.4.ebuild |
| 129 |
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_DOC="doc:all" |
| 130 |
|
| 131 |
RUBY_FAKEGEM_EXTRAINSTALL="locales" |
| 132 |
|
| 133 |
-inherit eutils user ruby-fakegem versionator |
| 134 |
+inherit eutils user ruby-fakegem eapi7-ver |
| 135 |
|
| 136 |
DESCRIPTION="A system automation and configuration management software." |
| 137 |
HOMEPAGE="http://puppetlabs.com/" |
| 138 |
@@ -19,7 +19,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz" |
| 139 |
|
| 140 |
LICENSE="Apache-2.0 GPL-2" |
| 141 |
SLOT="0" |
| 142 |
-KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86" |
| 143 |
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
| 144 |
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax" |
| 145 |
RESTRICT="test" |
| 146 |
|
| 147 |
@@ -98,8 +98,6 @@ all_ruby_install() { |
| 148 |
|
| 149 |
# openrc init stuff |
| 150 |
newinitd "${FILESDIR}"/puppet.init-4.x puppet |
| 151 |
- newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster |
| 152 |
- newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster |
| 153 |
|
| 154 |
keepdir /etc/puppetlabs/puppet/ssl |
| 155 |
|
| 156 |
@@ -133,13 +131,8 @@ pkg_postinst() { |
| 157 |
elog "Portage Puppet module with Gentoo-specific resources:" |
| 158 |
elog "http://forge.puppetlabs.com/gentoo/portage" |
| 159 |
elog |
| 160 |
- |
| 161 |
- for v in ${REPLACING_VERSIONS}; do |
| 162 |
- if [ "$(get_major_version $v)" = "4" ]; then |
| 163 |
- elog |
| 164 |
- elog "Please see the following url for the release notes for puppet-5" |
| 165 |
- elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x" |
| 166 |
- elog |
| 167 |
- fi |
| 168 |
- done |
| 169 |
+ elog "If updating from puppet 5 to 6, keep in mind that webrick (server/master)" |
| 170 |
+ elog "suppert was removed for >=6.x, please migrate to puppetserver if you have" |
| 171 |
+ elog "not already done so." |
| 172 |
+ elog |
| 173 |
} |
Archives