Last commit made on 2009-08-21
Get this branch:
git clone -b ubuntu/karmic https://git.launchpad.net/ubuntu/+source/squid
Members of Ubuntu Server Dev import team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

80697df... by Kees Cook on 2009-08-21

Import patches-unapplied version 2.7.STABLE6-2ubuntu2 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: 59b9910812c60350300b249281b3468bd5a3f70e

New changelog entries:
  * debian/{control,rules}: add and enable hardened build for PIE
    (Debian bug 542723).

59b9910... by Mathias Gug on 2009-08-14

Import patches-unapplied version 2.7.STABLE6-2ubuntu1 to ubuntu/karmic

Imported using git-ubuntu import.

Changelog parent: aad7bc55b0631767cdd8898ea6e7079bad273c48

New changelog entries:
  [ Bhavani Shankar ]
  * Merge from debian unstable, remaining changes: (LP: #396472)
    - 99-ubuntu-ssl-cert-snakeoil:
      + src/cf.data.pre:
        * Add refrence to snakepil /etc/ssl
    - debian/control:
      + Add ssl-cert to Depends to bring in snakeoil certificates.
    - debian/logrotate: use sarg-reports rather than sarg-maint.
      (LP: #268816)

aad7bc5... by Luigi Gangitano on 2009-07-07

Import patches-unapplied version 2.7.STABLE6-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 6c2226df92fbbaca52afe1b3cefdf316635b6f42

New changelog entries:
  * debian/{control,rules,postinst.squid-common,NEWS.Debian}
    - Added dependency on squid-langpack, linked error directory to
      /usr/share/squid-langpack. Default language now 'en'.
    - Fix link to directory on upgrade
    - Added a notice in NEWS.Debian on customized error_directory settings
  * debian/patches/04-smb_auth
    - Added fix for environment in post-lenny smbclient packages
      (Closes: #524957)
  * debian/{postinst,config}
    - Removed path from command invocation and make lintian happy

6c2226d... by Luigi Gangitano on 2009-03-01

Import patches-unapplied version 2.7.STABLE6-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: df6446793f0f72c532b044d4140c49da7a318e8c

New changelog entries:
  * New upstream release (Closes: #498998)
    - Removed patches integrated upstream
      + 59-forward-assert
      + 60-dns-queue
      + 61-upgrade-http0.9-option
      + 70-DoS-request-processing
  * debian/squid.resolvconf
    - Added PATH to env in resolvconf script (Closes: #513102)
  * debian/squid.rc
    - Fix cache creation when using coss on raw block devices
      (Closes: #512954)
  * debian/po/nl.po
    - Updated Dutch debconf translation, thanks to Vincent Zweije
      (Closes: #513299)

df64467... by Steffen Joeris <email address hidden> on 2009-02-05

Import patches-unapplied version 2.7.STABLE3-4.1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 252c014c47b640e897030d5d36d1bb101e378d6b

New changelog entries:
  * Non-maintainer upload by the security team
  * Include upstream patch to fix DoS via error in request processing
    code (Closes: #514142)

252c014... by Luigi Gangitano on 2009-02-02

Import patches-unapplied version 2.7.STABLE3-4 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 8dc88c21d727740b19f866f856622da58698da44

New changelog entries:
  * debian/rules
    - Limit parallel building to the build: section (Closes: #512512)

8dc88c2... by Luigi Gangitano on 2009-01-21

Import patches-unapplied version 2.7.STABLE3-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 3b750d1f3bfc41e1b8f255c608164f5528e5788e

New changelog entries:
  * debian/patches/61-upgrade-http0.9-option
    - Added upstream patch adding an option that fixes issue with streaming
      (Closes: #512287)
  * debian/logrotate
    - Removed reference to /usr/sbin/sarg-maint which is not in sarg anymore
      (Closes: 462932)
  * debian/squid.overrides
    - Updated override of lintian warnings for setgid binaries needed for auth
  * debian/squid.resolvconv
    - Call init.d script using invoke-rc.d

3b750d1... by Luigi Gangitano on 2009-01-09

Import patches-unapplied version 2.7.STABLE3-2 to debian/sid

Imported using git-ubuntu import.

Changelog parent: c1716e265f33e4ac6d3c75b882c152401b216885

New changelog entries:
  * debian/squid.rc
    - Added status action in rc script (Closes: #492131)
    - Changed reload action to -k reconfigure (Closes: #506985)
  * debian/patches/01-cf.data.debian
    - Added proper defaults to use as APT proxy (Closes: #491151)
  * debian/patches/59-forward-assert
    - Added two upstream patches fixing asserts in forward.c (Closes: #503692)
  * debian/patches/60-dns-queue
    - Added two upstream patches fixing DNS queue issues with stuck queries and
      large DNS responses over TCP
  * debian/{postrm,postrm.squid-cgi,preinst,postinst}
    - Added set -e line to make lintian happy
  * debian/postinst
    - Removed path from squid invocation to make lintian happy
  * debian/rules
    - Added standard interpretation of DEB_BUILD_OPTIONS=parallel=n
  * debian/control
    - Bumped Standard-Version to 3.8.0

c1716e2... by Luigi Gangitano on 2008-07-06

Import patches-unapplied version 2.7.STABLE3-1 to debian/lenny

Imported using git-ubuntu import.