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
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-02-09 22:59:24 +0000
3+++ debian/changelog 2010-02-10 18:32:24 +0000
4@@ -1,3 +1,4 @@
5+<<<<<<< TREE
6 squid (2.7.STABLE7-1ubuntu5) lucid; urgency=low
7
8 * debian/control: Re-apply lost 2.7.STABLE7-1ubuntu3 fix [Chuck Short] for
9@@ -28,6 +29,25 @@
10
11 -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Jan 2010 14:45:45 -0500
12
13+=======
14+squid (2.7.STABLE7-1ubuntu2) lucid; urgency=low
15+
16+ [Michael Vogt]
17+ * debian/patches/90-cf.data.ubuntu.dpatch:
18+ - add an example refresh pattern for debs
19+ (foundations-lucid-local-report spec)
20+
21+ [Chuck Short]
22+ * Dont bring down the buildd because the number of jobs
23+ is set wrong. (LP: #476953)
24+ * debian/patches/99-fix-storeurl-move-temp.dpatch:
25+ - Fix bug with http 302 response moved temporarily. (LP: #503777)
26+ * debian/squid.upstart, debian/rules: Convert initscripts to upstart.
27+ * debian/squid-capability.dpatch: Fix libcap compatibility issues.
28+
29+ -- Chuck Short <zulcss@ubuntu.com> Fri, 22 Jan 2010 14:45:45 -0500
30+
31+>>>>>>> MERGE-SOURCE
32 squid (2.7.STABLE7-1ubuntu1) lucid; urgency=low
33
34 * Merge from debian testing, remaining changes:
35
36=== added file 'debian/patches/90-cf.data.ubuntu.dpatch'
37--- debian/patches/90-cf.data.ubuntu.dpatch 1970-01-01 00:00:00 +0000
38+++ debian/patches/90-cf.data.ubuntu.dpatch 2010-02-10 18:32:24 +0000
39@@ -0,0 +1,19 @@
40+#! /bin/sh /usr/share/dpatch/dpatch-run
41+## 90-cf.data.ubuntu.dpatch by <mvo@ubuntu.com>
42+##
43+## All lines beginning with `## DP:' are a description of the patch.
44+## DP: No description.
45+
46+@DPATCH@
47+diff -urNad squid-2.7.STABLE7~/src/cf.data.pre squid-2.7.STABLE7/src/cf.data.pre
48+--- squid-2.7.STABLE7~/src/cf.data.pre 2010-01-20 11:59:06.709996916 +0100
49++++ squid-2.7.STABLE7/src/cf.data.pre 2010-01-20 12:00:15.287493658 +0100
50+@@ -3058,6 +3058,8 @@
51+ refresh_pattern ^gopher: 1440 0% 1440
52+ refresh_pattern -i (/cgi-bin/|\?) 0 0% 0
53+ refresh_pattern (Release|Package(.gz)*)$ 0 20% 2880
54++# example line deb packages
55++#refresh_pattern (\.deb|\.udeb)$ 129600 100% 129600
56+ refresh_pattern . 0 20% 4320
57+ NOCOMMENT_END
58+ DOC_END
59
60=== renamed file 'debian/patches/90-cf.data.ubuntu.dpatch' => 'debian/patches/90-cf.data.ubuntu.dpatch.moved'
61=== added file 'debian/patches/99-fix-storeurl-move-temp.dpatch'
62--- debian/patches/99-fix-storeurl-move-temp.dpatch 1970-01-01 00:00:00 +0000
63+++ debian/patches/99-fix-storeurl-move-temp.dpatch 2010-02-10 18:32:24 +0000
64@@ -0,0 +1,24 @@
65+#! /bin/sh /usr/share/dpatch/dpatch-run
66+
67+@DPATCH@
68+diff -Naurp squid-2.7.STABLE7.orig/src/client_side.c squid-2.7.STABLE7/src/client_side.c
69+--- squid-2.7.STABLE7.orig/src/client_side.c 2009-08-16 17:43:51.000000000 -0400
70++++ squid-2.7.STABLE7/src/client_side.c 2010-01-18 11:04:19.931761060 -0500
71+@@ -2401,6 +2401,17 @@ clientCacheHit(void *data, HttpReply * r
72+ is_modified = 0;
73+ }
74+ }
75++ /* Bug fix for 302 move_temporarily when using storeurl */
76++ if (mem->reply->sline.status == HTTP_MOVED_TEMPORARILY) {
77++ const char *cloc = httpHeaderGetStr(&e->mem_obj->reply->header, HDR_LOCATION);
78++ if (!strcmp(http->uri,cloc)) {
79++ debug(33, 1) ("Loop Detected: %s Redirect to: %s\n",
80++ http->uri,cloc);
81++ http->log_type = LOG_TCP_MISS;
82++ clientProcessMiss(http);
83++ return;
84++ }
85++ }
86+ stale = refreshCheckHTTPStale(e, r);
87+ debug(33, 2) ("clientCacheHit: refreshCheckHTTPStale returned %d\n", stale);
88+ if (stale == 0) {
89
90=== renamed file 'debian/patches/99-fix-storeurl-move-temp.dpatch' => 'debian/patches/99-fix-storeurl-move-temp.dpatch.moved'
91=== added file 'debian/patches/99-squid-capability.dpatch'
92--- debian/patches/99-squid-capability.dpatch 1970-01-01 00:00:00 +0000
93+++ debian/patches/99-squid-capability.dpatch 2010-02-10 18:32:24 +0000
94@@ -0,0 +1,43 @@
95+#! /bin/sh /usr/share/dpatch/dpatch-run
96+
97+@DPATCH@
98+diff -Naurp squid-2.7.STABLE7.orig/configure.in squid-2.7.STABLE7/configure.in
99+--- squid-2.7.STABLE7.orig/configure.in 2009-09-16 18:46:50.000000000 -0400
100++++ squid-2.7.STABLE7/configure.in 2010-01-22 20:40:57.753126557 -0500
101+@@ -1694,7 +1694,6 @@ AC_CHECK_HEADERS(
102+ db.h \
103+ db_185.h \
104+ aio.h \
105+- sys/capability.h \
106+ ,,,[
107+ #if HAVE_SYS_TYPES_H
108+ #include <sys/types.h>
109+@@ -1728,6 +1727,13 @@ AC_CHECK_HEADERS(
110+ #endif
111+ ])
112+
113++dnl Check for libcap header
114++AC_ARG_ENABLE(caps,
115++[ --disable-caps disable usage of Linux capabilities library to control privileges])
116++if test "x$enable_caps" != xno; then
117++ AC_CHECK_HEADERS( sys/capability.h )
118++fi
119++
120+ dnl Check for IP-Filter headers. These are a bit nasty..
121+ AC_CHECK_HEADERS( \
122+ ip_compat.h \
123+diff -Naurp squid-2.7.STABLE7.orig/src/tools.c squid-2.7.STABLE7/src/tools.c
124+--- squid-2.7.STABLE7.orig/src/tools.c 2008-10-06 17:27:17.000000000 -0400
125++++ squid-2.7.STABLE7/src/tools.c 2010-01-22 20:41:41.893126711 -0500
126+@@ -42,11 +42,6 @@
127+
128+ #ifdef _SQUID_LINUX_
129+ #if HAVE_SYS_CAPABILITY_H
130+-#undef _POSIX_SOURCE
131+-/* Ugly glue to get around linux header madness colliding with glibc */
132+-#define _LINUX_TYPES_H
133+-#define _LINUX_FS_H
134+-typedef uint32_t __u32;
135+ #include <sys/capability.h>
136+ #endif
137+ #endif
138
139=== renamed file 'debian/patches/99-squid-capability.dpatch' => 'debian/patches/99-squid-capability.dpatch.moved'
140=== modified file 'debian/rules'
141--- debian/rules 2010-02-01 13:49:20 +0000
142+++ debian/rules 2010-02-10 18:32:24 +0000
143@@ -320,7 +320,11 @@
144 $(tmp)/usr/share/lintian/overrides/squid
145
146 dpkg-shlibdeps $(tmp)/usr/sbin/* $(tmp)$(libexecdir)/*
147+<<<<<<< TREE
148 dh_installinit -psquid -u"start 89 2 3 4 5 . stop 11 1 ." -R --name squid
149+=======
150+ dh_installinit -psquid --upstart-only -R --name squid
151+>>>>>>> MERGE-SOURCE
152 dpkg-gencontrol -isp -p$(package)
153 dpkg --build $(tmp) ..
154 rm -f debian/substvars
155
156=== added file 'debian/squid.upstart'
157--- debian/squid.upstart 1970-01-01 00:00:00 +0000
158+++ debian/squid.upstart 2010-02-10 18:32:24 +0000
159@@ -0,0 +1,70 @@
160+# squid - SQUID HTTP proxy-cache
161+#
162+
163+description "HTTP proxy-cache"
164+author "Chuck Short <zulcss@ubuntu.com>"
165+
166+start on (net-device-up
167+ and local-filesystems)
168+stop on runlevel[016]
169+
170+console output
171+expect fork
172+respawn
173+
174+pre-start script
175+ if [ -f /etc/default/squid ]; then
176+ . /etc/default/squid
177+ fi
178+
179+
180+ grepconf () {
181+ w=" " # space tab
182+ sq=/etc/squid/squid.conf
183+ # sed is cool.
184+ res=`sed -ne '
185+ s/^'$1'['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
186+ t end;
187+ d;
188+ :end q' < $sq`
189+ [ -n "$res" ] || res=$2
190+ echo "$res"
191+ }
192+
193+ grepconf2 () {
194+ w=" " # space tab
195+ sq=/etc/squid/$NAME.conf
196+ # sed is cool.
197+ res=`sed -ne '
198+ s/^'$1'['"$w"']\+[^'"$w"']\+['"$w"']\+\([^'"$w"']\+\).*$/\1/p;
199+ t end;
200+ d;
201+ :end q' < $sq`
202+ [ -n "$res" ] || res=$2
203+ echo "$res"
204+ }
205+
206+ cdr=`grepconf2 cache_dir /var/spool/squid`
207+ ctp=`grepconf cache_dir ufs`
208+
209+ case "$cdr" in
210+ [0-9]*)
211+ echo "squid: squid.conf contains 2.2.5 syntax - not starting"
212+ exit 1
213+ ;;
214+ esac
215+
216+ if [ -d "$cdr" -a ! -d "$cdr/00" ] || [ "$ctp" = "coss" -a ! -w "$cdr" ]
217+ then
218+ /usr/sbin/squid $SQUID_ARGS -z
219+ fi
220+
221+end script
222+
223+script
224+ if [ -f /etc/default/squid ]; then
225+ . /etc/default/squid
226+ fi
227+
228+ exec /usr/sbin/squid $SQUID_ARGS
229+end script
230
231=== renamed file 'debian/squid.upstart' => 'debian/squid.upstart.moved'

Subscribers

People subscribed via source and target branches

to all changes: