Merge ~ahasenack/ubuntu/+source/squid:squid-apparmor-1792728 into ubuntu/+source/squid:ubuntu/devel

Proposed by Andreas Hasenack on 2018-09-20
Status: Merged
Approved by: Christian Ehrhardt  on 2018-09-21
Approved revision: bd9acc31cd2aebafee0d356aa8bac26fdec94185
Merged at revision: bd9acc31cd2aebafee0d356aa8bac26fdec94185
Proposed branch: ~ahasenack/ubuntu/+source/squid:squid-apparmor-1792728
Merge into: ubuntu/+source/squid:ubuntu/devel
Diff against target: 28 lines (+8/-1)
2 files modified
debian/changelog (+7/-0)
debian/usr.sbin.squid (+1/-1)
Reviewer Review Type Date Requested Status
Christian Ehrhardt  2018-09-20 Approve on 2018-09-21
Review via email: mp+355455@code.launchpad.net

Description of the change

This is re-applying the apparmor fix from Simon Deziel <email address hidden> that was sponsored by @paelzer in https://code.launchpad.net/~sdeziel/ubuntu/+source/squid3/+git/squid3/+merge/354989 and which got trumped by my squid-4 upload.

I slightly changed the d/changelog entry to match our custom of specifying which file is being changed. I figured it's not a big deal since it's a new source package anyway, new major version, and I will have to test this again anyway. But if you think I should preserve the original d/changelog as proposed by him, please let me know. I did a cherry-pick of the fix, though, so the git commit is as he made it.

Bileto ticket, currently still running: https://bileto.ubuntu.com/#/ticket/3427

To post a comment you must log in.
Christian Ehrhardt  (paelzer) wrote :

The changes are correctly rebased onto squid4 and I agree to the changelog being kept as-is but bumped to the new version.

+1

review: Approve
Christian Ehrhardt  (paelzer) wrote :

Since you can't sponsor this yet until the seed change reflecting the rename is fully complete I'll do that for you.

To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/squid
 * [new tag] upload/4.1-1ubuntu2 -> upload/4.1-1ubuntu2

Christian Ehrhardt  (paelzer) wrote :

PPA build ok
Fix in PPA seems ok in my quick test
It is default off, so likely a no-op, but never the less dep8 tests on the PPA are good as well.

Christian Ehrhardt  (paelzer) wrote :

Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_4.1-1ubuntu2.dsc: done.
  Uploading squid_4.1-1ubuntu2.debian.tar.xz: done.
  Uploading squid_4.1-1ubuntu2_source.buildinfo: done.
  Uploading squid_4.1-1ubuntu2_source.changes: done.
Successfully uploaded packages

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/debian/changelog b/debian/changelog
index e957d13..2b85ae0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1squid (4.1-1ubuntu2) cosmic; urgency=medium
2
3 * d/usr.sbin.squid: Update apparmor profile to grant read access to squid
4 binary (LP: #1792728)
5
6 -- Simon Deziel <simon@sdeziel.info> Sat, 15 Sep 2018 13:55:32 -0400
7
1squid (4.1-1ubuntu1) cosmic; urgency=medium8squid (4.1-1ubuntu1) cosmic; urgency=medium
29
3 * Merged with Debian unstable (LP: #1780944, LP: #1097032, LP: #16669).10 * Merged with Debian unstable (LP: #1780944, LP: #1097032, LP: #16669).
diff --git a/debian/usr.sbin.squid b/debian/usr.sbin.squid
index d80c8ea..07a9642 100644
--- a/debian/usr.sbin.squid
+++ b/debian/usr.sbin.squid
@@ -24,7 +24,7 @@
24 capability sys_chroot,24 capability sys_chroot,
2525
26 # allow child processes to run execvp(argv[0], [kidname, ...])26 # allow child processes to run execvp(argv[0], [kidname, ...])
27 /usr/sbin/squid ix,27 /usr/sbin/squid rix,
2828
29 # pinger29 # pinger
30 network inet raw,30 network inet raw,

Subscribers

People subscribed via source and target branches