gentoo resync : 20.03.2021

2 files changed, 0 insertions, 90 deletions

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
deleted file mode 100644
index 66f950d0c04d..000000000000
--- a/net-analyzer/argus/files/argus-3.0.8.2-fno-common.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- 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 <argus_compat.h>
- #include <ArgusModeler.h>
- 
--#include <argus/bootp.h>
--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 <argus_compat.h>
- #include <ArgusModeler.h>
- 
--#include <argus/bootp.h>
--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 <argus.h>
- 
--#include <argus/bootp.h>
- #include <signal.h>
- 
- #include <sched.h>
diff --git a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch b/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
deleted file mode 100644
index 96af0caf140e..000000000000
--- a/net-analyzer/argus/files/argus-3.0.8.2-rpc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- a/common/Makefile.in
-+++ b/common/Makefile.in
-@@ -35,12 +35,12 @@
- 
- CC = @CC@
- CCOPT = @V_CCOPT@
--INCLS = -I$(srcdir) @V_INCLS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
-+INCLS = -I$(srcdir) @V_INCLS@ @RPC_CFLAGS@ -I$(srcdir)/../include  -I$(srcdir)/../argus
- DEFS = @DEFS@
- 
- # Standard CFLAGS
- CFLAGS = $(CCOPT) $(INCLS) $(DEFS)
--LDFLAGS = @LDFLAGS@
-+LDFLAGS = @LDFLAGS@ @RPC_LIBS@
- 
- INSTALL = @INSTALL@
- RANLIB = @V_RANLIB@
---- a/configure.ac
-+++ b/configure.ac
-@@ -120,6 +120,25 @@
- AC_CHECK_FUNCS(floorf remainderf)
- AC_CHECK_FUNCS(timegm)
- 
-+AC_ARG_WITH([libtirpc],
-+           AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
-+           [], [ with_libtirpc=no ])
-+
-+AS_IF([test "x$with_libtirpc" != xno], 
-+      [PKG_CHECK_MODULES([TIRPC], 
-+                         [libtirpc], 
-+                         [RPC_CFLAGS=$TIRPC_CFLAGS; RPC_LIBS=$TIRPC_LIBS;],
-+                        [AC_MSG_ERROR([libtirpc requested, but library not found.])]
-+                       )], 
-+      [AC_CHECK_HEADER(rpc/rpc.h, 
-+                      [RPC_CFLAGS=""; RPC_LIBS="";],
-+                      [AC_MSG_ERROR([sunrpc requested, but headers are not present.])]
-+                     )]
-+)
-+
-+AC_SUBST(RPC_CFLAGS)
-+AC_SUBST(RPC_LIBS)
-+
- AC_CHECK_FUNCS(xdrmem_create)
- if test "$ac_cv_func_xdrmem_create" = yes ; then
-    AC_DEFINE([HAVE_XDR], [], [Using system XDR library])