Merge lp:~ubuntu-branches/ubuntu/lucid/squid/lucid-201002101821 into lp:ubuntu/lucid/squid

[James Westby]

[James Westby (james-w)]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/squid now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/squid/lucid-201002101821. A merge should be performed if necessary.

=== modified file 'debian/changelog'
--- debian/changelog	2010-02-09 22:59:24 +0000
+++ debian/changelog	2010-02-10 18:32:24 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 squid (2.7.STABLE7-1ubuntu5) lucid; urgency=low
 
   * debian/control: Re-apply lost 2.7.STABLE7-1ubuntu3 fix [Chuck Short] for
@@ -28,6 +29,25 @@
    
  -- Chuck Short <[e-mail]>  Fri, 22 Jan 2010 14:45:45 -0500
 
+=======
+squid (2.7.STABLE7-1ubuntu2) lucid; urgency=low
+
+  [Michael Vogt]
+  * debian/patches/90-cf.data.ubuntu.dpatch:
+    - add an example refresh pattern for debs
+      (foundations-lucid-local-report spec)
+
+  [Chuck Short]
+  * Dont bring down the buildd because the number of jobs 
+    is set wrong. (LP: #476953)
+  * debian/patches/99-fix-storeurl-move-temp.dpatch:
+    - Fix bug with http 302 response moved temporarily. (LP: #503777)
+  * debian/squid.upstart, debian/rules: Convert initscripts to upstart.
+  * debian/squid-capability.dpatch: Fix libcap compatibility issues.
+   
+ -- Chuck Short <[e-mail]>  Fri, 22 Jan 2010 14:45:45 -0500
+
+>>>>>>> MERGE-SOURCE
 squid (2.7.STABLE7-1ubuntu1) lucid; urgency=low
 
   * Merge from debian testing, remaining changes:

=== added file 'debian/patches/90-cf.data.ubuntu.dpatch'
--- debian/patches/90-cf.data.ubuntu.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/90-cf.data.ubuntu.dpatch	2010-02-10 18:32:24 +0000
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 90-cf.data.ubuntu.dpatch by  <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad squid-2.7.STABLE7~/src/cf.data.pre squid-2.7.STABLE7/src/cf.data.pre
+--- squid-2.7.STABLE7~/src/cf.data.pre	2010-01-20 11:59:06.709996916 +0100
++++ squid-2.7.STABLE7/src/cf.data.pre	2010-01-20 12:00:15.287493658 +0100
+@@ -3058,6 +3058,8 @@
+ refresh_pattern ^gopher:	1440	0%	1440
+ refresh_pattern -i (/cgi-bin/|\?) 0	0%	0
+ refresh_pattern (Release|Package(.gz)*)$	0	20%	2880
++# example line deb packages
++#refresh_pattern (\.deb|\.udeb)$   129600 100% 129600
+ refresh_pattern .		0	20%	4320
+ NOCOMMENT_END
+ DOC_END

=== renamed file 'debian/patches/90-cf.data.ubuntu.dpatch' => 'debian/patches/90-cf.data.ubuntu.dpatch.moved'
=== added file 'debian/patches/99-fix-storeurl-move-temp.dpatch'
--- debian/patches/99-fix-storeurl-move-temp.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/99-fix-storeurl-move-temp.dpatch	2010-02-10 18:32:24 +0000
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+diff -Naurp squid-2.7.STABLE7.orig/src/client_side.c squid-2.7.STABLE7/src/client_side.c
+--- squid-2.7.STABLE7.orig/src/client_side.c	2009-08-16 17:43:51.000000000 -0400
++++ squid-2.7.STABLE7/src/client_side.c	2010-01-18 11:04:19.931761060 -0500
+@@ -2401,6 +2401,17 @@ clientCacheHit(void *data, HttpReply * r
+ 		is_modified = 0;
+ 	}
+     }
++    /* Bug fix for 302 move_temporarily when using storeurl */
++    if (mem->reply->sline.status == HTTP_MOVED_TEMPORARILY) {
++    const char *cloc = httpHeaderGetStr(&e->mem_obj->reply->header, HDR_LOCATION);
++    if (!strcmp(http->uri,cloc)) {
++	debug(33, 1) ("Loop Detected: %s Redirect to: %s\n",
++		http->uri,cloc);
++	http->log_type = LOG_TCP_MISS;
++	clientProcessMiss(http);
++		return;
++	}
++    }
+     stale = refreshCheckHTTPStale(e, r);
+     debug(33, 2) ("clientCacheHit: refreshCheckHTTPStale returned %d\n", stale);
+     if (stale == 0) {

=== renamed file 'debian/patches/99-fix-storeurl-move-temp.dpatch' => 'debian/patches/99-fix-storeurl-move-temp.dpatch.moved'
=== added file 'debian/patches/99-squid-capability.dpatch'
--- debian/patches/99-squid-capability.dpatch	1970-01-01 00:00:00 +0000
+++ debian/patches/99-squid-capability.dpatch	2010-02-10 18:32:24 +0000
@@ -0,0 +1,43 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+
+@DPATCH@
+diff -Naurp squid-2.7.STABLE7.orig/configure.in squid-2.7.STABLE7/configure.in
+--- squid-2.7.STABLE7.orig/configure.in	2009-09-16 18:46:50.000000000 -0400
++++ squid-2.7.STABLE7/configure.in	2010-01-22 20:40:57.753126557 -0500
+@@ -1694,7 +1694,6 @@ AC_CHECK_HEADERS(
+ 	db.h \
+ 	db_185.h \
+ 	aio.h \
+-	sys/capability.h \
+ ,,,[
+ #if HAVE_SYS_TYPES_H
+ #include <sys/types.h>
+@@ -1728,6 +1727,13 @@ AC_CHECK_HEADERS(
+ #endif
+ ])
+ 
++dnl Check for libcap header
++AC_ARG_ENABLE(caps,
++[  --disable-caps  disable usage of Linux capabilities library to control privileges])
++if test "x$enable_caps" != xno; then
++	AC_CHECK_HEADERS( sys/capability.h )
++fi
++
+ dnl Check for IP-Filter headers. These are a bit nasty..
+ AC_CHECK_HEADERS( \
+ 	ip_compat.h \
+diff -Naurp squid-2.7.STABLE7.orig/src/tools.c squid-2.7.STABLE7/src/tools.c
+--- squid-2.7.STABLE7.orig/src/tools.c	2008-10-06 17:27:17.000000000 -0400
++++ squid-2.7.STABLE7/src/tools.c	2010-01-22 20:41:41.893126711 -0500
+@@ -42,11 +42,6 @@
+ 
+ #ifdef _SQUID_LINUX_
+ #if HAVE_SYS_CAPABILITY_H
+-#undef _POSIX_SOURCE
+-/* Ugly glue to get around linux header madness colliding with glibc */
+-#define _LINUX_TYPES_H
+-#define _LINUX_FS_H
+-typedef uint32_t __u32;
+ #include <sys/capability.h>
+ #endif
+ #endif

=== renamed file 'debian/patches/99-squid-capability.dpatch' => 'debian/patches/99-squid-capability.dpatch.moved'
=== modified file 'debian/rules'
--- debian/rules	2010-02-01 13:49:20 +0000
+++ debian/rules	2010-02-10 18:32:24 +0000
@@ -320,7 +320,11 @@
 		$(tmp)/usr/share/lintian/overrides/squid
 	
 	dpkg-shlibdeps $(tmp)/usr/sbin/* $(tmp)$(libexecdir)/*
+<<<<<<< TREE
 	dh_installinit -psquid -u"start 89 2 3 4 5 . stop 11 1 ." -R --name squid
+=======
+	dh_installinit -psquid --upstart-only -R --name squid
+>>>>>>> MERGE-SOURCE
 	dpkg-gencontrol -isp -p$(package)
 	dpkg --build $(tmp) ..
 	rm -f debian/substvars

=== added file 'debian/squid.upstart'
--- debian/squid.upstart	1970-01-01 00:00:00 +0000
+++ debian/squid.upstart	2010-02-10 18:32:24 +0000
@@ -0,0 +1,70 @@
+# squid - SQUID HTTP proxy-cache
+#
+
+description	"HTTP proxy-cache"
+author		"Chuck Short <[e-mail]>"
+
+start on (net-device-up
+	and local-filesystems)
+stop on runlevel[016]
+
+console output
+expect fork
+respawn
+
+pre-start script
+	if [ -f /etc/default/squid ]; then
+		. /etc/default/squid
+	fi
+
+
+	grepconf () {
+        	w="     " # space tab
+        	sq=/etc/squid/squid.conf
+        	# sed is cool.
+        	res=`sed -ne '
+                	s/^'$1'['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+                	t end;
+                	d;
+                :end q' < $sq`
+        	[ -n "$res" ] || res=$2
+		echo "$res"
+	}
+
+	grepconf2 () {
+        	w="     " # space tab
+        	sq=/etc/squid/$NAME.conf
+        	# sed is cool.
+        	res=`sed -ne '
+                	s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
+                	t end;
+                	d;
+                :end q' < $sq`
+        	[ -n "$res" ] || res=$2
+        	echo "$res"
+	}
+
+	cdr=`grepconf2 cache_dir /var/spool/squid`
+	ctp=`grepconf cache_dir ufs`
+
+	case "$cdr" in
+		[0-9]*)
+			echo "squid: squid.conf contains 2.2.5 syntax - not starting"
+			exit 1
+		;;
+	esac
+
+	if [ -d "$cdr" -a ! -d "$cdr/00" ] || [ "$ctp" = "coss" -a ! -w "$cdr" ]
+	then
+		/usr/sbin/squid $SQUID_ARGS -z
+	fi
+	
+end script
+
+script
+	if [ -f /etc/default/squid ]; then
+		. /etc/default/squid
+	fi
+
+	exec /usr/sbin/squid $SQUID_ARGS
+end script

=== renamed file 'debian/squid.upstart' => 'debian/squid.upstart.moved'