| 1 |
mrness 09/04/25 11:42:36 |
| 2 |
|
| 3 |
Added: squid-3.0.14-max-forwards.patch |
| 4 |
squid-3.0.14-gcc43.patch |
| 5 |
squid-3.0.14-cross-compile.patch |
| 6 |
Log: |
| 7 |
Fix assertion failure (#267109). Fix gcc-4.3 and cross compilation issues (#266581). |
| 8 |
(Portage version: 2.1.6.7/cvs/Linux x86_64) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 net-proxy/squid/files/squid-3.0.14-max-forwards.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.14-max-forwards.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.14-max-forwards.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: squid-3.0.14-max-forwards.patch |
| 17 |
=================================================================== |
| 18 |
diff -Nru squid-3.0.STABLE14.orig/src/HttpHeader.cc squid-3.0.STABLE14/src/HttpHeader.cc |
| 19 |
--- squid-3.0.STABLE14.orig/src/HttpHeader.cc 2009-04-11 08:35:40.000000000 +0000 |
| 20 |
+++ squid-3.0.STABLE14/src/HttpHeader.cc 2009-04-25 11:34:00.000000000 +0000 |
| 21 |
@@ -106,7 +106,7 @@ |
| 22 |
{"Last-Modified", HDR_LAST_MODIFIED, ftDate_1123}, |
| 23 |
{"Link", HDR_LINK, ftStr}, |
| 24 |
{"Location", HDR_LOCATION, ftStr}, |
| 25 |
- {"Max-Forwards", HDR_MAX_FORWARDS, ftInt}, |
| 26 |
+ {"Max-Forwards", HDR_MAX_FORWARDS, ftInt64}, |
| 27 |
{"Mime-Version", HDR_MIME_VERSION, ftStr}, /* for now */ |
| 28 |
{"Pragma", HDR_PRAGMA, ftStr}, |
| 29 |
{"Proxy-Authenticate", HDR_PROXY_AUTHENTICATE, ftStr}, |
| 30 |
|
| 31 |
|
| 32 |
|
| 33 |
1.1 net-proxy/squid/files/squid-3.0.14-gcc43.patch |
| 34 |
|
| 35 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.14-gcc43.patch?rev=1.1&view=markup |
| 36 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.14-gcc43.patch?rev=1.1&content-type=text/plain |
| 37 |
|
| 38 |
Index: squid-3.0.14-gcc43.patch |
| 39 |
=================================================================== |
| 40 |
diff -Nru squid-3.0.STABLE14.orig/lib/util.c squid-3.0.STABLE14/lib/util.c |
| 41 |
--- squid-3.0.STABLE14.orig/lib/util.c 2009-04-11 08:35:38.000000000 +0000 |
| 42 |
+++ squid-3.0.STABLE14/lib/util.c 2009-04-25 11:28:40.000000000 +0000 |
| 43 |
@@ -755,7 +755,7 @@ |
| 44 |
|
| 45 |
PROF_stop(xstrdup); |
| 46 |
|
| 47 |
- return p; |
| 48 |
+ return (char *)p; |
| 49 |
} |
| 50 |
|
| 51 |
/* |
| 52 |
@@ -765,7 +765,7 @@ |
| 53 |
xstrndup(const char *s, size_t n) |
| 54 |
{ |
| 55 |
size_t sz; |
| 56 |
- void *p; |
| 57 |
+ char *p; |
| 58 |
PROF_start(xstrndup); |
| 59 |
assert(s != NULL); |
| 60 |
assert(n); |
| 61 |
@@ -774,7 +774,7 @@ |
| 62 |
if (sz > n) |
| 63 |
sz = n; |
| 64 |
|
| 65 |
- p = xstrncpy(xmalloc(sz), s, sz); |
| 66 |
+ p = xstrncpy((char *)xmalloc(sz), s, sz); |
| 67 |
|
| 68 |
PROF_stop(xstrndup); |
| 69 |
|
| 70 |
@@ -923,7 +923,7 @@ |
| 71 |
xint64toa(int64_t num) |
| 72 |
{ |
| 73 |
static char buf[24]; /* 2^64 = 18446744073709551616 */ |
| 74 |
- snprintf(buf, sizeof(buf), "%" PRId64, num); |
| 75 |
+ snprintf(buf, sizeof(buf), "%" PRId64, (long long int)num); |
| 76 |
return buf; |
| 77 |
} |
| 78 |
|
| 79 |
|
| 80 |
|
| 81 |
|
| 82 |
1.1 net-proxy/squid/files/squid-3.0.14-cross-compile.patch |
| 83 |
|
| 84 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.14-cross-compile.patch?rev=1.1&view=markup |
| 85 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-proxy/squid/files/squid-3.0.14-cross-compile.patch?rev=1.1&content-type=text/plain |
| 86 |
|
| 87 |
Index: squid-3.0.14-cross-compile.patch |
| 88 |
=================================================================== |
| 89 |
diff -Nru squid-3.0.STABLE14.orig/configure.in squid-3.0.STABLE14/configure.in |
| 90 |
--- squid-3.0.STABLE14.orig/configure.in 2009-04-25 11:24:10.000000000 +0000 |
| 91 |
+++ squid-3.0.STABLE14/configure.in 2009-04-25 11:31:02.000000000 +0000 |
| 92 |
@@ -1820,6 +1820,10 @@ |
| 93 |
;; |
| 94 |
esac |
| 95 |
|
| 96 |
+dnl Define HOSTCXX |
| 97 |
+HOSTCXX="$build-g++" |
| 98 |
+AC_SUBST(HOSTCXX) |
| 99 |
+ |
| 100 |
dnl Check for programs |
| 101 |
AC_PROG_CPP |
| 102 |
AC_PROG_INSTALL |
| 103 |
diff -Nru squid-3.0.STABLE14.orig/src/Makefile.am squid-3.0.STABLE14/src/Makefile.am |
| 104 |
--- squid-3.0.STABLE14.orig/src/Makefile.am 2009-04-25 11:24:10.000000000 +0000 |
| 105 |
+++ squid-3.0.STABLE14/src/Makefile.am 2009-04-25 11:31:02.000000000 +0000 |
| 106 |
@@ -1007,6 +1007,8 @@ |
| 107 |
|
| 108 |
DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\" |
| 109 |
|
| 110 |
+HOSTCXX ?= @HOSTCXX@ |
| 111 |
+ |
| 112 |
$(OBJS): $(top_srcdir)/include/version.h ../include/autoconf.h |
| 113 |
|
| 114 |
snmp_core.o snmp_agent.o: ../snmplib/libsnmp.a $(top_srcdir)/include/cache_snmp.h |
| 115 |
@@ -1030,6 +1032,11 @@ |
| 116 |
squid.conf.default: cf_parser.h |
| 117 |
true |
| 118 |
|
| 119 |
+cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) |
| 120 |
+ $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc \ |
| 121 |
+ $(top_srcdir)/lib/util.c $(top_srcdir)/lib/assert.c \ |
| 122 |
+ -DNDEBUG -DBUILD_HOST_TOOL ${INCLUDES} |
| 123 |
+ |
| 124 |
cf_parser.h: cf.data cf_gen$(EXEEXT) |
| 125 |
./cf_gen cf.data $(srcdir)/cf.data.depend |
Archives