diff options
Diffstat (limited to 'net-wireless/wpa_supplicant')
14 files changed, 20 insertions, 1452 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index 4e4c3c2e3300..516b9da1d24e 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.206 2013/12/22 12:03:58 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.207 2013/12/22 14:40:18 gurligebis Exp $ + + 22 Dec 2013; <gurligebis@gentoo.org> -wpa_supplicant-0.7.3-r5.ebuild, + -files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch, + -files/wpa_supplicant-0.7.3-dbus-api-changes.patch, + -files/wpa_supplicant-0.7.3-dbus_path_fix.patch, + -files/wpa_supplicant-0.7.3-generate-libeap-peer.patch, + -files/wpa_supplicant-1.1-dbus-path-fix.patch, + -files/do-not-call-dbus-functions-with-NULL-path.patch, + -files/wpa_supplicant-gcc470.patch, + -files/wpa_supplicant-1.1-do-not-call-dbus-functions-with-NULL-path.patch, + -files/wpa_supplicant-1.1-generate-libeap-peer.patch, + -files/wpa_supplicant-1.1-libnl_path_fix.patch, metadata.xml: + Cleaning up, now that 2.0-r2 is stable 22 Dec 2013; Agostino Sarubbo <ago@gentoo.org> wpa_supplicant-2.0-r2.ebuild: Stable for ppc64, wrt bug #486008 diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index c8631432fa5d..19b5a65d0705 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -1,47 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 -AUX do-not-call-dbus-functions-with-NULL-path.patch 1931 SHA256 faa5d9bbc79ff719c61ed24bc173ad07699a0b21f9fc472f09157d001299395e SHA512 6d59a0354c57b9dfdd06dce9231b627521d2ed83762994464d700da0d3cf029b4d776ee75393bd9e5753f1e1b57f900f416e582bc44840928426c3c11e7aceb3 WHIRLPOOL cc8cc3c39b686dbaa4dead808448b54f89e9e542d531f341094c0ec572d467a9a87dfd74ef594c82198cf487e7a376600e41bbe21e5940c313bddcbf3329497a AUX wpa_cli.sh 1407 SHA256 a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179 SHA512 613345f142f2e87f7ebe9eaf3a9a60f4cee08f50596d307bd9c0acd88d1c470080bd27c645455ae32cb4fb7fe96ae131ee09fd6c7657cc298fc3476e4dfdc059 WHIRLPOOL c7d461efcde44f9ce98e99217ef27ef713082269380d1a45da17a9e679c5d816c156cb5c00665034a88680b241144e7e71c901a7c73bae075dfca7eb55b10ffd -AUX wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch 4706 SHA256 6206d79bcd800d56cae73e2a01a27ac2bee961512f77e5d62a59256a9919077a SHA512 c4153d33f9b285e21024c2bc7cfcfc0b4425a12163e4c9474d7678e05f1344d8daadd41d71074d195bc9656797c89c890842093b6a762254b601f5432410abd9 WHIRLPOOL 101bfce06d3f5cb621e98693f90fbdbdcd11aa9e8628156362ea41d3a952404074d4e4ec7eb648d4103d916e4cb24d286dcd59e0fa6c4f3fe62a299aaea414df -AUX wpa_supplicant-0.7.3-dbus-api-changes.patch 2011 SHA256 5ccb8169d0c10ba3003d3626f89a210aa26713f860ca07c8e4602a9b2ea821fe SHA512 821cb2196b35f5931c2c3a17d425b882ea38810ae1020acca715b7aab569d03eef0a9636a45852c9955c0a93f49e1f24fe7bb93097067ca33f2b90cb9109457f WHIRLPOOL ac3fa5866a182cd7ad6fa23cd46fdfae88393e8d82832541f0d008d38d6fc995973fb03b5bdc945e4d8b88ddde1fc6fc1000ffd7acd952c203483baebc7b4659 -AUX wpa_supplicant-0.7.3-dbus_path_fix.patch 616 SHA256 340a4f04107be23063520e58cecae9f40e9cdc9375e6d644ba32076815fe6c90 SHA512 574a8a3c6d8c8c79e3d3ab772dfebff9f177c0e4268b67bd1e7acadee1a60d11539c5b81f748ade86c73351cb3ad2de09a7d60e425cce7deb03f6b9130dc4c77 WHIRLPOOL f88cf3190473f311924a9ca9a3acba23e49b82559da383fafccf5bf3cff5deffbeba3be179c0f2c7592dfeb9851893247d32ee7255d4b2ea0b941f02d0360ceb -AUX wpa_supplicant-0.7.3-generate-libeap-peer.patch 11221 SHA256 1afaabe0c2862f08f4a7e6284ff13939f8b9c112f3170025c3713982701052c0 SHA512 eae9e5c7a8c2285d0a5bdcdfa2c405a71742f1c4f5b4df4b06d8691990e0c7bb0a06f65147adb27f031a83ee5d557698466c1fd8bfd89b59dfc7008870a25b08 WHIRLPOOL 3d30880d00f01b3f4be829948fb9f89f5da253d66db0047081387679a6aee667373aa8ff7e340ab30edeec63c1e36246bee508242e1b037c2c73c1e321c01e6e -AUX wpa_supplicant-1.1-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726ce5b505e87ceab4c42cee4241eba08d04391579 SHA512 7521764830b0ac27046c9030c632fe4f36937452b8352a257eaba28ff7a628b2d5d0b4187a23cdffe54c5adab42352ec9f7907e2606f68164d708cea34be5e45 WHIRLPOOL d36fa9563368e9670241fc2da4864a1cbe5e3190824d9b0d81739642d9e8f56bea1914dd44832df1f7ea7614331302259c6e1bfb668d7519c41a0e227fc05b61 -AUX wpa_supplicant-1.1-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654 -AUX wpa_supplicant-1.1-generate-libeap-peer.patch 9739 SHA256 3e9945a95f15eda4ae701ac51b3e3bcf9259bd76629b49cded76a9e125144a56 SHA512 3194386e5ef79c2fccac02e5fa7b8c47d2f1f3fdf4aa60db7a25bad50b6098283053b6b103311f309126e1a3374cc72d0cc0db0c31a5e0cc13ba4116a0b901db WHIRLPOOL 1f1d60f6999fa957679f7f1b8ba48b9b57ba3f610cdc77f10904b41e3c49d7969f363cc49889a76d5fd2ef80150179d1fc93dbdef2848f495a0c90635fdea9a6 -AUX wpa_supplicant-1.1-libnl_path_fix.patch 892 SHA256 7ec9489fed14b7f3916d0aab63e34886bcf39d07c257101df53e16ef4db2b95d SHA512 10b1db56ec2bb8a2ab04dcd50b5a0442efdd4814ef6a4effc50d0157d61fc993ebb6f2f6775566fc0341668ad314dd2d4ec4e91177d59d76c59b8ceb2bf4c2f4 WHIRLPOOL ae16d72eb649d7267191a2542c204da92493279f3d09dc9de4349ca4a8db9d7e5f46d3d824e4b22900ad257e1bdcf86b26fb46eee63cbb8af48bd739b0d27ea0 AUX wpa_supplicant-2.0-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726ce5b505e87ceab4c42cee4241eba08d04391579 SHA512 7521764830b0ac27046c9030c632fe4f36937452b8352a257eaba28ff7a628b2d5d0b4187a23cdffe54c5adab42352ec9f7907e2606f68164d708cea34be5e45 WHIRLPOOL d36fa9563368e9670241fc2da4864a1cbe5e3190824d9b0d81739642d9e8f56bea1914dd44832df1f7ea7614331302259c6e1bfb668d7519c41a0e227fc05b61 AUX wpa_supplicant-2.0-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654 AUX wpa_supplicant-2.0-fix-undefined-reference-to-random_get_bytes.patch 633 SHA256 29b9a9ba8d4b53313593c3f56ad13e776ee76fbd04bc33b35e1d6f61e571b496 SHA512 e6e27a982c064bff7c833d33051205ddbaf931f7116724880c9c6e676139ccc69b0302229817d6c618cb3669ec68989b347a1cb40660c4ab124df9841bc7c020 WHIRLPOOL 38950a4044cfb9b9f56852e465297fed94bb9fa76907d4247346a24a7f40457b0c34dd12338d6cff9677da6b6b9d315989f4911242d472d0dbb4f8fcb8a930c9 AUX wpa_supplicant-2.0-generate-libeap-peer.patch 9778 SHA256 771e2392754c094a8b4bacbcbff77429946e7c4acfdef37be7deab5d6ad2994e SHA512 7ceb37e7d23864351dc4960d6e867f02bd6004b29b2b4d2ca6d9bda2a71946c2dc83d2197828c56d46420ad7c3d3309b684335009b7f9129915cd113b73e6adf WHIRLPOOL 68ee035c05a4bb79479dfd62057695862073c41f4bd9265719e01cbf29328fcea6970ffeb0903e4aec83428bfa2e62a280748bfeab668e490c6763788b903dfa AUX wpa_supplicant-conf.d 161 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90 SHA512 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 WHIRLPOOL 5508d1598bd952ec773db0d5e5ab440134337de6e26d7b8c7c6b00789c570559a54457ac507357b65e8604da849f9ab52dff90d27197d9be11ed2cc66eaae1e7 -AUX wpa_supplicant-gcc470.patch 407 SHA256 a2cc1d8ce27fee214b6845cf228e3ceb4c1ba54cea03e99ee653b0aed4f82fcf SHA512 98d67be5d876a5cf754328189f80617727b9c0128447efcfed4418eb890c440e5e4a0e98d9629f8d8438696aac5a57b0f4d11941a66ebb83e967838b50c932e1 WHIRLPOOL 61990de6e2ff41e3b3cb19d03a85490605630742e2b0d0dd2dafaf6e711b27deb2f059472bd9f333fb052570b3a20c48e67783c7dbfcb60b7a5c8cf06be4bde9 AUX wpa_supplicant-init.d 1249 SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0 SHA512 6b245dad8861f71bab7187d9349464d4ae5986202d097928886e26db9ca9c08dedd82852c52dd72d232bd23139f47a76cd8c87e020596796b403fd0c4ac0ffc7 WHIRLPOOL d5edcd9842d3039cbc9b57e24a770b6443a1e869ab3492a86eac60f920aa2a4537b0fdb3d73cbf4b8f85dd257a529839786e16e98ddd4556445d464c43deb012 AUX wpa_supplicant.conf 183 SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a SHA512 425a5c955d462ea0d0d3f79c3e1bbf68e15b495df04ad03ed7aee12408b52616af05650dfc147ca5940d69e97360c33995d33733820fef8eb8769b31e58434e8 WHIRLPOOL 4615456a07dfc81139d350cb7618fc204008ae9cfa118f5966f923d758d1339a2d17eb79b631d8eb094225fac583a74705ed5ca4d348554f6b2435f166c16548 AUX wpa_supplicant.service 264 SHA256 aa76e01677a755270147bcda08dbd8283ba37dc15e384869e874585cf5720c39 SHA512 b5ff8db22a7e23e8a54a6bd018c495093c7d31f5734eb83cb652184193193d7cd0c03b7ca286eeef59b0a12f1472d5fa37990d7c10511e22f2eaf410ee15d056 WHIRLPOOL f29f175636def13bedd8519d9837fffb802dcc219e3714ac8b285ae1d411a2c19f55ae1d8c1bad3446a4172dd28ff3d5d9d8baedfdea29e2a057678b82589e3c AUX wpa_supplicant_at.service 314 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb743eaf868cd311a5128c13ac0c SHA512 400e2e4b69408a4fe044409fee9639338e1fd6423e00a544b46065fe1d0215717b17b44ce1abadf0ce5da365724977ea0beffbf75d96c0c6ee1f24618c92428d WHIRLPOOL 1603e4651072e0dfb5381c9a063db64bb412c2bc640226137b7cfd56f2525a6c1e198cb042553f5a25fc234773d1d9438eea09d65fdde71d81dddfd86b5273b0 -DIST wpa_supplicant-0.7.3.tar.gz 1638224 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 SHA512 81c633eac9168ac2438ea3ad7505c25dcde98befee8b65ea562b9cc6ee658e998ff147f7646531968edc596d44a38c3acef3e30c43b1db4a8cbeeab22287e888 WHIRLPOOL 594f70b2e4e78a302809ac0b3bf9eccaaba92d8a052efc22184623b1690ade39d418a221933f7f8ba885ee6c59b5a189158db333c2e11e60c8bb51ec68537929 DIST wpa_supplicant-2.0.tar.gz 2044281 SHA256 2c115609fbb5223d51381084a5c944455a8afcda81d584173ff55ba233379e09 SHA512 c3a599e1dfa5e0bb4b8d35ed49501696ce68c807ff458c1e3bff9ed5619c780f7117c6d8d7cb9a11351e9fad27cf83fc114f255c92552e7ba084de70c5f8e254 WHIRLPOOL 603f9ac54505166690516a0f1e3112a8279a7184a54066699ad24b1f6269ad90c46a01a87d23bb62df782cdf561aa6f8b5a11e7ee59914cb36be8daea470389e -EBUILD wpa_supplicant-0.7.3-r5.ebuild 8993 SHA256 ae802134af12a5e2d7dbd0dd1bb1326a9fed29d3707a10643fb8ac3a80b9f091 SHA512 a6b583f0dfde3123deb5b7145fc416092dbbe0652d9433347dfb1aca5e32f652ce55dc0618e70cda8b66a5a9a31f47469c7ff0d2b4b7bd0a8bdc58cf603e70ea WHIRLPOOL 6dad309403a376a6297559de07a954faea89dd5eb5b11fc9282fca2ae24f7852dffb066b89cd2f31246f6b2afdbb67b3cf8fcb12ab52239f0ca821362cd942aa EBUILD wpa_supplicant-2.0-r2.ebuild 9086 SHA256 a8b7ce63e9ba7b62487e11139f7de923506f5e8a072a3e452f4be45382b45567 SHA512 9dbe3a9cd9a7e1305ea0666f3f457dfe4f7944eff7cf7b597fe41a16ca6e606f0ce69d467e2c0f767eedb2d5742bed3d8207e8ec922d872e41518dda9699de32 WHIRLPOOL c7e95a15ab9a76f21af1eaf8731d059c8aaed61599013c4468dd6802293b154aa5f28314915d17ebfb5d7640680f2fd51c49f3fad2e1c1f9318512234003fe90 EBUILD wpa_supplicant-2.0-r3.ebuild 9215 SHA256 0bdb32f7e92d3575ce0166de13083b4c98f08ad77622ab3714611d333fb78be1 SHA512 47b71f7fc1dc26d2696cbf162c8338fcbb118547049dd46f2e5dd4cb122830bbde51f6f7de3487066d42c40f95621c470bd316d8a2c145a96638509d4d1d2464 WHIRLPOOL d7b00daf3ed94bd276073d15e2703349f96a43700b8958d28f6b3dc2588ddbef6d3c0f64677403b523b75cdd57dfcb554961067c36c3dc6304350da0bb016653 -MISC ChangeLog 41849 SHA256 e79b5b10183850befb24eff05c0c8ce0c624e2d26da614c5e87063327612c0ae SHA512 003d6a74a934b23c517707a8568cdbfb90c2020e2b94fbc3922c4aa07ed634b79a13685dfa73611645a08c3b70c744a5d1d9a3a1befc7bb14d23d8c6517ab4c6 WHIRLPOOL 49e91993e8a68c33846b07e492bdff7f4ade738ec568e1a3481ab4ca68f8ba411f579a80f500c07ec016ce40e19363e934ee036f8c35fa3a65b056615e502ada -MISC metadata.xml 1179 SHA256 e6c44e08d38abba2645ab7b081783f2fe7e8962fa1b038086d4f6a986cd0e3f8 SHA512 392bc5e00c0c37c16fb84840bbca085b2dffecc0f7ce7d3a38872666bd3e17332533ca4e07c0cfbfe3ed78a639c7ca6ace164efb7df28fc5d7b275321e517622 WHIRLPOOL 03c040317c8fb74f901cd35a10d2befd3b2b2e0b3a6adec5a7a5c78adf369282931f938ab824386efbe4f6c0ac8dea8d42554ea65f0ab833a97b84cb14174a61 +MISC ChangeLog 42527 SHA256 b31a75984b6c4a58a70fa73543902e646ebe6864dddf1b8ab7adfde916a7075e SHA512 e27339fd39c909ff37f19efaa59af9981a8d5d9e4c4c421ba398a772b5fbf3dd923492b68660f45d5151d8a6a990218c7fcc5fa94fb34c6f6e2f0faa835c967f WHIRLPOOL 021ad0261cd270de3a3e5271ca54a5c15a0c43274535f9effa596d1ea1996444d0365effa3a97480d2a7415295637651525d0b64a01a420e98589a0067d4c04d +MISC metadata.xml 1107 SHA256 eae15b505a1ed1406d589cd6dc9227a87340119331e8373ff25302f6a9c098c8 SHA512 bcca37682eae987546d19d7b43cf62d5dabb5d905b392728b17590a5d0692c5019bc1c29513799a5c4f8c4177e42de0397cfb1387cb56463a7fa47f0425fcae8 WHIRLPOOL 13218a055188f39f11f005885bc5a80ea63f3984cab53b73a9d0190ef3c164a2be4448902217e9913f65c14b32e8cceaa0b1a65df5e7acb8e9eac39a614a1a4b -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQIcBAEBCgAGBQJSttQ+AAoJELp701BxlEWfq+8P/0ZE7U3FsKa4it8fWYl6riec -/Xvm1scLJhwZtS/hN+wzuu7ie1WiVe3C0Kt5AypeFZ0+z0rW8zYhrRGHedfu8dKG -IR893wz2M812TcE8ETq3Tp65nPbHKdzqb4ehRV/vy5HcQXQm7i0WmM/zAHfIzXnY -OxYW2oMuzCblpdl5P4PrVFo4reJ7/BqhXi70/ynWB8GrI5kYbA6wmSLgRFXpIDCr -aChnDiBxauNO3S5bCvabm2XOR/zQKhT4yfzjK+ZEI1Qot4J9383Il0dQ51MYZm/F -vGNubYXo/KJc236sOaKlk6mL2KeMduGHuqv/oJ2GGKlunr9XNbCU1DzCKv5fboXF -6fnFfsuiCc7TmAkUJsbdxpgiCBkMjKyWOPYk8oiVBLbIkfEL+s1VXBuzowk1hPLh -5MXbl6LloUigb1suu01j10GLEqXcd3d81kXro204dCZi1FhCRdWHMR10qeFVX2RU -Ra/7V3qvhfomui45M25ZUUO7/rI4v+PhTsYFalkfD/VCqzsvOII0Xq4ody4IyOTX -NsQbSPHqKRmNTYZyIi0fV/pF0DUJfqGwGkA/lwBqr71GS4DGoBRCe/duqLL77eLj -POwpwkw2b6EHfMEtlHmVepThRKx+itg31C7a3MqAxdoc2lcjZ0VDl5kQIHWRXa+/ -8T0XhDvM64DOmzzJIq4p -=IwiI +iEYEAREIAAYFAlK2+dMACgkQsR7PQhRXYElVDQCdHhebaxyL0BvX6rk24fMpbnqo +H7EAn3D9FMwSOfVXK900pMlIe5/czuKO +=GuzE -----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 deleted file mode 100644 index d868f84384e0..000000000000 --- a/net-wireless/wpa_supplicant/files/do-not-call-dbus-functions-with-NULL-path.patch +++ /dev/null @@ -1,53 +0,0 @@ -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/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch deleted file mode 100644 index 3920da63f383..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure 2011-04-09 14:04:43.108343777 -0400 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c 2011-04-09 14:44:09.808372285 -0400 -@@ -33,6 +33,14 @@ - #include "dbus_new_handlers.h" - #include "dbus_dict_helpers.h" - -+/* The getters in this file can also be invoked when building a signal -+ * message to send out spontaneously. In this case, no message is passed -+ * in and if we try to call dbus_message_new_error(), we'll get an -+ * assertion failure. So, #define dbus_message_new_error() to a more -+ * tolerant cut-and-paste version -+ */ -+#define dbus_message_new_error wpa_dbus_message_new_error -+ - extern int wpa_debug_level; - extern int wpa_debug_show_keys; - extern int wpa_debug_timestamp; -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure 2011-04-09 14:04:18.293117234 -0400 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c 2011-04-09 14:51:48.464204876 -0400 -@@ -22,6 +22,42 @@ - #include "dbus_new.h" - #include "dbus_new_helpers.h" - -+/* This is exactly like dbus_message_new_error, but returns a -+ * (partially filled in) error message in the case reply_to is -+ * NULL rather than failing with an assertion message. This is -+ * useful for getters that we recycle when sending out signals. -+ * -+ * Contains code cut-and-pasted from dbus_message_new_error() -+ * Copyright (C) 2002, 2003, 2004, 2005 Red Hat Inc. -+ * Copyright (C) 2002, 2003 CodeFactory AB -+ */ -+DBusMessage* -+wpa_dbus_message_new_error (DBusMessage *reply_to, -+ const char *error_name, -+ const char *error_message) -+{ -+ if (reply_to) { -+ return dbus_message_new_error(reply_to, error_name, error_message); -+ } else { -+ DBusMessage *message = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR); -+ DBusMessageIter iter; -+ -+ dbus_message_set_error_name(message, error_name); -+ dbus_message_set_no_reply(message, TRUE); -+ -+ if (error_message != NULL) { -+ dbus_message_iter_init_append(message, &iter); -+ if (!dbus_message_iter_append_basic(&iter, -+ DBUS_TYPE_STRING, -+ &error_message)) { -+ dbus_message_unref(message); -+ return NULL; -+ } -+ } -+ -+ return message; -+ } -+} - - /** - * recursive_iter_copy - Reads arguments from one iterator and -@@ -86,6 +122,7 @@ static void recursive_iter_copy(DBusMess - - - static unsigned int fill_dict_with_properties( -+ DBusMessage *message, - DBusMessageIter *dict_iter, const struct wpa_dbus_property_desc *props, - const char *interface, const void *user_data) - { -@@ -98,7 +135,7 @@ static unsigned int fill_dict_with_prope - if (!os_strncmp(dsc->dbus_interface, interface, - WPAS_DBUS_INTERFACE_MAX) && - dsc->access != W && dsc->getter) { -- reply = dsc->getter(NULL, user_data); -+ reply = dsc->getter(message, user_data); - if (!reply) - continue; - -@@ -160,7 +197,8 @@ static DBusMessage * get_all_properties( - DBUS_DICT_ENTRY_END_CHAR_AS_STRING, - &dict_iter); - -- props_num = fill_dict_with_properties(&dict_iter, obj_dsc->properties, -+ props_num = fill_dict_with_properties(message, -+ &dict_iter, obj_dsc->properties, - interface, obj_dsc->user_data); - - dbus_message_iter_close_container(&iter, &dict_iter); -@@ -870,6 +908,7 @@ void wpa_dbus_get_object_properties(stru - return; - } - -- fill_dict_with_properties(dict_iter, obj_desc->properties, -+ fill_dict_with_properties(NULL, -+ dict_iter, obj_desc->properties, - interface, obj_desc->user_data); - } -diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h ---- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure 2011-04-09 14:04:25.130180461 -0400 -+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h 2011-04-09 14:38:53.092075181 -0400 -@@ -112,6 +112,10 @@ struct wpa_dbus_property_desc { - #define WPA_DBUS_PROPERTIES_SET "Set" - #define WPA_DBUS_PROPERTIES_GETALL "GetAll" - -+DBusMessage* wpa_dbus_message_new_error (DBusMessage *reply_to, -+ const char *error_name, -+ const char *error_message); -+ - void free_dbus_object_desc(struct wpa_dbus_object_desc *obj_dsc); - - int wpa_dbus_ctrl_iface_init(struct wpas_dbus_priv *iface, char *dbus_path, diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-api-changes.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-api-changes.patch deleted file mode 100644 index 2ec1a97e9fbc..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-api-changes.patch +++ /dev/null @@ -1,66 +0,0 @@ -Taken from: - -https://bugzilla.gnome.org/show_bug.cgi?id=644634 - - -From b80b5639935d37b95d00f86b57f2844a9c775f57 Mon Sep 17 00:00:00 2001 -From: Dan Williams <dcbw@redhat.com> -Date: Fri, 17 Dec 2010 15:56:01 +0200 -Subject: [PATCH] dbus: Emit property changed events when adding/removing BSSes - -The supplicant was not emitting property changed events when the BSSs -property changed. - -Signed-off-by: Dan Williams <dcbw@redhat.com> -(cherry picked from commit 1e6288df6b07a353a9246b77e0de2a840b5f2c72) ---- - wpa_supplicant/dbus/dbus_new.c | 6 ++++++ - wpa_supplicant/dbus/dbus_new.h | 1 + - 2 files changed, 7 insertions(+), 0 deletions(-) - -diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c -index bdfbbac..c66640a 100644 ---- a/wpa_supplicant/dbus/dbus_new.c -+++ b/wpa_supplicant/dbus/dbus_new.c -@@ -691,6 +691,10 @@ void wpas_dbus_signal_prop_changed(struct wpa_supplicant *wpa_s, - wpas_dbus_getter_current_network; - prop = "CurrentNetwork"; - break; -+ case WPAS_DBUS_PROP_BSSS: -+ getter = (WPADBusPropertyAccessor) wpas_dbus_getter_bsss; -+ prop = "BSSs"; -+ break; - default: - wpa_printf(MSG_ERROR, "dbus: %s: Unknown Property value %d", - __func__, property); -@@ -1199,6 +1203,7 @@ int wpas_dbus_unregister_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_removed(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - } -@@ -1263,6 +1268,7 @@ int wpas_dbus_register_bss(struct wpa_supplicant *wpa_s, - } - - wpas_dbus_signal_bss_added(wpa_s, bss_obj_path); -+ wpas_dbus_signal_prop_changed(wpa_s, WPAS_DBUS_PROP_BSSS); - - return 0; - -diff --git a/wpa_supplicant/dbus/dbus_new.h b/wpa_supplicant/dbus/dbus_new.h -index 80ea98c..9cdefcb 100644 ---- a/wpa_supplicant/dbus/dbus_new.h -+++ b/wpa_supplicant/dbus/dbus_new.h -@@ -30,6 +30,7 @@ enum wpas_dbus_prop { - WPAS_DBUS_PROP_STATE, - WPAS_DBUS_PROP_CURRENT_BSS, - WPAS_DBUS_PROP_CURRENT_NETWORK, -+ WPAS_DBUS_PROP_BSSS, - }; - - enum wpas_dbus_bss_prop { --- -1.7.4-rc1 - diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch deleted file mode 100644 index ac82943fbe7f..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus_path_fix.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- dbus/fi.epitest.hostap.WPASupplicant.service 2010-09-07 10:43:39.000000000 -0500 -+++ dbus/fi.epitest.hostap.WPASupplicant.service 2011-01-08 19:41:32.969507889 -0500 -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=fi.epitest.hostap.WPASupplicant --Exec=/sbin/wpa_supplicant -u -+Exec=/usr/sbin/wpa_supplicant -u - User=root ---- dbus/fi.w1.wpa_supplicant1.service 2010-09-07 10:43:39.000000000 -0500 -+++ dbus/fi.w1.wpa_supplicant1.service 2011-01-08 19:42:12.420246349 -0500 -@@ -1,4 +1,4 @@ - [D-BUS Service] - Name=fi.w1.wpa_supplicant1 --Exec=/sbin/wpa_supplicant -u -+Exec=/usr/sbin/wpa_supplicant -u - User=root diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-generate-libeap-peer.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-generate-libeap-peer.patch deleted file mode 100644 index 52c0e95a5da6..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-generate-libeap-peer.patch +++ /dev/null @@ -1,396 +0,0 @@ -From 3de5e59b291b6f58317bb16736f8c0271754378e Mon Sep 17 00:00:00 2001 -From: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> -Date: Sat, 2 Oct 2010 00:11:51 -0700 -Subject: [PATCH] eap_peer: create a libeap library, with header files and pkg-config [v2] - -This adds infrastructe in src/eap_peer to make libeap.so and install -the needed header files and pkg-config files. - -Now, this is quite dirty and probably not what we want in the long -term, but serves as an starting point: - - - we don't build from the wpa_supplicant directory because the - objects the .so have to be built with -fPIC. So if you need to - build both the binary and the library: - - make -C wpa_supplicant - make -C src/eap_peer clean - make -C src/eap_peer - - As I said, it's dirty -- we'd need either wpa_supplicant linking - against the library properly (but that seems not to be desirable) - or a multiple object build approach ala automake. - - - need to use 'override CFLAGS' in src/eap_peer/Makefile, otherwise - any CFLAGS setting will kill the build infrastructure. I miss - AM_CFLAGS. - - - adds 'eap_register_methods()' that will register every compiled in - method. - -Signed-off-by: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com> ---- - build_release | 12 +++ - src/eap_peer/Makefile | 191 ++++++++++++++++++++++++++++++++++++++++++-- - src/eap_peer/eap_methods.c | 114 ++++++++++++++++++++++++++ - src/eap_peer/eap_methods.h | 1 + - src/eap_peer/libeap0.pc | 10 +++ - 5 files changed, 320 insertions(+), 8 deletions(-) - create mode 100644 src/eap_peer/libeap0.pc - -diff --git a/src/eap_peer/Makefile b/src/eap_peer/Makefile -index 3651056..58c067a 100644 ---- a/src/eap_peer/Makefile -+++ b/src/eap_peer/Makefile -@@ -1,11 +1,186 @@ --all: -- @echo Nothing to be made. -+LIBEAP_NAME = libeap -+LIBEAP_CURRENT = 0 -+LIBEAP_REVISION = 0 -+LIBEAP_AGE = 0 -+ -+LIBEAP = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT).$(LIBEAP_REVISION).$(LIBEAP_AGE) -+LIBEAP_SO = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT) -+ -+.PHONY: all clean install uninstall -+ -+all: $(LIBEAP) -+ -+ifndef CC -+CC=gcc -+endif -+ -+ifndef CFLAGS -+CFLAGS = -MMD -O0 -Wall -g -+endif -+ -+CONFIG_TLS=openssl -+ -+INCLUDE_INSTALL_DIR=/usr/include/eap_peer -+ -+# Got to use override all across the board, otherwise a 'make -+# CFLAGS=XX' will kill us because the command line's CFLAGS will -+# overwrite Make's and we'll loose all the infrastructure it sets. -+override CFLAGS += -I. -I.. -I../crypto -I../utils -I../common -+ -+# at least for now, need to include config_ssid.h and config_blob.h from -+# wpa_supplicant directory -+override CFLAGS += -I ../../wpa_supplicant -+ -+OBJS_both += ../utils/common.o -+OBJS_both += ../utils/os_unix.o -+OBJS_both += ../utils/wpa_debug.o -+OBJS_both += ../utils/base64.o -+OBJS_both += ../utils/wpabuf.o -+OBJS_both += ../crypto/md5.o -+OBJS_both += ../crypto/sha1.o -+OBJS_both += ../crypto/sha1-tlsprf.o -+OBJS_both += ../crypto/aes-encblock.o -+OBJS_both += ../crypto/aes-wrap.o -+OBJS_both += ../crypto/aes-ctr.o -+OBJS_both += ../crypto/aes-eax.o -+OBJS_both += ../crypto/aes-omac1.o -+OBJS_both += ../crypto/ms_funcs.o -+OBJS_both += ../crypto/sha256.o -+ -+ -+OBJS_both += ../eap_common/eap_peap_common.o -+OBJS_both += ../eap_common/eap_psk_common.o -+OBJS_both += ../eap_common/eap_pax_common.o -+OBJS_both += ../eap_common/eap_sake_common.o -+OBJS_both += ../eap_common/eap_gpsk_common.o -+OBJS_both += ../eap_common/chap.o -+ -+OBJS_peer += ../eap_peer/eap_tls.o -+OBJS_peer += ../eap_peer/eap_peap.o -+OBJS_peer += ../eap_peer/eap_ttls.o -+OBJS_peer += ../eap_peer/eap_md5.o -+OBJS_peer += ../eap_peer/eap_mschapv2.o -+OBJS_peer += ../eap_peer/mschapv2.o -+OBJS_peer += ../eap_peer/eap_otp.o -+OBJS_peer += ../eap_peer/eap_gtc.o -+OBJS_peer += ../eap_peer/eap_leap.o -+OBJS_peer += ../eap_peer/eap_psk.o -+OBJS_peer += ../eap_peer/eap_pax.o -+OBJS_peer += ../eap_peer/eap_sake.o -+OBJS_peer += ../eap_peer/eap_gpsk.o -+OBJS_peer += ../eap_peer/eap.o -+OBJS_peer += ../eap_common/eap_common.o -+OBJS_peer += ../eap_peer/eap_methods.o -+OBJS_peer += ../eap_peer/eap_tls_common.o -+ -+override CFLAGS += -DEAP_TLS -+override CFLAGS += -DEAP_PEAP -+override CFLAGS += -DEAP_TTLS -+override CFLAGS += -DEAP_MD5 -+override CFLAGS += -DEAP_MSCHAPv2 -+override CFLAGS += -DEAP_GTC -+override CFLAGS += -DEAP_OTP -+override CFLAGS += -DEAP_LEAP -+override CFLAGS += -DEAP_PSK -+override CFLAGS += -DEAP_PAX -+override CFLAGS += -DEAP_SAKE -+override CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256 -+override CFLAGS += -DEAP_TLS_FUNCS -+ -+override CFLAGS += -DIEEE8021X_EAPOL -+ -+ifeq ($(CONFIG_TLS), openssl) -+override CFLAGS += -DEAP_TLS_OPENSSL -+OBJS_both += ../crypto/tls_openssl.o -+OBJS_both += ../crypto/crypto_openssl.o -+LIBS += -lssl -lcrypto -+override CFLAGS += -DINTERNAL_SHA256 -+endif -+ -+ifeq ($(CONFIG_TLS), internal) -+OBJS_both += ../crypto/tls_internal.o -+OBJS_both += ../tls/tlsv1_common.o ../../tls/tlsv1_record.o -+OBJS_both += ../tls/tlsv1_cred.o -+OBJS_both += ../tls/asn1.o ../../tls/x509v3.o -+OBJS_both += ../crypto/crypto_internal.o ../../tls/rsa.o ../../tls/bignum.o -+ -+OBJS_peer += ../tls/tlsv1_client.o -+OBJS_peer += ../tls/tlsv1_client_write.o ../../tls/tlsv1_client_read.o -+override CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT -+ -+OBJS_server += ../tls/tlsv1_server.o -+OBJS_server += ../tls/tlsv1_server_write.o ../../tls/tlsv1_server_read.o -+override CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER -+ -+override CFLAGS += -DCONFIG_TLS_INTERNAL -+override CFLAGS += -DCONFIG_CRYPTO_INTERNAL -+override CFLAGS += -DCONFIG_INTERNAL_X509 -+override CFLAGS += -DINTERNAL_AES -+override CFLAGS += -DINTERNAL_SHA1 -+override CFLAGS += -DINTERNAL_SHA256 -+override CFLAGS += -DINTERNAL_MD5 -+override CFLAGS += -DINTERNAL_MD4 -+override CFLAGS += -DINTERNAL_DES -+ifdef CONFIG_INTERNAL_LIBTOMMATH -+override CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH -+else -+LIBS += -ltommath -+endif -+endif -+ -+ifndef LDO -+LDO=$(CC) -+endif -+ -+ -+OBJS_lib=$(OBJS_both) $(OBJS_peer) -+ -+ #$(OBJS_server) -+ -+override CFLAGS += -fPIC -DPIC -+LDFLAGS += -shared -+ -+$(LIBEAP): $(OBJS_lib) -+ $(LDO) $(LDFLAGS) $(OBJS_lib) -Wl,-soname -Wl,$(LIBEAP_SO) -o $(LIBEAP) $(LIBS) -+ -+ -+UTIL_HEADERS = ../utils/includes.h ../utils/common.h \ -+ ../utils/wpabuf.h ../utils/build_config.h \ -+ ../utils/os.h ../utils/wpa_debug.h -+COMMON_HEADERS = ../common/defs.h -+EAP_COMMON_HEADERS = ../eap_common/eap_defs.h -+MAIN_HEADERS = eap.h eap_methods.h eap_config.h -+CRYPTO_HEADERS = ../crypto/tls.h -+ -+install: -+ -+ mkdir -p $(DESTDIR)/usr/lib -+# copy the lib file to std lib location -+ cp $(LIBEAP) $(DESTDIR)/usr/lib -+ ln -fs $(LIBEAP_SO) $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so -+ ln -fs $(LIBEAP_NAME).so.0.0.0 $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so.0 -+ -+# copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include -+ mkdir -p \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto -+ install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common -+ install -m 0644 $(COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common -+ install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto -+ install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util -+ install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/ -+ -+ mkdir -p $(DESTDIR)/usr/lib/pkgconfig -+ cp libeap0.pc $(DESTDIR)/usr/lib/pkgconfig -+ -+uninstall: -+ -+ rm $(DESTDIR)/usr/lib/$(LIBEAP) -+ rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR) -+ rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc - - clean: -- rm -f *~ *.o *.so *.d -+ rm -f *~ *.o *.so *.d libeap.a $(LIBEAP) $(OBJS_lib) - --install: -- if ls *.so >/dev/null 2>&1; then \ -- install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \ -- cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \ -- ; fi -+-include $(OBJS:%.o=%.d) -diff --git a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c -index 3b0af05..092f266 100644 ---- a/src/eap_peer/eap_methods.c -+++ b/src/eap_peer/eap_methods.c -@@ -340,6 +340,120 @@ int eap_peer_method_register(struct eap_method *method) - - - /** -+ * eap_peer_register_methods - Register all known EAP peer methods -+ * -+ * This function is called at program start to register all compiled -+ * in EAP peer methods. -+ */ -+int eap_peer_register_methods(void) -+{ -+ int ret = 0; -+ -+#ifdef EAP_MD5 -+ if (ret == 0) -+ ret = eap_peer_md5_register(); -+#endif /* EAP_MD5 */ -+ -+#ifdef EAP_TLS -+ if (ret == 0) -+ ret = eap_peer_tls_register(); -+#endif /* EAP_TLS */ -+ -+#ifdef EAP_MSCHAPv2 -+ if (ret == 0) -+ ret = eap_peer_mschapv2_register(); -+#endif /* EAP_MSCHAPv2 */ -+ -+#ifdef EAP_PEAP -+ if (ret == 0) -+ ret = eap_peer_peap_register(); -+#endif /* EAP_PEAP */ -+ -+#ifdef EAP_TTLS -+ if (ret == 0) -+ ret = eap_peer_ttls_register(); -+#endif /* EAP_TTLS */ -+ -+#ifdef EAP_GTC -+ if (ret == 0) -+ ret = eap_peer_gtc_register(); -+#endif /* EAP_GTC */ -+ -+#ifdef EAP_OTP -+ if (ret == 0) -+ ret = eap_peer_otp_register(); -+#endif /* EAP_OTP */ -+ -+#ifdef EAP_SIM -+ if (ret == 0) -+ ret = eap_peer_sim_register(); -+#endif /* EAP_SIM */ -+ -+#ifdef EAP_LEAP -+ if (ret == 0) -+ ret = eap_peer_leap_register(); -+#endif /* EAP_LEAP */ -+ -+#ifdef EAP_PSK -+ if (ret == 0) -+ ret = eap_peer_psk_register(); -+#endif /* EAP_PSK */ -+ -+#ifdef EAP_AKA -+ if (ret == 0) -+ ret = eap_peer_aka_register(); -+#endif /* EAP_AKA */ -+ -+#ifdef EAP_AKA_PRIME -+ if (ret == 0) -+ ret = eap_peer_aka_prime_register(); -+#endif /* EAP_AKA_PRIME */ -+ -+#ifdef EAP_FAST -+ if (ret == 0) -+ ret = eap_peer_fast_register(); -+#endif /* EAP_FAST */ -+ -+#ifdef EAP_PAX -+ if (ret == 0) -+ ret = eap_peer_pax_register(); -+#endif /* EAP_PAX */ -+ -+#ifdef EAP_SAKE -+ if (ret == 0) -+ ret = eap_peer_sake_register(); -+#endif /* EAP_SAKE */ -+ -+#ifdef EAP_GPSK -+ if (ret == 0) -+ ret = eap_peer_gpsk_register(); -+#endif /* EAP_GPSK */ -+ -+#ifdef EAP_WSC -+ if (ret == 0) -+ ret = eap_peer_wsc_register(); -+#endif /* EAP_WSC */ -+ -+#ifdef EAP_IKEV2 -+ if (ret == 0) -+ ret = eap_peer_ikev2_register(); -+#endif /* EAP_IKEV2 */ -+ -+#ifdef EAP_VENDOR_TEST -+ if (ret == 0) -+ ret = eap_peer_vendor_test_register(); -+#endif /* EAP_VENDOR_TEST */ -+ -+#ifdef EAP_TNC -+ if (ret == 0) -+ ret = eap_peer_tnc_register(); -+#endif /* EAP_TNC */ -+ -+ return ret; -+} -+ -+ -+/** - * eap_peer_unregister_methods - Unregister EAP peer methods - * - * This function is called at program termination to unregister all EAP peer -diff --git a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h -index 384c61b..b83a46f 100644 ---- a/src/eap_peer/eap_methods.h -+++ b/src/eap_peer/eap_methods.h -@@ -32,6 +32,7 @@ EapType eap_peer_get_type(const char *name, int *vendor); - const char * eap_get_name(int vendor, EapType type); - size_t eap_get_names(char *buf, size_t buflen); - char ** eap_get_names_as_string_array(size_t *num); -+int eap_peer_register_methods(void); - void eap_peer_unregister_methods(void); - - #else /* IEEE8021X_EAPOL */ -diff --git a/src/eap_peer/libeap0.pc b/src/eap_peer/libeap0.pc -new file mode 100644 -index 0000000..2f8463a ---- /dev/null -+++ b/src/eap_peer/libeap0.pc -@@ -0,0 +1,10 @@ -+prefix=/usr -+exec_prefix=/usr -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include/eap_peer -+ -+Name: libeap0 -+Description: EAP Peer Library API -+Version: 0.7.2 -+Libs: -L${libdir} -leap -+Cflags: -I${includedir} --- -1.6.6.1 - diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-dbus-path-fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-dbus-path-fix.patch deleted file mode 100644 index 976d71b0ec39..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-dbus-path-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -aurp a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in ---- a/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2012-05-15 09:00:03.048545044 +0000 -+++ b/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in 2012-05-15 09:01:19.759550509 +0000 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.epitest.hostap.WPASupplicant --Exec=@BINDIR@/wpa_supplicant -u -+Exec=/usr/sbin/wpa_supplicant -u - User=root - SystemdService=wpa_supplicant.service -diff -aurp a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in ---- a/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2012-05-15 09:00:03.048545044 +0000 -+++ b/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in 2012-05-15 09:01:28.727551913 +0000 -@@ -1,5 +1,5 @@ - [D-BUS Service] - Name=fi.w1.wpa_supplicant1 --Exec=@BINDIR@/wpa_supplicant -u -+Exec=/usr/sbin/wpa_supplicant -u - User=root - SystemdService=wpa_supplicant.service diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-do-not-call-dbus-functions-with-NULL-path.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-do-not-call-dbus-functions-with-NULL-path.patch deleted file mode 100644 index bbff73e13d42..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-do-not-call-dbus-functions-with-NULL-path.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff -aurp a/wpa_supplicant/dbus/dbus_new_helpers.c b/wpa_supplicant/dbus/dbus_new_helpers.c ---- a/wpa_supplicant/dbus/dbus_new_helpers.c 2012-05-15 07:28:37.616150164 +0000 -+++ b/wpa_supplicant/dbus/dbus_new_helpers.c 2012-05-15 07:30:21.904157611 +0000 -@@ -882,7 +882,7 @@ void wpa_dbus_mark_property_changed(stru - 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 -aurp a/wpa_supplicant/dbus/dbus_old.c b/wpa_supplicant/dbus/dbus_old.c ---- a/wpa_supplicant/dbus/dbus_old.c 2012-05-15 07:28:29.502149373 +0000 -+++ b/wpa_supplicant/dbus/dbus_old.c 2012-05-15 07:30:48.859162441 +0000 -@@ -379,7 +379,7 @@ void wpa_supplicant_dbus_notify_scan_res - 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, -@@ -419,7 +419,7 @@ void wpa_supplicant_dbus_notify_state_ch - 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 */ -@@ -478,7 +478,7 @@ void wpa_supplicant_dbus_notify_scanning - 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, -@@ -513,7 +513,7 @@ void wpa_supplicant_dbus_notify_wps_cred - 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, -@@ -564,7 +564,7 @@ void wpa_supplicant_dbus_notify_certific - 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/files/wpa_supplicant-1.1-generate-libeap-peer.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-generate-libeap-peer.patch deleted file mode 100644 index c84e51dfdecd..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-generate-libeap-peer.patch +++ /dev/null @@ -1,347 +0,0 @@ -diff -Naurp a/src/eap_peer/eap_methods.c b/src/eap_peer/eap_methods.c ---- a/src/eap_peer/eap_methods.c 2012-05-15 08:23:17.151386999 +0000 -+++ b/src/eap_peer/eap_methods.c 2012-05-15 08:23:57.403389760 +0000 -@@ -342,6 +342,120 @@ int eap_peer_method_register(struct eap_ - - - /** -+ * eap_peer_register_methods - Register all known EAP peer methods -+ * -+ * This function is called at program start to register all compiled -+ * in EAP peer methods. -+ */ -+int eap_peer_register_methods(void) -+{ -+ int ret = 0; -+ -+#ifdef EAP_MD5 -+ if (ret == 0) -+ ret = eap_peer_md5_register(); -+#endif /* EAP_MD5 */ -+ -+#ifdef EAP_TLS -+ if (ret == 0) -+ ret = eap_peer_tls_register(); -+#endif /* EAP_TLS */ -+ -+#ifdef EAP_MSCHAPv2 -+ if (ret == 0) -+ ret = eap_peer_mschapv2_register(); -+#endif /* EAP_MSCHAPv2 */ -+ -+#ifdef EAP_PEAP -+ if (ret == 0) -+ ret = eap_peer_peap_register(); -+#endif /* EAP_PEAP */ -+ -+#ifdef EAP_TTLS -+ if (ret == 0) -+ ret = eap_peer_ttls_register(); -+#endif /* EAP_TTLS */ -+ -+#ifdef EAP_GTC -+ if (ret == 0) -+ ret = eap_peer_gtc_register(); -+#endif /* EAP_GTC */ -+ -+#ifdef EAP_OTP -+ if (ret == 0) -+ ret = eap_peer_otp_register(); -+#endif /* EAP_OTP */ -+ -+#ifdef EAP_SIM -+ if (ret == 0) -+ ret = eap_peer_sim_register(); -+#endif /* EAP_SIM */ -+ -+#ifdef EAP_LEAP -+ if (ret == 0) -+ ret = eap_peer_leap_register(); -+#endif /* EAP_LEAP */ -+ -+#ifdef EAP_PSK -+ if (ret == 0) -+ ret = eap_peer_psk_register(); -+#endif /* EAP_PSK */ -+ -+#ifdef EAP_AKA -+ if (ret == 0) -+ ret = eap_peer_aka_register(); -+#endif /* EAP_AKA */ -+ -+#ifdef EAP_AKA_PRIME -+ if (ret == 0) -+ ret = eap_peer_aka_prime_register(); -+#endif /* EAP_AKA_PRIME */ -+ -+#ifdef EAP_FAST -+ if (ret == 0) -+ ret = eap_peer_fast_register(); -+#endif /* EAP_FAST */ -+ -+#ifdef EAP_PAX -+ if (ret == 0) -+ ret = eap_peer_pax_register(); -+#endif /* EAP_PAX */ -+ -+#ifdef EAP_SAKE -+ if (ret == 0) -+ ret = eap_peer_sake_register(); -+#endif /* EAP_SAKE */ -+ -+#ifdef EAP_GPSK -+ if (ret == 0) -+ ret = eap_peer_gpsk_register(); -+#endif /* EAP_GPSK */ -+ -+#ifdef EAP_WSC -+ if (ret == 0) -+ ret = eap_peer_wsc_register(); -+#endif /* EAP_WSC */ -+ -+#ifdef EAP_IKEV2 -+ if (ret == 0) -+ ret = eap_peer_ikev2_register(); -+#endif /* EAP_IKEV2 */ -+ -+#ifdef EAP_VENDOR_TEST -+ if (ret == 0) -+ ret = eap_peer_vendor_test_register(); -+#endif /* EAP_VENDOR_TEST */ -+ -+#ifdef EAP_TNC -+ if (ret == 0) -+ ret = eap_peer_tnc_register(); -+#endif /* EAP_TNC */ -+ -+ return ret; -+} -+ -+ -+/** - * eap_peer_unregister_methods - Unregister EAP peer methods - * - * This function is called at program termination to unregister all EAP peer -diff -Naurp a/src/eap_peer/eap_methods.h b/src/eap_peer/eap_methods.h ---- a/src/eap_peer/eap_methods.h 2012-05-15 08:23:17.151386999 +0000 -+++ b/src/eap_peer/eap_methods.h 2012-05-15 08:23:57.404389735 +0000 -@@ -32,6 +32,7 @@ EapType eap_peer_get_type(const char *na - const char * eap_get_name(int vendor, EapType type); - size_t eap_get_names(char *buf, size_t buflen); - char ** eap_get_names_as_string_array(size_t *num); -+int eap_peer_register_methods(void); - void eap_peer_unregister_methods(void); - - #else /* IEEE8021X_EAPOL */ -diff -Naurp a/src/eap_peer/libeap0.pc b/src/eap_peer/libeap0.pc ---- a/src/eap_peer/libeap0.pc 1970-01-01 00:00:00.000000000 +0000 -+++ b/src/eap_peer/libeap0.pc 2012-05-15 08:23:57.404389735 +0000 -@@ -0,0 +1,10 @@ -+prefix=/usr -+exec_prefix=/usr -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include/eap_peer -+ -+Name: libeap0 -+Description: EAP Peer Library API -+Version: 0.7.2 -+Libs: -L${libdir} -leap -+Cflags: -I${includedir} -diff -Naurp a/src/eap_peer/Makefile b/src/eap_peer/Makefile ---- a/src/eap_peer/Makefile 2012-05-15 08:23:17.152386964 +0000 -+++ b/src/eap_peer/Makefile 2012-05-15 08:23:57.403389760 +0000 -@@ -1,11 +1,186 @@ --all: -- @echo Nothing to be made. -+LIBEAP_NAME = libeap -+LIBEAP_CURRENT = 0 -+LIBEAP_REVISION = 0 -+LIBEAP_AGE = 0 -+ -+LIBEAP = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT).$(LIBEAP_REVISION).$(LIBEAP_AGE) -+LIBEAP_SO = $(LIBEAP_NAME).so.$(LIBEAP_CURRENT) -+ -+.PHONY: all clean install uninstall -+ -+all: $(LIBEAP) -+ -+ifndef CC -+CC=gcc -+endif -+ -+ifndef CFLAGS -+CFLAGS = -MMD -O0 -Wall -g -+endif -+ -+CONFIG_TLS=openssl -+ -+INCLUDE_INSTALL_DIR=/usr/include/eap_peer -+ -+# Got to use override all across the board, otherwise a 'make -+# CFLAGS=XX' will kill us because the command line's CFLAGS will -+# overwrite Make's and we'll loose all the infrastructure it sets. -+override CFLAGS += -I. -I.. -I../crypto -I../utils -I../common -+ -+# at least for now, need to include config_ssid.h and config_blob.h from -+# wpa_supplicant directory -+override CFLAGS += -I ../../wpa_supplicant -+ -+OBJS_both += ../utils/common.o -+OBJS_both += ../utils/os_unix.o -+OBJS_both += ../utils/wpa_debug.o -+OBJS_both += ../utils/base64.o -+OBJS_both += ../utils/wpabuf.o -+OBJS_both += ../crypto/md5.o -+OBJS_both += ../crypto/sha1.o -+OBJS_both += ../crypto/sha1-tlsprf.o -+OBJS_both += ../crypto/aes-encblock.o -+OBJS_both += ../crypto/aes-wrap.o -+OBJS_both += ../crypto/aes-ctr.o -+OBJS_both += ../crypto/aes-eax.o -+OBJS_both += ../crypto/aes-omac1.o -+OBJS_both += ../crypto/ms_funcs.o -+OBJS_both += ../crypto/sha256.o -+ -+ -+OBJS_both += ../eap_common/eap_peap_common.o -+OBJS_both += ../eap_common/eap_psk_common.o -+OBJS_both += ../eap_common/eap_pax_common.o -+OBJS_both += ../eap_common/eap_sake_common.o -+OBJS_both += ../eap_common/eap_gpsk_common.o -+OBJS_both += ../eap_common/chap.o -+ -+OBJS_peer += ../eap_peer/eap_tls.o -+OBJS_peer += ../eap_peer/eap_peap.o -+OBJS_peer += ../eap_peer/eap_ttls.o -+OBJS_peer += ../eap_peer/eap_md5.o -+OBJS_peer += ../eap_peer/eap_mschapv2.o -+OBJS_peer += ../eap_peer/mschapv2.o -+OBJS_peer += ../eap_peer/eap_otp.o -+OBJS_peer += ../eap_peer/eap_gtc.o -+OBJS_peer += ../eap_peer/eap_leap.o -+OBJS_peer += ../eap_peer/eap_psk.o -+OBJS_peer += ../eap_peer/eap_pax.o -+OBJS_peer += ../eap_peer/eap_sake.o -+OBJS_peer += ../eap_peer/eap_gpsk.o -+OBJS_peer += ../eap_peer/eap.o -+OBJS_peer += ../eap_common/eap_common.o -+OBJS_peer += ../eap_peer/eap_methods.o -+OBJS_peer += ../eap_peer/eap_tls_common.o -+ -+override CFLAGS += -DEAP_TLS -+override CFLAGS += -DEAP_PEAP -+override CFLAGS += -DEAP_TTLS -+override CFLAGS += -DEAP_MD5 -+override CFLAGS += -DEAP_MSCHAPv2 -+override CFLAGS += -DEAP_GTC -+override CFLAGS += -DEAP_OTP -+override CFLAGS += -DEAP_LEAP -+override CFLAGS += -DEAP_PSK -+override CFLAGS += -DEAP_PAX -+override CFLAGS += -DEAP_SAKE -+override CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256 -+override CFLAGS += -DEAP_TLS_FUNCS -+ -+override CFLAGS += -DIEEE8021X_EAPOL -+ -+ifeq ($(CONFIG_TLS), openssl) -+override CFLAGS += -DEAP_TLS_OPENSSL -+OBJS_both += ../crypto/tls_openssl.o -+OBJS_both += ../crypto/crypto_openssl.o -+LIBS += -lssl -lcrypto -+override CFLAGS += -DINTERNAL_SHA256 -+endif -+ -+ifeq ($(CONFIG_TLS), internal) -+OBJS_both += ../crypto/tls_internal.o -+OBJS_both += ../tls/tlsv1_common.o ../../tls/tlsv1_record.o -+OBJS_both += ../tls/tlsv1_cred.o -+OBJS_both += ../tls/asn1.o ../../tls/x509v3.o -+OBJS_both += ../crypto/crypto_internal.o ../../tls/rsa.o ../../tls/bignum.o -+ -+OBJS_peer += ../tls/tlsv1_client.o -+OBJS_peer += ../tls/tlsv1_client_write.o ../../tls/tlsv1_client_read.o -+override CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT -+ -+OBJS_server += ../tls/tlsv1_server.o -+OBJS_server += ../tls/tlsv1_server_write.o ../../tls/tlsv1_server_read.o -+override CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER -+ -+override CFLAGS += -DCONFIG_TLS_INTERNAL -+override CFLAGS += -DCONFIG_CRYPTO_INTERNAL -+override CFLAGS += -DCONFIG_INTERNAL_X509 -+override CFLAGS += -DINTERNAL_AES -+override CFLAGS += -DINTERNAL_SHA1 -+override CFLAGS += -DINTERNAL_SHA256 -+override CFLAGS += -DINTERNAL_MD5 -+override CFLAGS += -DINTERNAL_MD4 -+override CFLAGS += -DINTERNAL_DES -+ifdef CONFIG_INTERNAL_LIBTOMMATH -+override CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH -+else -+LIBS += -ltommath -+endif -+endif -+ -+ifndef LDO -+LDO=$(CC) -+endif -+ -+ -+OBJS_lib=$(OBJS_both) $(OBJS_peer) -+ -+ #$(OBJS_server) -+ -+override CFLAGS += -fPIC -DPIC -+LDFLAGS += -shared -+ -+$(LIBEAP): $(OBJS_lib) -+ $(LDO) $(LDFLAGS) $(OBJS_lib) -Wl,-soname -Wl,$(LIBEAP_SO) -o $(LIBEAP) $(LIBS) -+ -+ -+UTIL_HEADERS = ../utils/includes.h ../utils/common.h \ -+ ../utils/wpabuf.h ../utils/build_config.h \ -+ ../utils/os.h ../utils/wpa_debug.h -+COMMON_HEADERS = ../common/defs.h -+EAP_COMMON_HEADERS = ../eap_common/eap_defs.h -+MAIN_HEADERS = eap.h eap_methods.h eap_config.h -+CRYPTO_HEADERS = ../crypto/tls.h -+ -+install: -+ -+ mkdir -p $(DESTDIR)/usr/lib -+# copy the lib file to std lib location -+ cp $(LIBEAP) $(DESTDIR)/usr/lib -+ ln -fs $(LIBEAP_SO) $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so -+ ln -fs $(LIBEAP_NAME).so.0.0.0 $(DESTDIR)/usr/lib/$(LIBEAP_NAME).so.0 -+ -+# copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include -+ mkdir -p \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util \ -+ $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto -+ install -m 0644 $(EAP_COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common -+ install -m 0644 $(COMMON_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/common -+ install -m 0644 $(CRYPTO_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/crypto -+ install -m 0644 $(UTIL_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/util -+ install -m 0644 $(MAIN_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/ -+ -+ mkdir -p $(DESTDIR)/usr/lib/pkgconfig -+ cp libeap0.pc $(DESTDIR)/usr/lib/pkgconfig -+ -+uninstall: -+ -+ rm $(DESTDIR)/usr/lib/$(LIBEAP) -+ rm -fr $(DESTDIR)/$(INCLUDE_INSTALL_DIR) -+ rm -f $(DESTDIR)/usr/lib/pkgconfig/libeap0.pc - - clean: -- rm -f *~ *.o *.so *.d -+ rm -f *~ *.o *.so *.d libeap.a $(LIBEAP) $(OBJS_lib) - --install: -- if ls *.so >/dev/null 2>&1; then \ -- install -d $(DESTDIR)$(LIBDIR)/wpa_supplicant && \ -- cp *.so $(DESTDIR)$(LIBDIR)/wpa_supplicant \ -- ; fi diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-libnl_path_fix.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-libnl_path_fix.patch deleted file mode 100644 index abf15a6e7e07..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-1.1-libnl_path_fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -aurp a/src/drivers/drivers.mak b/src/drivers/drivers.mak ---- a/src/drivers/drivers.mak 2012-10-03 19:42:16.387634128 +0000 -+++ b/src/drivers/drivers.mak 2012-10-03 19:43:16.246693744 +0000 -@@ -48,7 +48,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny -diff -aurp a/src/drivers/drivers.mk b/src/drivers/drivers.mk ---- a/src/drivers/drivers.mk 2012-10-03 19:42:16.385634126 +0000 -+++ b/src/drivers/drivers.mk 2012-10-03 19:43:23.333700780 +0000 -@@ -48,7 +48,7 @@ NEED_RFKILL=y - ifdef CONFIG_LIBNL32 - DRV_LIBS += -lnl-3 - DRV_LIBS += -lnl-genl-3 -- DRV_CFLAGS += -DCONFIG_LIBNL20 -+ DRV_CFLAGS += -DCONFIG_LIBNL20 -I/usr/include/libnl3 - else - ifdef CONFIG_LIBNL_TINY - DRV_LIBS += -lnl-tiny diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch deleted file mode 100644 index 947a47665bfb..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- ./wpa_supplicant/wpa_gui-qt4/wpagui.cpp_old 2012-03-22 10:32:40.397228118 +0000 -+++ ./wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2012-03-22 10:33:04.150228188 +0000 -@@ -12,10 +12,10 @@ - * See README and COPYING for more details. - */ - --#ifdef __MINGW32__ -+/* #ifdef __MINGW32__ */ - /* Need to get getopt() */ - #include <unistd.h> --#endif -+/* #endif */ - - #ifdef CONFIG_NATIVE_WINDOWS - #include <windows.h> diff --git a/net-wireless/wpa_supplicant/metadata.xml b/net-wireless/wpa_supplicant/metadata.xml index 6a63e4e5d0c5..935c73eb3c79 100644 --- a/net-wireless/wpa_supplicant/metadata.xml +++ b/net-wireless/wpa_supplicant/metadata.xml @@ -17,7 +17,6 @@ <flag name='ap'>Add support for access point mode</flag> <flag name='eap-sim'>Add support for EAP-SIM authentication algorithm</flag> <flag name='fasteap'>Add support for FAST-EAP authentication algorithm</flag> - <flag name='madwifi'>Add support for madwifi (Atheros chipset)</flag> <flag name='p2p'>Add support for Wi-Fi Direct mode</flag> <flag name='ps3'>Add support for ps3 hypervisor driven gelic wifi</flag> <flag name='wps'>Add support for Wi-Fi Protected Setup</flag> diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild deleted file mode 100644 index 34347198c803..000000000000 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild +++ /dev/null @@ -1,310 +0,0 @@ -# Copyright 1999-2013 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.3-r5.ebuild,v 1.19 2013/03/02 23:13:01 hwoarang Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs qt4-r2 systemd multilib - -DESCRIPTION="IEEE 802.1X/WPA supplicant for secure wireless transfers" -HOMEPAGE="http://hostap.epitest.fi/wpa_supplicant/" -SRC_URI="http://hostap.epitest.fi/releases/${P}.tar.gz" -LICENSE="|| ( GPL-2 BSD )" - -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc ppc64 x86 ~x86-fbsd" -IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline selinux ssl wimax wps kernel_linux kernel_FreeBSD" - -RDEPEND="dbus? ( sys-apps/dbus ) - kernel_linux? ( - eap-sim? ( sys-apps/pcsc-lite ) - madwifi? ( >net-wireless/madwifi-ng-tools-0.9.3 ) - dev-libs/libnl:1.1 - ) - !kernel_linux? ( net-libs/libpcap ) - qt4? ( - dev-qt/qtgui:4 - dev-qt/qtsvg:4 - ) - readline? ( - sys-libs/ncurses - sys-libs/readline - ) - ssl? ( dev-libs/openssl ) - !ssl? ( gnutls? ( net-libs/gnutls ) ) - !ssl? ( !gnutls? ( dev-libs/libtommath ) ) - selinux? ( sec-policy/selinux-networkmanager )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -S="${WORKDIR}/${P}/${PN}" - -pkg_setup() { - if use fasteap && (use gnutls || use ssl) ; then - die "If you use fasteap, you must build with wpa_supplicant's internal TLS implementation. That is, both 'gnutls' and 'ssl' USE flags must be disabled" - fi - - if use gnutls && use ssl ; then - einfo "You have both 'gnutls' and 'ssl' USE flags enabled: defaulting to USE=\"ssl\"" - fi -} - -src_prepare() { - # net/bpf.h needed for net-libs/libpcap on Gentoo/FreeBSD - sed -i \ - -e "s:\(#include <pcap\.h>\):#include <net/bpf.h>\n\1:" \ - ../src/l2_packet/l2_packet_freebsd.c || die - - # People seem to take the example configuration file too literally (bug #102361) - sed -i \ - -e "s:^\(opensc_engine_path\):#\1:" \ - -e "s:^\(pkcs11_engine_path\):#\1:" \ - -e "s:^\(pkcs11_module_path\):#\1:" \ - wpa_supplicant.conf || die - - # Change configuration to match Gentoo locations (bug #143750) - sed -i \ - -e "s:/usr/lib/opensc:/usr/$(get_libdir):" \ - -e "s:/usr/lib/pkcs11:/usr/$(get_libdir):" \ - wpa_supplicant.conf || die - - epatch "${FILESDIR}/${P}-dbus_path_fix.patch" - - # systemd entries to D-Bus service files (bug #372877) - echo 'SystemdService=wpa_supplicant.service' \ - | tee -a dbus/*.service >/dev/null || die - - if use wimax; then - cd "${WORKDIR}/${P}" - epatch "${FILESDIR}/${P}-generate-libeap-peer.patch" - - # multilib-strict fix (bug #373685) - sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile - fi - - # bug (320097) - epatch "${FILESDIR}/do-not-call-dbus-functions-with-NULL-path.patch" - # https://bugzilla.gnome.org/show_bug.cgi?id=644634 - epatch "${FILESDIR}/${P}-dbus-api-changes.patch" - # bug (374089) - epatch "${FILESDIR}/${P}-dbus-WPAIE-fix.patch" - # bug (409285) - epatch "${FILESDIR}/wpa_supplicant-gcc470.patch" -} - -src_configure() { - # Toolchain setup - tc-export CC - - # Basic setup - echo "CONFIG_CTRL_IFACE=y" >> .config - echo "CONFIG_BACKEND=file" >> .config - - # Basic authentication methods - # NOTE: we don't set GPSK or SAKE as they conflict - # with the below options - echo "CONFIG_EAP_GTC=y" >> .config - echo "CONFIG_EAP_MD5=y" >> .config - echo "CONFIG_EAP_OTP=y" >> .config - echo "CONFIG_EAP_PAX=y" >> .config - echo "CONFIG_EAP_PSK=y" >> .config - echo "CONFIG_EAP_TLV=y" >> .config - echo "CONFIG_IEEE8021X_EAPOL=y" >> .config - echo "CONFIG_PKCS12=y" >> .config - echo "CONFIG_PEERKEY=y" >> .config - echo "CONFIG_EAP_LEAP=y" >> .config - echo "CONFIG_EAP_MSCHAPV2=y" >> .config - echo "CONFIG_EAP_PEAP=y" >> .config - echo "CONFIG_EAP_TLS=y" >> .config - echo "CONFIG_EAP_TTLS=y" >> .config - - if use dbus ; then - echo "CONFIG_CTRL_IFACE_DBUS=y" >> .config - echo "CONFIG_CTRL_IFACE_DBUS_NEW=y" >> .config - echo "CONFIG_CTRL_IFACE_DBUS_INTRO=y" >> .config - fi - - if use debug ; then - echo "CONFIG_DEBUG_FILE=y" >> .config - fi - - if use eap-sim ; then - # Smart card authentication - echo "CONFIG_EAP_SIM=y" >> .config - echo "CONFIG_EAP_AKA=y" >> .config - echo "CONFIG_EAP_AKA_PRIME=y" >> .config - echo "CONFIG_PCSC=y" >> .config - fi - - if use fasteap ; then - echo "CONFIG_EAP_FAST=y" >> .config - fi - - if use readline ; then - # readline/history support for wpa_cli - echo "CONFIG_READLINE=y" >> .config - fi - - # SSL authentication methods - if use ssl ; then - echo "CONFIG_TLS=openssl" >> .config - echo "CONFIG_SMARTCARD=y" >> .config - elif use gnutls ; then - echo "CONFIG_TLS=gnutls" >> .config - echo "CONFIG_GNUTLS_EXTRA=y" >> .config - else - echo "CONFIG_TLS=internal" >> .config - fi - - if use kernel_linux ; then - # Linux specific drivers - echo "CONFIG_DRIVER_ATMEL=y" >> .config - #echo "CONFIG_DRIVER_BROADCOM=y" >> .config - #echo "CONFIG_DRIVER_HERMES=y" >> .config - echo "CONFIG_DRIVER_HOSTAP=y" >> .config - echo "CONFIG_DRIVER_IPW=y" >> .config - echo "CONFIG_DRIVER_NDISWRAPPER=y" >> .config - echo "CONFIG_DRIVER_NL80211=y" >> .config - #echo "CONFIG_DRIVER_PRISM54=y" >> .config - echo "CONFIG_DRIVER_RALINK=y" >> .config - echo "CONFIG_DRIVER_WEXT=y" >> .config - echo "CONFIG_DRIVER_WIRED=y" >> .config - - if use madwifi ; then - # Add include path for madwifi-driver headers - echo "CFLAGS += -I/usr/include/madwifi" >> .config - echo "CONFIG_DRIVER_MADWIFI=y" >> .config - fi - - if use ps3 ; then - echo "CONFIG_DRIVER_PS3=y" >> .config - fi - - elif use kernel_FreeBSD ; then - # FreeBSD specific driver - echo "CONFIG_DRIVER_BSD=y" >> .config - fi - - # Wi-Fi Protected Setup (WPS) - if use wps ; then - echo "CONFIG_WPS=y" >> .config - fi - - # Enable mitigation against certain attacks against TKIP - echo "CONFIG_DELAYED_MIC_ERROR_REPORT=y" >> .config - - # If we are using libnl 2.0 and above, enable support for it - # Bug 382159 - # Removed for now, since the 3.2 version is broken, and we don't - # support it. - #if has_version ">=dev-libs/libnl-2.0"; then - # echo "CONFIG_LIBNL20=y" >> .config - #fi - - if use qt4 ; then - pushd "${S}"/wpa_gui-qt4 > /dev/null - eqmake4 wpa_gui.pro - popd > /dev/null - fi -} - -src_compile() { - einfo "Building wpa_supplicant" - emake - - if use wimax; then - emake -C ../src/eap_peer clean - emake -C ../src/eap_peer - fi - - if use qt4 ; then - pushd "${S}"/wpa_gui-qt4 > /dev/null - einfo "Building wpa_gui" - emake - popd > /dev/null - fi -} - -src_install() { - dosbin wpa_supplicant - dobin wpa_cli wpa_passphrase - - # baselayout-1 compat - if has_version "<sys-apps/baselayout-2.0.0"; then - dodir /sbin - dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant - dodir /bin - dosym /usr/bin/wpa_cli /bin/wpa_cli - fi - - if has_version ">=sys-apps/openrc-0.5.0"; then - newinitd "${FILESDIR}/${PN}-init.d" wpa_supplicant - newconfd "${FILESDIR}/${PN}-conf.d" wpa_supplicant - fi - - exeinto /etc/wpa_supplicant/ - newexe "${FILESDIR}/wpa_cli.sh" wpa_cli.sh - - dodoc ChangeLog {eap_testing,todo}.txt README{,-WPS} \ - wpa_supplicant.conf - - doman doc/docbook/*.{5,8} - - if use qt4 ; then - into /usr - dobin wpa_gui-qt4/wpa_gui - doicon wpa_gui-qt4/icons/wpa_gui.svg - make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" - fi - - use wimax && emake DESTDIR="${D}" -C ../src/eap_peer install - - if use dbus ; then - pushd "${S}"/dbus > /dev/null - insinto /etc/dbus-1/system.d - newins dbus-wpa_supplicant.conf wpa_supplicant.conf - insinto /usr/share/dbus-1/system-services - doins fi.epitest.hostap.WPASupplicant.service fi.w1.wpa_supplicant1.service - keepdir /var/run/wpa_supplicant - popd > /dev/null - fi - - # systemd stuff - systemd_dounit "${FILESDIR}"/wpa_supplicant.service - systemd_newunit "${FILESDIR}"/wpa_supplicant_at.service 'wpa_supplicant@.service' -} - -pkg_postinst() { - einfo "If this is a clean installation of wpa_supplicant, you" - einfo "have to create a configuration file named" - einfo "/etc/wpa_supplicant/wpa_supplicant.conf" - einfo - einfo "An example configuration file is available for reference in" - einfo "/usr/share/doc/${PF}/" - - if [[ -e ${ROOT}etc/wpa_supplicant.conf ]] ; then - echo - ewarn "WARNING: your old configuration file ${ROOT}etc/wpa_supplicant.conf" - ewarn "needs to be moved to ${ROOT}etc/wpa_supplicant/wpa_supplicant.conf" - fi - - if use madwifi ; then - echo - einfo "This package compiles against the headers installed by" - einfo "madwifi-old, madwifi-ng or madwifi-ng-tools." - einfo "You should re-emerge ${PN} after upgrading these packages." - fi - - # Mea culpa, feel free to remove that after some time --mgorny. - local fn - for fn in wpa_supplicant{,@wlan0}.service; do - if [[ -e "${ROOT}"/etc/systemd/system/network.target.wants/${fn} ]] - then - ebegin "Moving ${fn} to multi-user.target" - mv "${ROOT}"/etc/systemd/system/network.target.wants/${fn} \ - "${ROOT}"/etc/systemd/system/multi-user.target.wants/ - eend ${?} \ - "Please try to re-enable ${fn}" - fi - done -} |