From a9173173d6c732f2b1379c156a7c0006f97cf198 Mon Sep 17 00:00:00 2001 From: Patrick McLean Date: Wed, 19 May 2010 18:29:10 +0000 Subject: [PATCH] Revision bump, add patch that fixes issues with NetworkManager (bug #320097), remove broken version. Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- net-wireless/wpa_supplicant/ChangeLog | 10 +++- net-wireless/wpa_supplicant/Manifest | 21 ++++++-- ...t-call-dbus-functions-with-NULL-path.patch | 53 +++++++++++++++++++ ....ebuild => wpa_supplicant-0.7.2-r1.ebuild} | 5 +- 4 files changed, 82 insertions(+), 7 deletions(-) create mode 100644 net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch rename net-wireless/wpa_supplicant/{wpa_supplicant-0.7.2.ebuild => wpa_supplicant-0.7.2-r1.ebuild} (97%) diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index 05aca10a3fee..432edadeacd8 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.135 2010/05/18 08:54:58 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.136 2010/05/19 18:29:10 chutzpah Exp $ + +*wpa_supplicant-0.7.2-r1 (19 May 2010) + + 19 May 2010; Patrick McLean + -wpa_supplicant-0.7.2.ebuild, +wpa_supplicant-0.7.2-r1.ebuild, + +files/do-not-call-dbus-functions-with-NULL-path.patch: + Revision bump, add patch that fixes issues with NetworkManager (bug + #320097), remove broken version. 18 May 2010; +wpa_supplicant-0.7.1.ebuild, +files/wpa_supplicant-0.7.1-dbus_path_fix.patch: diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 509ef0edc200..79a51c8d0d70 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -2,6 +2,7 @@ Hash: SHA1 AUX dbus_path_fix.patch 286 RMD160 891b3b8dc1ed75089a5be31e4a6937fe52178ad0 SHA1 8bf3cc3e970a039c282ca8e01d3096273f1d19f7 SHA256 1d64d21d9a38a41665b054775bfa77c3c3849d2d60d30575434c77b3630ff52f +AUX do-not-call-dbus-functions-with-NULL-path.patch 1931 RMD160 9ba6cc14cb6816062ba208f136785d664e58d347 SHA1 9ae40351bd125d5be0a392bff5239b6f3ce85af4 SHA256 faa5d9bbc79ff719c61ed24bc173ad07699a0b21f9fc472f09157d001299395e AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f74eb053183d13fcb7d039d91c01fb3765a SHA256 f6b62c8b1db53e94c49ad717d10f5cbb3b08127ba9f8ab9c72da14ba52f995d8 AUX wpa_supplicant-0.7.1-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791 AUX wpa_supplicant-0.7.2-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791 @@ -16,14 +17,24 @@ DIST wpa_supplicant-0.7.2.tar.gz 1634596 RMD160 d9c804dd92ef827a4640a53ae963ea52 EBUILD wpa_supplicant-0.6.10.ebuild 7173 RMD160 44cfc0b09aae6d4e71c5c89b23a51beee9a0cced SHA1 c266129998aa32f79493652f4aae5abbd6566789 SHA256 2b65a620e335af8ea647a43e31262513d81e88636648cdfe9aa65a357068c4b2 EBUILD wpa_supplicant-0.6.9.ebuild 7168 RMD160 7d620356257c94e507f3ac544f1fc2372e51faaf SHA1 ee6059770c14627ca69c3af9aa23029414dcef98 SHA256 e2958204f8d68cb5188cd54c73c749304b7886c150cec4f8c2af5ba795ac2a2b EBUILD wpa_supplicant-0.7.1.ebuild 7244 RMD160 c738048eee3a19aa1b33f0e4d290a89d0690268c SHA1 0d34dce35729c0dfd7167116be243182cd3e81b6 SHA256 177b79291cb0038ffcd8de1ab0c8ffe499d1720843ceb189563adb0258d5202a -EBUILD wpa_supplicant-0.7.2.ebuild 7246 RMD160 8b52fbdcf6887514f6c3857f681a8f7e0d8c2f54 SHA1 2ed936de12c6400bbcc7db1206029312a91c9f9d SHA256 45fdb4837b2da973e9dbc22d447cf6848f3e0f3f49bc6c8b86215d66d649f950 +EBUILD wpa_supplicant-0.7.2-r1.ebuild 7334 RMD160 227e3de809f37cf6533fc07459a16285d2a06180 SHA1 679bff35940c0528d4cfaffd5d5711394d48bd5f SHA256 ac1575aa43f5eecfeac15e58d2bac08478c310c8430fa47914024e864e665e4d EBUILD wpa_supplicant-9999.ebuild 7529 RMD160 65051207df5cf3ede7fda795ccd67d2e70487c7b SHA1 0bb0d2213a40d158dcf706728756fe1d06eba732 SHA256 4c3e380774a16cfd5ed1122d51bf6290ab56ca4a753024d559cbc9f68336a272 -MISC ChangeLog 29238 RMD160 f142b2f3f56f53b21810ce6fb42011765cc5723f SHA1 4977279a0bce0460b08754694276f44bccbc3ec0 SHA256 fdb3da51beea6cc539f2490591b2d7b8b74bdf44893f74cf92f0a39758ee2fb0 +MISC ChangeLog 29559 RMD160 a8c7011b7d6e299af03d5b2527818e10f7272089 SHA1 3d8273811f4038bf2e7e3fa453860169d85bd684 SHA256 e975351730c09d686a27c40fdc5a0036080525b33746f68d960347f7d1187914 MISC metadata.xml 651 RMD160 c1b0aca5e38265dbd80247ec686a0b7c3f8fb171 SHA1 6c5d98fa137ddb0f8a5866af68032cf769cc315c SHA256 88eec5cdc25fc735e42d5b581463e576a0f4a5df8e7694e1c8b9c24ea8358b93 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkvyVesACgkQp5vW4rUFj5on9ACaA7i46D9q8lps8ZPlIjN29Pcf -A7AAnA5jZxVeFi4KO5XalHH1T4qEuZaU -=h0zz +iQIcBAEBAgAGBQJL9C4iAAoJEHy/RO9cNQiDpnkQAK1owbXDCv/lQ1iKCGRDJNqR +KTc7RQk7bV0OvxMom7576O/BIpgK1EGqZQG+D/q4PjxDK8qGusO2n8m+qjwMGE8I +p233OZmvX3FKSjwwupvE6IlhF/BiqNr/bTFj0HaVuajC5AdD49vL2w5uHqLTPbaP +s6TmLOnQA+pdv2r+t9/2Ax1SKy5PHHjKl+W7CHBoS2Jqtn+CCqxTIWXj+v9HVQKZ +Mf7V2xjyJa8xRgAOQHuDqeSnuyPzQ22GweB5R1wZ3tpEnxxD/AkqgrYi16rifT58 +JdSKSIn4o5lVp+vBLlMUKx6e9LaXy22wsf2uJCXMMzImCKjeKJ841rxtP217Vgu3 +D3I1oyxOF2XhEABclmKjIorhZk1ztMi98M2I+sg0SHQCmPqaSoIOujljplKzH/RO +g11i6vtWdAjwLDCfNhj0pAVDxHZjCCi0/pjpYTQ9YQQyXOVsA8XPCyWX+7vVjBOn +GLZ0RkurXwqtFEReSU9qQsHh2i7ZuFm09R+qiNdmW0IezC7YC/hmUoGxCl+6qSMk +6yr1xitRH9euJ4Jv/Y9hLM1dJKUDG3xaqex30H/h53fdr6rN0JLTKNE3hL/aLhdk +XlZQ28+st5D/fF3kejsVyrUy3GcWLeyBlf4bznqHzGloFJwgh6Vb1jIATIodPPd1 +Udb18O/OQd3TS797/ehL +=kTmo -----END PGP SIGNATURE----- diff --git a/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch new file mode 100644 index 000000000000..d868f84384e0 --- /dev/null +++ b/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch @@ -0,0 +1,53 @@ +diff --git a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c +index 06749db..1cbdee9 100644 +--- a/wpa_supplicant/dbus/dbus_new_helpers.c ++++ b/wpa_supplicant/dbus/dbus_new_helpers.c +@@ -810,7 +810,7 @@ void wpa_dbus_mark_property_changed(struct wpas_dbus_priv *iface, + const struct wpa_dbus_property_desc *dsc; + int i = 0; + +- if (iface == NULL) ++ if (iface == NULL || path == NULL) + return; + + dbus_connection_get_object_path_data(iface->con, path, +diff --git a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c +index 437a04d..9e6c762 100644 +--- a/wpa_supplicant/dbus/dbus_old.c ++++ b/wpa_supplicant/dbus/dbus_old.c +@@ -377,7 +377,7 @@ void wpa_supplicant_dbus_notify_scan_results(struct wpa_supplicant *wpa_s) + DBusMessage *_signal; + + /* Do nothing if the control interface is not turned on */ +- if (iface == NULL) ++ if (iface == NULL || wpa_s->dbus_path == NULL) + return; + + _signal = dbus_message_new_signal(wpa_s->dbus_path, +@@ -414,7 +414,7 @@ void wpa_supplicant_dbus_notify_state_change(struct wpa_supplicant *wpa_s, + if (wpa_s->global == NULL) + return; + iface = wpa_s->global->dbus; +- if (iface == NULL) ++ if (iface == NULL || wpa_s->dbus_path == NULL) + return; + + /* Only send signal if state really changed */ +@@ -473,7 +473,7 @@ void wpa_supplicant_dbus_notify_scanning(struct wpa_supplicant *wpa_s) + dbus_bool_t scanning = wpa_s->scanning ? TRUE : FALSE; + + /* Do nothing if the control interface is not turned on */ +- if (iface == NULL) ++ if (iface == NULL || wpa_s->dbus_path == NULL) + return; + + _signal = dbus_message_new_signal(wpa_s->dbus_path, +@@ -508,7 +508,7 @@ void wpa_supplicant_dbus_notify_wps_cred(struct wpa_supplicant *wpa_s, + if (wpa_s->global == NULL) + return; + iface = wpa_s->global->dbus; +- if (iface == NULL) ++ if (iface == NULL || wpa_s->dbus_path == NULL) + return; + + _signal = dbus_message_new_signal(wpa_s->dbus_path, diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r1.ebuild similarity index 97% rename from net-wireless/wpa_supplicant/wpa_supplicant-0.7.2.ebuild rename to net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r1.ebuild index bcb267a4d7c0..a799d68e0ef4 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 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.7.2.ebuild,v 1.1 2010/05/16 19:52:41 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.2-r1.ebuild,v 1.1 2010/05/19 18:29:10 chutzpah Exp $ EAPI="2" @@ -66,6 +66,9 @@ src_prepare() { wpa_supplicant.conf || die epatch "${FILESDIR}"/${P}-dbus_path_fix.patch + + # bug (320097) + epatch "${FILESDIR}"/do-not-call-dbus-functions-with-NULL-path.patch } src_configure() { -- 2.26.2