diff options
| -rw-r--r-- | net-wireless/wimax-tools/Manifest | 24 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/ChangeLog | 7 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/Manifest | 30 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/files/wpa_supplicant-0.6.10-generate-libeap-peer.patch | 387 | ||||
| -rw-r--r-- | net-wireless/wpa_supplicant/wpa_supplicant-0.6.10-r1.ebuild | 271 |
5 files changed, 37 insertions, 682 deletions
diff --git a/net-wireless/wimax-tools/Manifest b/net-wireless/wimax-tools/Manifest index 9e59df2d809b..76b476fb2363 100644 --- a/net-wireless/wimax-tools/Manifest +++ b/net-wireless/wimax-tools/Manifest @@ -1,14 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 -DIST wimax-tools-1.4.3.tar.gz 360490 RMD160 004ea061114b4df66eb1ec11be045d5f8c2f7022 SHA1 bfbe66489ff3c38d357ae80e4901d6d00758290e SHA256 e1ee72668b570ce4652f8aa97e8e91d0b0def461f5ca1cf16476a370088546b8 -EBUILD wimax-tools-1.4.3.ebuild 922 RMD160 9767d0965daeea2e432d3e990187c4f6eb682f1f SHA1 804fda064e1388fe3da3eaedbb8f8cc9434cdfa9 SHA256 d2f4b24f10e891226202749b620cc7b2d8f18dd43d1f7a967d5e38a7058b3a44 -MISC ChangeLog 675 RMD160 4469249f5272273cbf6260c800744a0b76c04a29 SHA1 ae8e57f7c396005b64a2c7c9b0449bb21dadedd1 SHA256 906bc36d5d252d81d50a058b003ea13347f352eebdf9962345bded9c7b30bb6c +DIST wimax-tools-1.4.4.tar.gz 361572 RMD160 cbf7830bbee11a49c326107c47b24a2b0993372b SHA1 87c5f5d5ad495c69abe1d83838c3f40a5162dbe0 SHA256 63ea9796704ae2f0e324b655398d103cdd4261d9a2e58d6a41c5574719dec4bd +EBUILD wimax-tools-1.4.4.ebuild 691 RMD160 50cf4e181e55c2c5938267a103fde695628d6589 SHA1 41c59fe9289ccf07d852178637e17b6136078bd6 SHA256 89ee2f1e822e8ed2a300c50dc425c0bda30612856c0f1d15ad5dae3f0c51f53e +MISC ChangeLog 842 RMD160 f6304a8359b8ccaf8074ff05b479c68d57b52938 SHA1 365efa0b5be46751da233845b7d56b56bfda8fe8 SHA256 3a8927ab255502abac1daa092327b282b065c7cd83d90cdc22fd9618fb962ec5 MISC metadata.xml 250 RMD160 94be601f620e3158922f31ac28328a28665555a2 SHA1 ac8010695121148bf3593692aba56938187882c9 SHA256 aea796ea3b08f1f5ca77c34868298e406de62590afbf2662e87d094c3e0041f4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iEYEARECAAYFAkxODygACgkQ5BmOA85PVLgPCACgm+KflW4x3k2SWdLWH1TFlV+b -94cAn3VUEUOH0y8xxD3O1YDibiWVMaNJ -=KG1u +iQIcBAEBCAAGBQJM2Da5AAoJEOf+E+/4L5LmyKQP/jnLH78+2fB3u92ET1nXvFQ3 +eo6flepeLUnW/i6uBD/9r8c/GhTog/7IEmco1qmlHmhKHQeYdIpvIdbAPflmX7hP +uHOTXa56CoH4G/vgIe5+QmXPdhF+dh8MNoOqase396u++33bgguGKjGYy9px9QEs +AfiisNNIEupYh8Labq89/9jvZLgGwQ4lnGbS+Y25iJ3SRMWiaAVc+2B+0LJXQ3RA +mRwJudnhoV1AA6Z3JReZtmMpYuBn3C/7zDamvUmbdy78apR2k+RH/h0pkJmI1E3d ++zZF4I4JqmVFVlvZ5+Nu4Z41nsOiykbCB6A+jbzskje3kVug9lQ5TG6Iu7iLZRZc +bFQte2VFPNO3CdJPpXm8/cYi4vnkMqjMMf9bdo3EhNTo5QHvt8aRQ0Ks6I95KGen +2QWQQGLYkeylQoY1whdx9earW/0eq8SDabSxc5cVIKPgL/q+N+0Ara3EJXtgxfQy +B2tq3IJmmzDadRzbhAKx/9qRnOxkQtl8gM8lFceG4471kBgEEYJFW09ALKNejBpL +IDVyqa+DKp8/lEmpjfbLGFu6ArOWNPm61PHs84WEImVEzAUEKSGKQ5lnWI7gpuZl +OTBXiXuxaBLDLRpgA+vAKKsfmZyNNhGH70vXyERsEzB6lLoVYKo+Yvjt0nCc3T+b +XxucVaUKQJU+q3u0CG9M +=Vsji -----END PGP SIGNATURE----- diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index 9f266eaa66ef..3499253f7076 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,11 @@ # 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.150 2010/11/08 17:39:02 alexxy Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.151 2010/11/08 17:40:39 alexxy Exp $ + + 08 Nov 2010; Alexey Shvetsov <alexxy@gentoo.org> + -wpa_supplicant-0.6.10-r1.ebuild, + -files/wpa_supplicant-0.6.10-generate-libeap-peer.patch: + Drop old wpa_supplicant with wimax *wpa_supplicant-0.7.3-r1 (08 Nov 2010) diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 74363a3294fb..b14522beb320 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -5,7 +5,6 @@ AUX dbus_path_fix.patch 286 RMD160 891b3b8dc1ed75089a5be31e4a6937fe52178ad0 SHA1 AUX do-not-call-dbus-functions-with-NULL-path.patch 1931 RMD160 9ba6cc14cb6816062ba208f136785d664e58d347 SHA1 9ae40351bd125d5be0a392bff5239b6f3ce85af4 SHA256 faa5d9bbc79ff719c61ed24bc173ad07699a0b21f9fc472f09157d001299395e AUX fix-ssid-combo.patch 3713 RMD160 97e68ffcf2ae2a0d45ca5d868e0490ce531af8b4 SHA1 5f12d283fb7bf119807ae01783db99a1f1549c9a SHA256 68e351bf69eb9cba38c093b0f252a89d2b8794039def4697b5f6851feedc7831 AUX wpa_cli.sh 1312 RMD160 d894097c699d067068d2cace9bf71dd6c8c29908 SHA1 f2887f74eb053183d13fcb7d039d91c01fb3765a SHA256 f6b62c8b1db53e94c49ad717d10f5cbb3b08127ba9f8ab9c72da14ba52f995d8 -AUX wpa_supplicant-0.6.10-generate-libeap-peer.patch 10190 RMD160 f921ae640985974fb6dfd8875f2430d5e798bee5 SHA1 ed46c39d06702369895582a24ea980867f9d01f4 SHA256 f7b9dc867ff2120279b427b0b2e5e2d50875caaed4c6cac971c83b0f7ab55b69 AUX wpa_supplicant-0.7.2-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791 AUX wpa_supplicant-0.7.2-no-crash.patch 601 RMD160 ade21c632516b4ea179a9bc361d5f8944f5541f4 SHA1 8da52f09f7402dc78b71e39cb5c097169fc7dfa3 SHA256 58922437ffa6be06dd3f6f4e8ae9598c342d6e865f2b43442655666eab3e6611 AUX wpa_supplicant-0.7.3-dbus_path_fix.patch 316 RMD160 bb1b43b0d369a93fa01cef10ca5ad93d9b608853 SHA1 2f9715b648ceb8c67b15a3b1b345a27b5e1dc933 SHA256 3fdc64892399b158b912dac6902ea8c161e998591d4b3bcf56bc1ab06d7a4791 @@ -16,27 +15,26 @@ AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 DIST wpa_supplicant-0.6.10.tar.gz 1190391 RMD160 3c2b5269fd261ba695a276204088588a7992c002 SHA1 d2c93758607de250a8dda7adc8f8b304d0a074ce SHA256 ac27c69c26e3f4e06fba13e0dc8e1c7ed7b0012a95263bcfcf0f39be8059f2fd DIST wpa_supplicant-0.7.2.tar.gz 1634596 RMD160 d9c804dd92ef827a4640a53ae963ea520e2fdb99 SHA1 188dd2f0a53982a84ee6fb87ffb3d7eca4bcf42b SHA256 df002a75376fc3f8bc0082771d1accadf60891515e08ac5b7ca044fa9985dcbe DIST wpa_supplicant-0.7.3.tar.gz 1638224 RMD160 e22f0440d64c943e4b0886eefa3418e75ea01b60 SHA1 ca51db8931fabf386352c87422f3e62fb44c3fe3 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 -EBUILD wpa_supplicant-0.6.10-r1.ebuild 7964 RMD160 c655684a622f6483213ccc72045d0768ead956c2 SHA1 84e02c0a23525720f1553f39da36a374d2fe230c SHA256 5a72126b2ecbaa77e7b8b940a9a304cc89695031fb57ec933d89097ae093542d EBUILD wpa_supplicant-0.6.10.ebuild 7174 RMD160 00bcc016cd92490a79a37d86d639368b70190b74 SHA1 3be13113ff07ce8489e5916cb22addfe723c42bf SHA256 535b47551b6044ace8cad9b9b91da37f453a2c130a6a1e846ed3f18747a2fb5e EBUILD wpa_supplicant-0.7.2-r3.ebuild 7452 RMD160 146b6a75921a123a2e03af560359a513fe316603 SHA1 6ce002f0b54305a1d86e12d9002581a979f7d778 SHA256 8bae50364de36069e48e71f6efd09be55301f35630e568a2aeae3fefb35dea20 EBUILD wpa_supplicant-0.7.3-r1.ebuild 7690 RMD160 6d3450c5fa246612b271c4df2c8b907bfb803712 SHA1 34bd8938570f7d36ce194f736a4dc088d354e000 SHA256 962ac0efa4f6ecb7bcefd8f372913db3fb9f47043025b42c1262af5678965629 EBUILD wpa_supplicant-0.7.3.ebuild 7338 RMD160 b08afd181c20f05b73d161a8fdf7143dc8fd1422 SHA1 8fc93a2f91ec3b83b5a36bbbe7ddfed7c7627668 SHA256 da38172c49068cd9c871886fe6c4281e06c7d9ad3d51f8fd28d6f5feb6338321 -MISC ChangeLog 32253 RMD160 d54bca858e79b7c6fd1da4f29e00c1948d78a90a SHA1 d20038f550d30b7ee6b2662aab8dc7071b28d90a SHA256 ce535ae5170a23772ad2247a963508673a851033a37b8ecf8d9630339c1fea38 +MISC ChangeLog 32437 RMD160 c5383c831610a33611495d93ae1301a3f6a05aca SHA1 d07d0528b7cdd30a71a3225b6776651834f7ab04 SHA256 2868cd9b2a64091582b2fe7496a4f017804534cd81f851034b8ff2ee94b7a454 MISC metadata.xml 832 RMD160 14771aa4f3533875b5f3f900ee513dcda354873d SHA1 01f054ebe9f2bebdf8814558085c65ce9d8a15f6 SHA256 a8de983e560152d0491219686afa13bde6e5aa9fcade3b79e77f179c61bb164c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iQIcBAEBCAAGBQJM2DU/AAoJEOf+E+/4L5LmEIsQAJMUK+Zu1+LI/rqlQun0Dv9t -QkUpkRNdUZ2PN3Vg1UcHM1zGSmJh/2Qv1BuxBSokg+dkOWInXZcCCVG5WLLDAqnC -azI8JvBnCckGk7Ug3a4d2xd+OwTN7J8x8spWr9z2ggIbaK1fiNG9KD1Ey0pwlEHC -q8bwf+WrpUmsHmcWBXONOQ8z4PphrdpWL9Mg0YyWauVW7LP7ZOYo8L0gKB3UO5Qf -61GJ+QdYwuT2KAoM/sjVeU1Nw0kIVMReLdA5ScwuHzvJg/tKmBMSeYZ+xEljS0hN -eV/btKNRUTTvjLCpX5MeTCL/Su2+fSVgEdfSg1YYfmT320sHZYJmO8g5nhqM8oHh -hVZioUVwX+JKL623Hy36RrCvtWPC+E5Q6lubAHJpRWhnWQ7FtN7AIGo6dl6EgY74 -K3LNsF8j3aeb3GLPeIpUrs4Zge8qpdFXTJlVsdHrnY7LAF4GVqNFUVe8y75J5TDf -dpGRIteojc7aYDxkSXygjndiFKhAzYQjIyCAzqfXKtyk9NWrZ9cqACSbmZwI8O5Z -Ff4yptcTzgcQkEPv0M4ZgavtPm2CSTtSMLnH4GZh4p6HU/OAh7g5vHDtTyMNjVmX -JrXOcK7whe2AjE6efZ/wSoWmPFkuG9T7hNEI+slw0S5O2M59BvHnfrjXZtkcVZwj -3b5SHsRhUTWuaRL0QPsv -=+tmd +iQIcBAEBCAAGBQJM2DWZAAoJEOf+E+/4L5LmaW8P/2/hT4vTCnk9uP/XezOSVYNS +RZ/RztozX6lq5DhrMqmNUDuGEcCEFeU/BMNc3YobuhGSoDOeAviRql1N1t3Su/MJ +iJ6mLP76Z8zJcsnRAcyuW9lCpVCKkKmLkmDcm/AfruqogSKw3Tr4rMVYSWcK2mNV +D/g4Mi3CBpHdpjOQQKfi0BwxBZFx6HUE5C4CudizvNcOygx59PW7KRaC8yFnnTBk +wpAS4qZTa0KYzbppvi6p5/k9pwHM9wCm7M8G4Tqo4k1fMD3hYqq1sApg1k9n2kpW ++7zXVfOKU1YNlAD8gqwEbF3zj/4skXaYQeazsJLiimhqORLo6Vh3Ce1894DglKHY +XksZOoxdMOx0++hVz8k0wdUOfB5Ap8nevzQfcSJRkbuOOJkX14DmB6jM16a9FU76 +QxLLeeh9UlcLPEQ7VGrvG/OmQ2Uk4VMmlCwCJSh/VNAv9DVrOUZOdcxxEjo2k9iv +Ty/ggAaEQg92VsfZRRoxGRYPYxjxgMAFDqiSXscy304mNQAizKoKxukrhcF6EKSv +zKGRJDgRamDketZhox+1OaTIH/Z61bNT8S7fT6ulwDfo7aKlwxQs0rJbvVJjlkIC +O4Nu6ycW/onJhu7Y9MTH4a5V8SrDb5tgYJQ1awZz8qBCGZtdDyQaMBU4X+hpWySp +PvNfdc5Fp3T5x64wtwvg +=JSt9 -----END PGP SIGNATURE----- diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.6.10-generate-libeap-peer.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-0.6.10-generate-libeap-peer.patch deleted file mode 100644 index ac2b8ec5f4ec..000000000000 --- a/net-wireless/wpa_supplicant/files/wpa_supplicant-0.6.10-generate-libeap-peer.patch +++ /dev/null @@ -1,387 +0,0 @@ -diff -urN wpa_supplicant-0.6.10.orig/src/eap_peer/eap_methods.c wpa_supplicant-0.6.10/src/eap_peer/eap_methods.c ---- wpa_supplicant-0.6.10.orig/src/eap_peer/eap_methods.c 2010-01-12 17:55:02.000000000 +0300 -+++ wpa_supplicant-0.6.10/src/eap_peer/eap_methods.c 2010-07-22 03:45:02.000000000 +0400 -@@ -339,6 +339,146 @@ - } - - -+// ###################################################### -+ -+#ifdef EAP_MD5 -+ int eap_peer_md5_register(void); -+#endif /* EAP_MD5 */ -+ -+#ifdef EAP_TLS -+ int eap_peer_tls_register(void); -+#endif /* EAP_TLS */ -+ -+#ifdef EAP_MSCHAPv2 -+ int eap_peer_mschapv2_register(void); -+#endif /* EAP_MSCHAPv2 */ -+ -+#ifdef EAP_PEAP -+ int eap_peer_peap_register(void); -+#endif /* EAP_PEAP */ -+ -+#ifdef EAP_TTLS -+ int eap_peer_ttls_register(void); -+#endif /* EAP_TTLS */ -+ -+#ifdef EAP_GTC -+ int eap_peer_gtc_register(void); -+#endif /* EAP_GTC */ -+ -+#ifdef EAP_OTP -+ int eap_peer_otp_register(void); -+#endif /* EAP_OTP */ -+ -+#ifdef EAP_SIM -+ int eap_peer_sim_register(void); -+#endif /* EAP_SIM */ -+ -+#ifdef EAP_LEAP -+ int eap_peer_leap_register(void); -+#endif /* EAP_LEAP */ -+ -+#ifdef EAP_PSK -+ int eap_peer_psk_register(void); -+#endif /* EAP_PSK */ -+ -+#ifdef EAP_AKA -+ int eap_peer_aka_register(void); -+#endif /* EAP_AKA */ -+ -+#ifdef EAP_AKA_PRIME -+ int eap_peer_aka_prime_register(void); -+#endif /* EAP_AKA_PRIME */ -+ -+#ifdef EAP_FAST -+ int eap_peer_fast_register(void); -+#endif /* EAP_FAST */ -+ -+#ifdef EAP_PAX -+ int eap_peer_pax_register(void); -+#endif /* EAP_PAX */ -+ -+#ifdef EAP_SAKE -+ int eap_peer_sake_register(void); -+#endif /* EAP_SAKE */ -+ -+#ifdef EAP_GPSK -+ int eap_peer_gpsk_register(void); -+#endif /* EAP_GPSK */ -+ -+#ifdef EAP_WSC -+ int eap_peer_wsc_register(void); -+#endif /* EAP_WSC */ -+ -+#ifdef EAP_IKEV2 -+ int eap_peer_ikev2_register(void); -+#endif /* EAP_IKEV2 */ -+ -+#ifdef EAP_VENDOR_TEST -+ int eap_peer_vendor_test_register(void); -+#endif /* EAP_VENDOR_TEST */ -+ -+#ifdef EAP_TNC -+ int eap_peer_tnc_register(void); -+#endif -+ -+// ###################################################### -+ -+int eap_peer_set_method(int eap_method) -+{ -+ typedef int (*eap_method_register)(); -+ -+ static eap_method_register eap_method_register_funcs[] = -+ { -+ NULL, /* EAP_TYPE_NONE = 0, */ -+ NULL, /* EAP_TYPE_IDENTITY */ -+ NULL, /* EAP_TYPE_NOTIFICATION */ -+ NULL, /* EAP_TYPE_NAK */ -+#ifdef EAP_MD5 -+ eap_peer_md5_register, -+#else -+ NULL, /* EAP_TYPE_MD5 */ -+#endif -+ NULL, // EAP_TYPE_OTP -+ NULL, // EAP_TYPE_GTC -+ NULL, // EAP_TYPE_LEAP -+ NULL, // EAP_TYPE_SIM -+ NULL, // EAP_TYPE_AKA -+ -+ NULL, // EAP_TYPE_PEAP -+ NULL, // EAP_TYPE_MSCHAPV2 -+ NULL, // EAP_TYPE_TLV -+#ifdef EAP_TLS -+ eap_peer_tls_register, -+#else -+ NULL, // EAP_TYPE_TLS -+#endif -+ NULL, // EAP_TYPE_TNC -+ NULL, // EAP_TYPE_FAST -+ NULL, // EAP_TYPE_PAX -+ NULL, // EAP_TYPE_PSK -+ NULL, // EAP_TYPE_SAKE -+ NULL, // EAP_TYPE_IKEV2 -+ NULL, // EAP_TYPE_AKA_PRIME -+#ifdef EAP_TTLS -+ eap_peer_ttls_register, -+#else -+ NULL, // EAP_TYPE_TTLS -+#endif -+ NULL // EAP_TYPE_GPSK -+ -+ }; -+ -+ -+ if ( eap_method_register_funcs[eap_method] != NULL ) -+ { -+ eap_method_register_funcs[eap_method](); -+ return 1; -+ } -+ else -+ return -1; -+} -+ -+ - /** - * eap_peer_register_methods - Register statically linked EAP peer methods - * Returns: 0 on success, -1 on failure -diff -urN wpa_supplicant-0.6.10.orig/src/eap_peer/libeap0.pc wpa_supplicant-0.6.10/src/eap_peer/libeap0.pc ---- wpa_supplicant-0.6.10.orig/src/eap_peer/libeap0.pc 1970-01-01 03:00:00.000000000 +0300 -+++ wpa_supplicant-0.6.10/src/eap_peer/libeap0.pc 2010-07-22 03:45:02.000000000 +0400 -@@ -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.6.7 -+Libs: -L${libdir} -leap -+Cflags: -I${includedir} -diff -urN wpa_supplicant-0.6.10.orig/src/eap_peer/Makefile wpa_supplicant-0.6.10/src/eap_peer/Makefile ---- wpa_supplicant-0.6.10.orig/src/eap_peer/Makefile 2010-01-12 17:55:02.000000000 +0300 -+++ wpa_supplicant-0.6.10/src/eap_peer/Makefile 2010-07-22 03:45:31.000000000 +0400 -@@ -1,12 +1,179 @@ --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 -O2 -Wall -g -+endif -+ -+CFLAGS += -fPIC -+ -+CONFIG_TLS=openssl -+ -+INCLUDE_INSTALL_DIR=/usr/include/eap_peer -+ -+CFLAGS += -I. -+CFLAGS += -I .. -+CFLAGS += -I ../crypto -+CFLAGS += -I ../utils -+CFLAGS += -I ../common -+ -+# at least for now, need to include config_ssid.h and config_blob.h from -+# wpa_supplicant directory -+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/rc4.o -+OBJS_both += ../crypto/md4.o -+OBJS_both += ../crypto/sha1.o -+OBJS_both += ../crypto/des.o -+OBJS_both += ../crypto/aes_wrap.o -+OBJS_both += ../crypto/aes.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 -+ -+CFLAGS += -DEAP_TLS -+CFLAGS += -DEAP_PEAP -+CFLAGS += -DEAP_TTLS -+CFLAGS += -DEAP_MD5 -+CFLAGS += -DEAP_MSCHAPv2 -+CFLAGS += -DEAP_GTC -+CFLAGS += -DEAP_OTP -+CFLAGS += -DEAP_LEAP -+CFLAGS += -DEAP_PSK -+CFLAGS += -DEAP_PAX -+CFLAGS += -DEAP_SAKE -+CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256 -+CFLAGS += -DEAP_TLS_FUNCS -+ -+CFLAGS += -DIEEE8021X_EAPOL -+ -+ifeq ($(CONFIG_TLS), openssl) -+CFLAGS += -DEAP_TLS_OPENSSL -+OBJS_both += ../crypto/tls_openssl.o -+OBJS_both += ../crypto/crypto_openssl.o -+LIBS += -lssl -lcrypto -+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 -+CFLAGS += -DCONFIG_TLS_INTERNAL_CLIENT -+ -+OBJS_server += ../tls/tlsv1_server.o -+OBJS_server += ../tls/tlsv1_server_write.o ../../tls/tlsv1_server_read.o -+CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER -+ -+CFLAGS += -DCONFIG_TLS_INTERNAL -+CFLAGS += -DCONFIG_CRYPTO_INTERNAL -+CFLAGS += -DCONFIG_INTERNAL_X509 -+CFLAGS += -DINTERNAL_AES -+CFLAGS += -DINTERNAL_SHA1 -+CFLAGS += -DINTERNAL_SHA256 -+CFLAGS += -DINTERNAL_MD5 -+CFLAGS += -DINTERNAL_MD4 -+CFLAGS += -DINTERNAL_DES -+ifdef CONFIG_INTERNAL_LIBTOMMATH -+CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH -+else -+LIBS += -ltommath -+endif -+endif -+ -+ifndef LDO -+LDO=$(CC) -+endif -+ -+ -+OBJS_lib=$(OBJS_both) $(OBJS_peer) -+ -+ #$(OBJS_server) -+ -+CFLAGS += -fPIC -DPIC -+LDFLAGS += -shared -+ -+$(LIBEAP): $(OBJS_lib) -+ $(LDO) $(LDFLAGS) $(OBJS_lib) -Wl,-soname -Wl,$(LIBEAP_SO) -o $(LIBEAP) $(LIBS) -+ -+ -+INCLUDE_HEADERS = ../utils/includes.h ../utils/common.h eap.h ../common/defs.h ../eap_common/eap_defs.h eap_methods.h eap_config.h ../utils/wpabuf.h ../crypto/tls.h ../utils/build_config.h ../utils/os.h ../utils/wpa_debug.h -+ -+install: -+ -+ mkdir -p $(DESTDIR)/usr/lib -+# copy the lib file to std lib location -+ cp $(LIBEAP) $(DESTDIR)/usr/lib -+ -+# copy the headers reqd by apps using eap peer library in its own subfolder under /usr/include -+ test -z $(DESTDIR)/$(INCLUDE_INSTALL_DIR) || mkdir -p $(DESTDIR)/$(INCLUDE_INSTALL_DIR) -+ -+# the header folder structure needs to be preserved. -+ test -z $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common || mkdir -p $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common -+ -+ cp $(INCLUDE_HEADERS) $(DESTDIR)/$(INCLUDE_INSTALL_DIR) -+ -+ mv $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_defs.h $(DESTDIR)/$(INCLUDE_INSTALL_DIR)/eap_common -+ -+ 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: -- for d in $(SUBDIRS); do make -C $$d clean; done -- rm -f *~ *.o *.so *.d -+ rm -f core *~ *.o *.d libeap.a $(LIBEAP) - --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 -urN wpa_supplicant-0.6.10.orig/wpa_supplicant/Makefile wpa_supplicant-0.6.10/wpa_supplicant/Makefile ---- wpa_supplicant-0.6.10.orig/wpa_supplicant/Makefile 2010-01-12 17:55:02.000000000 +0300 -+++ wpa_supplicant-0.6.10/wpa_supplicant/Makefile 2010-07-22 04:04:36.000000000 +0400 -@@ -6,6 +6,8 @@ - CFLAGS = -MMD -O2 -Wall -g - endif - -+CFLAGS += -fPIC -+ - export LIBDIR ?= /usr/local/lib/ - export BINDIR ?= /usr/local/sbin/ - -@@ -17,7 +19,7 @@ - - ALL=wpa_supplicant wpa_passphrase wpa_cli - --all: verify_config $(ALL) dynamic_eap_methods -+all: verify_config $(ALL) dynamic_eap_methods eap_peer_lib - - verify_config: - @if [ ! -r .config ]; then \ -@@ -1102,6 +1104,9 @@ - wpa_cli: $(OBJS_c) - $(LDO) $(LDFLAGS) -o wpa_cli $(OBJS_c) $(LIBS_c) - -+eap_peer_lib: -+ $(MAKE) -C ../src/eap_peer -+ - link_test: $(OBJS) $(OBJS_h) tests/link_test.o - $(LDO) $(LDFLAGS) -o link_test $(OBJS) $(OBJS_h) tests/link_test.o $(LIBS) - diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10-r1.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10-r1.ebuild deleted file mode 100644 index 636d9ad640e9..000000000000 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.6.10-r1.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# 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.6.10-r1.ebuild,v 1.2 2010/09/08 17:34:33 gurligebis Exp $ - -EAPI="2" - -inherit eutils toolchain-funcs qt4 - -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 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="dbus debug gnutls eap-sim fasteap madwifi ps3 qt4 readline 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 - net-wireless/madwifi-old ) - ) - dev-libs/libnl - ) - !kernel_linux? ( net-libs/libpcap ) - qt4? ( x11-libs/qt-gui:4 - x11-libs/qt-svg:4 ) - readline? ( sys-libs/ncurses sys-libs/readline ) - ssl? ( dev-libs/openssl ) - !ssl? ( gnutls? ( net-libs/gnutls ) ) - !ssl? ( !gnutls? ( dev-libs/libtommath ) )" -DEPEND="${RDEPEND} - dev-util/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}/dbus_path_fix.patch" - - if use wimax; then - cd "${WORKDIR}/${P}" - epatch "${FILESDIR}/${P}-generate-libeap-peer.patch" - fi -} - -src_configure() { - # Toolchain setup - echo "CC = $(tc-getCC)" > .config - - # 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 - 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 -} - -src_compile() { - emake || die "emake failed" - - if use qt4 ; then - cd "${S}"/wpa_gui-qt4 - eqmake4 wpa_gui.pro - emake || die "Qt4 wpa_gui compilation failed" - fi -} - -src_install() { - dosbin wpa_supplicant || die - dobin wpa_cli wpa_passphrase || die - - # baselayout-1 compat - if has_version "<sys-apps/baselayout-2.0.0"; then - dodir /sbin - dosym /usr/sbin/wpa_supplicant /sbin/wpa_supplicant || die - dodir /bin - dosym /usr/bin/wpa_cli /bin/wpa_cli || die - 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 || die "dodoc failed" - - doman doc/docbook/*.{5,8} || die "doman failed" - - if use qt4 ; then - into /usr - dobin wpa_gui-qt4/wpa_gui || die - fi - - if use qt4 ; then - doicon wpa_gui-qt4/icons/wpa_gui.svg || die "Icon not found" - make_desktop_entry wpa_gui "WPA Supplicant Administration GUI" "wpa_gui" "Qt;Network;" - fi - - if use wimax; then - insinto /usr/include/eap_peer - doins ../src/utils/includes.h - doins ../src/utils/common.h - doins ../src/eap_peer/eap.h - doins ../src/common/defs.h - doins ../src/eap_peer/eap_methods.h - doins ../src/eap_peer/eap_config.h - doins ../src/utils/wpabuf.h - doins ../src/crypto/tls.h - doins ../src/utils/build_config.h - doins ../src/utils/os.h - doins ../src/utils/wpa_debug.h - insinto /usr/include/eap_peer/eap_common - doins ../src/eap_common/eap_defs.h || die - insinto /usr/lib/pkgconfig - doins ../src/eap_peer/libeap0.pc - dolib.so ../src/eap_peer/libeap.so.0.0.0 - dosym /usr/$(get_libdir)/libeap.so.0.0.0 /usr/$(get_libdir)/libeap.so.0 - fi - - if use dbus ; then - insinto /etc/dbus-1/system.d - newins dbus-wpa_supplicant.conf wpa_supplicant.conf || die - insinto /usr/share/dbus-1/system-services - newins dbus-wpa_supplicant.service 'fi.epitest.hostap.WPASupplicant.service' || die - keepdir /var/run/wpa_supplicant - fi -} - -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 -} |