Commit 632a954a authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

argus: bump to vanilla version 3.6.0.1



All of the new toolchain requirements (ipv6, threads, rpc) aren't
actually new - this package failed to build for ages, it just wasn't
picked up by the autobuilders because the main Makefile just doesn't
care about bailing out properly.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <peter@korsgaard.com>
parent 143593b9
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
config BR2_PACKAGE_ARGUS
	bool "argus"
	depends on BR2_INET_IPV6
	depends on BR2_TOOLCHAIN_HAS_THREADS
	depends on BR2_USE_MMU # fork()
	select BR2_PACKAGE_LIBPCAP
	select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC
	help
	  A Real Time Flow Monitor-based audit engine.

	  http://qosient.com/argus/

comment "argus needs a toolchain w/ threads, IPv6"
	depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_INET_IPV6)
+1460 −0

File added.

Preview size limit exceeded, changes collapsed.

+0 −1278

File deleted.

Preview size limit exceeded, changes collapsed.

+0 −27
Original line number Diff line number Diff line
Instead of hardcoding a wrong prototype for a libcap function, include
the correct header.

Index: argus-3.0.0.rc.34/argus/ArgusSource.c
===================================================================
--- argus-3.0.0.rc.34.orig/argus/ArgusSource.c	2010-02-09 22:57:21.000000000 +0100
+++ argus-3.0.0.rc.34/argus/ArgusSource.c	2010-02-09 22:57:29.000000000 +0100
@@ -53,6 +53,7 @@
 #define PPP_HDRLEN      4       /* length of PPP header */
 #endif
 
+#include <pcap.h>
 
 void ArgusGetInterfaceStatus (struct ArgusSourceStruct *src);
 
Index: argus-3.0.0.rc.34/argus/ArgusSource.h
===================================================================
--- argus-3.0.0.rc.34.orig/argus/ArgusSource.h	2010-02-09 22:57:35.000000000 +0100
+++ argus-3.0.0.rc.34/argus/ArgusSource.h	2010-02-09 22:57:54.000000000 +0100
@@ -381,7 +381,6 @@
 
 int ArgusCreatePktFromFddi(const struct fddi_header *, struct ether_header *, int);
 
-extern char *bpf_image(struct bpf_insn *, int);
 
 
 #else /* defined(ArgusSource) */
+11 −12
Original line number Diff line number Diff line
@@ -4,20 +4,19 @@
#
################################################################################

ARGUS_VERSION = 3.0.0.rc.34
ARGUS_SOURCE = argus_$(ARGUS_VERSION).orig.tar.gz
ARGUS_PATCH = argus_$(ARGUS_VERSION)-1.diff.gz
ARGUS_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/a/argus/
ARGUS_VERSION = 3.0.6.1
ARGUS_SITE = http://qosient.com/argus/src
ARGUS_DEPENDENCIES = libpcap
ARGUS_CONF_ENV = arg_cv_sys_errlist=yes
# Code is really v2+ though COPYING is v3 so ship README to avoid confusion
ARGUS_LICENSE = GPLv2+
ARGUS_LICENSE_FILES = COPYING
ARGUS_LICENSE_FILES = README

define ARGUS_DEBIAN_PATCH_APPLY
	if [ -d $(@D)/debian/patches ]; then \
		support/scripts/apply-patches.sh $(@D) $(@D)/debian/patches \*.patch; \
	fi
endef

ARGUS_POST_PATCH_HOOKS += ARGUS_DEBIAN_PATCH_APPLY
ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
ARGUS_DEPENDENCIES += libtirpc
ARGUS_CONF_ENV += \
	CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/tirpc/" \
	LDFLAGS="$(TARGET_LDFLAGS) -ltirpc"
endif

$(eval $(autotools-package))