net-analyzer/icinga: actually fixing bug 564242 CVE-2015-8010

Package-Manager: portage-2.2.20.1

diff --git a/net-analyzer/icinga/Manifest b/net-analyzer/icinga/Manifest
index e72df2b79e3b12eb3cddf30da0195689ca8803a1..066d121e591cc587f473f23e6db7a9cb54e8bc86 100644 (file)
--- a/net-analyzer/icinga/Manifest
+++ b/net-analyzer/icinga/Manifest
@@ -1 +1,2 @@
+DIST CVE-2015-8010_1.13.3.patch 177807 SHA256 8ccd8cdf221b8f2aa90ae1e4c76ccc61e7cf7519eadc9482c671502c2138c2a7 SHA512 bc82e588db33fbb955002cf51ae7b0e40109d4ec3fa6199b046ffbf23b649d74fbdd04c8fb4a5af4cd44301e26f30aa295a9574281c14bc45eec2b9149a6339a WHIRLPOOL 90f3eb3a6ad79337cf9d7fe63e201e313769fea6e3fdf2f2de0b2072b1b21e66d650b632794dcb39b458e7c17449f7fb2d45d678a3b628a467496284f238231d
 DIST icinga-1.13.3.tar.gz 18738204 SHA256 d6994bcc9e137f6639b781a78a55d29c51d74cdfce7f35c13c47e09f200acd84 SHA512 babdbb823c6d7241aa67c39c35f67bdf9a4963688b6edd1190af32e056639c1e592791071c90eae3daa44bcb63beee2ff260ce5a0d5e7edb0ed3c99d69ffdaed WHIRLPOOL 6886f98f44cf2aed3b1f2a23d905cbbf5ecf22055ba66d44b44c46942947103863e47e8ba889ba97d98a22f9364946cd3e725563d05df105be519486e2f4857d

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
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
index 9560c51f911d98ea335488d64c67b5c2a014562c..658064358c189b9c2bc76d927a0ada4d024d3844 100644 (file)
--- a/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.3-r1.ebuild
@@ -12,7 +12,8 @@ HOMEPAGE="http://www.icinga.org/"
 #SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_PV}.tar.gz"
 #S=${WORKDIR}/${PN}-${MY_PV}
 #SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/${PN}/${PN}-core/releases/download/v${PV}/${P}.tar.gz
+       https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/CVE-2015-8010_1.13.3.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -44,7 +45,7 @@ pkg_setup() {
 
 src_prepare() {
        epatch "${FILESDIR}/fix-prestripped-binaries-1.7.0.patch"
-       epatch "${FILESDIR}/CVE-2015-8010_1.13.3.patch"
+       epatch "${DISTDIR}/CVE-2015-8010_1.13.3.patch"
 }
 
 src_configure() {