Package: calamaris Version: 2.99.4.0-16 Severity: important Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
In Ubuntu, the attached patch was applied to achieve the following: The calamaris cron script checks for squid log files in /var/log/squid but squid3 logs to /var/log/squid3. The format of the log files is the same so calamaris just needs to know to look in /var/log/squid3 for log files. I added the patch to Ubuntu first to ensure that this was fixed for our next release. * Add in a patch to use squid3 log files if they are present (LP: #569514) Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-20-generic (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru calamaris-2.99.4.0/debian/changelog calamaris-2.99.4.0/debian/changelog diff -Nru calamaris-2.99.4.0/debian/control calamaris-2.99.4.0/debian/control --- calamaris-2.99.4.0/debian/control 2011-10-12 21:24:23.000000000 -0700 +++ calamaris-2.99.4.0/debian/control 2012-03-30 10:48:21.000000000 -0700 @@ -1,7 +1,8 @@ Source: calamaris Section: utils Priority: optional -Maintainer: Daniel Echeverry <epsilo...@gmail.com> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Daniel Echeverry <epsilo...@gmail.com> Standards-Version: 3.9.2 Build-Depends: debhelper (>= 8), po-debconf, debconf Homepage: http://cord.de/tools/squid/calamaris/ diff -Nru calamaris-2.99.4.0/debian/patches/series calamaris-2.99.4.0/debian/patches/series --- calamaris-2.99.4.0/debian/patches/series 2011-07-11 20:44:24.000000000 -0700 +++ calamaris-2.99.4.0/debian/patches/series 2012-03-30 10:45:30.000000000 -0700 @@ -1,3 +1,4 @@ cachelogfile.diff deprecation_warning_perl.diff fix-manpage.diff +use-squid3-log.diff diff -Nru calamaris-2.99.4.0/debian/patches/use-squid3-log.diff calamaris-2.99.4.0/debian/patches/use-squid3-log.diff --- calamaris-2.99.4.0/debian/patches/use-squid3-log.diff 1969-12-31 16:00:00.000000000 -0800 +++ calamaris-2.99.4.0/debian/patches/use-squid3-log.diff 2012-03-30 10:47:46.000000000 -0700 @@ -0,0 +1,22 @@ +From: Brian Murray <br...@ubuntu.com> +Description: If a squid3 log file is present use that instead of a squid log file +Bug-Ubuntu: http://launchpad.net/bugs/569514 +Origin: ubuntu, http://launchpad.net/bugs/569514 +Forwarded: yes +Author: Brian Murray <br...@ubuntu.com> + +Index: calamaris-2.99.4.0/calamaris-cron-script +=================================================================== +--- calamaris-2.99.4.0.orig/calamaris-cron-script 2012-03-30 10:44:09.000000000 -0700 ++++ calamaris-2.99.4.0/calamaris-cron-script 2012-03-30 10:46:07.000000000 -0700 +@@ -74,6 +74,10 @@ + + # look for cache log files + if [ "$CACHE" = "auto" ]; then ++ if [ -r /var/log/squid3/$CACHEFILE ]; then ++ CACHE=squid ++ CACHELOGDIR=/var/log/squid3 ++ fi + if [ -r /var/log/squid/$CACHEFILE ]; then + CACHE=squid + CACHELOGDIR=/var/log/squid
