diff --git a/.cvsignore b/.cvsignore index f2b760b..d08859b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ squid-3.0.STABLE16.tar.bz2 b9052.patch +b9053.patch diff --git a/sources b/sources index 331e9de..62f047a 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ aa039a2c75404a496f0e99a278599e00 squid-3.0.STABLE16.tar.bz2 8039be92fb6ca5a71dd11b7d99c841fa b9052.patch +edcea01a412a23fb0ceaddf0eaa16c8b b9053.patch diff --git a/squid-3.0.STABLE13-gcc44.patch b/squid-3.0.STABLE13-gcc44.patch deleted file mode 100644 index 13024cb..0000000 --- a/squid-3.0.STABLE13-gcc44.patch +++ /dev/null @@ -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)) { - diff --git a/squid.spec b/squid.spec index 7fed49d..3fbed7e 100644 --- a/squid.spec +++ b/squid.spec @@ -23,6 +23,7 @@ Source98: perl-requires-squid.sh # 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/b9052.patch +Patch002: http://www.squid-cache.org/Versions/v3/3.0/changesets/b9053.patch # External patches @@ -35,7 +36,6 @@ Patch203: squid-3.0.STABLE1-build.patch Patch204: squid-3.0.STABLE1-perlpath.patch Patch205: squid-3.0.STABLE15-smb-path.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) Requires: bash >= 2.0 @@ -62,13 +62,13 @@ lookup program (dnsserver), a program for retrieving FTP data %setup -q %patch001 -p1 -b .b9052 +%patch002 -p1 -b .b9053 %patch201 -p1 -b .config %patch202 -p1 -b .location %patch203 -p1 -b .build %patch204 -p1 -b .perlpath %patch205 -p1 -b .smb-path %patch208 -p1 -b .from_manpg -%patch209 -p1 -b .gcc44 %build export CXXFLAGS="-fPIE %{optflags}" ; export CFLAGS="-fPIE -Os -g -pipe -fsigned-char %{optflags}" ; export LDFLAGS="-pie" ;