Ubuntu
squid package

Merge ~athos-ribeiro/ubuntu/+source/squid:merge-lp2018110-mantic into ubuntu/+source/squid:debian/sid

  1. Git
  2. lp:~athos-ribeiro/ubuntu/+source/squid
  3. merge-lp2018110-mantic
  4. Merge into debian/sid
Proposed by Athos Ribeiro
Status: Merged
Approved by: git-ubuntu bot
Approved revision: not available
Merge reported by: git-ubuntu bot
Merged at revision: bfd18b861db3eff8bd4d4be7a6e33e71cceb1950
Proposed branch: ~athos-ribeiro/ubuntu/+source/squid:merge-lp2018110-mantic
Merge into: ubuntu/+source/squid:debian/sid
Diff against target: 1319 lines (+1096/-4)
12 files modified
debian/NEWS (+7/-0)
debian/changelog (+855/-0)
debian/control (+3/-2)
debian/patches/0009-Fix-Werror-alloc-size-larger-than-on-GCC-12.patch (+65/-0)
debian/patches/0010-Fix-Werror-sign-compare-on-GCC-13.patch (+24/-0)
debian/patches/0011-Fix-ftp-support.patch (+39/-0)
debian/patches/90-cf.data.ubuntu.patch (+21/-0)
debian/patches/99-ubuntu-ssl-cert-snakeoil.patch (+28/-0)
debian/patches/series (+5/-0)
debian/rules (+15/-2)
debian/tests/upstream-test-suite (+7/-0)
debian/usr.sbin.squid (+27/-0)
Reviewer Review Type Date Requested Status
git-ubuntu bot Approve
Sergio Durigan Junior (community) Approve
Canonical Server Reporter Pending
Review via email: mp+448949@code.staging.launchpad.net

Description of the change

This is the squid 6 merge for the mantic cycle. This is a major version bump.

There are three changes being dropped because they were applied/fixed either in debian on in the upstream project;

and four changes being introduced: one is to fix a compilation error due to a warning introduced in one of our patches with the new mantic gcc version; another fixes a FTBFS issue due to LTO; the other one is an upstream patch to fix the squid FTP support which leads to dep8 test failures; the last one is a fix to make some missing targets for the upstream tests dep8 run.

Once these get reviewed here, I will forward the relevant new patches to debian.

PPA: https://launchpad.net/~athos-ribeiro/+archive/ubuntu/lp2018110-merge-squid-mantic/+packages

autopkgtest results on linked PPA: pending

To post a comment you must log in.
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote (last edit ):

Regarding

- d/rules, d/NEWS: drop the NIS basic auth helper (LP: #1895694),

this was dropped in Debian in squid 5.1. I wonder if we should keep the change to include our d/NEWS entry of if we should just drop this one instead.

Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

- d/rules, d/NEWS: drop the NIS basic auth helper (LP: #1895694),

This was discussed with the server team and we should keep this one for now.

DEP8 tests (with proposed due to libc transition):

  - squid/6.1-2ubuntu1~ppa9
    + ✅ squid on mantic for amd64 @ 12.08.23 18:36:10 Log️ 🗒️
    + ✅ squid on mantic for arm64 @ 12.08.23 18:43:35 Log️ 🗒️
    + ✅ squid on mantic for ppc64el @ 12.08.23 18:29:09 Log️ 🗒️
    + ✅ squid on mantic for s390x @ 12.08.23 18:27:24 Log️ 🗒️

i386 and armhf fail as usual (no regression).

Revision history for this message
Sergio Durigan Junior (sergiodj) wrote :

Thanks, Athos.

Package builds fine. dep8 passes. Dropped delta is OK. It's a pity that we have to use -Wno-error=maybe-uninitialized on ppc64el due to LTO; I wonder if it makes sense to submit a bug upstream and/or try to fix the issues (although I understand that upstream is very picky when reviewing changes and these fixes usually end up being larger and more involved than expected).

I'm leaving a few comments regarding the new changes, but otherwise everything LGTM. I'm approving this MP now; feel free to upload the package whenever you feel it's ready.

review: Approve
Revision history for this message
git-ubuntu bot (git-ubuntu-bot) wrote :

Approvers: athos-ribeiro, sergiodj
Uploaders: athos-ribeiro, sergiodj
MP auto-approved

review: Approve
Revision history for this message
Athos Ribeiro (athos-ribeiro) wrote :

Thanks, Sergio!

- I updated the FTP patch commit message and changelog entry as you suggested.
- I left the sign-compare patch as is for now. Merging those patches would require re-thinking their documentation since they address different issues and possibly updating the PR forwarded upstream (although I agree we should do that; I can work on this after the upcoming feature freeze).

- I will submit the LTO bug upstream and forward the relevant changes to Debian.

Uploaded

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches