Merge ~sergiodj/ubuntu/+source/squid:merge-5.7-1-lunar into ubuntu/+source/squid:debian/sid
Status: | Merged | ||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merge reported by: | git-ubuntu bot | ||||||||||||
Merged at revision: | d405b36b389057b7ae45de8921ca988991a7acf7 | ||||||||||||
Proposed branch: | ~sergiodj/ubuntu/+source/squid:merge-5.7-1-lunar | ||||||||||||
Merge into: | ubuntu/+source/squid:debian/sid | ||||||||||||
Diff against target: |
1212 lines (+1039/-2) 9 files modified
debian/NEWS (+7/-0) debian/changelog (+794/-0) debian/control (+3/-2) debian/patches/0009-Fix-Werror-alloc-size-larger-than-on-GCC-12.patch (+65/-0) debian/patches/90-cf.data.ubuntu.patch (+22/-0) debian/patches/99-ubuntu-ssl-cert-snakeoil.patch (+28/-0) debian/patches/fix-max-pkt-sz-for-icmpEchoData-padding.patch (+89/-0) debian/patches/series (+4/-0) debian/usr.sbin.squid (+27/-0) |
||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bryce Harrington (community) | Approve | ||
Canonical Server Reporter | Pending | ||
Review via email: mp+435095@code.staging.launchpad.net |
Description of the change
This is the merge of squid 5.7-1 from Debian unstable.
This new version implements support for OpenSSL 3 natively, which means that we're able to finally drop the ugly patch that we'd been carrying for a while.
Aside from that, two CVE fixes have been incorporated upstream and are also being dropped, along with a small hack (export DEB_*_MAINT_APPEND inside d/t/upstream-
There's a PPA with the proposed changes here:
https:/
autopkgtest results:
Results: (from http://
squid @ amd64:
04.01.23 01:08:59 Log 🗒️ ✅ Triggers: squid/5.
squid @ arm64:
04.01.23 01:39:40 Log 🗒️ ✅ Triggers: squid/5.
squid @ ppc64el:
04.01.23 01:15:07 Log 🗒️ ✅ Triggers: squid/5.
squid @ s390x:
04.01.23 01:22:31 Log 🗒️ ✅ Triggers: squid/5.
The armhf test failed but that's a known flaky test. I resubmitted it and will post its results later.
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
99-ubuntu- ssl-cert- snakeoil. patch ought to have DEP3 metadata by now. It's been around forever and looks like it'll stay with us permanently so would be worth formalizing it.
I'd also suggest along with that, to revise that change's changelog entry to match your standard style, i.e.:
- d/p/99- ubuntu- ssl-cert- snakeoil. patch: Use snakeoil certificates
via ssl-cert, and add a note about ssl to the default config file.
The GCC 11 FTBFS changelog entry could be similarly revised to match style of other entries.
https:/ /github. com/squid- cache/squid/ pull/887 looks like it was more or less agreed to and approved but still seems to be in process for over a year; might be worth a ping?
https:/ /github. com/squid- cache/squid/ pull/1118 looks like you've had an amicable interaction with upstream, but they're pushing back requesting more extensive refactoring work. I imagine it's not something you want to take time to tackle right now with the merge, but if you don't have anything too urgent on your plate this might be a good time in the cycle. Those kinds of data type refactorings tend not to be too hard but can require a few review roundtrips, so I'd not hold this merge for that work.
The changelog's version number needs fixed - it's 5.7-1ubuntu1~ppa1 but should be just 5.7-1ubuntu1.