Pull in the updated lua_sandbox

magnusp · Apr 8, 2015 · 93cd189 · 93cd189
1 parent 245faa8
commit 93cd189
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -267,7 +267,7 @@ add_test(plugins/udp ${GO_EXECUTABLE} test ${LDFLAGS} ${BENCHMARK_FLAG} github.c
 add_test(logstreamer ${GO_EXECUTABLE} test ${LDFLAGS} ${BENCHMARK_FLAG} github.com/mozilla-services/heka/logstreamer)
 add_test(client ${GO_EXECUTABLE} test ${LDFLAGS} ${BENCHMARK_FLAG} github.com/mozilla-services/heka/client)
 if(INCLUDE_SANDBOX)
-    add_test(sandbox_move_modules cmake -E copy_directory ${CMAKE_BINARY_DIR}/heka/modules ${CMAKE_BINARY_DIR}/heka/src/github.com/mozilla-services/heka/sandbox/lua/modules)
+    add_test(sandbox_move_modules cmake -E copy_directory ${CMAKE_BINARY_DIR}/heka/lib/luasandbox/modules ${CMAKE_BINARY_DIR}/heka/src/github.com/mozilla-services/heka/sandbox/lua/modules)
     add_test(sandbox ${GO_EXECUTABLE} test ${LDFLAGS} ${BENCHMARK_FLAG} github.com/mozilla-services/heka/sandbox/lua)
     add_test(sandbox_plugins ${GO_EXECUTABLE} test ${LDFLAGS} ${BENCHMARK_FLAG} github.com/mozilla-services/heka/sandbox/plugins)
 endif()

diff --git a/cmake/externals.cmake b/cmake/externals.cmake
@@ -19,7 +19,7 @@ if(INCLUDE_SANDBOX)
     externalproject_add(
         ${SANDBOX_PACKAGE}
         GIT_REPOSITORY https://github.com/mozilla-services/lua_sandbox.git
-        GIT_TAG 7d0e4ed65d73b158c61ebeaf9a84f58ba6cf6a15
+        GIT_TAG 32819b65772e4a230435e4d0fd15be63c478caa7
         CMAKE_ARGS ${SANDBOX_ARGS}
         INSTALL_DIR ${PROJECT_PATH}
     )

diff --git a/sandbox/lua/lua_sandbox.go.in b/sandbox/lua/lua_sandbox.go.in
@@ -18,8 +18,8 @@ package lua
 #cgo CFLAGS: -std=gnu99 -I @LUA_INCLUDE_PATH@
 #@CGO_LDFLAGS@
 #include <stdlib.h>
-#include <lsb.h>
-#include <lsb_output.h>
+#include <luasandbox.h>
+#include <luasandbox_output.h>
 #include "lua_sandbox_interface.h"
 */
 import "C"

diff --git a/sandbox/lua/lua_sandbox_interface.c b/sandbox/lua/lua_sandbox_interface.c
@@ -6,10 +6,10 @@
 
 /// @brief Sandboxed Lua execution @file
 #include <ctype.h>
-#include <lsb.h>
-#include <lsb/lauxlib.h>
-#include <lsb/lua.h>
-#include <lsb/lualib.h>
+#include <luasandbox.h>
+#include <luasandbox/lauxlib.h>
+#include <luasandbox/lua.h>
+#include <luasandbox/lualib.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/sandbox/lua/lua_sandbox_interface.h b/sandbox/lua/lua_sandbox_interface.h
@@ -8,8 +8,8 @@
 #ifndef lua_sandbox_interface_
 #define lua_sandbox_interface_
 
-#include <lsb.h>
-#include <lsb/lua.h>
+#include <luasandbox.h>
+#include <luasandbox/lua.h>
 
 // LMW_ERR_*: Lua Message Write errors
 extern const int LMW_ERR_NO_SANDBOX_PACK;