[gentoo-commits] repo/gentoo:master commit in: dev-libs/libmspack/files/
commit: cb0e40e1cbee88737d78e59df4a62cf1a23963c9
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sun Apr 7 14:48:26 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sat Apr 20 01:28:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb0e40e1
dev-libs/libmspack: remove unused patches
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11627
Signed-off-by: Aaron Bauman gentoo.org>
.../files/libmspack-0.6_alpha-fix-tests.patch| 14 --
.../libmspack-0.7.1_alpha-fix-parallel-build.patch | 20
2 files changed, 34 deletions(-)
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
deleted file mode 100644
index 22b0461ae7e..000
--- a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/libmspack/test/cabd_test.c b/libmspack/test/cabd_test.c
-index 5e8851c..abed65c 100644
a/test/cabd_test.c
-+++ b/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/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
b/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
deleted file mode 100644
index 38935a8d26f..000
--- a/dev-libs/libmspack/files/libmspack-0.7.1_alpha-fix-parallel-build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 43099fb1bba26792fe98b4157c950db9c333134d Mon Sep 17 00:00:00 2001
-From: Stuart Caie
-Date: Tue, 16 Oct 2018 11:25:24 +0100
-Subject: [PATCH] Fix parallel builds by adding adding libmschmd.la explicitly
- to test_chmd_test_DEPENDENCIES
-
-diff --git a/libmspack/Makefile.am b/libmspack/Makefile.am
-index ba19535..6130bc2 100644
a/Makefile.am
-+++ b/Makefile.am
-@@ -89,7 +89,7 @@ test_chmd_order_SOURCES =test/chmd_order.c test/md5.c
test/md5.h \
- test_chmd_order_LDADD = libmschmd.la
- test_chmd_test_SOURCES = test/chmd_test.c libmschmd.la
- test_chmd_test_LDADD =libmschmd.la
--test_chmd_test_DEPENDENCIES =
test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
-+test_chmd_test_DEPENDENCIES = libmschmd.la
test/test_files/chmd/cve-2015-4467-reset-interval-zero.chm
- test_chminfo_SOURCES =test/chminfo.c libmschmd.la
- test_chminfo_LDADD = libmschmd.la
- test_kwajd_test_SOURCES = test/kwajd_test.c libmspack.la
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libmspack/files/, dev-libs/libmspack/
commit: 87f69c522fb67cdfb9e04f10e5ced3f88420fc86
Author: Thomas Deutschmann gentoo org>
AuthorDate: Thu Nov 22 13:45:29 2018 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Nov 22 13:46:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87f69c52
dev-libs/libmspack: fix big endian
Closes: https://bugs.gentoo.org/670654
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann gentoo.org>
.../files/libmspack-0.9.1_alpha-fix-bigendian.patch | 17 +
...9.1_alpha.ebuild => libmspack-0.9.1_alpha-r1.ebuild} | 2 ++
2 files changed, 19 insertions(+)
diff --git a/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch
b/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch
new file mode 100644
index 000..c134fa0760d
--- /dev/null
+++ b/dev-libs/libmspack/files/libmspack-0.9.1_alpha-fix-bigendian.patch
@@ -0,0 +1,17 @@
+https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6
+
+---
+ configure.ac | 1 +
+ 1 files changed, 1 insertions(+)
+
+diff --git a/libmspack/configure.ac b/libmspack/configure.ac
+--- a/configure.ac
b/configure.ac
+@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h])
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
++AC_C_BIGENDIAN
+ AC_TYPE_MODE_T
+ AC_TYPE_OFF_T
+ AC_TYPE_SIZE_T
diff --git a/dev-libs/libmspack/libmspack-0.9.1_alpha.ebuild
b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
similarity index 96%
rename from dev-libs/libmspack/libmspack-0.9.1_alpha.ebuild
rename to dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
index 8cdcb1c82b7..d7bd17fac0b 100644
--- a/dev-libs/libmspack/libmspack-0.9.1_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.9.1_alpha-r1.ebuild
@@ -26,6 +26,8 @@ IUSE="debug doc static-libs"
DEPEND=""
RDEPEND=""
+PATCHES=( "${FILESDIR}"/${P}-fix-bigendian.patch )
+
S="${WORKDIR}/${MY_P}"
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libmspack/files/
commit: 07f1f53c96e552cdb6c318b4dfdf420f9f2886f2
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Sat Apr 28 07:57:18 2018 +
Commit: Aaron Bauman gentoo org>
CommitDate: Sat May 5 01:22:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f1f53c
dev-libs/libmspack: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/8178
.../files/libmspack-0.5_alpha-CVE-2017-6419.patch | 41 --
1 file changed, 41 deletions(-)
diff --git a/dev-libs/libmspack/files/libmspack-0.5_alpha-CVE-2017-6419.patch
b/dev-libs/libmspack/files/libmspack-0.5_alpha-CVE-2017-6419.patch
deleted file mode 100644
index 1b81fdcbfcd..000
--- a/dev-libs/libmspack/files/libmspack-0.5_alpha-CVE-2017-6419.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a83773682e856ad6529ba6db8d1792e6d515d7f1 Mon Sep 17 00:00:00 2001
-From: Mickey Sola
-Date: Wed, 29 Mar 2017 14:55:26 -0400
-Subject: [PATCH] fixing potential OOB window write when unpacking chm files
-
- libclamav/libmspack-0.5alpha/mspack/lzxd.c | 11 +--
- libclamav/libmspack.c | 6 +-
- 2 files changed, 14 insertions(+), 3 deletions(-)
-
-diff --git a/libclamav/libmspack-0.5alpha/mspack/lzxd.c
b/libclamav/libmspack-0.5alpha/mspack/lzxd.c
-index 2281e7b9d..45105a583 100644
a/mspack/lzxd.c
-+++ b/mspack/lzxd.c
-@@ -766,8 +766,13 @@ int lzxd_decompress(struct lzxd_stream *lzx, off_t
out_bytes) {
- case LZX_BLOCKTYPE_UNCOMPRESSED:
- /* as this_run is limited not to wrap a frame, this also means it
-* won't wrap the window (as the window is a multiple of 32k) */
-+if (window_posn + this_run > lzx->window_size) {
-+D(("match ran over window boundary"))
-+return lzx->error = MSPACK_ERR_DECRUNCH;
-+}
- rundest = &window[window_posn];
- window_posn += this_run;
-+
- while (this_run > 0) {
- if ((i = i_end - i_ptr) == 0) {
- READ_IF_NEEDED;
-@@ -888,8 +893,10 @@ void lzxd_free(struct lzxd_stream *lzx) {
- struct mspack_system *sys;
- if (lzx) {
- sys = lzx->sys;
--sys->free(lzx->inbuf);
--sys->free(lzx->window);
-+if(lzx->inbuf)
-+sys->free(lzx->inbuf);
-+if(lzx->window)
-+sys->free(lzx->window);
- sys->free(lzx);
- }
- }
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libmspack/files/
commit: df1387eae217481b44a32fd9fe04919def2099f3
Author: Maciej Mrozowski gentoo org>
AuthorDate: Fri Nov 3 01:04:02 2017 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Fri Nov 3 01:04:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df1387ea
dev-libs/libmspack: Fix "Fix tests" patch, bug 636110
Package-Manager: Portage-2.3.8, Repoman-2.3.4
.../files/libmspack-0.6_alpha-fix-tests.patch | 86 +-
1 file changed, 2 insertions(+), 84 deletions(-)
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
index 2f010d87a37..22b0461ae7e 100644
--- a/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
+++ b/dev-libs/libmspack/files/libmspack-0.6_alpha-fix-tests.patch
@@ -1,36 +1,7 @@
-From deb65056f436a4ce06946c4dde270f533e3cab4d Mon Sep 17 00:00:00 2001
-From: Stuart Caie
-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
-+
-+ * 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
-
- * 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
+--- a/test/cabd_test.c
b/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]);
@@ -41,56 +12,3 @@ index 5e8851c..abed65c 100644
}
/* 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 \n" unless @ARGV == 1;
--my $hh = $0; $hh =~ s{[^/]+$}{hh.exe};
--my $dir = tempdir("./.temp", 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
[gentoo-commits] repo/gentoo:master commit in: dev-libs/libmspack/files/, dev-libs/libmspack/
commit: ac489776e5c17f2e6a91b0ee7603caa7ad797a4e
Author: Maciej Mrozowski gentoo org>
AuthorDate: Mon Oct 30 06:05:30 2017 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Mon Oct 30 06:05:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac489776
dev-libs/libmspack: Fix tests, bug #635776
Package-Manager: Portage-2.3.8, Repoman-2.3.4
.../files/libmspack-0.6_alpha-fix-tests.patch | 96 ++
dev-libs/libmspack/libmspack-0.6_alpha.ebuild | 4 +
2 files changed, 100 insertions(+)
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 000..2f010d87a37
--- /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
+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
++
++ * 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
+
+ * 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 \n" unless @ARGV == 1;
+-my $hh = $0; $hh =~ s{[^/]+$}{hh.exe};
+-my $dir = tempdir("./.temp", 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 b8c96e78ed0..6a40351178f 100644
--- a/dev-libs/libmspack/libmspack-0.6_alpha.ebuild
+++ b/dev-libs/libmspack/libmspack-0.6_alpha.ebuil
