diff options
| author |   Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-05-22 07:17:10 +0000 |
|---|---|---|
| committer | Bjarke Istrup Pedersen <gurligebis@gentoo.org> | 2012-05-22 07:17:10 +0000 |
| commit | 1c7d252e3688c64117d2000b66f7f58f7be56704 (patch) | |
| tree | cddfd119c5b62d530a763b55e11e8101de03fe9f /net-wireless/wpa_supplicant | |
| parent | marked x86 per bug 414985 (diff) | |
| download | historical-1c7d252e3688c64117d2000b66f7f58f7be56704.tar.gz historical-1c7d252e3688c64117d2000b66f7f58f7be56704.tar.bz2 historical-1c7d252e3688c64117d2000b66f7f58f7be56704.zip | |
Fixing building with GCC 4.7, fixing bug 409285
Package-Manager: portage-2.2.0_alpha107/cvs/Linux i686
Diffstat (limited to 'net-wireless/wpa_supplicant')
5 files changed, 34 insertions, 9 deletions
diff --git a/net-wireless/wpa_supplicant/ChangeLog b/net-wireless/wpa_supplicant/ChangeLog index b0162a8fc798..a60a54a7726d 100644 --- a/net-wireless/wpa_supplicant/ChangeLog +++ b/net-wireless/wpa_supplicant/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/wpa_supplicant # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.180 2012/05/15 09:25:39 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/ChangeLog,v 1.181 2012/05/22 07:17:10 gurligebis Exp $ + + 22 May 2012; <gurligebis@gentoo.org> +files/wpa_supplicant-gcc470.patch, + wpa_supplicant-0.7.3-r5.ebuild, wpa_supplicant-1.0.ebuild: + Fixing building with GCC 4.7, fixing bug #409285 *wpa_supplicant-1.0 (15 May 2012) diff --git a/net-wireless/wpa_supplicant/Manifest b/net-wireless/wpa_supplicant/Manifest index 5977f7c2ee6c..b19ca69bbd75 100644 --- a/net-wireless/wpa_supplicant/Manifest +++ b/net-wireless/wpa_supplicant/Manifest @@ -11,20 +11,21 @@ AUX wpa_supplicant-1.0-dbus-path-fix.patch 1028 RMD160 897b48b3cc7f8e22f16eb4ea8 AUX wpa_supplicant-1.0-do-not-call-dbus-functions-with-NULL-path.patch 2131 RMD160 4a3e476e1fa0bb7f89b309831d60575a553226ec SHA1 dccb989815cbc10716c2fef3f45fc1da7748d66a SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c AUX wpa_supplicant-1.0-generate-libeap-peer.patch 9739 RMD160 841e9c0be11ae1298c9e5d15ea8519c8b6a654d6 SHA1 2b038b15e10bfb06c692d2530368067ac233e6b0 SHA256 3e9945a95f15eda4ae701ac51b3e3bcf9259bd76629b49cded76a9e125144a56 AUX wpa_supplicant-conf.d 161 RMD160 8188ddf3448d31c6288d4201cc9d10d0c4ac3ee3 SHA1 c0ca31e2ddb9b2b5cbafc3eba66316e83688b808 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90 +AUX wpa_supplicant-gcc470.patch 407 RMD160 4c42824a0000e54d3e8a4cc3515e68d80fa83fe2 SHA1 4fb9ad5c2c883805deb06767ea64075b478e0b17 SHA256 a2cc1d8ce27fee214b6845cf228e3ceb4c1ba54cea03e99ee653b0aed4f82fcf AUX wpa_supplicant-init.d 1249 RMD160 b91b304a2913ce47f04c625e01e5cc504922cf0f SHA1 0e158f5954e4046af3bc157a1c85aab4bbcc71cb SHA256 62a3655ea88b3dfff5243666a4e90d3f0eef6370a7889affb849e178ba4a82b0 AUX wpa_supplicant.conf 183 RMD160 591d852e8993648793f717402c7b5c52e1f54b71 SHA1 0a7f2922ad2394f475e1485d5537d1b2c6d7cafb SHA256 15082ad37ebd98f57c3733454a0921a79dc2b41007f1b012fb7e67c09d87de3a AUX wpa_supplicant.service 264 RMD160 d8110d5d02067448c469723bddfd07f6041c5696 SHA1 0422a518f1f0137bf134a8148540ac42f4316bf0 SHA256 aa76e01677a755270147bcda08dbd8283ba37dc15e384869e874585cf5720c39 AUX wpa_supplicant_at.service 314 RMD160 21fcd8438d384988c46da9b2c31759500f424e21 SHA1 efbfac91721f1ff71c86b0ffc554cc63366363d1 SHA256 caa0104f7169909d30f0c4ce9fa9a6c27e7ddb743eaf868cd311a5128c13ac0c DIST wpa_supplicant-0.7.3.tar.gz 1638224 RMD160 e22f0440d64c943e4b0886eefa3418e75ea01b60 SHA1 ca51db8931fabf386352c87422f3e62fb44c3fe3 SHA256 d0cd50caa85346ccc376dcda5ed3c258eef19a93b3cade39d25760118ad59443 DIST wpa_supplicant-1.0.tar.gz 1948417 RMD160 12cb2feb513815127773cfe88197b99f8ec720fd SHA1 22ce2a70863ee47768808453066b635293804e64 SHA256 91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c -EBUILD wpa_supplicant-0.7.3-r5.ebuild 8931 RMD160 74fabdb97c7a4a7fe1d7eab30f58d5755ec1a5fb SHA1 2a352c51753bdf7de3c8c2d0764621d0fc1ab881 SHA256 87f0dfacfc350d5dd20f664bbd2937df08ff1dbdd944cb50364ce63834254b33 -EBUILD wpa_supplicant-1.0.ebuild 9007 RMD160 b9f0b7390ff39e2761f03749edb0e8e1fb04ae1e SHA1 36e943df47deb0ca34fdada702f1379bef0f4220 SHA256 b2039e07794a66a9a178aea103926b3224d52bb6e2d66706a20620091270a82c -MISC ChangeLog 37222 RMD160 b9f84e3e32d87eebe674180815e36522c32bd68f SHA1 96cdb6aace11fb0397cc4c4df3df7112f2d22e51 SHA256 68b92adfd04c567f393594af700598823e790ee9e8756b8d3e1418f7b6b8b81c +EBUILD wpa_supplicant-0.7.3-r5.ebuild 9001 RMD160 e4d50a56a2be57c029bcdc6da617675df893711a SHA1 43b19beb69b4b54c1b110c2baee2987b2529add8 SHA256 249285c8839b7b6b7a6d46ab7f51ce55652c732d9cdd343242cb1293e6431fd6 +EBUILD wpa_supplicant-1.0.ebuild 9074 RMD160 39a5ae4b9fe41f0cd7c1bf1ec2c72b7e933318e8 SHA1 ce0d287a5c4a287e8bde5fb2e420dd7765810b4b SHA256 1c3710d5b97c1d7fa47df0c0f752fdeb985ce2e68014991429e1678b650a1ce0 +MISC ChangeLog 37410 RMD160 d2e847990283b3ddb3d2ee77dda5ea65467ca57c SHA1 cde566b731d38116d38861eba33a068be3db7165 SHA256 fef6e7f296b0e0d50d5497711b250ccefee6867df8a7ed2d2e2d6c4524e0beb9 MISC metadata.xml 832 RMD160 14771aa4f3533875b5f3f900ee513dcda354873d SHA1 01f054ebe9f2bebdf8814558085c65ce9d8a15f6 SHA256 a8de983e560152d0491219686afa13bde6e5aa9fcade3b79e77f179c61bb164c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEARECAAYFAk+yIKwACgkQsR7PQhRXYEmGQwCePUYPhgVqRFpb1CgPwTrM7l4V -La8An05jH05Tyc9wkgrKJrCaB+CLKE9F -=XggI +iEYEARECAAYFAk+7PQIACgkQsR7PQhRXYEkFwACeM7KJGO30OuaI3K2WlsyVA2bj +VhMAn3IHmq9t8Nmp/apEW5n2iwg6OuMX +=cMSp -----END PGP SIGNATURE----- diff --git a/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch b/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch new file mode 100644 index 000000000000..947a47665bfb --- /dev/null +++ b/net-wireless/wpa_supplicant/files/wpa_supplicant-gcc470.patch @@ -0,0 +1,15 @@ +--- ./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/wpa_supplicant-0.7.3-r5.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild index fd7cd3f1b34c..3c3c669eb110 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 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.17 2012/05/04 06:41:54 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-0.7.3-r5.ebuild,v 1.18 2012/05/22 07:17:10 gurligebis Exp $ EAPI=4 @@ -88,6 +88,8 @@ src_prepare() { 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() { diff --git a/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild b/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild index b0fb9ba8dcca..9023f97d8673 100644 --- a/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild +++ b/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild,v 1.1 2012/05/15 09:25:39 gurligebis Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/wpa_supplicant-1.0.ebuild,v 1.2 2012/05/22 07:17:10 gurligebis Exp $ EAPI=4 @@ -87,6 +87,9 @@ src_prepare() { # bug (320097) epatch "${FILESDIR}/${P}-do-not-call-dbus-functions-with-NULL-path.patch" + # bug (409285) + epatch "${FILESDIR}/wpa_supplicant-gcc470.patch" + # TODO - NEED TESTING TO SEE IF STILL NEEDED, NOT COMPATIBLE WITH 1.0 OUT OF THE BOX, # SO WOULD BE NICE TO JUST DROP IT, IF IT IS NOT NEEDED. # bug (374089) |