Created attachment 147279 [details] SVN diff same 146878 content, but load from file, not paste Last commit intends to add sys/types.h for FreeBSD 8.4. However, the trick is over-played. "#ifdef SO_ACCEPT... " location of the patch file has problem, which causes the sys/types is not included finally. In the original test patch on 8.4, #ifdef SO_ACCEPTFILTER is placed at the end of #include section. This helps to pass the test because SO_ACCEPTFILTER is defined in sys/socket.h and the socket.h is included before. In such case, sys/types.h is included. When committing and generate the diff for SVN, I adjust its location. When #ifdef SO_ACCEPTFILTER listed before socket.h, this test return false. Then, the types.h will not included. Overall, it is not necessary to use this test, and sys/types.h can be include more blindly.
Created attachment 147281 [details] svn diff
Created attachment 147282 [details] final patch file looks like this
Created attachment 147283 [details] svn diff
the diff link does not display 2nd file correctly, ODD!
*** Bug 193614 has been marked as a duplicate of this bug. ***
Am I right with the assumption that https://bugs.freebsd.org/bugzilla/attachment.cgi?id=147283 (svn diff from 2014-09-13 18:31 UTC, the last diff) is the one, you'd like to see applied? Are the others obosolete?
(In reply to Marcus von Appen from comment #6) > Am I right with the assumption that > https://bugs.freebsd.org/bugzilla/attachment.cgi?id=147283 (svn diff from > 2014-09-13 18:31 UTC, the last diff) is the one, you'd like to see applied? > Are the others obsolete? Yes. 147283 is the one. The other attachments are there because when I loaded first diff, it does not show me the patch-evhtp.c file diff.
Thanks for clarifying. The patch looks good, moving to Patch Ready.
(In reply to Marcus von Appen from comment #8) > Thanks for clarifying. The patch looks good, moving to Patch Ready. Thank you for your service and efforts.
Hi, Your patch fails to apply to 'files/patch-evhtp.c' in revision 368121. Can you please update your ports, create and test new diff and upload it?
Okay. Will post in an hour.
Created attachment 147816 [details] re-gen svn diff Not sure what happens for patching failure. The method I did is as same as last time expect the version maybe: 570 svn co https://svn0.us-west.FreeBSD.org/ports/head/www/libevhtp@368121 571 cd libevhtp 572 patch -p0 -i ../libevhtp-1.2.9_2.diff $ patch -p0 -i ../libevhtp-1.2.9_2.diff Hmm... Looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: Makefile |=================================================================== |--- Makefile (revision 369567) |+++ Makefile (working copy) -------------------------- Patching file Makefile using Plan A... Hunk #1 succeeded at 2. Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -------------------------- |Index: files/patch-evhtp.c |=================================================================== |--- files/patch-evhtp.c (revision 369567) |+++ files/patch-evhtp.c (working copy) -------------------------- Patching file files/patch-evhtp.c using Plan A... Hunk #1 succeeded at 1. done Please let me whether this patch works. Thank you.
A commit references this bug: Author: robak Date: Wed Oct 1 13:14:11 UTC 2014 New revision: 369725 URL: https://svnweb.freebsd.org/changeset/ports/369725 Log: www/libevhtp: fix build for 8.4 systems PR: 193615 Submitted by: Jingfeng Yan <yan_jingfeng@yahoo.com> Approved by: mentors (implicit) Changes: head/www/libevhtp/Makefile head/www/libevhtp/files/patch-evhtp.c
Committed, thanks for your work!