1 |
commit: 05cc9dc260cd9098de4bd2d940f3b6bf27541e10 |
2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 25 13:25:21 2016 +0000 |
4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 25 13:25:38 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05cc9dc2 |
7 |
|
8 |
net-analyzer/nagios-check_rbl: new revision for perl-5.24 compatibility. |
9 |
|
10 |
The tarball for this package was shipped with a copy of inc/version.pm |
11 |
that was causing problems with perl-5.24. Since v1.3.7 was added to |
12 |
the tree, upstream has moved SRC_URI to github, and re-released v1.3.7 |
13 |
with modified source code. The new tarball does not exhibit the |
14 |
version.pm problem. |
15 |
|
16 |
To fix the issue, this revision uses the new tarball, but renames it |
17 |
to include the -r1 suffix so that users don't see checksum |
18 |
failures. We are also removing inc/version.pm in |
19 |
src_prepare(). Comments have been added to the ebuild so that we can |
20 |
check for an upstream fix at a later time. The new revision also uses |
21 |
EAPI=6. |
22 |
|
23 |
Gentoo-Bug: 583966 |
24 |
|
25 |
Package-Manager: portage-2.2.28 |
26 |
|
27 |
net-analyzer/nagios-check_rbl/Manifest | 2 +- |
28 |
...3.7.ebuild => nagios-check_rbl-1.3.7-r1.ebuild} | 33 +++++++++++++++++----- |
29 |
2 files changed, 27 insertions(+), 8 deletions(-) |
30 |
|
31 |
diff --git a/net-analyzer/nagios-check_rbl/Manifest b/net-analyzer/nagios-check_rbl/Manifest |
32 |
index 706828e..2c2a627 100644 |
33 |
--- a/net-analyzer/nagios-check_rbl/Manifest |
34 |
+++ b/net-analyzer/nagios-check_rbl/Manifest |
35 |
@@ -1,2 +1,2 @@ |
36 |
DIST check_rbl-1.3.0.tar.gz 32179 SHA256 c713dc226a9d56af6d51863c5f594f34c49227d8af48984085c8b3b137b2d247 SHA512 773610abc1b8521843353f7053e2ce7996fa3178087eb468f628c60d099f4a5658d47fef2b35867363fc9d4de30b849858f2e28f8c70a17baa30d07d7b9ebf2f WHIRLPOOL 7afe3d34333ebb2e79ac4214aefa47d6abe35b1585144ce6395eed686b348543ae4b46d00c9fbc1e0e35f5def8bc87e9b7c90a334600e55fa63bdd07247701a1 |
37 |
-DIST check_rbl-1.3.7.tar.gz 39385 SHA256 b9523db1d0895bb08ac34fb0d20c1a3ff53066fdfcccc62e980e1a9b2e30a9f7 SHA512 ceb00b41ef49ed9cc8f5c7eb8b3a994b59d88f486e5cdb821c842da5d92a091033a2294c642c55b449188fb434585606f024e734c8b7c9f0e655bf4baaba314e WHIRLPOOL 16b0e113f599eed8237423362372dd3afab0a8ab6710fee968586ee0b7b8cbca563b2ecc0fd089edb9e075da1e49ea4a06df74e2601c164fac60961bb47352d1 |
38 |
+DIST check_rbl-1.3.7-r1.tar.gz 38565 SHA256 dbe76bd24ab9404817f74fd895dfeb1c55d296fe9a8264a4c631c5139ea31247 SHA512 a918090b2c1e93095b155215de559b0d7f35c949e9c9d27c7b6dc91e21391b03d716154dd90ea1a68deeabce5afde3c9e5746190910f18bf1d3e08ff20d02431 WHIRLPOOL 31a13de7cfc650deea83d8c7cf148358046260502c34e3d643ad53c1e96854b0194da80fac3d95cf5fa06b01d9224fb9716ce3e281148ce174f89e75bb418023 |
39 |
|
40 |
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild |
41 |
similarity index 51% |
42 |
rename from net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7.ebuild |
43 |
rename to net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild |
44 |
index c4a2217..c75db07 100644 |
45 |
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7.ebuild |
46 |
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild |
47 |
@@ -1,17 +1,24 @@ |
48 |
-# Copyright 1999-2015 Gentoo Foundation |
49 |
+# Copyright 1999-2016 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Id$ |
52 |
|
53 |
-EAPI=5 |
54 |
+EAPI=6 |
55 |
|
56 |
-inherit multilib |
57 |
+# Needed for perl_rm_files in src_prepare() only. |
58 |
+inherit perl-functions |
59 |
|
60 |
-DESCRIPTION="check_rbl is a Nagios plugin that fails if a host is blacklisted" |
61 |
-HOMEPAGE="https://svn.id.ethz.ch/projects/nagios_plugins/wiki/check_rbl" |
62 |
+DESCRIPTION="Monitor whether or not a host is blacklisted" |
63 |
+HOMEPAGE="https://github.com/matteocorti/check_rbl" |
64 |
|
65 |
MY_P="${P/nagios-/}" |
66 |
|
67 |
-SRC_URI="https://svn.id.ethz.ch/projects/nagios_plugins/downloads/${MY_P}.tar.gz" |
68 |
+# We rename the tarball here because the upstream source changed without |
69 |
+# a new release. That change happens to fix bug #583966, so we do want |
70 |
+# the newer tarball. But I think, without the rename, that user might |
71 |
+# have gotten a checksum failure. |
72 |
+SRC_URI="${HOMEPAGE}/releases/download/v${PV}/${MY_P}.tar.gz |
73 |
+ -> ${MY_P}-r1.tar.gz" |
74 |
+ |
75 |
LICENSE="GPL-3" |
76 |
SLOT="0" |
77 |
|
78 |
@@ -39,6 +46,17 @@ DEPEND="${RDEPEND}" |
79 |
|
80 |
S="${WORKDIR}/${MY_P}" |
81 |
|
82 |
+src_prepare() { |
83 |
+ default |
84 |
+ |
85 |
+ # The copy of version.pm that upstream ships causes problems and |
86 |
+ # isn't necessary. They probably shouldn't be shipping it at all. |
87 |
+ # See bug #583966 for more information. You should check on |
88 |
+ # https://github.com/matteocorti/check_rbl/issues/6 every once |
89 |
+ # in a while to see if this can be removed. |
90 |
+ perl_rm_files inc/version.pm |
91 |
+} |
92 |
+ |
93 |
src_configure() { |
94 |
perl Makefile.PL INSTALLDIRS=vendor || die |
95 |
} |
96 |
@@ -47,7 +65,8 @@ src_install() { |
97 |
default |
98 |
|
99 |
local nagiosplugindir=/usr/$(get_libdir)/nagios/plugins |
100 |
- # move this aftertime as it's a bit strange otherwise |
101 |
+ |
102 |
+ # It's simplest to move this file after it's been installed. |
103 |
dodir "${nagiosplugindir}" |
104 |
mv "${D}"/usr/bin/check_rbl "${D}"/"${nagiosplugindir}" || die |
105 |
} |