* Merge from Debian testing (LP: #1016560). Remaining changes: + debian/control: - Update maintainer. - Suggests apparmor (>= 2.3) - Depends on ssl-cert ((>= 1.0-11ubuntu1) - Add transitional dummy packages + debian/squid3.upstart - Move ulimit command to script section so that it applies to the started squid daemon. Thanks to Timur Irmatov (LP: 986159) - Work around squid not handling SIGHUP by adding respawn to upstart job. (LP: 978356) + debian/NEWS.Debian: Rename NEWS.debian, add note regarding squid3 transition in 12.04 (LP: 924739) + debian/rules - Re-enable all hardening options lost in the squid->squid3 transition (LP: 986314) + squid3.resolvconf, debian/squid3.postinst, debian/squid3.postrm, debian/squid3.preinst, debian/squid3.prerm: - Convert init script to upstart + debian/patches/99-ubuntu-ssl-cert-snakeoil: - Use snakeoil certificates. + debian/logrotate - Use sar-reports rather than sarg-maint. (LP: 26616) + debian/patches/90-cf.data.ubuntu.dpatch: - Add an example refresh pattern for debs. (foundations-lucid-local-report spec) + Add disabled by default AppArmor profile (LP: 497790) - debian/squid3.upstart: load profile in pre-start stanza - add debian/usr.sbin.squid3 profile - debian/rules: + install debian/usr.sbin.squid3, etc/apparmor.d/force-complain and etc/apparmor.d/disable into $(INSTALLDIR) + use dh_apparmor - debian/squid3.install: install etc/apparmor.d/disable, force-complain and usr.sbin.squid3 - debian/squid3.preinst: disable profile on clean install or upgrades from earlier than when we shipped the profile