diff options
| author |   Johannes Huber <johu@gentoo.org> | 2014-08-04 15:25:47 +0000 |
|---|---|---|
| committer | Johannes Huber <johu@gentoo.org> | 2014-08-04 15:25:47 +0000 |
| commit | e188d41925c97c8cae5c27e7f88fff509a4c20ac (patch) | |
| tree | 20aaf11e3d40952cc737eca3ba503cce5e59b967 /kde-base/krfb | |
| parent | Keyworded on alpha, bug 489676 (diff) | |
| download | gentoo-2-e188d41925c97c8cae5c27e7f88fff509a4c20ac.tar.gz gentoo-2-e188d41925c97c8cae5c27e7f88fff509a4c20ac.tar.bz2 gentoo-2-e188d41925c97c8cae5c27e7f88fff509a4c20ac.zip | |
Apply patch before eclass src_prepare, fixes bug #518824.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)
Diffstat (limited to 'kde-base/krfb')
| -rw-r--r-- | kde-base/krfb/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-base/krfb/krfb-4.12.5-r1.ebuild | 9 | ||||
| -rw-r--r-- | kde-base/krfb/krfb-4.13.3-r1.ebuild | 9 |
3 files changed, 19 insertions, 5 deletions
diff --git a/kde-base/krfb/ChangeLog b/kde-base/krfb/ChangeLog index 21caa648508e..1b01434e5e8a 100644 --- a/kde-base/krfb/ChangeLog +++ b/kde-base/krfb/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-base/krfb # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.318 2014/07/31 20:46:59 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v 1.319 2014/08/04 15:25:47 johu Exp $ + + 04 Aug 2014; Johannes Huber <johu@gentoo.org> krfb-4.12.5-r1.ebuild, + krfb-4.13.3-r1.ebuild: + Apply patch before eclass src_prepare, fixes bug #518824. *krfb-4.12.5-r1 (31 Jul 2014) *krfb-4.13.3-r1 (31 Jul 2014) diff --git a/kde-base/krfb/krfb-4.12.5-r1.ebuild b/kde-base/krfb/krfb-4.12.5-r1.ebuild index 5e20a4d9d165..42d47193cbfa 100644 --- a/kde-base/krfb/krfb-4.12.5-r1.ebuild +++ b/kde-base/krfb/krfb-4.12.5-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.12.5-r1.ebuild,v 1.1 2014/07/31 20:46:59 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.12.5-r1.ebuild,v 1.2 2014/08/04 15:25:47 johu Exp $ EAPI=5 @@ -26,7 +26,12 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-CVE-2014-4607-unbundle-libvncserver.patch" ) +src_prepare() { + # bug 518824, patch before eclass magic + epatch "${FILESDIR}/${P}-CVE-2014-4607-unbundle-libvncserver.patch" + + kde4-base_src_prepare +} src_configure() { mycmakeargs=( diff --git a/kde-base/krfb/krfb-4.13.3-r1.ebuild b/kde-base/krfb/krfb-4.13.3-r1.ebuild index 9e8b194961b7..d9538077c33d 100644 --- a/kde-base/krfb/krfb-4.13.3-r1.ebuild +++ b/kde-base/krfb/krfb-4.13.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.13.3-r1.ebuild,v 1.1 2014/07/31 20:46:59 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.13.3-r1.ebuild,v 1.2 2014/08/04 15:25:47 johu Exp $ EAPI=5 @@ -26,7 +26,12 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch" ) +src_prepare() { + # bug 518824, patch before eclass magic + epatch "${FILESDIR}/${PN}-4.12.5-CVE-2014-4607-unbundle-libvncserver.patch" + + kde4-base_src_prepare +} src_configure() { local mycmakeargs=( |