* [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/
@ 2016-06-29 7:41 Patrice Clement
0 siblings, 0 replies; 8+ messages in thread
From: Patrice Clement @ 2016-06-29 7:41 UTC (permalink / raw
To: gentoo-commits
commit: 9d1b53ec3f4077fb6ec0e11b60a461fd3c2baca1
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Jun 28 20:25:08 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jun 29 07:13:16 2016 +0000
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 <monsieurp <AT> 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..0000000
--- 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.000000000 -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..0000000
--- 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.rb 2013-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*\]$/
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/
@ 2017-08-08 22:37 Matt Thode
0 siblings, 0 replies; 8+ messages in thread
From: Matt Thode @ 2017-08-08 22:37 UTC (permalink / raw
To: gentoo-commits
commit: ad787a1aac2d203b9c3e36ca3e1a85a387423d24
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Tue Aug 8 16:29:32 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 22:36:40 2017 +0000
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..00000000000
--- 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.000000000 -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,
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/
@ 2018-05-18 12:34 Aaron Bauman
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Bauman @ 2018-05-18 12:34 UTC (permalink / raw
To: gentoo-commits
commit: 2ee33026ec8924ade78e58987141042d34805a83
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu May 17 08:21:13 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri May 18 12:32:58 2018 +0000
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..00000000000
--- 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 <josh@puppet.com>
-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.
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/
@ 2019-05-31 11:04 Sven Wegener
0 siblings, 0 replies; 8+ messages in thread
From: Sven Wegener @ 2019-05-31 11:04 UTC (permalink / raw
To: gentoo-commits
commit: 3943a0f87694796adda723aa96995f47853f5362
Author: Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Fri May 31 11:04:43 2019 +0000
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Fri May 31 11:04:43 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3943a0f8
app-admin/puppet: Drop old patch
Signed-off-by: Sven Wegener <swegener <AT> 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..00000000000
--- 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.000000000 -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,
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/
@ 2019-10-18 16:19 Matthew Thode
0 siblings, 0 replies; 8+ messages in thread
From: Matthew Thode @ 2019-10-18 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 2fc28526575fa8a99887606d2db998bccbac08d3
Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 18 16:19:04 2019 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Oct 18 16:19:04 2019 +0000
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 <prometheanfire <AT> 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 <http://gnu.org/licenses/gpl.html>.
-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.000000000 -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.000000000 -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.000000000 -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.000000000 -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.000000000 -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))))
+
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/
@ 2019-12-23 10:16 David Seifert
0 siblings, 0 replies; 8+ messages in thread
From: David Seifert @ 2019-12-23 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 4c0d558d89fdb1be842f5cdfe98c779116ca0ba4
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Dec 23 06:48:31 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 10:15:23 2019 +0000
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 <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> 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..00000000000
--- 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..00000000000
--- 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.000000000 -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))))
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/
@ 2021-07-10 21:16 Conrad Kostecki
0 siblings, 0 replies; 8+ messages in thread
From: Conrad Kostecki @ 2021-07-10 21:16 UTC (permalink / raw
To: gentoo-commits
commit: 7e21c9dc7f325d95c0615d2a13f2a01e18400f5d
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Jul 4 11:22:48 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 21:14:08 2021 +0000
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 <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> 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..00000000000
--- 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.000000000 -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))))
-
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/
@ 2023-04-09 1:47 Matthew Thode
0 siblings, 0 replies; 8+ messages in thread
From: Matthew Thode @ 2023-04-09 1:47 UTC (permalink / raw
To: gentoo-commits
commit: 43654211fe9761c24b71ed75b8b3cfce539e90c0
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Apr 8 17:14:28 2023 +0000
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Apr 9 01:47:28 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43654211
app-admin/puppet: remove unused files
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Matthew Thode <prometheanfire <AT> 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..000000000000
--- 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..000000000000
--- 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..000000000000
--- 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..000000000000
--- a/app-admin/puppet/files/tmpfiles.d
+++ /dev/null
@@ -1 +0,0 @@
-D /var/run/puppet 0755 puppet puppet -
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2023-04-09 1:47 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-29 7:41 [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet/files/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2017-08-08 22:37 Matt Thode
2018-05-18 12:34 Aaron Bauman
2019-05-31 11:04 Sven Wegener
2019-10-18 16:19 Matthew Thode
2019-12-23 10:16 David Seifert
2021-07-10 21:16 Conrad Kostecki
2023-04-09 1:47 Matthew Thode
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox