Date: Sat, 26 Nov 2016 21:32:50 +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: r427183 - in head/www: nginx nginx-devel Message-ID: <201611262132.uAQLWobU015357@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sat Nov 26 21:32:50 2016 New Revision: 427183 URL: https://svnweb.freebsd.org/changeset/ports/427183 Log: Fix the functionality issue of the third-party modsecurity module. Found by: Rami Jebara <rami.jebara@tuangru.com> (in private mail) Modified: head/www/nginx-devel/Makefile head/www/nginx/Makefile Modified: head/www/nginx-devel/Makefile ============================================================================== --- head/www/nginx-devel/Makefile Sat Nov 26 19:26:42 2016 (r427182) +++ head/www/nginx-devel/Makefile Sat Nov 26 21:32:50 2016 (r427183) @@ -870,6 +870,7 @@ LIB_DEPENDS+= libapr-1.so:devel/apr1 \ libyajl.so:devel/yajl USE_APACHE= 22+ USE_GNOME+= libxml2 +USES+= pkgconfig shebangfix 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 @@ -1282,7 +1283,9 @@ post-patch: pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} ( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \ - CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \ + CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module \ + --with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} \ + --with-curl=${LOCALBASE} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) .endif .if ${PORT_OPTIONS:MSMALL_LIGHT} Modified: head/www/nginx/Makefile ============================================================================== --- head/www/nginx/Makefile Sat Nov 26 19:26:42 2016 (r427182) +++ head/www/nginx/Makefile Sat Nov 26 21:32:50 2016 (r427183) @@ -862,6 +862,7 @@ LIB_DEPENDS+= libapr-1.so:devel/apr1 \ libyajl.so:devel/yajl USE_APACHE= 22+ USE_GNOME+= libxml2 +USES+= pkgconfig shebangfix 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 @@ -1272,7 +1273,9 @@ post-patch: pre-configure: .if ${PORT_OPTIONS:MMODSECURITY} ( cd ${WRKDIR}/modsecurity-${NGINX_MODSECURITY_VERSION} && \ - CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module && \ + CC="${CC}" ${CONFIGURE_CMD} --enable-standalone-module \ + --with-pcre=${LOCALBASE} --with-yajl=${LOCALBASE} \ + --with-curl=${LOCALBASE} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ) .endif .if ${PORT_OPTIONS:MSMALL_LIGHT}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611262132.uAQLWobU015357>