gentoo resync : 31.10.2017

3 files changed, 102 insertions, 1 deletions

diff --git a/dev-libs/libmspack/Manifest b/dev-libs/libmspack/Manifest
index 9cb1128216d1..2dc4450cbca3 100644
--- a/dev-libs/libmspack/Manifest
+++ b/dev-libs/libmspack/Manifest
@@ -1,7 +1,8 @@
 AUX libmspack-0.5_alpha-CVE-2017-6419.patch 1483 SHA256 4b3ba5b72796af2a442bb0a01a09d6f19a4cc1544c84f505b9c50d974262e9b4 SHA512 b6aafe82630d3bb1254fcce9a8bc528b0f375a2e7eec5f729e04c2d9816feb23ba12a0275efcf5ced6578789c4ef83b4364104b4cc35c2c146f4fb527c8dbf4a WHIRLPOOL f34e90557d6c01827c032ad9067b7d1d0072f9cd4b49d99c3d6968e30e0d2d64c5a4e405fa5ff93d483268a1ee2dd912ef4e8091ef4265ef90eed0447416646d
+AUX libmspack-0.6_alpha-fix-tests.patch 3848 SHA256 b2a1f3851d7127e446972a24e94c068026f391dbf048a942c278af1a4813bc9e SHA512 7a2374a4099744939d0422e5194f019d34bd1cadc6155112e7202ed7ebaa722e9ce90b2b3095985dd89238ea77bb26bde80f8f05e5c0097096127ce7693ec007 WHIRLPOOL e7f475bd486db5efeb5022beae267906537b54b6864c8e662180b400bac08fe632d6b7127593993e53ab35ea5cd1abbe2adf3fd521d9ca6f0b21b315dee16501
 DIST libmspack-0.5alpha.tar.gz 654193 SHA256 8967f275525f5067b364cee43b73e44d0433668c39f9376dfff19f653d1c8110 SHA512 6d4efa0f43c43185ef91c97c1518aa70f09109d7332cda7e12019e146ec9cb0f2065fb1b57683b48bae9a7eaf8e82eb94096644c6d25c56d45878f630b719231 WHIRLPOOL fcbbbdee1ce4c75222767ad7ce3e16d18c3fbf1c7cb60170a9cad51647e3500e11c458f7a65e8c2e0dccfb8a8e3981f13252ac26fd9edce6f633381b77410faf
 DIST libmspack-0.6alpha.tar.gz 476992 SHA256 1edbee82accb28e679ab538f803aab7a5a569e4102ccf1715b462b1bd915f921 SHA512 7ba4a584d335c2d703628a3c179bc0d323574632357cdfe04622f960dcc4ef970b5739799397b6802d44a312f7ed9d589b4be223facf044bbfdbfd76d9c7405d WHIRLPOOL 5c8fb600af798cb7902c8a7233515004ffc2cc440a152d4296f6827910530259648f73f6e29fd75b5190057b9cf66ad1d180c58255450dbb6b23fce548ad5c73
 EBUILD libmspack-0.5_alpha-r1.ebuild 1056 SHA256 8a72b6596b49c1983142923a489d396737bf24f8fd8ec103311aa681889d7ded SHA512 df255a8f2895b667e46acb21586f7101cbb59d9dff1575a537ce31bbaac7c1d5316ca37ea58c953c1c7854929cea6e5314d5287b915b19cbd8bc943d3f1c2182 WHIRLPOOL c0ce9ca8a6e62e50574c14ae4b2cf4d56fe405d448ae9e6fcdb82bbb3df008aea0aa0763f23b2bdc9d0ae236b8995e26e3c964508956694c84b727134137765f
 EBUILD libmspack-0.5_alpha.ebuild 1001 SHA256 e3ba99982cb2b9704552a2805b912d6c6be5bb1a74c33770609bcd0bdaf30a73 SHA512 04e51296ad4a50665ad8df5d020337c75667f7525412b08356aede88c5b79bfd102613ba5f7a7fd26adbb918a4d78e280f4977949dfcc59a492613ceba1114ed WHIRLPOOL 55f3edd5aea6e803a8c3c70c310d905a8a76e314ad2ecbfce453d8438435512e2b5cdb04d9dcbdff54b9d59915b77e0018d46cc1a9e3fdd4a49f3ef902a8c9f0
