LINUX.ORG.RU
ФорумAdmin

squid-2.6-13 patch icap-2.6


0

0

Пытаюсь нактать patch icap . patch -p0 < icap-2_6.patch patching file squid/configure.in Hunk #2 succeeded at 2360 (offset 1 line). 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:./squid/configure.in patching file ./squid/configure.in Hunk #1 FAILED at 28. 1 out of 1 hunk FAILED -- saving rejects to file ./squid/configure.in.rej patching file squid/errors/Bulgarian/ERR_ICAP_FAILURE patching file squid/errors/Catalan/ERR_ICAP_FAILURE patching file squid/errors/Czech/ERR_ICAP_FAILURE patching file squid/errors/Danish/ERR_ICAP_FAILURE patching file squid/errors/Dutch/ERR_ICAP_FAILURE patching file squid/errors/English/ERR_ICAP_FAILURE patching file squid/errors/Estonian/ERR_ICAP_FAILURE patching file squid/errors/Finnish/ERR_ICAP_FAILURE patching file squid/errors/French/ERR_ICAP_FAILURE patching file squid/errors/German/ERR_ICAP_FAILURE patching file squid/errors/Greek/ERR_ICAP_FAILURE patching file squid/errors/Hebrew/ERR_ICAP_FAILURE patching file squid/errors/Hungarian/ERR_ICAP_FAILURE patching file squid/errors/Italian/ERR_ICAP_FAILURE patching file squid/errors/Japanese/ERR_ICAP_FAILURE patching file squid/errors/Korean/ERR_ICAP_FAILURE patching file squid/errors/Lithuanian/ERR_ICAP_FAILURE patching file squid/errors/Polish/ERR_ICAP_FAILURE patching file squid/errors/Portuguese/ERR_ICAP_FAILURE patching file squid/errors/Romanian/ERR_ICAP_FAILURE patching file squid/errors/Russian-1251/ERR_ICAP_FAILURE patching file squid/errors/Russian-koi8-r/ERR_ICAP_FAILURE patching file squid/errors/Serbian/ERR_ICAP_FAILURE patching file squid/errors/Simplify_Chinese/ERR_ICAP_FAILURE patching file squid/errors/Slovak/ERR_ICAP_FAILURE patching file squid/errors/Spanish/ERR_ICAP_FAILURE patching file squid/errors/Swedish/ERR_ICAP_FAILURE patching file squid/errors/Traditional_Chinese/ERR_ICAP_FAILURE patching file squid/errors/Turkish/ERR_ICAP_FAILURE patching file squid/include/util.h patching file squid/lib/Makefile.am patching file squid/lib/strcasestr.c patching file squid/lib/strnstr.c patching file squid/src/Makefile.am patching file squid/src/MemBuf.c patching file squid/src/cache_cf.c Hunk #1 succeeded at 2394 (offset 7 lines). patching file squid/src/cbdata.c patching file squid/src/cf.data.pre Hunk #1 succeeded at 3215 (offset 15 lines). patching file squid/src/cf_gen_defines patching file squid/src/client_side.c Hunk #6 succeeded at 1375 (offset 8 lines). Hunk #8 succeeded at 1610 (offset 9 lines). Hunk #10 succeeded at 1655 (offset 11 lines). Hunk #11 succeeded at 3310 (offset -24 lines). Hunk #12 succeeded at 3356 with fuzz 1 (offset 12 lines). Hunk #13 FAILED at 3805. Hunk #14 FAILED at 3838. Hunk #15 succeeded at 3821 (offset -192 lines). Hunk #16 succeeded at 4313 (offset 201 lines). Hunk #17 succeeded at 4049 (offset -192 lines). Hunk #18 succeeded at 4484 (offset 201 lines). Hunk #19 succeeded at 4813 (offset -192 lines). 2 out of 19 hunks FAILED -- saving rejects to file squid/src/client_side.c.rej patching file squid/src/comm.c patching file squid/src/enums.h patching file squid/src/forward.c Hunk #1 FAILED at 358. Hunk #2 succeeded at 944 (offset 4 lines). Hunk #4 succeeded at 1005 (offset 4 lines). 1 out of 4 hunks FAILED -- saving rejects to file squid/src/forward.c.rej patching file squid/src/globals.h patching file squid/src/http.c Hunk #12 succeeded at 1052 (offset 1 line). Hunk #14 succeeded at 1187 (offset 1 line). Hunk #16 succeeded at 1632 with fuzz 1 (offset 1 line). patching file squid/src/icap_common.c patching file squid/src/icap_opt.c patching file squid/src/icap_reqmod.c patching file squid/src/icap_respmod.c patching file squid/src/main.c patching file squid/src/mem.c patching file squid/src/mk-string-arrays.pl patching file squid/src/pconn.c patching file squid/src/protos.h Hunk #1 succeeded at 302 (offset -1 lines). Hunk #2 succeeded at 627 (offset -1 lines). Hunk #3 succeeded at 1421 with fuzz 2 (offset -13 lines). patching file squid/src/squid.h patching file squid/src/stat.c Hunk #1 succeeded at 804 (offset 9 lines). Hunk #3 succeeded at 1510 (offset 9 lines). patching file squid/src/store.c Hunk #1 succeeded at 1105 (offset -8 lines). patching file squid/src/structs.h Hunk #2 succeeded at 827 (offset 5 lines). Hunk #3 succeeded at 906 (offset -1 lines). Hunk #4 succeeded at 1122 (offset 4 lines). Hunk #5 succeeded at 1253 (offset -1 lines). Hunk #6 succeeded at 1377 (offset 5 lines). Hunk #7 succeeded at 1386 (offset -1 lines). Hunk #8 succeeded at 2064 (offset 6 lines). Hunk #9 succeeded at 2167 (offset -1 lines). patching file squid/src/typedefs.h patching file squid/src/url.c Что ему не нравиться ?


