diff -Nru squid3-3.3.8/debian/changelog squid3-3.3.8/debian/changelog --- squid3-3.3.8/debian/changelog 2015-07-01 22:25:59.000000000 +0000 +++ squid3-3.3.8/debian/changelog 2015-10-14 16:48:40.000000000 +0000 @@ -1,3 +1,10 @@ +squid3 (3.3.8-1ubuntu6.4) trusty-proposed; urgency=low + + * d/squid3.upstart: Use SIGINT to terminate squid and wait at most 40 + seconds for it to finish. (LP: #1073478) + + -- Tiago Stürmer Daitx Wed, 14 Oct 2015 02:54:20 +0000 + squid3 (3.3.8-1ubuntu6.3) trusty-proposed; urgency=low * d/patches/fix-caching-vary-header.patch: Added upstream patch diff -Nru squid3-3.3.8/debian/squid3.upstart squid3-3.3.8/debian/squid3.upstart --- squid3-3.3.8/debian/squid3.upstart 2013-12-11 10:50:28.000000000 +0000 +++ squid3-3.3.8/debian/squid3.upstart 2015-10-14 16:48:40.000000000 +0000 @@ -12,6 +12,9 @@ respawn normal exit 0 +kill signal SIGINT +kill timeout 40 + env CONFIG="/etc/squid3/squid.conf" env SQUID_ARGS="-YC"