* 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

1 files changed, 0 insertions, 46 deletions

diff --git a/debian/patches/24-libnl1-pre8_fix.patch b/debian/patches/24-libnl1-pre8_fix.patch
deleted file mode 100644
index 26a54e7b..00000000
--- a/debian/patches/24-libnl1-pre8_fix.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-=== modified file 'src/NetworkManagerSystem.c'
---- src/NetworkManagerSystem.c	2007-12-20 06:06:27 +0000
-+++ src/NetworkManagerSystem.c	2007-12-20 06:57:47 +0000
-@@ -224,16 +224,33 @@
- 
- static struct nl_handle * new_nl_handle (void)
- {
--	struct nl_handle *	nlh = NULL;
--
--	nlh = nl_handle_alloc_nondefault(NL_CB_VERBOSE);
--	nl_handle_set_pid (nlh, (pthread_self() << 16 | getpid()));
--	if (nl_connect(nlh, NETLINK_ROUTE) < 0)
--	{
--		nm_warning ("%s: couldn't connecto to netlink: %s", __func__, nl_geterror());
-+	struct nl_handle * nlh = NULL;
-+	struct nl_cb *cb;
-+
-+	cb = nl_cb_alloc (NL_CB_VERBOSE);
-+	nlh = nl_handle_alloc_cb (cb);
-+
-+	if (!nlh) {
-+		nm_warning ("couldn't allocate netlink handle.");
-+		return NULL;
-+	}
-+
-+	if (nl_connect (nlh, NETLINK_ROUTE) < 0) {
-+        	/* HACK: try one more time. Because the netlink monitor for link state
-+                 * inits before we get here, it grabs the port that matches the PID
-+                 * of the NM process, which also happens to be the PID that libnl uses
-+                 * the first time too.  The real fix is to convert nm-netlink-monitor.c
-+                 * over to use libnl.
-+                 */
- 		nl_handle_destroy (nlh);
- 		nlh = NULL;
--	}
-+
-+		nlh = new_nl_handle ();
-+		if (!nlh) {
-+			nm_error ("couldn't connect to netlink: %s", nl_geterror ());
-+			return NULL;
-+		}
-+        }
- 
- 	return nlh;
- }
-