johu 14/08/04 15:25:47
Modified: krfb-4.12.5-r1.ebuild krfb-4.13.3-r1.ebuild
ChangeLog
Log:
Apply patch before eclass src_prepare, fixes bug #518824.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key
F3CFD2BD)
Revision Changes Path
1.2 kde-base/krfb/krfb-4.12.5-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krfb/krfb-4.12.5-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krfb/krfb-4.12.5-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krfb/krfb-4.12.5-r1.ebuild?r1=1.1&r2=1.2
Index: krfb-4.12.5-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.12.5-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krfb-4.12.5-r1.ebuild 31 Jul 2014 20:46:59 -0000 1.1
+++ krfb-4.12.5-r1.ebuild 4 Aug 2014 15:25:47 -0000 1.2
@@ -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 @@
"
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=(
1.2 kde-base/krfb/krfb-4.13.3-r1.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krfb/krfb-4.13.3-r1.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krfb/krfb-4.13.3-r1.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krfb/krfb-4.13.3-r1.ebuild?r1=1.1&r2=1.2
Index: krfb-4.13.3-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/krfb/krfb-4.13.3-r1.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- krfb-4.13.3-r1.ebuild 31 Jul 2014 20:46:59 -0000 1.1
+++ krfb-4.13.3-r1.ebuild 4 Aug 2014 15:25:47 -0000 1.2
@@ -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 @@
"
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=(
1.319 kde-base/krfb/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krfb/ChangeLog?rev=1.319&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krfb/ChangeLog?rev=1.319&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/krfb/ChangeLog?r1=1.318&r2=1.319
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/krfb/ChangeLog,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -r1.318 -r1.319
--- ChangeLog 31 Jul 2014 20:46:59 -0000 1.318
+++ ChangeLog 4 Aug 2014 15:25:47 -0000 1.319
@@ -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 <[email protected]> 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)
