Added a patch to display the 'PF_UNIX: Address in use' only when an error

  occurs that we cannot resolve.
Package-Manager: portage-2.1.2_rc1-r5

4 files changed, 41 insertions, 10 deletions

diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog
index 1f1521a87b61..2235b694bbe0 100644
--- a/net-wireless/wpa_supplicant/ChangeLog
+++ b/net-wireless/wpa_supplicant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/wpa_supplicant
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.82 2006/11/07 10:36:54 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.83 2006/11/10 14:39:30 uberlord Exp $
+
+  10 Nov 2006; Roy Marples <uberlord@gentoo.org>
+  +files/wpa_supplicant-0.5.5-inuse-warning.patch,
+  wpa_supplicant-0.5.5.ebuild:
+  Added a patch to display the 'PF_UNIX: Address in use' only when an error
+  occurs that we cannot resolve.
 
   07 Nov 2006; Roy Marples <uberlord@gentoo.org>
   wpa_supplicant-0.5.5.ebuild:
diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest
index 1cfe514a7992..f50056b459c3 100644
--- a/net-wireless/wpa_supplicant/Manifest
+++ b/net-wireless/wpa_supplicant/Manifest
@@ -6,6 +6,10 @@ AUX wpa_supplicant-0.5.5-default_driver.patch 1366 RMD160 415150af08b255ae2ea1f3
 MD5 58bcb22a59e6ba086bd7f5ea4363aee7 files/wpa_supplicant-0.5.5-default_driver.patch 1366
 RMD160 415150af08b255ae2ea1f3069dc28e977145feb4 files/wpa_supplicant-0.5.5-default_driver.patch 1366
 SHA256 71deb59486cf170f73a655c71dbf5c8d14bf38f9fa7d75667907d0117175f913 files/wpa_supplicant-0.5.5-default_driver.patch 1366
+AUX wpa_supplicant-0.5.5-inuse-warning.patch 771 RMD160 af674cee94abe064e9f36ba26c0d855342473daa SHA1 849cc6fdb7e0cb679fc1ff749ed9b044cd53633b SHA256 b7a10c03ee2723617e74d7d1234983fc702623a549ae58e4b3cd075c5a0b4a5f
+MD5 eb8155cdc192b944140dc97ad16bdfa1 files/wpa_supplicant-0.5.5-inuse-warning.patch 771
+RMD160 af674cee94abe064e9f36ba26c0d855342473daa files/wpa_supplicant-0.5.5-inuse-warning.patch 771
+SHA256 b7a10c03ee2723617e74d7d1234983fc702623a549ae58e4b3cd075c5a0b4a5f files/wpa_supplicant-0.5.5-inuse-warning.patch 771
 AUX wpa_supplicant-0.5.5-qt4.patch 2398 RMD160 10cf397ac7fa1b2146d55114c95d1663b66ef94e SHA1 6e9f26011b3d9ea1f7f1d5254cd069fe6447c571 SHA256 cf72c70ab0ce1c79c25bcd02545271e7c1fe395c0b303b55cee87562f50877e1
 MD5 5d8913030686471a3ab843514c4018b5 files/wpa_supplicant-0.5.5-qt4.patch 2398
 RMD160 10cf397ac7fa1b2146d55114c95d1663b66ef94e files/wpa_supplicant-0.5.5-qt4.patch 2398
@@ -29,14 +33,14 @@ EBUILD wpa_supplicant-0.5.4.ebuild 5453 RMD160 9c4d1a6041acd7032f1ba4e1a7e93e703
 MD5 976dc6af9ca858f57004edd19a1ff902 wpa_supplicant-0.5.4.ebuild 5453
 RMD160 9c4d1a6041acd7032f1ba4e1a7e93e70305a1de0 wpa_supplicant-0.5.4.ebuild 5453
 SHA256 0bf236255f218eefe9a1b42ab02cb1c3df0dc9b950fa3220ae38d99404c54454 wpa_supplicant-0.5.4.ebuild 5453
