From 47e4450944184f87f5eea01f767b249620ff2210 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Wed, 29 Sep 2010 12:56:10 +0000
Subject: main/webkit: add 7 of cve patches

---
 main/webkit/APKBUILD | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

(limited to 'main/webkit/APKBUILD')

diff --git a/main/webkit/APKBUILD b/main/webkit/APKBUILD
index f8d4332542..4eac1ff862 100644
--- a/main/webkit/APKBUILD
+++ b/main/webkit/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=webkit
 pkgver=1.2.4
-pkgrel=0
+pkgrel=1
 pkgdesc="portable web rendering engine WebKit for GTK+"
 url="http://webkitgtk.org/"
 license="LGPL BSD"
@@ -16,12 +16,33 @@ makedepends="
 	"
 install=
 subpackages="$pkgname-dev gtklauncher"
-source="http://webkitgtk.org/$pkgname-$pkgver.tar.gz"
+source="http://webkitgtk.org/$pkgname-$pkgver.tar.gz
+	cve-2010-2646.patch
+	cve-2010-2651.patch
+	cve-2010-2900.patch
+	cve-2010-2901.patch
+	cve-2010-3115.patch
+	cve-2010-3116.patch
+	cve-2010-3120.patch
+	"
 
 depends_dev="gtk+-dev libsoup-dev gstreamer-dev"
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case "$i" in
+		*.patch)
+			msg "Applying $i"
+			patch -p1 -i "$srcdir"/$i || return 1
+			;;
+		esac
+	done
+}
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
@@ -30,7 +51,7 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install
 }
 
@@ -42,4 +63,11 @@ gtklauncher() {
 		"$subpkgdir"/usr/bin/GtkLauncher
 }
 
-md5sums="dc3a92dd0e8c2e70263fbfdf809b51a5  webkit-1.2.4.tar.gz"
+md5sums="dc3a92dd0e8c2e70263fbfdf809b51a5  webkit-1.2.4.tar.gz
+3d2c4af2fa46388876de7a5747f50de0  cve-2010-2646.patch
+4db553a178f951b857486bcc0955b663  cve-2010-2651.patch
+abfec5aeaa5005279993d731dc919680  cve-2010-2900.patch
+fa980cb721e6a2b43107633dc3782d62  cve-2010-2901.patch
+fc5553d85c14f29128985bddc195782c  cve-2010-3115.patch
+b4787ffaac3f102e7bb267839a261496  cve-2010-3116.patch
+b3e21cb4755c6cbab31dbe5063883c04  cve-2010-3120.patch"
-- 
cgit v1.2.3