reinit the tree, so we can have metadata

12 files changed, 508 insertions, 0 deletions

diff --git a/media-libs/libwmf/Manifest b/media-libs/libwmf/Manifest
new file mode 100644
index 000000000000..b70a50b8d2cb
--- /dev/null
+++ b/media-libs/libwmf/Manifest
@@ -0,0 +1,14 @@
+AUX libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch 3240 SHA256 fa2200c972600db3c49a049c53edf323d893211314d8c3ecb963b6c9fd0fdb26 SHA512 49216f9d0f499ce8923fafc8da8fa9ac1d1ce284ba36fa8131be48b23f0885c3f20ec358f0e9a47b6856239aeff2dbe9311df6594a7e797bfef92e092365821f WHIRLPOOL 81c062844dfd11cbbbb8dd8821c9450a0d99a3bd94de63722fa91b94b44fe1aced947357336dfc63ec053fb5803d73c045bccf5e2aa4b0914a4dc7cfa92c3578
+AUX libwmf-0.2.8.4-CVE-2015-4695.patch 1813 SHA256 c64aae7fd62343fe78cab6ca08b99fb982cfa44a367dad0437da805933bc980b SHA512 43c3b73df7317eec2d0ef5ce818949977d7f634487279afc692a79b78f6418bf6d9c854765fdd85a2647061ae647d2291ac9504dfbf1e6c5c5caf58712e6446e WHIRLPOOL a5d369608eef99bffe69b5f4ef7c2ab601d0ef4b29ec7f056abfdb4c7cbd50ebfeccc77c220aabed11730ce1fd7b9ce26dda61ff7c451d8e0dfb94730ffc50e3
+AUX libwmf-0.2.8.4-CVE-2015-4696.patch 483 SHA256 c1d1dace600cdfb92a6d59351f131241a099a89d05b2359eff9aa85376c52f94 SHA512 8f89d01822bfe598c410a22385207f5782164974d796c3839c27562531017452ac1f3da3111e8580168963d45fd797b1fbb9487d8593286ff8bbd446cb383dd2 WHIRLPOOL 96cf244f4de204242dae6d7d9e8775eb85217c891783263e17e0d736c1a5f3f442b430e05676ce16656fcfacb413dabfe1429577ed67871c0d491c44c372c3b5
+AUX libwmf-0.2.8.4-build.patch 1340 SHA256 e12d0cd079b70fc83f87f09d262eee901707f27fe5f509e65ff108aa8cdccadb SHA512 de48cf695e0c1a3d9b97e2dbd4db9ccc2c633269de88be8799e5cf37dbd6a5bb70cae36b203ed2bc22f22a38970faa4feeb0b7aa11aa290f68dadd2b3a5dd2f6 WHIRLPOOL 07f139f417251ccdb00b33a46f8124766b2ce8c537f69373b5191f8a537ed4330bf2c1363cf21d9946f901f1a0d001c034b7066d007e6bc9b7f9176bc8154251
+AUX libwmf-0.2.8.4-gdk-pixbuf.patch 1037 SHA256 fcfbc4ae5bc086c934fbe785ca21dacad90ef58e56aa52a58f3d29931b21c839 SHA512 2a03dffdcf2f8e6181f4468b69dc6dce4b01d9258f7596ffce83a555bed14e429e60848ba26fe7bece309430f9c2a90eec84802221d136f15058207b183382a0 WHIRLPOOL a8d17ef71da7605fe0b94eb77d2cf15ec516b6aa70442536b95bbab004944bccb9273567dfd74283c9549a720f7b66f735a732dbccf11e588ab529b3551cbe59
+AUX libwmf-0.2.8.4-intoverflow.patch 971 SHA256 b19f80f742c22138beb6d1943f6cbedc0db2a8c72419bf8bf9216e1f806d4690 SHA512 939b729d2ca9c1204e623d50151d2a736904455e716ce917da83e454dc99165b77c2039413174bd9e219dc7453ef3c92348cc7bf1e3a1ade1d5040a81eb7cdee WHIRLPOOL 9baa124817974ae0adde1d3d2e85a80e73f8c85fc97f9088197df0dc7adee4008682250e1a177d13ee7ee4446a792d002f12a7c08bb14d77400bb12b79d80889
+AUX libwmf-0.2.8.4-libpng-1.5.patch 478 SHA256 ffad4b3657725028bf3250f3555275373b800eacd6b6be5512ef3e5f76563181 SHA512 acfa95c22d3d352b270d41cd814c1c876536da9a08a19eb40acb9770913fbd824654c90223413507d714248321cd6be9190187d3b00a75ed4a0a001a0800617c WHIRLPOOL 99ce6e8841552deffcbc570a1aa69fa5d1a7afb61426224c167b39772c2929719a533ad054655fce3607a709f458cada7be7291df0df496fa767d28555840596
+AUX libwmf-0.2.8.4-pngfix.patch 582 SHA256 39a47d2d12720cc98ee4669e44c012e855df5de0dcec0636f1fb12918c2d8006 SHA512 02170d7ec2cd0e987567becd995416c52b85d3f55d6e0e236ea8eeacdb3218edc1a1647d96f24b3dbe904ea3bcc6cacef1a6d82a0fbfa9d808dc061e11a154f7 WHIRLPOOL ba610a005c06fc1e1878cf4cac5403020270afa77df7624ba2adf19179e9e82dc6b137919f8c9c068f49ea054e88e9e4bd194666fbc115756f37cb789feec5a4
+AUX libwmf-0.2.8.4-use-system-fonts.patch 840 SHA256 b99aea69f5c83ccecaca0f74c7d5bbdac2bb7c6c7991bf30d8c64616edddc469 SHA512 0b5536cf6ac5812f88cada38afa94a7c51044aff44c4fa4a74b8fabd41c001aed7acf7911cebe967ad9764525aef8cbc048796b60db7b60b12bee3cfc846c50c WHIRLPOOL eb0297267c74eb19713011392822e10e640b59eabdd58d06de3c7a6cc99046f7c8e7ced40a27d990e280de6c4f8c634e7ade7a81d5117e52d458854c631e20a7
+DIST libwmf-0.2.8.4.tar.gz 2169375 SHA256 5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8 SHA512 d98df8e76a52245487b13e5ab3d2fbba9d246f97ee04a7344c0e5861bb2d0f990fc6d662dbd849ce621768b06eaebd4270fb34bec4ee004334a98b14ba6044a5 WHIRLPOOL e6f9378fcb3363d62eb7bb12dca93a496954971a4c17359b8276c675557f892dee19843598c9d21987bf50ecc42083e7cec420e95e7052974a5843696ae0fd1e
+EBUILD libwmf-0.2.8.4-r6.ebuild 2758 SHA256 1a698d93f5af6f9850c815b1fd35485006d769a41e7ef72909e37cccce8596d6 SHA512 0ed88a4ac51bf4c8ebca0bba2d43f936b8232b5f367012fb20e8423b2bd729a23c79931906bdc042db1789e4454d241fdca8bf49f99835bddfbeacf6a43da7b4 WHIRLPOOL a2f026d691f4daf41232150bc4161c3f3857f59f33a7d7f82eee7d2832693c49e74737bfab411bc1a21902487726458fe143fa42da9a86a9a462e5945f664d65
+MISC ChangeLog 4980 SHA256 fcb6869f50af5025fb7d95d3f4ef3213fd71a55c23ee30bfede102965868730e SHA512 64d367d8670e02b8f8318fc6f5587d77f3f1d2fc087ba50026f2657e84e6d7f672e0cf22b8973b3492057de96c3168ab8aa7cf4c3f3f65358dfaea3a242cf436 WHIRLPOOL 8fd3d3144845abe424cbfa9f6750b8038a1166d91c5579ae860484ea14cb7afd8af2ca10e92fa1c128c84100028b19bb4815ec5ca928648f132f34981c91f321
+MISC ChangeLog-2015 13914 SHA256 6dd1f9662079b1ac0dc611520e98260b15b157bf138b97fa8ae51ba049dff678 SHA512 d0e96d7af50cdca6b8baaa9af0261653cc11bd75dfd03e7f36cb24ad1a097437b59411f5480e82fd7d0cc7d0cc70908c83381fb1fb065575ea59dc3996c731fd WHIRLPOOL 45fba391436b8381a8148e4a547f3eab55417f0c4c788c2138e2294b918687ab0fc506519ded426f01f1c756abe143ab0e8352abcf439c922ac492d28bd8f802
+MISC metadata.xml 248 SHA256 64e3371e8a11442ae54773ee9a83d2bc8c3e684e1eb990a0d0531b5cb75a6c7c SHA512 027605de999e5f246cbf861899aeea5ec9efeb1de5dcd5ff8f0b2f883135e208db85ac8d0e37a7caf300d293de3b6b6b9ed91d5fafc1c1b0d66bd65d79579cb5 WHIRLPOOL e0d24e4f620d1e9219cef6dbaeca1c6f832b4dfea04f2afe24db2552b79b11b9f5344b13b03abd5b42f9117d8adcc8076b34ab9622f888666815855004059b99
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
new file mode 100644
index 000000000000..e8ba8db1e843
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-0848+CVE-2015-4588.patch
@@ -0,0 +1,118 @@
+--- libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2015-06-08 14:46:24.591876404 +0100
++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2015-06-08 14:46:35.345993247 +0100
+@@ -859,7 +859,7 @@
+ %
+ %
+ */
+-static void DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
++static int DecodeImage (wmfAPI* API,wmfBMP* bmp,BMPSource* src,unsigned int compression,unsigned char* pixels)
+ {	int byte;
+ 	int count;
+ 	int i;
+@@ -870,12 +870,14 @@
+ 	U32 u;
+ 
+ 	unsigned char* q;
++	unsigned char* end;
+ 
+ 	for (u = 0; u < ((U32) bmp->width * (U32) bmp->height); u++) pixels[u] = 0;
+ 
+ 	byte = 0;
+ 	x = 0;
+ 	q = pixels;
++	end = pixels + bmp->width * bmp->height;
+ 
+ 	for (y = 0; y < bmp->height; )
+ 	{	count = ReadBlobByte (src);
+@@ -884,7 +886,10 @@
+ 		{	/* Encoded mode. */
+ 			byte = ReadBlobByte (src);
+ 			for (i = 0; i < count; i++)
+-			{	if (compression == 1)
++			{	
++				if (q == end)
++					return 0;
++			 	if (compression == 1)
+ 				{	(*(q++)) = (unsigned char) byte;
+ 				}
+ 				else
+@@ -896,13 +901,15 @@
+ 		else
+ 		{	/* Escape mode. */
+ 			count = ReadBlobByte (src);
+-			if (count == 0x01) return;
++			if (count == 0x01) return 1;
+ 			switch (count)
+ 			{
+ 			case 0x00:
+ 			 {	/* End of line. */
+ 				x = 0;
+ 				y++;
++				if (y >= bmp->height)
++					return 0;
+ 				q = pixels + y * bmp->width;
+ 				break;
+ 			 }
+@@ -910,13 +917,20 @@
+ 			 {	/* Delta mode. */
+ 				x += ReadBlobByte (src);
+ 				y += ReadBlobByte (src);
++				if (y >= bmp->height)
++					return 0;
++				if (x >= bmp->width)
++					return 0;
+ 				q = pixels + y * bmp->width + x;
+ 				break;
+ 			 }
+ 			default:
+ 			 {	/* Absolute mode. */
+ 				for (i = 0; i < count; i++)
+-				{	if (compression == 1)
++				{
++					if (q == end)
++						return 0;
++					if (compression == 1)
+ 					{	(*(q++)) = ReadBlobByte (src);
+ 					}
+ 					else
+@@ -943,7 +957,7 @@
+ 	byte = ReadBlobByte (src);  /* end of line */
+ 	byte = ReadBlobByte (src);
+ 
+-	return;
++	return 1;
+ }
+ 
+ /*
+@@ -1143,8 +1157,18 @@
+ 		}
+ 	}
+ 	else
+-	{	/* Convert run-length encoded raster pixels. */
+-		DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image);
++	{
++		if (bmp_info.bits_per_pixel == 8)	/* Convert run-length encoded raster pixels. */
++		{
++			if (!DecodeImage (API,bmp,src,(unsigned int) bmp_info.compression,data->image))
++			{	WMF_ERROR (API,"corrupt bmp");
++				API->err = wmf_E_BadFormat;
++			}
++		}
++		else
++		{	WMF_ERROR (API,"Unexpected pixel depth");
++			API->err = wmf_E_BadFormat;
++		}
+ 	}
+ 
+ 	if (ERR (API))
+--- libwmf-0.2.8.4/src/ipa/ipa.h	2015-06-08 14:46:24.590876393 +0100
++++ libwmf-0.2.8.4/src/ipa/ipa.h	2015-06-08 14:46:35.345993247 +0100
+@@ -48,7 +48,7 @@
+ static unsigned short ReadBlobLSBShort (BMPSource*);
+ static unsigned long  ReadBlobLSBLong (BMPSource*);
+ static long           TellBlob (BMPSource*);
+-static void           DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
++static int            DecodeImage (wmfAPI*,wmfBMP*,BMPSource*,unsigned int,unsigned char*);
+ static void           ReadBMPImage (wmfAPI*,wmfBMP*,BMPSource*);
+ static int            ExtractColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned int,unsigned int);
+ static void           SetColor (wmfAPI*,wmfBMP*,wmfRGB*,unsigned char,unsigned int,unsigned int);
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch
new file mode 100644
index 000000000000..b6d499da98e1
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4695.patch
@@ -0,0 +1,56 @@
+--- libwmf-0.2.8.4/src/player/meta.h
++++ libwmf-0.2.8.4/src/player/meta.h
+@@ -1565,7 +1565,7 @@ static int meta_rgn_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -2142,7 +2142,7 @@ static int meta_dib_brush (wmfAPI* API,w
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3067,7 +3067,7 @@ static int meta_pen_create (wmfAPI* API,
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3181,7 +3181,7 @@ static int meta_brush_create (wmfAPI* AP
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3288,7 +3288,7 @@ static int meta_font_create (wmfAPI* API
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
+@@ -3396,7 +3396,7 @@ static int meta_palette_create (wmfAPI*
+ 	objects = P->objects;
+ 
+ 	i = 0;
+-	while (objects[i].type && (i < NUM_OBJECTS (API))) i++;
++	while ((i < NUM_OBJECTS (API)) && objects[i].type) i++;
+ 
+ 	if (i == NUM_OBJECTS (API))
+ 	{	WMF_ERROR (API,"Object out of range!");
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch
new file mode 100644
index 000000000000..3312841258b0
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-CVE-2015-4696.patch
@@ -0,0 +1,23 @@
+--- libwmf-0.2.8.4/src/player/meta.h
++++ libwmf-0.2.8.4/src/player/meta.h
+@@ -2585,6 +2585,8 @@
+ 			polyrect.BR[i] = clip->rects[i].BR;
+ 		}
+ 
++		if (FR->region_clip) FR->region_clip (API,&polyrect);
++
+ 		wmf_free (API,polyrect.TL);
+ 		wmf_free (API,polyrect.BR);
+ 	}
+@@ -2593,9 +2595,10 @@
+ 		polyrect.BR = 0;
+ 
+ 		polyrect.count = 0;
++	
++		if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 	}
+ 
+-	if (FR->region_clip) FR->region_clip (API,&polyrect);
+ 
+ 	return (changed);
+ }
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-gdk-pixbuf.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch
new file mode 100644
index 000000000000..83a9ce7f3635
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-gdk-pixbuf.patch
@@ -0,0 +1,25 @@
+diff -urN libwmf-0.2.8.4.old/configure.ac libwmf-0.2.8.4/configure.ac
+--- libwmf-0.2.8.4.old/configure.ac	2011-07-01 22:37:57.000000000 +0200
++++ libwmf-0.2.8.4/configure.ac	2011-07-01 22:41:38.000000000 +0200
+@@ -744,8 +744,7 @@
+ 
+ if test $LIBWMF_BUILDSTYLE != lite; then
+ 	PKG_CHECK_MODULES(GDK_PIXBUF,gdk-pixbuf-2.0 >= 2.1.2,[
+-		GTK_VERSION=`$PKG_CONFIG --variable=gtk_binary_version gtk+-2.0`
+-		GDK_PIXBUF_DIR="gtk-2.0/$GTK_VERSION/loaders"
++		GDK_PIXBUF_DIR=`$PKG_CONFIG --variable=gdk_pixbuf_moduledir gdk-pixbuf-2.0`
+ 		wmf_gdk_pixbuf=yes
+ 	],[	wmf_gdk_pixbuf=no
+ 	])
+diff -urN libwmf-0.2.8.4.old/src/Makefile.am libwmf-0.2.8.4/src/Makefile.am
+--- libwmf-0.2.8.4.old/src/Makefile.am	2011-07-01 22:37:57.000000000 +0200
++++ libwmf-0.2.8.4/src/Makefile.am	2011-07-01 22:40:41.000000000 +0200
+@@ -63,7 +63,7 @@
+ 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ 	-release $(LT_RELEASE) -export-dynamic
+ 
+-loaderdir = $(libdir)/$(GDK_PIXBUF_DIR)
++loaderdir = $(GDK_PIXBUF_DIR)
+ 
+ loader_LTLIBRARIES = $(GDK_PIXBUF_PLUGIN)
+ 
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...");
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-libpng-1.5.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-libpng-1.5.patch
new file mode 100644
index 000000000000..3528c74ebd8d
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-libpng-1.5.patch
@@ -0,0 +1,12 @@
+diff -urN libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h libwmf-0.2.8.4/src/ipa/ipa/bmp.h
+--- libwmf-0.2.8.4.old/src/ipa/ipa/bmp.h	2011-05-23 19:14:23.000000000 +0200
++++ libwmf-0.2.8.4/src/ipa/ipa/bmp.h	2011-05-23 19:15:11.000000000 +0200
+@@ -66,7 +66,7 @@
+ 		return;
+ 	}
+ 
+-	if (setjmp (png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{	WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
+ 		png_destroy_write_struct (&png_ptr,&info_ptr);
+ 		wmf_free (API,buffer);
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch
new file mode 100644
index 000000000000..52717735a26e
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-pngfix.patch
@@ -0,0 +1,20 @@
+diff -NrU5 libwmf-0.2.8.4.orig/src/ipa/ipa.c libwmf-0.2.8.4/src/ipa/ipa.c
+--- libwmf-0.2.8.4.orig/src/ipa/ipa.c	2009-05-10 23:41:17.000000000 +0200
++++ libwmf-0.2.8.4/src/ipa/ipa.c	2009-05-11 00:07:43.000000000 +0200
+@@ -33,10 +33,16 @@
+ 
+ /* Define WMF_API if this is module so that ipa headers are included via "wmfdefs.h" first
+  */
+ #define WMF_IPA 1
+ 
++#ifndef HAVE_GD
++#ifdef HAVE_LIBPNG
++#include <png.h>
++#endif /* HAVE_LIBPNG */
++#endif /* HAVE_GD */
++
+ #include "wmfdefs.h"
+ 
+ #include "ipa/ipa.h"
+ #include "ipa/ipa/bmp.h"   /* Provides default bitmap functionality */
+ 
diff --git a/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch b/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch
new file mode 100644
index 000000000000..2f7465c33cd0
--- /dev/null
+++ b/media-libs/libwmf/files/libwmf-0.2.8.4-use-system-fonts.patch
@@ -0,0 +1,39 @@
+diff -urN libwmf-0.2.8.4.old/fonts/Makefile.am libwmf-0.2.8.4/fonts/Makefile.am
+--- libwmf-0.2.8.4.old/fonts/Makefile.am	2011-07-01 22:37:57.000000000 +0200
++++ libwmf-0.2.8.4/fonts/Makefile.am	2011-07-01 22:38:37.000000000 +0200
+@@ -1,35 +1,3 @@
+ fontdir = @WMF_FONTDIR@
+ 
+ bin_SCRIPTS = libwmf-fontmap
+-
+-FONTS = \
+-	n019003l.afm \
+-	n019003l.pfb \
+-	n019004l.afm \
+-	n019004l.pfb \
+-	n019023l.afm \
+-	n019023l.pfb \
+-	n019024l.afm \
+-	n019024l.pfb \
+-	n021003l.afm \
+-	n021003l.pfb \
+-	n021004l.afm \
+-	n021004l.pfb \
+-	n021023l.afm \
+-	n021023l.pfb \
+-	n021024l.afm \
+-	n021024l.pfb \
+-	n022003l.afm \
+-	n022003l.pfb \
+-	n022004l.afm \
+-	n022004l.pfb \
+-	n022023l.afm \
+-	n022023l.pfb \
+-	n022024l.afm \
+-	n022024l.pfb \
+-	s050000l.afm \
+-	s050000l.pfb
+-
+-font_DATA = $(FONTS) fontmap
+-
+-EXTRA_DIST = libwmf-fontmap.in LICENSE $(FONTS)
diff --git a/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
new file mode 100644
index 000000000000..0418fee876c3
--- /dev/null
+++ b/media-libs/libwmf/libwmf-0.2.8.4-r6.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils gnome2-utils
+
+#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 ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+IUSE="X debug doc expat xml"
+
+RDEPEND="
+	app-text/ghostscript-gpl
+	media-fonts/urw-fonts
+	media-libs/freetype:2=
+	>=media-libs/libpng-1.4:0=
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2[X?]
+	virtual/jpeg:0=
+	xml? (
+		expat? ( dev-libs/expat )
+		!expat? (  dev-libs/libxml2 )
+	)
+	X? ( x11-libs/libX11 )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	X? (
+		x11-libs/libXt
+		x11-libs/libXpm
+	)"
+# plotutils are not really supported yet, so looks like that's it
+
+REQUIRED_USE="expat? ( xml )"
+
+DOCS=( README AUTHORS CREDITS ChangeLog NEWS TODO )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-intoverflow.patch
+	"${FILESDIR}"/${P}-build.patch
+	"${FILESDIR}"/${P}-pngfix.patch
+	"${FILESDIR}"/${P}-libpng-1.5.patch
+	"${FILESDIR}"/${P}-use-system-fonts.patch
+	"${FILESDIR}"/${P}-gdk-pixbuf.patch
+	"${FILESDIR}"/${P}-CVE-2015-0848+CVE-2015-4588.patch
+	"${FILESDIR}"/${P}-CVE-2015-4695.patch
+	"${FILESDIR}"/${P}-CVE-2015-4696.patch
+	)
+
+AUTOTOOLS_PRUNE_LIBTOOL_FILES='modules'
+
+src_prepare() {
+	if ! use doc ; then
+		sed -e 's:doc::' -i Makefile.am || die
+	fi
+	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=()
+	# NOTE: The gd that is included is gd-2.0.0. Even with --with-sys-gd, that gd is built
+	# and included in libwmf. Since nothing in-tree seems to use media-libs/libwmf[gd],
+	# we're explicitly disabling gd use w.r.t. bug 268161
+	if use expat; then
+		myeconfargs+=( --without-libxml2 )
+	else
+		myeconfargs+=( $(use_with xml libxml2) )
+	fi
+
+	myeconfargs+=(
+		--disable-static
+		$(use_enable debug)
+		$(use_with X x)
+		$(use_with expat)
+		--disable-gd
+		--with-sys-gd
+		--with-gsfontdir="${EPREFIX}"/usr/share/ghostscript/fonts
+		--with-fontdir="${EPREFIX}"/usr/share/fonts/urw-fonts/
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		)
+	autotools-utils_src_configure
+}
+
+src_install() {
+	MAKEOPTS+=" -j1"
+	autotools-utils_src_install
+}
+
+pkg_preinst() {
+	gnome2_gdk_pixbuf_savelist
+}
+
+pkg_postinst() {
+	gnome2_gdk_pixbuf_update
+}
+
+pkg_postrm() {
+	gnome2_gdk_pixbuf_update
+}
diff --git a/media-libs/libwmf/metadata.xml b/media-libs/libwmf/metadata.xml
new file mode 100644
index 000000000000..12310dcd7d27
--- /dev/null
+++ b/media-libs/libwmf/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <!-- maintainer-needed -->
+  <upstream>
+    <remote-id type="sourceforge">wvware</remote-id>
+  </upstream>
+</pkgmetadata>