Fix bug #454300

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

5 files changed, 54 insertions, 8 deletions

diff --git a/net-libs/cyassl/ChangeLog b/net-libs/cyassl/ChangeLog
index 70aef82c5ec3..a902e45389d0 100644
--- a/net-libs/cyassl/ChangeLog
+++ b/net-libs/cyassl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/cyassl
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/ChangeLog,v 1.20 2013/01/30 14:28:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/ChangeLog,v 1.21 2013/01/31 14:54:21 blueness Exp $
+
+  31 Jan 2013; Anthony G. Basile <blueness@gentoo.org>
+  +files/cyassl-2.4.6-fix-disable-debug.patch,
+  +files/cyassl-2.4.6-respect-CFLAGS.patch, cyassl-2.4.6.ebuild:
+  Fix bug #454300
 
   30 Jan 2013; Jeroen Roovers <jer@gentoo.org> cyassl-2.4.6.ebuild:
   Stable for HPPA (bug #448980).
diff --git a/net-libs/cyassl/Manifest b/net-libs/cyassl/Manifest
index 62bb0fcdf2c3..bd06304f88c9 100644
--- a/net-libs/cyassl/Manifest
+++ b/net-libs/cyassl/Manifest
@@ -4,6 +4,8 @@ Hash: SHA256
 AUX cyassl-2.0.8-disable-testsuit-ifnothreads.patch 734 SHA256 972057b9a614bf0ea4e3acf87df7ce4e528a67a59799ff7991b51cf3f85442ba SHA512 15f3675d858b147412892c6c8d0a47cb712f565ba0eadd403d69e0bc7bbae7c8d1286a5fc6480e8c8f9f2884c36a88618ae389ca24850a6cdb84a6e5c9237e38 WHIRLPOOL b197e5e25ce636962e942eba2622fca934bcdb481f308715f73d83fe4f9c821554b6d63c25128f746f2747ce13f3d81c28670ba70421a9f06a1680a3ff022b35
 AUX cyassl-2.0.8-fix-gnustack.patch 390 SHA256 8a8bed2bf340081cde93bdd3790a90775f8dad79c12e9fdd4355bb9f0fa2640f SHA512 9df5a4da028129c1b2ffef213d92667217f08e38a5b9016917768d22853aa003725c42dce0ee2ee0faee3e2f2d8df210f02e82dd587cbd36c6025e3e5916ac2c WHIRLPOOL f87e9f5db916c97a515cd4bf8a0438b16fed59dcf00e13ef2ae037238e1defa512596a3ecd7da8ba1e1f3b2090d02d2c75644faa94ba3283e591f85b0f5d0949
 AUX cyassl-2.4.0-fix-missing-DYNAMIC_TYPE_LIBZ.patch 669 SHA256 fdd3e292a02cf4126825ee2643aa37db755183730b8d7a90716c0fa4342fd5bf SHA512 e169895348857cd1fe1e281c34ffdbf558f31ce836f59858635fce92bc713eac1d619ac3e1735268522338c5ef8739195ffbb9fe5017ed830d0032cdf2dc5c1b WHIRLPOOL 3d692be724b0f39367fff62becbccb9ee93d42062567735e3047c079b83f20fec4c5dd3911ff995fc980f6513c5a063a94e42d29d2f3a750ed387696f576f62c
+AUX cyassl-2.4.6-fix-disable-debug.patch 552 SHA256 df98c7da00fbaba679689e2f5a1b4371bd7d31bb0cf3ba01ff3a464cadb0247e SHA512 4e82696a83e9ec1df35619bcb48c8b21af32951daffc24588051cb1f5402f245e9334d5e0840ba2a2ee3f30cd87e3316454b49ed6300c7b1162b64bc84ec6ac0 WHIRLPOOL 790123655a387cfe39b51e8f41d0b5228492fe2d49ce780c13e28194139005484ac4f39bf8cefe4856b34439f38135ce7e9dfa9ca8701fd8091145664895c32e
+AUX cyassl-2.4.6-respect-CFLAGS.patch 457 SHA256 a73beef906bcce05baad2bffbe04f4ba55db52d9be01544c4210f366c94228f9 SHA512 881b547d5a1e3a4257c9f7c65a5b1c49bc38bc2ab850ed212c0b781fd229c297006cc1ba80a81149ebb4f292759dd67328a23ca390fc30071166aeefee5183bf WHIRLPOOL f0eb47b656f8cbddc1c0e6ba0262a2e76ec12071a7b1f1cea27e5b1e652e7c517cb0ab32e1aca3a2d47a1bfb5f4368e9985c46719986013c7bb4159e49908cf6
 DIST cyassl-2.0.8.zip 894570 SHA256 bcf26384f155c5fe2fdec82eea41894b7742fc39c651d6c52e80824f63a4a09b SHA512 60b24ae9b658ba5fd75835ed9066d418b51ed8c881a2333e627d65285019491d98fddd77c5cea43b07e454765c420024e3ed158d6d731e182bbe332c830ece43 WHIRLPOOL 3ec147fb2759c952dee18d2ee2b2a5fe64c1986c5197177e198bd12a7318ab187dc45f44e31a23d81e870b058330748462cf7fec292bf94813cd12a5fa42d286
 DIST cyassl-2.2.0.zip 935384 SHA256 b2416bf2ec1b7c774d3c89e27577a0534cfe83a50f33d4af759021268bf20bb8 SHA512 71cb25c3bb69fec91898a5b701ec2b6787375cbb51f89cdce02413d084edb6c32a8d9091852f2f49b970b3e530c4ec437b27c83d8c511ef816b905eba097f5d3 WHIRLPOOL 2c135e674be17f5ad8859c9be4ed9ff9e3af562b4afb474ca192fc0387b1318b584e3afb844c82ac56fa8b0b0dd40ba61f357319c5a90d296341096e6b866d5f
 DIST cyassl-2.3.0.zip 975125 SHA256 b597f1c55d3bc4556d9c37e98ca56da2a529e111164d97c650fb097ef0a0d461 SHA512 8ad5ffa13344db1b4336e6bf693fb77eee1e7b13e961f2b5e8e07b9174e8fd3fad5bbe5005f0bfc329e3e213c50a928cd9c3f2aae404bfaddac0b0984aab6adb WHIRLPOOL 4a9d48df87a536892f067f394b5bfab2677a6788beeb23f81ad106a63414ef11a0fa40d0bdc35a2c443c8d744445072bf2be0827ba5f360efc90de201d2036cf
@@ -13,13 +15,23 @@ EBUILD cyassl-2.0.8-r1.ebuild 3141 SHA256 e59d1ca28aa9764f798d775f206718d49d3371
 EBUILD cyassl-2.2.0.ebuild 3215 SHA256 4254c629ecab977e38a030559d7da40b4fa96ed56dcf6a25bd0207b64774b689 SHA512 b2206d134abf75e453387d788961e8a14a1dde6120f90a30f4935ce6e4f223ca3241ebd9f7b4cdca3594bbe931935690335b570448705cba2d849b32a1dbb696 WHIRLPOOL 43842d5baa1fed571edfb0f0c826705f89492e90579233478b8c83a624c55f75a35ba38eda8fe425bcbde2a6b9215bf3038f8c17e1173f076038fab84d99b313
 EBUILD cyassl-2.3.0.ebuild 3440 SHA256 2e2c6b4ba85585cc2cf88df30b997f2f4777cf0669ba6f19decb1c2b2b170de2 SHA512 2d5e3c8abdcde6bc7515993bd2ff7658b0350e251d14a00ddb1a03a2f370ae2633262a554cc5632fdc9b79f0764a24290656e9baabe73a289db57c5cc9d02bc9 WHIRLPOOL d1b80ba7a0d7ff9855d5299874af848cb644218ed3eed00487de3a58921d7d55cb08b6aefbc239f480051f879b88508d5cb0bf5b5816220bd07b05353e3188fc
 EBUILD cyassl-2.4.0.ebuild 3500 SHA256 5e056aed6ea8c9ceadb9643904fe64bb83f5c6e805f3dd18d7610f66ce1a81e1 SHA512 e7f7b3c7ce43e847b318e55db81f97518f4894f6f1478097c888602b718509a4a929e6b982c03660a42e60838e3530e2dfa6146813a08d8f3c0e0fbfd602b76c WHIRLPOOL ef44c47495492623a05ee1d09631d437761bbf913bccee343f97db77d3142f1838d8097f4b54e6c8d3be3237d818998e10c7899c9bbe9de2e8ea47175d44dd26
-EBUILD cyassl-2.4.6.ebuild 3342 SHA256 8107f90ad3d766139e6aa762406f2f324127236559965a1a43cc70dba14496c7 SHA512 ae0b1c8d71f8d434118c0bd15783e8375726ef284ec428dc2f5c93510bd5dbbfc31f9f980402aac5004ad09d1fa66303e8c436a897d59ddeedfcd30279a23cd1 WHIRLPOOL f3c0a0e19e800d3366ad7b5915c73877561237497c609f08c89dfce89599ee6f5f0464dae7c423f87dbea8ff52ee0501967ff6937a6ee601f413d36da99ba983
-MISC ChangeLog 2787 SHA256 533bbda3c3e27dd3caa8aacaeca617ce8f2f42a5f6767bb8beca768e0e9245c4 SHA512 9f346ec3dcfee0690c4ce4d6b8fd60f61bddd3bfd59410f8b0fb8cd3c3f26d1ef2cf7732f431196d27ef8153fc48a8d799b9e15051ebfbaf31c71e7c6bbb8838 WHIRLPOOL 7d7697a8b4d1f1730f28343a4338a4e004a7cc96381f128b42ad26dc864bb6e455be46466262ba05b182a13b389dd41454863cbbfd0e5435d1eca9f6393b70fe
+EBUILD cyassl-2.4.6.ebuild 3484 SHA256 ed3e61f6a82d730bb6e11d17c368acd0a460a4ccf2aa20aa678f37a593d69b3a SHA512 e468bdfaeb63caf71982c643978cb0fd1488a6fab41ab02c7bba307139c53406e4f3590131b7ef02559c407d76714cdae3fb71f4401c5e0c3e8b2a3e9571311f WHIRLPOOL 8a807c671808783788b5e539d239be6b662a3409978760390c53149aac8ab97b1db0b4e41e705cc8e537f2ddf2dc0a38e92064de553814b2107c2121000403ba
+MISC ChangeLog 2978 SHA256 e50cb0358edb8a677d5ed4bafab2a8fbeefad3867e4386ac0683bc7c84bfe40d SHA512 c1157909c3e6adffd98664f2f07170031eec98fca842efb6a89b4ccfc6c10b2a5f254bac388deb853e6cbf677bb525a34429b4f9b4cb981b0648855b1f5153a5 WHIRLPOOL 1691d9c1b2272e98e32f6c0f459eb58e8893a8d974df44c156709a688216a3274adbf2b1c9abc1334bcd5c0816da552fcb11c6f2e1e6b58adc9bf018220bd798
 MISC metadata.xml 1630 SHA256 ccd20952579332be49ffef98de5ee4a7436114dcbff60c86269e4d2c7494bbcf SHA512 5d883b162383d2fd5c3c7c82394e3629009dbdaa33ba87d0f66b8e4e199846acf7e256589cffad006a7bb44e06db31518184d5aa825eecfa3b59809ca526f3ff WHIRLPOOL ac86b42a291f268a5fa6ee62538d5d5588e8b9c5097cd4680b6d3e082b742d9b307cb0776274bf2a50c20590201e71a4a8be5e8714b13cbe82ce4a0e8895a126
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEJLfkACgkQVWmRsqeSphPEYQCeJ75SBcQOlXxnOQTp62XaqJCA
-W/EAn1A6tbtXjVowLecvl6OOAVt0eDE6
-=YL4V
+iQIcBAEBCAAGBQJRCoWmAAoJEJOE+m71LUu6fu8P/RKSvx6GaGmA6Wd7kmI87g7y
+fy4VakN1BnrC8kHQpb5SDWRsDt6aJmOTf2qDSCecMvjTpAuHMnxByeeCwaIGMxgP
+B/tTlbV96RGSEa+XoQ6NxsB0pexDYjiLUh3PSjpRkeCDrCKhuc9GYlhzIIsTyjZ8
+07yRMNZzf9C5cUZR/Cm/tUxGRjgGVlbiNkAcfhW85yINdn+wCFaYYkexY50xAMI3
+3oXhEL2bcjfxI5PKGb7uSjod8IakXZHO80DNTxV6lE+UQcU3ZOAzxK44LDE3GNfm
+7F2slLK3faZvPOLb848p3MGPRznJuSAZ69pHNm7wNOvGd1cDkglHBXKa/qloHdwh
+wiMoVCC4RgfXVT9sj8/0D3JyB4XWn6Xn/N8tzcrDvYt7MVJUgvCYkxLKX9NAmPZL
+qBi2x2i2sZ/YWxzMRdu3w6Jy3YXS9NV9YSwpD6xw5sTz5ApY26jRnbDoDK2y/ZLn
+VPS841Ivv4hKpiURo3LG3/2g/i3ot1HLL0wvz45hDpA5Lk2mfoBcgxEFDV4RKHJT
+XZbNlQw7f2FMc68929xwgwcXEaC66mkcwMJwymRLa5b202PFO9ObuJAMWfPBfMKd
+ZOSDtL/pS/Pq/KJ2XOZuWLWZSeCWiElz0rs70N4yxAfkiu67lbBce3/GeizEXD82
+PQFLIRYU4K2Z+nc5nON/
+=RYph
 -----END PGP SIGNATURE-----
diff --git a/net-libs/cyassl/cyassl-2.4.6.ebuild b/net-libs/cyassl/cyassl-2.4.6.ebuild
index 667482534699..d3008253dd1d 100644
--- a/net-libs/cyassl/cyassl-2.4.6.ebuild
+++ b/net-libs/cyassl/cyassl-2.4.6.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.4.6.ebuild,v 1.2 2013/01/30 14:28:00 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.4.6.ebuild,v 1.3 2013/01/31 14:54:21 blueness Exp $
 
 EAPI="4"
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
 HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
@@ -36,6 +36,11 @@ src_prepare() {
 
 	#Apply unconditionally, but only triggered if USE="aes-ni"
 	epatch "${FILESDIR}"/${PN}-2.0.8-fix-gnustack.patch
+
+	#Bug #454300
+	epatch "${FILESDIR}"/${P}-fix-disable-debug.patch
+	epatch "${FILESDIR}"/${P}-respect-CFLAGS.patch
+	eautoreconf
 }
 
 src_configure() {
diff --git a/net-libs/cyassl/files/cyassl-2.4.6-fix-disable-debug.patch b/net-libs/cyassl/files/cyassl-2.4.6-fix-disable-debug.patch
new file mode 100644
index 000000000000..b6871da6bf18
--- /dev/null
+++ b/net-libs/cyassl/files/cyassl-2.4.6-fix-disable-debug.patch
@@ -0,0 +1,12 @@
+diff -Naur cyassl-2.4.6.orig/m4/ax_debug.m4 cyassl-2.4.6/m4/ax_debug.m4
+--- cyassl-2.4.6.orig/m4/ax_debug.m4	2012-10-19 16:01:02.000000000 -0400
++++ cyassl-2.4.6/m4/ax_debug.m4	2013-01-28 22:03:46.000000000 -0500
+@@ -49,7 +49,7 @@
+     AC_ARG_ENABLE([debug],
+       [AS_HELP_STRING([--enable-debug],
+         [Add debug code/turns off optimizations (yes|no) @<:@default=no@:>@])],[
+-      ax_enable_debug=yes
++      ax_enable_debug=$enableval
+       AC_DEFINE(DEBUG, [ 1 ], [Define to 1 to enable debugging code.])
+       ],[
+       ax_enable_debug=no
diff --git a/net-libs/cyassl/files/cyassl-2.4.6-respect-CFLAGS.patch b/net-libs/cyassl/files/cyassl-2.4.6-respect-CFLAGS.patch
new file mode 100644
index 000000000000..89b3764e2a74
--- /dev/null
+++ b/net-libs/cyassl/files/cyassl-2.4.6-respect-CFLAGS.patch
@@ -0,0 +1,12 @@
+diff -Naur cyassl-2.4.6.orig/configure.ac cyassl-2.4.6/configure.ac
+--- cyassl-2.4.6.orig/configure.ac	2012-12-20 16:25:33.000000000 -0500
++++ cyassl-2.4.6/configure.ac	2013-01-31 09:49:36.000000000 -0500
+@@ -42,7 +42,7 @@
+ 
+ # capture user C_EXTRA_FLAGS from ./configure line, CFLAGS may hold -g -O2 even
+ # if user doesn't override, no way to tell
+-USER_C_EXTRA_FLAGS="$C_EXTRA_FLAGS"
++USER_C_EXTRA_FLAGS="$CFLAGS"
+ 
+ LT_INIT([win32-dll])
+ LT_LANG([C++])