From 2d192e860a94462247e73bda6eeece5768fbb0fd Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Thu, 24 Jan 2008 21:59:21 +0000 Subject: * Rebuild against libnl1. (Closes: #461922) * debian/patches/24-get_mode_fix_r3122.patch - Pull r3122 from upstream stable branch. - Fix getting mode of device. * debian/patches/25-libnl_unique_pid_r3155.patch - Pull r3155 from stable branch. - Ensures that the pid acquired by libnl is unique. * debian/patches/26-libnl_1.0-pre8_r3206.patch - Pull r3206 from upstream stable branch. - Replaces 24-libnl1-pre8_fix.patch, which has been removed. - Fixes a FTBFS on architectures using SIGTRAP in G_BREAKPOINT(). (Closes: #459740) * debian/patches/13-validate_mac_addr.patch - Drop APs with an invalid MAC address. (Closes: #461500) Thanks to Sjoerd Simons for the patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@2056 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/patches/13-validate_mac_addr.patch | 33 +++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 debian/patches/13-validate_mac_addr.patch (limited to 'debian/patches/13-validate_mac_addr.patch') diff --git a/debian/patches/13-validate_mac_addr.patch b/debian/patches/13-validate_mac_addr.patch new file mode 100644 index 00000000..47a81e19 --- /dev/null +++ b/debian/patches/13-validate_mac_addr.patch @@ -0,0 +1,33 @@ +--- network-manager-0.6.5.orig/src/nm-device-802-11-wireless.c ++++ network-manager-0.6.5/src/nm-device-802-11-wireless.c +@@ -3439,6 +3439,20 @@ + } + + static gboolean ++has_valid_ether_addr (NMAccessPoint *ap) ++{ ++ struct ether_addr *addr; ++ int i; ++ ++ addr = nm_ap_get_address (ap); ++ for (i = 0 ; i < ETH_ALEN; i++) ++ if (addr->ether_addr_octet[i] != 0) ++ return TRUE; ++ ++ return FALSE; ++} ++ ++static gboolean + process_scan_results (NMDevice80211Wireless *dev, + const guint8 *res_buf, + guint32 res_buf_len) +@@ -3474,7 +3488,8 @@ + + /* Merge previous AP */ + if (ap) { +- add_new_ap_to_device_list (dev, ap); ++ if (has_valid_ether_addr (ap)) ++ add_new_ap_to_device_list (dev, ap); + nm_ap_unref (ap); + ap = NULL; + } -- cgit 1.3.0-6-gf8a5