Control: tags 956970 + patch Control: tags 956970 + pending
Dear maintainer, I've prepared an NMU for 4g8 (versioned as 1.0-3.3) and uploaded it to DELAYED/15. Please feel free to tell me if I should delay it longer. Regards. diff -u 4g8-1.0/debian/changelog 4g8-1.0/debian/changelog --- 4g8-1.0/debian/changelog +++ 4g8-1.0/debian/changelog @@ -1,3 +1,11 @@ +4g8 (1.0-3.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with GCC 10 by ensuring global variables only have one + definition. (Closes: #956970) + + -- Michael Hudson-Doyle <mwhud...@debian.org> Tue, 06 Oct 2020 13:51:30 +1300 + 4g8 (1.0-3.2) unstable; urgency=medium * Non-maintainer upload. diff -u 4g8-1.0/src/globals.h 4g8-1.0/src/globals.h --- 4g8-1.0/src/globals.h +++ 4g8-1.0/src/globals.h @@ -128,20 +128,20 @@ #define P_UINT64 0xFFFFFFFFFFFFFFFF -char w_file[OPT_MAXLEN]; +extern char w_file[OPT_MAXLEN]; -pcap_t *pkt; -libnet_t *pkt_d; -u_int8_t *device; -u_int8_t display; -u_int8_t dump_pkt; -u_int16_t payload_len; -u_int16_t hdr_len; -u_int16_t ip_hdrlen; -u_int8_t *gw_ip; -u_int8_t *gw_mac; -u_int8_t *host_ip; -u_int8_t *host_mac; -u_int8_t outbound; -u_int8_t poison_cache; +extern pcap_t *pkt; +extern libnet_t *pkt_d; +extern u_int8_t *device; +extern u_int8_t display; +extern u_int8_t dump_pkt; +extern u_int16_t payload_len; +extern u_int16_t hdr_len; +extern u_int16_t ip_hdrlen; +extern u_int8_t *gw_ip; +extern u_int8_t *gw_mac; +extern u_int8_t *host_ip; +extern u_int8_t *host_mac; +extern u_int8_t outbound; +extern u_int8_t poison_cache; #endif /* __GLOBALS_H */ only in patch2: unchanged: --- 4g8-1.0.orig/src/error.h +++ 4g8-1.0/src/error.h @@ -29,7 +29,7 @@ #define SUCCESS 1 #define FAILURE -1 -char error_buf[ERRBUF_MAXLEN]; +extern char error_buf[ERRBUF_MAXLEN]; void fatal_error(u_int8_t *,...); only in patch2: unchanged: --- 4g8-1.0.orig/src/main.c +++ 4g8-1.0/src/main.c @@ -22,6 +22,25 @@ #include "main.h" +char w_file[OPT_MAXLEN]; + +pcap_t *pkt; +libnet_t *pkt_d; +u_int8_t *device; +u_int8_t display; +u_int8_t dump_pkt; +u_int16_t payload_len; +u_int16_t hdr_len; +u_int16_t ip_hdrlen; +u_int8_t *gw_ip; +u_int8_t *gw_mac; +u_int8_t *host_ip; +u_int8_t *host_mac; +u_int8_t outbound; +u_int8_t poison_cache; + +char error_buf[ERRBUF_MAXLEN]; + int main(int argc, char *argv[]) {