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

GCC-4.4 patch now available upstream

Browse Source
This commit is contained in:
Henrik Nordström 2009-06-29 12:02:14 +00:00
parent de76121bdf
commit 46671b4770
4 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -1,2 +1,3 @@
squid-3.0.STABLE16.tar.bz2 squid-3.0.STABLE16.tar.bz2
b9052.patch b9052.patch
b9053.patch

1
sources
View File

@ -1,2 +1,3 @@
aa039a2c75404a496f0e99a278599e00 squid-3.0.STABLE16.tar.bz2 aa039a2c75404a496f0e99a278599e00 squid-3.0.STABLE16.tar.bz2
8039be92fb6ca5a71dd11b7d99c841fa b9052.patch 8039be92fb6ca5a71dd11b7d99c841fa b9052.patch
edcea01a412a23fb0ceaddf0eaa16c8b b9053.patch

14
squid-3.0.STABLE13-gcc44.patch
View File

@ -1,14 +0,0 @@
diff -ru squid-3.0.STABLE13/src/wccp2.cc squid-3.0.STABLE13.wccp/src/wccp2.cc
--- squid-3.0.STABLE13/src/wccp2.cc 2009-02-03 02:36:23.000000000 +0100
+++ squid-3.0.STABLE13.wccp/src/wccp2.cc 2009-03-06 16:04:14.000000000 +0100
@@ -1182,8 +1182,9 @@
/* Go through the data structure */
while (data_length > offset) {
+ char *data = wccp2_i_see_you.data;
- header = (struct wccp2_item_header_t *) &wccp2_i_see_you.data[offset];
+ header = (struct wccp2_item_header_t *) &data[offset];
switch (ntohs(header->type)) {

4
squid.spec
View File

@ -23,6 +23,7 @@ Source98: perl-requires-squid.sh
# Upstream patches # Upstream patches
#Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch #Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/bXXXX.patch
Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9052.patch Patch001: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9052.patch
Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9053.patch
# External patches # External patches
@ -35,7 +36,6 @@ Patch203: squid-3.0.STABLE1-build.patch
Patch204: squid-3.0.STABLE1-perlpath.patch Patch204: squid-3.0.STABLE1-perlpath.patch
Patch205: squid-3.0.STABLE15-smb-path.patch Patch205: squid-3.0.STABLE15-smb-path.patch
Patch208: squid-3.0.STABLE7-from_manpg.patch Patch208: squid-3.0.STABLE7-from_manpg.patch
Patch209: squid-3.0.STABLE13-gcc44.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: bash >= 2.0 Requires: bash >= 2.0
@ -62,13 +62,13 @@ lookup program (dnsserver), a program for retrieving FTP data
%setup -q %setup -q
%patch001 -p1 -b .b9052 %patch001 -p1 -b .b9052
%patch002 -p1 -b .b9053
%patch201 -p1 -b .config %patch201 -p1 -b .config
%patch202 -p1 -b .location %patch202 -p1 -b .location
%patch203 -p1 -b .build %patch203 -p1 -b .build
%patch204 -p1 -b .perlpath %patch204 -p1 -b .perlpath
%patch205 -p1 -b .smb-path %patch205 -p1 -b .smb-path
%patch208 -p1 -b .from_manpg %patch208 -p1 -b .from_manpg
%patch209 -p1 -b .gcc44
%build %build
export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ; export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;