Ubuntu
squid package

Merge ~sergiodj/ubuntu/+source/squid:squid-merge-4.12-1 into ubuntu/+source/squid:debian/sid

  1. Git
  2. lp:~sergiodj/ubuntu/+source/squid
  3. squid-merge-4.12-1
  4. Merge into debian/sid
Proposed by Sergio Durigan Junior
Status: Merged
Approved by: Andreas Hasenack
Approved revision: db0be8a903e911be4fa27b1fe29ad5c57590291b
Merge reported by: Sergio Durigan Junior
Merged at revision: db0be8a903e911be4fa27b1fe29ad5c57590291b
Proposed branch: ~sergiodj/ubuntu/+source/squid:squid-merge-4.12-1
Merge into: ubuntu/+source/squid:debian/sid
Diff against target: 802 lines (+688/-2)
7 files modified
debian/changelog (+493/-0)
debian/control (+3/-2)
debian/patches/0007-WCCP-Fix-GCC-10-Wstringop-truncation-failures.patch (+112/-0)
debian/patches/90-cf.data.ubuntu.patch (+22/-0)
debian/patches/99-ubuntu-ssl-cert-snakeoil.patch (+22/-0)
debian/patches/series (+3/-0)
debian/usr.sbin.squid (+33/-0)
Reviewer Review Type Date Requested Status
Andreas Hasenack (community) Approve
Canonical Server Pending
Review via email: mp+389025@code.staging.launchpad.net

Description of the change

This is the merge of squid 4.12.1 from Debian.

We're still keeping some of our existing delta. I'm taking a closer look at the patches we're carrying and checking which ones can be proposed upstream or to Debian.

As for the good news, we can drop a number of local modifications:

- No need to add -Wno-format-truncation to CXXFLAGS anymore; the build works normally on ppc64el on groovy now.

- Dropped 2 patches accepted by Debian which simplify and fix the postinst script.

- Dropped 1 patch acccepted by Debian which adjusts the 'test-squid.py' dep8 test.

I'm adding a patch needed to make the build pass on s390x; there's a GCC-10 FTBFS that happens there. This patch has already been proposed and accepted upstream:

  https://github.com/squid-cache/squid/pull/708/

autopkgtest is still happy:

autopkgtest [15:11:15]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-test-suite PASS
squid PASS

To post a comment you must log in.
Revision history for this message
Andreas Hasenack (ahasenack) wrote :

grabbing this

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Looks good, +1. You said you would still add a DEP3 header to d/p/90-cf.data.ubuntu.patch because you forwarded it to debian, right? Feel free to do that and commit, and then ping here when ready for sponsoring.

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

On Tuesday, August 11 2020, Andreas Hasenack wrote:

> Looks good, +1. You said you would still add a DEP3 header to
> d/p/90-cf.data.ubuntu.patch because you forwarded it to debian, right?
> Feel free to do that and commit, and then ping here when ready for
> sponsoring.

Thanks for the review, Andreas.

I have force-pushed the branch with the DEP3 header update now, so it's
ready for sponsorship.

--
Sergio
GPG key ID: E92F D0B3 6B14 F1F4 D8E0 EB2F 106D A1C8 C3CB BF14

Revision history for this message
Andreas Hasenack (ahasenack) wrote :

Tagging and uploading db0be8a903e911be4fa27b1fe29ad5c57590291b

$ git push pkg upload/4.12-1ubuntu1
Enumerating objects: 43, done.
Counting objects: 100% (43/43), done.
Delta compression using up to 4 threads
Compressing objects: 100% (32/32), done.
Writing objects: 100% (36/36), 11.59 KiB | 565.00 KiB/s, done.
Total 36 (delta 25), reused 7 (delta 4)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/squid
 * [new tag] upload/4.12-1ubuntu1 -> upload/4.12-1ubuntu1

$ dput ubuntu ../squid_4.12-1ubuntu1_source.changes
Checking signature on .changes
gpg: ../squid_4.12-1ubuntu1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../squid_4.12-1ubuntu1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_4.12-1ubuntu1.dsc: done.
  Uploading squid_4.12.orig.tar.xz: done.
  Uploading squid_4.12-1ubuntu1.debian.tar.xz: done.
  Uploading squid_4.12-1ubuntu1_source.buildinfo: done.
  Uploading squid_4.12-1ubuntu1_source.changes: done.
Successfully uploaded packages.

Please follow its migration.

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

This has migrated.

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