Date: Sun, 7 Feb 2016 18:09:28 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408436 - in head/www: nginx nginx-devel nginx-devel/files nginx/files Message-ID: <201602071809.u17I9Sjx059061@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sun Feb 7 18:09:28 2016 New Revision: 408436 URL: https://svnweb.freebsd.org/changeset/ports/408436 Log: Upgrade third-party modsecurity module from 2.9.0 to 2.9.1-rc1. Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure head/www/nginx/Makefile head/www/nginx/distinfo head/www/nginx/files/extra-patch-nginx-modsecurity-configure Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sun Feb 7 18:05:44 2016 (r408435) +++ head/www/nginx-devel/Makefile Sun Feb 7 18:09:28 2016 (r408436) @@ -691,7 +691,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_me .endif .if ${PORT_OPTIONS:MMODSECURITY} -NGINX_MODSECURITY_VERSION= 2.9.0 +NGINX_MODSECURITY_VERSION= 2.9.1-RC1 LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ libcurl.so:${PORTSDIR}/ftp/curl \ libluajit-5.1.so:${PORTSDIR}/lang/luajit \ @@ -699,7 +699,7 @@ LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/de libyajl.so:${PORTSDIR}/devel/yajl USE_APACHE= 22+ USE_GNOME+= libxml2 -MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION}/:modsecurity +MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Sun Feb 7 18:05:44 2016 (r408435) +++ head/www/nginx-devel/distinfo Sun Feb 7 18:09:28 2016 (r408436) @@ -20,8 +20,8 @@ SHA256 (1.2.4.tar.gz) = f79521a25322cb4f SIZE (1.2.4.tar.gz) = 120448 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1 SIZE (mod_zip-1.1.6.tar.gz) = 21991 -SHA256 (modsecurity-2.9.0.tar.gz) = e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434 -SIZE (modsecurity-2.9.0.tar.gz) = 4246467 +SHA256 (modsecurity-2.9.1-RC1.tar.gz) = 86fd2462c556a11f812d76a3b97716cec2de0e81ee0a095d8280fdd6be384455 +SIZE (modsecurity-2.9.1-RC1.tar.gz) = 4265101 SHA256 (passenger-5.0.24.tar.gz) = 06b9cdd18c1ef283628b753815ae1c6eaf764f212fd8d439d7035c9257288f79 SIZE (passenger-5.0.24.tar.gz) = 5415880 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76 Modified: head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure ============================================================================== --- head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure Sun Feb 7 18:05:44 2016 (r408435) +++ head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure Sun Feb 7 18:09:28 2016 (r408436) @@ -1,11 +1,11 @@ ---- ../modsecurity-2.9.0/configure.orig 2015-02-12 22:08:46.000000000 +0300 -+++ ../modsecurity-2.9.0/configure 2015-08-10 02:53:29.046156000 +0300 +--- ../modsecurity-2.9.1-RC1/configure.orig 2016-02-07 12:45:53.346098000 -0500 ++++ ../modsecurity-2.9.1-RC1/configure 2016-02-07 12:47:50.081558000 -0500 @@ -14949,7 +14949,7 @@ LUA_LDADD="" LUA_LDFLAGS="" LUA_CONFIG=${PKG_CONFIG} --LUA_PKGNAMES="lua5.1 lua-5.1 lua_5.1 lua-51 lua_51 lua51 lua5 lua" -+LUA_PKGNAMES="luajit" +-LUA_PKGNAMES="lua5.1 lua-5.1 lua_5.1 lua-51 lua_51 lua51 lua5 lua lua5.2 lua-5.2 lua_5.2 lua-52 lua_52 lua52 lua5.3 lua-5.3 lua_5.3 lua-53 lua_53 lua53 " ++LUA_PKGNAMES="luajit " LUA_SONAMES="so la sl dll dylib a" Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sun Feb 7 18:05:44 2016 (r408435) +++ head/www/nginx/Makefile Sun Feb 7 18:09:28 2016 (r408436) @@ -670,7 +670,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_me .endif .if ${PORT_OPTIONS:MMODSECURITY} -NGINX_MODSECURITY_VERSION= 2.9.0 +NGINX_MODSECURITY_VERSION= 2.9.1-RC1 LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ libcurl.so:${PORTSDIR}/ftp/curl \ libluajit-5.1.so:${PORTSDIR}/lang/luajit \ @@ -678,7 +678,7 @@ LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/de libyajl.so:${PORTSDIR}/devel/yajl USE_APACHE= 22+ USE_GNOME+= libxml2 -MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION}/:modsecurity +MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION:S/RC/rc/}/:modsecurity DISTFILES+= modsecurity-${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/nginx/modsecurity EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-configure Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Sun Feb 7 18:05:44 2016 (r408435) +++ head/www/nginx/distinfo Sun Feb 7 18:09:28 2016 (r408436) @@ -20,8 +20,8 @@ SHA256 (1.2.4.tar.gz) = f79521a25322cb4f SIZE (1.2.4.tar.gz) = 120448 SHA256 (mod_zip-1.1.6.tar.gz) = d30546b4be8308c721df0240ebc38c474c6b577381a110321eded6dbed5104b1 SIZE (mod_zip-1.1.6.tar.gz) = 21991 -SHA256 (modsecurity-2.9.0.tar.gz) = e2bbf789966c1f80094d88d9085a81bde082b2054f8e38e0db571ca49208f434 -SIZE (modsecurity-2.9.0.tar.gz) = 4246467 +SHA256 (modsecurity-2.9.1-RC1.tar.gz) = 86fd2462c556a11f812d76a3b97716cec2de0e81ee0a095d8280fdd6be384455 +SIZE (modsecurity-2.9.1-RC1.tar.gz) = 4265101 SHA256 (passenger-5.0.24.tar.gz) = 06b9cdd18c1ef283628b753815ae1c6eaf764f212fd8d439d7035c9257288f79 SIZE (passenger-5.0.24.tar.gz) = 5415880 SHA256 (nginx-sflow-module-0.9.7.tar.gz) = 508d15a43059abab08281bfa66d2dd520e2e7635d0b17043549bb331c8755b76 Modified: head/www/nginx/files/extra-patch-nginx-modsecurity-configure ============================================================================== --- head/www/nginx/files/extra-patch-nginx-modsecurity-configure Sun Feb 7 18:05:44 2016 (r408435) +++ head/www/nginx/files/extra-patch-nginx-modsecurity-configure Sun Feb 7 18:09:28 2016 (r408436) @@ -1,11 +1,11 @@ ---- ../modsecurity-2.9.0/configure.orig 2015-02-12 22:08:46.000000000 +0300 -+++ ../modsecurity-2.9.0/configure 2015-08-10 02:53:29.046156000 +0300 +--- ../modsecurity-2.9.1-RC1/configure.orig 2016-02-07 12:45:53.346098000 -0500 ++++ ../modsecurity-2.9.1-RC1/configure 2016-02-07 12:47:50.081558000 -0500 @@ -14949,7 +14949,7 @@ LUA_LDADD="" LUA_LDFLAGS="" LUA_CONFIG=${PKG_CONFIG} --LUA_PKGNAMES="lua5.1 lua-5.1 lua_5.1 lua-51 lua_51 lua51 lua5 lua" -+LUA_PKGNAMES="luajit" +-LUA_PKGNAMES="lua5.1 lua-5.1 lua_5.1 lua-51 lua_51 lua51 lua5 lua lua5.2 lua-5.2 lua_5.2 lua-52 lua_52 lua52 lua5.3 lua-5.3 lua_5.3 lua-53 lua_53 lua53 " ++LUA_PKGNAMES="luajit " LUA_SONAMES="so la sl dll dylib a"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602071809.u17I9Sjx059061>