Ubuntu
squid package

Merge ~athos-ribeiro/ubuntu/+source/squid:dont-default-to-openssl into ubuntu/+source/squid:ubuntu/devel

  1. Git
  2. lp:~athos-ribeiro/ubuntu/+source/squid
  3. dont-default-to-openssl
  4. Merge into ubuntu/devel
Proposed by Athos Ribeiro
Status: Merged
Merged at revision: 85a27808006cc7489739a5d1994838f721dd24f7
Proposed branch: ~athos-ribeiro/ubuntu/+source/squid:dont-default-to-openssl
Merge into: ubuntu/+source/squid:ubuntu/devel
Diff against target: 65 lines (+8/-34)
3 files modified
debian/changelog (+8/-0)
debian/patches/series (+0/-1)
dev/null (+0/-33)
Reviewer Review Type Date Requested Status
Utkarsh Gupta (community) Approve
Bryce Harrington (community) Approve
Review via email: mp+419351@code.staging.launchpad.net

Description of the change

This is a proposal fix for LP: #1968200. It consists of dropping an specific patch in Ubuntu delta which makes --with-openssl a default option during configuration. This was proposed by an upstream review at https://github.com/squid-cache/squid/pull/694/files#r793839271.

A PPA with the proposed changes is available at https://launchpad.net/~athos-ribeiro/+archive/ubuntu/squid-no-openssl-default/+packages

To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

This LGTM, after checking the LP bug and upstream bug.
I would suggest in the changelog not just specify "what" changed but also mention "why":
I.e., that --with-openssl is no longer necessary since the build auto-detects openssl, and having this option present causes a build error.
With that changelog addition, this is +1 to go, no need for re-review.

review: Approve
Revision history for this message
Utkarsh Gupta (utkarsh) wrote :

+1 with exactly what Bryce said. \o/

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

Thanks Bryce, Utkarsh :)

I added a snipped in the changelog (and commit msg) to say that having -with-openssl by default "hinders packaging since we ship squid in two different flavours (gnutls and openssl)".

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

Uploaded.

$ dput ubuntu ../squid_5.2-1ubuntu4_source.changes
D: Setting host argument.
Checking signature on .changes
gpg: ../squid_5.2-1ubuntu4_source.changes: Valid signature from 033C4CA276024834
Checking signature on .dsc
gpg: ../squid_5.2-1ubuntu4.dsc: Valid signature from 033C4CA276024834
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_5.2-1ubuntu4.dsc: done.
  Uploading squid_5.2-1ubuntu4.debian.tar.xz: done.
  Uploading squid_5.2-1ubuntu4_source.buildinfo: done.
  Uploading squid_5.2-1ubuntu4_source.changes: done.
Successfully uploaded packages.

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