Version bump

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 126 insertions, 6 deletions

diff --git a/net-libs/cyassl/ChangeLog b/net-libs/cyassl/ChangeLog
index bf2111b16e14..e4c81047076b 100644
--- a/net-libs/cyassl/ChangeLog
+++ b/net-libs/cyassl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/cyassl
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/ChangeLog,v 1.9 2012/07/24 14:16:16 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/ChangeLog,v 1.10 2012/08/15 15:23:29 blueness Exp $
+
+*cyassl-2.3.0 (15 Aug 2012)
+
+  15 Aug 2012; Anthony G. Basile <blueness@gentoo.org> +cyassl-2.3.0.ebuild,
+  metadata.xml:
+  Version bump
 
   24 Jul 2012; Jeroen Roovers <jer@gentoo.org> cyassl-2.2.0.ebuild:
   Marked ~hppa (bug #427262).
diff --git a/net-libs/cyassl/Manifest b/net-libs/cyassl/Manifest
index a3a00cae603f..526cfdade0a7 100644
--- a/net-libs/cyassl/Manifest
+++ b/net-libs/cyassl/Manifest
@@ -5,14 +5,16 @@ AUX cyassl-2.0.8-disable-testsuit-ifnothreads.patch 734 SHA256 972057b9a614bf0ea
 AUX cyassl-2.0.8-fix-gnustack.patch 390 SHA256 8a8bed2bf340081cde93bdd3790a90775f8dad79c12e9fdd4355bb9f0fa2640f SHA512 9df5a4da028129c1b2ffef213d92667217f08e38a5b9016917768d22853aa003725c42dce0ee2ee0faee3e2f2d8df210f02e82dd587cbd36c6025e3e5916ac2c WHIRLPOOL f87e9f5db916c97a515cd4bf8a0438b16fed59dcf00e13ef2ae037238e1defa512596a3ecd7da8ba1e1f3b2090d02d2c75644faa94ba3283e591f85b0f5d0949
 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
 EBUILD cyassl-2.0.8-r1.ebuild 3141 SHA256 e59d1ca28aa9764f798d775f206718d49d33711c27c6165f2186a558b692df7e SHA512 b6556dac251efb0f182b3c633ea0d6974f6c06936bca086078c94addb014a09322ae4f6c986a07f0b500cab32d23c7046343bc1f3b486955810342bcb585fed5 WHIRLPOOL 648c0b2c864372d347ee06ab37d7e6849208e085e50041cc1ae18a5d67ff705af280a7a3f4a0285e8c2846b1ae00a0cea24a084276f37bb90f51b23a2e4bd796
 EBUILD cyassl-2.2.0.ebuild 3215 SHA256 d535545263894f89a95d5f8874d2ad463ff0adfed7aac81a1c61eacf3085b197 SHA512 af18de3de692050e06af18ebd026abd7e72ad4a198acb4d24e572419f6014b123db397e48a3fb3dbcd5d21136ea0899dbd723d54a2b90f1526e8b21b29a4e45c WHIRLPOOL 1e54067816915da3581aaf9b253766c6215edc89731ea07187a85cc285844711bbf13a8979a25532dd7fbebb3750f8ae507109a3b17bc4741fd6588c5f6d0b87
-MISC ChangeLog 1505 SHA256 f556c1d14cdad5b6682f1e3cb7e3fee4b166b588f9116b592154f9fc8cacf875 SHA512 a67a889bbd87373588049f9a61a92057ba4c19f3311809dff5075e727bff85abf233202cef2d86d507ce0b0ccf7a1250f689311efd5c7cea0d3a7786ae9fd77f WHIRLPOOL 9e5b35d805ea8ffd3e893b01d477a750be83712f71a38ae7b65e6c36388ddf489e74ab9d0dc1ead51f4f48cc8831092919aca5498fc4a7831ff15e554179682e
-MISC metadata.xml 1434 SHA256 90296583f1ae6d6fbaca9527e7556003b67f2fbde8dabc3b21ffc4d21575f316 SHA512 6ae208494b223c8e438a58f4dd94e0d3f1623fecc8e2b2a2c00aa3716b907f5b9b68ce5ab735f002cfe806f904c05322909578c50d6ecdc2faf9f51dd5a439b7 WHIRLPOOL 9846a2bc66b13cf9bf340d26575ce62ec2e097adabd543d5b55f68ff85aca94c2d18859cc2f97b79dbb6273fa37c13f582b6e9d19b5dda4c4822ecb26bbf7087
+EBUILD cyassl-2.3.0.ebuild 3406 SHA256 dcc8301affc4b02a95d2de43e9b8117575c6174fe87e044fe1ddb596209413e0 SHA512 6b200f1a2e8bf6feeb9a05a267d39dbe59f97d678504ff1b8e70d366647ae012e8679709038cd3642680fb97c6d249e03a063defa09f2310fb533731a2a2d933 WHIRLPOOL 1ce04d0b886be8656206a893131e5acb1c04ca483c8856f394ff5c678d0befe87d393a5bf47b4412fd34f83e4be8db9d930b2fd66c7b352b6c2b68e99c82b6e7
+MISC ChangeLog 1649 SHA256 e0b3571e15a2e02956198e4913f4fbd4ee066d5cdb714b075117d05ffc3e6d51 SHA512 da67c3e88aac83e120d41c3e63bcdc731d7c77c264840d331c3daa874d5a5fb12b02e6283916483e31a777952861bbe0d781728864346fce4e8d78da18d832a7 WHIRLPOOL 656b5df628d2ad6142baae2f41cc87bda310613da20b3d9a5b0952cd59677bf078eba36623f6383a9c57f6c6e469e43525fb93fcb6b2da6d7071e0b214cc12bc
+MISC metadata.xml 1630 SHA256 ccd20952579332be49ffef98de5ee4a7436114dcbff60c86269e4d2c7494bbcf SHA512 5d883b162383d2fd5c3c7c82394e3629009dbdaa33ba87d0f66b8e4e199846acf7e256589cffad006a7bb44e06db31518184d5aa825eecfa3b59809ca526f3ff WHIRLPOOL ac86b42a291f268a5fa6ee62538d5d5588e8b9c5097cd4680b6d3e082b742d9b307cb0776274bf2a50c20590201e71a4a8be5e8714b13cbe82ce4a0e8895a126
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlAOrjYACgkQVWmRsqeSphOqbgCeIjOAsknfXP8iuvh1Sy8K7qO6
-a0wAniisJbcYCkUKT8zg6lxgmWv8v7il
-=x3U1
+iEYEAREIAAYFAlArvu4ACgkQl5yvQNBFVTVaWgCfagb5+1/SBBi2l6hfsI6Q+EEs
+iYAAnRYn+vaGPJeZV0SRARKWFUjd15Bp
+=nWyX
 -----END PGP SIGNATURE-----
diff --git a/net-libs/cyassl/cyassl-2.3.0.ebuild b/net-libs/cyassl/cyassl-2.3.0.ebuild
new file mode 100644
index 000000000000..f3669be5efa3
--- /dev/null
+++ b/net-libs/cyassl/cyassl-2.3.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/cyassl-2.3.0.ebuild,v 1.1 2012/08/15 15:23:29 blueness Exp $
+
+EAPI="4"
+
+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"
+
+#Add CRYPTO_OPTS=ecc when fixed
+CACHE_SIZE="small big +huge"
+CRYPTO_OPTS="aes-gcm aes-ni +hc128 md2 +psk +ripemd sha512"
+CERT_OPTS="ocsp crl crl-monitor +sessioncerts +testcert"
+IUSE="debug -dtls ipv6 +httpd +sniffer static-libs threads +zlib cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS} ${CERT_OPTS}"
+
+#You can only pick one cach size
+#sha512 is broken on x86
+#Testing freezes with dtls
+REQUIRED_USE="^^ ( small big huge )
+	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
+
+	#Apply unconditionally, but only triggered if USE="aes-ni"
+	epatch "${FILESDIR}"/${PN}-2.0.8-fix-gnustack.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
+
+	#There are lots of options, so we'll force a few reasonable
+	#We may change this in the future, in particular ecc needs to be fixed
+	econf \
+		--enable-opensslExtra               \
+		--enable-fortress                   \
+		--enable-keygen                     \
+		--enable-certgen                    \
+		--disable-debug                     \
+		--disable-ecc                       \
+		--disable-small                     \
+		--disable-ntru                      \
+		--disable-noFilesystem              \
+		--disable-noInline                  \
+		--disable-gcc-lots-o-warnings       \
+		$(use_enable debug)                 \
+		$(use_enable small smallcache)      \
+		$(use_enable big bigcache)          \
+		$(use_enable huge hugecache)        \
+		$(use_enable aes-gcm aesgcm)        \
+		$(use_enable aes-ni aesni)          \
+		$(use_enable hc128)                 \
+		$(use_enable md2)                   \
+		$(use_enable psk)                   \
+		$(use_enable ripemd)                \
+		$(use_enable sha512)                \
+		$(use_enable dtls)                  \
+		$(use_enable ipv6)                  \
+		$(use_enable httpd webServer)       \
+		$(use_enable ocsp)                  \
+		$(use_enable crl)                   \
+		$(use_enable crl-monitor)           \
+		$(use_enable sessioncerts)          \
+		$(use_enable sniffer)               \
+		$(use_enable testcert)              \
+		$(use_enable static-libs static)    \
+		$(use_enable cyassl-hardening gcc-hardening)    \
+		$(use_enable cyassl-hardening linker-hardening) \
+		$(use_with zlib libz)               \
+		"${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 9a903b105bdb..b51be1854f2f 100644
--- a/net-libs/cyassl/metadata.xml
+++ b/net-libs/cyassl/metadata.xml
@@ -6,11 +6,13 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<use>
+		<flag name="aes-gcm">Enable AES Galois/Counter mode</flag>
 		<flag name="aes-ni">Enable Intel AES instruction support</flag>
 		<!-- add this when ecc is fixed
 		<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="psk">Enable Pre-Shared Key support</flag>
 		<flag name="ripemd">Enable RIPEMD-160 support</flag>
 		<flag name="sha512">Enable SHA-160 support</flag>
@@ -21,6 +23,7 @@
 		<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="sessioncerts">Store session certificates</flag>
 		<flag name="sniffer">Allow collection/decryption of SSL traffic</flag>
 		<flag name="sniffer">Allow collection/decryption of SSL traffic</flag>