Update netlink patch from git.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 33 insertions, 30 deletions

diff --git a/net-dns/avahi/ChangeLog b/net-dns/avahi/ChangeLog
index 34cb227a56f9..0060d1ee2fc8 100644
--- a/net-dns/avahi/ChangeLog
+++ b/net-dns/avahi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/avahi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.201 2011/03/17 07:11:31 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/avahi/ChangeLog,v 1.202 2011/03/17 07:14:41 swegener Exp $
+
+  17 Mar 2011; Sven Wegener <swegener@gentoo.org>
+  files/netlink-request-all-matches-when-requesting-interface.patch:
+  Update netlink patch from git.
 
 *avahi-0.6.29 (17 Mar 2011)
 
diff --git a/net-dns/avahi/Manifest b/net-dns/avahi/Manifest
index 2fd9068dca80..6780f27f9a0a 100644
--- a/net-dns/avahi/Manifest
+++ b/net-dns/avahi/Manifest
@@ -1,10 +1,10 @@
 AUX autoipd-openrc.sh 700 RMD160 00e259967279dc52ee99476dfb4d6c9672b77ee3 SHA1 1d9858b99f23688f6a0f4a6726400bbbe41df976 SHA256 9f9e8d751bc640491397c8a06cbb6f3dcbf9cdf1a083e274f4d802c9c925c6c0
 AUX autoipd.sh 1271 RMD160 85ac3d69aff64867baa0ba6c58e9f224ba0e2e57 SHA1 95a6145f00ccd511e3b067d4669148861f56c2a4 SHA256 9582a49d0674fac714f448976065fd4e1f0423c08f645685160ed682a121f8c9
 AUX avahi-0.6.28-CVE-2011-1002.patch 2076 RMD160 0b561a78e75099a14e7a3da5290cd1ffa6a75533 SHA1 6d298861d7c7b432cd350f3df277e43ed59b378b SHA256 bf8422b278c0c66eca063672c4836346a4d85cb16014882ca3003b0a79ba9f97
-AUX netlink-request-all-matches-when-requesting-interface.patch 1642 RMD160 b8c1987c35e2d7fde63ee3971bb6e5cafe37ae43 SHA1 44fe78fda6a2cdfbb92654164fa421450aaec68a SHA256 9b91094b8316d8125a2dc2b118c406e2ae8e5f7760089a041bbf539ff44dc12f
+AUX netlink-request-all-matches-when-requesting-interface.patch 1634 RMD160 3995e26dca6ec1cb4801159c479c0b591eff5da3 SHA1 e234d6bd96b7adaf543ef7583b6dd90538238608 SHA256 163db2141b278a07433e7d1b51227493555ca7ba1faf2d19c97e20aa51b947cd
 DIST avahi-0.6.28.tar.gz 1238660 RMD160 d61b370baa3f25d57efba43f2c34b54cab7e7e9e SHA1 5da3f7da2cff8ddf74f8746e4dcb2524e5047f67 SHA256 a0d80aac88212b9f9d5331c248091d3c9c9209f0e41985421636ebd14230fc91
 DIST avahi-0.6.29.tar.gz 1244081 RMD160 a0a4e1019cafb53a683ceceaa44605873957b6cd SHA1 af13ae6fdb3cd61b2eafa25a108773156d88b362 SHA256 4eb1a6bdc93f1b245fc1b26ff6a79f5f958c1135c04bff60d36d374d98cc14d8
 EBUILD avahi-0.6.28-r1.ebuild 4934 RMD160 7ebe1201b97f00f08a330211f8f81b07e3d17250 SHA1 4bc99179361a3a55234dbd6f646ce958bbe96e61 SHA256 fb564902531fd9e2059456b2e4659ac0f66ca6e8c1dc0911b9c7fc1cf6c1eed5
 EBUILD avahi-0.6.29.ebuild 4813 RMD160 b9f7a58b8fd051d9c6702d0e2ed01548d26d9edc SHA1 932b31e959caa23f2e58fb8c1beb4da9b8f9dbe8 SHA256 d260d87b5571792264b9ecaa6832bfec5694b40c3199978c4f3385101e6debac
-MISC ChangeLog 30008 RMD160 20e9ebd2794f499872ebc0ef35a6bf2e70fc98e7 SHA1 70aa849df15f76536395d55ac421f42ea23c49bf SHA256 39a63deca5ea2cde846448c54356281e6dcb18fe529140c37a4b43ce50a9de28
+MISC ChangeLog 30161 RMD160 e9b632ee6bc0041d87356bee452609199c0e9a59 SHA1 cc9883e834fe699307534bcdf0095b005dcfa1e5 SHA256 fc0d4d9dea48441e01aee1c97d3a52684aa5acacc0ebe35aa6e8a793d79e4fd6
 MISC metadata.xml 609 RMD160 fa4efaaf9b8ac6d75251c9bd1f0721ea175acda9 SHA1 4532738c9ff6d9d2a2aef226b827919ac31be2de SHA256 365224bb3c21c159a89fa03ea08c534eb27cc2df62012a69e03ad81779607faa
