Version bump with fix from Fedora for security issue #139325.

Package-Manager: portage-2.1.1_pre4

diff --git a/media-libs/libwmf/ChangeLog b/media-libs/libwmf/ChangeLog
index f2496f21f0e74736c3dcc61352255494d4fd3591..259c84c061a52b55763ac9700c1f06dc2d3198ca 100644 (file)
--- a/media-libs/libwmf/ChangeLog
+++ b/media-libs/libwmf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libwmf
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.39 2006/07/31 07:34:49 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/ChangeLog,v 1.40 2006/08/07 03:40:31 vapier Exp $
+
+*libwmf-0.2.8.4 (07 Aug 2006)
+
+  07 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  +files/libwmf-0.2.8.4-build.patch,
+  +files/libwmf-0.2.8.4-intoverflow.patch, +libwmf-0.2.8.4.ebuild:
+  Version bump with fix from Fedora for security issue #139325.
 
   31 Jul 2006; Simon Stelling <blubb@gentoo.org> libwmf-0.2.8.3-r1.ebuild:
   stable on amd64

diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
index aa1c042e400cf6e10069b562c74d3921fdb5074b..f9e6478dab50f59ee745ff58364eee4fb2d5b8b4 100644 (file)
--- a/media-libs/libwmf/Manifest
+++ b/media-libs/libwmf/Manifest
@@ -1,8 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libwmf-0.2.8.4-build.patch 1340 RMD160 d0ee933b7bd3d3b299859c8c36e542298049343b SHA1 81e1f460c426c3db37606ec3cc8da66b52c11fa3 SHA256 e12d0cd079b70fc83f87f09d262eee901707f27fe5f509e65ff108aa8cdccadb
+MD5 38162ee2a4a9ab4655fda6b4a8875041 files/libwmf-0.2.8.4-build.patch 1340
+RMD160 d0ee933b7bd3d3b299859c8c36e542298049343b files/libwmf-0.2.8.4-build.patch 1340
+SHA256 e12d0cd079b70fc83f87f09d262eee901707f27fe5f509e65ff108aa8cdccadb files/libwmf-0.2.8.4-build.patch 1340
+AUX libwmf-0.2.8.4-intoverflow.patch 971 RMD160 4b5c414021a2b663032aa90e9f40f05e1389b503 SHA1 6f130ea9f639ccf88fef0fda74cf9fa3956f81b5 SHA256 b19f80f742c22138beb6d1943f6cbedc0db2a8c72419bf8bf9216e1f806d4690
+MD5 af50a4b45bd99e0a489e04c32c1bdf36 files/libwmf-0.2.8.4-intoverflow.patch 971
+RMD160 4b5c414021a2b663032aa90e9f40f05e1389b503 files/libwmf-0.2.8.4-intoverflow.patch 971
+SHA256 b19f80f742c22138beb6d1943f6cbedc0db2a8c72419bf8bf9216e1f806d4690 files/libwmf-0.2.8.4-intoverflow.patch 971
 DIST libwmf-0.2.8.2.tar.gz 1642727 RMD160 4dd603d2b8b12203907386dfa9f2c53e32e36353 SHA1 ba8f3af71a40976a1870dcb0b4d43b189f5480e3 SHA256 ba90f243dc5f7718b94a1c97b9b42d0c3a36f8c079a7b08ec9d4e4e10b3f771c
 DIST libwmf-0.2.8.3.tar.gz 1750358 RMD160 7d53ade95ff9123dfb12b00033eb1451cabcdee5 SHA1 7408b83ba9f8aebada94b7ffdb0a8baab3b19c96 SHA256 2216a82d73a65ffe978a893d93099704b1253e9fdf0ff2e5b32d623d6be44b9f
+DIST libwmf-0.2.8.4.tar.gz 2169375 RMD160 98cd631adb5bb332d9224d04bc8a265c105435f2 SHA1 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89 SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8
 EBUILD libwmf-0.2.8.2.ebuild 1654 RMD160 f34b11a901212a2b86cf64c169b8c0e5e9e32650 SHA1 9e9c39b543b8c52d1594d346dca8fee2c7ca1e43 SHA256 25b63fc402564de4eba59db1afed721179c4d82f5df0cb6c4b6242b76324ffb1
 MD5 bd5e4bda6b3b055f8812bc6e9fdfa73e libwmf-0.2.8.2.ebuild 1654
 RMD160 f34b11a901212a2b86cf64c169b8c0e5e9e32650 libwmf-0.2.8.2.ebuild 1654