-EBUILD wpa_supplicant-0.5.5.ebuild 5860 RMD160 6a2b6c487d6abd547ed4309dbe203adc2afbc82c SHA1 5ac4e4f1f9ad01e9f7c1537455c5b074d1cf9675 SHA256 63134ffa6fb7829cffd7fc9d3efb9c8dee82cb7af069fee5a98095b7b8f9e204
-MD5 3899d24864cd9f33f202142657acedf6 wpa_supplicant-0.5.5.ebuild 5860
-RMD160 6a2b6c487d6abd547ed4309dbe203adc2afbc82c wpa_supplicant-0.5.5.ebuild 5860
-SHA256 63134ffa6fb7829cffd7fc9d3efb9c8dee82cb7af069fee5a98095b7b8f9e204 wpa_supplicant-0.5.5.ebuild 5860
-MISC ChangeLog 18954 RMD160 de2a4146499a9461ab4bf0abfb6ca753a65ba5f3 SHA1 e489fcb733390581144f4c23ea670799f145071a SHA256 0ff4557f69ee26e388b252e1c42298321bac82f5d983447d2315814024449830
-MD5 8686bddceda296907c4518792748df2c ChangeLog 18954
-RMD160 de2a4146499a9461ab4bf0abfb6ca753a65ba5f3 ChangeLog 18954
-SHA256 0ff4557f69ee26e388b252e1c42298321bac82f5d983447d2315814024449830 ChangeLog 18954
+EBUILD wpa_supplicant-0.5.5.ebuild 5973 RMD160 7325bbbdd8fd3639762596e4a0f181d1f13f4953 SHA1 e2c87c6cb53c229572fc90d7ef237e3024973482 SHA256 fe1d1f8a8638d1e6f4f3ded9fa50b457a14fa85030c8babe8069f4530b52dc16
+MD5 9c439509dfba2ecaa74e3eda17c95dda wpa_supplicant-0.5.5.ebuild 5973
+RMD160 7325bbbdd8fd3639762596e4a0f181d1f13f4953 wpa_supplicant-0.5.5.ebuild 5973
+SHA256 fe1d1f8a8638d1e6f4f3ded9fa50b457a14fa85030c8babe8069f4530b52dc16 wpa_supplicant-0.5.5.ebuild 5973
+MISC ChangeLog 19195 RMD160 4834a42f24159f0e669d46b2eaad2fe2a1f65ea6 SHA1 46e91026ecfc57e8c41010b549675616104d7f38 SHA256 b4b42f989e2bc645a9e4020ef54342a17005b8e890190e720b1f936fc29eb85d
+MD5 f05a5cd123bcdce08ccd075d863792bd ChangeLog 19195
+RMD160 4834a42f24159f0e669d46b2eaad2fe2a1f65ea6 ChangeLog 19195
+SHA256 b4b42f989e2bc645a9e4020ef54342a17005b8e890190e720b1f936fc29eb85d ChangeLog 19195
 MISC metadata.xml 250 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e SHA1 60f90e59de723ec974b5e2d8c3a952c3ea378f6f SHA256 fd3c97233444ca2664cd393f484f4cba1ace7b76c686112b098ab45a4cebbe0e
 MD5 672d42771a5a69fdbc5ba1648d133812 metadata.xml 250
 RMD160 876c64d1767e4bdd32723fa285a7dabf15f1e82e metadata.xml 250
diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-inuse-warning.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-inuse-warning.patch
new file mode 100644
index 000000000000..cf25a6a04494
--- /dev/null
+++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.5.5-inuse-warning.patch
@@ -0,0 +1,18 @@
+--- ctrl_iface_unix.c	2006-11-10 14:14:21.686328744 +0000
++++ ctrl_iface_unix.c	2006-11-10 14:15:11.000000000 +0000
+@@ -321,7 +321,6 @@
+ 		goto fail;
+ 	strncpy(addr.sun_path, fname, sizeof(addr.sun_path));
+ 	if (bind(priv->sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+-		perror("bind(PF_UNIX)");
+ 		if (connect(priv->sock, (struct sockaddr *) &addr,
+ 			    sizeof(addr)) < 0) {
+ 			wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"
+@@ -342,6 +341,7 @@
+ 			wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
+ 				   "ctrl_iface socket '%s'", fname);
+ 		} else {
++			perror("bind(PF_UNIX)");
+ 			wpa_printf(MSG_INFO, "ctrl_iface exists and seems to "
+ 				   "be in use - cannot override it");
+ 			wpa_printf(MSG_INFO, "Delete '%s' manually if it is "
diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
index 62d842e9b549..f3d63e7b65b7 100644
--- a/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
+++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild,v 1.11 2006/11/07 10:36:54 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.5.5.ebuild,v 1.12 2006/11/10 14:39:30 uberlord Exp $
 
 inherit eutils toolchain-funcs
 
@@ -53,6 +53,9 @@ src_unpack() {
 	# Change the default driver to wext for Linux systems.
 	epatch "${FILESDIR}/${P}-default_driver.patch"
 
+	# Move the PF_UNIX: Address in use warning to where it's needed
+	epatch "${FILESDIR}/${P}-inuse-warning.patch"
+
 	# net/bpf.h needed for net-libs/libpcap on Gentoo FreeBSD
 	sed -i \
 		-e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \