Opened 3 years ago

Closed 3 years ago

#67407 closed defect (fixed)

nghttp2: patching fails for 'src/shrpx_client_handler.cc'

Reported by: kickingvegas (Charles Choi) Owned by: Schamschula (Marius Schamschula)
Priority: Normal Milestone:
Component: ports Version: 2.8.1
Keywords: Cc: mascguy (Christopher Nielsen)
Port: nghttp2

Description (last modified by mascguy (Christopher Nielsen))

nghttp2 failing to be patched. Message below. 

:info:patch --->  Applying patch-src-shrpx_client_handler.cc.diff
:info:patch patching file 'src/shrpx_client_handler.cc'
:info:patch 2 out of 3 hunks failed--saving rejects to 'src/shrpx_client_handler.cc.rej'

Attachments (1)

main.log​ (13.2 KB) - added by kickingvegas (Charles Choi) 3 years ago.
main.log file generated from attempt to patch

Download all attachments as: .zip

Change History (3)

Changed 3 years ago by kickingvegas (Charles Choi)

Attachment: main.log​ added

main.log file generated from attempt to patch

comment:1 Changed 3 years ago by mascguy (Christopher Nielsen)

Cc: mascguy added
Description: modified (diff)
Owner: set to Schamschula
Status: new → assigned
Summary: nghttp2 failing to be patched → nghttp2: patching fails for 'src/shrpx_client_handler.cc'

Confirmed: I'm seeing similar failures locally, using the latest updates: 

--->  Applying patch-src-shrpx_client_handler.cc.diff
patching file src/shrpx_client_handler.cc
Hunk #1 succeeded at 1150 (offset 170 lines).
Hunk #2 FAILED at 1206.
Hunk #3 FAILED at 1278.
2 out of 3 hunks FAILED -- saving rejects to file src/shrpx_client_handler.cc.rej

comment:2 Changed 3 years ago by Schamschula (Marius Schamschula)

Resolution: → fixed
Status: assigned → closed

Unfortunately, the source file was rearranged. Adding the new hunks to the existing patch file had the hunks out of order.

Fixed in ​https://github.com/macports/macports-ports/commit/8fc175fa5a029b8983445c5094003642b5136c3a

Note: See TracTickets for help on using tickets.