Re: squid-2.6-13 patch icap-2.6

Не знаю, что ему не "нравитЬся", а мне не нравится кривое форматирование, а патч не может наложиться, потому-что не знает куда. Не совпадает в нём место наложения с тем, что в сорцах.

Deleted ()
Ответ на: Re: squid-2.6-13 patch icap-2.6 от MiracleMan

Re: squid-2.6-13 patch icap-2.6

щРНР ОЮРВ ЯЙЮВЕМ Я devel.squid-cache.org.х ОПЕДМЮГМЮВЕМ ДКЪ squid-2.6-x. 1.яНЦКЮЯЕМ ОЮРВ ЙПХБН МН КНФХРЭЯЪ ОПНАКЕЛШ МЮВХМЮЧРЯЪ ОНРНЛ . 2../bootstrap.sh automake : autoconfg: Bootstrapping configure.in: installing `cfgaux/mkinstalldirs' Autotool bootstrapping complete РНФЕ БПНДЕ ЯЗЕК. 3../configure --enable-icap-support --prefix=/usr/local/squid ЙНЛОХКЪЖХЪ ГЮЙЮМВХБЮЕРЯЪ АЕГ НЬХАНЙ .......... Яonfig.status: creating tools/Makefile config.status: creating include/autoconf.h config.status: executing depfiles commands 4.make ГЮЙЮМВХБЮЕРЯЪ ЯКЕДСЧЫЕИ НЬХАЙНИ 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 `test -f 'http.c' || echo './'`http.c; \ then mv -f ".deps/http.Tpo" ".deps/http.Po"; \ else rm -f ".deps/http.Tpo"; exit 1; \ fi http.c: б ТСМЙЖХХ ▒httpAppendBody▓ http.c:650: ОПЕДСОПЕФДЕМХЕ: passing argument 2 of ▒icapRespModAddBodyData▓ discards qualifiers from pointer target type http.c:662: ОПЕДСОПЕФДЕМХЕ: passing argument 2 of ▒icapRespModAddBodyData▓ discards qualifiers from pointer target type http.c: б ТСМЙЖХХ ▒httpSendComplete▓ http.c:1152: ОПЕДСОПЕФДЕМХЕ: implicit declaration of function ▒storeClientUnregisterAbort▓ http.c:1160: НЬХАЙЮ: incompatible type for argument 2 of ▒storeCreateEntry▓ http.c:1160: НЬХАЙЮ: incompatible type for argument 3 of ▒storeCreateEntry▓ http.c:1160: НЬХАЙЮ: too few arguments to function ▒storeCreateEntry▓ make[3]: *** [http.o] нЬХАЙЮ 1 make[3]: Leaving directory `/usr/src/redhat/SOURCES/squid/src' make[2]: *** [all-recursive] нЬХАЙЮ 1 make[2]: Leaving directory `/usr/src/redhat/SOURCES/squid/src' make[1]: *** [all] нЬХАЙЮ 2 make[1]: Leaving directory `/usr/src/redhat/SOURCES/squid/src' make: *** [all-recursive] нЬХАЙЮ 1

лНФЭ ВРН ОНОПЮБХРЭ Б http.c?

hz ()
Ответ на: Re: squid-2.6-13 patch icap-2.6 от MiracleMan

Re: squid-2.6-13 patch icap-2.6

щРНР ОЮРВ ЯЙЮВЕМ Я devel.squid-cache.org.х ОПЕДМЮГМЮВЕМ ДКЪ squid-2.6-x.
1.яНЦКЮЯЕМ ОЮРВ ЙПХБН МН КНФХРЭЯЪ ОПНАКЕЛШ МЮВХМЮЧРЯЪ ОНРНЛ .
2../bootstrap.sh
automake :
autoconfg:
Bootstrapping
configure.in: installing `cfgaux/mkinstalldirs'
Autotool bootstrapping complete РНФЕ БПНДЕ ЯЗЕК.
3../configure --enable-icap-support --prefix=/usr/local/squid
ЙНЛОХКЪЖХЪ ГЮЙЮМВХБЮЕРЯЪ АЕГ НЬХАНЙ
..........
Яonfig.status: creating tools/Makefile
config.status: creating include/autoconf.h
config.status: executing depfiles commands
4.make ГЮЙЮМВХБЮЕРЯЪ ЯКЕДСЧЫЕИ НЬХАЙНИ
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 `test -f 'http.c' || echo './'`http.c; \
        then mv -f ".deps/http.Tpo" ".deps/http.Po"; \
        else rm -f ".deps/http.Tpo"; exit 1; \
        fi