@@ -15,10 +24,14 @@ EBUILD libwmf-0.2.8.3.ebuild 1659 RMD160 b21a13f398f6b8b36c104e3a310a1f7d6642cac
 MD5 ffe35adf5ebf119b9f76bb83d47e22fa libwmf-0.2.8.3.ebuild 1659
 RMD160 b21a13f398f6b8b36c104e3a310a1f7d6642cac4 libwmf-0.2.8.3.ebuild 1659
 SHA256 8d23f0a0b046a3b76da26d5cd75a0e1c87f6a52792f1b460e5dadbca32aea8fa libwmf-0.2.8.3.ebuild 1659
-MISC ChangeLog 5650 RMD160 266b36f5ed58d4703ce8f16eab80ad10e38a2127 SHA1 08970740fc213670d40df10bf4038db1ada41b3c SHA256 7e3e35dda6520775be9d95272911e34c23774b876205975068cb7339bd464372
-MD5 151c9d200a5e5798744b253759676ed4 ChangeLog 5650
-RMD160 266b36f5ed58d4703ce8f16eab80ad10e38a2127 ChangeLog 5650
-SHA256 7e3e35dda6520775be9d95272911e34c23774b876205975068cb7339bd464372 ChangeLog 5650
+EBUILD libwmf-0.2.8.4.ebuild 2352 RMD160 6080e9faf7664a06974de98a2910703e9d08e303 SHA1 2e5eaf3c44d68ead8cf36ce1a9a5d6c69fb200c8 SHA256 54f341c7f21ddb6d0ef4662ce598bb66d1eefc87a2790f92ffd1cc66a9786409
+MD5 e4ffd35f777c0f0a897209aa9727df14 libwmf-0.2.8.4.ebuild 2352
+RMD160 6080e9faf7664a06974de98a2910703e9d08e303 libwmf-0.2.8.4.ebuild 2352
+SHA256 54f341c7f21ddb6d0ef4662ce598bb66d1eefc87a2790f92ffd1cc66a9786409 libwmf-0.2.8.4.ebuild 2352
+MISC ChangeLog 5901 RMD160 dea08569bf54b829454d0f0167dddc32e979acd6 SHA1 809acbcf878e40b3101f7054f3aa2004ff250962 SHA256 8d9a08bbbea7521c2bbcd3823b87bbe1f7eb8e083d3e77946ff2641ef532f71f
+MD5 5beb398516c19cde409f351894508662 ChangeLog 5901
+RMD160 dea08569bf54b829454d0f0167dddc32e979acd6 ChangeLog 5901
+SHA256 8d9a08bbbea7521c2bbcd3823b87bbe1f7eb8e083d3e77946ff2641ef532f71f ChangeLog 5901
 MISC metadata.xml 198 RMD160 ecb3dd5b9b5c15998184dfda3dd755184141cac2 SHA1 2f9abf78f7ff06b358d4462b4aecfce8774ac7a3 SHA256 0ada8d2cad084a20adb963bc7d24f6d332fc599e8ef2d25bf053561ad2b98c07
 MD5 56e3c453f3fa414649d2454a760fad1f metadata.xml 198
 RMD160 ecb3dd5b9b5c15998184dfda3dd755184141cac2 metadata.xml 198
@@ -32,10 +45,13 @@ SHA256 556ac8a2fba3100e2a226c75eca392439a2da6113c497ad4f79993903d2f145e files/di
 MD5 83a04df1d4f91aae02865acc18ea09f5 files/digest-libwmf-0.2.8.3-r1 247
 RMD160 d91f67114ddb923c8bf99020f675c11cbc12bbab files/digest-libwmf-0.2.8.3-r1 247
 SHA256 556ac8a2fba3100e2a226c75eca392439a2da6113c497ad4f79993903d2f145e files/digest-libwmf-0.2.8.3-r1 247
