[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/

[Matthew Thode]

commit: 43654211fe9761c24b71ed75b8b3cfce539e90c0
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Apr  8 17:14:28 2023 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Sun Apr  9 01:47:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43654211

app-admin/puppet: remove unused files

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Matthew Thode  gentoo.org>

 app-admin/puppet/files/puppet.init-4.x   | 29 --
 app-admin/puppet/files/puppetmaster.confd| 18 --
 app-admin/puppet/files/puppetmaster.init-4.x | 37 
 app-admin/puppet/files/tmpfiles.d|  1 -
 4 files changed, 85 deletions(-)

diff --git a/app-admin/puppet/files/puppet.init-4.x 
b/app-admin/puppet/files/puppet.init-4.x
deleted file mode 100644
index f7106e6f0294..
--- a/app-admin/puppet/files/puppet.init-4.x
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
-
-pidfile="${PUPPET_PID_DIR}/puppet.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-command="/usr/bin/puppet"
-extra_started_commands="reload"
-
-command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet 
${PUPPET_EXTRA_OPTS}"
-
-depend() {
-   need localmount
-   use dns logger puppetmaster netmount nfsmount
-}
-
-start_pre() {
-   checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
-   checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-}
-
-reload() {
-ebegin "Reloading $RC_SVCNAME"
-start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
-eend $?
-}

diff --git a/app-admin/puppet/files/puppetmaster.confd 
b/app-admin/puppet/files/puppetmaster.confd
deleted file mode 100644
index afecf479a6a1..
--- a/app-admin/puppet/files/puppetmaster.confd
+++ /dev/null
@@ -1,18 +0,0 @@
-# Location of PID files
-PUPPETMASTER_PID_DIR="/var/run/puppet"
-
-# Where to log general messages to.
-# Specify syslog to send log messages to the system log.
-#PUPPETMASTER_LOG="syslog"
-
-# You may specify other parameters to the puppetmaster here
-#PUPPETMASTER_EXTRA_OPTS="--noca"
-
-# You may specify an alternate port on which puppetmaster should listen.
-# Default is: 8140
-#PUPPETMASTER_PORT="8140"
-
-# To start multiple servers:
-# # cp /etc/conf.d/puppetmaster /etc/conf.d/puppetmaster.master_8141
-# # ln -s puppetmaster /etc/init.d/puppetmaster.master_8141
-# # ${EDITOR} /etc/conf.d/puppetmaster.master_8141 (set 8141 to 
PUPPETMASTER_PORT)

diff --git a/app-admin/puppet/files/puppetmaster.init-4.x 
b/app-admin/puppet/files/puppetmaster.init-4.x
deleted file mode 100644
index 286f7e67579a..
--- a/app-admin/puppet/files/puppetmaster.init-4.x
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "puppetmaster" ] ; then
-   PUPPETMASTER_PID="master"
-else
-   PUPPETMASTER_PID="${SVCNAME#*.}"
-fi
-PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
-pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-command_args="master --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet 
${PUPPETMASTER_EXTRA_OPTS}"
-if [ -n "${PUPPETMASTER_PORT}" ] ; then
-   command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
-fi
-
-command="/usr/bin/puppet"
-extra_started_commands="reload"
-
-depend() {
-   need localmount
-   use dns logger slapd netmount nfsmount
-}
-
-start_pre() {
-   checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
-   checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-   checkpath --file --owner puppet:puppet --mode 640 
"${PUPPET_LOG_DIR}/masterhttp.log"
-}
-
-reload() {
-ebegin "Reloading $RC_SVCNAME"
-start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
-eend $?
-}

diff --git a/app-admin/puppet/files/tmpfiles.d 
b/app-admin/puppet/files/tmpfiles.d
deleted file mode 100644
index cd33231df7f7..
--- a/app-admin/puppet/files/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/puppet 0755 puppet puppet -

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/, app-admin/puppet/

[Matthew Thode]

commit: 52c8456296aff281cdf964e85e149f3958212c54
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Dec 22 19:52:51 2022 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Thu Dec 22 19:53:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52c84562

app-admin/puppet: fix tmpfiles.d

Closes: https://bugs.gentoo.org/887923

Signed-off-by: Matthew Thode  gentoo.org>

 app-admin/puppet/files/puppet.init   |  29 +++
 app-admin/puppet/files/tmpfiles.d-2  |   1 +
 app-admin/puppet/puppet-7.21.0-r1.ebuild | 127 +++
 3 files changed, 157 insertions(+)

diff --git a/app-admin/puppet/files/puppet.init 
b/app-admin/puppet/files/puppet.init
new file mode 100644
index ..ad7a638bebb8
--- /dev/null
+++ b/app-admin/puppet/files/puppet.init
@@ -0,0 +1,29 @@
+#!/sbin/openrc-run
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_PID_DIR="${PUPPET_PID_DIR:-/run/puppet}"
+
+pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command="/usr/bin/puppet"
+extra_started_commands="reload"
+
+command_args="agent --pidfile ${pidfile} --confdir /etc/puppetlabs/puppet 
${PUPPET_EXTRA_OPTS}"
+
+depend() {
+   need localmount
+   use dns logger puppetmaster netmount nfsmount
+}
+
+start_pre() {
+   checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+   checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+}
+
+reload() {
+ebegin "Reloading $RC_SVCNAME"
+start-stop-daemon --signal SIGHUP --pidfile "${pidfile}"
+eend $?
+}

diff --git a/app-admin/puppet/files/tmpfiles.d-2 
b/app-admin/puppet/files/tmpfiles.d-2
new file mode 100644
index ..b36eec4dbdfc
--- /dev/null
+++ b/app-admin/puppet/files/tmpfiles.d-2
@@ -0,0 +1 @@
+D /run/puppet 0755 puppet puppet -

