Created attachment 146240 [details] update to 3.3.12 Patch to update www/squid33 to lastest version in 3.3 branch. Mark FS_COSS as broken. It's been experimental since birth and I couldn't manage to compile it anywhere. Mark ECAP as broken on FreeBSD10+. Here is info http://www.squid-cache.org/mail-archive/squid-users/201402/0338.html This release contains fix for detection pthread on FreeBSD 10. In general it led to activation some flags for clang which causes to fault during compilation. Make clang less strict about deprecations to let it compile (see the files/patch-configure). I hope this PR is solution for these PRs https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=184993 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=186379 (I know, it's closed)
Created attachment 146241 [details] update to 3.3.12 Here is patch
Don't know why, bu diff for files/patch-configure is not visible in bugzilla's attachment preview.
(In reply to timp87 from comment #2) > Don't know why, bu diff for files/patch-configure is not visible in > bugzilla's attachment preview. diff viewer malfunctions a lot, don't worry about it. how does bug 192980 relate to this patch?
(In reply to John Marino from comment #3) > (In reply to timp87 from comment #2) > > Don't know why, bu diff for files/patch-configure is not visible in > > bugzilla's attachment preview. > > > diff viewer malfunctions a lot, don't worry about it. > > > how does bug 192980 relate to this patch? It's has nothing to do I think. I don't understand the problem described in that PR
I think we'd better resolve bug 192980 first before updating the port. Even if resolve means invalid, but we haven't determined that the bug is invalid.
FYI: .if ${PORT_OPTIONS:MFS_COSS} BROKEN= FS_COSS does not compile If it's unconditionally broken on all platforms, just comment out the option I'm halfway considering doing the same thing with ECAP using OPTIONS_EXCLUDE= if FreeBSD 10+
(In reply to John Marino from comment #6) > FYI: .if ${PORT_OPTIONS:MFS_COSS} > BROKEN= FS_COSS does not compile > > > If it's unconditionally broken on all platforms, just comment out the option > I agree > I'm halfway considering doing the same thing with ECAP using > OPTIONS_EXCLUDE= if FreeBSD 10+ What if compiler is gcc and platform is FreeBSD 10?
(In reply to timp87 from comment #7) > > I'm halfway considering doing the same thing with ECAP using > > OPTIONS_EXCLUDE= if FreeBSD 10+ > > What if compiler is gcc and platform is FreeBSD 10? Right now, I proposed the same thing your patch is doing. I don't know if I like the idea of a different compiler depending on the options selected. I already thought about "USE_GCC=any" in this case but thought it was not a good idea.
Olli has some significant bug fixes to squid33 that he'd like to propose. We need to hole off on upgrading the version until those fixes are in. They affect options such as ECAP.
Created attachment 146275 [details] update to 3.3.13 plus rework The patch adopts the update to 3.3.12 Additional: - heavy lifted Makefile (where possible) - add hints with url's to bugs into Makefile - fix pkg-plist - remove FS_COSS from OPTIONS_DEFINE - patches to not install *.conf$ files (remove install instructions from Makefile.in) PS: I've tried OPTIONS_EXCLUDE for ECAP, but OPSYS is unknown before bsd.port.options.mk and after the include this instruction is useless, so pick up the BROKEN message. Please cross test on FreeBSD 10+ and current
(In reply to Olli Hauer from comment #10) > Created attachment 146275 [details] > update to 3.3.13 plus rework > > The patch adopts the update to 3.3.12 > > Additional: > - heavy lifted Makefile (where possible) > - add hints with url's to bugs into Makefile > - fix pkg-plist > - remove FS_COSS from OPTIONS_DEFINE > - patches to not install *.conf$ files (remove install instructions from > Makefile.in) > > PS: > I've tried OPTIONS_EXCLUDE for ECAP, but OPSYS is unknown before > bsd.port.options.mk and after the include this instruction is useless, so > pick up the BROKEN message. > > Please cross test on FreeBSD 10+ and current There is no part for files/patch-configure?
minor typo: "+ROKEN= FS_COSS does not compile"
timp97, do I understand that you think the patch is incomplete? I added takefu to the PR, I'd like to get his opinion on it as well. When you both nod, I'll move it to patch-ready
John, I guess timp87 means the fix to detect the clang/pthread issue mentioned on the squid-cache mailing list. http://www.squid-cache.org/mail-archive/squid-users/201402/0338.html I haven't found the snapshot archive with the patch on the squid-cache ftp's and also not hint via the bazaar webinterface. I will spend some time this evening, perhaps I can identify the fix by comparing squid-3.3 against squid-3.4.
The pthread thing should be fixed already: from Changelog: Changes to squid-3.3.12 (09 Mar 2014): - Regression Bug 3769: client_netmask not evaluated since Comm redesign - Bug 4026: Fix SSL and adaptation_access handling of aborted connections - Bug 3969: Fix credentials caching for Digest authentication - Bug 3806: Caching responses with Vary header - Fix umask default on crash report generated email - Fix pthread library detection on FreeBSD 10 - Avoid assertions on Range requests that trigger Squid-generated errors. This could explain why don't find a fix for something already fixed.
Look at my first message here. It explains what I want. Then look at the end of firstly provided patch by me(don't use visual diff, download it), it contains patch for port's patch - it adds to files/patch-configure a part to the end. Without this it won't compile under FreeBSD10
(In reply to timp87 from comment #16) > Look at my first message here. It explains what I want. Then look at the end > of firstly provided patch by me(don't use visual diff, download it), it > contains patch for port's patch - it adds to files/patch-configure a part to > the end. > Without this it won't compile under FreeBSD10 Replacing stuff like freebsd1* to freebsd1.* is not so important, but removing "-Werror" from clang flags is important
Created attachment 146382 [details] shar for 3.3.13 (In reply to Olli Hauer from comment #10) > Created attachment 146275 [details] > update to 3.3.13 plus rework Olli, that was for 3.3.12. squid 3.3.13 was released today http://squid-web-proxy-cache.1019090.n4.nabble.com/Squid-3-3-13-is-available-td4667413.html The main reason is CVE-2014-3609 : SQUID-2014:2 Denial of service in request processing That sould be mentioned is audit db (or how is it called?). I took your patch and made shar for 3.3.13. I also added a part to file/patch-configure which I talked about.
i'm relying on you guys to tell me when to commit this. if/when everyone is happy I'll run it through poudriere, and if that's fine, I'll commit it.
"shar for 3.3.13" looks good for me. Now where I see the configure changes, the FreeBSD >= 10 issue is clear (check for FreeBSD-1 with freebsd1* and FreeBSD >= 10 as OS )
ok, i'll test it now
ugh, it's a shar. shars are only for new ports (and maybe resurrecting dead ports), but you aren't supposed to use shars to update ports. I'll try to make do but follow the rule above in the future. It's actually written in the porter's handbook.
The shar also contained patch-*.orig files (!)
A commit references this bug: Author: marino Date: Wed Aug 27 21:55:31 UTC 2014 New revision: 366362 URL: http://svnweb.freebsd.org/changeset/ports/366362 Log: www/squid33: Upgrade version 3.3.11 => 3.3.13 Refactored the makefile again, added urls for known bugs in the makefile, Removed FS_COSS from options (broken everywhere). The new versions bring in fixes from upstream too. PR: 192983 Collaboration: timp87 and ohauer@ Changes: head/www/squid33/Makefile head/www/squid33/distinfo head/www/squid33/files/patch-configure head/www/squid33/files/patch-helpers__basic_auth__MSNT__Makefile.in head/www/squid33/files/patch-src__Makefile.in head/www/squid33/files/patch-tools__Makefile.in head/www/squid33/pkg-plist
somehow I still managed... It built cleanly. I hope it's a big improvement! I trust squid34 will be updated accordingly.
John, I'm sorry for the mess. Thanks a lot Olli and John!