From 74a93b6947dda51282111815d38594436fced477 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 16 Aug 2012 09:52:37 +0000
Subject: main/libxml2: apply various fixes from upstream (CVE-2012-2807)

fixes #1305
---
 main/libxml2/APKBUILD | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

(limited to 'main/libxml2/APKBUILD')

diff --git a/main/libxml2/APKBUILD b/main/libxml2/APKBUILD
index 8f2848f5b23..f9f52acdfbd 100644
--- a/main/libxml2/APKBUILD
+++ b/main/libxml2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Carlo Landmeter <clandmeter at gmail>
 pkgname=libxml2
 pkgver=2.7.8
-pkgrel=3
+pkgrel=4
 pkgdesc="XML parsing library, version 2"
 url="http://www.xmlsoft.org/"
 arch="all"
@@ -15,6 +15,16 @@ source="ftp://ftp.xmlsoft.org/${pkgname}/${pkgname}-${pkgver}.tar.gz
 	largefile64.patch
 	libxml2-2.7.8-CVE-2011-1944.patch
 	cve-2012-0841.patch
+
+	libxml2-2.7.8-xpath-memory.patch
+	libxml2-2.7.8-xpath-freeing.patch
+	libxml2-2.7.8-xpath-freeing2.patch
+	libxml2-2.7.8-hardening-xpath.patch
+	libxml2-2.7.8-error-xpath.patch
+	libxml2-2.7.8-allocation-error-copying-entities.patch
+	libxml2-2.7.8-entities-local-buffers-size.patch
+	libxml2-2.7.8-entities-local-buffers-size2.patch
+	libxml2-2.7.8-parser-local-buffers-size.patch
 	"
 
 options="!strip"
@@ -59,4 +69,13 @@ utils() {
 md5sums="8127a65e8c3b08856093099b52599c86  libxml2-2.7.8.tar.gz
 5ad4915665608ebfa5b89f7908467a72  largefile64.patch
 49cba5245dfa6f2ec710324df947fff9  libxml2-2.7.8-CVE-2011-1944.patch
-045c7f25e46de3127a6061e273de3f7b  cve-2012-0841.patch"
+045c7f25e46de3127a6061e273de3f7b  cve-2012-0841.patch
+bec456883fa9c91b0e7d2ad91283eeb1  libxml2-2.7.8-xpath-memory.patch
+8e3374d282fc12c7e40a3c5fb4b62978  libxml2-2.7.8-xpath-freeing.patch
+d1eff47d3bc99b38a09744345eaf3434  libxml2-2.7.8-xpath-freeing2.patch
+9027cbb76b112629cb5fa84ffcfc44bd  libxml2-2.7.8-hardening-xpath.patch
+8bf2bd2422b9aab015fb7a8ca993eef3  libxml2-2.7.8-error-xpath.patch
+de02f584b928d3e25babc5c90aa800be  libxml2-2.7.8-allocation-error-copying-entities.patch
+c8c789a4fbdae599a47ecbfa32b889d7  libxml2-2.7.8-entities-local-buffers-size.patch
+cba1201e77dc0f3e337d9ff146a2666e  libxml2-2.7.8-entities-local-buffers-size2.patch
+6c5c7a125dddb616feb1b2f4254bf467  libxml2-2.7.8-parser-local-buffers-size.patch"
-- 
cgit v1.2.3