Fix geoip, cmake patch

4 files changed, 60 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 402cfcc07fdc..acbbcb036ad0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Feb 21 10:06:11 UTC 2016
+# Thu Apr 14 21:02:10 UTC 2016
 pkgbase = heka
 	pkgdesc = Data collection and processing made easy
 	pkgver = 0.10.0
-	pkgrel = 3
+	pkgrel = 7
 	url = https://github.com/mozilla-services/heka
 	install = install.sh
 	arch = i686
@@ -17,7 +17,7 @@ pkgbase = heka
 	makedepends = mercurial
 	makedepends = patch
 	depends = geoip
-	optdepends = geoip-citydata: GeoIpDecoder
+	optdepends = geoip-database-extra: GeoIpDecoder
 	provides = heka
 	conflicts = heka
 	source = heka::git+https://github.com/mozilla-services/heka.git#tag=v0.10.0
diff --git a/PKGBUILD b/PKGBUILD
index b436ff591df0..9b70eecb6ce3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@ pkgname=('heka')
 srcname='heka'
 pkgdesc='Data collection and processing made easy'
 pkgver='0.10.0'
-pkgrel='3'
+pkgrel='7'
 arch=('i686' 'x86_64')
 url="https://github.com/mozilla-services/${srcname}"
 license=('MPL2')
@@ -17,7 +17,7 @@ makedepends=(
     'mercurial'
     'patch'
 )
-optdepends=('geoip-citydata: GeoIpDecoder')
+optdepends=('geoip-database-extra: GeoIpDecoder')
 provides=("${pkgname[0]%-git}")
 conflicts=("${pkgname[0]%-git}")
 
diff --git a/cmake.patch b/cmake.patch
index d82b5870650b..8163575914fa 100644
--- a/cmake.patch
+++ b/cmake.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f42228..0324223 100644
+index 7f42228..fb69a0b 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -19,7 +19,6 @@ find_package(Go 1.4 REQUIRED)
@@ -10,15 +10,63 @@ index 7f42228..0324223 100644
  set(PROJECT_PATH "${CMAKE_BINARY_DIR}/heka")
  set(HEKA_PATH "${PROJECT_PATH}/src/github.com/mozilla-services/heka")
  set(LUA_INCLUDE_PATH "${PROJECT_PATH}/include")
-@@ -289,9 +288,9 @@ endif()
+@@ -181,18 +180,20 @@ if (INCLUDE_DOCUMENTATION)
+     install(DIRECTORY "${HEKA_PATH}/docs/build/man/" DESTINATION share/man/man5 FILES_MATCHING PATTERN "*.5")
+ endif()
+ 
+-if (MINGW AND INCLUDE_SANDBOX)
+-    add_custom_command(TARGET heka_source POST_BUILD
+-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}"
+-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/pipeline"
+-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/plugins"
+-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/sandbox/lua"
+-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/sandbox/plugins"
+-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/cmd/hekad"
+-    COMMENT "Install dll's for the mock generation and unit tests")
+-    install(DIRECTORY "${PROJECT_PATH}/lib/" DESTINATION bin PATTERN "*.dll" PATTERN "luasandbox" EXCLUDE PATTERN "luasandbox/*" EXCLUDE)
+-else()
+-    install(DIRECTORY "${PROJECT_PATH}/lib/" DESTINATION lib PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}" PATTERN "luasandbox" EXCLUDE PATTERN "luasandbox/*" EXCLUDE)
++if(INCLUDE_SANDBOX)
++    if (MINGW)
++        add_custom_command(TARGET heka_source POST_BUILD
++        COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}"
++        COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/pipeline"
++        COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/plugins"
++        COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/sandbox/lua"
++        COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/sandbox/plugins"
++        COMMAND ${CMAKE_COMMAND} -E copy_directory "${PROJECT_PATH}/lib/" "${HEKA_PATH}/cmd/hekad"
++        COMMENT "Install dll's for the mock generation and unit tests")
++        install(DIRECTORY "${PROJECT_PATH}/lib/" DESTINATION bin PATTERN "*.dll" PATTERN "luasandbox" EXCLUDE PATTERN "luasandbox/*" EXCLUDE)
++    else()
++        install(DIRECTORY "${PROJECT_PATH}/lib/" DESTINATION lib PATTERN "*${CMAKE_SHARED_LIBRARY_SUFFIX}" PATTERN "luasandbox" EXCLUDE PATTERN "luasandbox/*" EXCLUDE)
++    endif()
+ endif()
+ 
+ install(PROGRAMS "${HEKA_EXE}" DESTINATION bin)
+@@ -289,16 +290,16 @@ endif()
  if (INCLUDE_MOZSVC)
      add_test(mozsvc ${GO_EXECUTABLE} test ${BENCHMARK_FLAG} ${COVERAGE_FLAG} github.com/mozilla-services/heka-mozsvc-plugins)
  endif()
 -install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION bin)
-+install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
- if(INCLUDE_SANDBOX)
+-if(INCLUDE_SANDBOX)
 -install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION bin)
-+install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
- endif()
+-endif()
++install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
  install(FILES "${CMAKE_SOURCE_DIR}/LICENSE.txt" DESTINATION "share/${CMAKE_PROJECT_NAME}")
  install(DIRECTORY "${CMAKE_SOURCE_DIR}/dasher" DESTINATION "share/${CMAKE_PROJECT_NAME}")
+-install(DIRECTORY "${PROJECT_PATH}/lib/luasandbox/modules/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_modules")
+-install(DIRECTORY "${PROJECT_PATH}/lib/luasandbox/io_modules/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_io_modules")
+ install(DIRECTORY "${CMAKE_SOURCE_DIR}/examples/conf/" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
+-install(DIRECTORY "${CMAKE_SOURCE_DIR}/sandbox/lua/modules/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_modules")
+-install(DIRECTORY "${CMAKE_SOURCE_DIR}/sandbox/lua/decoders/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_decoders")
+-install(DIRECTORY "${CMAKE_SOURCE_DIR}/sandbox/lua/filters/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_filters")
+-install(DIRECTORY "${CMAKE_SOURCE_DIR}/sandbox/lua/encoders/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_encoders")
++if(INCLUDE_SANDBOX)
++    install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
++    install(DIRECTORY "${PROJECT_PATH}/lib/luasandbox/modules/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_modules")
++    install(DIRECTORY "${PROJECT_PATH}/lib/luasandbox/io_modules/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_io_modules")
++    install(DIRECTORY "${CMAKE_SOURCE_DIR}/sandbox/lua/modules/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_modules")
++    install(DIRECTORY "${CMAKE_SOURCE_DIR}/sandbox/lua/decoders/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_decoders")
++    install(DIRECTORY "${CMAKE_SOURCE_DIR}/sandbox/lua/filters/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_filters")
++    install(DIRECTORY "${CMAKE_SOURCE_DIR}/sandbox/lua/encoders/" DESTINATION "share/${CMAKE_PROJECT_NAME}/lua_encoders")
++endif()
diff --git a/heka.service b/heka.service
index 101922f2face..f6bda4bec106 100644
--- a/heka.service
+++ b/heka.service
@@ -10,7 +10,7 @@ Restart=on-failure
 
 ExecStart=/usr/bin/hekad -config=/etc/heka/conf.d/
 
-ExecReload=/usr/bin/kill --signal HUP ${MAINPID}
+ExecReload=/usr/bin/kill --signal HUP "${MAINPID}"
 
 [Install]
 WantedBy=multi-user.target