Hi Yuri, Sorry to be a thorn in the flesh in this one.
Which source code were you applying this patch against? I applied this patch on the released squid-4.0.8.tar.xz and it doesn't apply cleanly for starters... Maybe I am doing it wrongly? Just doing patch < /path/to/patch wash@mail:~/ILI/Squid/4.x/squid-4.0.8$ patch < ../squid-4-14633.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |------------------------------------------------------------ |revno: 14633 |revision-id: squ...@treenet.co.nz-20160408073547-xtjco0mpai4lr920 |parent: chtsa...@users.sourceforge.net-20160407163610-yl8zzhc08l1ysv5f |committer: Amos Jeffries <squ...@treenet.co.nz> |branch nick: trunk |timestamp: Fri 2016-04-08 19:35:47 +1200 |message: | Fix shm_open error message after rev.14625 |------------------------------------------------------------ |# Bazaar merge directive format 2 (Bazaar 0.90) |# revision_id: squ...@treenet.co.nz-20160408073547-xtjco0mpai4lr920 |# target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ |# testament_sha1: c1983f6601c29e4d03f936e60ecee221a860f932 |# timestamp: 2016-04-08 07:51:00 +0000 |# source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk |# base_revision_id: chtsa...@users.sourceforge.net-20160407163610-\ |# yl8zzhc08l1ysv5f |# |# Begin patch |=== modified file 'src/ipc/mem/Segment.cc' |--- src/ipc/mem/Segment.cc 2016-04-03 23:41:58 +0000 |+++ src/ipc/mem/Segment.cc 2016-04-08 07:35:47 +0000 -------------------------- Patching file src/ipc/mem/Segment.cc using Plan A... Hunk #1 failed at 91. Hunk #2 succeeded at 105 (offset -4 lines). Hunk #3 succeeded at 121 (offset -4 lines). Hunk #4 succeeded at 151 (offset -1 lines). 1 out of 4 hunks failed--saving rejects to src/ipc/mem/Segment.cc.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- | |=== modified file 'src/ipc/mem/Segment.h' |--- src/ipc/mem/Segment.h 2016-03-24 17:02:25 +0000 |+++ src/ipc/mem/Segment.h 2016-04-08 07:35:47 +0000 -------------------------- Patching file src/ipc/mem/Segment.h using Plan A... Hunk #1 succeeded at 53. Hmm... Ignoring the trailing garbage. done Then when I compile, the compilation fails as follows (though without the patch the compilation succeeds): libtool: compile: clang++ -DHAVE_CONFIG_H -DDEFAULT_STATEDIR=\"/opt/squid-4/var/run/squid\" -I../.. -I../../include -I../../lib -I../../src -I../../include -I/usr/include -I/usr/include -I../../libltdl -I/usr/include -I/usr/local/include/libxml2 -I/usr/local/include/libxml2 -Werror -Qunused-arguments -Wno-deprecated-register -D_REENTRANT -g -O2 -march=native -std=c++11 -I/usr/local/include -MT mem/Pages.lo -MD -MP -MF mem/.deps/Pages.Tpo -c mem/Pages.cc -fPIC -DPIC -o mem/.libs/Pages.o libtool: compile: clang++ -DHAVE_CONFIG_H -DDEFAULT_STATEDIR=\"/opt/squid-4/var/run/squid\" -I../.. -I../../include -I../../lib -I../../src -I../../include -I/usr/include -I/usr/include -I../../libltdl -I/usr/include -I/usr/local/include/libxml2 -I/usr/local/include/libxml2 -Werror -Qunused-arguments -Wno-deprecated-register -D_REENTRANT -g -O2 -march=native -std=c++11 -I/usr/local/include -MT mem/Pages.lo -MD -MP -MF mem/.deps/Pages.Tpo -c mem/Pages.cc -o mem/Pages.o >/dev/null 2>&1 depbase=`echo mem/PageStack.lo | sed 's|[^/]*$|.deps/&|;s|\.lo$||'`; /bin/sh ../../libtool --tag=CXX --mode=compile clang++ -DHAVE_CONFIG_H -DDEFAULT_STATEDIR=\"/opt/squid-4/var/run/squid\" -I../.. -I../../include -I../../lib -I../../src -I../../include -I/usr/include -I/usr/include -I../../libltdl -I/usr/include -I/usr/local/include/libxml2 -I/usr/local/include/libxml2 -Werror -Qunused-arguments -Wno-deprecated-register -D_REENTRANT -g -O2 -march=native -std=c++11 -I/usr/local/include -MT mem/PageStack.lo -MD -MP -MF $depbase.Tpo -c -o mem/PageStack.lo mem/PageStack.cc && mv -f $depbase.Tpo $depbase.Plo libtool: compile: clang++ -DHAVE_CONFIG_H -DDEFAULT_STATEDIR=\"/opt/squid-4/var/run/squid\" -I../.. -I../../include -I../../lib -I../../src -I../../include -I/usr/include -I/usr/include -I../../libltdl -I/usr/include -I/usr/local/include/libxml2 -I/usr/local/include/libxml2 -Werror -Qunused-arguments -Wno-deprecated-register -D_REENTRANT -g -O2 -march=native -std=c++11 -I/usr/local/include -MT mem/PageStack.lo -MD -MP -MF mem/.deps/PageStack.Tpo -c mem/PageStack.cc -fPIC -DPIC -o mem/.libs/PageStack.o libtool: compile: clang++ -DHAVE_CONFIG_H -DDEFAULT_STATEDIR=\"/opt/squid-4/var/run/squid\" -I../.. -I../../include -I../../lib -I../../src -I../../include -I/usr/include -I/usr/include -I../../libltdl -I/usr/include -I/usr/local/include/libxml2 -I/usr/local/include/libxml2 -Werror -Qunused-arguments -Wno-deprecated-register -D_REENTRANT -g -O2 -march=native -std=c++11 -I/usr/local/include -MT mem/PageStack.lo -MD -MP -MF mem/.deps/PageStack.Tpo -c mem/PageStack.cc -o mem/PageStack.o >/dev/null 2>&1 depbase=`echo mem/Segment.lo | sed 's|[^/]*$|.deps/&|;s|\.lo$||'`; /bin/sh ../../libtool --tag=CXX --mode=compile clang++ -DHAVE_CONFIG_H -DDEFAULT_STATEDIR=\"/opt/squid-4/var/run/squid\" -I../.. -I../../include -I../../lib -I../../src -I../../include -I/usr/include -I/usr/include -I../../libltdl -I/usr/include -I/usr/local/include/libxml2 -I/usr/local/include/libxml2 -Werror -Qunused-arguments -Wno-deprecated-register -D_REENTRANT -g -O2 -march=native -std=c++11 -I/usr/local/include -MT mem/Segment.lo -MD -MP -MF $depbase.Tpo -c -o mem/Segment.lo mem/Segment.cc && mv -f $depbase.Tpo $depbase.Plo libtool: compile: clang++ -DHAVE_CONFIG_H -DDEFAULT_STATEDIR=\"/opt/squid-4/var/run/squid\" -I../.. -I../../include -I../../lib -I../../src -I../../include -I/usr/include -I/usr/include -I../../libltdl -I/usr/include -I/usr/local/include/libxml2 -I/usr/local/include/libxml2 -Werror -Qunused-arguments -Wno-deprecated-register -D_REENTRANT -g -O2 -march=native -std=c++11 -I/usr/local/include -MT mem/Segment.lo -MD -MP -MF mem/.deps/Segment.Tpo -c mem/Segment.cc -fPIC -DPIC -o mem/.libs/Segment.o mem/Segment.cc:96:22: error: too few arguments to function call, single argument 'err' was not specified if (!createFresh() && errno == EEXIST) { ~~~~~~~~~~~ ^ ../../src/ipc/mem/Segment.h:56:5: note: 'createFresh' declared here bool createFresh(int &err); ^ mem/Segment.cc:98:21: error: too few arguments to function call, single argument 'err' was not specified createFresh(); ~~~~~~~~~~~ ^ ../../src/ipc/mem/Segment.h:56:5: note: 'createFresh' declared here bool createFresh(int &err); ^ mem/Segment.cc:108:9: error: use of undeclared identifier 'xerrno' xerrno = errno; ^ mem/Segment.cc:110:66: error: use of undeclared identifier 'xerrno' debugs(54, 5, "ftruncate " << theName << ": " << xstrerr(xerrno)); ^ ../../src/Debug.h:107:21: note: expanded from macro 'debugs' _dbo << CONTENT; \ ^ mem/Segment.cc:112:45: error: use of undeclared identifier 'xerrno' theName.termedBuf(), xstrerr(xerrno)); ^ 5 errors generated. *** Error code 1 Stop. make[3]: stopped in /usr/home/wash/ILI/Squid/4.x/squid-4.0.8/src/ipc *** Error code 1 Stop. make[2]: stopped in /usr/home/wash/ILI/Squid/4.x/squid-4.0.8/src *** Error code 1 Stop. make[1]: stopped in /usr/home/wash/ILI/Squid/4.x/squid-4.0.8/src *** Error code 1 Stop. make: stopped in /usr/home/wash/ILI/Squid/4.x/squid-4.0.8 Okay, I know I am being a bug here myself since I am focused on 3.5 now more than 4.x but I also like giving the little feedback I can from these FreeBSD servers I have:-) On 8 April 2016 at 17:19, Yuri Voinov <yvoi...@gmail.com> wrote: > > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA256 > > Seems fixed. > > http://bugs.squid-cache.org/show_bug.cgi?id=4486#c2 > > 08.04.16 18:05, Amos Jeffries пишет: > > On 8/04/2016 10:28 p.m., Odhiambo Washington wrote: > >> Hello Yuri, > >> > >> Thanks, but this patch is for squid-4.0.8, right?? > >> > > > > Yes the patch in that bug report is specific to the latest 4.0 snapshot, > > which Yuri is running. > > > > As Alex mentioned the errno usage in Squid was a bit wrong. The latest > > 4.0 have a patch to fix that, which is causing Yuri's problem. Your 3.5 > > issue may or may not be related. But we wont know until after Yuri > > applies that patch and checks the results. > > > > Amos > > > > _______________________________________________ > > squid-users mailing list > > squid-users@lists.squid-cache.org > > http://lists.squid-cache.org/listinfo/squid-users > > -----BEGIN PGP SIGNATURE----- > Version: GnuPG v2 > > iQEcBAEBCAAGBQJXB74GAAoJENNXIZxhPexGwkwH/ipdtdS23EuZHIQHWEN7DeSM > aJ+b1lhRb+052wbL1vx8uyvhwGf++QVZcvFTGcxwFN0yQ1EaN1b1tE6IYlosG8IC > 1rCOkARyZnyLK0MZKqvajrv4RZMR9CAvcRspv7DftQwS/2/h2uhnakc2PZYKBSUO > eF+hkxjUq2bSySY0sQ6tMTCr/U5x9IKzpg21VEE2tnn2S1HujnAEQ/C7pyi1ws7U > SXyqQBOVr25wxQq3AZMg5Sk6uZ7pSF02soCaIon7SeBdx6K+eWTngg9/t1Rn5zit > EGSrVLdEHsVFID/y5PsDMylpy4TwL+m0VCWSPbwYDGM+rp3tikfU/XAorFMR79M= > =mVL9 > -----END PGP SIGNATURE----- > > > _______________________________________________ > squid-users mailing list > squid-users@lists.squid-cache.org > http://lists.squid-cache.org/listinfo/squid-users > > -- Best regards, Odhiambo WASHINGTON, Nairobi,KE +254 7 3200 0004/+254 7 2274 3223 "Oh, the cruft."
_______________________________________________ squid-users mailing list squid-users@lists.squid-cache.org http://lists.squid-cache.org/listinfo/squid-users
