[squid] fixes FTBFS due to gcc-4.7

[Jiri Skala]

commit 9332c3379300617d4019a9b4a75eb9e38b0dd34f
Author: Jiri Skala <jskala at redhat.com>
Date:   Mon Jan 16 10:14:12 2012 +0100

    fixes FTBFS due to gcc-4.7

 squid-3.2.0.14-gcc47.patch |   19 +++++++++++++++----
 squid.spec                 |    5 ++++-
 2 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/squid-3.2.0.14-gcc47.patch b/squid-3.2.0.14-gcc47.patch
index f3989fd..5e9c9f4 100644
--- a/squid-3.2.0.14-gcc47.patch
+++ b/squid-3.2.0.14-gcc47.patch
@@ -1,13 +1,24 @@
+diff -up squid-3.2.0.14/src/ssl/support.cc.gcc47 squid-3.2.0.14/src/ssl/support.cc
+--- squid-3.2.0.14/src/ssl/support.cc.gcc47	2012-01-16 09:02:32.097769625 +0100
++++ squid-3.2.0.14/src/ssl/support.cc	2012-01-16 09:43:53.149248015 +0100
+@@ -333,7 +333,7 @@ ssl_options[] = {
+ #endif
+ #if SSL_OP_ALL
+     {
+-        "ALL", SSL_OP_ALL
++        "ALL", (long)SSL_OP_ALL
+     },
+ #endif
+ #if SSL_OP_SINGLE_DH_USE
 diff -up squid-3.2.0.14/src/StoreEntryStream.h.gcc47 squid-3.2.0.14/src/StoreEntryStream.h
 --- squid-3.2.0.14/src/StoreEntryStream.h.gcc47	2012-01-13 15:34:52.973978675 +0100
-+++ squid-3.2.0.14/src/StoreEntryStream.h	2012-01-13 15:36:01.820858662 +0100
-@@ -70,7 +70,8 @@ protected:
++++ squid-3.2.0.14/src/StoreEntryStream.h	2012-01-16 08:36:31.504084580 +0100
+@@ -70,7 +70,7 @@ protected:
              return traits_type::eof();
  
          if (aChar != traits_type::eof()) {
 -            char chars[1] = {aChar};
-+            char chars[1];
-+            chars[0] = aChar;
++            char chars[1] = { (char)aChar };
  
              if (aChar != traits_type::eof())
                  theEntry->append(chars, 1);
diff --git a/squid.spec b/squid.spec
index bdf74cb..b817992 100644
--- a/squid.spec
+++ b/squid.spec
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.2.0.14
-Release:  4%{?dist}
+Release:  5%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -305,6 +305,9 @@ fi
         /sbin/chkconfig --add squid >/dev/null 2>&1 || :
 
 %changelog
+* Mon Jan 16 2012 Jiri Skala <jskala at redhat.com> - 7:3.2.0.14-5
+- fixes FTBFS due to gcc-4.7
+
 * Fri Jan 13 2012 Jiri Skala <jskala at redhat.com> - 7:3.2.0.14-4
 - fixes #772481 - Low number of open files for squid process
 - fixes FTBFS due to gcc4.7