rpms/argus/F-12 argus-2.0.6.fixes.1-libpcap10.patch, 1.1, 1.2 argus.spec, 1.13, 1.14

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/argus/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30493/F-12

Modified Files:
	argus-2.0.6.fixes.1-libpcap10.patch argus.spec 
Log Message:
remove conflicting redeclaration of bpf_image

argus-2.0.6.fixes.1-libpcap10.patch:
 common/argus_filter.c  |   14 +++++++-------
 include/argus_filter.h |    4 ----
 server/ArgusSource.h   |    2 --
 3 files changed, 7 insertions(+), 13 deletions(-)

Index: argus-2.0.6.fixes.1-libpcap10.patch
===================================================================
RCS file: /cvs/pkgs/rpms/argus/F-12/argus-2.0.6.fixes.1-libpcap10.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- argus-2.0.6.fixes.1-libpcap10.patch	4 Oct 2009 06:45:15 -0000	1.1
+++ argus-2.0.6.fixes.1-libpcap10.patch	4 Oct 2009 07:01:10 -0000	1.2
@@ -76,3 +76,15 @@ diff -ur argus-2.0.6.fixes.1/include/arg
  extern char *intoa(u_int);
  extern char * getname(u_char *);
  
+diff -ur argus-2.0.6.fixes.1/server/ArgusSource.h argus-2.0.6.fixes.1-libpcap10/server/ArgusSource.h
+--- argus-2.0.6.fixes.1/server/ArgusSource.h	2004-02-23 16:00:36.000000000 +0100
++++ argus-2.0.6.fixes.1-libpcap10/server/ArgusSource.h	2009-10-04 08:57:29.000000000 +0200
+@@ -324,8 +324,6 @@
+ 
+ int ArgusCreatePktFromFddi(const struct fddi_header *, struct ether_header *, int);
+ 
+-extern char *bpf_image(struct bpf_insn *, int);
+-
+ 
+ #else /* defined(ArgusSource) */
+ 


Index: argus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/argus/F-12/argus.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- argus.spec	4 Oct 2009 06:45:15 -0000	1.13
+++ argus.spec	4 Oct 2009 07:01:10 -0000	1.14
@@ -128,7 +128,8 @@ fi
 
 %changelog
 * Sun Oct 04 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.0.6.fixes.1-19
-- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol)
+- Fix build with libpcap 1.0 (rename conflicting bpf_dump symbol, remove
+  conflicting redeclaration of bpf_image)
 
 * Wed Sep 30 2009 Gabriel Somlo <somlo at cmu.edu> - 2.0.6.fixes.1-18
 - Rebuilt for libpcap.1.0