Version bump

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

4 files changed, 198 insertions, 27 deletions

diff --git a/net-libs/cyassl/ChangeLog b/net-libs/cyassl/ChangeLog
index b35c564a1a3c..73be2b8f0b76 100644
--- a/net-libs/cyassl/ChangeLog
+++ b/net-libs/cyassl/ChangeLog
@@ -1,6 +1,12 @@
 # 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.37 2013/03/07 07:26:17 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/ChangeLog,v 1.38 2013/06/26 14:55:09 blueness Exp $
+
+*cyassl-2.7.0 (26 Jun 2013)
+
+  26 Jun 2013; Anthony G. Basile <blueness@gentoo.org> +cyassl-2.7.0.ebuild,
+  metadata.xml:
+  Version bump
 
   07 Mar 2013; Mike Frysinger <vapier@gentoo.org> cyassl-2.5.0.ebuild:
   Add s390 lovin.
diff --git a/net-libs/cyassl/Manifest b/net-libs/cyassl/Manifest
index 5cf65d50aae2..722ec9d029dd 100644
--- a/net-libs/cyassl/Manifest
+++ b/net-libs/cyassl/Manifest
@@ -7,24 +7,26 @@ AUX cyassl-2.4.6-fix-disable-debug.patch 552 SHA256 df98c7da00fbaba679689e2f5a1b
 AUX cyassl-2.4.6-respect-CFLAGS.patch 457 SHA256 a73beef906bcce05baad2bffbe04f4ba55db52d9be01544c4210f366c94228f9 SHA512 881b547d5a1e3a4257c9f7c65a5b1c49bc38bc2ab850ed212c0b781fd229c297006cc1ba80a81149ebb4f292759dd67328a23ca390fc30071166aeefee5183bf WHIRLPOOL f0eb47b656f8cbddc1c0e6ba0262a2e76ec12071a7b1f1cea27e5b1e652e7c517cb0ab32e1aca3a2d47a1bfb5f4368e9985c46719986013c7bb4159e49908cf6
 DIST cyassl-2.4.6.zip 1041965 SHA256 051caa5013cecafbec3780d2597374870e7e5a7bbeaeb502bc029d5774d6e508 SHA512 85d4db5207e3f47db676415f4d51ccbedbf3e1d05db19e91fd33d9ef80851d79933d40b1fed17acef3be803b811514b08065588889f9d6dec7fc63dfb58e4aff WHIRLPOOL b1a6edfdfc0bed8c95c8987fc35ad4dec772a17c66c5478cbae30e384a5a6857cca87dcbb8ac5e647e8fdbe4ea54827ccf88b04b276877896645617a05ef85ad
 DIST cyassl-2.5.0.zip 1203748 SHA256 3b4ecc75cdb001d5171b127c03fd3f458bc585bfa1c19505dcf36bc239c04c2e SHA512 0bacefc6ddb1c37ad2091352b92c9a49c2e592c0d01d2d8868529ebebc61d70112827ca19ba44571b150eb5723b2a745c74158aa403dc77c00c8f4a0d2de58b7 WHIRLPOOL 2af4e9440aab89197e2290c4ec4f75098a9284f74871a3817748f59ddaef7605559ca2791b4a5446dfcf0040d6891223cb97a9b29593f2e75f80737a69603d87
+DIST cyassl-2.7.0.zip 1296831 SHA256 16c82f8ec18f73222f2337492d86db31b03b1c712b9a6a56f2472bdb65d72521 SHA512 26960ed5551c47e2f6572816827775754a7e9b373c317e4328e4402a4c84232e09d8709b81d72b79b63776d7d6445d4545642f42720c92f12cb6c993cee7f0b5 WHIRLPOOL 73038ec3c0c7e1c2fae3254c54aa38510427e675f1b718df2719267b9ec7201887f778b9dd13b502a89a89805fb0d9cabfa2497619b634d237d13f0f518d12a4
 EBUILD cyassl-2.4.6.ebuild 3474 SHA256 5dd2b213cce2a702de735bdce97c70f2609dab05a4813ff1c8e94ac8bc1de7a3 SHA512 359379d4d3410f4f894dfd5137b1c0ac65a42558a43d782805211cd667ddda8b74f95eeb97c7cf89bbf267855da7f2f8b5e5ae128c364255824aeb62dc8e0405 WHIRLPOOL 4f8cb0c3329290edd996cad7ba852ccd1e9908beddbb6156523a6e86a2e06f071fd40d89c69525630562bc7aae3bc15db30aee6beb64c7ed359144318be23984
 EBUILD cyassl-2.5.0.ebuild 3381 SHA256 c1413dd79e838703df1d80b710d19845704849d7f210ba4f2b2a6b950e36adfb SHA512 e25edf9c3f73d7a94e2348aab9cdbe00ece6849343e7485b58bbcce55e309e311b8e40342cc22966c51e6bd23d32b48ea7237c47e2f6dfcd1dc8e08ebf3e6633 WHIRLPOOL eb218f3aad88fab10fc81c4b1cc0280643431bcc60c9062be84eb4869908939571be82ccdcea8009f969d1fe56bd008a325ec4ce59ee3aa056342f88606d73ca
-MISC ChangeLog 4894 SHA256 438d92fd26cc840f215262aa44a82cf0b213921e8cfe5084187ba2a4925883ee SHA512 94363f29d56a3676a9f4b83706a1110119cb1e7452153284047040f26b88d5f638fc8e9d85271018fc555e8c7a4a3d9d7a25c2777f8daa3b225ca9cfb91f4994 WHIRLPOOL 784c55edcf0de0fc3ed7c540683f32afe680b90fce5da517dc3ffdf3890b7679768d2fd4bb1cfa349fe611a82cfbb4c71004f2ff755121583fbb8a7c8a7a3e96
-MISC metadata.xml 1765 SHA256 c46e465810186933237c9f18a017c519e9561d415bf7c272d204844ba612974f SHA512 ad4a6033c05044a2faaf84fd02283ca4c761803fb6936e69c64c63b52bd074c2bf7c99877da2c99a28dc56506f45bc821376ae419c681c27a3b0821d03ae9ee8 WHIRLPOOL 6ec1e754af9c918be95875c689cd4393aca73729687af351675f1ca4096428f274ea79f2e8e23756ac02610c2ceba49321df3d31c1de28be77528a29b9c9c8e1
+EBUILD cyassl-2.7.0.ebuild 4719 SHA256 0853908553e0e820d94f47aeb83dd48fc71e8e57bd1c283026a777f81bc29f41 SHA512 e5894be29553123294c1c6150ff6cd21d38b15e83914157a98682b69544f1640b7e9e26d035ef8ace1f757dfdca06e6e16b275615af24b4d18014d465528d58e WHIRLPOOL cc78070d4ab6e11e58d07bbdadb27ada76d9df7ec9826c7e43958d64d7823daa7917177cc84c7ce6b8ff114781b929577667bbb2603702b9bfa12e00b6f29080
+MISC ChangeLog 5034 SHA256 507a6b4fa38cdc143d3396b367cda9fd2f67a9416944cbb0d11ad0c0391eb093 SHA512 b575f07c5e130850b4107aac21cf5e0aab12793beaa6bf04a62f9dadcfe2bda0375fab79fda6e3b1fb9fd5528de7a2de8ce6e601df307d999190d3c8f4fe0322 WHIRLPOOL 90ebaa9226616f6c2cbd8fa0a1649f7f21a06fdd024e34cd83a894e382a8417caa36c86c90c1111cf70bb2e4df87b658c04cf4cbe3ac03fe133336bd0e99c7f4
+MISC metadata.xml 3094 SHA256 8a2ebfecafda06deb2eae7748549e9cb4d8b1a481eb165a9b12ad7fbc47dddaa SHA512 2e0962bfb3dec5c32b94e8c4c94dc65bda4f5dbd1299d1aeae689c5910d14b9dea0525a07be0abcb67ae1e1100872fae8235d15fba95b3482a4c9bfe8595d029 WHIRLPOOL cdcb6aec0a7e9c6c216ba795340b9e31ae98efeb5f5bf3e59cebe613f23143d0e3d79959508409246b25c1a35b2b76a7bef25522c6a59aaa1d1c2ae7800d24ab
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJROEGYAAoJELEHsLL7fEFWpaAP/1KWpMNd2G689X74V8+fFBB+
-Cd3NrO/0HDAy0ymxV+JcjzPsFRE+KX64WkM9odk2xsuE5kqk8Kh7AX7r+Vo7L9s3
-TKagBC2XvkxiO+30Xr4I73AYkATE8DS4V5MOuVxGpTL6cl2zZGv82RfUdVVZU/vQ
-oumPpwwoi+iDlhws9YladUsAm+IDu772ADIJsCOHqkrnweLohlI+38puWLBU+ijO
-SFo5nh5sGKnFBASUFJ7/x6GQKsD4jWqoAFJBxixzdenWQF51nn377IizfYQ5wmsR
-2rRuE1N/vGhxa1GWMHxTgjPQCvzNEh/Ysregt8o83bihDrFvWNM1v7QFH0ui3F9Y
-CEc5bX0SvyWbyNbz+9/DsknMmXM6xn0ODLYc1V9hPH7hSGATqlGf4KYw0o094WNp
-0OjY2zcVQRhTDCzzKRk5slD4hbzYTdSTpc9EhQSl36JQTGbSznlKk5aEwcg/USLQ
-D3KVfKEAiwU2CuBKMesmJ+iWz3+x3Z649SZFedEh18umD3Z5sNQ/iFUHedwSGUfB
-+f82EHwcTH0+LW9+EB02zYIHA3Nn4VHRDSLEaFFhixqNNuYJS4ZeXfE/9fwatzz5
-Obd+sxj0poOCrfdDcPqx+B3YRmRCNapaoPiFn5gn6cASKrvnNCNvSTjYknII+6tD
-bbhnBlb5h+DyI+Rd0yev
-=qI0c
+iQIcBAEBCAAGBQJRywEuAAoJEJOE+m71LUu6ByQP/0qVE+nGR3dOwcanKTx9Rx37
+gsjwIcOIw7V311YijsC63I5kBvIGakkqgGCVyBMlkc+1yQgXKo45Jb8ONDwBJz8j
+UKLU+9A/JNuf7OGNgkj2WfSs0Jr/wqti5k1HwpezOYAn3IO9n27gkGR65CvGTreq
+p93QHtBc3Jhqas0lSPukLbRofcYg3AHmfbu5KtVHaCSndbH56e6JFBDjXIod/92z
+aQqB1vJ2+V+jjayS4wwyA1wPdsWa0aCc+tS0yBxykqV4mo70vPYAZ2OqZcyDWheg
+ZF6Vp2Zk7nmvMRi4ZoZcIswA8q7EOgCpqbNJqurbZzf3hB/Nl4s4OG+EEYaBRjQi
+Ix0fIvuChqcZQSjoR+EHAXgZAFW+YY3OZnwtqB46UQi7LF4pHy7oicA3mowtf+Gw
++jgpynrYeS+3DTxfPCODuKflQGxgHKsCS6PJeIOZAB/8zbGArzMIvjlcdMSJmi4h
+kqCkYjUprq1R2K+1qhV5FJT1SlMbkd54BtPLiNfn/BGFQfRmci7a8lCK0Lu8MliE
+X5jTuX0B8wlRBwwwt6GEzLqKody2Kw0fDi6kGefj6gRsZSG3zOwJNEDC0FDWgD6A
+ChHd7gCXNoN4x+GTtqy5O79X4FeMHgu25C6ccyrtX9/jOCd3vvEnwe24SY02s0v9
+zzWh9/gRBj7H0G2SU2q5
+=Idcn
 -----END PGP SIGNATURE-----
