diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2006-08-07 03:40:31 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2006-08-07 03:40:31 +0000 |
| commit | adf4580b06b420d7ea614e483162aa4edd30a37d (patch) | |
| tree | ff213484414160bb203eebdffd8a7d16b05f8844 /media-libs/libwmf/files | |
| parent | New upstream release, closes bug #143035. (diff) | |
| download | gentoo-2-adf4580b06b420d7ea614e483162aa4edd30a37d.tar.gz gentoo-2-adf4580b06b420d7ea614e483162aa4edd30a37d.tar.bz2 gentoo-2-adf4580b06b420d7ea614e483162aa4edd30a37d.zip | |
Version bump with fix from Fedora for security issue #139325.
(Portage version: 2.1.1_pre4)
Diffstat (limited to 'media-libs/libwmf/files')
| -rw-r--r-- | media-libs/libwmf/files/digest-libwmf-0.2.8.4 | 3 | ||||
| -rw-r--r-- | media-libs/libwmf/files/libwmf-0.2.8.4-build.patch | 54 | ||||
| -rw-r--r-- | media-libs/libwmf/files/libwmf-0.2.8.4-intoverflow.patch | 27 |
3 files changed, 84 insertions, 0 deletions
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 index 000000000000..f3dd09cd2a0a --- /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 index 000000000000..8814046e889c --- /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 index 000000000000..507fe66223ce --- /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..."); |