From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SHdrj-00046Q-J3 for garchives@archives.gentoo.org; Tue, 10 Apr 2012 16:24:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 57FE7E0BAD; Tue, 10 Apr 2012 16:24:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0F649E0BAD for ; Tue, 10 Apr 2012 16:24:03 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 21B5D1B4009 for ; Tue, 10 Apr 2012 16:24:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C3698E5402 for ; Tue, 10 Apr 2012 16:24:00 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1334075033.ff90bf2f195a78126aeccdc3f686166246b32389.blueness@gentoo> Subject: [gentoo-commits] dev/blueness:master commit in: net-libs/cyassl/, net-libs/cyassl/files/ X-VCS-Repository: dev/blueness X-VCS-Files: net-libs/cyassl/Manifest net-libs/cyassl/cyassl-2.0.8.ebuild net-libs/cyassl/files/cyassl-2.0.8-disable-testsuit.patch net-libs/cyassl/files/cyassl-2.0.8-fix-gnustack.patch net-libs/cyassl/metadata.xml X-VCS-Directories: net-libs/cyassl/ net-libs/cyassl/files/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: ff90bf2f195a78126aeccdc3f686166246b32389 X-VCS-Branch: master Date: Tue, 10 Apr 2012 16:24:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 1b544605-8b8e-4870-9610-9b7705adbf82 X-Archives-Hash: 3cce24dc809f3e384cd27ea66f684484 commit: ff90bf2f195a78126aeccdc3f686166246b32389 Author: Anthony G. Basile gentoo org> AuthorDate: Tue Apr 10 16:23:53 2012 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Tue Apr 10 16:23:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/blueness.git;a= =3Dcommit;h=3Dff90bf2f net-libs/cyassl: fix testsuite and gnustack bugs --- net-libs/cyassl/Manifest | 6 ++- net-libs/cyassl/cyassl-2.0.8.ebuild | 33 +++++++++++++-= ----- .../files/cyassl-2.0.8-disable-testsuit.patch | 24 ++++++++++++++ .../cyassl/files/cyassl-2.0.8-fix-gnustack.patch | 10 ++++++ net-libs/cyassl/metadata.xml | 2 + 5 files changed, 62 insertions(+), 13 deletions(-) diff --git a/net-libs/cyassl/Manifest b/net-libs/cyassl/Manifest index 451c233..31df95c 100644 --- a/net-libs/cyassl/Manifest +++ b/net-libs/cyassl/Manifest @@ -1,3 +1,5 @@ +AUX cyassl-2.0.8-disable-testsuit.patch 734 RMD160 c784e25897f1196330982= d1e70a5ee0f9146316f SHA1 b0bf5bf802541cd9e1d208496776a3605f47a1a5 SHA256 = 972057b9a614bf0ea4e3acf87df7ce4e528a67a59799ff7991b51cf3f85442ba +AUX cyassl-2.0.8-fix-gnustack.patch 390 RMD160 e6e15c80e750b6872bcde37a1= 378885d60a688dc SHA1 797a2918b11b123a68e6b83013a329884fa5bc3a SHA256 8a8b= ed2bf340081cde93bdd3790a90775f8dad79c12e9fdd4355bb9f0fa2640f DIST cyassl-2.0.8.zip 894570 RMD160 0c2db4947505829b09ac51b1184fcdba210e= 0b38 SHA1 13310489944b69b1b001f8d9f15464d45717ed51 SHA256 bcf26384f155c5f= e2fdec82eea41894b7742fc39c651d6c52e80824f63a4a09b -EBUILD cyassl-2.0.8.ebuild 2380 RMD160 40ce47c50459a8d3fa99442ff64f54d13= 0ca6763 SHA1 a0d5da2d8632e55b2b51658616099e1027e09e24 SHA256 1617f8204109= 666131c9f8b655c42c414f783e0df4d4a3620e013ec1b14ec9e2 -MISC metadata.xml 1264 RMD160 cb61e63bee0e50296813d2024668f363c5f2f726 S= HA1 54b3eb7795d8f7a136d298920ee143818ad0903a SHA256 19040c79a67d7e64a0f98= 9e1c32fc3347562717d6938108763a5e620bfe1fb27 +EBUILD cyassl-2.0.8.ebuild 2658 RMD160 041c6affe3748c982768725292c8e4afb= 12c75b4 SHA1 9ced550dfff66722f7a0261fdda01e18d6f13f35 SHA256 f75da33b7e2e= d9f15358a8370c383c623c8bbe3faa652f7c73af8f1105fe15e5 +MISC metadata.xml 1304 RMD160 ed7c2b27d40c079350ffbf95fcabeda053d2bc6d S= HA1 11a85fe5e88b93eec6c91daec33886c23f408f41 SHA256 e9ab659127538acac6192= 6181d1427c036ef49f40db3ff166cd8f20f4ba71c87 diff --git a/net-libs/cyassl/cyassl-2.0.8.ebuild b/net-libs/cyassl/cyassl= -2.0.8.ebuild index 4e35773..7cc32a5 100644 --- a/net-libs/cyassl/cyassl-2.0.8.ebuild +++ b/net-libs/cyassl/cyassl-2.0.8.ebuild @@ -4,6 +4,8 @@ =20 EAPI=3D"4" =20 +inherit eutils + DESCRIPTION=3D"Lightweight SSL/TLS library targeted at embedded and RTOS= environments" HOMEPAGE=3D"http://www.yassl.com/yaSSL/Home.html" SRC_URI=3D"http://dev.gentoo.org/~blueness/${PN}/${P}.zip" @@ -12,20 +14,22 @@ LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~amd64 ~x86" =20 +#Add CRYPTO_OPTS=3Decc when fixed CACHE_SIZE=3D"small big +huge" -CRTYPT_OPTS=3D"aes-ni ecc +hc128 +psk +ripemd +sha512" -IUSE=3D"+dtls ipv6 httpd sessioncerts +sniffer testcert threads +zlib cy= assl-hardening ${CACHE_SIZE} ${CRTYPT_OPTS}" +CRYPTO_OPTS=3D"aes-ni +hc128 +psk +ripemd +sha512" +IUSE=3D"-dtls ipv6 +httpd +sessioncerts +sniffer +testcert threads +zlib= cyassl-hardening ${CACHE_SIZE} ${CRYPTO_OPTS}" =20 +# Testing requires threads and freezes with dtls REQUIRED_USE=3D"^^ ( small big huge ) - test? ( threads )" + test? ( threads !dtls )" =20 DEPEND=3D"zlib? ( sys-libs/zlib )" RDEPEND=3D"${DEPEND}" =20 src_prepare() { - if ! use test; then - echo "int main() { ; return 0; }" > "${S}"/testsuite/testsuite.c - fi + epatch "${FILESDIR}"/${P}-disable-testsuit.patch + #Apply unconditionally but only needed if USE=3D"aes-ni" + epatch "${FILESDIR}"/${P}-fix-gnustack.patch } =20 src_configure() { @@ -37,11 +41,8 @@ src_configure() { myconf+=3D( --enable-singleThreaded ) fi =20 - # --enable-noFilesystem Enable No Filesystem (default: disabled) - # --enable-noInline Enable No inline (default: disabled) - #There are lots of options, so we'll force a few reasonable - #We may change this in the future + #We may change this in the future, in particular ecc needs to be fixed econf \ --enable-opensslExtra \ --enable-fortress \ @@ -51,14 +52,16 @@ src_configure() { --enable-keygen \ --enable-certgen \ --disable-debug \ + --disable-ecc \ --disable-small \ --disable-ntru \ + --disable-noFilesystem \ + --disable-noInline \ --disable-gcc-lots-o-warnings \ $(use_enable small smallcache) \ $(use_enable big bigcache) \ $(use_enable huge hugecache) \ $(use_enable aes-ni aesni) \ - $(use_enable ecc) \ $(use_enable hc128) \ $(use_enable psk) \ $(use_enable ripemd) \ @@ -74,3 +77,11 @@ src_configure() { $(use_with zlib libz) \ "${myconf[@]}" } + +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/files/cyassl-2.0.8-disable-testsuit.patch b/= net-libs/cyassl/files/cyassl-2.0.8-disable-testsuit.patch new file mode 100644 index 0000000..b1c2cbe --- /dev/null +++ b/net-libs/cyassl/files/cyassl-2.0.8-disable-testsuit.patch @@ -0,0 +1,24 @@ +diff -Naur cyassl-2.0.8.orig//testsuite/testsuite.c cyassl-2.0.8/testsui= te/testsuite.c +--- cyassl-2.0.8.orig//testsuite/testsuite.c 2012-02-13 14:51:39.0000000= 00 -0500 ++++ cyassl-2.0.8/testsuite/testsuite.c 2012-04-10 10:26:40.000000000 -04= 00 +@@ -27,10 +27,11 @@ + #include + #include +=20 ++/* Create a stub rather than #error out */ ++/* We can run the tests manually */ + #ifdef SINGLE_THREADED +- #error testsuite needs threads to run, please run ctaocrypt/test, \ +- and the examples/ individually +-#endif ++int main() { return 0; } ++#else +=20 + void wait_tcp_ready(func_args*); + void ctaocrypt_test(void*); +@@ -230,4 +231,4 @@ + fclose(f); + } +=20 +- ++#endif /* SINGLE_THREADED */ diff --git a/net-libs/cyassl/files/cyassl-2.0.8-fix-gnustack.patch b/net-= libs/cyassl/files/cyassl-2.0.8-fix-gnustack.patch new file mode 100644 index 0000000..6906708 --- /dev/null +++ b/net-libs/cyassl/files/cyassl-2.0.8-fix-gnustack.patch @@ -0,0 +1,10 @@ +diff -Naur cyassl-2.0.8.orig//ctaocrypt/src/aes_asm.s cyassl-2.0.8/ctaoc= rypt/src/aes_asm.s +--- cyassl-2.0.8.orig//ctaocrypt/src/aes_asm.s 2011-09-26 18:22:08.00000= 0000 -0400 ++++ cyassl-2.0.8/ctaocrypt/src/aes_asm.s 2012-04-10 12:20:21.000000000 -= 0400 +@@ -482,3 +482,6 @@ + pxor %xmm2, %xmm3 + ret +=20 ++#if defined(__linux__) && defined(__ELF__) ++.section .note.GNU-stack,"",%progbits ++#endif diff --git a/net-libs/cyassl/metadata.xml b/net-libs/cyassl/metadata.xml index 9c1518a..01a7145 100644 --- a/net-libs/cyassl/metadata.xml +++ b/net-libs/cyassl/metadata.xml @@ -7,7 +7,9 @@ Enable Intel AES instruction support + Enable HC-128 support Enable Pre-Shared Key support Enable RIPEMD-160 support