Attachment 207360 Details for Bug 240460 – Updated patch for ip2location/ip2proxy

[patch] Updated patch for ip2location/ip2proxy

ip2locproxy.diff.txt (text/plain), 3.81 KB, created by Ryan Steinmetz on 2019-09-10 21:53:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ryan Steinmetz

Created: 2019-09-10 21:53:50 UTC

Size: 3.81 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 511698)
>+++ Makefile	(working copy)
>@@ -82,14 +82,14 @@
> 	ARRAYVAR DRIZZLE DYNAMIC_UPSTREAM ECHO ENCRYPTSESSION FASTDFS FORMINPUT \
> 	GRIDFS HEADERS_MORE HTTP_ACCEPT_LANGUAGE HTTP_AUTH_DIGEST HTTP_AUTH_KRB5 \
> 	HTTP_AUTH_LDAP HTTP_AUTH_PAM HTTP_DAV_EXT HTTP_EVAL HTTP_FANCYINDEX \
>-	HTTP_FOOTER HTTP_GEOIP2 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_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
> 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 \
>Index: Makefile.extmod
>===================================================================
>--- Makefile.extmod	(revision 511698)
>+++ Makefile.extmod	(working copy)
>@@ -108,6 +108,14 @@
> HTTP_GEOIP2_VARS=		DSO_EXTMODS+=geoip2
> HTTP_GEOIP2_LIB_DEPENDS=	libmaxminddb.so:net/libmaxminddb
> 
>+HTTP_IP2LOCATION_GH_TUPLE=	ip2location:ip2location-nginx:d47d248:ip2location
>+HTTP_IP2LOCATION_LIB_DEPENDS=	libIP2Location.so:net/ip2location
>+HTTP_IP2LOCATION_CONFIGURE_ON=	--add-module=${WRKSRC_ip2location}
>+
>+HTTP_IP2PROXY_GH_TUPLE=		ip2location:ip2proxy-nginx:d6fd05a:ip2proxy
>+HTTP_IP2PROXY_LIB_DEPENDS=	libIP2Proxy.so:net/ip2proxy
>+HTTP_IP2PROXY_CONFIGURE_ON=	--add-module=${WRKSRC_ip2proxy}
>+
> HTTP_JSON_STATUS_GH_TUPLE=	nginx-modules:ngx_http_json_status_module:1d2f303:json_status
> HTTP_JSON_STATUS_CONFIGURE_ON=	--add-module=${WRKSRC_json_status}
> 
>Index: Makefile.options.desc
>===================================================================
>--- Makefile.options.desc	(revision 511698)
>+++ Makefile.options.desc	(working copy)
>@@ -43,6 +43,8 @@
> HTTP_GUNZIP_FILTER_DESC=	Enable http_gunzip_filter module
> HTTP_GZIP_STATIC_DESC=		Enable http_gzip_static module
> HTTP_IMAGE_FILTER_DESC=		Enable http_image_filter module
>+HTTP_IP2LOCATION_DESC=		3rd party ip2location-nginx module
>+HTTP_IP2PROXY_DESC=		3rd party ip2proxy-nginx module
> HTTP_JSON_STATUS_DESC=		3rd party http_json_status module
> HTTP_MOGILEFS_DESC=		3rd party mogilefs module
> HTTP_MP4_DESC=			Enable http_mp4 module
>Index: distinfo
>===================================================================
>--- distinfo	(revision 511778)
>+++ distinfo	(working copy)
>@@ -137,3 +137,7 @@
> SIZE (tg123-websockify-nginx-module-e82d254_GH0.tar.gz) = 14378
> SHA256 (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 958bd8de773601d8d3138501cc4be0420f1c818a3987a70cc9c0023371e432cf
> SIZE (openresty-xss-nginx-module-v0.05_GH0.tar.gz) = 11477
>+SHA256 (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = ae45341c361fb4ab11f8415c5d85b51ea1aa1027f8ab4fa9524df2074080bb9c
>+SIZE (ip2location-ip2location-nginx-d47d248_GH0.tar.gz) = 5542
>+SHA256 (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 7b8df48216cd258d770b084b1768d6963a1ec850a748944f896098ce0fa0d993
>+SIZE (ip2location-ip2proxy-nginx-d6fd05a_GH0.tar.gz) = 4573

Actions: View | Diff

Attachments on bug 240460: 207338 | 207359 | 207360