Control: tags 957369 + patch
Control: tags 957369 + pending
--

Dear maintainer,

I've prepared an NMU for ipband (versioned as 0.8.1-5.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should cancel it.

--
Regards
Sudip

diff -Nru ipband-0.8.1/debian/changelog ipband-0.8.1/debian/changelog
--- ipband-0.8.1/debian/changelog       2016-12-06 14:13:55.000000000 +0000
+++ ipband-0.8.1/debian/changelog       2020-11-11 19:11:52.000000000 +0000
@@ -1,3 +1,10 @@
+ipband (0.8.1-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix ftbfs with GCC-10. (Closes: #957369)
+
+ -- Sudip Mukherjee <sudipm.mukher...@gmail.com>  Wed, 11 Nov 2020 19:11:52 
+0000
+
 ipband (0.8.1-5) unstable; urgency=low
 
   * Step up to Standards version 3.9.8, no changes.
diff -Nru ipband-0.8.1/debian/patches/07_fix_gcc-10.patch 
ipband-0.8.1/debian/patches/07_fix_gcc-10.patch
--- ipband-0.8.1/debian/patches/07_fix_gcc-10.patch     1970-01-01 
01:00:00.000000000 +0100
+++ ipband-0.8.1/debian/patches/07_fix_gcc-10.patch     2020-11-11 
19:02:50.000000000 +0000
@@ -0,0 +1,123 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee <sudipm.mukher...@gmail.com>
+Bug-Debian: https://bugs.debian.org/957369
+Forwarded: no
+
+---
+
+--- ipband-0.8.1.orig/ipband.h
++++ ipband-0.8.1/ipband.h
+@@ -174,40 +174,40 @@ Global variables
+ extern char pcap_version[];
+ 
+ /* Internal use */
+-int    isig_m;                        /* Interupt flag for capture loop */
+-int    preload_m;             /* Subnets are preloaded flag */
+-char   *pcapdev_m;            /* Device to listen to */
+-pcap_t *pcapfile_m;           /* Pcap input file descriptor */
+-int    pcapoffset_m;          /* IP header offset */
+-time_t started_m;             /* Time when we started */
++extern int    isig_m;                         /* Interupt flag for capture 
loop */
++extern int    preload_m;              /* Subnets are preloaded flag */
++extern char   *pcapdev_m;             /* Device to listen to */
++extern pcap_t *pcapfile_m;            /* Pcap input file descriptor */
++extern int    pcapoffset_m;           /* IP header offset */
++extern time_t started_m;              /* Time when we started */
+ 
+-ll_srvc_t *ll_tcp_cache;      /* Resolved tcp services cache */
+-ll_srvc_t *ll_udp_cache;      /* Resolved udp services cache */
++extern ll_srvc_t *ll_tcp_cache;       /* Resolved tcp services cache */
++extern ll_srvc_t *ll_udp_cache;       /* Resolved udp services cache */
+ 
+ 
+ /* Variables holding option values */
+-int    debug_m;               /* Debug option */
+-int    do_html;                       /* Generate HTML output */
+-char   *filtercmd_m;          /* Pcap filter string */
+-char   *repfname_m;           /* Subnet report output file */
+-char   *htmlfname_m;          /* HTML report output file */
+-char   *htmltitle_m;          /* HTML Title */
+-int    mask_m;                        /* Network aggregation mask bits */
+-int    cycle_m;                       /* Number of sec to average data */
+-int    rcycle_m;              /* How long in sec bandwidth
++extern int    debug_m;                /* Debug option */
++extern int    do_html;                        /* Generate HTML output */
++extern char   *filtercmd_m;           /* Pcap filter string */
++extern char   *repfname_m;            /* Subnet report output file */
++extern char   *htmlfname_m;           /* HTML report output file */
++extern char   *htmltitle_m;           /* HTML Title */
++extern int    mask_m;                 /* Network aggregation mask bits */
++extern int    cycle_m;                        /* Number of sec to average 
data */
++extern int    rcycle_m;               /* How long in sec bandwidth
+                                  threshold may be exceeded */
+-float  thresh_m;              /* Bandwidth threshold in kBps */
+-int    fork_m;                        /* Fork flag */
+-int    top_m;                 /* No of top connections in report */
+-char   *config_m;             /* Config file name */
+-char   *mailto_m;             /* E-mail address for reporting */
+-char   *mailfoot_m;           /* Footer file for e-mail report */
+-char   *mtastring_m;          /* MTA command string */
+-int    report_aggr_m;         /* Flag to report aggr exceed time */
+-int    promisc_m;             /* Use promiscious mode? */
+-int    *iplist_m;             /* List of local networks */
+-int    niplist_m;             /* Number of local networks */
+-int    lenadj_m;              /* IP packet length adjustment in bytes */
++extern float  thresh_m;               /* Bandwidth threshold in kBps */
++extern int    fork_m;                 /* Fork flag */
++extern int    top_m;                  /* No of top connections in report */
++extern char   *config_m;              /* Config file name */
++extern char   *mailto_m;              /* E-mail address for reporting */
++extern char   *mailfoot_m;            /* Footer file for e-mail report */
++extern char   *mtastring_m;           /* MTA command string */
++extern int    report_aggr_m;          /* Flag to report aggr exceed time */
++extern int    promisc_m;              /* Use promiscious mode? */
++extern int    *iplist_m;              /* List of local networks */
++extern int    niplist_m;              /* Number of local networks */
++extern int    lenadj_m;               /* IP packet length adjustment in bytes 
*/
+ 
+ 
+ /*
+--- ipband-0.8.1.orig/main.c
++++ ipband-0.8.1/main.c
+@@ -32,7 +32,40 @@
+ ll_srvc_t *ll_tcp_cache = NULL;         /* Resolved tcp services cache */
+ ll_srvc_t *ll_udp_cache = NULL;         /* Resolved udp services cache */
+ 
++/* Internal use */
++int    isig_m;                        /* Interupt flag for capture loop */
++int    preload_m;             /* Subnets are preloaded flag */
++char   *pcapdev_m;            /* Device to listen to */
++pcap_t *pcapfile_m;           /* Pcap input file descriptor */
++int    pcapoffset_m;          /* IP header offset */
++time_t started_m;             /* Time when we started */
+ 
++ll_srvc_t *ll_tcp_cache;      /* Resolved tcp services cache */
++ll_srvc_t *ll_udp_cache;      /* Resolved udp services cache */
++
++/* Variables holding option values */
++int    debug_m;                       /* Debug option */
++int    do_html;                       /* Generate HTML output */
++char   *filtercmd_m;          /* Pcap filter string */
++char   *repfname_m;           /* Subnet report output file */
++char   *htmlfname_m;          /* HTML report output file */
++char   *htmltitle_m;          /* HTML Title */
++int    mask_m;                        /* Network aggregation mask bits */
++int    cycle_m;                       /* Number of sec to average data */
++int    rcycle_m;              /* How long in sec bandwidth
++                                 threshold may be exceeded */
++float  thresh_m;              /* Bandwidth threshold in kBps */
++int    fork_m;                        /* Fork flag */
++int    top_m;                 /* No of top connections in report */
++char   *config_m;             /* Config file name */
++char   *mailto_m;             /* E-mail address for reporting */
++char   *mailfoot_m;           /* Footer file for e-mail report */
++char   *mtastring_m;          /* MTA command string */
++int    report_aggr_m;         /* Flag to report aggr exceed time */
++int    promisc_m;             /* Use promiscious mode? */
++int    *iplist_m;             /* List of local networks */
++int    niplist_m;             /* Number of local networks */
++int    lenadj_m;              /* IP packet length adjustment in bytes */
+ 
+ int main (int argc, char *argv[]) {
+ 
diff -Nru ipband-0.8.1/debian/patches/series ipband-0.8.1/debian/patches/series
--- ipband-0.8.1/debian/patches/series  2016-12-05 22:24:07.000000000 +0000
+++ ipband-0.8.1/debian/patches/series  2020-11-11 18:59:07.000000000 +0000
@@ -4,3 +4,4 @@
 04_check_mailer_strings.diff
 05_reproducible_timestamp.diff
 06_spelling_errors.diff
+07_fix_gcc-10.patch

Reply via email to