diff --git a/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch b/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch
index 2cd1afd19b3c..877d97c74ed8 100644
--- a/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch
+++ b/net-dns/avahi/files/netlink-request-all-matches-when-requesting-interface.patch
@@ -1,32 +1,34 @@
-From 882da7d7385e51024bc64a08a21cfd86cc55f3d1 Mon Sep 17 00:00:00 2001
-From: Andy Whitcroft <apw@canonical.com>
-Date: Tue, 18 Jan 2011 10:30:58 +0000
-Subject: [PATCH] netlink: request all matches when requesting interface and address lists
+From: Pablo Neira Ayuso <pablo@netfilter.org>
+Date: Fri, 18 Feb 2011 17:58:21 +0000 (+0100)
+Subject: netlink: fix wrong use of netlink flags for dump operations
+X-Git-Tag: v0.6.29~17
+X-Git-Url: http://git.0pointer.de/?p=avahi.git;a=commitdiff_plain;h=65cb5c100eb1e5891f145be0b89aaa3c2d2e4317
 
-When requesting the a full list of interfaces and addresses for the machine
-avahi uses a wild card netlink search.  This is done via a NLM_F_ROOT
-request.  However we do not correctly request NLM_F_MATCH indicating
-we want all matches.  This leads to the requests returning EINVAL on
-v2.6.38-rc1 and later kernels and to the daemon hanging during startup.
+netlink: fix wrong use of netlink flags for dump operations
 
-Prior to v2.6.38-rc1 bugs in the kernel caused NLM_F_ROOT to incorrectly
-imply NLM_F_MATCH, see the commit below for details:
+The avahi-daemon uses a wrong flag combination to operate with
+rtnetlink. This patch fixes the problems.
 
-    commit 0ab03c2b1478f2438d2c80204f7fef65b1bca9cf
-    Author: Jan Engelhardt <jengelh@medozas.de>
-    Date:   Fri Jan 7 03:15:05 2011 +0000
-
-	netlink: test for all flags of the NLM_F_DUMP composite
-
-Add the missing NLM_F_MATCH.
-
-Signed-off-by: Andy Whitcroft <apw@canonical.com>
+No need to set NLM_F_ACK since the dump operation already includes
+the trailing NLMSG_DONE message that informs about the end of the
+dump operation.
 ---
- avahi-core/iface-linux.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
 
+diff --git a/avahi-autoipd/iface-linux.c b/avahi-autoipd/iface-linux.c
+index fc27829..83e9e41 100644
+--- a/avahi-autoipd/iface-linux.c
++++ b/avahi-autoipd/iface-linux.c
+@@ -262,7 +262,7 @@ int iface_get_initial_state(State *state) {
+     n->nlmsg_len = NLMSG_LENGTH(sizeof(*ifi));
+     n->nlmsg_type = RTM_GETLINK;
+     n->nlmsg_seq = seq;
+-    n->nlmsg_flags = NLM_F_MATCH|NLM_F_REQUEST|NLM_F_ACK;
++    n->nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP;
+     n->nlmsg_pid = 0;
+ 
+     ifi = NLMSG_DATA(n);
 diff --git a/avahi-core/iface-linux.c b/avahi-core/iface-linux.c
-index a1b7f73..9a0bbb6 100644
+index a1b7f73..4d12f73 100644
 --- a/avahi-core/iface-linux.c
 +++ b/avahi-core/iface-linux.c
 @@ -53,7 +53,7 @@ static int netlink_list_items(AvahiNetlink *nl, uint16_t type, unsigned *ret_seq
@@ -34,10 +36,7 @@ index a1b7f73..9a0bbb6 100644
      n->nlmsg_len = NLMSG_LENGTH(sizeof(struct rtgenmsg));
      n->nlmsg_type = type;
 -    n->nlmsg_flags = NLM_F_ROOT|NLM_F_REQUEST;
-+    n->nlmsg_flags = NLM_F_MATCH|NLM_F_ROOT|NLM_F_REQUEST;
++    n->nlmsg_flags = NLM_F_REQUEST|NLM_F_DUMP;
      n->nlmsg_pid = 0;
  
      gen = NLMSG_DATA(n);
--- 
-1.7.1
-