Gentoo Archives: gentoo-commits

From: Matt Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/icinga/, net-analyzer/icinga/files/
Date: Wed, 04 Nov 2015 23:38:08
Message-Id: 1446680256.b0b83ba267a1daadaa6cc671c67cd7bfc09b42bb.prometheanfire@gentoo
1 commit: b0b83ba267a1daadaa6cc671c67cd7bfc09b42bb
2 Author: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
3 AuthorDate: Wed Nov 4 23:37:36 2015 +0000
4 Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Wed Nov 4 23:37:36 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b83ba2
7
8 net-analyzer/icinga: actually fixing bug 564242 CVE-2015-8010
9
10 Package-Manager: portage-2.2.20.1
11
12 net-analyzer/icinga/Manifest | 1 +
13 net-analyzer/icinga/files/CVE-2015-8010_1.13.3.patch | 0
14 net-analyzer/icinga/icinga-1.13.3-r1.ebuild | 5 +++--
15 3 files changed, 4 insertions(+), 2 deletions(-)
16
17 diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
18 index e72df2b..066d121 100644
19 --- a/net-analyzer/icinga/Manifest
20 +++ b/net-analyzer/icinga/Manifest
21 @@ -1 +1,2 @@
22 +DIST CVE-2015-8010_1.13.3.patch 177807 SHA256 8ccd8cdf221b8f2aa90ae1e4c76ccc61e7cf7519eadc9482c671502c2138c2a7 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a WHIRLPOOL 90f3eb3a6ad79337cf9d7fe63e201e313769fea6e3fdf2f2de0b2072b1b21e66d650b632794dcb39b458e7c17449f7fb2d45d678a3b628a467496284f238231d
23 DIST icinga-1.13.3.tar.gz 18738204 SHA256 d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512 babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed WHIRLPOOL 6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d
24
25 diff --git a/net-analyzer/icinga/files/CVE-2015-8010_1.13.3.patch b/net-analyzer/icinga/files/CVE-2015-8010_1.13.3.patch
26 deleted file mode 100644
27 index e69de29..0000000
28
29 diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
30 index 9560c51..6580643 100644
31 --- a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
32 +++ b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
33 @@ -12,7 +12,8 @@ HOMEPAGE="http://www.icinga.org/"
34 #SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
35 #S=${WORKDIR}/${PN}-${MY_PV}
36 #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
37 -SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
38 +SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz
39 + https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch"
40
41 LICENSE="GPL-2"
42 SLOT="0"
43 @@ -44,7 +45,7 @@ pkg_setup() {
44
45 src_prepare() {
46 epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
47 - epatch "${FILESDIR}/CVE-2015-8010_1.13.3.patch"
48 + epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch"
49 }
50
51 src_configure() {