-EBUILD libmspack-0.6_alpha.ebuild 1003 SHA256 4a53ba265e2918686067c7c40fd95d0110db4857428834be82399789e3e0ece4 SHA512 8e5c7dd3ac04fdd0dbe84f68d39e531d7427e9ceec23e70b4273041134d665e781809ee6fbd6da215297edda693903684c297b3ea7c7be8ea7bdbcd288a64ce9 WHIRLPOOL 0aee7c1389f2ed9542eb7d88dbaae4d39e873f5b4cc47e4d64a9b6fa83416ac0ec32650266e467d5cb189402894797eae970fac8bc44b5232dfdc3ae34ee0db1
+EBUILD libmspack-0.6_alpha.ebuild 1052 SHA256 d1a122b76a5c9990c7049f341dfb89d8ffa4c789f53afdc003406fad8f2284a0 SHA512 ca61e5186f0c5a181a72a58a0e6144a32e01bc320704cadc8fa1a0cd86877fee4dce45e43fd8840cbaba941fcd3039b4806890fc1e212c1ed50dc67a55610f0c WHIRLPOOL c2425336ba490a16c79028f94148ec3fd5ffeed8db8b23d3201c3c0d545fc39945ad484d85589872d5f5e9dbf8acd5e9eb482b181d5041cdfa12619c41a6b1dd
 MISC metadata.xml 269 SHA256 b0e50e7006e04a696bc946ae45550e2bb2d59f449f22ca6a2eade72adb0a927f SHA512 753992cc0fe22a630515becd9f12d80c9929c104521232d87da5fb369c1e3d2a86080d1d54ed1483b54f368882a7a3854a151c7779c5a3ce2aabb06b6a840c2a WHIRLPOOL e9ced1f41b584ec2f6653cbc62c86391fd9306e5f79347bc9d6e82956a7d069177ff5c2e5fc471a4097984889b22fdad936210b3bcd0682327c6aaafb11877b3
