Version bump

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

3 files changed, 129 insertions, 5 deletions

diff --git a/net-libs/cyassl/ChangeLog b/net-libs/cyassl/ChangeLog
index 67371bcad443..80b7612b2907 100644
--- a/net-libs/cyassl/ChangeLog
+++ b/net-libs/cyassl/ChangeLog
@@ -1,6 +1,11 @@
 # 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.18 2012/10/18 21:34:31 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/cyassl/ChangeLog,v 1.19 2012/12/28 01:55:02 blueness Exp $
+
+*cyassl-2.4.6 (28 Dec 2012)
+
+  28 Dec 2012; Anthony G. Basile <blueness@gentoo.org> +cyassl-2.4.6.ebuild:
+  Version bump
 
 *cyassl-2.4.0 (18 Oct 2012)
 
diff --git a/net-libs/cyassl/Manifest b/net-libs/cyassl/Manifest
index 195db8967f86..d120f30949cb 100644
--- a/net-libs/cyassl/Manifest
+++ b/net-libs/cyassl/Manifest
@@ -8,16 +8,28 @@ DIST cyassl-2.0.8.zip 894570 SHA256 bcf26384f155c5fe2fdec82eea41894b7742fc39c651
 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
 DIST cyassl-2.4.0.zip 1027685 SHA256 5fcfccfac906d122e7d37b610d69a22e587e1a810670aa9eecc8f0cd02178d60 SHA512 a21f0d1b136590586b81c2b735e8ee37a456c8d472d3fd1f5a3b7d1582f31f270cfba0cf8d706eebe45a471dfb7c2201c4c7dcd01598b1fc57b2315632590583 WHIRLPOOL d6b8846e216b983113f4a2ef844c729bb1487f00279780193fc701ca510557946d812ebcbed397a6a579c29d0bd3ca8f694cb8dfa56e3d0f83600adcc8cda242
+DIST cyassl-2.4.6.zip 1041965 SHA256 051caa5013cecafbec3780d2597374870e7e5a7bbeaeb502bc029d5774d6e508 SHA512 85d4db5207e3f47db676415f4d51ccbedbf3e1d05db19e91fd33d9ef80851d79933d40b1fed17acef3be803b811514b08065588889f9d6dec7fc63dfb58e4aff WHIRLPOOL b1a6edfdfc0bed8c95c8987fc35ad4dec772a17c66c5478cbae30e384a5a6857cca87dcbb8ac5e647e8fdbe4ea54827ccf88b04b276877896645617a05ef85ad
 EBUILD cyassl-2.0.8-r1.ebuild 3141 SHA256 e59d1ca28aa9764f798d775f206718d49d33711c27c6165f2186a558b692df7e SHA512 b6556dac251efb0f182b3c633ea0d6974f6c06936bca086078c94addb014a09322ae4f6c986a07f0b500cab32d23c7046343bc1f3b486955810342bcb585fed5 WHIRLPOOL 648c0b2c864372d347ee06ab37d7e6849208e085e50041cc1ae18a5d67ff705af280a7a3f4a0285e8c2846b1ae00a0cea24a084276f37bb90f51b23a2e4bd796
 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
