Re: [squid-users] Problem applying ICAP Patch to 2.6.STABLE10
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi ! Thanks for the help. I did as advised, which corrected the issue in client_side.c but now there is a problem when compiling http.c: then mv -f .deps/helper.Tpo .deps/helper.Po; else rm -f .deps/helper.Tpo; exit 1; fi if gcc -DHAVE_CONFIG_H - -DDEFAULT_CONFIG_FILE=\/usr/local/squid/etc/squid.conf\ -I. -I. - -I../include -I. -I. -I../include -I../include-Wall -g -O2 -MT http.o -MD -MP -MF .deps/http.Tpo -c -o http.o http.c; \ then mv -f .deps/http.Tpo .deps/http.Po; else rm -f .deps/http.Tpo; exit 1; fi http.c: In function `httpAppendBody': http.c:649: warning: passing arg 2 of `icapRespModAddBodyData' discards qualifiers from pointer target type http.c:661: warning: passing arg 2 of `icapRespModAddBodyData' discards qualifiers from pointer target type http.c: In function `httpSendComplete': http.c:1144: error: incompatible type for argument 2 of `storeCreateEntry' http.c:1144: error: incompatible type for argument 3 of `storeCreateEntry' http.c:1144: error: too few arguments to function `storeCreateEntry' make[4]: *** [http.o] Error 1 make[4]: Leaving directory `/var/squid-tree/squid-2.6.STABLE11/src' make[3]: *** [all-recursive] Error 1 make[3]: Leaving directory `/var/squid-tree/squid-2.6.STABLE11/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/var/squid-tree/squid-2.6.STABLE11/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/var/squid-tree/squid-2.6.STABLE11' make: *** [build] Error 2 in store.h i found: extern StoreEntry *storeCreateEntry(const char *, const char *, request_flags, method_t); but in http.c it is called this way: httpState-entry = storeCreateEntry(fake, fake_flags, fake_method); Can i resolv this problem simply with calling httpState-entry = storeCreateEntry(fake, fake,fake_flags, fake_method); ? Thanks Kai Henrik Nordstrom schrieb: | tor 2007-03-15 klockan 21:38 +0100 skrev Kai Steverding: | |I just downloaded the latest ICAP Patch from | |http://devel.squid-cache.org/cgi-bin/diff2/icap-2_6.patch | | |and tried to apply it to the latest 2.6 branch squid.It didn't apply: | | | http://www.squid-cache.org/mail-archive/squid-dev/200703/0074.html | | Regards | Henrik -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.0 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFF++fJaoKL0dhmIeERAsomAKCWsSQngH+zWavVUGvtFWQ0YWEy5wCeM6W/ V/gwPD634EWiWk+b7Ez2/pU= =oiBB -END PGP SIGNATURE-
Re: [squid-users] Problem applying ICAP Patch to 2.6.STABLE10
tor 2007-03-15 klockan 21:38 +0100 skrev Kai Steverding: I just downloaded the latest ICAP Patch from http://devel.squid-cache.org/cgi-bin/diff2/icap-2_6.patch and tried to apply it to the latest 2.6 branch squid.It didn't apply: http://www.squid-cache.org/mail-archive/squid-dev/200703/0074.html Regards Henrik signature.asc Description: Detta är en digitalt signerad meddelandedel
[squid-users] Problem applying ICAP Patch to 2.6.STABLE10
I just downloaded the latest ICAP Patch from http://devel.squid-cache.org/cgi-bin/diff2/icap-2_6.patch and tried to apply it to the latest 2.6 branch squid.It didn't apply: There were errors in client_side.c : patching file src/client_side.c Hunk #6 succeeded at 1375 (offset 8 lines). Hunk #7 succeeded at 1410 (offset 8 lines). Hunk #8 succeeded at 1610 (offset 9 lines). Hunk #9 succeeded at 1629 (offset 9 lines). Hunk #10 succeeded at 1655 (offset 11 lines). Hunk #11 succeeded at 3318 (offset -16 lines). Hunk #12 succeeded at 3329 with fuzz 1 (offset -15 lines). Hunk #13 FAILED at 3778. Hunk #14 FAILED at 3811. Hunk #15 succeeded at 3831 (offset -182 lines). Hunk #16 succeeded at 4119 (offset 7 lines). Hunk #17 succeeded at 4248 (offset 7 lines). Hunk #18 succeeded at 4290 (offset 7 lines). Hunk #19 succeeded at 5012 (offset 7 lines). 2 out of 19 hunks FAILED -- saving rejects to file src/client_side.c.rej Here is the full patch output : pelota:/var/build-squid/squid-2.6.STABLE10# patch -p1 icap-2_6.patch patching file configure.in Hunk #3 succeeded at 2548 (offset 2 lines). can't find file to patch at input line 57 Perhaps you used the wrong -p or --strip option? The text leading up to this was: -- |Index: squid/errors/list |diff -u squid/errors/list:1.4 squid/errors/list:1.4.10.1 |--- squid/errors/list:1.4 Fri Apr 28 04:10:45 2006 |+++ squid/errors/list Wed May 17 10:57:59 2006 -- File to patch: Skip this patch? [y] Skipping patch. 1 out of 1 hunk ignored patching file errors/Bulgarian/ERR_ICAP_FAILURE patching file errors/Catalan/ERR_ICAP_FAILURE patching file errors/Czech/ERR_ICAP_FAILURE patching file errors/Danish/ERR_ICAP_FAILURE patching file errors/Dutch/ERR_ICAP_FAILURE patching file errors/English/ERR_ICAP_FAILURE patching file errors/Estonian/ERR_ICAP_FAILURE patching file errors/Finnish/ERR_ICAP_FAILURE patching file errors/French/ERR_ICAP_FAILURE patching file errors/German/ERR_ICAP_FAILURE patching file errors/Greek/ERR_ICAP_FAILURE patching file errors/Hebrew/ERR_ICAP_FAILURE patching file errors/Hungarian/ERR_ICAP_FAILURE patching file errors/Italian/ERR_ICAP_FAILURE patching file errors/Japanese/ERR_ICAP_FAILURE patching file errors/Korean/ERR_ICAP_FAILURE patching file errors/Lithuanian/ERR_ICAP_FAILURE patching file errors/Polish/ERR_ICAP_FAILURE patching file errors/Portuguese/ERR_ICAP_FAILURE patching file errors/Romanian/ERR_ICAP_FAILURE patching file errors/Russian-1251/ERR_ICAP_FAILURE patching file errors/Russian-koi8-r/ERR_ICAP_FAILURE patching file errors/Serbian/ERR_ICAP_FAILURE patching file errors/Simplify_Chinese/ERR_ICAP_FAILURE patching file errors/Slovak/ERR_ICAP_FAILURE patching file errors/Spanish/ERR_ICAP_FAILURE patching file errors/Swedish/ERR_ICAP_FAILURE patching file errors/Traditional_Chinese/ERR_ICAP_FAILURE patching file errors/Turkish/ERR_ICAP_FAILURE patching file include/util.h patching file lib/Makefile.am patching file lib/strcasestr.c patching file lib/strnstr.c patching file src/Makefile.am patching file src/MemBuf.c patching file src/cache_cf.c Hunk #1 succeeded at 2394 (offset 7 lines). patching file src/cbdata.c patching file src/cf.data.pre Hunk #1 succeeded at 3215 (offset 15 lines). Hunk #2 succeeded at 3483 (offset 15 lines). patching file src/cf_gen_defines patching file src/client_side.c Hunk #6 succeeded at 1375 (offset 8 lines). Hunk #7 succeeded at 1410 (offset 8 lines). Hunk #8 succeeded at 1610 (offset 9 lines). Hunk #9 succeeded at 1629 (offset 9 lines). Hunk #10 succeeded at 1655 (offset 11 lines). Hunk #11 succeeded at 3318 (offset -16 lines). Hunk #12 succeeded at 3329 with fuzz 1 (offset -15 lines). Hunk #13 FAILED at 3778. Hunk #14 FAILED at 3811. Hunk #15 succeeded at 3831 (offset -182 lines). Hunk #16 succeeded at 4119 (offset 7 lines). Hunk #17 succeeded at 4248 (offset 7 lines). Hunk #18 succeeded at 4290 (offset 7 lines). Hunk #19 succeeded at 5012 (offset 7 lines). 2 out of 19 hunks FAILED -- saving rejects to file src/client_side.c.rej patching file src/comm.c patching file src/enums.h patching file src/forward.c Hunk #2 succeeded at 942 (offset 2 lines). Hunk #3 succeeded at 982 (offset 2 lines). Hunk #4 succeeded at 1003 (offset 2 lines). patching file src/globals.h patching file src/http.c Hunk #5 succeeded at 643 (offset -1 lines). Hunk #6 succeeded at 716 (offset -1 lines). Hunk #7 succeeded at 737 (offset -10 lines). Hunk #8 succeeded at 800 (offset -10 lines). Hunk #9 succeeded at 863 (offset -10 lines). Hunk #10 succeeded at 885 (offset -10 lines). Hunk #11 succeeded at 932 (offset -10 lines). Hunk #12 succeeded at 1036 (offset -15 lines). Hunk #13 succeeded at 1106 (offset -15 lines). Hunk #14 succeeded at 1171 (offset -15 lines). Hunk #15 succeeded at 1486 (offset -15 lines). Hunk #16 succeeded at 1616 with fuzz 1 (offset -15 lines). Hunk #17 succeeded at 1659 (offset -15 lines). patching file src/icap_common.c patching file src/icap_opt.c patching
