package/unzip: configure with LARGE_FILE_SUPPORT by default
Buildroot always enable largefile support in the toolchain, and thus
the associated definitions are always on. This leads to a problem in
unzip that on a 32-bit arch with these flags being passed in
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
but the LARGE_FILE_SUPPORT define not being set will cause a size
mismatch on the comparison of the zipfiles:
$ unzip test.zip
Archive: test.zip
error: invalid zip file with overlapped components (possible zip bomb)
The simple solution is just enable LARGE_FILE_SUPPORT to enable large
file support. In order to avoid redefinition warnings, we undefine
_LARGEFILE_SOURCE and _LARGEFILE64_SOURCE.
Signed-off-by: Charles Hardin <ckhardin@gmail.com>
Tested-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 168e5848ad
)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
90dbfba385
commit
65714b7e86
@ -28,4 +28,18 @@ UNZIP_IGNORE_CVES = \
|
||||
CVE-2022-0529 \
|
||||
CVE-2022-0530
|
||||
|
||||
# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
|
||||
# necessary, redefining it on the command line causes some warnings.
|
||||
UNZIP_TARGET_CFLAGS = \
|
||||
$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
|
||||
|
||||
# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
|
||||
# necessary, redefining it on the command line causes some warnings.
|
||||
UNZIP_TARGET_CXXFLAGS = \
|
||||
$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CXXFLAGS))
|
||||
|
||||
UNZIP_CONF_OPTS += \
|
||||
-DCMAKE_C_FLAGS="$(UNZIP_TARGET_CFLAGS) -DLARGE_FILE_SUPPORT" \
|
||||
-DCMAKE_CXX_FLAGS="$(UNZIP_TARGET_CXXFLAGS) -DLARGE_FILE_SUPPORT"
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
Loading…
Reference in New Issue
Block a user