1 |
commit: 3a418bfc82713d71cdefa33db2a04aebc78fd052 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 22 13:53:24 2018 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Nov 22 13:53:24 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a418bfc |
7 |
|
8 |
app-arch/cabextract: fix big-endian |
9 |
|
10 |
Closes: https://bugs.gentoo.org/670654 |
11 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
.../{cabextract-1.9.ebuild => cabextract-1.9-r1.ebuild} | 5 +++++ |
15 |
.../cabextract/files/cabextract-1.9-fix-bigendian.patch | 17 +++++++++++++++++ |
16 |
.../cabextract-1.9-remove-spurious-test_files.patch | 17 +++++++++++++++++ |
17 |
3 files changed, 39 insertions(+) |
18 |
|
19 |
diff --git a/app-arch/cabextract/cabextract-1.9.ebuild b/app-arch/cabextract/cabextract-1.9-r1.ebuild |
20 |
similarity index 93% |
21 |
rename from app-arch/cabextract/cabextract-1.9.ebuild |
22 |
rename to app-arch/cabextract/cabextract-1.9-r1.ebuild |
23 |
index 547506966c9..f435083a5f2 100644 |
24 |
--- a/app-arch/cabextract/cabextract-1.9.ebuild |
25 |
+++ b/app-arch/cabextract/cabextract-1.9-r1.ebuild |
26 |
@@ -31,6 +31,11 @@ DEPEND="${LIBMSPACK_DEPEND} |
27 |
virtual/pkgconfig" |
28 |
RDEPEND="extras? ( dev-lang/perl )" |
29 |
|
30 |
+PATCHES=( |
31 |
+ "${FILESDIR}"/${P}-fix-bigendian.patch |
32 |
+ "${FILESDIR}"/${P}-remove-spurious-test_files.patch |
33 |
+) |
34 |
+ |
35 |
src_prepare() { |
36 |
if [[ ${PV} == "9999" ]] ; then |
37 |
# Re-create file layout from release tarball |
38 |
|
39 |
diff --git a/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch |
40 |
new file mode 100644 |
41 |
index 00000000000..760dd9dbb01 |
42 |
--- /dev/null |
43 |
+++ b/app-arch/cabextract/files/cabextract-1.9-fix-bigendian.patch |
44 |
@@ -0,0 +1,17 @@ |
45 |
+https://github.com/kyz/libmspack/commit/c19e707936947b45cf05bc9aaee68517c6c2aca6 |
46 |
+ |
47 |
+--- |
48 |
+ configure.ac | 1 + |
49 |
+ 1 files changed, 1 insertions(+) |
50 |
+ |
51 |
+diff --git a/configure.ac b/configure.ac |
52 |
+--- a/configure.ac |
53 |
++++ b/configure.ac |
54 |
+@@ -30,6 +30,7 @@ AC_CHECK_HEADERS([inttypes.h]) |
55 |
+ # Checks for typedefs, structures, and compiler characteristics. |
56 |
+ AC_C_CONST |
57 |
+ AC_C_INLINE |
58 |
++AC_C_BIGENDIAN |
59 |
+ AC_TYPE_MODE_T |
60 |
+ AC_TYPE_OFF_T |
61 |
+ AC_TYPE_SIZE_T |
62 |
|
63 |
diff --git a/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch |
64 |
new file mode 100644 |
65 |
index 00000000000..d80b8704834 |
66 |
--- /dev/null |
67 |
+++ b/app-arch/cabextract/files/cabextract-1.9-remove-spurious-test_files.patch |
68 |
@@ -0,0 +1,17 @@ |
69 |
+https://github.com/kyz/libmspack/commit/2f78851e3927b05931574b380ca6dccaf91e3807 |
70 |
+ |
71 |
+--- |
72 |
+ test/bugs.test | 2 +- |
73 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
74 |
+ |
75 |
+--- a/test/bugs.test |
76 |
++++ b/test/bugs.test |
77 |
+@@ -2,7 +2,7 @@ |
78 |
+ # test that known crash bugs remain fixed |
79 |
+ . test/testcase |
80 |
+ |
81 |
+-$cabextract -t $test_files/bugs/*.cab |
82 |
++$cabextract -t bugs/*.cab |
83 |
+ |
84 |
+ # fail if exit code indicates a crash (SIGBUS, SIGSEGV, etc.) |
85 |
+ test $? -le 1 |