Bug#557807: NMU

[Steffen Joeris]

Hi

Since it works and Noah could confirm it, I'll NMU (hit me later :) ).

Cheers
Steffen

diff -u argus-2.0.6.fixes.1/debian/changelog argus-2.0.6.fixes.1/debian/changelog
--- argus-2.0.6.fixes.1/debian/changelog
+++ argus-2.0.6.fixes.1/debian/changelog
@@ -1,3 +1,12 @@
+argus (1:2.0.6.fixes.1-16.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Use pcap_dispatch() rather than the private functions
+    pcap_offline_read()/pcap_read() and fix a few compilation errors
+    (Closes: #557807)
+
+ -- Steffen Joeris <wh...@debian.org>  Fri, 22 Jan 2010 15:16:59 +0100
+
 argus (1:2.0.6.fixes.1-16) unstable; urgency=low
 
   * Updated Swedish debconf template translation (closes: #491934)
only in patch2:
unchanged:
--- argus-2.0.6.fixes.1.orig/common/argus_filter.c
+++ argus-2.0.6.fixes.1/common/argus_filter.c
@@ -3628,10 +3628,10 @@
 
 #include <stdio.h>
 
-extern void bpf_dump(struct bpf_program *, int);
+extern void bpf_dump(const struct bpf_program *, int);
 
 void
-bpf_dump(struct bpf_program *p, int option)
+bpf_dump(const struct bpf_program *p, int option)
 {
    struct bpf_insn *insn;
    int i;
only in patch2:
unchanged:
--- argus-2.0.6.fixes.1.orig/include/argus_filter.h
+++ argus-2.0.6.fixes.1/include/argus_filter.h
@@ -142,7 +142,7 @@
 u_int ipaddrtonetmask(u_int);
 u_int getnetnumber(u_int);
 
-void bpf_dump(struct bpf_program *, int);
+void bpf_dump(const struct bpf_program *, int);
 
 char *intoa(u_int);
 static SIGRET nohostname(int);
@@ -225,7 +225,7 @@
 extern u_int ipaddrtonetmask(u_int);
 extern u_int getnetnumber(u_int);
 
-extern void bpf_dump(struct bpf_program *, int);
+extern void bpf_dump(const struct bpf_program *, int);
 
 extern char *intoa(u_int);
 extern char * getname(u_char *);
only in patch2:
unchanged:
--- argus-2.0.6.fixes.1.orig/server/ArgusSource.h
+++ argus-2.0.6.fixes.1/server/ArgusSource.h
@@ -324,7 +324,7 @@
 
 int ArgusCreatePktFromFddi(const struct fddi_header *, struct ether_header *, int);
 
-extern char *bpf_image(struct bpf_insn *, int);
+extern char *bpf_image(const struct bpf_insn *, int);
 
 
 #else /* defined(ArgusSource) */
only in patch2:
unchanged:
--- argus-2.0.6.fixes.1.orig/server/ArgusSource.c
+++ argus-2.0.6.fixes.1/server/ArgusSource.c
@@ -956,7 +956,7 @@
                            ArgusInterfaceIndex = i;
                            switch (ArgusInterface[i].ArgusInterfaceType) {
                               case ARGUSLIBPPKTFILE:
-                                 if ((pcap_read (ArgusPd[i], -1, ArgusCallBack, (u_char *) NULL)) < 0) {
+                                 if ((pcap_dispatch (ArgusPd[i], -1, ArgusCallBack, (u_char *) NULL)) < 0) {
 #ifdef ARGUSDEBUG
                                     ArgusDebug (4, "ArgusGetPackets: pcap_read() returned %s", pcap_geterr(ArgusPd[i]));
 #endif
@@ -1022,7 +1022,7 @@
          } while (noerror && (Nflag != 0) && (!(ArgusShutDownStarted)));
    
       } else {
-         pcap_offline_read (ArgusPd[0], -1, ArgusCallBack, (u_char *) NULL);
+         pcap_dispatch (ArgusPd[0], -1, ArgusCallBack, (u_char *) NULL);
       }
    }