Bug 208380 - www/nginx patch to support 3rd-party upstream check module
Summary: www/nginx patch to support 3rd-party upstream check module
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Sergey A. Osokin
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-03-29 10:24 UTC by ganbold-freebsd
Modified: 2016-09-08 09:34 UTC (History)
0 users

See Also:
bugzilla: maintainer-feedback? (osa)


Attachments
patches to support 3rd-party upstream check module (2.93 KB, application/x-gzip)
2016-03-29 10:24 UTC, ganbold-freebsd
no flags Details
patch to support 3rd-party upstream check module (16.30 KB, patch)
2016-04-03 15:01 UTC, ganbold-freebsd
no flags Details | Diff
patch to support 3rd-party upstream check module in nginx-devel (16.66 KB, patch)
2016-04-12 13:19 UTC, ganbold-freebsd
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description ganbold-freebsd 2016-03-29 10:24:43 UTC
Created attachment 168751 [details]
patches to support 3rd-party upstream check module

Attached are patches to support 3rd-party upstream check module for nginx which supports upstream health check.

URL:

https://github.com/yaoweibin/nginx_upstream_check_module
Comment 1 Sergey A. Osokin freebsd_committer freebsd_triage 2016-04-03 14:26:42 UTC
Hi Ganbold,

could you please attach a text patch.

Thanks in advance.
Comment 2 ganbold-freebsd 2016-04-03 15:01:47 UTC
Created attachment 168928 [details]
patch to support 3rd-party upstream check module
Comment 3 Ganbold Tsagaankhuu freebsd_committer freebsd_triage 2016-04-03 15:16:56 UTC
Hi Sergey,

Text patch is attached.

thanks,

Ganbold
Comment 4 Sergey A. Osokin freebsd_committer freebsd_triage 2016-04-12 11:05:17 UTC
Dear Ganbold,

the patch looks pretty good, I'm ready to commit it to www/nginx.

Please note, www/nginx will be upgraded soon and all changes will be merged from www/nginx-devel to www/nginx.  In this case - is there any chance to see the patch with the same changes for www/nginx-devel?

Thanks.
Comment 5 ganbold-freebsd 2016-04-12 11:32:38 UTC
(In reply to Sergey A. Osokin from comment #4)

How soon will it be upgraded? In case of 1.9.x it looks like the patch needs to be updated. After upgrade I think we can update the patch for www/nginx.
Please let me know.
Comment 6 Sergey A. Osokin freebsd_committer freebsd_triage 2016-04-12 12:11:29 UTC
It'll be upgrade next 2-3 weeks.

I'd highly recommend to commit the support for upstream check module to the www/nginx-devel too.
Comment 7 ganbold-freebsd 2016-04-12 13:19:54 UTC
Created attachment 169238 [details]
patch to support 3rd-party upstream check module in nginx-devel
Comment 8 ganbold-freebsd 2016-04-12 13:20:33 UTC
Patch for nginx-devel is attached.

thanks,

Ganbold
Comment 9 Sergey A. Osokin freebsd_committer freebsd_triage 2016-04-12 21:58:01 UTC
Thanks for the patch.

I've reviewed them and I'd like to rename extra-patch files to fix:
o) pairs of underscore symbols to one;
o) one underscore symbol to dash symbol.
o) white spaces in patch for www/nginx-devel/Makefile

