| Index: trunk/debs/squid/debian/patches/24-coss-rebuild-meta-key-length.dpatch |
| — | — | @@ -1,48 +0,0 @@ |
| 2 | | -#! /bin/sh /usr/share/dpatch/dpatch-run |
| 3 | | -## 24-coss-rebuild-meta-key-length.dpatch by <mark@hawthorn.knams.wikimedia.org> |
| 4 | | -## |
| 5 | | -## All lines beginning with `## DP:' are a description of the patch. |
| 6 | | -## DP: No description. |
| 7 | | - |
| 8 | | -@DPATCH@ |
| 9 | | -diff -urNad squid-2.6.12~/src/fs/coss/store_dir_coss.c squid-2.6.12/src/fs/coss/store_dir_coss.c |
| 10 | | -+++ squid-2.6.12/src/fs/coss/store_dir_coss.c 2007-03-26 08:21:21.000000000 +0000 |
| 11 | | -@@ -1299,21 +1299,33 @@ |
| 12 | | - debug(47, 3) ("Size: %" PRINTF_OFF_T " (len %d)\n", *l, t->length); |
| 13 | | - break; |
| 14 | | - case STORE_META_KEY: |
| 15 | | -- assert(t->length == MD5_DIGEST_CHARS); |
| 16 | | -+ if (t->length != MD5_DIGEST_CHARS) { |
| 17 | | -+ debug(47, 1) ("COSS: %s: stripe %d: offset %d has invalid STORE_META_KEY length. Ignoring object.\n", stripePath(SD), cs->rebuild.curstripe, j); |
| 18 | | -+ goto nextobject; |
| 19 | | -+ } |
| 20 | | - xmemcpy(key, t->value, MD5_DIGEST_CHARS); |
| 21 | | - break; |
| 22 | | - #if SIZEOF_SQUID_FILE_SZ == SIZEOF_SIZE_T |
| 23 | | - case STORE_META_STD: |
| 24 | | -- assert(t->length == STORE_HDR_METASIZE); |
| 25 | | -+ if (t->length != STORE_HDR_METASIZE) { |
| 26 | | -+ debug(47, 1) ("COSS: %s: stripe %d: offset %d has invalid STORE_META_STD length. Ignoring object.\n", stripePath(SD), cs->rebuild.curstripe, j); |
| 27 | | -+ goto nextobject; |
| 28 | | -+ } |
| 29 | | - xmemcpy(&tmpe.timestamp, t->value, STORE_HDR_METASIZE); |
| 30 | | - break; |
| 31 | | - #else |
| 32 | | - case STORE_META_STD_LFS: |
| 33 | | -- assert(t->length == STORE_HDR_METASIZE); |
| 34 | | -+ if (t->length != STORE_HDR_METASIZE) { |
| 35 | | -+ debug(47, 1) ("COSS: %s: stripe %d: offset %d has invalid STORE_META_STD_LFS length. Ignoring object.\n", stripePath(SD), cs->rebuild.curstripe, j); |
| 36 | | -+ goto nextobject; |
| 37 | | -+ } |
| 38 | | - xmemcpy(&tmpe.timestamp, t->value, STORE_HDR_METASIZE); |
| 39 | | - break; |
| 40 | | - case STORE_META_STD: |
| 41 | | -- assert(t->length == STORE_HDR_METASIZE_OLD); |
| 42 | | -+ if (t->length != STORE_HDR_METASIZE_OLD) { |
| 43 | | -+ debug(47, 1) ("COSS: %s: stripe %d: offset %d has invalid STORE_META_STD length. Ignoring object.\n", stripePath(SD), cs->rebuild.curstripe, j); |
| 44 | | -+ goto nextobject; |
| 45 | | -+ } |
| 46 | | - { |
| 47 | | - struct { |
| 48 | | - time_t timestamp; |
| Index: trunk/debs/squid/debian/patches/00README |
| — | — | @@ -32,9 +32,6 @@ |
| 33 | 33 | wikimedia-errors Wikimedia specific error messages |
| 34 | 34 | nomanglerequestheaders Do not alter the request headers in server-side |
| 35 | 35 | requests |
| 36 | | -coss-rebuild-meta-key-length |
| 37 | | - Do not crash on assert(t->length == MD5_DIGEST_CHARS) |
| 38 | | - in the COSS rebuild code, just ignore the object |
| 39 | 36 | coss-remove-swap-log Remove (or currently, disable) COSS swap log as it's |
| 40 | 37 | not really used and just causes bugs and disk I/O. |
| 41 | 38 | storedir-minobjsize Add support for min-size cache option |
| Index: trunk/debs/squid/debian/patches/00list |
| — | — | @@ -8,5 +8,4 @@ |
| 9 | 9 | 22-udplog |
| 10 | 10 | 23-storedir-minobjsize.dpatch |
| 11 | 11 | 23-variant-invalidation.dpatch |
| 12 | | -24-coss-rebuild-meta-key-length.dpatch |
| 13 | 12 | 25-coss-remove-swap-log |
| Index: trunk/debs/squid/debian/changelog |
| — | — | @@ -1,3 +1,10 @@ |
| | 2 | +squid (2.6.13-1wm1) edgy; urgency=low |
| | 3 | + |
| | 4 | + * New upstream version 2.6.STABLE13 |
| | 5 | + - Dropped patch 24-coss-rebuild-meta-key-length, included upstream |
| | 6 | + |
| | 7 | + -- Mark Bergsma <mark@wikimedia.org> Tue, 12 Jun 2007 18:31:13 +0000 |
| | 8 | + |
| 2 | 9 | squid (2.6.12-1wm6) edgy; urgency=low |
| 3 | 10 | |
| 4 | 11 | * Increase default nr of FDs to 32768 in squid-frontend |