Control: tags 952064 + patch Control: tags 952064 + pending Dear maintainer,
I've prepared an NMU for labrea (versioned as 2.5-stable-3.1) and uploaded it to mentors for sponsoring. Please feel free to tell me if I should remove it. -- Regards Sudip diff -u labrea-2.5-stable/debian/changelog labrea-2.5-stable/debian/changelog --- labrea-2.5-stable/debian/changelog +++ labrea-2.5-stable/debian/changelog @@ -1,3 +1,10 @@ +labrea (2.5-stable-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS. (Closes: #952064) + + -- Sudip Mukherjee <sudipm.mukher...@gmail.com> Wed, 08 Apr 2020 13:06:10 +0100 + labrea (2.5-stable-3) unstable; urgency=low * Adopting the package (Closes: #424715). diff -u labrea-2.5-stable/debian/patches/series labrea-2.5-stable/debian/patches/series --- labrea-2.5-stable/debian/patches/series +++ labrea-2.5-stable/debian/patches/series @@ -2,0 +3 @@ +fix_pcap_open.patch only in patch2: unchanged: --- labrea-2.5-stable.orig/debian/patches/fix_pcap_open.patch +++ labrea-2.5-stable/debian/patches/fix_pcap_open.patch @@ -0,0 +1,54 @@ +Description: Fix FTBFS + libpcap moved the declaration of pcap_open() to pcap.h and so its now + visible to labrea. So, it had a conflict with the private pcap_open() + which labrea has defined. Rename pcap_open() to _pcap_open(). + + ref: https://github.com/the-tcpdump-group/libpcap/commit/a372536befc9b1ee1d355058daa2eb9f66aa0c59 + +Author: Sudip Mukherjee <sudipm.mukher...@gmail.com> +Bug-Debian: https://bugs.debian.org/952064 + +--- + +--- a/inc/pcaputil.h ++++ b/inc/pcaputil.h +@@ -15,7 +15,7 @@ + #endif + + +-pcap_t * pcap_open(char *device); ++pcap_t * _pcap_open(char *device); + int pcap_dloff(pcap_t *pcap); + int pcap_filter(pcap_t *pcap, const char *fmt, ...); + void pcap_stat (pcap_t *pd); +--- a/src/lbio.c ++++ b/src/lbio.c +@@ -190,7 +190,7 @@ open_winpcap_adapter() + /* + * Open the WinPcap device for sniffing + */ +- if ((io.pcap = pcap_open(io.adapter_name_list[j])) == NULL) { ++ if ((io.pcap = _pcap_open(io.adapter_name_list[j])) == NULL) { + warnx("*** Couldn't open WinPcap adapter" ); + return(-1); + } +@@ -286,7 +286,7 @@ lbio_init(u_char *dev, u_char *texpr) + util_clean_exit(1); + + } else { /* open Unix pcap device for sniffing */ +- if ((io.pcap = pcap_open(io.ifent->intf_name)) == NULL) { ++ if ((io.pcap = _pcap_open(io.ifent->intf_name)) == NULL) { + warnx("*** Couldn't open pcap device for sniffing" ); + util_clean_exit(1); + } +--- a/src/pcaputil.c ++++ b/src/pcaputil.c +@@ -52,7 +52,7 @@ + #include "pcaputil.h" + + pcap_t * +-pcap_open(char *device) ++_pcap_open(char *device) + { + char ebuf[PCAP_ERRBUF_SIZE]; + pcap_t *pcap;
