Bug 224000
| Summary: | www/nginx: Update brotli module | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Bernard Spil <brnrd> | ||||||
| Component: | Individual Port(s) | Assignee: | Jochen Neumeister <joneum> | ||||||
| Status: | Closed FIXED | ||||||||
| Severity: | Affects Some People | CC: | brnrd, joneum, kidon, osa | ||||||
| Priority: | --- | Keywords: | needs-qa, patch | ||||||
| Version: | Latest | Flags: | bugzilla:
maintainer-feedback?
(joneum) |
||||||
| Hardware: | Any | ||||||||
| OS: | Any | ||||||||
| Attachments: |
|
||||||||
|
Description
Bernard Spil
2017-11-30 20:26:01 UTC
Upstream patch here https://github.com/eustas/ngx_brotli/pull/1 Created attachment 188434 [details]
svn diff for www/nginx
Updated with upstreamed patch. Cleaner.
Hi Bernard, thanks for the patch. I think we can simplify this update with the 9891a98811a5d301041298a6507de8acc498e52a commit, committed as the https://github.com/google/ngx_brotli/pull/63/commits pull request. I'd recommend to add the patch as a third-party patch for the ${PATCHDIR} of the www/nginx and www/nginx-devel ports. Hi Sergey, That patch is indeed the same, comes from the same fork. That doesn't solve the issue with building against an external brotli. Bernard. (In reply to Sergey A. Osokin from comment #3) The pull request was abandoned https://github.com/google/ngx_brotli/pull/63#issuecomment-348463499 suggest we take the fork. Otherwise you'll have to provide the old brotli snapshot in-source in the tree for the module to use. A commit references this bug: Author: joneum Date: Fri Dec 1 22:52:28 UTC 2017 New revision: 455319 URL: https://svnweb.freebsd.org/changeset/ports/455319 Log: www/nginx: Update brotli module - Switch to fork that uses new brotli ABI The upstream brotli module hasn't been updated for over a year even though it's been broken for over a year with later brotli releases. There's a fork that does update which uses the new brotli abi. This patch is based on the fork. Requires some patching to the config file as it depends on an old upstream brotli snapshot to be in the src dir. PR: 224000 Reported by: brnrd Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D13319 Changes: head/www/nginx/Makefile head/www/nginx/distinfo head/www/nginx/files/extra-patch-brotli_config Patching failes:
===> Patching for nginx-1.12.2_2,2
===> Applying extra patch /usr/ports/www/nginx/files/extra-patch-brotli_config
No file to patch. Skipping...
3 out of 3 hunks ignored--saving rejects to ../ngx_brotli-9891a98/config.rej
Can't create ../ngx_brotli-9891a98/config.rej, output is in /tmp/patchr8OdL4ys32T: No such file or directory
*** Error code 1
Stop.
make: stopped in /usr/ports/www/nginx
=>> Cleaning up wrkdir
===> Cleaning for nginx-1.12.2_2,2
build of www/nginx | nginx-1.12.2_2,2 ended at Sat Dec 2 19:17:00 CET 2017
build time: 00:00:05
!!! build failure encountered !!!
The updated port uses a newer commit hash than the one that was in the patch here. The newer commit hash includes the fix that allows building with an external libbrotli. Checking at the moment, but it seems safe to just remove files/extra-patch-brotli_config A commit references this bug: Author: brnrd Date: Sun Dec 3 09:48:02 UTC 2017 New revision: 455397 URL: https://svnweb.freebsd.org/changeset/ports/455397 Log: www/nginx: Unbreak brotli option - The used commit hash includes the patch PR: 224000 Reported by: Philipp <kidon posteo de> Changes: head/www/nginx/Makefile head/www/nginx/files/extra-patch-brotli_config For the record. After submitting the patch here, I discovered that the author of the fork (eustas) is the maintainer of the brotli module for google. (In reply to Bernard Spil from comment #8) Removing the patch from the Makefile solves the issue. A commit references this bug: Author: osa Date: Tue Dec 5 02:09:22 UTC 2017 New revision: 455560 URL: https://svnweb.freebsd.org/changeset/ports/455560 Log: Switch to fork that uses new brotli ABI. Thanks to: Evgenii Kliuchnikov <eustas@google.com> PR: 224000 While I'm here add CONFLICTS_INSTALL and PORTSCOUNT. Bump PORTREVISION. Changes: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo |