pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/nginx Changes with nginx 1.12.1
details: https://anonhg.NetBSD.org/pkgsrc/rev/3a4530e205fc
branches: trunk
changeset: 365706:3a4530e205fc
user: adam <adam%pkgsrc.org@localhost>
date: Sun Jul 23 21:08:18 2017 +0000
description:
Changes with nginx 1.12.1
*) Security: a specially crafted request might result in an integer
overflow and incorrect processing of ranges in the range filter,
potentially resulting in sensitive information leak (CVE-2017-7529).
PkgSrc:
*) Updated external modules
*) Added RTMP module (Media Streaming Server)
diffstat:
www/nginx/Makefile | 5 +--
www/nginx/Makefile.common | 13 ++++----
www/nginx/distinfo | 66 ++++++++++++++++++++--------------------------
www/nginx/options.mk | 50 +++++++++++++++++++++--------------
4 files changed, 67 insertions(+), 67 deletions(-)
diffs (278 lines):
diff -r e5ff7f13574c -r 3a4530e205fc www/nginx/Makefile
--- a/www/nginx/Makefile Sun Jul 23 21:05:21 2017 +0000
+++ b/www/nginx/Makefile Sun Jul 23 21:08:18 2017 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.72 2017/06/29 12:20:05 fhajny Exp $
+# $NetBSD: Makefile,v 1.73 2017/07/23 21:08:18 adam Exp $
-DISTNAME= nginx-1.12.0
+DISTNAME= nginx-1.12.1
MAINTAINER= joerg%NetBSD.org@localhost
-PKGREVISION= 2
.include "../../www/nginx/Makefile.common"
diff -r e5ff7f13574c -r 3a4530e205fc www/nginx/Makefile.common
--- a/www/nginx/Makefile.common Sun Jul 23 21:05:21 2017 +0000
+++ b/www/nginx/Makefile.common Sun Jul 23 21:08:18 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2017/06/29 12:20:05 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.11 2017/07/23 21:08:18 adam Exp $
# used by www/nginx/Makefile
# used by www/nginx-devel/Makefile
@@ -59,9 +59,9 @@
.for file in ${EGFILES}
CONF_FILES+= ${EGDIR}/conf/${file} ${PKG_SYSCONFDIR}/${file}
-. if !empty(PKG_OPTIONS:Mnaxsi)
+. if !empty(PKG_OPTIONS:Mnaxsi)
CONF_FILES+= ${EGDIR}/conf/naxsi_core.rules ${PKG_SYSCONFDIR}/naxsi_core.rules
-. endif
+. endif
.endfor
RCD_SCRIPTS= nginx
@@ -75,9 +75,9 @@
BUILD_TARGET= build
SUBST_CLASSES+= prefix
-SUBST_STAGE.prefix+= pre-configure
-SUBST_FILES.prefix+= auto/lib/pcre/conf
-SUBST_SED.prefix+= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_STAGE.prefix= pre-configure
+SUBST_FILES.prefix= auto/lib/pcre/conf
+SUBST_SED.prefix= -e 's,@PREFIX@,${PREFIX},g'
SUBST_CLASSES+= paths
SUBST_STAGE.paths= pre-configure
@@ -119,7 +119,6 @@
${DESTDIR}${PERL5_INSTALLVENDORARCH}
.endif
-
.include "../../devel/zlib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
.include "../../www/nginx/Makefile.cflags"
diff -r e5ff7f13574c -r 3a4530e205fc www/nginx/distinfo
--- a/www/nginx/distinfo Sun Jul 23 21:05:21 2017 +0000
+++ b/www/nginx/distinfo Sun Jul 23 21:08:18 2017 +0000
@@ -1,49 +1,41 @@
-$NetBSD: distinfo,v 1.56 2017/05/02 12:28:31 fhajny Exp $
+$NetBSD: distinfo,v 1.57 2017/07/23 21:08:18 adam Exp $
-SHA1 (array-var-nginx-module-0.04.tar.gz) = 1fd3bdd05c2d1d7667ed6f7baa612ddf7f630df3
-RMD160 (array-var-nginx-module-0.04.tar.gz) = a751a2ce87dcfb88d072779097b4df9f42a415e4
-SHA512 (array-var-nginx-module-0.04.tar.gz) = a45905338d2fdac002eaa43f7bff1fa48edcdcf9299de5c47725c2f6d86830f390fbdefc0ebe7492222e53de113439ea754ce63e20dc0245cf82e3247bb855f2
-Size (array-var-nginx-module-0.04.tar.gz) = 10777 bytes
-SHA1 (echo-nginx-module-0.59.tar.gz) = 83cedd03405e86dde573d5c90a24ac6d7bf25ad5
-RMD160 (echo-nginx-module-0.59.tar.gz) = 2caa40d531c0e19f0cdaa93c854e169f8f9375a2
-SHA512 (echo-nginx-module-0.59.tar.gz) = 803c431da00160f62ee98e126d244fb97b2d9dca08137daabf55504f012598f8e2c689841c2e8bfced5f07ce24c46933c49b3feffc09ca0b5f07dc10e34546ee
-Size (echo-nginx-module-0.59.tar.gz) = 52703 bytes
-SHA1 (encrypted-session-nginx-module-0.05.tar.gz) = 0d96ec039f98fae95ce315946bd4ad12128a426c
-RMD160 (encrypted-session-nginx-module-0.05.tar.gz) = 2e8f92d1841c9352cf9c2c775565a60cb840d2ff
-SHA512 (encrypted-session-nginx-module-0.05.tar.gz) = eb11560945f614b110034a7fc461a23057cd8fdc50af7abaaec00fb4991c4dfec25ddfc56d3458de5bd601f0d9990dd235605432d46c5a1852be2f69317a5761
-Size (encrypted-session-nginx-module-0.05.tar.gz) = 10462 bytes
+SHA1 (array-var-nginx-module-0.05.tar.gz) = c69fac77814947009ab783a471783b3c95a63a26
+RMD160 (array-var-nginx-module-0.05.tar.gz) = 89bd4efc04864e3e90781588a337338951ec8733
+SHA512 (array-var-nginx-module-0.05.tar.gz) = 7c9fa9b76bc7cd2473ceae6d5ffb8de26993be9293ea967908d6c4550e086affa7016df4c936fb0b79f1142dc0aa1a5f2058d417e6433b5a3497a45d7e866e84
+Size (array-var-nginx-module-0.05.tar.gz) = 11280 bytes
+SHA1 (encrypted-session-nginx-module-0.06.tar.gz) = 4a95344a16abb34ffd4913b37b2651372abb046d
+RMD160 (encrypted-session-nginx-module-0.06.tar.gz) = b42990e6aae92b1bfe65d10c4f87495b405b3ba2
+SHA512 (encrypted-session-nginx-module-0.06.tar.gz) = 60e3531c7f35c9f19dd1e78d3cad9db6ea1a89ba6610a8a94491fcc54e4d4db46c92c90de31e05a693069656caf27c8707408b90212e80d93559486fbfe445c6
+Size (encrypted-session-nginx-module-0.06.tar.gz) = 11128 bytes
SHA1 (form-input-nginx-module-0.12.tar.gz) = 03d3befb5ecc6aba5f4f871d18c490e206906022
RMD160 (form-input-nginx-module-0.12.tar.gz) = 954f13e7ef7afe0d859b543a57482c3dbdf33ced
SHA512 (form-input-nginx-module-0.12.tar.gz) = 1c5c5ab74156cac09da44a2dcdd84f7c03c9919a23a847e63613e00e3781ecd73d5ad12446174b4fdef9d064257a31570a8dbcccc00d8266f7048e3dcde0362e
Size (form-input-nginx-module-0.12.tar.gz) = 11090 bytes
-SHA1 (headers-more-nginx-module-0.30.tar.gz) = a188a399f3e365a0831585a9d7aa0e6ed1a75f0d
-RMD160 (headers-more-nginx-module-0.30.tar.gz) = 68fc349ccf41b8755d75a7415d1ae968665f1593
-SHA512 (headers-more-nginx-module-0.30.tar.gz) = 378f2c4b4fbf580e59c8ad3ef5fcb617e4669b7b506a0ae87e4e0bc920d34e16fe55565e48dd57e7b6c37ae8b407646ca64f5d84a2fbbe2d41d719c7643c1a82
-Size (headers-more-nginx-module-0.30.tar.gz) = 27793 bytes
-SHA1 (lua-nginx-module-0.10.5.tar.gz) = a33590654c0624c45eb64a2f1443977ab7fa8ebe
-RMD160 (lua-nginx-module-0.10.5.tar.gz) = 0117c85d034f7424f0fbf29209fb0a39c61fa668
-SHA512 (lua-nginx-module-0.10.5.tar.gz) = a02b8614fdcd063b1087a3114f05402c707343ff3bceabaca1fb98531ba30edea1a525fc45e2f5a49ff155de8d6f9e1155e8870e463476da5703acfd5f8fc3fc
-Size (lua-nginx-module-0.10.5.tar.gz) = 579793 bytes
-SHA1 (naxsi-0.55.3.tar.gz) = 93c2be1f50e5e86a44c54ee02fc6a6faca16707f
-RMD160 (naxsi-0.55.3.tar.gz) = 45dcedc7961e487c2c659064abdeaf5b91dc75d2
-SHA512 (naxsi-0.55.3.tar.gz) = 9e8f41a5cd1342cc9b8aa334a603842d14a256aab1f4a21205bb1278aecbb0c49e39c889d8113a5b41aad2efeaa2ed9f11cba6929173f50add91f54c4c59c8a0
-Size (naxsi-0.55.3.tar.gz) = 187416 bytes
-SHA1 (nginx-1.12.0.tar.gz) = 40733c030d0096fe56513c0a4da65c682ca0a18b
-RMD160 (nginx-1.12.0.tar.gz) = e9c61e3f3d4b257a579e7a0d8a9a6da42b4f1a7e
-SHA512 (nginx-1.12.0.tar.gz) = e2e930b61491d91090090d4716740895fc7812e8e266c427ac2b40c5a70493150e5c81e769c6b7563baf5f0e15b32fae8f2b11fd5699e468e1cc40706defb8ee
-Size (nginx-1.12.0.tar.gz) = 980831 bytes
-SHA1 (nginx_http_push_module-0.731.tar.gz) = 353f3ef3d013edfcc78ddba0237a9ce7dca633b4
-RMD160 (nginx_http_push_module-0.731.tar.gz) = d35d7138d3b4dd20076b1026c420f03c68177f99
-SHA512 (nginx_http_push_module-0.731.tar.gz) = b95e6e88236d920e18c927a5bdf7d84210ba34b234e7c20ba09d114337a4494535c94c7e84926e5479b23d4eba4e2f1db0a3e7d8b017c9907a4a824cd25098d8
-Size (nginx_http_push_module-0.731.tar.gz) = 50346 bytes
+SHA1 (headers-more-nginx-module-0.32.tar.gz) = aadb7f0b6c5b5b9cae2af72984e03dc2fbf3fecb
+RMD160 (headers-more-nginx-module-0.32.tar.gz) = a0fd69817659321c2d51d9143de413e43cb049b4
+SHA512 (headers-more-nginx-module-0.32.tar.gz) = e42582b45c3111de3940bbeb67ce161aca2d55adcfb00c61c12256fa0e36221d38723013f36edbcf6d1b520f8dfb49d4657df8a956e66d36e68425afad382bd1
+Size (headers-more-nginx-module-0.32.tar.gz) = 28033 bytes
+SHA1 (nginx-1.12.1.tar.gz) = 71000022267589f50e83b0d6743923c1b7e64238
+RMD160 (nginx-1.12.1.tar.gz) = 2763d528651e383a2b8dd391e3ba68a1813d9951
+SHA512 (nginx-1.12.1.tar.gz) = 3a2ad2a559b366dda92dd58c0fe40ee84dd60a3eaf72071454110e032c3e9a03f2a63b28fe3a615b527950521eeb533c687a2cc4c87524e1d8f3a0a5f043fdb6
+Size (nginx-1.12.1.tar.gz) = 981093 bytes
+SHA1 (nginx-rtmp-module-1.2.0.tar.gz) = f22b89944c93cdd8a3e6e5632ace54013df5c7ff
+RMD160 (nginx-rtmp-module-1.2.0.tar.gz) = 851b9570e4afd85acb4945772a8b46f298336892
+SHA512 (nginx-rtmp-module-1.2.0.tar.gz) = 8965d9bee91a46375516ccd012d1c43cd23f15c0630d11ed01472b9a84504574b476f22c5584f43c972a8f923e9ae025b9b60c64aace0ed159c7279bcbd376c8
+Size (nginx-rtmp-module-1.2.0.tar.gz) = 519895 bytes
+SHA1 (nginx_http_push_module-1.1.7.tar.gz) = ece7090a54140f81bb5bc8ae3dc3ea21f241b078
+RMD160 (nginx_http_push_module-1.1.7.tar.gz) = e56ada4758b6018521c763a25291eda98dfcbf8c
+SHA512 (nginx_http_push_module-1.1.7.tar.gz) = 1e9b029912ef6e89dba8e3aed57d50848b52fbeb1077d965ca39aea14c2b34c11092ee53db47fb1df9e5adaf466f849c5a33cade881fddb420c1a036bc659d4b
+Size (nginx_http_push_module-1.1.7.tar.gz) = 608690 bytes
SHA1 (ngx_devel_kit-0.3.0.tar.gz) = b556d068db23037be30436af559795f45dd93c67
RMD160 (ngx_devel_kit-0.3.0.tar.gz) = beb2736eb06e8e26f60643623553789346f653da
SHA512 (ngx_devel_kit-0.3.0.tar.gz) = 558764c9be913a4f61d0e277d07bf3c272e1ce086b3fadb85b693a7e92805cd9fca4da7a8d29c96e53fc0d23b331327d3b2561ff61f19d2330e7d5d35ac7d614
Size (ngx_devel_kit-0.3.0.tar.gz) = 66455 bytes
-SHA1 (set-misc-nginx-module-0.30.tar.gz) = a56b4d9bd33df2117803c93e1edde8b8bcd6e507
-RMD160 (set-misc-nginx-module-0.30.tar.gz) = 6eec9e0828e4ef6339ecc5e53bf4580cf1e18fc3
-SHA512 (set-misc-nginx-module-0.30.tar.gz) = f081fc7e8e03f1a61b665d8798999f14d6516c317a039e35635f6368188f73a583c3320a5d41f000868b87e5c78e4796168e9d3d3a68325f3c642bf5b3458e2e
-Size (set-misc-nginx-module-0.30.tar.gz) = 28584 bytes
+SHA1 (set-misc-nginx-module-0.31.tar.gz) = 181b04a9264dd503de4c7d80ccc240e80c85b071
+RMD160 (set-misc-nginx-module-0.31.tar.gz) = bba92dfdfb63f8f654e7546a8f476221a7aa95bd
+SHA512 (set-misc-nginx-module-0.31.tar.gz) = c853b041cecc3521f888be3d0483c6cf23d239259ac4f5d35b10d4483b0fb06d1d22060adedcf6605b220d99f9051faf300d06989736d510b4486f943d3a675e
+Size (set-misc-nginx-module-0.31.tar.gz) = 29359 bytes
SHA1 (patch-aa) = 47f0c19b47b115f00ea6e9432d5bb12058c3bc1c
SHA1 (patch-ab) = 7d126a4372aa8575ef01a4bfd9aec9898861c763
SHA1 (patch-auto_lib_pcre_conf) = 500f16808c07ae2fd4016dd662b6f1b0b1efbb91
diff -r e5ff7f13574c -r 3a4530e205fc www/nginx/options.mk
--- a/www/nginx/options.mk Sun Jul 23 21:05:21 2017 +0000
+++ b/www/nginx/options.mk Sun Jul 23 21:08:18 2017 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: options.mk,v 1.40 2017/07/09 09:20:31 alnsn Exp $
+# $NetBSD: options.mk,v 1.41 2017/07/23 21:08:18 adam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.nginx
PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 luajit mail-proxy memcache naxsi \
pcre push realip ssl sub uwsgi image-filter \
debug status nginx-autodetect-cflags echo \
set-misc headers-more array-var encrypted-session \
- form-input perl gzip http2 auth-request
+ form-input perl gzip http2 auth-request rtmp
PKG_OPTIONS_LEGACY_OPTS+= v2:http2
PKG_SUGGESTED_OPTIONS= inet6 pcre ssl
@@ -19,6 +19,13 @@
PLIST.naxsi= yes
CONFIGURE_ARGS+= --add-module=../${NAXSI_DISTNAME}/naxsi_src
.endif
+.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum)
+NAXSI_VERSION= 0.55.3
+NAXSI_DISTNAME= naxsi-${NAXSI_VERSION}
+NAXSI_DISTFILE= ${NAXSI_DISTNAME}.tar.gz
+SITES.${NAXSI_DISTFILE}=-https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz
+DISTFILES+= ${NAXSI_DISTFILE}
+.endif
.if !empty(PKG_OPTIONS:Mdebug)
CONFIGURE_ARGS+= --with-debug
@@ -67,14 +74,6 @@
CONFIGURE_ARGS+= --without-http_memcached_module
.endif
-.if !empty(PKG_OPTIONS:Mnaxsi) || make(makesum)
-NAXSI_VERSION= 0.55.3
-NAXSI_DISTNAME= naxsi-${NAXSI_VERSION}
-NAXSI_DISTFILE= ${NAXSI_DISTNAME}.tar.gz
-SITES.${NAXSI_DISTFILE}= -https://github.com/nbs-system/naxsi/archive/${NAXSI_VERSION}.tar.gz
-DISTFILES+= ${NAXSI_DISTFILE}
-.endif
-
.if !empty(PKG_OPTIONS:Mrealip)
CONFIGURE_ARGS+= --with-http_realip_module
.endif
@@ -85,10 +84,10 @@
# NDK must be added once and before 3rd party modules needing it
.for _ngx_mod in luajit set-misc array-var form-input encrypted-session
-. if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${_ngx_mod}:O)
+. if !defined(NEED_NDK) && !empty(PKG_OPTIONS:M${_ngx_mod}:O)
CONFIGURE_ARGS+= --add-module=../${NDK_DISTNAME}
NEED_NDK= yes
-. endif
+. endif
.endfor
.if defined(NEED_NDK) || make(makesum)
NDK_VERSION= 0.3.0
@@ -105,7 +104,7 @@
CONFIGURE_ARGS+= --add-module=../${LUA_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mluajit) || make(makesum)
-LUA_VERSION= 0.10.5
+LUA_VERSION= 0.10.8
LUA_DISTNAME= lua-nginx-module-${LUA_VERSION}
LUA_DISTFILE= ${LUA_DISTNAME}.tar.gz
SITES.${LUA_DISTFILE}= -https://github.com/openresty/lua-nginx-module/archive/v${LUA_VERSION}.tar.gz
@@ -116,7 +115,7 @@
CONFIGURE_ARGS+= --add-module=../${ECHOMOD_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mecho) || make(makesum)
-ECHOMOD_VERSION= 0.59
+ECHOMOD_VERSION= 0.60
ECHOMOD_DISTNAME= echo-nginx-module-${ECHOMOD_VERSION}
ECHOMOD_DISTFILE= ${ECHOMOD_DISTNAME}.tar.gz
SITES.${ECHOMOD_DISTFILE}= -https://github.com/openresty/echo-nginx-module/archive/v${ECHOMOD_VERSION}.tar.gz
@@ -127,7 +126,7 @@
CONFIGURE_ARGS+= --add-module=../${SETMISC_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mset-misc) || make(makesum)
-SETMISC_VERSION= 0.30
+SETMISC_VERSION= 0.31
SETMISC_DISTNAME= set-misc-nginx-module-${SETMISC_VERSION}
SETMISC_DISTFILE= ${SETMISC_DISTNAME}.tar.gz
SITES.${SETMISC_DISTFILE}= -https://github.com/openresty/set-misc-nginx-module/archive/v${SETMISC_VERSION}.tar.gz
@@ -138,7 +137,7 @@
CONFIGURE_ARGS+= --add-module=../${ARRAYVAR_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Marray-var) || make(makesum)
-ARRAYVAR_VERSION= 0.04
+ARRAYVAR_VERSION= 0.05
ARRAYVAR_DISTNAME= array-var-nginx-module-${ARRAYVAR_VERSION}
ARRAYVAR_DISTFILE= ${ARRAYVAR_DISTNAME}.tar.gz
SITES.${ARRAYVAR_DISTFILE}= -https://github.com/openresty/array-var-nginx-module/archive/v${ARRAYVAR_VERSION}.tar.gz
@@ -149,7 +148,7 @@
CONFIGURE_ARGS+= --add-module=../${ENCSESS_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mencrypted-session) || make(makesum)
-ENCSESS_VERSION= 0.05
+ENCSESS_VERSION= 0.06
ENCSESS_DISTNAME= encrypted-session-nginx-module-${ENCSESS_VERSION}
ENCSESS_DISTFILE= ${ENCSESS_DISTNAME}.tar.gz
SITES.${ENCSESS_DISTFILE}= -https://github.com/openresty/encrypted-session-nginx-module/archive/v${ENCSESS_VERSION}.tar.gz
@@ -171,7 +170,7 @@
CONFIGURE_ARGS+= --add-module=../${HEADMORE_DISTNAME}
.endif
.if !empty(PKG_OPTIONS:Mheaders-more) || make(makesum)
-HEADMORE_VERSION= 0.30
+HEADMORE_VERSION= 0.32
HEADMORE_DISTNAME= headers-more-nginx-module-${HEADMORE_VERSION}
HEADMORE_DISTFILE= ${HEADMORE_DISTNAME}.tar.gz
SITES.${HEADMORE_DISTFILE}= -https://github.com/openresty/headers-more-nginx-module/archive/v${HEADMORE_VERSION}.tar.gz
@@ -189,10 +188,10 @@
CONFIGURE_ARGS+= --add-module=../nchan-${PUSH_VERSION}
.endif
.if !empty(PKG_OPTIONS:Mpush) || make(makesum)
-PUSH_VERSION= 0.731
+PUSH_VERSION= 1.1.7
PUSH_DISTNAME= nginx_http_push_module-${PUSH_VERSION}
PUSH_DISTFILE= ${PUSH_DISTNAME}.tar.gz
-SITES.${PUSH_DISTFILE}= -https://github.com/slact/nginx_http_push_module/archive/v${PUSH_VERSION}.tar.gz
+SITES.${PUSH_DISTFILE}= -https://github.com/slact/nchan/archive/v${PUSH_VERSION}.tar.gz
DISTFILES+= ${PUSH_DISTFILE}
.endif
@@ -221,3 +220,14 @@
.if !empty(PKG_OPTIONS:Mauth-request)
CONFIGURE_ARGS+= --with-http_auth_request_module
.endif
+
+.if !empty(PKG_OPTIONS:Mrtmp)
+CONFIGURE_ARGS+= --add-module=../${RTMP_DISTNAME}
+.endif
+.if !empty(PKG_OPTIONS:Mrtmp) || make(makesum)
+RTMP_VERSION= 1.2.0
+RTMP_DISTNAME= nginx-rtmp-module-${RTMP_VERSION}
+RTMP_DISTFILE= ${RTMP_DISTNAME}.tar.gz
+SITES.${RTMP_DISTFILE}= -https://github.com/arut/nginx-rtmp-module/archive/v${RTMP_VERSION}.tar.gz
+DISTFILES+= ${RTMP_DISTFILE}
+.endif
Home |
Main Index |
Thread Index |
Old Index