Last commit made on 2017-02-10
Get this branch:
git clone -b ubuntu/zesty-devel https://git.launchpad.net/ubuntu/+source/squid3
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

de2bcf1... by Robie Basak on 2017-01-24

Import patches-unapplied version 3.5.23-1ubuntu1 to ubuntu/zesty-proposed

Imported using git-ubuntu import.

Changelog parent: 6893a8ff86d6aa64ddbf024f272623fd5c01634c
Upload parent: 43e5b2db070aa94cbced3acef473be6cce59d60d

New changelog entries:
  * Merge from Debian (LP: #1644538). Remaining changes:
    - Add additional dep8 tests.
    - Use snakeoil certificates.
    - Add an example refresh pattern for debs.
    - Add disabled by default AppArmor profile.
    - Revert "Set pidfile for systemd's sysv-generator" from Debian.
    - Drop wrong short-circuiting of various invocations; we always want to
      call the debhelper block.
    - Add missing Pre-Depends on adduser.
    - Enable autoreconf. This is no longer required for the security updates,
      but is needed for the seddery of test-suite/Makefile.am in
  * Drop changes (adopted in Debian):
    - Run sarg-reports if present before rotating logs.
    - Add lsb-release build dep.
  * Drop changes that no longer make a functional difference in Ubuntu, but may
    still be relevant to send to Debian:
    - d/squid3.postinst: don't try to stop squid3 again.
    - d/squid3.postrm: don't rm -f conffiles in purge.
    - Drop squid3 dependencies on ${shlib:Depends} and lsb-base.
    - Drop creation of /etc/squid.
  * Drop unnecessary changes:
    - Add executable bits to d/squid.preinst.
  * Drop changes relating to the upgrade path from prior to Xenial, so no
    longer required:
    - /var/spool/squid3 upgrade path handling.
    - Conffile upgrade path handling.
    - Remove redundant version-guarded restart code from squid postinst.
    - Clean up apparmor links for usr.sbin.squid3 on upgrade.
    - Attempt to migrate /var/log/squid3 -> /var/log/squid on upgrade.
    - Add Breaks on older ufw to fix upgrade path.
    - Use Breaks instead of Conflicts. Instead, drop the Conflicts/Replaces
      entirely (see below).
  * Drop security fixes: all included in 3.5.23 upstream.
  * Drop Conflicts/Replaces of squid against squid3. In Ubuntu, the migration
    happened in Xenial, so no upgrade path still requires this code. This
    reduces upgrade ordering difficulty.
  * Fix failing autopkgtests:
    - Adjust Python module dependencies.
    - Correctly handle the squid3 -> squid rename.
    - Adjust seddery for upstream test squid binary location.
  * Drop dependency on init-system-helpers. This was introduced in LP 1432683.
    Since we no longer ship an upstart job, it is no longer required.
  * Correct attribution and add explanatory note in d/NEWS.debian.

43e5b2d... by Robie Basak on 2017-01-26


bed5cff... by Robie Basak on 2017-01-24


0525413... by Robie Basak on 2017-02-09


096e3e1... by Robie Basak on 2016-11-10

Note historical migration in d/NEWS.debian

Attribute the person who made the change, and add an additional
explanatory note, so it doesn't look like Luigi wrote it, because he

162c407... by Robie Basak on 2017-02-06

Drop extra dependency on init-system-helpers

This was introduced in LP 1432683. Since we no longer ship an upstart
job, it is no longer required.

9543144... by Robie Basak on 2017-01-26

dep8: fix upstream-test-suite seddery

We need to sed the squid binary call only, not anything that starts
$(top_builddir)/src/squid. Otherwise we also catch things like
$(top_builddir)/src/squid.conf.default, incorrectly causing test

0248246... by Robie Basak on 2017-02-06

dep8 tests: adjust for squid3 -> squid rename

b94a031... by Robie Basak on 2017-02-06

d/t/control: adjust Python module dependencies

b9eefd0... by Robie Basak on 2016-11-10

Drop Breaks/Replaces of squid against squid3

In Ubuntu, the migration happened in Xenial, so no upgrade path still
requires this code. This reduces upgrade ordering difficulty.