diff --git a/app-admin/puppet/puppet-7.21.0-r1.ebuild 
b/app-admin/puppet/puppet-7.21.0-r1.ebuild
new file mode 100644
index ..42b2ff4970b6
--- /dev/null
+++ b/app-admin/puppet/puppet-7.21.0-r1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="doc:all"
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit ruby-fakegem systemd tmpfiles
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="https://puppet.com/";
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz";
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
+RESTRICT="test"
+
+ruby_add_rdepend "
+   dev-ruby/hiera
+   dev-ruby/json:=
+   dev-ruby/semantic_puppet
+   >=dev-ruby/facter-3.0.0
+   dev-ruby/concurrent-ruby
+   augeas? ( dev-ruby/ruby-augeas )
+   diff? ( dev-ruby/diff-lcs )
+   doc? ( dev-ruby/rdoc )
+   ldap? ( dev-ruby/ruby-ldap )
+   shadow? ( dev-ruby/ruby-shadow )
+   sqlite? ( dev-ruby/sqlite3 )
+   virtual/ruby-ssl
+   dev-ruby/hocon"
+
+ruby_add_bdepend "
+   doc? ( dev-ruby/yard )
+   test? (
+   dev-ruby/mocha
+   dev-ruby/rack
+   dev-ruby/rspec-its
+   )"
+# this should go in the above lists, but isn't because of test deps not being 
keyworded
+#   dev-ruby/rspec-collection_matchers
+
+RDEPEND+=" ${RDEPEND}
+   rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+   selinux? (
+   sys-libs/libselinux[ruby]
+   sec-policy/selinux-puppet
+   )
+   vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+   >=app-portage/eix-0.18.0
+   acct-user/puppet
+   acct-group/puppet"
+PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
+
+all_ruby_prepare() {
+   # Avoid spec that require unpackaged json-schema.
+   rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+   # fix systemd path
+   eapply -p0 "${FILESDIR}/puppet-systemd.patch"
+
+   # Avoid specs that can only run in the puppet.git repository. This
+   # should be narrowed down to the specific specs.
+   rm spec/integration/parser/compiler_spec.rb || die
+
+   # Avoid failing spec that need further investigation.
+   rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+each_ruby_install() {
+   each_fakegem_install
+#  dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" 
"/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+   all_fakegem_install
+
+   # systemd stuffs
+   systemd_dounit "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+   # tmpfiles stuff
+   newtmpfiles "${FILESDIR}/tmpfiles.d-2" "puppet.conf"
+
+   # openrc init stuff
+   newinitd "${FILESDIR}"/pu

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/

[Conrad Kostecki]

commit: 7e21c9dc7f325d95c0615d2a13f2a01e18400f5d
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jul  4 11:22:48 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Jul 10 21:14:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e21c9dc

app-admin/puppet: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21520
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 app-admin/puppet/files/puppet-fix-tests-6.10.1.patch | 19 ---
 1 file changed, 19 deletions(-)

diff --git a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch 
b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
deleted file mode 100644
index daa065dabb5..000
--- a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
+++ /dev/null
@@ -1,19 +0,0 @@
 spec/unit/network/http/api/indirected_routes_spec.rb   2018-09-17 
19:36:56.0 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb   2018-09-19 
10:52:35.841614932 -0500
-@@ -158,16 +158,6 @@
-   handler.uri2indirection("GET", uri_escaped, params)
- end
- 
--it "when the environment is unknown should remove :environment from 
params passed to check_authorization and therefore fail" do
--  expect(handler).to receive(:check_authorization).with(anything,
--anything,
--
excluding(:environment))
--  expect { handler.uri2indirection("GET",
--   "#{master_url_prefix}/node/bar",
--   {:environment => 'bogus'})
--  }.to raise_error(not_found_error)
--end
--
- it "should not URI unescape the indirection key as passed through to a 
call to check_authorization" do
-   expect(handler).to receive(:check_authorization).with(anything, 
anything, hash_including(environment: 
be_a(Puppet::Node::Environment).and(have_attributes(name: :env
- 

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/

[David Seifert]

commit: 4c0d558d89fdb1be842f5cdfe98c779116ca0ba4
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Mon Dec 23 06:48:31 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 23 10:15:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c0d558d

app-admin/puppet: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/14100
Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: David Seifert  gentoo.org>

 app-admin/puppet/files/puppet-fix-tests-5.5.14.patch | 18 --
 app-admin/puppet/files/puppet-fix-tests-6.4.1.patch  | 18 --
 2 files changed, 36 deletions(-)

diff --git a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch 
b/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
deleted file mode 100644
index 09ffe07da1a..000
--- a/app-admin/puppet/files/puppet-fix-tests-5.5.14.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 puppet/spec/unit/network/http/api/indirected_routes_spec.rb
-+++ puppet/spec/unit/network/http/api/indirected_routes_spec.rb
-@@ -142,15 +142,6 @@
-   handler.uri2indirection("GET", uri_escaped, params)
- end
- 
--it "should not pass through an environment to check_authorization and 
fail if the environment is unknown" do
--  expect(handler).to receive(:check_authorization) do |_, _, arg|
--expect(arg).not_to include(:environment)
--  end
--  expect(lambda { handler.uri2indirection("GET",
--  "#{master_url_prefix}/node/bar",
--  {:environment => 'bogus'}) 
}).to raise_error(not_found_error)
--end
--
- it "should not URI unescape the indirection key as passed through to a 
call to check_authorization" do
-   expect(handler).to receive(:check_authorization).with(anything, 
anything, hash_including(environment: 
be_a(Puppet::Node::Environment).and(have_attributes(name: :env
- 

diff --git a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch 
b/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
deleted file mode 100644
index 6b7b5b48479..000
--- a/app-admin/puppet/files/puppet-fix-tests-6.4.1.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 spec/unit/network/http/api/indirected_routes_spec.rb   2018-09-17 
19:36:56.0 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb   2018-09-19 
10:52:35.841614932 -0500
-@@ -144,15 +144,6 @@
-   handler.uri2indirection("GET", uri_escaped, params)
- end
- 
--it "when the environment is unknown should remove :environment from 
params passed to check_authorization and therefore fail" do
--  expect(handler).to receive(:check_authorization).with(anything,
--anything,
--
excluding(:environment))
--  expect(lambda { handler.uri2indirection("GET",
--  "#{master_url_prefix}/node/bar",
--  {:environment => 'bogus'}) 
}).to raise_error(not_found_error)
--end
--
- it "should not URI unescape the indirection key as passed through to a 
call to check_authorization" do
-   expect(handler).to receive(:check_authorization).with(anything, 
anything, hash_including(environment: 
be_a(Puppet::Node::Environment).and(have_attributes(name: :env
- 

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/

[Matthew Thode]

commit: 2fc28526575fa8a99887606d2db998bccbac08d3
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct 18 16:19:04 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Oct 18 16:19:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fc28526

app-admin/puppet: actually fix 6.10.1 patching

Bug: https://bugs.gentoo.org/697982
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Matthew Thode  gentoo.org>

 .../puppet/files/puppet-fix-tests-6.10.1.patch | 107 -
 1 file changed, 19 insertions(+), 88 deletions(-)

diff --git a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch 
b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
index adb9e8dd7d4..daa065dabb5 100644
--- a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
+++ b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
@@ -1,88 +1,19 @@
-* puppet-fix-tests-6.4.1.patch *
-PWD: /var/tmp/portage/app-admin/puppet-6.10.1/work/all/puppet-6.10.1
-PATCH TOOL: patch -> /usr/bin/patch
-VERSION INFO:
-GNU patch 2.7.6
-Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
-Copyright (C) 1988 Larry Wall
-
-License GPLv3+: GNU GPL version 3 or later .
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-
-Written by Larry Wall and Paul Eggert
-
-
-
-PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-
-checking file spec/unit/network/http/api/indirected_routes_spec.rb
-Hunk #1 FAILED at 144.
-1 out of 1 hunk FAILED
-
-patch program exited with status 1
-
-
-PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-
-can't find file to patch at input line 3
-Perhaps you used the wrong -p or --strip option?
-The text leading up to this was:
---
-|--- spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-17 
19:36:56.0 -0500
-|+++ spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-19 
10:52:35.841614932 -0500
---
-No file to patch.  Skipping patch.
-1 out of 1 hunk ignored
-
-patch program exited with status 1
-
-
-PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-
-can't find file to patch at input line 3
-Perhaps you used the wrong -p or --strip option?
-The text leading up to this was:
---
-|--- spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-17 
19:36:56.0 -0500
-|+++ spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-19 
10:52:35.841614932 -0500
---
-No file to patch.  Skipping patch.
-1 out of 1 hunk ignored
-
-patch program exited with status 1
-
-
-PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-
-can't find file to patch at input line 3
-Perhaps you used the wrong -p or --strip option?
-The text leading up to this was:
---
-|--- spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-17 
19:36:56.0 -0500
-|+++ spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-19 
10:52:35.841614932 -0500
---
-No file to patch.  Skipping patch.
-1 out of 1 hunk ignored
-
-patch program exited with status 1
-
-
-PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
-
-
-can't find file to patch at input line 3
-Perhaps you used the wrong -p or --strip option?
-The text leading up to this was:
---
-|--- spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-17 
19:36:56.0 -0500
-|+++ spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-19 
10:52:35.841614932 -0500
---
-No file to patch.  Skipping patch.
-1 out of 1 hunk ignored
-
-patch program exited with status 1
+--- spec/unit/network/http/api/indirected_routes_spec.rb   2018-09-17 
19:36:56.0 -0500
 spec/unit/network/http/api/indirected_routes_spec.rb   2018-09-19 
10:52:35.841614932 -0500
+@@ -158,16 +158,6 @@
+   handler.uri2indirection("GET", uri_escaped, params)
+

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/, app-admin/puppet/

[Matthew Thode]

commit: 8d613ebaa25d4ee4499e5a28a3322618e1797418
Author: Matthew Thode  gentoo  org>
AuthorDate: Fri Oct 18 15:55:46 2019 +
Commit: Matthew Thode  gentoo  org>
CommitDate: Fri Oct 18 16:02:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d613eba

app-admin/puppet: fix 6.10.1 patching

Fixes: https://bugs.gentoo.org/697982
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Matthew Thode  gentoo.org>

 .../puppet/files/puppet-fix-tests-6.10.1.patch | 88 ++
 app-admin/puppet/puppet-6.10.1.ebuild  |  2 +-
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch 
b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
new file mode 100644
index 000..adb9e8dd7d4
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-6.10.1.patch
@@ -0,0 +1,88 @@
+* puppet-fix-tests-6.4.1.patch *
+PWD: /var/tmp/portage/app-admin/puppet-6.10.1/work/all/puppet-6.10.1
+PATCH TOOL: patch -> /usr/bin/patch
+VERSION INFO:
+GNU patch 2.7.6
+Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
+Copyright (C) 1988 Larry Wall
+
+License GPLv3+: GNU GPL version 3 or later .
+This is free software: you are free to change and redistribute it.
+There is NO WARRANTY, to the extent permitted by law.
+
+Written by Larry Wall and Paul Eggert
+
+
+
+PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
+
+
+checking file spec/unit/network/http/api/indirected_routes_spec.rb
+Hunk #1 FAILED at 144.
+1 out of 1 hunk FAILED
+
+patch program exited with status 1
+
+
+PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
+
+
+can't find file to patch at input line 3
+Perhaps you used the wrong -p or --strip option?
+The text leading up to this was:
+--
+|--- spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-17 
19:36:56.0 -0500
+|+++ spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-19 
10:52:35.841614932 -0500
+--
+No file to patch.  Skipping patch.
+1 out of 1 hunk ignored
+
+patch program exited with status 1
+
+
+PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
+
+
+can't find file to patch at input line 3
+Perhaps you used the wrong -p or --strip option?
+The text leading up to this was:
+--
+|--- spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-17 
19:36:56.0 -0500
+|+++ spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-19 
10:52:35.841614932 -0500
+--
+No file to patch.  Skipping patch.
+1 out of 1 hunk ignored
+
+patch program exited with status 1
+
+
+PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
+
+
+can't find file to patch at input line 3
+Perhaps you used the wrong -p or --strip option?
+The text leading up to this was:
+--
+|--- spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-17 
19:36:56.0 -0500
+|+++ spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-19 
10:52:35.841614932 -0500
+--
+No file to patch.  Skipping patch.
+1 out of 1 hunk ignored
+
+patch program exited with status 1
+
+
+PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  --dry-run -f < 
'/var/tmp/portage/app-admin/puppet-6.10.1/files/puppet-fix-tests-6.4.1.patch'
+
+
+can't find file to patch at input line 3
+Perhaps you used the wrong -p or --strip option?
+The text leading up to this was:
+--
+|--- spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-17 
19:36:56.0 -0500
+|+++ spec/unit/network/http/api/indirected_routes_spec.rb  2018-09-19 
10:52:35.841614932 -0500
+--
+No file to patch.  Skipping patch.
+1 out of 1 hunk ignored
+
+patch program exited with status 1

diff --git a/app-admin/puppet/puppet-6.10.1.ebuild 
b/app-admin/puppet/puppet-6.10.1.ebuild
index d633c6865a1..2fac345af4a 100644
--- a/app-admin/puppet/puppet-6.10.1.ebuild
+++ b/app-admin/puppet/puppet-6.10.1.ebuild
@@ -68,7 +68,7 @@ all_ruby_prepare() {
rm 

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/

[Sven Wegener]

commit: 3943a0f87694796adda723aa96995f47853f5362
Author: Sven Wegener  gentoo  org>
AuthorDate: Fri May 31 11:04:43 2019 +
Commit: Sven Wegener  gentoo  org>
CommitDate: Fri May 31 11:04:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3943a0f8

app-admin/puppet: Drop old patch

Signed-off-by: Sven Wegener  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 app-admin/puppet/files/puppet-fix-tests-6.0.0.patch | 18 --
 1 file changed, 18 deletions(-)

diff --git a/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch 
b/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch
deleted file mode 100644
index 3e51218034c..000
--- a/app-admin/puppet/files/puppet-fix-tests-6.0.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 spec/unit/network/http/api/indirected_routes_spec.rb   2018-09-17 
19:36:56.0 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb   2018-09-19 
10:52:35.841614932 -0500
-@@ -143,15 +143,6 @@
-   _, _, _, _ = handler.uri2indirection("GET", uri_escaped, params)
- end
- 
--it "when the environment is unknown should remove :environment from 
params passed to check_authorization and therefore fail" do
--  handler.expects(:check_authorization).with(anything,
-- anything,
-- Not(has_key(:environment)))
--  expect(lambda { handler.uri2indirection("GET",
--  "#{master_url_prefix}/node/bar",
--  {:environment => 'bogus'}) 
}).to raise_error(not_found_error)
--end
--
- it "should not URI unescape the indirection key as passed through to a 
call to check_authorization" do
-   handler.expects(:check_authorization).with(anything,
-  anything,

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/

[Aaron Bauman]

commit: 2ee33026ec8924ade78e58987141042d34805a83
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu May 17 08:21:13 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri May 18 12:32:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ee33026

app-admin/puppet: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/8445

 app-admin/puppet/files/puppet-4-webrick-ruby.patch | 53 --
 1 file changed, 53 deletions(-)

diff --git a/app-admin/puppet/files/puppet-4-webrick-ruby.patch 
b/app-admin/puppet/files/puppet-4-webrick-ruby.patch
deleted file mode 100644
index ce4b055644f..000
--- a/app-admin/puppet/files/puppet-4-webrick-ruby.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From a358d5ec01c6f87b39e5bfbab7a35582624fdbf7 Mon Sep 17 00:00:00 2001
-From: Josh Cooper 
-Date: Fri, 12 Jan 2018 15:30:38 -0800
-Subject: [PATCH] (PUP-8297) Don't accept already connected socket
-
-Webrick's start method yields an already connected socket, so it is not
-necessary to call accept on the socket. In ruby versions prior to 2.3.6 and
-2.4.3, the accept call was a noop.
-
-In 2.3.6 and 2.4.3, it is an error, because ruby those versions use a
-non-blocking accept to handle clients that make an TCP connection, but
-are slow to negotiate the TLS handshake[1,2]. On these versions, puppet
-master would report:
-
-SSL_accept returned=1 errno=0 state=unknown state: unexpected record
-
-Remove the call to Socket#accept.
-
-[1] https://bugs.ruby-lang.org/issues/14005
-[2] 
https://github.com/ruby/ruby/commit/2e728d51e70ed3756ad760c687a08b8487b0112f

- lib/puppet/network/http/webrick.rb | 1 -
- spec/unit/network/http/webrick_spec.rb | 5 +
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/puppet/network/http/webrick.rb 
b/lib/puppet/network/http/webrick.rb
-index 9ebf1763be5..3ac2ff40650 100644
 a/lib/puppet/network/http/webrick.rb
-+++ b/lib/puppet/network/http/webrick.rb
-@@ -29,7 +29,6 @@ def listen(address, port)
- if ! IO.select([sock],nil,nil,timeout)
-   raise "Client did not send data within %.1f seconds of connecting" 
% timeout
- end
--sock.accept
- @server.run(sock)
-   end
- end
-diff --git a/spec/unit/network/http/webrick_spec.rb 
b/spec/unit/network/http/webrick_spec.rb
-index a90fc3f3378..843b0d54c8a 100644
 a/spec/unit/network/http/webrick_spec.rb
-+++ b/spec/unit/network/http/webrick_spec.rb
-@@ -92,6 +92,11 @@
-   expect(server).to be_listening
- end
- 
-+it "is passed an already connected socket" do
-+  socket.expects(:accept).never
-+  server.listen(address, port)
-+end
-+
- describe "when the REST protocol is requested" do
-   it "should register the REST handler at /" do
- # We don't care about the options here.

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/, app-admin/puppet/

[Hans de Graaff]

commit: 319deed791230fa6ad3d6a7443d400e1caa7409b
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sun Jan 28 06:55:19 2018 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sun Jan 28 06:55:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=319deed7

app-admin/puppet: fix puppetmaster with recent ruby

Backport upstream fix to make puppetmaster work on
ruby 2.3.6 and 2.4.3 again.

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 app-admin/puppet/files/puppet-4-webrick-ruby.patch |  53 ++
 app-admin/puppet/puppet-4.10.9-r1.ebuild   | 199 +
 2 files changed, 252 insertions(+)

diff --git a/app-admin/puppet/files/puppet-4-webrick-ruby.patch 
b/app-admin/puppet/files/puppet-4-webrick-ruby.patch
new file mode 100644
index 000..ce4b055644f
--- /dev/null
+++ b/app-admin/puppet/files/puppet-4-webrick-ruby.patch
@@ -0,0 +1,53 @@
+From a358d5ec01c6f87b39e5bfbab7a35582624fdbf7 Mon Sep 17 00:00:00 2001
+From: Josh Cooper 
+Date: Fri, 12 Jan 2018 15:30:38 -0800
+Subject: [PATCH] (PUP-8297) Don't accept already connected socket
+
+Webrick's start method yields an already connected socket, so it is not
+necessary to call accept on the socket. In ruby versions prior to 2.3.6 and
+2.4.3, the accept call was a noop.
+
+In 2.3.6 and 2.4.3, it is an error, because ruby those versions use a
+non-blocking accept to handle clients that make an TCP connection, but
+are slow to negotiate the TLS handshake[1,2]. On these versions, puppet
+master would report:
+
+SSL_accept returned=1 errno=0 state=unknown state: unexpected record
+
+Remove the call to Socket#accept.
+
+[1] https://bugs.ruby-lang.org/issues/14005
+[2] 
https://github.com/ruby/ruby/commit/2e728d51e70ed3756ad760c687a08b8487b0112f
+---
+ lib/puppet/network/http/webrick.rb | 1 -
+ spec/unit/network/http/webrick_spec.rb | 5 +
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/puppet/network/http/webrick.rb 
b/lib/puppet/network/http/webrick.rb
+index 9ebf1763be5..3ac2ff40650 100644
+--- a/lib/puppet/network/http/webrick.rb
 b/lib/puppet/network/http/webrick.rb
+@@ -29,7 +29,6 @@ def listen(address, port)
+ if ! IO.select([sock],nil,nil,timeout)
+   raise "Client did not send data within %.1f seconds of connecting" 
% timeout
+ end
+-sock.accept
+ @server.run(sock)
+   end
+ end
+diff --git a/spec/unit/network/http/webrick_spec.rb 
b/spec/unit/network/http/webrick_spec.rb
+index a90fc3f3378..843b0d54c8a 100644
+--- a/spec/unit/network/http/webrick_spec.rb
 b/spec/unit/network/http/webrick_spec.rb
+@@ -92,6 +92,11 @@
+   expect(server).to be_listening
+ end
+ 
++it "is passed an already connected socket" do
++  socket.expects(:accept).never
++  server.listen(address, port)
++end
++
+ describe "when the REST protocol is requested" do
+   it "should register the REST handler at /" do
+ # We don't care about the options here.

diff --git a/app-admin/puppet/puppet-4.10.9-r1.ebuild 
b/app-admin/puppet/puppet-4.10.9-r1.ebuild
new file mode 100644
index 000..c404e787afc
--- /dev/null
+++ b/app-admin/puppet/puppet-4.10.9-r1.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+#RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locales"
+
+inherit xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/";
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz";
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="augeas diff doc emacs experimental ldap rrdtool selinux shadow sqlite 
vim-syntax xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+   >=dev-ruby/gettext-setup-0.10:0
+   >=dev-ruby/hiera-2.0
+   >=dev-ruby/locale-2.1
+   >=dev-ruby/rgen-0.6.5
+   dev-ruby/json:=
+   >=dev-ruby/facter-3.0.0
+   augeas? ( dev-ruby/ruby-augeas )
+   diff? ( dev-ruby/diff-lcs )
+   doc? ( dev-ruby/rdoc )
+   ldap? ( dev-ruby/ruby-ldap )
+   shadow? ( dev-ruby/ruby-shadow )
+   sqlite? ( dev-ruby/sqlite3 )
+   virtual/ruby-ssl"
+
+# ruby_add_bdepend "
+#  test? (
+#  dev-ruby/mocha:0.14
+#  =dev-ruby/rack-1*
+#  dev-ruby/rspec-its
+#  dev-ruby/rspec-collection_matchers
+#  >=dev-ruby/vcr-2.9:2
+#  >=dev-ruby/webmock-1.24:0
+#  )"
+
+DEPEND+=" ${DEPEND}
+   xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+   rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+   selinux? (
+   sys-libs/libselinux[ruby]
+   sec-policy/selinux-puppet
+   )
+   vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+   >=app-portage

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/, app-admin/puppet/

[Matt Thode]

commit: 08001c72ddb19ef04e825aa57b90b024de8a9b40
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Dec  3 18:00:08 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sun Dec  3 18:00:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08001c72

app-admin/puppet: remove unused files

thanks mm1ke

Package-Manager: Portage-2.3.14, Repoman-2.3.6

 app-admin/puppet/Manifest   |  2 +-
 app-admin/puppet/files/puppet.init-r1   | 24 ---
 app-admin/puppet/files/puppetmaster.init-r1 | 30 -
 3 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 34c545c90fe..629b3dd0e0c 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -2,4 +2,4 @@ DIST puppet-4.10.1.tar.gz 2954351 BLAKE2B 
6cf8ac28d8c09f4b82956b3fc8ebc17c0ec35c
 DIST puppet-4.10.8.tar.gz 2979824 BLAKE2B 
802b65d48ff7d8303e3cc847a9f753a5e19c0ada6ee02dc1fc9c748da8d69462c34bdfeddeedf0057179ff1133665439c41e970c41ca1728463292ef26e996ab
 SHA512 
9f3384702dd4938e1e00aeceb0745b760de32000e0dd59d5b846d1120a46026499176a51d0409e3a0ae414efc0872854c204d1941385695a4c57c209fbd1f28d
 DIST puppet-4.10.9.tar.gz 2981668 BLAKE2B 
315c39953c2ba70b547fd7a393c7be0bd3c387bd52e3f383a932ebc03f9d96c17d988d53b15bcb8d08bc22ebcaf1c9c5cff00f9c34d730e231417565aad5311f
 SHA512 
0ac70f716a602b15d28504cc594c5a0d4f8005083de6751c682dc9180feca68148d942353a63e16aaa2e783e6ebe90b8f77b0b033c671a5134bcbcdff36a3204
 DIST puppet-5.1.0.tar.gz 2734018 BLAKE2B 
d4169fee328710b7685de2606196de68e21ca31f9a9945bdd84255f5185fd2d95c6543a7b88b5130f1f01e60e04294664de71a8ccd1319c2e0bebf4d031e6225
 SHA512 
07019f40c5b7f18243f13abb899c2ff2ea4b135895ab98c13da3df50f8e720e2759f8eb39e349ff04286da7de504cffea3df8acf9711e8591b25001a2a3f9c15
-DIST puppet-5.3.3.tar.gz 2843386 SHA256 
45360f64fe0375df617571d58e929515e2094daa1d0dc78e2b6718d7cbeaf18e SHA512 
b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe
 WHIRLPOOL 
19c8511ba58186692ee0ace02158c16529715cc213f0eb7266bb078a10db6e698081edc4b3e0735f1e79fb568066cc6f1699d0b1a954a29d74d1a91f393130fa
+DIST puppet-5.3.3.tar.gz 2843386 BLAKE2B 
dc96282ff2d6bb6719362cd9b2e856537019bd888af8ba897e37fc97584cd76c1d4179b3b629d2bb20d1dade0f84ec88ab41dd0d66cccd2c850a87f96ccf4b65
 SHA512 
b5bb9ac4059855c7cac624ea0fdc2c3366cea82bf07bee195a179a0a709fa53e7fffe883e581c1e07a64705a638b156288301227f7334226ddc401a9bf770afe

diff --git a/app-admin/puppet/files/puppet.init-r1 
b/app-admin/puppet/files/puppet.init-r1
deleted file mode 100644
index 36398d26fe2..000
--- a/app-admin/puppet/files/puppet.init-r1
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
-
-pidfile="${PUPPET_PID_DIR}/puppet.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-extra_started_commands="reload"
-
-command="/usr/bin/puppet"
-
-command_args="agent --pidfile ${pidfile} ${PUPPET_EXTRA_OPTS}"
-
-depend() {
-   need localmount
-   use dns logger puppetmaster netmount nfsmount
-}
-
-start_pre() {
-   checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
-   checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-}

diff --git a/app-admin/puppet/files/puppetmaster.init-r1 
b/app-admin/puppet/files/puppetmaster.init-r1
deleted file mode 100644
index 22479c5e1a6..000
--- a/app-admin/puppet/files/puppetmaster.init-r1
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-if [ "${SVCNAME}" = "puppetmaster" ] ; then
-   PUPPETMASTER_PID="master"
-else
-   PUPPETMASTER_PID="${SVCNAME#*.}"
-fi
-PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
-pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
-PUPPET_LOG_DIR="/var/log/puppet"
-
-command_args="master --pidfile ${pidfile} ${PUPPETMASTER_EXTRA_OPTS}"
-if [ -n "${PUPPETMASTER_PORT}" ] ; then
-   command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
-fi
-
-command="/usr/bin/puppet"
-
-depend() {
-   need localmount
-   use dns logger slapd netmount nfsmount
-}
-
-start_pre() {
-   checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
-   checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
-   checkpath --file --owner puppet:puppet --mode 640 
"${PUPPET_LOG_DIR}/masterhttp.log"
-}

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/

[Matt Thode]

commit: ad787a1aac2d203b9c3e36ca3e1a85a387423d24
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Aug  8 16:29:32 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Tue Aug  8 22:36:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad787a1a

app-admin/puppet: remove unused patch

 app-admin/puppet/files/puppet-fix-tests-4.4.2.patch | 18 --
 1 file changed, 18 deletions(-)

diff --git a/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch 
b/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch
deleted file mode 100644
index b77c1cea39c..000
--- a/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 spec/unit/network/http/api/indirected_routes_spec.rb  2016-04-22 
17:15:56.0 -0500
-+++ spec/unit/network/http/api/indirected_routes_spec.rb.new  2016-04-28 
09:06:38.133311369 -0500
-@@ -140,15 +140,6 @@
-   indirection, _, _, _ = handler.uri2indirection("GET", uri_escaped, 
params)
- end
- 
--it "should not pass through an environment to check_authorization and 
fail if the environment is unknown" do
--  handler.expects(:check_authorization).with(anything,
-- anything,
-- Not(has_entry(:environment)))
--  expect(lambda { handler.uri2indirection("GET",
--  "#{master_url_prefix}/node/bar",
--  {:environment => 'bogus'}) 
}).to raise_error(ArgumentError)
--end
--
- it "should not URI unescape the indirection key as passed through to a 
call to check_authorization" do
-   handler.expects(:check_authorization).with(anything,
-  anything,

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/, app-admin/puppet/

[Matt Thode]

commit: 5b9f3229c4a2cbef014a812d8d5eefb6306e35c6
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Mar  9 17:06:11 2017 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Mar  9 17:06:11 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b9f3229

app-admin/puppet: fix systemd exec path for bug 612040

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 app-admin/puppet/files/puppet-systemd.patch |  10 ++
 app-admin/puppet/puppet-4.9.1-r1.ebuild | 177 
 2 files changed, 187 insertions(+)

diff --git a/app-admin/puppet/files/puppet-systemd.patch 
b/app-admin/puppet/files/puppet-systemd.patch
new file mode 100644
index 000..72d7d69a2f7
--- /dev/null
+++ b/app-admin/puppet/files/puppet-systemd.patch
@@ -0,0 +1,10 @@
+--- ext/systemd/puppet.service 2017-02-02 18:28:58.0 -0600
 ext/systemd/puppet.service 2017-03-09 10:56:59.091489324 -0600
+@@ -17,7 +17,7 @@
+ EnvironmentFile=-/etc/sysconfig/puppetagent
+ EnvironmentFile=-/etc/sysconfig/puppet
+ EnvironmentFile=-/etc/default/puppet
+-ExecStart=/opt/puppetlabs/puppet/bin/puppet agent $PUPPET_EXTRA_OPTS 
--no-daemonize
++ExecStart=/usr/bin/puppet agent $PUPPET_EXTRA_OPTS --no-daemonize
+ ExecReload=/bin/kill -HUP $MAINPID
+ KillMode=process

diff --git a/app-admin/puppet/puppet-4.9.1-r1.ebuild 
b/app-admin/puppet/puppet-4.9.1-r1.ebuild
new file mode 100644
index 000..506e8ca297f
--- /dev/null
+++ b/app-admin/puppet/puppet-4.9.1-r1.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+USE_RUBY="ruby21"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit elisp-common xemacs-elisp-common eutils user ruby-fakegem versionator
+
+DESCRIPTION="A system automation and configuration management software."
+HOMEPAGE="http://puppetlabs.com/";
+SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz";
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax 
xemacs"
+RESTRICT="test"
+
+ruby_add_rdepend "
+   dev-ruby/hiera
+   >=dev-ruby/rgen-0.6.5
+   dev-ruby/json:=
+   >=dev-ruby/facter-3.0.0
+   augeas? ( dev-ruby/ruby-augeas )
+   diff? ( dev-ruby/diff-lcs )
+   doc? ( dev-ruby/rdoc )
+   ldap? ( dev-ruby/ruby-ldap )
+   shadow? ( dev-ruby/ruby-shadow )
+   sqlite? ( dev-ruby/sqlite3 )
+   virtual/ruby-ssl"
+
+ruby_add_bdepend "
+   test? (
+   dev-ruby/mocha
+   dev-ruby/rack
+   dev-ruby/rspec-its
+   )"
+# this should go in the above lists, but isn't because of test deps not being 
keyworded
+#  dev-ruby/rspec-collection_matchers
+
+DEPEND+=" ${DEPEND}
+   emacs? ( virtual/emacs )
+   xemacs? ( app-editors/xemacs )"
+RDEPEND+=" ${RDEPEND}
+   rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+   selinux? (
+   sys-libs/libselinux[ruby]
+   sec-policy/selinux-puppet
+   )
+   vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
+   >=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+   enewgroup puppet
+   enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_prepare() {
+   # Avoid spec that require unpackaged json-schema.
+   rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
+
+   # can't be run within portage.
+   epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
+
+   # fix systemd path
+   epatch "${FILESDIR}/puppet-systemd.patch"
+
+   # Avoid specs that can only run in the puppet.git repository. This
+   # should be narrowed down to the specific specs.
+   rm spec/integration/parser/compiler_spec.rb || die
+
+   # Avoid failing spec that need further investigation.
+   rm spec/unit/module_tool/metadata_spec.rb || die
+}
+
+all_ruby_compile() {
+   if use emacs ; then
+   elisp-compile ext/emacs/puppet-mode.el
+   fi
+
+   if use xemacs ; then
+   # Create a separate version for xemacs to be able to install
+   # emacs and xemacs in parallel.
+   mkdir ext/xemacs
+   cp ext/emacs/* ext/xemacs/
+   xemacs-elisp-compile ext/xemacs/puppet-mode.el
+   fi
+}
+
+each_ruby_install() {
+   each_fakegem_install
+#  dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" 
"/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
+}
+
+all_ruby_install() {
+   all_fakegem_install
+
+   # systemd stuffs
+   insinto /usr/lib/systemd/system
+   doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
+
+   # tmpfiles stuff
+   insinto /usr/lib/tmpfiles.d
+   newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
+
+   # openrc init stuff
+   newinitd "${FILESDIR}"/puppet.init-4.x puppet
+   newinitd "${FILESDIR}"/

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/

[Patrice Clement]

commit: 9d1b53ec3f4077fb6ec0e11b60a461fd3c2baca1
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Tue Jun 28 20:25:08 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jun 29 07:13:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d1b53ec

app-admin/puppet: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/1790

Signed-off-by: Patrice Clement  gentoo.org>

 app-admin/puppet/files/puppet-fix-tests-4.x.patch | 18 --
 app-admin/puppet/files/puppet-openrc-status-fix.patch | 15 ---
 2 files changed, 33 deletions(-)

diff --git a/app-admin/puppet/files/puppet-fix-tests-4.x.patch 
b/app-admin/puppet/files/puppet-fix-tests-4.x.patch
deleted file mode 100644
index 77d9cfb..000
--- a/app-admin/puppet/files/puppet-fix-tests-4.x.patch
+++ /dev/null
@@ -1,18 +0,0 @@
 ./spec/unit/network/http/api/indirected_routes_spec.rb 2015-07-21 
12:09:09.0 -0500
-+++ ./spec/unit/network/http/api/indirected_routes_spec.rb.new 2015-07-23 
18:33:22.839914116 -0500
-@@ -144,15 +144,6 @@
-
:env
-   handler.uri2indirection("GET", "#{master_url_prefix}/node/bar", params)
- end
--
--it "should not pass through an environment to check_authorization and 
fail if the environment is unknown" do
--  handler.expects(:check_authorization).with(anything,
-- anything,
-- Not(has_entry(:environment)))
--  expect(lambda { handler.uri2indirection("GET",
--  "#{master_url_prefix}/node/bar",
--  {:environment => 'bogus'}) 
}).to raise_error(ArgumentError)
--end
-   end
- 
-   describe "when converting a request into a URI" do

diff --git a/app-admin/puppet/files/puppet-openrc-status-fix.patch 
b/app-admin/puppet/files/puppet-openrc-status-fix.patch
deleted file mode 100644
index af56809..000
--- a/app-admin/puppet/files/puppet-openrc-status-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur puppet-3.1.1-r2.orig/lib/puppet/provider/service/openrc.rb 
puppet-3.1.1-r2/lib/puppet/provider/service/openrc.rb
 all/puppet-3.1.1.orig/lib/puppet/provider/service/openrc.rb   2013-06-05 
03:32:53.646824966 -0400
-+++ all/puppet-3.1.1/lib/puppet/provider/service/openrc.rb2013-06-05 
03:37:25.333824967 -0400
-@@ -10,8 +10,10 @@
-   defaultfor :operatingsystem => :gentoo
-   defaultfor :operatingsystem => :funtoo
- 
-+  has_command(:rcstatus, '/bin/rc-status') do
-+environment :RC_SVCNAME => nil
-+  end
-   commands :rcservice => '/sbin/rc-service'
--  commands :rcstatus  => '/bin/rc-status'
-   commands :rcupdate  => '/sbin/rc-update'
- 
-   self::STATUSLINE = /^\s+(.*?)\s*\[\s*(.*)\s*\]$/

[gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/, app-admin/puppet/

[Matt Thode]

commit: 67dd528c748f33ec564fc50b409361de6bbe4a1c
Author: Matthew Thode  gentoo  org>
AuthorDate: Thu Apr 28 14:09:32 2016 +
Commit: Matt Thode  gentoo  org>
CommitDate: Thu Apr 28 14:10:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67dd528c

app-admin/puppet: fix patch for bug 581428

Package-Manager: portage-2.2.26

 app-admin/puppet/files/puppet-fix-tests-4.4.2.patch | 18 ++
 app-admin/puppet/puppet-4.4.2.ebuild|  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch 
b/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch
new file mode 100644
index 000..b77c1ce
--- /dev/null
+++ b/app-admin/puppet/files/puppet-fix-tests-4.4.2.patch
@@ -0,0 +1,18 @@
+--- spec/unit/network/http/api/indirected_routes_spec.rb  2016-04-22 
17:15:56.0 -0500
 spec/unit/network/http/api/indirected_routes_spec.rb.new  2016-04-28 
09:06:38.133311369 -0500
+@@ -140,15 +140,6 @@
+   indirection, _, _, _ = handler.uri2indirection("GET", uri_escaped, 
params)
+ end
+ 
+-it "should not pass through an environment to check_authorization and 
fail if the environment is unknown" do
+-  handler.expects(:check_authorization).with(anything,
+- anything,
+- Not(has_entry(:environment)))
+-  expect(lambda { handler.uri2indirection("GET",
+-  "#{master_url_prefix}/node/bar",
+-  {:environment => 'bogus'}) 
}).to raise_error(ArgumentError)
+-end
+-
+ it "should not URI unescape the indirection key as passed through to a 
call to check_authorization" do
+   handler.expects(:check_authorization).with(anything,
+  anything,

diff --git a/app-admin/puppet/puppet-4.4.2.ebuild 
b/app-admin/puppet/puppet-4.4.2.ebuild
index dc356cf..67270df 100644
--- a/app-admin/puppet/puppet-4.4.2.ebuild
+++ b/app-admin/puppet/puppet-4.4.2.ebuild
@@ -66,7 +66,7 @@ all_ruby_prepare() {
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
 
# can't be run within portage.
-   epatch "${FILESDIR}/puppet-fix-tests-4.x.patch"
+   epatch "${FILESDIR}/puppet-fix-tests-4.4.2.patch"
 
# Avoid specs that can only run in the puppet.git repository. This
# should be narrowed down to the specific specs.