rpms/squid
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fixes FTBFS due to gcc-4.7

Browse Source
This commit is contained in:
Jiri Skala 2012-01-16 10:14:12 +01:00
parent ceb5ad7c5f
commit 9332c33793
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
squid-3.2.0.14-gcc47.patch
View File

@ -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 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.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 +++ squid-3.2.0.14/src/StoreEntryStream.h 2012-01-16 08:36:31.504084580 +0100
@@ -70,7 +70,8 @@ protected: @@ -70,7 +70,7 @@ protected:
return traits_type::eof(); return traits_type::eof();
if (aChar != traits_type::eof()) { if (aChar != traits_type::eof()) {
- char chars[1] = {aChar}; - char chars[1] = {aChar};
+ char chars[1]; + char chars[1] = { (char)aChar };
+ chars[0] = aChar;
if (aChar != traits_type::eof()) if (aChar != traits_type::eof())
theEntry->append(chars, 1); theEntry->append(chars, 1);

5
squid.spec
View File

@ -4,7 +4,7 @@
Name: squid Name: squid
Version: 3.2.0.14 Version: 3.2.0.14
Release: 4%{?dist} Release: 5%{?dist}
Summary: The Squid proxy caching server Summary: The Squid proxy caching server
Epoch: 7 Epoch: 7
# See CREDITS for breakdown of non GPLv2+ code # See CREDITS for breakdown of non GPLv2+ code
@ -305,6 +305,9 @@ fi
/sbin/chkconfig --add squid >/dev/null 2>&1 || : /sbin/chkconfig --add squid >/dev/null 2>&1 || :
%changelog %changelog
* 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 * 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 #772481 - Low number of open files for squid process
- fixes FTBFS due to gcc4.7 - fixes FTBFS due to gcc4.7