-MISC ChangeLog 2568 SHA256 4705e8d5c98511a38aeacc61fc93783fab17765c5d6e95ee8bd26b07bff801e5 SHA512 bd468a545f4a58789b26ef1c0d602a2f346d94ab225f62f1ea42a60a1b6592ca221210298995b7149311ce78d951b6a7b21288c26dd842526c11fa91c6d28fdc WHIRLPOOL 64c98da0203ec783ce24e603ac0282402b1f028d71fb51d3e8e9aabdc600e01eddefb4e1f8c537c61ec94faad5691b8b66c0642dee0a399dd9cf727defd61e14
+EBUILD cyassl-2.4.6.ebuild 3348 SHA256 d68c821c8e8781197331ecd446b5e731f8ed318b71f6153ebf3d78e6cda24f66 SHA512 45c6f6cad39448c5d15590662541d6b390172b99ea401e9b0b58f648f389254404ef85a3e82ac35f00a4a606245434d3f48130800086f216c9869984d0e5b9ef WHIRLPOOL 03ccd0236b28c36dc8ebcaaa3b9901e4610a5b39b6bfea2fd2571a688d20be2b529f8a5beb49889e984c35d0a15ce9a3820196d83a5af659fafb53c96f6e181f
+MISC ChangeLog 2690 SHA256 bb4a039dbaaf681a5a93868ef11bcd325246e3fbfca994ac6b7b3f6afaf20788 SHA512 e26e645f0228c336e551d5325e1b3525718b62b63a5fcb7bfd084206eedc3964ab3136a8ad83e813d67bbaf2cddd180d2636da55bd6f87a6e024d80f0629f429 WHIRLPOOL a22857d4563ea7e3eb62d4b496605c046f3b145b7e12be9ddac2a4e3a4fa36cff08ecf916601fbcf43fdae24fac5fadb0f4af9a67c7fed526518dbc78032a861
 MISC metadata.xml 1630 SHA256 ccd20952579332be49ffef98de5ee4a7436114dcbff60c86269e4d2c7494bbcf SHA512 5d883b162383d2fd5c3c7c82394e3629009dbdaa33ba87d0f66b8e4e199846acf7e256589cffad006a7bb44e06db31518184d5aa825eecfa3b59809ca526f3ff WHIRLPOOL ac86b42a291f268a5fa6ee62538d5d5588e8b9c5097cd4680b6d3e082b742d9b307cb0776274bf2a50c20590201e71a4a8be5e8714b13cbe82ce4a0e8895a126
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCAdbAACgkQl5yvQNBFVTVaqQCeNyxb5O/nsS+SHRMdff80yI26
-AacAn2FWTNkWQbIrWUQPyfJ0d/OPjh5W
-=el/9
+iQIcBAEBCAAGBQJQ3PwFAAoJEJOE+m71LUu6cKAP/jY0+4d0KBAAbC/40qBt36SL
+l4OZGplgftPkNWTytUXEBZEM7DVZGEBKHq1zz336DTYC4iv+BjYhLNGk8ex8nv6n
+pGKYw0qVcjRk3uVaogwMQUd+CY84KEuGF7MeV5lRARHxEFjTZ13M4iCRSZVgrx9z
+ZAOVKMynABlirtCF6Ceg52dxnGSFBdZv5WMIBTC9Myq/F6jHTAxQnL8ZKUAkLPNd
+OHrdxuLAGCUZJ8f9xyLzkykpVOxX/KYQLNP/g+Jfuk5ZsmI/AS2DW5wSF3IqplME
+XOeCBCZK2bwHMcsRvF5glhd3Jr70bX15uywxKChC5P1z2OiC1iZGgOBWqZU/OdEy
+3ELP+xe1BPg6BJSWyub1pm8+ZaYMZCfcGWml1+IISREoDzHkuv+QQH09nNenleJi
+DHX/tzg1wwpgSXl0VU2Tg7WHvfv8IDntl+b2AeOSoEkeKTU2ajOP0OZCZM+WwOOi
+8FFHqrenfTiAquItfbfk1KuEigkVk5jx2dhXMaz066u+dphbUW5IRPcSxgCkF0PK
+DropAEgdK6+JYNd5y1cpADONzFNbLIv+UpW6cC5QmgJhLVwkfEmyLdzgkQJ2itdI
+h9ED2t9tG5pki15WPw2RcN3EwQaaapndsiDzvehS2xsl9JmY/1IDsfF/OF1pdTuT
+tKzIc3pMi684rLy3y7er
+=hNu9
 -----END PGP SIGNATURE-----
diff --git a/net-libs/cyassl/cyassl-2.4.6.ebuild b/net-libs/cyassl/cyassl-2.4.6.ebuild
new file mode 100644
index 000000000000..c0e1d982e237
--- /dev/null
+++ b/net-libs/cyassl/cyassl-2.4.6.ebuild
@@ -0,0 +1,107 @@
+# 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.4.6.ebuild,v 1.1 2012/12/28 01:55:02 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 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+#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                  \
+		$(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_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}"/
+}