diff --git a/net-libs/cyassl/cyassl-2.7.0.ebuild b/net-libs/cyassl/cyassl-2.7.0.ebuild
new file mode 100644
index 000000000000..1112da538f0c
--- /dev/null
+++ b/net-libs/cyassl/cyassl-2.7.0.ebuild
@@ -0,0 +1,141 @@
+# 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.7.0.ebuild,v 1.1 2013/06/26 14:55:09 blueness Exp $
+
+EAPI="5"
+
+inherit eutils
+
+DESCRIPTION="Lightweight SSL/TLS library targeted at embedded and RTOS environments"
+HOMEPAGE="http://www.yassl.com/yaSSL/Home.html"
+SRC_URI="http://dev.gentoo.org/~blueness/${PN}/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
+
+#Add CRYPTO_OPTS=ecc when fixed
+CACHE_SIZE="small big +huge"
+CRYPTO_OPTS="+aes aes-gcm aes-ccm aes-ni +arc4 +asn blake2 camellia +coding +dh dsa +des3 ecc +hc128 md2 md4 +md5 nullcipher +psk leanpsk rabbit +ripemd +rsa +sha sha512"
+CERT_OPTS="ocsp crl crl-monitor savesession savecert +sessioncerts +testcert"
+DEBUG="debug +errorstrings +memory test"
+IUSE="-dtls examples extra fortress ipv6 +httpd mcapi pwdbased sni sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS} ${DEBUG}"
+
+#You can only pick one cach size
+#sha512 is broken on x86
+#Testing freezes with dtls
+REQUIRED_USE="^^ ( small big huge )
+	leanpsk? ( psk )
+	fortress? ( extra sha512 )
+	pwdbased? ( extra )
+	test? ( !dtls )"
+
+DEPEND="app-arch/unzip
+	sniffer? ( net-libs/libpcap )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.0.8-disable-testsuit-ifnothreads.patch
+}
+
+src_configure() {
+	local myconf=()
+
+	if use threads; then
+		myconf+=( --disable-singlethreaded )
+	else
+		myconf+=( --enable-singlethreaded )
+	fi
+
+	if use amd64; then
+		myconf+=( --enable-fastmath --enable-fasthugemath --enable-bump )
+	elif use x86; then
+		#not pie friendly, sorry x86, no fast math for you :(
+		myconf+=( --disable-fastmath --disable-fasthugemath --disable-bump )
+	fi
+
+	#Bug #454300
+	export C_EXTRA_FLAGS=${CFLAGS}
+
+	econf \
+		--disable-silent-rules              \
+		--enable-keygen                     \
+		--enable-certgen                    \
+		--disable-stacksize                 \
+		--disable-ntru                      \
+		--enable-filesystem                 \
+		--enable-inline                     \
+		--disable-oldtls                    \
+		--disable-valgrind                  \
+		                                    \
+		$(use_enable small smallcache)      \
+		$(use_enable big bigcache)          \
+		$(use_enable huge hugecache)        \
+		                                    \
+		$(use_enable aes)                   \
+		$(use_enable aes-gcm aesgcm)        \
+		$(use_enable aes-ccm aesccm)        \
+		$(use_enable aes-ni aesni)          \
+		$(use_enable arc4)                  \
+		$(use_enable asn)                   \
+		$(use_enable blake2)                \
+		$(use_enable camellia)              \
+		$(use_enable coding)                \
+		$(use_enable dh)                    \
+		$(use_enable dsa)                   \
+		$(use_enable des3)                  \
+		$(use_enable ecc)                   \
+		$(use_enable hc128)                 \
+		$(use_enable md2)                   \
+		$(use_enable md4)                   \
+		$(use_enable md5)                   \
+		$(use_enable nullcipher)            \
+		$(use_enable psk)                   \
+		$(use_enable leanpsk)               \
+		$(use_enable rabbit)                \
+		$(use_enable ripemd)                \
+		$(use_enable rsa)                   \
+		$(use_enable sha)                   \
+		$(use_enable sha512)                \
+		                                    \
+		$(use_enable ocsp)                  \
+		$(use_enable crl)                   \
+		$(use_enable crl-monitor)           \
+		$(use_enable savesession)           \
+		$(use_enable savecert)              \
+		$(use_enable sessioncerts)          \
+		$(use_enable testcert)              \
+		                                    \
+		$(use_enable debug)                 \
+		$(use_enable errorstrings)          \
+		$(use_enable memory)                \
+		                                    \
+		$(use_enable dtls)                  \
+		$(use_enable examples)              \
+		$(use_enable extra opensslextra)    \
+		$(use_enable fortress)              \
+		$(use_enable ipv6)                  \
+		$(use_enable httpd webserver)       \
+		$(use_enable mcapi)                 \
+		$(use_enable pwdbased)              \
+		$(use_enable sni)                   \
+		$(use_enable sniffer)               \
+		$(use_enable static-libs static)    \
+		$(use_with zlib libz)               \
+		$(use_enable cyassl-hardening gcc-hardening)    \
+		"${myconf[@]}"
+}
+
+src_test() {
+	"${S}"/tests/unit
+	"${S}"/ctaocrypt/benchmark/benchmark
+}
+
+src_install() {
+	default
+
+	mv "${D}"/usr/share/doc/"${PN}"/* \
+		"${D}"/usr/share/doc/"${P}"/
+	rmdir "${D}"/usr/share/doc/"${PN}"/
+}
diff --git a/net-libs/cyassl/metadata.xml b/net-libs/cyassl/metadata.xml
index 935a6dbcfcc7..d57493191e40 100644
--- a/net-libs/cyassl/metadata.xml
+++ b/net-libs/cyassl/metadata.xml
@@ -6,30 +6,52 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
+		<flag name="small">Choose small cache size (excludes big or huge)</flag>
+		<flag name="big">Choose big cache size (excludes small or huge)</flag>
+		<flag name="huge">Choose big cache size (excludes small or big)</flag>
+		<flag name="aes">Enable AES cipher support</flag>
 		<flag name="aes-gcm">Enable AES Galois/Counter mode</flag>
-		<flag name="aes-ccm">Eanble AES Counter with CBC-MAC mode </flag>
+		<flag name="aes-ccm">Eanble AES Counter with CBC-MAC mode</flag>
 		<flag name="aes-ni">Enable Intel AES instruction support</flag>
-		<flag name="camellia">Enable Camellia-CBC cipher support </flag>
-		<!-- add this when ecc is fixed
+		<flag name="arc4">Enable ARC4 cipher support</flag>
+		<flag name="asn">Enable ASN cipher support</flag>
+		<flag name="blake2">Enable CyaSSL BLAKE2 support</flag>
+		<flag name="camellia">Enable Camellia-CBC cipher support</flag>
+		<flag name="coding">Enable Coding base 16/64</flag>
+		<flag name="dh">Enable DH cipher support</flag>
+		<flag name="dsa">Enable DSA cipher support</flag>
+		<flag name="des3">Enable triple DES support</flag>
 		<flag name="ecc">Enable Elliptic Curve support</flag>
-		-->
 		<flag name="hc128">Enable HC-128 support</flag>
 		<flag name="md2">Enable MD2 support</flag>
+		<flag name="md4">Enable MD4 support</flag>
+		<flag name="md5">Enable MD5 support</flag>
+		<flag name="nullcipher">Enable nullcipher support</flag>
 		<flag name="psk">Enable Pre-Shared Key support</flag>
+		<flag name="leanpsk">Enable lean PSK support (requires psk)</flag>
+		<flag name="rabbit">Enable RABBIT cipher support</flag>
 		<flag name="ripemd">Enable RIPEMD-160 support</flag>
+		<flag name="rsa">Enable RSA cihper support</flag>
+		<flag name="sha">Enable SHA cipher support</flag>
 		<flag name="sha512">Enable SHA-160 support</flag>
-		<flag name="small">Choose small cache size (excludes big or huge)</flag>
-		<flag name="big">Choose big cache size (excludes small or huge)</flag>
-		<flag name="huge">Choose big cache size (excludes small or big)</flag>
-		<flag name="dtls">Enable datagram TLS</flag>
-		<flag name="httpd">Enable features for yaSSL web server</flag>
 		<flag name="ocsp">Enable Online Certificate Status Protocol</flag>
 		<flag name="crl">Enable Certificate Revocation List</flag>
 		<flag name="crl-monitor">Enable Certificate Revocation List Directory Monitoring</flag>
+		<flag name="savesession">Support session saving</flag>
+		<flag name="savecert">Support certificate saving</flag>
 		<flag name="sessioncerts">Store session certificates</flag>
+		<flag name="testcert">Enable certificate testing</flag>
+		<flag name="errorstrings">Enable error strings table</flag>
+		<flag name="memory">Enable memory callbacks</flag>
+		<flag name="dtls">Enable datagram TLS (must be disabled for tests)</flag>
+		<flag name="extra">Enable extra OpenSSL API</flag>
+		<flag name="fortress">Enable fortress SSL build (requires extra and SHA512)</flag>
+		<flag name="httpd">Enable features for yaSSL web server</flag>
+		<flag name="mcapi">Enable Microchip API</flag>
+		<flag name="pwdbased">Enable PWDBASED (requires extra)</flag>
+		<flag name="sni">Enable server name indication</flag>
 		<flag name="sniffer">Allow collection/decryption of SSL traffic</flag>
 		<flag name="sniffer">Allow collection/decryption of SSL traffic</flag>
-		<flag name="testcert">Enable certificate testing</flag>
 		<flag name="cyassl-hardening">Add hardening flags to CFLAGS/LDFLAGS</flag>
 	</use>
 </pkgmetadata>