Date: Sun, 10 Aug 2014 17:47:05 +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: r364551 - in head/www: nginx nginx-devel nginx-devel/files nginx/files Message-ID: <53e7b019.2c91.25b2850a@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sun Aug 10 17:47:04 2014 New Revision: 364551 URL: http://svnweb.freebsd.org/changeset/ports/364551 QAT: https://qat.redports.org/buildarchive/r364551/ Log: Update third-party modsecurity module from 2.7.5 to latest version 2.8.0. Added: head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure (contents, props changed) head/www/nginx/files/extra-patch-nginx-modsecurity-configure (contents, props changed) Deleted: head/www/nginx-devel/files/extra-patch-nginx-modsecurity-config head/www/nginx/files/extra-patch-nginx-modsecurity-config Modified: head/www/nginx-devel/Makefile head/www/nginx-devel/distinfo head/www/nginx/Makefile head/www/nginx/distinfo Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sun Aug 10 16:32:45 2014 (r364550) +++ head/www/nginx-devel/Makefile Sun Aug 10 17:47:04 2014 (r364551) @@ -612,15 +612,16 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MMODSECURITY} -NGINX_MODSECURITY_VERSION= 2.7.5 +NGINX_MODSECURITY_VERSION= 2.8.0 LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ - libapr-1.so:${PORTSDIR}/devel/apr1 + libapr-1.so:${PORTSDIR}/devel/apr1 \ + libyajl.so:${PORTSDIR}/devel/yajl USE_APACHE= 22+ USE_GNOME= libxml2 MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION}/:modsecurity -DISTFILES+= modsecurity-apache_${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity -CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-apache_${NGINX_MODSECURITY_VERSION}/nginx/modsecurity -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-config +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 .endif .if ${PORT_OPTIONS:MNAXSI} @@ -951,12 +952,12 @@ post-patch: .if ${PORT_OPTIONS:MMODSECURITY} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ - ${WRKDIR}/modsecurity-apache_${NGINX_MODSECURITY_VERSION}/nginx/modsecurity/config + ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/configure .endif pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} - ( cd ${WRKDIR}/modsecurity-apache_${NGINX_MODSECURITY_VERSION} && \ + ( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \ CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \ ${MAKE} ) .endif Modified: head/www/nginx-devel/distinfo ============================================================================== --- head/www/nginx-devel/distinfo Sun Aug 10 16:32:45 2014 (r364550) +++ head/www/nginx-devel/distinfo Sun Aug 10 17:47:04 2014 (r364551) @@ -68,8 +68,8 @@ SHA256 (openresty-lua-nginx-module-v0.9. SIZE (openresty-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = 470182 SHA256 (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = b60fed5921a0c19c6ffe71e5c764193283dbe635bb3bad6febd6655f94a633e9 SIZE (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37756 -SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2 -SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387 +SHA256 (modsecurity-2.8.0.tar.gz) = 5cbbc7fc993d39106b653213753d25c4ec21771eee17b01b69122ccf3f73460e +SIZE (modsecurity-2.8.0.tar.gz) = 3940357 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef SIZE (naxsi-core-0.50.tgz) = 49809 SHA256 (passenger-4.0.48.tar.gz) = 0fe6a42c82eee59511b04aa683f65fb4eaf1acc6310de3fbbe905fa507347e24 Added: head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure Sun Aug 10 17:47:04 2014 (r364551) @@ -0,0 +1,24 @@ +--- ../modsecurity-2.8.0/configure.orig 2014-04-15 16:44:15.000000000 +0400 ++++ ../modsecurity-2.8.0/configure 2014-08-10 21:24:00.000000000 +0400 +@@ -14664,7 +14664,7 @@ + no) : + test_paths= ;; #( + yes) : +- test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #( ++ test_paths="%%PREFIX%%/liblua %%PREFIX%%/lua %%PREFIX%% /opt/liblua /opt/lua /opt /usr" ;; #( + *) : + test_paths="${with_lua}" ;; + esac +@@ -14715,10 +14715,10 @@ + LUA_CFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --cflags`" + if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: lua CFLAGS: $LUA_CFLAGS" >&5 + $as_echo "$as_me: lua CFLAGS: $LUA_CFLAGS" >&6;}; fi +- LUA_LDADD="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-l`" ++ LUA_LDADD="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-l | sed 's/lua/lua-5.1/'`" + if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: lua LDADD: $LUA_LDADD" >&5 + $as_echo "$as_me: lua LDADD: $LUA_LDADD" >&6;}; fi +- LUA_LDFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-L --libs-only-other`" ++ LUA_LDFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-L --libs-only-other | sed 's/\/lua51//'`" + if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: lua LDFLAGS: $LUA_LDFLAGS" >&5 + $as_echo "$as_me: lua LDFLAGS: $LUA_LDFLAGS" >&6;}; fi + else Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sun Aug 10 16:32:45 2014 (r364550) +++ head/www/nginx/Makefile Sun Aug 10 17:47:04 2014 (r364551) @@ -624,15 +624,16 @@ CONFIGURE_ARGS+=--add-module=${WRKDIR}/o .endif .if ${PORT_OPTIONS:MMODSECURITY} -NGINX_MODSECURITY_VERSION= 2.7.5 +NGINX_MODSECURITY_VERSION= 2.8.0 LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \ - libapr-1.so:${PORTSDIR}/devel/apr1 + libapr-1.so:${PORTSDIR}/devel/apr1 \ + libyajl.so:${PORTSDIR}/devel/yajl USE_APACHE= 22+ USE_GNOME= libxml2 MASTER_SITES+= http://www.modsecurity.org/tarball/${NGINX_MODSECURITY_VERSION}/:modsecurity -DISTFILES+= modsecurity-apache_${NGINX_MODSECURITY_VERSION}.tar.gz:modsecurity -CONFIGURE_ARGS+=--add-module=${WRKDIR}/modsecurity-apache_${NGINX_MODSECURITY_VERSION}/nginx/modsecurity -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-nginx-modsecurity-config +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 .endif .if ${PORT_OPTIONS:MNAXSI} @@ -969,12 +970,12 @@ post-patch: .if ${PORT_OPTIONS:MMODSECURITY} @${REINPLACE_CMD} \ 's!%%PREFIX%%!${LOCALBASE}!g' \ - ${WRKDIR}/modsecurity-apache_${NGINX_MODSECURITY_VERSION}/nginx/modsecurity/config + ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION}/configure .endif pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} - ( cd ${WRKDIR}/modsecurity-apache_${NGINX_MODSECURITY_VERSION} && \ + ( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \ CC="${CC}" ./${CONFIGURE_SCRIPT} --enable-standalone-module && \ ${MAKE} ) .endif Modified: head/www/nginx/distinfo ============================================================================== --- head/www/nginx/distinfo Sun Aug 10 16:32:45 2014 (r364550) +++ head/www/nginx/distinfo Sun Aug 10 17:47:04 2014 (r364551) @@ -70,8 +70,8 @@ SHA256 (openresty-lua-nginx-module-v0.9. SIZE (openresty-lua-nginx-module-v0.9.4-0-g6169a19.tar.gz) = 470182 SHA256 (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = b60fed5921a0c19c6ffe71e5c764193283dbe635bb3bad6febd6655f94a633e9 SIZE (openresty-memc-nginx-module-v0.14-0-gde4cf86.tar.gz) = 37756 -SHA256 (modsecurity-apache_2.7.5.tar.gz) = 9e907536278d8da80d3dbb29aeffe9c4ec37ce9b641035b2da64e993135647a2 -SIZE (modsecurity-apache_2.7.5.tar.gz) = 1045387 +SHA256 (modsecurity-2.8.0.tar.gz) = 5cbbc7fc993d39106b653213753d25c4ec21771eee17b01b69122ccf3f73460e +SIZE (modsecurity-2.8.0.tar.gz) = 3940357 SHA256 (naxsi-core-0.50.tgz) = 7cece5f9d9c5df9e09af1e1023bc8e04bbbbe953e67461b893b8240e82ca52ef SIZE (naxsi-core-0.50.tgz) = 49809 SHA256 (passenger-4.0.48.tar.gz) = 0fe6a42c82eee59511b04aa683f65fb4eaf1acc6310de3fbbe905fa507347e24 Added: head/www/nginx/files/extra-patch-nginx-modsecurity-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-nginx-modsecurity-configure Sun Aug 10 17:47:04 2014 (r364551) @@ -0,0 +1,24 @@ +--- ../modsecurity-2.8.0/configure.orig 2014-04-15 16:44:15.000000000 +0400 ++++ ../modsecurity-2.8.0/configure 2014-08-10 21:24:00.000000000 +0400 +@@ -14664,7 +14664,7 @@ + no) : + test_paths= ;; #( + yes) : +- test_paths="/usr/local/liblua /usr/local/lua /usr/local /opt/liblua /opt/lua /opt /usr" ;; #( ++ test_paths="%%PREFIX%%/liblua %%PREFIX%%/lua %%PREFIX%% /opt/liblua /opt/lua /opt /usr" ;; #( + *) : + test_paths="${with_lua}" ;; + esac +@@ -14715,10 +14715,10 @@ + LUA_CFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --cflags`" + if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: lua CFLAGS: $LUA_CFLAGS" >&5 + $as_echo "$as_me: lua CFLAGS: $LUA_CFLAGS" >&6;}; fi +- LUA_LDADD="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-l`" ++ LUA_LDADD="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-l | sed 's/lua/lua-5.1/'`" + if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: lua LDADD: $LUA_LDADD" >&5 + $as_echo "$as_me: lua LDADD: $LUA_LDADD" >&6;}; fi +- LUA_LDFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-L --libs-only-other`" ++ LUA_LDFLAGS="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-L --libs-only-other | sed 's/\/lua51//'`" + if test "$verbose_output" -eq 1; then { $as_echo "$as_me:${as_lineno-$LINENO}: lua LDFLAGS: $LUA_LDFLAGS" >&5 + $as_echo "$as_me: lua LDFLAGS: $LUA_LDFLAGS" >&6;}; fi + else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?53e7b019.2c91.25b2850a>