From e54dcda0f3850194a820cfeb994832fa9b73f7de Mon Sep 17 00:00:00 2001
From: Holger Hans Peter Freyther <zecke@selfish.org>
Date: Wed, 17 Mar 2010 14:20:04 +0800
Subject: wv: Upgrade to 1.2.4 to address multiple flaws

Addressed CVE-2006-4513.
---
 conf/checksums.ini                  | 12 ------------
 recipes/wv/wv-1.2.0/pkgconfig.patch | 13 -------------
 recipes/wv/wv-1.2.4/pkgconfig.patch | 13 +++++++++++++
 recipes/wv/wv_1.2.0.bb              | 22 ----------------------
 recipes/wv/wv_1.2.4.bb              | 25 +++++++++++++++++++++++++
 5 files changed, 38 insertions(+), 47 deletions(-)
 delete mode 100644 recipes/wv/wv-1.2.0/pkgconfig.patch
 create mode 100644 recipes/wv/wv-1.2.4/pkgconfig.patch
 delete mode 100644 recipes/wv/wv_1.2.0.bb
 create mode 100644 recipes/wv/wv_1.2.4.bb

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 668a236db1..e8ee8c2dab 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -28138,18 +28138,6 @@ sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3
 md5=3d35c181dfab7dfd3fe898738dffb421
 sha256=64e6bd25d18e838e1c60693eccbd11926c65b228d6ac69c4dafc7ebe7341dbbf
 
-[http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz]
-md5=b6319d5e75611fe2210453b5feb82c0c
-sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
-
-[http://heanet.dl.sourceforge.net/wvware/wv-1.2.0.tar.gz]
-md5=b6319d5e75611fe2210453b5feb82c0c
-sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
-
-[http://switch.dl.sourceforge.net/sourceforge/wvware/wv-1.2.0.tar.gz]
-md5=b6319d5e75611fe2210453b5feb82c0c
-sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
-
 [http://www.alumnit.ca/download/wvdial-1.56.tar.gz]
 md5=45097f269c7847266e121e4a0f362be9
 sha256=e4d35719c10c372bfca8247d127c941958557aabca61c25a04f213e22cc40728
diff --git a/recipes/wv/wv-1.2.0/pkgconfig.patch b/recipes/wv/wv-1.2.0/pkgconfig.patch
deleted file mode 100644
index 136d89341f..0000000000
--- a/recipes/wv/wv-1.2.0/pkgconfig.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: wv-1.2.0/wv-1.0.pc.in
-===================================================================
---- wv-1.2.0.orig/wv-1.0.pc.in	2008-03-19 22:25:18.000000000 +0000
-+++ wv-1.2.0/wv-1.0.pc.in	2008-03-19 22:26:32.000000000 +0000
-@@ -6,5 +6,6 @@
- Name: wvWare
- Description: Word Document Filter library and utilities
- Version: @VERSION@
--Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
--Cflags: -I${includedir}/wv @GSF_CFLAGS@
-+Requires: libgsf-1
-+Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
-+Cflags: -I${includedir}/wv
diff --git a/recipes/wv/wv-1.2.4/pkgconfig.patch b/recipes/wv/wv-1.2.4/pkgconfig.patch
new file mode 100644
index 0000000000..136d89341f
--- /dev/null
+++ b/recipes/wv/wv-1.2.4/pkgconfig.patch
@@ -0,0 +1,13 @@
+Index: wv-1.2.0/wv-1.0.pc.in
+===================================================================
+--- wv-1.2.0.orig/wv-1.0.pc.in	2008-03-19 22:25:18.000000000 +0000
++++ wv-1.2.0/wv-1.0.pc.in	2008-03-19 22:26:32.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: wvWare
+ Description: Word Document Filter library and utilities
+ Version: @VERSION@
+-Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
+-Cflags: -I${includedir}/wv @GSF_CFLAGS@
++Requires: libgsf-1
++Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
++Cflags: -I${includedir}/wv
diff --git a/recipes/wv/wv_1.2.0.bb b/recipes/wv/wv_1.2.0.bb
deleted file mode 100644
index b3114a5325..0000000000
--- a/recipes/wv/wv_1.2.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "Programs for accessing Microsoft Word documents"
-HOMEPAGE = "http://wvware.sourceforge.net/"
-LICENSE = "GPLv2"
-DEPENDS = "libgsf glib-2.0"
-PR = "r4"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
-           file://pkgconfig.patch;patch=1"
-
-inherit autotools pkgconfig
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-EXTRA_OECONF = ""
-
-do_stage () {
-	autotools_stage_all
-}
-
-do_compile () {
-	oe_runmake -f GNUmakefile 
-}
diff --git a/recipes/wv/wv_1.2.4.bb b/recipes/wv/wv_1.2.4.bb
new file mode 100644
index 0000000000..8b773270c5
--- /dev/null
+++ b/recipes/wv/wv_1.2.4.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Programs for accessing Microsoft Word documents"
+HOMEPAGE = "http://wvware.sourceforge.net/"
+LICENSE = "GPLv2"
+DEPENDS = "libgsf glib-2.0"
+PR = "r4"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz;name=src \
+           file://pkgconfig.patch;patch=1"
+SRC_URI[src.md5sum] = "c1861c560491f121e12917fa76970ac5"
+SRC_URI[src.sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6"
+
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+EXTRA_OECONF = ""
+
+do_stage () {
+	autotools_stage_all
+}
+
+do_compile () {
+	oe_runmake -f GNUmakefile 
+}
-- 
cgit v1.2.3