src/patches/squid/squid-3.5-14156.patch

   1 ------------------------------------------------------------
   2 revno: 14156
   3 revision-id: squid3@treenet.co.nz-20170508110920-73gma737u4x6ce87
   4 parent: squid3@treenet.co.nz-20170504061416-ks61dfut8wyml2qu
   5 fixes bug: http://bugs.squid-cache.org/show_bug.cgi?id=4695
   6 author: Lubos Uhliarik <luhliari@redhat.com>
   7 committer: Amos Jeffries <squid3@treenet.co.nz>
   8 branch nick: 3.5
   9 timestamp: Mon 2017-05-08 23:09:20 +1200
  10 message:
  11   Bug 4695: squidpurge: GCC 7 build errors
  12 ------------------------------------------------------------
  13 # Bazaar merge directive format 2 (Bazaar 0.90)
  14 # revision_id: squid3@treenet.co.nz-20170508110920-73gma737u4x6ce87
  15 # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  16 # testament_sha1: a0f0c573b5be3d81cf0f8e65ae52bf27bd08dba5
  17 # timestamp: 2017-05-08 11:51:08 +0000
  18 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5
  19 # base_revision_id: squid3@treenet.co.nz-20170504061416-\
  20 #   ks61dfut8wyml2qu
  21 #
  22 # Begin patch
  23 === modified file 'tools/purge/purge.cc'
  24 --- tools/purge/purge.cc        2017-01-01 00:16:45 +0000
  25 +++ tools/purge/purge.cc        2017-05-08 11:09:20 +0000
  26 @@ -272,7 +272,7 @@
  27          snprintf( md5, sizeof(md5), "%-32s", "(no_md5_data_available)" );
  28      }
  29
  30 -    char timeb[64];
  31 +    char timeb[256];
  32      if ( meta && (findings = meta->search( STORE_META_STD )) ) {
  33          StoreMetaStd temp;
  34          // make data aligned, avoid SIGBUS on RISC machines (ARGH!)
  35 @@ -283,7 +283,7 @@
  36      } else if ( meta && (findings = meta->search( STORE_META_STD_LFS )) ) {
  37          StoreMetaStdLFS temp;
  38          // make data aligned, avoid SIGBUS on RISC machines (ARGH!)
  39 -        memcpy( &temp, findings->data, sizeof(StoreMetaStd) );
  40 +        memcpy( &temp, findings->data, sizeof(StoreMetaStdLFS) );
  41          snprintf( timeb, sizeof(timeb), "%08lx %08lx %08lx %08lx %04x %5hu ",
  42                    (unsigned long)temp.timestamp, (unsigned long)temp.lastref,
  43                    (unsigned long)temp.expires, (unsigned long)temp.lastmod, temp.flags, temp.refcount );
  44