aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-07-06 19:13:38 +0300
committerKaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>2017-07-06 19:13:38 +0300
commit21c087d34e63123d0cb1d9c70cf57103ba1219eb (patch)
treeef8dab97e9d6bb35ae26f45efe3b9ed2774fc63e
parent3a06b955419d78ecea6d97d47447e5a6e5d3fc07 (diff)
downloadaports-21c087d34e63123d0cb1d9c70cf57103ba1219eb.tar.bz2
aports-21c087d34e63123d0cb1d9c70cf57103ba1219eb.tar.xz
community/captagent: backport from v3.3
-rw-r--r--main/captagent/0001-Define-PATH_MAX-if-not-defined.patch30
-rw-r--r--main/captagent/APKBUILD48
-rw-r--r--main/captagent/ac-fix.patch12
-rw-r--r--main/captagent/captagent.initd13
4 files changed, 103 insertions, 0 deletions
diff --git a/main/captagent/0001-Define-PATH_MAX-if-not-defined.patch b/main/captagent/0001-Define-PATH_MAX-if-not-defined.patch
new file mode 100644
index 0000000000..27de02c9aa
--- /dev/null
+++ b/main/captagent/0001-Define-PATH_MAX-if-not-defined.patch
@@ -0,0 +1,30 @@
+From 15fc71cc82f2dc93321b60d557efdc968f5d9433 Mon Sep 17 00:00:00 2001
+From: Breno Leitao <breno.leitao@gmail.com>
+Date: Tue, 9 May 2017 16:54:49 +0000
+Subject: [PATCH] Define PATH_MAX if not defined
+
+On systems without glibc, you might lack definition of PATH_MAX.
+Defining it as already defined it for interface_http.c as defined in
+civetweb.c.
+---
+ src/modules/interface/http/interface_http.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/modules/interface/http/interface_http.c b/src/modules/interface/http/interface_http.c
+index 5c71e8e..4686c89 100644
+--- a/src/modules/interface/http/interface_http.c
++++ b/src/modules/interface/http/interface_http.c
+@@ -53,6 +53,10 @@
+ #include <json.h>
+ #endif
+
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ #include <captagent/globals.h>
+ #include <captagent/api.h>
+ #include <captagent/structure.h>
+--
+2.12.2
+
diff --git a/main/captagent/APKBUILD b/main/captagent/APKBUILD
new file mode 100644
index 0000000000..b1e996b351
--- /dev/null
+++ b/main/captagent/APKBUILD
@@ -0,0 +1,48 @@
+# Contributor: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+# Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
+pkgname=captagent
+pkgver=6.1.0.20
+pkgrel=4
+pkgdesc="HEP Capture Agent for HOMER"
+url="https://github.com/sipcapture/captagent"
+arch="all"
+license="GPL3"
+makedepends="autoconf automake bison expat-dev flex flex-dev json-c-dev libtool libpcap-dev linux-headers"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sipcapture/captagent/archive/$pkgver.tar.gz
+ $pkgname.initd
+ 0001-Define-PATH_MAX-if-not-defined.patch
+ ac-fix.patch"
+builddir="$srcdir/$pkgname-$pkgver"
+
+prepare() {
+ cd "$builddir"
+ for i in $source; do
+ case $i in
+ *.patch)
+ msg "Applying $i"
+ patch -p1 -i "$srcdir"/$i || return 1
+ ;;
+ esac
+ done
+}
+
+build() {
+ cd "$builddir" && ./build.sh && ./configure \
+ --build=$CBUILD \
+ --host=$CHOST \
+ --prefix=/usr \
+ --sysconfdir=/etc &&
+ make
+}
+
+package() {
+ cd "$builddir" && make install DESTDIR="$pkgdir" && \
+ install -D "$srcdir"/$pkgname.initd \
+ "$pkgdir"/etc/init.d/$pkgname && \
+ rm "$pkgdir"/usr/lib/$pkgname/modules/*.a
+}
+
+sha512sums="b867a41dfe98015f01fa8c67e57214754231eeec40d0685983fca9aacf53cc5287c2c9959f4752c80004ad5abc2e8a96058797b6b7cdc259a48443c1a909b609 captagent-6.1.0.20.tar.gz
+750326291fc65fa9a3568f6961f2d6b950baa715e75ad7fc8263956cc91c50445e2e041d8f73675a350ba0d55786908564b439396376d8105fb69332e8aefc27 captagent.initd
+f7c04f5e273dd362f09fd1e6a605f56dcaf64c71cd0d6ba16dadaca5e005b1f29dccd81b186c3727d2fc7872bd684ca4ddc8fc7a2a36fd83956592a134ea6a37 0001-Define-PATH_MAX-if-not-defined.patch
+c0bbbbf2f96c7644b154e71b672af5a0d7c209dd5b309b6f6b35915a04f30a33ff4fc18e408e3f1641d4ca6ae51430f9ac0189984f828353263fb52e985b47c1 ac-fix.patch"
diff --git a/main/captagent/ac-fix.patch b/main/captagent/ac-fix.patch
new file mode 100644
index 0000000000..cbd049c11e
--- /dev/null
+++ b/main/captagent/ac-fix.patch
@@ -0,0 +1,12 @@
+diff -ru captagent-6.1.0.20/configure.ac captagent-6.1.0.20.alpine/configure.ac
+--- captagent-6.1.0.20/configure.ac 2016-06-01 14:42:19.000000000 +0300
++++ captagent-6.1.0.20.alpine/configure.ac 2017-02-03 22:06:46.098797592 +0200
+@@ -181,7 +181,7 @@
+ echo " the LDFLAGS to set its proper path.";
+ AC_MSG_ERROR([Fatal: libjson not found.])])])
+
+-AC_CHECK_LIB(fl, yywrap, [ FLEX_LIBS="-lfl" ] , [AC_MSG_ERROR([captagent requires but cannot find libfl])])
++FLEX_LIBS="-lfl"
+
+ AC_SUBST(PTHREAD_LIBS)
+ AC_SUBST(DL_LIBS)
diff --git a/main/captagent/captagent.initd b/main/captagent/captagent.initd
new file mode 100644
index 0000000000..4d5d8b9eb7
--- /dev/null
+++ b/main/captagent/captagent.initd
@@ -0,0 +1,13 @@
+#!/sbin/openrc-run
+
+# init.d file for captagent
+# Copyright (c) 2017 Kaarle Ritvanen
+
+name=captagent
+command=/usr/bin/$name
+command_args=-d
+pidfile=/var/run/$name.pid
+
+depend() {
+ need net
+}