svn commit: r393858 - in head/www: nginx nginx-devel nginx-devel/files nginx/files
Sergey A. Osokin
osa at FreeBSD.org
Mon Aug 10 12:03:28 UTC 2015
Author: osa
Date: Mon Aug 10 12:03:26 2015
New Revision: 393858
URL: https://svnweb.freebsd.org/changeset/ports/393858
Log:
Use luajit instead of lua for third-party modsecurity module, sort list of dependences for it.
PR: 200263
Modified:
head/www/nginx-devel/Makefile
head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
head/www/nginx/Makefile
head/www/nginx/files/extra-patch-nginx-modsecurity-configure
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Mon Aug 10 11:39:26 2015 (r393857)
+++ head/www/nginx-devel/Makefile Mon Aug 10 12:03:26 2015 (r393858)
@@ -657,9 +657,10 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_me
.if ${PORT_OPTIONS:MMODSECURITY}
NGINX_MODSECURITY_VERSION= 2.9.0
-LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \
- libapr-1.so:${PORTSDIR}/devel/apr1 \
+LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \
libcurl.so:${PORTSDIR}/ftp/curl \
+ libluajit-5.1.so:${PORTSDIR}/lang/luajit \
+ libpcre.so:${PORTSDIR}/devel/pcre \
libyajl.so:${PORTSDIR}/devel/yajl
USE_APACHE= 22+
USE_GNOME+= libxml2
Modified: head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
==============================================================================
--- head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure Mon Aug 10 11:39:26 2015 (r393857)
+++ head/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure Mon Aug 10 12:03:26 2015 (r393858)
@@ -1,20 +1,25 @@
---- ../modsecurity-2.9.0/configure.orig 2014-04-15 16:44:15.000000000 +0400
-+++ ../modsecurity-2.9.0/configure 2014-08-10 21:24:00.000000000 +0400
-@@ -14664,7 +14664,7 @@
+--- ../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
+@@ -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_SONAMES="so la sl dll dylib a"
+
+
+@@ -14965,7 +14965,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="%%PREFIX%%/include/luajit-2.0" ;; #(
*) :
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/'`"
+@@ -15019,7 +15019,7 @@
+ LUA_LDADD="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-l`"
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`"
Modified: head/www/nginx/Makefile
==============================================================================
--- head/www/nginx/Makefile Mon Aug 10 11:39:26 2015 (r393857)
+++ head/www/nginx/Makefile Mon Aug 10 12:03:26 2015 (r393858)
@@ -643,9 +643,10 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_me
.if ${PORT_OPTIONS:MMODSECURITY}
NGINX_MODSECURITY_VERSION= 2.9.0
-LIB_DEPENDS+= libpcre.so:${PORTSDIR}/devel/pcre \
- libapr-1.so:${PORTSDIR}/devel/apr1 \
+LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \
libcurl.so:${PORTSDIR}/ftp/curl \
+ libluajit-5.1.so:${PORTSDIR}/lang/luajit \
+ libpcre.so:${PORTSDIR}/devel/pcre \
libyajl.so:${PORTSDIR}/devel/yajl
USE_APACHE= 22+
USE_GNOME+= libxml2
Modified: head/www/nginx/files/extra-patch-nginx-modsecurity-configure
==============================================================================
--- head/www/nginx/files/extra-patch-nginx-modsecurity-configure Mon Aug 10 11:39:26 2015 (r393857)
+++ head/www/nginx/files/extra-patch-nginx-modsecurity-configure Mon Aug 10 12:03:26 2015 (r393858)
@@ -1,20 +1,25 @@
---- ../modsecurity-2.9.0/configure.orig 2014-04-15 16:44:15.000000000 +0400
-+++ ../modsecurity-2.9.0/configure 2014-08-10 21:24:00.000000000 +0400
-@@ -14664,7 +14664,7 @@
+--- ../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
+@@ -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_SONAMES="so la sl dll dylib a"
+
+
+@@ -14965,7 +14965,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="%%PREFIX%%/include/luajit-2.0" ;; #(
*) :
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/'`"
+@@ -15019,7 +15019,7 @@
+ LUA_LDADD="`${LUA_CONFIG} ${LUA_PKGNAME} --libs-only-l`"
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`"
More information about the svn-ports-all
mailing list