svn commit: r512184 - in head/www/nginx-devel: . files

[Sergey A. Osokin]

On Fri, Sep 20, 2019 at 03:20:55PM +0200, Herbert J. Skuhra wrote:
> On Fri, Sep 20, 2019 at 12:29:08PM +0000, Sergey A. Osokin wrote:
> > On Thu, Sep 19, 2019 at 09:41:33PM +0200, Herbert J. Skuhra wrote:
> > > On Mon, 16 Sep 2019 22:38:21 +0200, "Sergey A. Osokin" wrote:
> > > > 
> > > > Author: osa
> > > > Date: Mon Sep 16 20:38:21 2019
> > > > New Revision: 512184
> > > > URL: https://svnweb.freebsd.org/changeset/ports/512184
> > > > 
> > > > Log:
> > > >   Add the following third-party modules:
> > > >   o) ip2location
> > > >   o) ip2proxy
> > > >   
> > > >   Add third-party slice_ahead feature.
> > > >   
> > > >   Update third-party passenger module to the latest release 6.0.3.
> > > >   
> > > >   Switch third-party lua module dependence from lang/luajit (2.0) to
> > > >   lang/luajit-openresty (2.1).
> > > >   
> > > >   Bump PORTREVISION.
> > > > 
> > > > Modified:
> > > >   head/www/nginx-devel/Makefile
> > > >   head/www/nginx-devel/Makefile.extmod
> > > >   head/www/nginx-devel/Makefile.options.desc
> > 
> > > >   head/www/nginx-devel/distinfo
> > > >   head/www/nginx-devel/files/extra-patch-passenger-build-nginx.rb
> > > >   head/www/nginx-devel/files/extra-patch-passenger-disable-telemetry
> > > 
> > > This commit is obviously wrong/incomplete:
> > > 
> > > 1. option HTTP_SLICE_AHEAD was added in wrong place
> > > 2. extra-patch-src_http_modules_ngx_http_slice_read_ahead.c is missing
> > 
> > Hi Herbert,
> > 
> > thanks for point me in.  The missing patch has been found and added
> > to the port.
> > Could you please explain what does it mean HTTP_SLICE_AHEAD in a wrong
> > place.
> 
> Hi Sergey,
> 
> thanks.
> 
> HTTP_SLICE_AHEAD is an external module but the option was added to
> "Modules that are part of the base nginx distribution".

Got it, Herbert, here is the patch.

--
Sergey
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 512305)
+++ Makefile	(working copy)
@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.17.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
@@ -70,9 +70,8 @@
 OPTIONS_GROUP_HTTPGRP= GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 	HTTP_CACHE HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC \
 	HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL HTTP_RANDOM_INDEX HTTP_REALIP \
-	HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SLICE_AHEAD \
-	HTTP_SSL HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 STREAM STREAM_SSL \
-	STREAM_SSL_PREREAD
+	HTTP_REWRITE HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL HTTP_STATUS \
+	HTTP_SUB HTTP_XSLT HTTPV2 STREAM STREAM_SSL STREAM_SSL_PREREAD
 
 # External modules (arrayvar MUST appear after devel_kit for build-dep)
 OPTIONS_GROUP_HTTPGRP+=	AJP AWS_AUTH BROTLI CACHE_PURGE CLOJURE CT DEVEL_KIT \
@@ -81,12 +80,12 @@
 	HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX \
 	HTTP_FOOTER HTTP_GEOIP2 HTTP_IP2LOCATION HTTP_IP2PROXY HTTP_JSON_STATUS \
 	HTTP_MOGILEFS HTTP_MP4_H264 HTTP_NOTICE HTTP_PUSH HTTP_PUSH_STREAM \
-	HTTP_REDIS HTTP_RESPONSE HTTP_SUBS_FILTER HTTP_TARANTOOL HTTP_UPLOAD \
-	HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK HTTP_UPSTREAM_FAIR \
-	HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR HTTP_ZIP ICONV LET LUA \
-	MEMC MODSECURITY MODSECURITY3 NAXSI NJS PASSENGER POSTGRES RDS_CSV \
-	RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH SLOWFS_CACHE \
-	SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY
+	HTTP_REDIS HTTP_RESPONSE HTTP_SLICE_AHEAD HTTP_SUBS_FILTER \
+	HTTP_TARANTOOL HTTP_UPLOAD HTTP_UPLOAD_PROGRESS HTTP_UPSTREAM_CHECK \
+	HTTP_UPSTREAM_FAIR HTTP_UPSTREAM_STICKY HTTP_VIDEO_THUMBEXTRACTOR \
+	HTTP_ZIP ICONV LET LUA MEMC MODSECURITY MODSECURITY3 NAXSI NJS PASSENGER \
+	POSTGRES RDS_CSV RDS_JSON REDIS2 RTMP SET_MISC SFLOW SHIBBOLETH \
+	SLOWFS_CACHE SMALL_LIGHT SRCACHE VOD VTS XSS WEBSOCKIFY
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \