diff options
| author | Max Rees <maxcrees@me.com> | 2020-06-14 00:52:37 -0500 |
|---|---|---|
| committer | Max Rees <maxcrees@me.com> | 2020-06-14 00:52:37 -0500 |
| commit | cc8b68b5a796ff131289930ead8f4b0d0812b348 (patch) | |
| tree | 14c2ddb945975f98747017d6a7575f6af0a875c7 /system/unzip/unzipsfx-bomb-32bit.patch | |
| parent | 4e53c51f591cbd62817c797c10d240c008182ab3 (diff) | |
| download | packages-cc8b68b5a796ff131289930ead8f4b0d0812b348.tar.gz packages-cc8b68b5a796ff131289930ead8f4b0d0812b348.tar.bz2 packages-cc8b68b5a796ff131289930ead8f4b0d0812b348.tar.xz packages-cc8b68b5a796ff131289930ead8f4b0d0812b348.zip | |
system/unzip: miscellaneous fixes
* Make sure CFLAGS are respected by setting LOCAL_UNZIP instead of
LOCAL_ZIP and unsetting CFLAGS_OPT in the configure script.
* Don't strip too early by setting STRIP to a no-op and unsetting
LFLAGS2 in the configure script.
* Cherry-pick a patch from Fedora to fix format warnings.
* Fix unzipsfx test on 32-bit arches by casting a literal argument to
the correct type.
Diffstat (limited to 'system/unzip/unzipsfx-bomb-32bit.patch')
| -rw-r--r-- | system/unzip/unzipsfx-bomb-32bit.patch | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/system/unzip/unzipsfx-bomb-32bit.patch b/system/unzip/unzipsfx-bomb-32bit.patch new file mode 100644 index 000000000..f834a919b --- /dev/null +++ b/system/unzip/unzipsfx-bomb-32bit.patch @@ -0,0 +1,14 @@ +Explicitly cast literal 0 to the expected bound_t type because K&R C is +awful. + +--- unzip60/extract.c 2020-06-13 22:51:33.799778287 -0500 ++++ unzip60/extract.c 2020-06-14 00:00:50.669719055 -0500 +@@ -520,7 +520,7 @@ int extract_or_test_files(__G) /* ret + return PK_MEM; + } + if ((G.extra_bytes != 0 && +- cover_add((cover_t *)G.cover, 0, G.extra_bytes) != 0) || ++ cover_add((cover_t *)G.cover, (bound_t)0, G.extra_bytes) != 0) || + (G.ecrec.have_ecr64 && + cover_add((cover_t *)G.cover, G.ecrec.ec64_start, + G.ecrec.ec64_end) != 0) || |