diff -u network-manager-applet-0.6.5/debian/changelog network-manager-applet-0.6.5/debian/changelog --- network-manager-applet-0.6.5/debian/changelog +++ network-manager-applet-0.6.5/debian/changelog @@ -1,3 +1,10 @@ +network-manager-applet (0.6.5-0ubuntu11) hardy; urgency=low + + * debian/patches/15_lp124336_missing_prototype_causes_connect_to_other_networks_sigsegv.patch: + Fix SIGSEGV caused by pointer>int>pointer conversion on x86_64. (LP: #124336) + + -- TJ Thu, 25 Oct 2007 21:00:00 +0000 + network-manager-applet (0.6.5-0ubuntu10) gutsy; urgency=low * debian/control: add missing depends on gksu to allow manual only in patch2: unchanged: --- network-manager-applet-0.6.5.orig/debian/patches/15_lp124336_missing_prototype_causes_connect_to_other_networks_sigsegv.patch +++ network-manager-applet-0.6.5/debian/patches/15_lp124336_missing_prototype_causes_connect_to_other_networks_sigsegv.patch @@ -0,0 +1,11 @@ +diff -Nru network-manager-applet-0.6.5.orig/src/wso-private.h network-manager-applet-0.6.5/src/wso-private.h +--- network-manager-applet-0.6.5.orig/src/wso-private.h 2007-04-19 19:01:13.000000000 +0100 ++++ network-manager-applet-0.6.5/src/wso-private.h 2007-10-27 14:18:18.000000000 +0100 +@@ -80,6 +80,7 @@ + #define WPA_KEY_TYPE_CIPHER_COL 1 + + GtkTreeModel * wso_wpa_create_key_type_model (int capabilities, gboolean wpa_eap, int *num_added); ++GtkTreeModel * wso_wpa_create_phase2_type_model (int capabilities, gboolean wpa_eap, int *num_added); + + + #endif /* WIRELESS_SECURITY_OPTION_PRIVATE_H */