Please confirm.
Comment 10 ganbold-freebsd 2016-04-12 23:11:40 UTC
(In reply to Sergey A. Osokin from comment #9)

Yes, please go ahead and rename the patches.

thanks,
Comment 11 commit-hook freebsd_committer freebsd_triage 2016-04-13 01:20:40 UTC
A commit references this bug:

Author: osa
Date: Wed Apr 13 01:20:19 UTC 2016
New revision: 413165
URL: https://svnweb.freebsd.org/changeset/ports/413165

Log:
  Add third-party upstream check module.

  PR:	208380

Changes:
  head/www/nginx/Makefile
  head/www/nginx/distinfo
  head/www/nginx/files/extra-patch-ngx_http_upstream_fair_module.c
  head/www/nginx/files/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c
  head/www/nginx/files/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c
  head/www/nginx/files/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c
  head/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.c
  head/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.h
  head/www/nginx-devel/Makefile
  head/www/nginx-devel/distinfo
  head/www/nginx-devel/files/extra-patch-ngx_http_upstream_fair_module.c
  head/www/nginx-devel/files/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c
  head/www/nginx-devel/files/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c
  head/www/nginx-devel/files/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c
  head/www/nginx-devel/files/extra-patch-src-http-ngx_http_upstream_round_robin.c
  head/www/nginx-devel/files/extra-patch-src-http-ngx_http_upstream_round_robin.h
Comment 12 Sergey A. Osokin freebsd_committer freebsd_triage 2016-04-13 01:21:00 UTC
Committed, thanks!
Comment 13 commit-hook freebsd_committer freebsd_triage 2016-06-05 17:44:15 UTC
A commit references this bug:

Author: junovitch
Date: Sun Jun  5 17:44:04 UTC 2016
New revision: 416407
URL: https://svnweb.freebsd.org/changeset/ports/416407

Log:
  MFH: r412446 r412447 r412449 r412450 r412534 r412535 r412555 r412588 r412645
       r412858 r412862 r413165 r413379 r413380 r413662

  Apply CVE-2016-4450 patches to www/nginx and www/nginx-devel following a sync
  with r413662 from head before the major release updates to 1.10.x and 1.11.x
  and configuration change requirement brought about by dynamic module support.

  - Enable several vendor's modules to be in sync with vendor's
    original packages for some linux distros, please see
    http://nginx.org/en/linux_packages.html for details.
  - Upgrade nginx-devel from 1.9.12 to 1.9.15; remove needless vendor patches.

  Add/upgrade third-party modules:
  o) Upgrade third-party brotli module from 86998c6 to 2fc6f12.
  o) Add AWS proxy third-party module.
  o) Change the third-party http_auth_digest module location and upgrade it.
     Previous location no longer supported by developers.
  o) Upgrade third-party nchan (formerly http_push) module from 0.99.8 to 0.99.11.
  o) Enable vendor's http_realip module by default.
  o) Upgrade third-party njs module from 50fbb3b to c4a5f2b.
  o) Upgrade third-party tarantool module from 966f2f5 to 3599ba0.
  o) Add third-party upstream check module.
  o) Upgrade push from 0.99.11 to 0.99.12;
  o) Upgrade lua from 7410339 to d44f8e0;
  o) Upgrade shibboleth from 20150121 to 4f1119b.

  PR:		208499 203967 208380
  Security:	CVE-2016-4450
  Security:	https://vuxml.FreeBSD.org/freebsd/36cf7670-2774-11e6-af29-f0def16c5c1b.html
  Approved by:	ports-secteam (with hat)

Changes:
_U  branches/2016Q2/
  branches/2016Q2/www/nginx/Makefile
  branches/2016Q2/www/nginx/distinfo
  branches/2016Q2/www/nginx/files/extra-patch-ngx_http_tarantool-config
  branches/2016Q2/www/nginx/files/extra-patch-ngx_http_upstream_fair_module.c
  branches/2016Q2/www/nginx/files/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c
  branches/2016Q2/www/nginx/files/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c
  branches/2016Q2/www/nginx/files/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c
  branches/2016Q2/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.c
  branches/2016Q2/www/nginx/files/extra-patch-src-http-ngx_http_upstream_round_robin.h
  branches/2016Q2/www/nginx/files/patch-CVE-2016-4450
  branches/2016Q2/www/nginx-devel/Makefile
  branches/2016Q2/www/nginx-devel/distinfo
  branches/2016Q2/www/nginx-devel/files/extra-patch-ngx_http_tarantool-config
  branches/2016Q2/www/nginx-devel/files/extra-patch-ngx_http_upstream_fair_module.c
  branches/2016Q2/www/nginx-devel/files/extra-patch-src-http-modules-ngx_http_upstream_hash_module.c
  branches/2016Q2/www/nginx-devel/files/extra-patch-src-http-modules-ngx_http_upstream_ip_hash_module.c
  branches/2016Q2/www/nginx-devel/files/extra-patch-src-http-modules-ngx_http_upstream_least_conn_module.c
  branches/2016Q2/www/nginx-devel/files/extra-patch-src-http-ngx_http_upstream_round_robin.c
  branches/2016Q2/www/nginx-devel/files/extra-patch-src-http-ngx_http_upstream_round_robin.h
  branches/2016Q2/www/nginx-devel/files/patch-CVE-2016-4450
  branches/2016Q2/www/nginx-devel/files/patch-auto-make
  branches/2016Q2/www/nginx-devel/files/patch-perl-as-dynamic-module