Hello Andrew,

At Imagination Technologies (http://imgtec.com/) Dejan Latinovic has
found solutions to Debian bugs #599972 and #749578.

https://bugs.debian.org/599972
https://bugs.debian.org/749578

My NMU patch for argus_3.0.0-3.1 is below, at the end of this message.

With the changes in the NMU patch argus builds successfully on mips,
mipsel and amd64.

Regards,

Aníbal
--
Aníbal Monsalve Salazar <[email protected]>

debdiff argus_3.0.0-3.dsc argus_3.0.0-3.1.dsc
diff -Nru argus-3.0.0/debian/changelog argus-3.0.0/debian/changelog
--- argus-3.0.0/debian/changelog        2014-05-28 13:35:59.000000000 +0100
+++ argus-3.0.0/debian/changelog        2014-05-28 13:35:15.000000000 +0100
@@ -1,3 +1,19 @@
+argus (2:3.0.0-3.1) experimental; urgency=low
+
+  * Non-maintainer upload.
+  * Replace the private libpcap function pcap_offline_read
+    with the proper pcap_dispatch function.
+    Add use-pcap_dispatch.patch.
+    Patch by Dejan Latinovic <[email protected]>
+    Closes: #599972.
+  * Remove argus_get_leng.
+    These changes are included in newer, (3.0.2) argus version.
+    Add remove-argus_get_leng.patch.
+    Patch by Dejan Latinovic <[email protected]>
+    Closes: #749578.
+
+ -- Anibal Monsalve Salazar <[email protected]>  Wed, 28 May 2014 13:34:20 
+0100
+
 argus (2:3.0.0-3) experimental; urgency=low
 
   * debian/rules: make /var/log/argus 750 again
diff -Nru argus-3.0.0/debian/patches/remove-argus_get_leng.patch 
argus-3.0.0/debian/patches/remove-argus_get_leng.patch
--- argus-3.0.0/debian/patches/remove-argus_get_leng.patch      1970-01-01 
01:00:00.000000000 +0100
+++ argus-3.0.0/debian/patches/remove-argus_get_leng.patch      2014-05-28 
13:34:00.000000000 +0100
@@ -0,0 +1,34 @@
+From: Dejan Latinovic <[email protected]>
+Subject: argus FTBFS with an error: conflicting types for 'argus_get_leng'
+Date: Tue, 27 May 2014 06:43:46 -0700
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749578
+
+The reason for the new failure is that flex was upgraded to new version
+2.5.39-6.
+
+To avoid this error I created a new patch removing-argus_get_leng.patch.
+These changes are included in newer, (3.0.2) argus version.
+
+--- a/common/scanner.l 2008-02-05 03:37:42.000000000 +0000
++++ b/common/scanner.l 2009-08-17 14:34:34.000000000 +0000
+@@ -64,7 +64,11 @@
+ #include <argus_filter.h>
+ 
+ #include <tokdefs.h>
++
++#if (HAVE_SYSLOG_H)
+ #include <syslog.h>
++#endif
++
+ 
+ #if !defined(HAVE_STRTOF)
+ float strtof (char *, char **);
+@@ -85,7 +89,6 @@
+ int argus_get_lineno (void);
+ FILE *argus_get_in (void);
+ FILE *argus_get_out (void);
+-int argus_get_leng (void);
+ char *argus_get_text(void);
+ void argus_set_lineno (int);
+ void argus_set_in (FILE *);
diff -Nru argus-3.0.0/debian/patches/series argus-3.0.0/debian/patches/series
--- argus-3.0.0/debian/patches/series   1970-01-01 01:00:00.000000000 +0100
+++ argus-3.0.0/debian/patches/series   2014-05-28 08:38:14.000000000 +0100
@@ -0,0 +1,2 @@
+use-pcap_dispatch.patch
+remove-argus_get_leng.patch
diff -Nru argus-3.0.0/debian/patches/use-pcap_dispatch.patch 
argus-3.0.0/debian/patches/use-pcap_dispatch.patch
--- argus-3.0.0/debian/patches/use-pcap_dispatch.patch  1970-01-01 
01:00:00.000000000 +0100
+++ argus-3.0.0/debian/patches/use-pcap_dispatch.patch  2014-05-19 
13:54:06.000000000 +0100
@@ -0,0 +1,23 @@
+From: Dejan Latinovic <[email protected]>
+Subject: Re: Bug#599972: argus: FTBFS on mips*: cp: cannot stat `./bin/argus': 
No such file or directory
+Date: Fri, 11 Apr 2014 12:31:46 +0000
+
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=599972
+
+Replace the private libpcap function pcap_offline_read
+with the proper pcap_dispatch function.
+
+A similar issue is reported here:
+https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=545595
+
+--- a/argus/ArgusSource.c      2008-03-17 15:00:51.000000000 +0000
++++ b/argus/ArgusSource.c      2014-04-11 12:12:36.000000000 +0000
+@@ -2209,7 +2209,7 @@
+       } else {
+          for (i = 0; i < src->ArgusInterfaces; i++) {
+             src->ArgusThisIndex = i;
+-            pcap_offline_read (src->ArgusInterface[i].ArgusPd, src->eNflag,
++            pcap_dispatch (src->ArgusInterface[i].ArgusPd, src->eNflag,
+                        src->ArgusInterface[i].ArgusCallBack, (u_char *) src);
+          }
+       }
diff -Nru argus-3.0.0/debian/source/format argus-3.0.0/debian/source/format
--- argus-3.0.0/debian/source/format    1970-01-01 01:00:00.000000000 +0100
+++ argus-3.0.0/debian/source/format    2014-05-19 14:10:49.000000000 +0100
@@ -0,0 +1 @@
+3.0 (quilt)

Attachment: signature.asc
Description: Digital signature

Reply via email to