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.

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

libgit2: upgrade to golang-with-libgit2 v0.1.4 #842

Merged
merged 2 commits into from
Jul 26, 2022

Conversation

aryan9600
Copy link
Member

@aryan9600 aryan9600 commented Jul 21, 2022

Upgrade to golang-with-libgit2 v0.1.4 and use libgit2 which is compiled
without being linked to libssh2 and openssl.

Relates to: #782
Fixes: #762

Signed-off-by: Sanskar Jaiswal jaiswalsanskar078@gmail.com

@pjbgf
Copy link
Member

pjbgf commented Jul 21, 2022

@pjbgf pjbgf added the area/git Git related issues and pull requests label Jul 21, 2022
@pjbgf pjbgf added this to the GA milestone Jul 21, 2022
@aryan9600 aryan9600 force-pushed the remove-unmanaged-transport branch 2 times, most recently from 2b21d3b to f42e430 Compare July 22, 2022 05:17
@pjbgf
Copy link
Member

pjbgf commented Jul 22, 2022

Copy link
Member

@pjbgf pjbgf left a comment

Choose a reason for hiding this comment

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

Just added two comments on changes we need to include as part of this PR.

@aryan9600 aryan9600 force-pushed the remove-unmanaged-transport branch 3 times, most recently from 2d1e524 to b1f741b Compare July 25, 2022 13:15
@aryan9600 aryan9600 requested review from pjbgf and hiddeco July 25, 2022 13:44
Dockerfile Outdated Show resolved Hide resolved
@aryan9600 aryan9600 force-pushed the remove-unmanaged-transport branch 3 times, most recently from e3cbb2a to 5e3a2ee Compare July 26, 2022 08:31
hack/install-libraries.sh Outdated Show resolved Hide resolved
Comment on lines 93 to 96
go-fuzz -tags gofuzz -func="${function}" -o "${fuzzer}.a" .
${CXX} ${CXXFLAGS} ${LIB_FUZZING_ENGINE} -o "${OUT}/${fuzzer}" \
"${fuzzer}.a" \
"${TARGET_DIR}/lib/libgit2.a" "${TARGET_DIR}/lib/libssh2.a" \
"${TARGET_DIR}/lib/libz.a" "${TARGET_DIR}/lib64/libssl.a" \
"${TARGET_DIR}/lib64/libcrypto.a" \
"${fuzzer}.a" "${TARGET_DIR}/lib/libgit2.a" \
-fsanitize="${SANITIZER}"
Copy link
Member

Choose a reason for hiding this comment

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

By the byte, now we don't need to embed the entire dependency chain, we may be able to revert back to the Vanilla tooling from the CIFuzz. Let's revisit this in a future/separate PR.

Copy link
Member

@pjbgf pjbgf left a comment

Choose a reason for hiding this comment

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

LGTM

thanks @aryan9600 🙇

Upgrade to golang-with-libgit2 v0.1.4 and use libgit2 which is compiled
without being linked to libssh2 and openssl.

Signed-off-by: Sanskar Jaiswal <jaiswalsanskar078@gmail.com>
Signed-off-by: Sanskar Jaiswal <jaiswalsanskar078@gmail.com>
@pjbgf pjbgf merged commit cf1a27c into fluxcd:main Jul 26, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/git Git related issues and pull requests
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Can't cross-build linux/amd64 image on Mac M1
3 participants