Use luajit instead of lua for third-party modsecurity module, sort list of dependences for it.

PR:	200263

4 files changed, 36 insertions, 24 deletions

diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 7a919020be92..5b3eef20f5e1 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -657,9 +657,10 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
 
 .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
diff --git a/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure b/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
index ffbc3eb36687..cdec65865069 100644
--- a/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
+++ b/www/nginx-devel/files/extra-patch-nginx-modsecurity-configure
@@ -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`"
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 21e292ee4b4b..9ba9090b64a0 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -643,9 +643,10 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_memc}
 
 .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
diff --git a/www/nginx/files/extra-patch-nginx-modsecurity-configure b/www/nginx/files/extra-patch-nginx-modsecurity-configure
index ffbc3eb36687..cdec65865069 100644
--- a/www/nginx/files/extra-patch-nginx-modsecurity-configure
+++ b/www/nginx/files/extra-patch-nginx-modsecurity-configure
@@ -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`"