Merge lp://qastaging/~yolanda.robla/ubuntu/saucy/squid3/debian_merge into lp://qastaging/ubuntu/saucy/squid3

Unmerged revisions

59. By Yolanda Robla on 2013-07-16

debian/tests/test-squid.py: fixed case problem with ftp test

58. By Yolanda Robla on 2013-07-16

  + debian/control:
    - Update maintainer.
    - Suggests apparmor (>= 2.3)
    - Depends on ssl-cert ((>= 1.0-11ubuntu1), autopkgtests
  + 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

57. By Yolanda Robla on 2013-07-16

added patches directory

56. By Yolanda Robla on 2013-07-16

  + debian/rules:
    - apparmor install, use dh_apparmor
  + debian/tests:
    - autopkgtests content
  + debian/control:
    - depends on autopkgtests
  + debian/squid3.install:
    - copy apparmor files
* debian/patches: refreshed patches:
  - 01-cf.data.debian.patch
  - 02-makefile-defaults.patch
  - 15-cachemgr-default-config.patch

55. By Yolanda Robla on 2013-07-15

fixes in patches

54. By Yolanda Robla on 2013-07-15

removing .pc files

53. By Yolanda Robla on 2013-07-15

fixes

52. By Yolanda Robla on 2013-07-15

removed .pc

51. By Yolanda Robla on 2013-07-15

* Merge from Debian unstable (LP: #1199883). Remaining changes:
  - debian/tests, debian/control: autopkgtests
  - debian/rules: preserved apparmor rules
  - debian/squid3.install: copy apparmor files
* debian/patches: dropped patches, superseeded by new snapshot:
  - 98-CVE-2012-5643.patch
  - 99-lp1117517_r12473.patch
* debian/patches: refreshed patches
* New upstream release
  - Added support for SHA passwords in ncsa_auth (Closes: #652010)
* debian/squid3.lintian-overrides
  - Added override for pinger setuid bin
* debian/watch
  - Fixed pattern to skip the last dot
* debian/rules
  - Removed reference to cppunit-basedir
I would like to thank Amos Jeffries <email address hidden> for his help
with this release.
* debian/control
  - Added Build-Depend on pkg-config to solve FTBFS when ecap is enabled
    (Closes: #706025)
  - Fixed package descriptions
  - Added Build-Depend on libnetfilter-conntrack-dev
  - Added Suggests on winbindd for NTLM authentication
* debian/patches/01-cf.data.debian.patch
  - Removed change to visible_hostname defaut value (Closes: #705983)
  - Fixed path of ntlm_auth helper in example
* debian/rules
  - Removed --enable-arp-acl options obsoleted by --enable-eui
  - Fixed FTBFS on hurd due to missing netfilter support
  - Enabled Rock store type support
  - Added SETUID bit to pinger program
* debian/watch
  - Fixed pattern to match all the released versions of 3.3
* New upstream release (Closes: #694633, #701799, #702540)
  - Removed upstream patches
    + debian/patches/20-ipv6-fix
    + debian/patches/30-CVE-2012-5643-CVE-2013-0189.patch
    + debian/patches/fix-701123-regression-in-cachemgr.patch
  - Includes upstream fix for CVE-2009-0801 (Closes: #521052)
  - Includes upstream fix for rejection of benign request containing variants
    of double CR (Closes: #669148)
* debian/control
  - Added dependency on libecap2-dev
  - Added squid-purge package
* debian/source
  - Enabled ECAP support
  - Fixed configure invocation to match new syntax
  - Removed unneeded rename of helper man pages
  - Fixed list of helpers to build, adding fake agents (Closes: #644280)
    and negotiate wrapper (Closes: #656304)
* debian/watch
  - Updated for 3.3
* debian/squid3.logrotate
  - Added check for existing binary in logrotate script (Closes: #703954)
* Non-maintainer upload.
* Add fix-701123-regression-in-cachemgr.patch patch.
  Fix missing bits in the fix for CVE-2012-5643 and CVE-2013-0189 causing
  cachemgr.cgi crashing when authentication credentials are supplied.
  Thanks to Amos Jeffries <email address hidden> (Closes: #701123)
* Non-maintainer upload
* Urgency high due to security fixes
* debian/patches/30-CVE-2012-5643-CVE-2013-0189.patch
  - Added upstream fix for squid-cgi (cachemgr) memory leaks and denial of
    service vulnerability (Closes: #696187)
* debian/patches/20-ipv6-fix
  - Added upstream fix for squid not working when IPv6 is not loaded
    (Closes: #660489)

50. By Martin Pitt on 2013-06-17

releasing version 3.1.20-1ubuntu7