diff --git a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch b/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
new file mode 100644
index 000000000000..2f010d87a376
--- /dev/null
+++ b/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
@@ -0,0 +1,96 @@
+From deb65056f436a4ce06946c4dde270f533e3cab4d Mon Sep 17 00:00:00 2001
+From: Stuart Caie <kyzer@cabextract.org.uk>
+Date: Mon, 16 Oct 2017 13:59:05 +0100
+Subject: [PATCH] Fix cabd_test.c test and msdecompile_md5 script
+
+---
+ libmspack/ChangeLog            | 10 +++++++++
+ libmspack/test/cabd_test.c     |  3 ++-
+ libmspack/test/msdecompile_md5 | 47 +++++++++++++++++++++---------------------
+ 3 files changed, 36 insertions(+), 24 deletions(-)
+
+diff --git a/libmspack/ChangeLog b/libmspack/ChangeLog
+index 6861b19..4aef85f 100644
+--- a/libmspack/ChangeLog
++++ b/libmspack/ChangeLog
+@@ -1,3 +1,13 @@
++2017-10-16  Stuart Caie <kyzer@cabextract.org.uk>
++
++	* test/cabd_test.c: update the short string tests to expect not only
++	MSPACK_ERR_DATAFORMAT but also MSPACK_ERR_READ, because of the recent
++	change to cabd_read_string(). Thanks to maitreyee43 for spotting this.
++
++	* test/msdecompile_md5: update the setup instructions for this script,
++	and also change the script so it works with current Wine. Again, thanks
++	to maitreyee43 for trying to use it and finding it not working.
++
+ 2017-08-13  Stuart Caie <kyzer@cabextract.org.uk>
+ 
+ 	* src/chmextract.c: support MinGW one-arg mkdir(). Thanks to AntumDeluge
+diff --git a/libmspack/test/cabd_test.c b/libmspack/test/cabd_test.c
+index 5e8851c..abed65c 100644
+--- a/libmspack/test/cabd_test.c
++++ b/libmspack/test/cabd_test.c
+@@ -186,7 +186,8 @@ void cabd_open_test_05() {
+   for (i = 0; i < (sizeof(str_files)/sizeof(char *)); i++) {
+     cab = cabd->open(cabd, str_files[i]);
+     TEST(cab == NULL);
+-    TEST(cabd->last_error(cabd) == MSPACK_ERR_DATAFORMAT);
++    TEST(cabd->last_error(cabd) == MSPACK_ERR_DATAFORMAT ||
++         cabd->last_error(cabd) == MSPACK_ERR_READ);
+   }
+ 
+   /* lack of data blocks should NOT be a problem for merely reading */
+diff --git a/libmspack/test/msdecompile_md5 b/libmspack/test/msdecompile_md5
+index a1d3b4b..9efbfac 100755
+--- a/libmspack/test/msdecompile_md5
++++ b/libmspack/test/msdecompile_md5
+@@ -1,24 +1,25 @@
+-#!/usr/bin/perl -w
+-# put hh.exe, hhctrl.ocx and itss.dll into this directory
+-# for this script to work. You can get them by downloading
+-# the HTML Help Workshop from Microsoft and then doing:
+-#   $ cabextract -F 'hh*' htmlhelp.exe
+-#   $ cabextract -F itircl.dll hhupd.exe
+-#   $ cabextract -F itss.dll hhupd.exe
+-#   $ cp -a itircl.dll ~/.wine/drive_c/windows/system32/
+-#   $ cp -a itss.dll ~/.wine/drive_c/windows/system32/
+-#   $ wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itircl.dll'
+-#   $ wine regsvr32 /s 'C:\WINDOWS\SYSTEM32\itss.dll'
++#!/bin/sh
++# This script needs the following setup to work:
++# - hh.exe and hhctrl.ocx copied to Wine's system32
++# - itss.dll and itircl.dll installed as Wine DLLs
++#
++# Download the HTML Help Workshop (htmlhelp.exe) from Microsoft:
++#
++#   https://msdn.microsoft.com/en-us/library/windows/desktop/ms669985(v=vs.85).aspx
++#
++# and then run these commands:
++#
++#   cabextract htmlhelp.exe -F hhupd.exe
++#   cabextract hhupd.exe -F hh.exe
++#   cabextract hhupd.exe -F hhctrl.ocx
++#   cabextract hhupd.exe -F itircl.dll
++#   cabextract hhupd.exe -F itss.dll
++#   mv hh.exe hhctrl.ocx itircl.dll itss.dll ~/.wine/drive_c/windows/system32/
++#   wine regsvr32 /s 'c:\windows\system32\itircl.dll'
++#   wine regsvr32 /s 'c:\windows\system32\itss.dll'
+ 
+-use strict;
+-use File::Temp qw(tempdir);
+-
+-die "Usage: $0 <file.chm>\n" unless @ARGV == 1;
+-my $hh = $0; $hh =~ s{[^/]+$}{hh.exe};
+-my $dir = tempdir("./.tempXXXX", CLEANUP => 1);
+-
+-$ENV{LANG} = 'C';
+-$ENV{WINEDLLOVERRIDES}='hhctrl.ocx,itss=n';
+-print "*** $ARGV[0]\n";
+-system("wine $hh -decompile $dir $ARGV[0] 1>&2 && " .
+-       "cd $dir && find * -type f -print0 | xargs -0 md5sum");
++dir=`mktemp -d`
++echo "*** $1"
++LANG=C WINEDLLOVERRIDES='hhctrl.ocx=n' wine hh -decompile $dir "$1"
++cd $dir && find * -type f -exec md5sum {} +
++rm -rf $dir
diff --git a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
index b8c96e78ed03..6a40351178f2 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
@@ -20,6 +20,10 @@ IUSE="debug doc static-libs"
 DEPEND=""
 RDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-tests.patch"
+)
+
 S="${WORKDIR}/${MY_P}"
 
 multilib_src_configure() {