summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2018-01-31 05:35:08 +0100
committerJeroen Roovers <jer@gentoo.org>2018-01-31 05:35:08 +0100
commit2321dd5c4aa02f5c83186193dfc558836c348811 (patch)
tree55c077f9d5b916373eb4f4197234c163e972e0bd /net-analyzer/argus-clients/files
parentx11-drivers/nvidia-drivers: Version 390.25. (diff)
downloadgentoo-2321dd5c4aa02f5c83186193dfc558836c348811.tar.gz
gentoo-2321dd5c4aa02f5c83186193dfc558836c348811.tar.bz2
gentoo-2321dd5c4aa02f5c83186193dfc558836c348811.zip
net-analyzer/argus-clients: Use net-libs/libtirpc.
Package-Manager: Portage-2.3.20, Repoman-2.3.6
Diffstat (limited to 'net-analyzer/argus-clients/files')
-rw-r--r--net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch4
-rw-r--r--net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch31
-rw-r--r--net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch34
3 files changed, 67 insertions, 2 deletions
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
index a08d974ce893..8e240043625d 100644
--- a/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.4.1-disable-tcp-wrappers-automagic.patch
@@ -1,5 +1,5 @@
---- configure.ac.org 2011-01-28 18:26:54.000000000 +0100
-+++ configure.ac 2011-04-20 00:09:37.000000000 +0200
+--- a/configure.ac
++++ b/configure.ac
@@ -121,6 +121,12 @@
esac
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch
new file mode 100644
index 000000000000..e5df5378ab17
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-ar.patch
@@ -0,0 +1,31 @@
+--- a/common/Makefile.in
++++ b/common/Makefile.in
+@@ -113,23 +113,23 @@
+ all: $(LIBS)
+
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+- rm -f $@; ar qc $@ $(COMMONOBJ)
++ rm -f $@; $(AR) qc $@ $(COMMONOBJ)
+ -$(RANLIB) $@
+
+ @INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
+- rm -f $@; ar qc $@ $(PARSEOBJ)
++ rm -f $@; $(AR) qc $@ $(PARSEOBJ)
+ -$(RANLIB) $@
+
+ @INSTALL_LIB@/argus_client.a: $(CLIENTOBJ)
+- rm -f $@; ar qc $@ $(CLIENTOBJ)
++ rm -f $@; $(AR) qc $@ $(CLIENTOBJ)
+ -$(RANLIB) $@
+
+ @INSTALL_LIB@/argus_output.a: $(OUTPUTOBJ)
+- rm -f $@; ar qc $@ $(OUTPUTOBJ)
++ rm -f $@; $(AR) qc $@ $(OUTPUTOBJ)
+ -$(RANLIB) $@
+
+ @INSTALL_LIB@/argus_event.a: $(EVENTOBJ)
+- rm -f $@; ar qc $@ $(EVENTOBJ)
++ rm -f $@; $(AR) qc $@ $(EVENTOBJ)
+ -$(RANLIB) $@
+
+ scanner.c: scanner.l
diff --git a/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
new file mode 100644
index 000000000000..e140fa96b2a3
--- /dev/null
+++ b/net-analyzer/argus-clients/files/argus-clients-3.0.8.2-rpc.patch
@@ -0,0 +1,34 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,7 @@
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ AC_PROG_YACC
++PKG_PROG_PKG_CONFIG
+
+ AC_CHECK_PROGS(V_RANLIB, ranlib, @true)
+ AC_QOSIENT_LEX_AND_YACC(V_LEX, V_YACC, argus_)
+@@ -82,6 +83,12 @@
+ AC_CHECK_HEADERS([stdlib.h stddef.h string.h strings.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h])
+ AC_CHECK_HEADERS([sys/mount.h sys/time.h sys/vfs.h syslog.h termios.h unistd.h values.h ifaddrs.h])
+
++PKG_CHECK_MODULES(libtirpc, libtirpc,
++ [LIBS="${LIBS} ${libtirpc_LIBS}"],
++[AC_CHECK_HEADER([rpc/types.h],,
++ [AC_MSG_ERROR([Cannot find <rpc/types.h>])])]
++)
++
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+ AC_C_INLINE
+--- a/common/Makefile.in
++++ b/common/Makefile.in
+@@ -48,7 +48,7 @@
+
+ CC = @CC@
+ CCOPT = @V_CCOPT@
+-INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@
++INCLS = -I. -I../include @V_INCLS@ @MYSQL_INCLS@ @libtirpc_CFLAGS@
+ DEFS = @DEFS@ -DARGUS_SYSLOG
+
+ # Standard CFLAGS