commit: 8d613ebaa25d4ee4499e5a28a3322618e1797418 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> AuthorDate: Fri Oct 18 15:55:46 2019 +0000 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> CommitDate: Fri Oct 18 16:02:59 2019 +0000 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 <prometheanfire <AT> 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 00000000000..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 <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 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 spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die # can't be run within portage. - epatch "${FILESDIR}/puppet-fix-tests-6.4.1.patch" + epatch "${FILESDIR}/puppet-fix-tests-6.10.1.patch" # fix systemd path epatch "${FILESDIR}/puppet-systemd.patch"
