Kalle Olavi Niemitalo <kon@iki.fi> writes: > Oliver Baltzer <racon@init.ca> writes: > >> Please, let me know if you are going to make a patch or if you have any >> questions. > > I think I'll try some time this week. I'll post if I succeed. I finally took a stab at applying the IPv6 changes to a more recent Squid. I didn't yet get anything I could even try to compile, but I learned something. Firstly, even though the IPv6 Squid is labeled as version 2.5.3ipv6.20030616-4, it is actually based on something older than the 2.5.STABLE3 release (which Debian labels 2.5.3). So diffing e.g. 2.5.3-1 to 2.5.3ipv6.20030616-4 will not produce a patch that would be beneficial to apply to newer versions. Instead, do this: cvs -z3 -d :pserver:anonymous@cvs.devel.squid-cache.org:/cvsroot/squid \ rdiff -u -kk -r Z-ipv6_merge_HEAD -r ipv6 squid Secondly, this patch does not apply cleanly to the 2.5.STABLE6 release. There are conflicts in 13 files out of 50 and fuzz in 6 others. The patch also tries modify src/recv-announce.c, which is included neither in the Debian squid_2.5.6-10 source tree nor in the upstream 2.5.STABLE6 tar.bz2. The file is however tagged with SQUID_2_5_STABLE6 at cvs.squid-cache.org. Apparently, the release tags in the CVS tree don't exactly match the actual releases. The next steps would be to resolve the syntactic conflicts and see if the program compiles and runs, but I don't think I'll have time for this before 2004-10-22.
Attachment:
pgpf5Z6HCoao3.pgp
Description: PGP signature