+MD5 7d102fa3f16787c4915f1a51e0f3455c files/digest-libwmf-0.2.8.4 247
+RMD160 7bdc1d9ac2daf82439b435b515007cdeb0284472 files/digest-libwmf-0.2.8.4 247
+SHA256 189c7ea072cb04cc391fef850f4865b6194e15716c1f09e61d7e8585644316ba files/digest-libwmf-0.2.8.4 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.4 (GNU/Linux)
 
-iD8DBQFE0/lbamhnQswr0vIRAs8WAJ9Ammz3Hwo+Ouym5G5qejvT9PhGEgCePqXV
-yKYLuIKNmcbSI04zCla8vTE=
-=d0WM
+iD8DBQFE1rY6amhnQswr0vIRAuIMAJkBfBUfdz9H9yhtncFWmISTeToYAwCfYERD
+4FRsMtOnpdby6Qathz7ikn8=
+=KJl+
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libwmf/files/digest-libwmf-0.2.8.4 b/media-libs/libwmf/files/digest-libwmf-0.2.8.4
new file mode 100644 (file)
index 0000000..f3dd09c
--- /dev/null
+++ b/media-libs/libwmf/files/digest-libwmf-0.2.8.4
@@ -0,0 +1,3 @@
+MD5 d1177739bf1ceb07f57421f0cee191e0 libwmf-0.2.8.4.tar.gz 2169375
+RMD160 98cd631adb5bb332d9224d04bc8a265c105435f2 libwmf-0.2.8.4.tar.gz 2169375
+SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8 libwmf-0.2.8.4.tar.gz 2169375

diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-build.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-build.patch
new file mode 100644 (file)
index 0000000..8814046
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-build.patch
@@ -0,0 +1,54 @@
+--- libwmf-0.2.8.4/src/convert/Makefile.am
++++ libwmf-0.2.8.4/src/convert/Makefile.am
+@@ -1,6 +1,6 @@
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@
+ 
+-LDFLAGS = -L$(top_builddir)/src/.libs @WMF_LIBFLAGS@ @LDFLAGS@
++LDADD = -L$(top_builddir)/src/.libs @WMF_LIBFLAGS@ @LDFLAGS@
+ 
+ DEFS = @DEFS@ @WMF_DEFS@ \
+       -DPACKAGE=\"@PACKAGE@\" \
+--- libwmf-0.2.8.4/src/extra/gd/Makefile.am
++++ libwmf-0.2.8.4/src/extra/gd/Makefile.am
+@@ -1,8 +1,6 @@
+ INCLUDES = -I$(srcdir)
+ 
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
+-
+-LDFLAGS = @LDFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@
+ 
+ DEFS = @DEFS@ @GD_DEFS@
+ 
+--- libwmf-0.2.8.4/src/extra/trio/Makefile.am
++++ libwmf-0.2.8.4/src/extra/trio/Makefile.am
+@@ -1,6 +1,4 @@
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
+-
+-LDFLAGS = @LDFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@
+ 
+ DEFS = @DEFS@ @WMF_DEFS@
+ 
+--- libwmf-0.2.8.4/src/ipa/Makefile.am
++++ libwmf-0.2.8.4/src/ipa/Makefile.am
+@@ -1,6 +1,4 @@
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@
+-
+-LDFLAGS = @LDFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@
+ 
+ DEFS = @DEFS@ @WMF_DEFS@ \
+       -DPACKAGE=\"@PACKAGE@\" \
+--- libwmf-0.2.8.4/src/Makefile.am
++++ libwmf-0.2.8.4/src/Makefile.am
+@@ -20,7 +20,7 @@
+ 
+ SUBDIRS = $(DIRHEAVY)
+ 
+-CFLAGS = @CFLAGS@ @WMF_CFLAGS@ @GDK_PIXBUF_CFLAGS@
++AM_CFLAGS = @WMF_CFLAGS@ @GDK_PIXBUF_CFLAGS@
+ 
+ DEFS = @DEFS@ @WMF_DEFS@ $(DEFHEAVY) $(GDK_PIXBUF_DEFS) \
+       -DPACKAGE=\"@PACKAGE@\" \

diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch
new file mode 100644 (file)
index 0000000..507fe66
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch
@@ -0,0 +1,27 @@
+--- libwmf-0.2.8.4.orig/src/player.c   2002-12-10 19:30:26.000000000 +0000
++++ libwmf-0.2.8.4/src/player.c        2006-07-12 15:12:52.000000000 +0100
+@@ -42,6 +42,7 @@
+ #include "player/defaults.h" /* Provides: default settings               */
+ #include "player/record.h"   /* Provides: parameter mechanism            */
+ #include "player/meta.h"     /* Provides: record interpreters            */
++#include <stdint.h>
+ 
+ /**
+  * @internal
+@@ -132,8 +134,14 @@
+               }
+       }
+ 
+-/*    P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)-3) * 2 * sizeof (unsigned char));
+- */   P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
++      if (MAX_REC_SIZE(API) > UINT32_MAX / 2)
++      {
++              API->err = wmf_E_InsMem;
++              WMF_DEBUG (API,"bailing...");
++              return (API->err);
++      }
++      
++      P->Parameters = (unsigned char*) wmf_malloc (API,(MAX_REC_SIZE(API)  ) * 2 * sizeof (unsigned char));
+ 
+       if (ERR (API))
+       {       WMF_DEBUG (API,"bailing...");

diff --git a/media-libs/libwmf/libwmf-0.2.8.4.ebuild b/media-libs/libwmf/libwmf-0.2.8.4.ebuild
new file mode 100644 (file)
index 0000000..a5f03bf
--- /dev/null
+++ b/media-libs/libwmf/libwmf-0.2.8.4.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libwmf/libwmf-0.2.8.4.ebuild,v 1.1 2006/08/07 03:40:31 vapier Exp $
+
+inherit eutils autotools
+
+#The configure script finds the 5.50 ghostscript Fontmap file while run.
+#This will probably work, especially since the real one (6.50) in this case
+#is empty. However beware in case there is any trouble
+
+DESCRIPTION="library for converting WMF files"
+HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="mirror://sourceforge/wvware/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sh ~sparc ~x86"
+IUSE="jpeg X expat xml debug doc gtk gd"
+
+RDEPEND="virtual/ghostscript
+       xml? ( !expat? ( dev-libs/libxml2 ) )
+       expat? ( dev-libs/expat )
+       gd? ( media-libs/gd )
+       >=media-libs/freetype-2.0.1
+       sys-libs/zlib
+       media-libs/libpng
+       jpeg? ( media-libs/jpeg )
+       X? ( || ( (
+                               x11-libs/libICE
+                               x11-libs/libSM
+                               x11-libs/libX11
+                       )
+                       virtual/x11
+               )
+       )
+       gtk? ( >=x11-libs/gtk+-2.1.2 ) "
+DEPEND="${RDEPEND}
+       dev-util/pkgconfig
+       X? ( || ( (
+                               x11-libs/libXt
+                               x11-libs/libXpm
+                       )
+                       virtual/x11
+               )
+       )"
+# plotutils are not really supported yet, so looks like that's it
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       if ! use doc ; then
+               sed -e 's:doc::' -i Makefile.am
+       fi
+       if ! use gtk ; then
+               sed -e 's:@LIBWMF_GDK_PIXBUF_TRUE@:#:' -i src/Makefile.in
+       fi
+       epatch "${FILESDIR}"/${P}-intoverflow.patch
+       epatch "${FILESDIR}"/${P}-build.patch
+
+       eautoreconf
+}
+
+src_compile() {
+       if use expat && use xml ; then
+               einfo "You can specify only one USE flag from expat and xml, to use expat"
+               einfo "or libxml2, respectively."
+               einfo
+               einfo "You have both flags enabled, we will default to expat (like autocheck does)."
+               myconf="${myconf} --with-expat --without-libxml2"
+       else
+               myconf="${myconf} $(use_with expat) $(use_with xml libxml2)"
+       fi
+
+       econf \
+               $(use_enable debug) \
+               $(use_with jpeg) \
+               $(use_with X x) \
+               $(use_enable gd) \
+               --with-sys-gd \
+               ${myconf} \
+               --with-gsfontdir=/usr/share/ghostscript/fonts \
+               --with-fontdir=/usr/share/libwmf/fonts/ \
+               --with-docdir=/usr/share/doc/${PF} \
+               || die "./configure failed"
+
+       emake || die
+}
+
+src_install() {
+       make install DESTDIR="${D}" || die
+       dodoc README AUTHORS CREDITS ChangeLog NEWS TODO
+}