resolve merge conflict

squid-3.2.0.14-gcc47.patch

@@ -0,0 +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-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] = { (char)aChar };
+ 
+             if (aChar != traits_type::eof())
+                 theEntry->append(chars, 1);

squid.service

@@ -4,6 +4,7 @@ After=syslog.target network.target named.service
 
 [Service]
 Type=forking
+LimitNOFILE=16384
 EnvironmentFile=/etc/sysconfig/squid
 ExecStartPre=/usr/libexec/squid/cache_swap.sh
 ExecStart=/usr/sbin/squid $SQUID_OPTS -f $SQUID_CONF

squid.spec

@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.2.0.14
-Release:  3%{?dist}
+Release:  5%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 # See CREDITS for breakdown of non GPLv2+ code
@@ -41,6 +41,7 @@ Patch203: squid-3.0.STABLE1-perlpath.patch
 Patch204: squid-3.2.0.9-fpic.patch
 Patch205: squid-3.1.9-ltdl.patch
 Patch206: squid-3.2.0.13-errname.patch
+#Patch207: squid-3.2.0.14-gcc47.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: bash >= 2.0
@@ -107,6 +108,7 @@ The squid-sysvinit contains SysV initscritps support.
 %patch204 -p1 -b .fpic
 %patch205 -p1 -b .ltdl
 %patch206 -p1 -b .errname
+#patch207 -p1 -b .gcc47
 
 %build
 %ifarch sparcv9 sparc64 s390 s390x
@@ -315,9 +317,16 @@ fi
 
 %changelog
 * Tue Jan 17 2012 Henrik Nordstrom <henrik@henriknordstrom.net> - 7:3.2.0.14-4
-- fix for gcc-4.7
+- upstream gcc-4.7 patch
 - fix for bug #772483 running out of memory, mem_node growing out of bounds
 
+* Mon Jan 16 2012 Jiri Skala <jskala@redhat.com> - 7:3.2.0.14-5
+- fixes FTBFS due to gcc-4.7
+
+* Fri Jan 13 2012 Jiri Skala <jskala@redhat.com> - 7:3.2.0.14-4
+- fixes #772481 - Low number of open files for squid process
+- fixes FTBFS due to gcc4.7
+
 * Thu Jan 05 2012 Henrik Nordstrom <henrik@henriknordstrom.net> - 3.2.0.14-3
 - rebuild for gcc-4.7.0