http.c: б ТСМЙЖХХ ▒httpAppendBody▓
http.c:650: ОПЕДСОПЕФДЕМХЕ: passing argument 2 of ▒icapRespModAddBodyData▓ discards qualifiers from pointer target type
http.c:662: ОПЕДСОПЕФДЕМХЕ: passing argument 2 of ▒icapRespModAddBodyData▓ discards qualifiers from pointer target type
http.c: б ТСМЙЖХХ ▒httpSendComplete▓
http.c:1152: ОПЕДСОПЕФДЕМХЕ: implicit declaration of function ▒storeClientUnregisterAbort▓
http.c:1160: НЬХАЙЮ: incompatible type for argument 2 of ▒storeCreateEntry▓
http.c:1160: НЬХАЙЮ: incompatible type for argument 3 of ▒storeCreateEntry▓
http.c:1160: НЬХАЙЮ: too few arguments to function ▒storeCreateEntry▓
make[3]: *** [http.o] нЬХАЙЮ 1
make[3]: Leaving directory `/usr/src/redhat/SOURCES/squid/src'
make[2]: *** [all-recursive] нЬХАЙЮ 1
make[2]: Leaving directory `/usr/src/redhat/SOURCES/squid/src'
make[1]: *** [all] нЬХАЙЮ 2
make[1]: Leaving directory `/usr/src/redhat/SOURCES/squid/src'
make: *** [all-recursive] нЬХАЙЮ 1

лНФЭ ВРН ОНОПЮБХРЭ Б http.c?

hz ()
Вы не можете добавлять комментарии в эту тему. Тема перемещена в архив.