Last commit made on 2007-03-24
Get this branch:
git clone -b ubuntu/feisty 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

954b36f... by Kees Cook on 2007-03-22

Import patches-unapplied version 2.6.5-4ubuntu2 to ubuntu/feisty

Imported using git-ubuntu import.

Changelog parent: dc5bb43657ac679eeff6dc830d849e724923db38

New changelog entries:
  * SECURITY UPDATE: remote denial of service via TRACE method.
  * debian/patches/57-external-trace-crash.dpatch: upstream fix.
  * References

dc5bb43... by Kees Cook on 2007-01-22

Import patches-unapplied version 2.6.5-4ubuntu1 to ubuntu/feisty

Imported using git-ubuntu import.

Changelog parent: 07630572676f68cc8a8bff4532ce3e4eecfb06d8

New changelog entries:
  * Merge from debian unstable, remaining changes:
    - Use snakeoil SSL cert.
  * Urgency high due to security issues
  * debian/patches/55-ftp-segfault.dpatch
    - Added upstream patch fixing DoS on specially crafted ftp urls
      (Closes: #407202) (Ref: SA23767)
  * debian/patches/56-external-acl-crash
    - Added upstream patch fixing external-acl crashing on high load
      conditions (Ref: CVE-2007-0248)
  * debian/po/es.po
    - Updated Spanish debconf translation, thanks to Javier Fernàndez-Sanguino
      Peña (Closes: #402677)

  * debian/po/pt.po
    - Added Portuguese debconf translation, thanks to Miguel Figueiredo
      (Closes: #399929)

0763057... by Oliver Grawert on 2006-11-20

Import patches-unapplied version 2.6.5-2ubuntu1 to ubuntu/feisty

Imported using git-ubuntu import.

Changelog parent: 6d90e0c6dbaab39402c6a1807a501f61561db188

New changelog entries:
  * Merge from debian unstable.
  * keep snakeoil cert patch
  * debian/rules
   - Remove mispelled configure option enablig TPROXY support
      (TPROXY support is NOT enabled since it needs kernel patches which
       are not in the kernel sources distributed by debian)
  * debian/control
    - Upgraded Standard-Version to (no change needed)
    - Added Dependency on apache | httpd
  * debian/postinst
    - Removed bashism
  * debian/squid.rc
    - Added LSB INIT section
  * debian/squidclient.1
    - Fixed syntax errors in man page
  * New upstream release
    - Removed patched integreated upstream:
      + 50-coss-compile.patch

  * debian/watch
    - Updated local version
  * debian/patches/51-htcp-assert
    - Included upstream patch fixing error with big htcp packets
  * debian/patches/52-hosts-overflow
    - Included upstream patch fixing buffer overflow (Closes: #392866)
  * debian/patches/53-coss-assert
    - Included upstream patch fixing error while restarting a coss-enabled squid
  * debian/patches/54-aufs-assert
    - Included upstream patch removing an assert causing squid to fail while
      using aufs
  * debian/squid.rc
    - Fixed invoke-rc.d call on upgrade (Closes: #392713)
  * debian/patches/50-coss-compile.patch
    - Added upstream patch to fix compile time failure when aufs is enabled
      and coss is not. (Closes: #390934)
  * debian/patches/01-cf.data.pre
    - Reverted patch for default group setting. Make the default configuration
      file setting the effective group instead setting it in sources.
      (Closes: #381191)
  * debian/rules
    - Enabled coss storage method for Debian GNU/KfreeBSD
    - Added DEB_BUILD_OPTIONS dependent optimization and install options,
      allowing for easy builing of unstripped binary packages as per Policy
      10.1. (Closes: #384616)
    - Removed RunCache script installation
  * New upstream release (Closes: #389536)
  * debian/rules
    - Enabled coss store option
  * New upstream release (Closes: #383763)
  * debian/control
    - Update Build-Depend on libdb4.4-dev
  * New upstream release
    - Removed patches that have been integrated upstream:
      + debian/patches/49-xstrdup
      + debian/patches/48-kfreebsd-kqueue
    - Fixes 100% CPU usage on diskd fail (Closes: #380181)
    - Fixes error on double definition of redirectors (Closes: #370108)
  * debian/doc/FAQ*
    - Updated FAQs
  * debian/control
    - Added Replace: to squid-common (Closes: #379101)
    - Removed the old squid-common Conflicts: statement on squid
  * debian/patches/49-xstrdup
    - Added upstream patch that fixes an error on XSTRDUP
      (Closes: #379586)

6d90e0c... by Anibal Monsalve Salazar on 2006-07-12

Import patches-unapplied version 2.6.1-3ubuntu1 to ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 145446f7596f335b564f39f68bacee1b5e78bc8c

New changelog entries:
  * Resynchronise with Debian.
  * debian/rules
    - Removed debian/po/*.po~
  * debian/patches/48-kfreebsd-kqueue
    - Added user interface for kqueue() on GNU/kFreeBSD (Thanks to Petr
      Salinger) (Closes: #377873)
  * debian/rules
    - Disabled IPF support on GNU/kFreeBSD
    - Install RELEASENOTES.html in /usr/share/doc
  * debian/NEWS.Debian
    - Added notice on changes to configuration file and reference to the
      RELEASENOTES.html file (Closes: #377950)
  * debian/control
    - Added missing Build-Depends on libdb4.3-dev (Closes: #377473)

145446f... by Martin Pitt on 2006-07-11

Import patches-unapplied version 2.6.1-1ubuntu2 to ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 256169dc22c44f2a05b052368f0e22a6b45a7326

New changelog entries:
  * Add libdb4.4-dev build dependency to fix FTBFS.

256169d... by Martin Pitt on 2006-07-10

Import patches-unapplied version 2.6.1-1ubuntu1 to ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 067fe7b78c281e300fe614e6f4d26fd90e7b793a

New changelog entries:
  * Merge from Debian unstable.
  * New upstream version
    - removed patches that have been integrated upstream:
  * debian/rules
    - Removed build time upgrade of autoconf since config.{sub,guess} has been
      updated upstream
    - Enabled epoll() support on Linux and Kqueue support on KFreeBSD
    - Enabled Linux TPROXY support for totally transparent proxy support
    - Removed Winbind-based helpers building. Winbind is not supported
      upstream anymore
    - Moved documentation to squid-common
  * debian/postinst
    - Fix configuration file for missing http_port directive
  * debian/control
    - Remove dependency on webmin-squid which is not in the archive anymore
    - Bumped Standards-Version to 3.7.2 (no change required)

067fe7b... by Martin Pitt on 2006-07-06

Import patches-unapplied version 2.5.14-1ubuntu1 to ubuntu/edgy

Imported using git-ubuntu import.

Changelog parent: 24707ac7e58153429384a94d131646298f7538ac

New changelog entries:
  * Merge from debian unstable.
  * Only Ubuntu change left: Use snakeoil SSL certificate.
  * New upstream release
  * debian/patches/47-httpreplydestroy
    - Added upstream patch fixing assertion failure in HttpReply.c
  * debian/{prerm,postinst}
    - Make squid restart in postinst instead of stopping in prerm
      (Closes: #252467)
  * debian/{rules,control}
    - Added build-time upgrade of config.{guess,sub} for GNU/kFreeBSD
      (Closes: #365211)
  * debian/po/ca.po
     - Added Catalan debconf translation thanks to Miguel Gea Milvaques
       (Closes: #365412)
  * New upstream release

24707ac... by Adam Conrad on 2006-02-22

Import patches-unapplied version 2.5.12-4ubuntu2 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: d1b29c6f2199810ed5f038f6b337affc5dcf29c7

New changelog entries:
  * Add 99-ubuntu-wbinfo_group.dpatch, to make wbinfo_group.pl work properly
    with Samba >= 3.0.21, which is in dapper (Closes: launchpad.net/29228)

d1b29c6... by Fabio Massimo Di Nitto on 2006-02-04

Import patches-unapplied version 2.5.12-4ubuntu1 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 612e3c557af89687ceb4086a2b71d653b015e9b0

New changelog entries:
  * Switch default config to suggest default ssl-cert-snakeoil certificates.
  * Add Depends on ssl-cert.
  * Add patch ssl-cert-snakeoil.

612e3c5... by Luigi Gangitano on 2006-01-16

Import patches-unapplied version 2.5.12-4 to ubuntu/dapper

Imported using git-ubuntu import.

Changelog parent: 0716619c6d9ebc25ec243261b629b878ccf0e928

New changelog entries:
  * The "Required is not essential" release
  * debian/control
    - Added dependency on lsb-base (Closes: #347800, #347537)