Merge lp:~clint-fewbar/ubuntu/lucid/squid/no-expect-fork into lp:ubuntu/lucid/squid

Proposed by Clint Byrum on 2011-01-11
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~clint-fewbar/ubuntu/lucid/squid/no-expect-fork
Merge into: lp:ubuntu/lucid/squid
Diff against target: 34 lines (+8/-3)
2 files modified
debian/changelog (+7/-0)
debian/squid.upstart (+1/-3)
To merge this branch: bzr merge lp:~clint-fewbar/ubuntu/lucid/squid/no-expect-fork
Reviewer Review Type Date Requested Status
Martin Pitt 2011-01-11 Approve on 2011-02-01
Review via email: mp+45924@code.launchpad.net

Description of the change

This is the SRU of the fix just released in natty.

To post a comment you must log in.
Martin Pitt (pitti) wrote :

This looks good, I sub'ed ubuntu-sru to the bug.

review: Approve
Martin Pitt (pitti) wrote :

Merged and uploaded to lucid unapproved queue. This can be accepted after the 10.04.2 freeze.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2010-04-16 09:00:19 +0000
+++ debian/changelog 2011-01-11 22:32:59 +0000
@@ -1,3 +1,10 @@
1squid (2.7.STABLE7-1ubuntu12.1) lucid-proposed; urgency=low
2
3 * Run squid with -N and drop 'expect fork' to prevent HUP's from
4 causing upstart to lose track of squid. (LP: #573853)
5
6 -- Clint Byrum <clint@ubuntu.com> Tue, 11 Jan 2011 10:49:37 -0800
7
1squid (2.7.STABLE7-1ubuntu12) lucid; urgency=low8squid (2.7.STABLE7-1ubuntu12) lucid; urgency=low
29
3 * debian/squid.upstart, debian/rules, postrm, postinst: Fixed up postinstallation10 * debian/squid.upstart, debian/rules, postrm, postinst: Fixed up postinstallation
411
=== modified file 'debian/squid.upstart'
--- debian/squid.upstart 2010-04-16 09:00:19 +0000
+++ debian/squid.upstart 2011-01-11 22:32:59 +0000
@@ -8,8 +8,6 @@
8 and net-device-up IFACE!=lo)8 and net-device-up IFACE!=lo)
9stop on runlevel[!2345]9stop on runlevel[!2345]
1010
11expect fork
12
13pre-start script11pre-start script
14 if [ -f /etc/default/squid ]; then12 if [ -f /etc/default/squid ]; then
15 . /etc/default/squid13 . /etc/default/squid
@@ -64,5 +62,5 @@
64 . /etc/default/squid62 . /etc/default/squid
65 fi63 fi
6664
67 exec /usr/sbin/squid $SQUID_ARGS65 exec /usr/sbin/squid -N $SQUID_ARGS
68end script66end script

Subscribers

People subscribed via source and target branches

to all changes: