Ubuntu
squid package

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

  1. Lucid (10.04)
  2. lucid-201002101821
  3. Merge into lucid
Proposed by James Westby
Status: Merged
Merged at revision: not available
Proposed branch: lp:~ubuntu-branches/ubuntu/lucid/squid/lucid-201002101821
Merge into: lp:ubuntu/lucid/squid
Diff against target: 231 lines (+180/-0) (has conflicts)
6 files modified
debian/changelog (+20/-0)
debian/patches/90-cf.data.ubuntu.dpatch (+19/-0)
debian/patches/99-fix-storeurl-move-temp.dpatch (+24/-0)
debian/patches/99-squid-capability.dpatch (+43/-0)
debian/rules (+4/-0)
debian/squid.upstart (+70/-0)
Text conflict in debian/changelog
Conflict adding file debian/patches/90-cf.data.ubuntu.dpatch.  Moved existing file to debian/patches/90-cf.data.ubuntu.dpatch.moved.
Conflict adding file debian/patches/99-fix-storeurl-move-temp.dpatch.  Moved existing file to debian/patches/99-fix-storeurl-move-temp.dpatch.moved.
Conflict adding file debian/patches/99-squid-capability.dpatch.  Moved existing file to debian/patches/99-squid-capability.dpatch.moved.
Text conflict in debian/rules
Conflict adding file debian/squid.upstart.  Moved existing file to debian/squid.upstart.moved.
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/lucid/squid/lucid-201002101821
To post a comment you must log in.
Revision history for this message
James Westby (james-w) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1<<<<<<< TREE
1squid (2.7.STABLE7-1ubuntu5) lucid; urgency=low2squid (2.7.STABLE7-1ubuntu5) lucid; urgency=low
23
3 * debian/control: Re-apply lost 2.7.STABLE7-1ubuntu3 fix [Chuck Short] for4 * debian/control: Re-apply lost 2.7.STABLE7-1ubuntu3 fix [Chuck Short] for
@@ -28,6 +29,25 @@
28 29
29 -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Jan 2010 14:45:45 -050030 -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Jan 2010 14:45:45 -0500
3031
32=======
33squid (2.7.STABLE7-1ubuntu2) lucid; urgency=low
34
35 [Michael Vogt]
36 * debian/patches/90-cf.data.ubuntu.dpatch:
37 - add an example refresh pattern for debs
38 (foundations-lucid-local-report spec)
39
40 [Chuck Short]
41 * Dont bring down the buildd because the number of jobs
42 is set wrong. (LP: #476953)
43 * debian/patches/99-fix-storeurl-move-temp.dpatch:
44 - Fix bug with http 302 response moved temporarily. (LP: #503777)
45 * debian/squid.upstart, debian/rules: Convert initscripts to upstart.
46 * debian/squid-capability.dpatch: Fix libcap compatibility issues.
47
48 -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Jan 2010 14:45:45 -0500
49
50>>>>>>> MERGE-SOURCE
31squid (2.7.STABLE7-1ubuntu1) lucid; urgency=low51squid (2.7.STABLE7-1ubuntu1) lucid; urgency=low
3252
33 * Merge from debian testing, remaining changes:53 * Merge from debian testing, remaining changes:
3454
=== 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 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2## 90-cf.data.ubuntu.dpatch by <mvo@ubuntu.com>
3##
4## All lines beginning with `## DP:' are a description of the patch.
5## DP: No description.
6
7@DPATCH@
8diff -urNad squid-2.7.STABLE7~/src/cf.data.pre squid-2.7.STABLE7/src/cf.data.pre
9--- squid-2.7.STABLE7~/src/cf.data.pre 2010-01-20 11:59:06.709996916 +0100
10+++ squid-2.7.STABLE7/src/cf.data.pre 2010-01-20 12:00:15.287493658 +0100
11@@ -3058,6 +3058,8 @@
12 refresh_pattern ^gopher: 1440 0% 1440
13 refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
14 refresh_pattern (Release|Package(.gz)*)$ 0 20% 2880
15+# example line deb packages
16+#refresh_pattern (\.deb|\.udeb)$ 129600 100% 129600
17 refresh_pattern . 0 20% 4320
18 NOCOMMENT_END
19 DOC_END
020
=== 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 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2
3@DPATCH@
4diff -Naurp squid-2.7.STABLE7.orig/src/client_side.c squid-2.7.STABLE7/src/client_side.c
5--- squid-2.7.STABLE7.orig/src/client_side.c 2009-08-16 17:43:51.000000000 -0400
6+++ squid-2.7.STABLE7/src/client_side.c 2010-01-18 11:04:19.931761060 -0500
7@@ -2401,6 +2401,17 @@ clientCacheHit(void *data, HttpReply * r
8 is_modified = 0;
9 }
10 }
11+ /* Bug fix for 302 move_temporarily when using storeurl */
12+ if (mem->reply->sline.status == HTTP_MOVED_TEMPORARILY) {
13+ const char *cloc = httpHeaderGetStr(&e->mem_obj->reply->header, HDR_LOCATION);
14+ if (!strcmp(http->uri,cloc)) {
15+ debug(33, 1) ("Loop Detected: %s Redirect to: %s\n",
16+ http->uri,cloc);
17+ http->log_type = LOG_TCP_MISS;
18+ clientProcessMiss(http);
19+ return;
20+ }
21+ }
22 stale = refreshCheckHTTPStale(e, r);
23 debug(33, 2) ("clientCacheHit: refreshCheckHTTPStale returned %d\n", stale);
24 if (stale == 0) {
025
=== 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 @@
1#! /bin/sh /usr/share/dpatch/dpatch-run
2
3@DPATCH@
4diff -Naurp squid-2.7.STABLE7.orig/configure.in squid-2.7.STABLE7/configure.in
5--- squid-2.7.STABLE7.orig/configure.in 2009-09-16 18:46:50.000000000 -0400
6+++ squid-2.7.STABLE7/configure.in 2010-01-22 20:40:57.753126557 -0500
7@@ -1694,7 +1694,6 @@ AC_CHECK_HEADERS(
8 db.h \
9 db_185.h \
10 aio.h \
11- sys/capability.h \
12 ,,,[
13 #if HAVE_SYS_TYPES_H
14 #include <sys/types.h>
15@@ -1728,6 +1727,13 @@ AC_CHECK_HEADERS(
16 #endif
17 ])
18
19+dnl Check for libcap header
20+AC_ARG_ENABLE(caps,
21+[ --disable-caps disable usage of Linux capabilities library to control privileges])
22+if test "x$enable_caps" != xno; then
23+ AC_CHECK_HEADERS( sys/capability.h )
24+fi
25+
26 dnl Check for IP-Filter headers. These are a bit nasty..
27 AC_CHECK_HEADERS( \
28 ip_compat.h \
29diff -Naurp squid-2.7.STABLE7.orig/src/tools.c squid-2.7.STABLE7/src/tools.c
30--- squid-2.7.STABLE7.orig/src/tools.c 2008-10-06 17:27:17.000000000 -0400
31+++ squid-2.7.STABLE7/src/tools.c 2010-01-22 20:41:41.893126711 -0500
32@@ -42,11 +42,6 @@
33
34 #ifdef _SQUID_LINUX_
35 #if HAVE_SYS_CAPABILITY_H
36-#undef _POSIX_SOURCE
37-/* Ugly glue to get around linux header madness colliding with glibc */
38-#define _LINUX_TYPES_H
39-#define _LINUX_FS_H
40-typedef uint32_t __u32;
41 #include <sys/capability.h>
42 #endif
43 #endif
044
=== 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 @@
320 $(tmp)/usr/share/lintian/overrides/squid320 $(tmp)/usr/share/lintian/overrides/squid
321 321
322 dpkg-shlibdeps $(tmp)/usr/sbin/* $(tmp)$(libexecdir)/*322 dpkg-shlibdeps $(tmp)/usr/sbin/* $(tmp)$(libexecdir)/*
323<<<<<<< TREE
323 dh_installinit -psquid -u"start 89 2 3 4 5 . stop 11 1 ." -R --name squid324 dh_installinit -psquid -u"start 89 2 3 4 5 . stop 11 1 ." -R --name squid
325=======
326 dh_installinit -psquid --upstart-only -R --name squid
327>>>>>>> MERGE-SOURCE
324 dpkg-gencontrol -isp -p$(package)328 dpkg-gencontrol -isp -p$(package)
325 dpkg --build $(tmp) ..329 dpkg --build $(tmp) ..
326 rm -f debian/substvars330 rm -f debian/substvars
327331
=== 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 @@
1# squid - SQUID HTTP proxy-cache
2#
3
4description "HTTP proxy-cache"
5author "Chuck Short <zulcss@ubuntu.com>"
6
7start on (net-device-up
8 and local-filesystems)
9stop on runlevel[016]
10
11console output
12expect fork
13respawn
14
15pre-start script
16 if [ -f /etc/default/squid ]; then
17 . /etc/default/squid
18 fi
19
20
21 grepconf () {
22 w=" " # space tab
23 sq=/etc/squid/squid.conf
24 # sed is cool.
25 res=`sed -ne '
26 s/^'$1'['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
27 t end;
28 d;
29 :end q' < $sq`
30 [ -n "$res" ] || res=$2
31 echo "$res"
32 }
33
34 grepconf2 () {
35 w=" " # space tab
36 sq=/etc/squid/$NAME.conf
37 # sed is cool.
38 res=`sed -ne '
39 s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
40 t end;
41 d;
42 :end q' < $sq`
43 [ -n "$res" ] || res=$2
44 echo "$res"
45 }
46
47 cdr=`grepconf2 cache_dir /var/spool/squid`
48 ctp=`grepconf cache_dir ufs`
49
50 case "$cdr" in
51 [0-9]*)
52 echo "squid: squid.conf contains 2.2.5 syntax - not starting"
53 exit 1
54 ;;
55 esac
56
57 if [ -d "$cdr" -a ! -d "$cdr/00" ] || [ "$ctp" = "coss" -a ! -w "$cdr" ]
58 then
59 /usr/sbin/squid $SQUID_ARGS -z
60 fi
61
62end script
63
64script
65 if [ -f /etc/default/squid ]; then
66 . /etc/default/squid
67 fi
68
69 exec /usr/sbin/squid $SQUID_ARGS
70end script
071
=== renamed file 'debian/squid.upstart' => 'debian/squid.upstart.moved'

Subscribers

People subscribed via source and target branches

to all changes: