Control: tags 958011 + patch Control: tags 958011 + pending
Dear maintainer, I've prepared an NMU for yersinia (versioned as 0.8.2-2.1) and uploaded it to DELAYED/15. Please feel free to tell me if I should delay it longer. Regards. diff -Nru yersinia-0.8.2/debian/changelog yersinia-0.8.2/debian/changelog --- yersinia-0.8.2/debian/changelog 2017-09-18 07:00:46.000000000 +1200 +++ yersinia-0.8.2/debian/changelog 2020-10-06 12:42:32.000000000 +1300 @@ -1,3 +1,11 @@ +yersinia (0.8.2-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix build failure with gcc-10 now that -fno-common is the default. + (Closes: 958011) + + -- Michael Hudson-Doyle <mwhud...@debian.org> Tue, 06 Oct 2020 12:42:32 +1300 + yersinia (0.8.2-2) unstable; urgency=medium * added fix from Frédéric Bonnard <fre...@linux.vnet.ibm.com> diff -Nru yersinia-0.8.2/debian/control yersinia-0.8.2/debian/control --- yersinia-0.8.2/debian/control 2017-09-18 07:00:46.000000000 +1200 +++ yersinia-0.8.2/debian/control 2020-10-05 16:17:28.000000000 +1300 @@ -1,7 +1,8 @@ Source: yersinia Section: admin Priority: optional -Maintainer: Noël Köthe <n...@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Noël Köthe <n...@debian.org> Build-Depends: debhelper (>= 9.0.0), dh-autoreconf, libncurses5-dev (>=5.4), libnet1-dev (>=1.1.2), libpcap0.8-dev, libgtk2.0-dev, lsb-release Standards-Version: 4.1.0 Homepage: http://www.yersinia.net/ diff -Nru yersinia-0.8.2/debian/patches/gcc10.patch yersinia-0.8.2/debian/patches/gcc10.patch --- yersinia-0.8.2/debian/patches/gcc10.patch 1970-01-01 12:00:00.000000000 +1200 +++ yersinia-0.8.2/debian/patches/gcc10.patch 2020-10-05 16:26:28.000000000 +1300 @@ -0,0 +1,133 @@ +--- a/src/gtk-gui.h ++++ b/src/gtk-gui.h +@@ -47,7 +47,7 @@ + #define MAX_PAD_HEIGHT 40 + #define MAX_PAD_WIDTH 70 + +-u_int8_t pointer[MAX_PROTOCOLS]; ++extern u_int8_t pointer[MAX_PROTOCOLS]; + + void gtk_gui(void *); + void gtk_gui_th_exit(struct term_node *); +--- a/src/interfaces.h ++++ b/src/interfaces.h +@@ -67,7 +67,7 @@ + + #define NO_TIMEOUT 0 + +-list_t *interfaces; ++extern list_t *interfaces; + + struct interface_data { + int8_t up; /* is it active? */ +--- a/src/ncurses-interface.h ++++ b/src/ncurses-interface.h +@@ -80,8 +80,8 @@ + #define CAN_RESIZE 1 + #endif + +-u_int8_t pointer[MAX_PROTOCOLS]; +-WINDOW *info_window; ++extern u_int8_t pointer[MAX_PROTOCOLS]; ++extern WINDOW *info_window; + + int8_t ncurses_i_init(WINDOW *[], PANEL *[], struct term_node *); + void ncurses_i_add_node(void); +--- a/src/protocols.h ++++ b/src/protocols.h +@@ -207,7 +207,7 @@ + end_t end; + }; + +-struct protocol_def protocols[MAX_PROTOCOLS]; ++extern struct protocol_def protocols[MAX_PROTOCOLS]; + + void protocol_init(void); + int8_t protocol_register(u_int8_t, const char *, const char *, const char *, +--- a/src/gtk-gui.c ++++ b/src/gtk-gui.c +@@ -70,6 +70,9 @@ + #include "gtk-interface.h" + #include "gtk-support.h" + ++u_int8_t pointer[MAX_PROTOCOLS]; ++ ++ + void + gtk_gui (void *args) + { +--- a/src/interfaces.c ++++ b/src/interfaces.c +@@ -102,7 +102,7 @@ + + #include "interfaces.h" + +- ++list_t *interfaces; + + + //////////////////////////////////////////////////////////////////////////////////////////////////// +--- a/src/ncurses-interface.c ++++ b/src/ncurses-interface.c +@@ -92,6 +92,8 @@ + #include "ncurses-interface.h" + #include "ncurses-callbacks.h" + ++WINDOW *info_window; ++ + + /* + * Ncurses init +--- a/src/protocols.c ++++ b/src/protocols.c +@@ -61,6 +61,9 @@ + + #include "protocols.h" + ++struct protocol_def protocols[MAX_PROTOCOLS]; ++ ++ + void + protocol_init(void) + { +--- a/src/gtk-interface.c ++++ b/src/gtk-interface.c +@@ -36,7 +36,11 @@ + + #include "gtk-interface.h" + +-#define GLADE_HOOKUP_OBJECT(component,widget,name) \ ++GtkWidget *protocols_tree[MAX_PROTOCOLS + 1]; ++GtkListStore *protocols_tree_model[MAX_PROTOCOLS + 1]; ++ ++ ++#define GLADE_HOOKUP_OBJECT(component,widget,name) \ + g_object_set_data_full (G_OBJECT (component), name, \ + gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) + +--- a/src/gtk-interface.h ++++ b/src/gtk-interface.h +@@ -26,8 +26,8 @@ + #include "gtk-callbacks.h" + #include "gtk-support.h" + +-GtkWidget *protocols_tree[MAX_PROTOCOLS + 1]; +-GtkListStore *protocols_tree_model[MAX_PROTOCOLS + 1]; ++extern GtkWidget *protocols_tree[MAX_PROTOCOLS + 1]; ++extern GtkListStore *protocols_tree_model[MAX_PROTOCOLS + 1]; + + GtkWidget* gtk_i_create_Main (struct gtk_s_helper *); + GtkWidget* gtk_i_create_opendialog (struct gtk_s_helper *); +--- a/src/ncurses-callbacks.h ++++ b/src/ncurses-callbacks.h +@@ -77,8 +77,8 @@ + #define CAN_RESIZE 1 + #endif + +-u_int8_t pointer[MAX_PROTOCOLS]; +-WINDOW *info_window; ++extern u_int8_t pointer[MAX_PROTOCOLS]; ++extern WINDOW *info_window; + + void ncurses_c_refresh_mwindow(u_int8_t, WINDOW *, u_int8_t, struct term_node *); + void ncurses_c_refresh_bwindow(u_int8_t, WINDOW *, struct term_node *); diff -Nru yersinia-0.8.2/debian/patches/series yersinia-0.8.2/debian/patches/series --- yersinia-0.8.2/debian/patches/series 2016-09-23 01:57:16.000000000 +1200 +++ yersinia-0.8.2/debian/patches/series 2020-10-05 16:04:13.000000000 +1300 @@ -1 +1,2 @@ yersinia_reproducible.patch +gcc10.patch
