From fd4bed892c78dd78b0441dfa99b69bd3bd6812d0 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 27 Jan 2020 19:38:56 +0100 Subject: [PATCH] net-analyzer/argus: Fix CFLAGS=-fno-common - EAPI=7 - Set new HOMEPAGE - Remove unneeded definitions to fix CFLAGS=-fno-common Package-Manager: Portage-2.3.85, Repoman-2.3.20 Closes: https://bugs.gentoo.org/706668 Signed-off-by: Jeroen Roovers --- net-analyzer/argus/argus-3.0.8.2-r2.ebuild | 93 +++++++++++++++++++ .../files/argus-3.0.8.2-fno-common.patch | 45 +++++++++ 2 files changed, 138 insertions(+) create mode 100644 net-analyzer/argus/argus-3.0.8.2-r2.ebuild create mode 100644 net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch diff --git a/net-analyzer/argus/argus-3.0.8.2-r2.ebuild b/net-analyzer/argus/argus-3.0.8.2-r2.ebuild new file mode 100644 index 000000000000..73a6fd17e88f --- /dev/null +++ b/net-analyzer/argus/argus-3.0.8.2-r2.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools user + +DESCRIPTION="network Audit Record Generation and Utilization System" +HOMEPAGE="https://openargus.org/" +SRC_URI="https://www.qosient.com/argus/dev/${P/_rc/.rc.}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +IUSE="debug +libtirpc sasl tcpd" + +RDEPEND=" + net-libs/libnsl:= + net-libs/libpcap + sys-libs/zlib + !libtirpc? ( sys-libs/glibc[rpc(-)] ) + libtirpc? ( net-libs/libtirpc ) + sasl? ( dev-libs/cyrus-sasl ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) +" + +DEPEND=" + ${RDEPEND} + >=sys-devel/bison-1.28 + >=sys-devel/flex-2.4.6 +" +PATCHES=( + "${FILESDIR}"/${PN}-3.0.8.1-disable-tcp-wrappers-automagic.patch + "${FILESDIR}"/${PN}-3.0.5-Makefile.patch + "${FILESDIR}"/${PN}-3.0.7.3-DLT_IPNET.patch + "${FILESDIR}"/${PN}-3.0.8.2-rpc.patch + "${FILESDIR}"/${PN}-3.0.8.2-fno-common.patch +) +S=${WORKDIR}/${P/_rc/.rc.} + +pkg_setup() { + enewgroup argus + enewuser argus -1 -1 /var/lib/argus argus +} + +src_prepare() { + find . -type f -execdir chmod +w {} \; #561360 + sed -e 's:/etc/argus.conf:/etc/argus/argus.conf:' \ + -i argus/argus.c \ + -i support/Config/argus.conf \ + -i man/man8/argus.8 \ + -i man/man5/argus.conf.5 || die + + sed -e 's:#\(ARGUS_SETUSER_ID=\).*:\1argus:' \ + -e 's:#\(ARGUS_SETGROUP_ID=\).*:\1argus:' \ + -e 's:\(#ARGUS_CHROOT_DIR=\).*:\1/var/lib/argus:' \ + -i support/Config/argus.conf || die + + default + eautoreconf +} + +src_configure() { + use debug && touch .debug # enable debugging + econf $(use_with libtirpc) $(use_with tcpd wrappers) $(use_with sasl) +} + +src_compile() { + emake CCOPT="${CFLAGS} ${LDFLAGS}" +} + +src_install () { + doman man/man5/*.5 man/man8/*.8 + + dosbin bin/argus{,bug} + + dodoc ChangeLog CREDITS README + + insinto /etc/argus + doins support/Config/argus.conf + + newinitd "${FILESDIR}/argus.initd" argus + keepdir /var/lib/argus +} + +pkg_preinst() { + enewgroup argus + enewuser argus -1 -1 /var/lib/argus argus +} + +pkg_postinst() { + elog "Note, if you modify ARGUS_DAEMON value in argus.conf it's quite" + elog "possible that the init script will fail to work." +} diff --git a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch b/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch new file mode 100644 index 000000000000..66f950d0c04d --- /dev/null +++ b/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch @@ -0,0 +1,45 @@ +--- a/include/argus/bootp.h ++++ b/include/argus/bootp.h +@@ -45,6 +45,8 @@ + unsigned char bp_vend[64]; /* vendor-specific area */ + }; + ++extern struct bootp *bp; ++ + /* + * UDP port numbers, server and client. + */ +--- a/argus/ArgusUdp.c ++++ b/argus/ArgusUdp.c +@@ -40,9 +40,6 @@ + #include + #include + +-#include +-struct bootp *bp; +- + void ArgusUpdateUDPState (struct ArgusModelerStruct *, struct ArgusFlowStruct *, unsigned char *); + + void +--- a/argus/ArgusUdt.c ++++ b/argus/ArgusUdt.c +@@ -40,9 +40,6 @@ + #include + #include + +-#include +-struct bootp *bp; +- + struct ArgusSystemFlow * + ArgusCreateUDTFlow (struct ArgusModelerStruct *model, struct udt_header *udt) + { +--- a/argus/ArgusModeler.c ++++ b/argus/ArgusModeler.c +@@ -43,7 +43,6 @@ + + #include + +-#include + #include + + #include -- 2.26.2