Merge ~paelzer/ubuntu/+source/squid3:lp-1792728-squid-apparmor-bionic into ubuntu/+source/squid3:ubuntu/bionic-devel

Proposed by Christian Ehrhardt 
Status: Merged
Approved by: Andreas Hasenack
Approved revision: 3523747c73a128e18d6c5ad2401a4f5666259649
Merged at revision: 3523747c73a128e18d6c5ad2401a4f5666259649
Proposed branch: ~paelzer/ubuntu/+source/squid3:lp-1792728-squid-apparmor-bionic
Merge into: ubuntu/+source/squid3:ubuntu/bionic-devel
Diff against target: 29 lines (+9/-1)
2 files modified
debian/changelog (+8/-0)
debian/usr.sbin.squid (+1/-1)
Reviewer Review Type Date Requested Status
Andreas Hasenack Approve
Canonical Server Pending
git-ubuntu developers Pending
Review via email: mp+355816@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :
Revision history for this message
Christian Ehrhardt  (paelzer) wrote :

Since I'm out, if this is acked could one also sponsor this please?

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

+1

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

Tagged:
$ git push pkg upload/3.5.27-1ubuntu1.1
Counting objects: 9, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (9/9), done.
Writing objects: 100% (9/9), 2.48 KiB | 254.00 KiB/s, done.
Total 9 (delta 6), reused 0 (delta 0)
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/squid3
 * [new tag] upload/3.5.27-1ubuntu1.1 -> upload/3.5.27-1ubuntu1.1

Sponsored:
ubuntu@bionic-squid3-build:~$ dput ubuntu squid3_3.5.27-1ubuntu1.1_source.changes
Checking signature on .changes
gpg: /home/ubuntu/squid3_3.5.27-1ubuntu1.1_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: /home/ubuntu/squid3_3.5.27-1ubuntu1.1.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid3_3.5.27-1ubuntu1.1.dsc: done.
  Uploading squid3_3.5.27-1ubuntu1.1.debian.tar.xz: done.
  Uploading squid3_3.5.27-1ubuntu1.1_source.buildinfo: done.
  Uploading squid3_3.5.27-1ubuntu1.1_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 cd27aed..c6e12d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
1squid3 (3.5.27-1ubuntu1.1) bionic; urgency=medium
2
3 [ Simon Deziel ]
4 * d/usr.sbin.squid: Update apparmor profile to grant read access to squid
5 binary (LP: #1792728)
6
7 -- Christian Ehrhardt <christian.ehrhardt@canonical.com> Fri, 28 Sep 2018 09:09:50 +0200
8
1squid3 (3.5.27-1ubuntu1) bionic; urgency=medium9squid3 (3.5.27-1ubuntu1) bionic; urgency=medium
210
3 * Merge with Debian unstable (LP: #1751286). Remaining changes:11 * Merge with Debian unstable (LP: #1751286). Remaining changes:
diff --git a/debian/usr.sbin.squid b/debian/usr.sbin.squid
index 2a400e9..92a959d 100644
--- a/debian/usr.sbin.squid
+++ b/debian/usr.sbin.squid
@@ -14,7 +14,7 @@
14 capability sys_chroot,14 capability sys_chroot,
1515
16 # allow child processes to run execvp(argv[0], [kidname, ...])16 # allow child processes to run execvp(argv[0], [kidname, ...])
17 /usr/sbin/squid ix,17 /usr/sbin/squid rix,
1818
19 # pinger19 # pinger
20 network inet raw,20 network inet raw,

Subscribers

People subscribed via source and target branches