| 1 |
commit: 10d8c1f67b3bd910fd7f9d1beb52da9d8322e76a |
| 2 |
Author: Louis Sautier <sautier.louis <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sat May 26 20:50:51 2018 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat May 26 21:46:35 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d8c1f6 |
| 7 |
|
| 8 |
www-apps/icingaweb2-module-graphite: fix SRC_URI for 1.0.1, EAPI=7 |
| 9 |
|
| 10 |
Also update HOMEPAGE and fix DESCRIPTION, remove deprecated patch from |
| 11 |
live ebuild and add upstream info to metadata.xml. |
| 12 |
|
| 13 |
Package-Manager: Portage-2.3.38, Repoman-2.3.9 |
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/8601 |
| 15 |
|
| 16 |
www-apps/icingaweb2-module-graphite/Manifest | 2 +- |
| 17 |
.../files/patch-unquote-service.patch | 54 ---------------------- |
| 18 |
... => icingaweb2-module-graphite-1.0.1-r1.ebuild} | 12 ++--- |
| 19 |
.../icingaweb2-module-graphite-9999.ebuild | 18 +++----- |
| 20 |
www-apps/icingaweb2-module-graphite/metadata.xml | 4 ++ |
| 21 |
5 files changed, 16 insertions(+), 74 deletions(-) |
| 22 |
|
| 23 |
diff --git a/www-apps/icingaweb2-module-graphite/Manifest b/www-apps/icingaweb2-module-graphite/Manifest |
| 24 |
index 2713871762c..72dd4c96786 100644 |
| 25 |
--- a/www-apps/icingaweb2-module-graphite/Manifest |
| 26 |
+++ b/www-apps/icingaweb2-module-graphite/Manifest |
| 27 |
@@ -1 +1 @@ |
| 28 |
-DIST icingaweb2-module-graphite-1.0.1.tar.gz 5988 BLAKE2B 43f98d853643377cc8088e60845c603563ec5f3bee8d1e9f48e884677c7bfbc82da5603e1aae05634616a52bd387c1685bf2605d1abcae0a96cc88dad303dd1c SHA512 594a8d2a141bdf682fa37dc7b677a78f255dfa3d05071878a416b7426ed6355abc2a2864394e333a00c08aba8fd4f898e42c5a49ffeaf689a16de175f6ddb333 |
| 29 |
+DIST icingaweb2-module-graphite-1.0.1.tar.gz 329327 BLAKE2B e53f9ea0e3ca061fdec80da71b6624f97eeda04d78975ac198a6e75ae5300eabf50db3e95802e6d0108ee0314ad9af6108daa24d5b99228c7d9c2fcecfc80cac SHA512 1270d2e7768d3f9181950f08c703236042a9c99d337bd2964396890cdb645b72afabe387d35d232fb123d9f635cc27fc09ac374ec2c5707fa83706b0ba67ac2a |
| 30 |
|
| 31 |
diff --git a/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch b/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch |
| 32 |
deleted file mode 100644 |
| 33 |
index 3dde1f45a96..00000000000 |
| 34 |
--- a/www-apps/icingaweb2-module-graphite/files/patch-unquote-service.patch |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,54 +0,0 @@ |
| 37 |
-From 3e5921b96b17ea4d0a5f32a39940a9b762e5c3a4 Mon Sep 17 00:00:00 2001 |
| 38 |
-From: Matthew Thode <mthode@××××××.org> |
| 39 |
-Date: Tue, 12 Apr 2016 03:14:16 +0000 |
| 40 |
-Subject: [PATCH] remove quotes around $service variable |
| 41 |
- |
| 42 |
-This fixes https://dev.icinga.org/issues/11572 |
| 43 |
- |
| 44 |
-This still leaves $hostname being quoted, I don't know if that needs to go as well. |
| 45 |
---- |
| 46 |
- application/controllers/ShowController.php | 6 +++--- |
| 47 |
- 1 file changed, 3 insertions(+), 3 deletions(-) |
| 48 |
- |
| 49 |
-diff --git a/application/controllers/ShowController.php b/application/controllers/ShowController.php |
| 50 |
-index f029b81..0457ce9 100644 |
| 51 |
---- a/application/controllers/ShowController.php |
| 52 |
-+++ b/application/controllers/ShowController.php |
| 53 |
-@@ -168,7 +168,7 @@ public function hostAction() |
| 54 |
- if (! array_key_exists('icingaHost', $patterns)) continue; |
| 55 |
- |
| 56 |
- foreach ($set->loadTemplates() as $key => $template) { |
| 57 |
-- if (strpos($template->getFilterString(), '$service') !== false) continue; |
| 58 |
-+ if (strpos($template->getFilterString(), $service) !== false) continue; |
| 59 |
- |
| 60 |
- $imgParams = array( |
| 61 |
- 'template' => $key, |
| 62 |
-@@ -228,7 +228,7 @@ public function serviceAction() |
| 63 |
- if (! array_key_exists('icingaHost', $patterns)) continue; |
| 64 |
- |
| 65 |
- foreach ($set->loadTemplates() as $key => $template) { |
| 66 |
-- if (strpos($template->getFilterString(), '$service') === false) continue; |
| 67 |
-+ if (strpos($template->getFilterString(), $service) === false) continue; |
| 68 |
- |
| 69 |
- $imgParams = array( |
| 70 |
- 'template' => $key, |
| 71 |
-@@ -289,7 +289,7 @@ public function XXXserviceAction() |
| 72 |
- |
| 73 |
- foreach ($set->loadTemplates() as $key => $template) { |
| 74 |
- |
| 75 |
-- if (strpos($template->getFilterString(), '$service') === false) continue; |
| 76 |
-+ if (strpos($template->getFilterString(), $service) === false) continue; |
| 77 |
- |
| 78 |
- $this->view->templates[$key] = $template; |
| 79 |
- |
| 80 |
-diff -Naur a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php b/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php |
| 81 |
---- a/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php 2016-10-16 19:10:49.794640399 -0500 |
| 82 |
-+++ b/library/Graphite/ProvidedHook/Monitoring/ServiceActions.php 2016-10-16 19:11:17.136401235 -0500 |
| 83 |
-@@ -16,6 +16,7 @@ |
| 84 |
- array( |
| 85 |
- 'host' => $service->host_name, |
| 86 |
- 'service' => $service->service_description, |
| 87 |
-+ 'check_command' => $service->service_check_command, |
| 88 |
- )) |
| 89 |
- ); |
| 90 |
- } |
| 91 |
|
| 92 |
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild |
| 93 |
similarity index 65% |
| 94 |
rename from www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild |
| 95 |
rename to www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild |
| 96 |
index 1722cdeaadb..312bc419e29 100644 |
| 97 |
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1.ebuild |
| 98 |
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-1.0.1-r1.ebuild |
| 99 |
@@ -1,18 +1,16 @@ |
| 100 |
# Copyright 1999-2018 Gentoo Foundation |
| 101 |
# Distributed under the terms of the GNU General Public License v2 |
| 102 |
|
| 103 |
-EAPI=6 |
| 104 |
+EAPI=7 |
| 105 |
|
| 106 |
-DESCRIPTION="Icinga Web 2 plugin for pnp4nagios" |
| 107 |
-HOMEPAGE="http://www.icinga.org/" |
| 108 |
+DESCRIPTION="Icinga Web 2 plugin for Graphite" |
| 109 |
+HOMEPAGE="https://www.icinga.com/docs/graphite/latest/" |
| 110 |
if [[ "${PV}" == 9999 ]]; then |
| 111 |
inherit git-r3 |
| 112 |
EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git" |
| 113 |
else |
| 114 |
KEYWORDS="~amd64 ~x86" |
| 115 |
- MY_PN="icingaweb2-module-pnp" |
| 116 |
- SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz" |
| 117 |
- S="${WORKDIR}/${MY_PN}-${PV}" |
| 118 |
+ SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 119 |
fi |
| 120 |
|
| 121 |
LICENSE="GPL-2" |
| 122 |
@@ -22,8 +20,6 @@ DEPEND=">=net-analyzer/icinga2-2.4.0 |
| 123 |
>=www-apps/icingaweb2-2.5.0" |
| 124 |
RDEPEND="${DEPEND}" |
| 125 |
|
| 126 |
-PATCHES=() |
| 127 |
- |
| 128 |
src_install() { |
| 129 |
insinto "/usr/share/icingaweb2/modules/graphite/" |
| 130 |
doins -r "${S}"/* |
| 131 |
|
| 132 |
diff --git a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild |
| 133 |
index 7e359c940e4..312bc419e29 100644 |
| 134 |
--- a/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild |
| 135 |
+++ b/www-apps/icingaweb2-module-graphite/icingaweb2-module-graphite-9999.ebuild |
| 136 |
@@ -1,29 +1,25 @@ |
| 137 |
-# Copyright 1999-2016 Gentoo Foundation |
| 138 |
+# Copyright 1999-2018 Gentoo Foundation |
| 139 |
# Distributed under the terms of the GNU General Public License v2 |
| 140 |
|
| 141 |
-EAPI=6 |
| 142 |
+EAPI=7 |
| 143 |
|
| 144 |
-DESCRIPTION="Icinga Web 2 plugin for pnp4nagios" |
| 145 |
-HOMEPAGE="http://www.icinga.org/" |
| 146 |
+DESCRIPTION="Icinga Web 2 plugin for Graphite" |
| 147 |
+HOMEPAGE="https://www.icinga.com/docs/graphite/latest/" |
| 148 |
if [[ "${PV}" == 9999 ]]; then |
| 149 |
inherit git-r3 |
| 150 |
EGIT_REPO_URI="https://github.com/Icinga/icingaweb2-module-graphite.git" |
| 151 |
else |
| 152 |
KEYWORDS="~amd64 ~x86" |
| 153 |
- MY_PN="icingaweb2-module-pnp" |
| 154 |
- SRC_URI="https://codeload.github.com/Icinga/${MY_PN}/tar.gz/v${PV} -> ${P}.tar.gz" |
| 155 |
- S="${WORKDIR}/${MY_PN}-${PV}" |
| 156 |
+ SRC_URI="https://github.com/Icinga/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
| 157 |
fi |
| 158 |
|
| 159 |
LICENSE="GPL-2" |
| 160 |
SLOT="0" |
| 161 |
|
| 162 |
-DEPEND=">=net-analyzer/icinga2-2.1.1 |
| 163 |
- >=www-apps/icingaweb2-2.0.0" |
| 164 |
+DEPEND=">=net-analyzer/icinga2-2.4.0 |
| 165 |
+ >=www-apps/icingaweb2-2.5.0" |
| 166 |
RDEPEND="${DEPEND}" |
| 167 |
|
| 168 |
-PATCHES=( "${FILESDIR}/patch-unquote-service.patch" ) |
| 169 |
- |
| 170 |
src_install() { |
| 171 |
insinto "/usr/share/icingaweb2/modules/graphite/" |
| 172 |
doins -r "${S}"/* |
| 173 |
|
| 174 |
diff --git a/www-apps/icingaweb2-module-graphite/metadata.xml b/www-apps/icingaweb2-module-graphite/metadata.xml |
| 175 |
index 3ffdeb4af3b..e6871e01f10 100644 |
| 176 |
--- a/www-apps/icingaweb2-module-graphite/metadata.xml |
| 177 |
+++ b/www-apps/icingaweb2-module-graphite/metadata.xml |
| 178 |
@@ -5,4 +5,8 @@ |
| 179 |
<email>prometheanfire@g.o</email> |
| 180 |
<name>Matthew Thode</name> |
| 181 |
</maintainer> |
| 182 |
+ <upstream> |
| 183 |
+ <remote-id type="github">Icinga/icingaweb2-module-graphite</remote-id> |
| 184 |
+ <bugs-to>https://github.com/Icinga/icingaweb2-module-graphite/issues</bugs-to> |
| 185 |
+ </upstream> |
| 186 |
</pkgmetadata> |
Archives