Attachment 402446 Details for Bug 544036 – Patch for the ebuild

[patch] Patch for the ebuild

wpa_supplicant.patch (text/plain), 12.56 KB, created by Felix Janda on 2015-05-02 17:31:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Felix Janda

Created: 2015-05-02 17:31:47 UTC

Size: 12.56 KB

patch

obsolete

>diff -ur /usr/portage/net-wireless/wpa_supplicant/Manifest net-wireless/wpa_supplicant/Manifest
>--- /usr/portage/net-wireless/wpa_supplicant/Manifest	2015-04-28 10:31:16.000000000 -0200
>+++ net-wireless/wpa_supplicant/Manifest	2015-05-02 19:23:28.739591953 -0200
>@@ -1,6 +1,3 @@
>------BEGIN PGP SIGNED MESSAGE-----
>-Hash: SHA256
>-
> AUX wpa_cli.sh 1407 SHA256 a60d145a8874b57a944c6775fdf500d03dd1ce73c24357b00d3de37b14620179 SHA512 613345f142f2e87f7ebe9eaf3a9a60f4cee08f50596d307bd9c0acd88d1c470080bd27c645455ae32cb4fb7fe96ae131ee09fd6c7657cc298fc3476e4dfdc059 WHIRLPOOL c7d461efcde44f9ce98e99217ef27ef713082269380d1a45da17a9e679c5d816c156cb5c00665034a88680b241144e7e71c901a7c73bae075dfca7eb55b10ffd
> 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
>@@ -13,23 +10,13 @@
> AUX wpa_supplicant-2.4-cve-2015-1863.patch 1642 SHA256 11bf1d9199d8b9a1745bc37c5089ff22f355418815562149affce7a95a7f90ff SHA512 eb6265216b7db929e90dacc338dbbb357b59430eb1be9d263ae1e80bf687eab9db6dd2352a7a442256f6bfdd4cfd0ebe2ae83aa9c3da4123fe0bab70d7ff8926 WHIRLPOOL 9a7bd0eccfd4fcfa1f267ed808f68c750140bc78116d0574328931486d3838dec3b7a21b1d24d09d94591bda94abef160f7fde7bea6e5ef0ffffb1d1af254a7d
> AUX wpa_supplicant-2.4-dbus-path-fix.patch 1028 SHA256 9d829625bbc8ddc5d9f117726ce5b505e87ceab4c42cee4241eba08d04391579 SHA512 7521764830b0ac27046c9030c632fe4f36937452b8352a257eaba28ff7a628b2d5d0b4187a23cdffe54c5adab42352ec9f7907e2606f68164d708cea34be5e45 WHIRLPOOL d36fa9563368e9670241fc2da4864a1cbe5e3190824d9b0d81739642d9e8f56bea1914dd44832df1f7ea7614331302259c6e1bfb668d7519c41a0e227fc05b61
> AUX wpa_supplicant-2.4-do-not-call-dbus-functions-with-NULL-path.patch 2131 SHA256 05231a2468853898595c6fffc0fd596c66b5d819d423d772ae2073197e9bf14c SHA512 3578594428c0361e5c9bfc80c8d467175082fd1837f026ae46a26bbd5068526a3c800bff474212bad38d7a1924d037e48a1134660332dcbace2245aa6e5f73a4 WHIRLPOOL f03fa121df0f4ffe14e6e65f9698d6cc6daf2454550afed0149a0923888ef5cd42893a3232f8a0aa188d62b45569679855bf4169a7868601b39b83e799ac8654
>-AUX wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch 633 SHA256 29b9a9ba8d4b53313593c3f56ad13e776ee76fbd04bc33b35e1d6f61e571b496 SHA512 e6e27a982c064bff7c833d33051205ddbaf931f7116724880c9c6e676139ccc69b0302229817d6c618cb3669ec68989b347a1cb40660c4ab124df9841bc7c020 WHIRLPOOL 38950a4044cfb9b9f56852e465297fed94bb9fa76907d4247346a24a7f40457b0c34dd12338d6cff9677da6b6b9d315989f4911242d472d0dbb4f8fcb8a930c9
>-AUX wpa_supplicant-2.4-generate-libeap-peer.patch 9820 SHA256 46d81b152ce7bc4905ee6a79ffbf50f6cab3d2df5dfd65314d38aa8a1571a7c8 SHA512 032344070ecf0ec1af362955693fc612031176dd3cac0df0164dab18347b1d2e1f0a4941fe153ed50f329a6fe8b3a4fab6544460b8ad501c7e63acc004eee065 WHIRLPOOL 1a6647b7cdab7919776bb3e95115db2b8e8049cb3ee62b837a937d0261eb72c40dec43950558223427edbfc616b9006af94edbb82057681a027b99b48f9699cd
>+AUX wpa_supplicant-2.4-generate-libeap-peer.patch 9810 SHA256 03576e31fdbd080717f5e5dd2e4e2ca87791cecd761414f433f39dcbec556ef7 SHA512 06a47aec9f2f41f8ba9c27de2a923a295e7afb55be870537d77d7d55ecd13cf74a9d2e286f23180284232cd46d59a50112b6c13e04e416cf8fbdd43dce118bf4 WHIRLPOOL a51c5288a6826df42c5d956269103fd5b262bff113ad7ba93e0ad87ea8c7140d35944eed2c4f5108ce8d2264b3c5f94cab70949d371eb4cf9591d9dab9eab7bc
> AUX wpa_supplicant-conf.d 161 SHA256 61ec59007f66ac5bacc0aa095d1f2ccbc977a687038e161a463d1727223d5a90 SHA512 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1 WHIRLPOOL 5508d1598bd952ec773db0d5e5ab440134337de6e26d7b8c7c6b00789c570559a54457ac507357b65e8604da849f9ab52dff90d27197d9be11ed2cc66eaae1e7
> 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-2.4.tar.gz 2525648 SHA256 058dc832c096139a059e6df814080f50251a8d313c21b13364c54a1e70109122 SHA512 03d8199325b3910f77013ddb7edd803ab4444542230484e1cb465dc3df9372b39ee3307d823ce88730e8f5a5231ef3183954c54cf07297b70432f526e45aac2b WHIRLPOOL 092ae97e2c0f55d7055fd4e5d688e2ba538f785089a13c754129829854b20a98de832d9d0925dce5823a060d10a3bb5882b0bf3d6cf55f8de9bbc2b00fbb7392
>-EBUILD wpa_supplicant-2.4-r1.ebuild 10128 SHA256 88594c2ea4088cf2ec3f29a7cd56616868292f928c0b10c53df4d2dcc005964b SHA512 f09bbee52b680b259bf915f535212ffc0c1b0508a4068a6dae849d819f7b4455efdddd1720cd15bfc44f2d4ffdd9805949d13321fc7d11bb0ff98e34ac7b7d04 WHIRLPOOL e883943e3cde33e304bd31c657c302206885b782764fc109803db150683118537f93892741a324faebeb07db0264be108411344910d8f50101c7a7ae4eefeed7
>+EBUILD wpa_supplicant-2.4-r1.ebuild 10050 SHA256 af8780f44c751cef5130f007b229e877adb18cb2e1a9c680926c0812acb3bb5d SHA512 c046a6232e2ce996a8777710cade23b73f97269b26579915da535e70c085d36726b506ba5a289073167e380706c8d5582786dd6377a98b4d3a97747db6416e62 WHIRLPOOL de8c7eb892204c1c3ae1765d1099f5884b4fbbcf856705ed580822c1b9c4db32708fef98178accadfc05941c0fd82353c4d5045455fd7c830981197a2c519462
> MISC ChangeLog 48695 SHA256 017837b75636e433e315850c8e637291314e738f160caed2b3de9a4280199b61 SHA512 8c17a9b3665a430dc7159c8dbcb1f24324b45150c4e53528fae03216ed5136b8449fb12521057efffeed5abb1484dafecefc3dc1ee00664ef9d3dec648f9d687 WHIRLPOOL 256c260dfc8b200e50ef61b70471af98bb957ad60132d8875d39a2db8208999f0ae38b5254436938bb27d4b4ef67ed971c0b14af516a040d77159e749ad6b9ae
> MISC metadata.xml 1253 SHA256 4f58fccaf5db494ac8815c1ca7caf7275e46afe3db674859255bab89ca43837a SHA512 a266e13d347579626be1a28470ab44fc4d47e5c8df1e80166061f6c9bd40eb4a4af7ca0ce007ed5e20be7648b421b57fb13916405af7502d1822b59c7ee9ace4 WHIRLPOOL 56913efc84be9c8ca5bfb82fa5da85771d06358938556c5e6aca6c3e7eb4d922781a6033200ee0d68a764b9c8701dd118c03510cda0c81fa51f3e5df37b3a2bb
>------BEGIN PGP SIGNATURE-----
>-Version: GnuPG v2
>-
>-iJwEAQEIAAYFAlU/Pw8ACgkQG9wOWsQutdbPFwQAoQuL3AIxHLm7+T+bGNFhYASg
>-GuMvyHd3BVFxhOw2gYpN5F4vKyfHm6xij0hHvUOxX47mQkMwh71qJJPlaV7jdV8P
>-F0Lu8cgDvmFNl0clV7ecRnZyq8cZUCsWUsagSrgR2M8Upb2YxCQUFbEMCP0ZgYfg
>-IZI+O7h9QJxo8P9qnkw=
>-=qJ8Q
>------END PGP SIGNATURE-----
>Only in /usr/portage/net-wireless/wpa_supplicant/files: wpa_supplicant-2.4-fix-undefined-reference-to-random_get_bytes.patch
>diff -ur /usr/portage/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-generate-libeap-peer.patch net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-generate-libeap-peer.patch
>--- /usr/portage/net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-generate-libeap-peer.patch	2015-03-21 15:32:11.000000000 -0200
>+++ net-wireless/wpa_supplicant/files/wpa_supplicant-2.4-generate-libeap-peer.patch	2015-05-02 19:22:23.369409193 -0200
>@@ -1,7 +1,7 @@
>-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_
>+diff -ur a/wpa_supplicant-2.4/src/eap_peer/eap_methods.c b/wpa_supplicant-2.4/src/eap_peer/eap_methods.c
>+--- a/wpa_supplicant-2.4/src/eap_peer/eap_methods.c	2015-03-15 19:30:39.000000000 -0200
>++++ b/wpa_supplicant-2.4/src/eap_peer/eap_methods.c	2015-04-26 14:39:58.247099942 -0200
>+@@ -336,6 +336,120 @@
>  
>  
>  /**
>@@ -122,10 +122,11 @@
>   * 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
>+Only in b/wpa_supplicant-2.4/src/eap_peer: eap_methods.c.orig
>+diff -ur a/wpa_supplicant-2.4/src/eap_peer/eap_methods.h b/wpa_supplicant-2.4/src/eap_peer/eap_methods.h
>+--- a/wpa_supplicant-2.4/src/eap_peer/eap_methods.h	2015-03-15 19:30:39.000000000 -0200
>++++ b/wpa_supplicant-2.4/src/eap_peer/eap_methods.h	2015-04-26 14:39:58.248099929 -0200
>+@@ -26,6 +26,7 @@
>  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);
>@@ -133,24 +134,12 @@
>  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,188 @@
>+Only in b/wpa_supplicant-2.4/src/eap_peer: eap_methods.h.orig
>+Only in b/wpa_supplicant-2.4/src/eap_peer: libeap0.pc
>+diff -ur a/wpa_supplicant-2.4/src/eap_peer/Makefile b/wpa_supplicant-2.4/src/eap_peer/Makefile
>+--- a/wpa_supplicant-2.4/src/eap_peer/Makefile	2015-03-15 19:30:39.000000000 -0200
>++++ b/wpa_supplicant-2.4/src/eap_peer/Makefile	2015-04-26 14:40:49.987453098 -0200
>+@@ -1,11 +1,192 @@
> -all:
> -	@echo Nothing to be made.
> +LIBEAP_NAME = libeap
>@@ -191,18 +180,22 @@
> +OBJS_both += ../utils/wpa_debug.o
> +OBJS_both += ../utils/base64.o
> +OBJS_both += ../utils/wpabuf.o
>-+OBJS_both += ../crypto/md5.o
>++OBJS_both += ../utils/eloop.o
> +ifneq ($(CONFIG_TLS), openssl)
>++OBJS_both += ../crypto/md5.o
> +OBJS_both += ../crypto/sha1.o
> +endif
> +OBJS_both += ../crypto/sha1-tlsprf.o
> +OBJS_both += ../crypto/aes-encblock.o
>++ifneq ($(CONFIG_TLS), openssl)
> +OBJS_both += ../crypto/aes-wrap.o
>++endif
> +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 += ../crypto/random.o
> +
> +
> +OBJS_both += ../eap_common/eap_peap_common.o
>diff -ur /usr/portage/net-wireless/wpa_supplicant/wpa_supplicant-2.4-r1.ebuild net-wireless/wpa_supplicant/wpa_supplicant-2.4-r1.ebuild
>--- /usr/portage/net-wireless/wpa_supplicant/wpa_supplicant-2.4-r1.ebuild	2015-04-27 20:29:34.000000000 -0200
>+++ net-wireless/wpa_supplicant/wpa_supplicant-2.4-r1.ebuild	2015-05-02 19:17:11.186312019 -0200
>@@ -101,7 +101,6 @@
> 		# generate-libeap-peer.patch comes before
> 		# fix-undefined-reference-to-random_get_bytes.patch
> 		epatch "${FILESDIR}/${P}-generate-libeap-peer.patch"
>-		epatch "${FILESDIR}/${P}-fix-undefined-reference-to-random_get_bytes.patch"
> 
> 		# multilib-strict fix (bug #373685)
> 		sed -e "s/\/usr\/lib/\/usr\/$(get_libdir)/" -i src/eap_peer/Makefile

Actions: View | Diff

Attachments on bug 544036: 399634 | 399636 | 399742 | 400140 | 401930 | 402042 | 402446