| Index: trunk/rpms/SOURCES/squid-2.5.STABLE13-htcp.patch |
| — | — | @@ -0,0 +1,12 @@ |
| | 2 | +--- src/htcp.c.orig 2006-04-27 20:33:35.000000000 +0000 |
| | 3 | +@@ -598,6 +598,9 @@ |
| | 4 | + packerClean(&p); |
| | 5 | + } |
| | 6 | + pkt = htcpBuildPacket(&stuff, &pktlen); |
| | 7 | ++ safe_free(stuff.D.resp_hdrs); |
| | 8 | ++ safe_free(stuff.D.entity_hdrs); |
| | 9 | ++ safe_free(stuff.D.cache_hdrs); |
| | 10 | + if (pkt == NULL) { |
| | 11 | + debug(31, 0) ("htcpTstReply: htcpBuildPacket() failed\n"); |
| | 12 | + return; |
| Index: trunk/rpms/SPECS/squid.spec |
| — | — | @@ -5,7 +5,7 @@ |
| 6 | 6 | Summary: The Squid proxy caching server. |
| 7 | 7 | Name: squid |
| 8 | 8 | Version: 2.5.STABLE13 |
| 9 | | -Release: 1wm |
| | 9 | +Release: 4wm |
| 10 | 10 | Epoch: 7 |
| 11 | 11 | License: GPL |
| 12 | 12 | Group: System Environment/Daemons |
| — | — | @@ -31,6 +31,7 @@ |
| 32 | 32 | Patch204: squid-2.5.STABLE4-perlpath.patch |
| 33 | 33 | Patch205: squid-2.5.STABLE5-pipe.patch |
| 34 | 34 | #Patch206: squid-2.5.STABLE11-libbind.patch |
| | 35 | +Patch207: squid-2.5.STABLE13-htcp.patch |
| 35 | 36 | |
| 36 | 37 | # Wikimedia patches |
| 37 | 38 | Patch251: squid-htcp-clr.diff |
| — | — | @@ -66,6 +67,7 @@ |
| 67 | 68 | %patch204 -p1 -b .perlpath |
| 68 | 69 | %patch205 -p1 -b .pipe |
| 69 | 70 | #%patch206 -p1 -b .libbind |
| | 71 | +%patch207 -p0 -b .htcp |
| 70 | 72 | %patch251 -p0 -b .htcpclr |
| 71 | 73 | %patch252 -p1 -b .errors |
| 72 | 74 | |
| — | — | @@ -106,7 +108,7 @@ |
| 107 | 109 | --enable-carp \ |
| 108 | 110 | --datadir=%{_datadir} |
| 109 | 111 | |
| 110 | | -export CFLAGS="-fPIE -Os -g -pipe -fsigned-char" ; export LDFLAGS=-pie ; |
| | 112 | +export CFLAGS="-fPIE -Os -g -pipe -fsigned-char -DPURIFY=1" ; export LDFLAGS=-pie ; |
| 111 | 113 | make %{?_smp_mflags} |
| 112 | 114 | |
| 113 | 115 | mkdir faq |
| — | — | @@ -302,6 +304,12 @@ |
| 303 | 305 | chgrp squid /var/cache/samba/winbindd_privileged > /dev/null 2>& 1 || true |
| 304 | 306 | |
| 305 | 307 | %changelog |
| | 308 | +* Thu Apr 27 2006 Mark Bergsma <mark@nedworks.org> 7:2.5.STABLE13-4.WM |
| | 309 | +- New production build with HTCP memleak fix |
| | 310 | + |
| | 311 | +* Wed Apr 26 2006 Mark Bergsma <mark@nedworks.org> 7:2.5.STABLE13-3.WM |
| | 312 | +- Experimental build with AIO and an alternative malloc lib |
| | 313 | + |
| 306 | 314 | * Wed Apr 26 2006 Mark Bergsma <mark@nedworks.org> 7:2.5.STABLE13-1.WM |
| 307 | 315 | - New upstream version 2.5.STABLE13 which hopefully fixes the grave memleak |
| 308 | 316 | |