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

squid: update to 5.7 #42054

Merged
merged 1 commit into from Feb 5, 2023
Merged

squid: update to 5.7 #42054

merged 1 commit into from Feb 5, 2023

Conversation

dkwo
Copy link
Contributor

@dkwo dkwo commented Feb 3, 2023

  • I tested the changes in this PR: no
  • I built this PR locally for my native architecture, (x86_64-musl)

seems to build fine with openssl 3 #37681

@dkwo dkwo mentioned this pull request Feb 3, 2023
6 tasks
@dkwo
Copy link
Contributor Author

dkwo commented Feb 3, 2023

cross compile fails with:

./cf_gen cf.data ./cf.data.depend
./cf_gen: ./cf_gen: cannot execute binary file
make[1]: *** [Makefile:8153: cf_parser.cci] Error 126
make[1]: Leaving directory '/builddir/squid-5.7/src'
make: *** [Makefile:594: all-recursive] Error 1
=> ERROR: squid-5.7_1: do_build: '${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}' exited with 2
=> ERROR:   in do_build() at common/build-style/gnu-configure.sh:15

@ghost

This comment was marked as duplicate.

@dkwo
Copy link
Contributor Author

dkwo commented Feb 3, 2023

@Vaelatern any ideas?

@ghost
Copy link

ghost commented Feb 3, 2023

@ghost
Copy link

ghost commented Feb 3, 2023

Oi, oi, oi. The patch is so old, so you have to adjust it manually. Forgot to mention that, sorry.

@dkwo
Copy link
Contributor Author

dkwo commented Feb 3, 2023

@kruceter Seems to be working, thank you!

@ghost
Copy link

ghost commented Feb 3, 2023

Alright, the problem here actually is BUILDCXX not being set in configure_args properly (i.e. it is empty). I will try to find the proper solution.

@ghost
Copy link

ghost commented Feb 3, 2023

Here is my proposal.

0001-fixup-squid-update-to-5.7-patch-for-cross-compile.txt

BUILDCXX is set properly, obsolete/unnecessary flags are removed.

@Vaelatern
Copy link
Member

Can you try upstreaming the proposed patch? I'd rather any build fix go upstream if we can...

@ghost
Copy link

ghost commented Feb 3, 2023

Can you try upstreaming the proposed patch? I'd rather any build fix go upstream if we can...

There is nothing to upstream here. It looks like BUILDCXX is not set properly, so I proposed the fix above which eliminates the need for patching.

@dkwo dkwo force-pushed the O3sq branch 2 times, most recently from fa03018 to f6c8686 Compare February 3, 2023 18:57
@ghost
Copy link

ghost commented Feb 3, 2023

Would you mind to include this into the commit message? Thank you.

* --sbindir is already defined in
  common/environment/configure/gnu-configure-args.sh

* --enable-useragent-log and --enable-referer-log are obsolete since
  version 3.2.0.4.

* --enable-arp-acl is gone
  (squid-cache/squid@41b91720118a5cf1d0eb47fdb903a841f46bb750).

* --enable-carp is gone, CARP is compiled in
  (squid-cache/squid@b2ea838f690d122679eeafda2ec30faadf1d5e82).

* --enable-truncate was removed upstream
  (squid-cache/squid@b3fb907032613d7151410eceb4622bb43f5af6bc).

* squid_cv_gnu_atomics is replaced with c++11 std::atomic
  (squid-cache/squid@ddd4edb743d82be97fc651d529e04bf55329a50d).

* squid_opt_enable_large_files is the duplicate of --with-large-files.
  Apparently Juan RP (aka xtraeme) used this option back in 2016 to fix
  cross build for arm* and glibc. Now that squid builds completely fine
  without it, it is safe to assume this option is not needed anymore.

* define BUILDCXX properly (CXX_host cannot be set outside of
  functions).

* CVE-2018-1000027 was fixed since version 4.0.23.

* --sbindir is already defined in
  common/environment/configure/gnu-configure-args.sh

* --enable-useragent-log and --enable-referer-log are obsolete since
  version 3.2.0.4.

* --enable-arp-acl is gone
  (squid-cache/squid@41b9172).

* --enable-carp is gone, CARP is compiled in
  (squid-cache/squid@b2ea838).

* --enable-truncate was removed upstream
  (squid-cache/squid@b3fb907).

* squid_cv_gnu_atomics is replaced with c++11 std::atomic
  (squid-cache/squid@ddd4edb).

* squid_opt_enable_large_files is the duplicate of --with-large-files.
  Apparently Juan RP (aka xtraeme) used this option back in 2016 to fix
  cross build for arm* and glibc. Now that squid builds completely fine
  without it, it is safe to assume this option is not needed anymore.

* define BUILDCXX properly (CXX_host cannot be set outside of
  functions).

* CVE-2018-1000027 was fixed since version 4.0.23.
@dkwo
Copy link
Contributor Author

dkwo commented Feb 4, 2023

@kruceter Should I also acknowledge your contribution in some way?

@ghost
Copy link

ghost commented Feb 4, 2023

Should I also acknowledge your contribution in some way?

No need to do this. Thank you.

@Vaelatern Vaelatern merged commit b623e0a into void-linux:master Feb 5, 2023
@dkwo dkwo deleted the O3sq branch February 13, 2023 22:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants