Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unzip was not building with bzip2 support #18

Merged
merged 5 commits into from
Jan 29, 2024
Merged

Unzip was not building with bzip2 support #18

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
58b34d3
unzip was not building with bzip2 support
citrus-it Jan 23, 2024
1392350
unzip: catch up on CVE fixes
citrus-it Jan 23, 2024
702652d
unzip: re-base patches
citrus-it Jan 23, 2024
7a6c62b
Use elfdump for testing libbz2 dependency
citrus-it Jan 27, 2024
d27c8ec
Review feedback
citrus-it Jan 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/unzip/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ configure_aarch64() {
}

pre_install() {
ldd $PROG | $EGREP -s libbz2 || logerr "unzip was built without bzip2"
$ELFEDIT -e dyn:dump -o simple $PROG | $EGREP -s 'libbz2\.so' \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
$ELFEDIT -e dyn:dump -o simple $PROG | $EGREP -s 'libbz2\.so' \
$ELFEDIT -r -e 'dyn:tag NEEDED' -o simple $PROG | $EGREP -s 'libbz2\.so' \

This makes sure that elfedit opens it read-only, which should be fine, but if the users are off will throw this off. Tihs also only dumps the needed tag, so that way if something else is in here and matches for some weird reason, you'll not be thrown off. Here's an example output:

rm@beren:~$ elfedit -r -e 'dyn:tag NEEDED' /usr/bin/ls
     index  tag                value
       [1]  NEEDED            0x693               libsec.so.1
       [3]  NEEDED            0x6b8               libnvpair.so.1
       [5]  NEEDED            0x6d0               libcmdutils.so.1
       [7]  NEEDED            0x6e1               libcurses.so.1
       [8]  NEEDED            0x6f0               libc.so.1

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, that's better, done.

|| logerr "unzip was built without bzip2"
save_variable MAKE_INSTALL_ARGS
MAKE_INSTALL_ARGS+=" prefix=$DESTDIR$PREFIX"
}
Expand Down