diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 10 | ||||
| -rw-r--r-- | fix-32bit-build.patch | 39 |
3 files changed, 6 insertions, 49 deletions
@@ -1,6 +1,8 @@ +# Generated by mksrcinfo v8 +# Wed Jan 6 23:50:19 UTC 2016 pkgbase = haka-git pkgdesc = Collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files - pkgver = 0.3.0.2192.47374d2 + pkgver = 0.3.0.2205.64202a8 pkgrel = 1 url = http://haka-security.org/ arch = i686 @@ -27,9 +29,7 @@ pkgbase = haka-git options = !emptydirs backup = etc/haka/haka.conf source = haka-git::git+https://github.com/haka-security/haka - source = fix-32bit-build.patch sha512sums = SKIP - sha512sums = d4b5db5fb3d04a4c2bb6d4c5833d34a21b3aac8f81eafa8305a0ca57a8bd24578a7baab05e485cb855d3ff0c48b3baa1627ed1db3553fda8c4b7de420d61a857 pkgname = haka-git @@ -2,7 +2,7 @@ pkgname=haka-git _pkgname=haka -pkgver=0.3.0.2192.47374d2 +pkgver=0.3.0.2205.64202a8 pkgrel=1 pkgdesc="Collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files" url="http://haka-security.org/" @@ -14,10 +14,8 @@ options=('!emptydirs') backup=('etc/haka/haka.conf') provides=('haka') conflicts=('haka') -source=(${pkgname}::git+https://github.com/haka-security/haka - fix-32bit-build.patch) -sha512sums=('SKIP' - 'd4b5db5fb3d04a4c2bb6d4c5833d34a21b3aac8f81eafa8305a0ca57a8bd24578a7baab05e485cb855d3ff0c48b3baa1627ed1db3553fda8c4b7de420d61a857') +source=(${pkgname}::git+https://github.com/haka-security/haka) +sha512sums=('SKIP') pkgver() { cd ${pkgname} @@ -28,13 +26,11 @@ pkgver() { prepare() { cd ${pkgname} - patch -p1 < "${srcdir}/fix-32bit-build.patch" sed 's|sbin|bin|g' -i \ CMakeLists.txt \ src/hakactl/CMakeLists.txt \ src/haka/CMakeLists.txt \ external/luajit/luajit.cmake - sed 's|-Wall -Werror|-Wall|g' -i CMakeLists.txt sed 's|sphinx-build|sphinx-build2|g' -i build/FindSphinx.cmake # temporary html docs via doxygen as sphinx generator is broken sed -r 's|(GENERATE_XML[ ]+=) YES|\1 NO|g' -i doc/Doxyfile.in diff --git a/fix-32bit-build.patch b/fix-32bit-build.patch deleted file mode 100644 index 4a1cd0d7662b..000000000000 --- a/fix-32bit-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 6398e9f43e81daaa424fd9e58f1acaaeaba62cf4 Mon Sep 17 00:00:00 2001 -From: Paul Fariello <pfariello@arkoon.dev> -Date: Mon, 20 Oct 2014 18:25:12 +0200 -Subject: [PATCH] Fix build - -libluajit requires libm but -lm was set after libluajit and so libm was -discarded under some conditions ---- - lib/haka/CMakeLists.txt | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/haka/CMakeLists.txt b/lib/haka/CMakeLists.txt -index d296a83..1160fda 100644 ---- a/lib/haka/CMakeLists.txt -+++ b/lib/haka/CMakeLists.txt -@@ -80,6 +80,11 @@ set_target_properties(libhaka PROPERTIES COMPILE_DEFINITIONS _GNU_SOURCE) - set_target_properties(libhaka PROPERTIES VERSION ${HAKA_VERSION_MAJOR}.${HAKA_VERSION_MINOR}.${HAKA_VERSION_PATCH} - SOVERSION ${HAKA_VERSION_MAJOR}) - -+target_link_libraries(libhaka LINK_PRIVATE ${LUA_LIBRARIES}) -+add_dependencies(libhaka ${LUA_DEPENDENCY}) -+include_directories(${LUA_INCLUDE_DIR}) -+link_directories(${LUA_LIBRARY_DIR}) -+ - target_link_libraries(libhaka LINK_PRIVATE ${DL_LIBRARIES}) - target_link_libraries(libhaka LINK_PRIVATE ${CMAKE_THREAD_LIBS_INIT}) - target_link_libraries(libhaka LINK_PRIVATE ${INIPARSER_LIBRARY}) -@@ -87,11 +92,6 @@ target_link_libraries(libhaka LINK_PRIVATE rt) - target_link_libraries(libhaka LINK_PRIVATE m) - target_link_libraries(libhaka LINK_PRIVATE ${EDITLINE_LIBRARY}) - --target_link_libraries(libhaka LINK_PRIVATE ${LUA_LIBRARIES}) --add_dependencies(libhaka ${LUA_DEPENDENCY}) --include_directories(${LUA_INCLUDE_DIR}) --link_directories(${LUA_LIBRARY_DIR}) -- - set_target_properties(libhaka PROPERTIES OUTPUT_NAME haka) - - # Install |