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

[Clint Byrum]

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

[Martin Pitt (pitti)]

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

review: Approve

[Martin Pitt (pitti)]

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

=== 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 @@
+squid (2.7.STABLE7-1ubuntu12.1) lucid-proposed; urgency=low
+
+  * Run squid with -N and drop 'expect fork' to prevent HUP's from
+    causing upstart to lose track of squid. (LP: #573853)
+
+ -- Clint Byrum <[e-mail]>  Tue, 11 Jan 2011 10:49:37 -0800
+
 squid (2.7.STABLE7-1ubuntu12) lucid; urgency=low
 
   * debian/squid.upstart, debian/rules, postrm, postinst:  Fixed up postinstallation

=== 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 @@
         and net-device-up IFACE!=lo)
 stop on runlevel[!2345]
 
-expect fork
-
 pre-start script
 	if [ -f /etc/default/squid ]; then
 		. /etc/default/squid
@@ -64,5 +62,5 @@
 		. /etc/default/squid
 	fi
 
-	exec /usr/sbin/squid $SQUID_ARGS
+	exec /usr/sbin/squid -N $SQUID_ARGS
 end script