diff options
author | 2014-07-11 23:52:12 +0000 | |
---|---|---|
committer | 2014-07-11 23:52:12 +0000 | |
commit | 944db4ac650b16e999af42af8ae1c75579cd14a4 (patch) | |
tree | 030bc5e1be6ee6833e7642de282581824863ce0d | |
parent | version bump (diff) | |
download | historical-944db4ac650b16e999af42af8ae1c75579cd14a4.tar.gz historical-944db4ac650b16e999af42af8ae1c75579cd14a4.tar.bz2 historical-944db4ac650b16e999af42af8ae1c75579cd14a4.zip |
version bump
Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xBDEED020
-rw-r--r-- | net-libs/polarssl/ChangeLog | 8 | ||||
-rw-r--r-- | net-libs/polarssl/Manifest | 33 | ||||
-rw-r--r-- | net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch | 40 | ||||
-rw-r--r-- | net-libs/polarssl/polarssl-1.3.8.ebuild | 91 |
4 files changed, 156 insertions, 16 deletions
diff --git a/net-libs/polarssl/ChangeLog b/net-libs/polarssl/ChangeLog index 667adefa5c2e..dc20d1fa1c67 100644 --- a/net-libs/polarssl/ChangeLog +++ b/net-libs/polarssl/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for net-libs/polarssl # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.82 2014/07/11 12:57:39 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/ChangeLog,v 1.83 2014/07/11 23:52:07 hasufell Exp $ + +*polarssl-1.3.8 (11 Jul 2014) + + 11 Jul 2014; Julian Ospald <hasufell@gentoo.org> +polarssl-1.3.8.ebuild, + +files/polarssl-1.3.8-ssl_pthread_server.patch: + version bump *polarssl-1.3.7-r1 (11 Jul 2014) diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest index d3f587a4915e..0ef8be5906f8 100644 --- a/net-libs/polarssl/Manifest +++ b/net-libs/polarssl/Manifest @@ -5,33 +5,36 @@ AUX polarssl-1.3.4-cflags.patch 1153 SHA256 33ca10ace98ac5d3a682a40b47051cf41fd1 AUX polarssl-1.3.4-out-of-source.patch 1445 SHA256 baba850b7d1649cfc0a434c886b2176855eeb4b3541da6d3dcc78594a29a5893 SHA512 f6cc8fab1ccbf70a6ed073018d65117a85a1b22b8000bbcc106ff50bd6369a0cc3e1f1d5d80175bc9529ac54507d69e15313281819302d3a08b590d3a57cd0ac WHIRLPOOL 18d22591cd3aeeba0d9035733040a3e3bbd12d25d4490acd6d7ed503946eac72d9f3414d4aa52f6b9e89e6d2af493361068d2c721c0b01e3f051480dd961acb4 AUX polarssl-1.3.4-static.patch 2522 SHA256 5d5e5443297cf682bee3099cb483089da0b00fe29b3ffb341f74fbb4392863a1 SHA512 941a406baa05a9b3847217a8b66b55c62ae1120d751b1317d244e165e1af38d7da012701263dfca0624ea3d1cfa6f0f7cab5a13063ea95d5192706d1209c0dc3 WHIRLPOOL 538301bce5447b42f2d70ea4f5134fc19ac49c3ae192faf84ef31eda6cad7f67f132e33085bf43e19649872fcc8cd4f22519b2da931621def852b6f18293ae6d AUX polarssl-1.3.4-zlib.patch 350 SHA256 8eb271667727d170a4bb040ef01681708f436f69a23ee505b196a8251f8948e7 SHA512 8a94aff7f257deea3c45cc901ed6793415d344330e8cd3c817a939958e23acdd0b279d734dd558e53244612923a23690509231eec2ecfe709f47956da3ef6794 WHIRLPOOL c06c357aafbb3f7e4f4c997b5031e5f2ae222ec4f28addcb8e434fff3f35392f22b2efc969fc5ea1551d6d61967c895f927a4122e4590e2bbd37bda84c342b35 +AUX polarssl-1.3.8-ssl_pthread_server.patch 1418 SHA256 8671492325e42b475685520d93be62f277f5ea7da34a840f1bf931440971ec92 SHA512 a5dd825e21348e4a3a3a76efabc8d7bcfe137fa9156208790b0706cfb990e199d909e0fde1c825b0098a34040eb349d84065fe2634440d5b4ae235fe5a919a79 WHIRLPOOL 135cf633716489c5e822d6705d836394eec5332a4e762d9c65c695c6e37e4fa995f831f89307f96a5d169f0242c7865a5f083913504ad8641200749aae544bc2 DIST polarssl-1.3.4-gpl.tgz 1242488 SHA256 faed0c813ea4e6abeaffe9a56e65db3d3b191b5aa76b86d5bf1e09e1a1a9ea7e SHA512 5e4e0f06bea38d9384eb897c405e68d12bf810b1308194e7589db2e77d0532305fabfdf65d33c201a9d7ee6abaaef6c49b144aa5e23f7f64ffef46dd86e4b7a1 WHIRLPOOL 54de1d3399b5d8ee4f0d832706328f8e3ddea39d47d0fcfa0d451a1a5414e7c30184fcaf8eed6bb1eb3597813663969d2610187992191285c9812c126dc6360d DIST polarssl-1.3.5-gpl.tgz 1569674 SHA256 158e8e9d0f7c1297296f78e913c6634aa221a4fbab684e7441828c8d5f58c07a SHA512 92238b92266100b300783d6e36e0b8baa312f8ad5d46e582c3bed6edf5ad7f92bdfaf1362d0955118f5b6873ae2133b53da3c9ba039b9a7c5ea76344203dd87a WHIRLPOOL 14568508359b6f43fe80b968ffe75bbde16645d02c4b22b5a7f44bb8ed4e63c7350ae519aae22016211c61e3a8697d70c97b2e439a789378cb7f1dcb76a017e6 DIST polarssl-1.3.6-gpl.tgz 1596728 SHA256 b97965c1a052df41201d35e01f91c4ac0bf28e443a56ddf461be63b20c85ae09 SHA512 632bf6132e37cf5da4568ea151a9f830dfdfb01dd9ceccd4e3fe78ab48f8784d9632e2983d7620016ca0285059d51bc756c51e3f62046b5b51b0c55a18bb237d WHIRLPOOL 80654bf46e72ebe0ba79cd76a189f9cd8458149ccd3e0c99fc33bb6b96f7ae65eea2350f3a10b5407b58d6a49f06cc4ccbbaa03f92c9a3b4463171f19e8d5ea4 DIST polarssl-1.3.7-gpl.tgz 1610166 SHA256 6beef0281160bf07fefefd6b412dd1ce4c39261cf5300835aef442253f0400e5 SHA512 67147f52157c2f1e7c7ee058bb9c0451af83d0b876b7751514d73129d4b1c06968c57f79fbd28cc071ddaa76f59e9298b88046060fb99a9fe0c67d245cfcfa8a WHIRLPOOL 5ba942de286635bdc12ba576bc37d83b48fd642bcc327658abdd2cba3fa9b607a21680873a68de7e66f276aa883a1a12a2098a4d237678a8469845cd3f630e69 +DIST polarssl-1.3.8-gpl.tgz 1725531 SHA256 318171db41335cacbb5b0047c94f1faf91442ab70a223b5223436703c9406ff1 SHA512 e1bf2b111510582ebf071b11d9d0663fbd02ac61f6ded9611e2f0eb5ff64b421d72768dd94ec5e52353d3bde06bc62d673211c26debab2cd7b3c86108d2de627 WHIRLPOOL ac482015949417b44b8d2800acdf042d8cfd217e3ab8d9aef17f3ef2f3bee8802f7413fd48d613bb1b61cbb13c0a3a71ad1f6a8de98a026de6730f9d2d74f126 EBUILD polarssl-1.3.4.ebuild 2489 SHA256 fb37525c7854f9006f8f227429dc8b1402a1f5f1ec3cb8ab7b4630a578ff0859 SHA512 dd77258b4235bddcabc2b6fd9d3241e62b1432e2103db39ce1c6ddc1cbcdab621e6c94ba25f22af9c8d27f6526457625f2cdf63e398b85e67fd881257071efcb WHIRLPOOL 50f2d8838382da861941dad05d3e883b4000f85e1f8b776b03b9a148a74119192f0107dfa610166e40fe03285e127f6bb1ca78c583d021667e9144808fbe1047 EBUILD polarssl-1.3.5.ebuild 2220 SHA256 4c1c45f92cfd1442684424240bb67f4c1ff9640ad607777bc69ddf1bf8296c3d SHA512 ab7d827adef2d1d8d3ec76427fb77a9acc0087f7e70cee28225423c93b9591878a2ad863dcace574677bdf71d77d71f5915348d3feb37e6d39078356c1ccc0bf WHIRLPOOL ce6492d4396d99a974913ba4436d659b88512f86c80155034548f95625ce16b8efc11f9f2b3a902dd570eeb53f287f9241b6e542a57d2ac1c5b13af7527590b0 EBUILD polarssl-1.3.6.ebuild 2204 SHA256 1e977fda5457c0dfe30a474f02d5eb13123958c88ab2cb5cf7b7ac654ebdcd6a SHA512 414cd4167b8b106ce7970e762619e31de99812decf63e3b141f0eeefd6fedf7b62de22e593b6ce895b923967370dc94b84d5613ccaf4ef413d5eb93f274984c4 WHIRLPOOL 0b18bd70ee8e6a9d4b9e7892a9369a8920243330830c51ec82d1eea94a30d6bf1bbb54249d81ee7e12866d37f252b3b3f6b7bb808fc9c441816fef48f86a4ee8 EBUILD polarssl-1.3.7-r1.ebuild 2452 SHA256 516401902dddf778075e62c2d608171bb0a5beb5f2658a2f9a7b82c05381dcad SHA512 c0a786f23c86b1329803093feed1ee1829b46aa50aa0b379c490bac74f5e336073709cd9551c248eb308811d8a03e1a6595f89a218f25a24a9aa38d0e8e13a9e WHIRLPOOL a49e16f2237cc91a73707d02873eb2a6c5a5d1bca97f825a356855654d378eef8e12778cd5200c8e07c5047d7825f87f26390f9bff858db254c87e457b7afb9f EBUILD polarssl-1.3.7.ebuild 2313 SHA256 b3a6eba875085107588d66bd84a3de2e270da883d8584f7eb30cb45f759dd1cb SHA512 4f32016f2e8e38bdd2963dfd0a67c7e3e54ecf23508c591627398aab18dbec59c4d83219df8ee778fb8deec766ffc4dc4d314369a21eed1c517a75c888f9c4e1 WHIRLPOOL d8276c93183bd3b8f4448e3e80ca3e6267ff81b87cb9d3ab5287c566addd83ac2479363630b5c5bce8126d04ec2eabc2cdd864945048e81dd2979b54bf995fa7 -MISC ChangeLog 10650 SHA256 5484a189ce58f3b01c8e7ff4ac6b6730f333a8626a2a32d2629b978f33e8e53f SHA512 09bd07ab16ff8ded81ff4042b2af478fddc415f10a8b10326234bdc06fd45840b3d48fddddb6f6a76bef9afe182cfa91b9ac171f5cd356c0c3af4b2b71b13b17 WHIRLPOOL 641c5e21c227f4e503dfa8ecb910f223fd015024e48544b038b9700728e7e834d3a6f8a552735cd72e2d8e6f927b44917a104f492276c88c69b349028692d22d +EBUILD polarssl-1.3.8.ebuild 2521 SHA256 6257c7f6166bdcafca1fdc29091bac85a0faa0264fe931a794167231ef80943f SHA512 2c1d8fdcd5971ef54daed0b73c751d61d8bbf1b1aad0ce98ec38b3560247fc0e2f0c9c9ecbbc1e354a8b9801a75c6b1efb555358cb548104291e23bc9886793e WHIRLPOOL 90e93a10421e9be1cdf9188496157118318312a0709665b2f66304414d83cc7564cd7af42be7ba1a19b69950ff0240018901f9f0c0bc2f8c7873a89f1f8ec891 +MISC ChangeLog 10822 SHA256 9643a55bae9c899723a017cc16326f87f433d1ae865c8cb2ca2eb8f379151a88 SHA512 ca8c79e3cc5dd73430404e90aff1d967139e2571de4a77bba5a458f84794cadcbc292aec950c5623f3550c1375e4241bd1d3fb2d974b3a300e685438ee83ed15 WHIRLPOOL bd5473f3f206dd3dd87b24ee8c8b49bb77b054bb567d2c1a1641f67e73c06204ab816b758117518448a9edf3672a0c92ce429a84496e8448ac920ab1dc1f3238 MISC metadata.xml 685 SHA256 0105b478e4b38b5acabf7452fe926df41ef48967f04b26cf9c7aacab38ae1f9c SHA512 4f8bfd590668543b57ad54358e37ce1fda2186f38fea31caa85bdc67e4911f29ba473292cb91ddca2d0342c52caf1b68861483168b31c0617fcc4ecc090b107a WHIRLPOOL e687881ad644fb52492cc4ec6649be93cf61bee444b85cb97a18faeedc12cf43a5d5de209b94aebbc6476e6eb2b7d8dabf462f0ac1f2b176bcff01d756581225 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) -iQJ8BAEBCABmBQJTv99GXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCABmBQJTwHisXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzMDlCNDQ4NjEyNDI4NjA5REVEMDI3MzIy -MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgFcUQALrbw0R6cAdn0yVDaPBRaZHM -8OKMGmZBa2wiO8iPO3MdHkWaCcdBhiS7NCITwfThy1/0NEqvIB8pZVUenoO5zurA -Lkn8gNx9KKooI40ph0ijWfUvb5+qp/vxUgbg+oCKnAnWBC06Pw3bboWqEmWHWDsk -lul7aREEr1xYkvanqYipJL/eTwcDZUqDQidyBNPRLhdcWmC+foYwxIGRdmtThgwJ -D6eUQB/73E2y03CMfQCN4Ukox9DoutZYE8+GxdKvkeBCo0Es9Dnytez34ZuMtv7F -qjr8OYDweDaMORonATBR81gU7lC68xdifQwg/nlC21Z1nHiZ6Kly9zmeSIOQyP9d -T5gaJqdRQUyhv5B7YvWLFvbiebt6vz5qm88gnXzwZBlVx7EBLd5RC80eUddvO5tt -/fm7coHR1H7yYf+BRT2HqlWTgJGhLWAwDQAQJfvhISmClGePeNLb8jwXddmmyAjW -NHHyhQyF6C+d0VLLPdCdG/UxtLsgewJQjM+bkdlgiIxelAk3cg1HTzK3SwoCvjnP -ypMnkTWWkeOwMPkZhyEqQpovbaFHG5Rzh9SAI2WodjNy6qSBb8Xkck5XQM2d/nGQ -XW64zHslmgzwJI5EAxqq5Fy4pbj3AP7+fYC7q7gZNSjgtJ6/aKdsBFHOulAMeW2A -DaMY3PxfTasuSnioetYm -=85V0 +MjBDRDFDNUJERUVEMDIwAAoJECIM0cW97tAgbbAQAK4xZ1NV9aHda4ofdbmhpuuP +2bayEE0EtwNCP70uP5e0dtQ/JgpG8MQ5ljKst2GoNOMZknIEOkVeNHynAuHUhVOJ +ANtDdHU9kMlyZHX9JpBrTWGZyVpIEtlvQXMbsz66BtLv/lodowJ1or2VGhWTWyfq ++Fw++B0BlP8NS+gWfLi+rNGqL/erXIc4VE1XTLkfGpPuQLGWlLkbL09CAUvI4R4S +k8yF7S6eajnuOCVrSecUi2auzehmDzJozat/71/TmszLuV9IrI6qg7UAp+cz7FSH +nzDNWaFchKp4xXavi26CXxe8qNksLlyeeBMHYGvBiohr7TnRYLGvk6sqDUrtxudm +ywsOZL974B9eMRgDT5HGa8WOWoDZbegCJdHSj4dsSTDbXAB0TwJo3GnEvdznGgXA +LQ1vWsMu+Xm5FDtcXpfiBGQ2vb6LYVDmpsXdwhGAYP7Hy4cf5x78UJroyiexidg2 +vqk31/fw/RFubAzNUOgRkDtdgU6UGJvsFw+akmS0l4aL0P8FWKxAWIit6OKrMgtN +gh/SCKuMIKZIYn40qnzXCQuPTt8w0U6VPgy+awsKumSu4kqvkn/M5e4/Zi5Sa7Y5 +dytJfwHGAs4GRXq71xQgLbElOAgSumWV6gjU89lZeSvnORDFE000AbK7HB/dYmK+ +FwUYQWnbd8MfJRKGrB6S +=yCio -----END PGP SIGNATURE----- diff --git a/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch b/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch new file mode 100644 index 000000000000..0c6ca92773e0 --- /dev/null +++ b/net-libs/polarssl/files/polarssl-1.3.8-ssl_pthread_server.patch @@ -0,0 +1,40 @@ +diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c +index cc6ad89..019e4e8 100644 +--- a/programs/ssl/ssl_pthread_server.c ++++ b/programs/ssl/ssl_pthread_server.c +@@ -129,6 +129,10 @@ static void *handle_ssl_connection( void *data ) + ssl_context ssl; + ctr_drbg_context ctr_drbg; + ++ /* Make sure memory references are valid */ ++ memset( &ssl, 0, sizeof( ssl_context ) ); ++ memset( &ctr_drbg, 0, sizeof( ctr_drbg_context ) ); ++ + snprintf( pers, sizeof(pers), "SSL Pthread Thread %d", thread_id ); + printf( " [ #%d ] Client FD %d\n", thread_id, client_fd ); + printf( " [ #%d ] Seeding the random number generator...\n", thread_id ); +@@ -176,7 +180,7 @@ static void *handle_ssl_connection( void *data ) + if( ( ret = ssl_set_own_cert( &ssl, thread_info->server_cert, thread_info->server_key ) ) != 0 ) + { + printf( " failed\n ! ssl_set_own_cert returned %d\n\n", ret ); +- goto exit; ++ goto thread_exit; + } + + printf( " [ #%d ] ok\n", thread_id ); +@@ -308,6 +312,7 @@ thread_exit: + #endif + + net_close( client_fd ); ++ ctr_drbg_free( &ctr_drbg ); + ssl_free( &ssl ); + + thread_info->thread_complete = 1; +@@ -492,7 +497,6 @@ exit: + #if defined(POLARSSL_SSL_CACHE_C) + ssl_cache_free( &cache ); + #endif +- ctr_drbg_free( &ctr_drbg ); + entropy_free( &entropy ); + + polarssl_mutex_free( &debug_mutex ); diff --git a/net-libs/polarssl/polarssl-1.3.8.ebuild b/net-libs/polarssl/polarssl-1.3.8.ebuild new file mode 100644 index 000000000000..872fa21d422c --- /dev/null +++ b/net-libs/polarssl/polarssl-1.3.8.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-libs/polarssl/polarssl-1.3.8.ebuild,v 1.1 2014/07/11 23:52:07 hasufell Exp $ + +EAPI=5 + +inherit eutils multilib cmake-utils multilib-minimal + +DESCRIPTION="Cryptographic library for embedded systems" +HOMEPAGE="http://polarssl.org/" +SRC_URI="http://polarssl.org/download/${P}-gpl.tgz" + +LICENSE="GPL-2" +SLOT="0/7" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="doc havege programs sse2 static-libs test threads zlib" + +RDEPEND=" + programs? ( dev-libs/openssl:0 ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen media-gfx/graphviz ) + test? ( dev-lang/perl )" + +enable_polarssl_option() { + local myopt="$@" + # check that config.h syntax is the same at version bump + sed -i \ + -e "s://#define ${myopt}:#define ${myopt}:" \ + include/polarssl/config.h || die +} + +src_prepare() { + use sse2 && enable_polarssl_option POLARSSL_HAVE_SSE2 + use zlib && enable_polarssl_option POLARSSL_ZLIB_SUPPORT + use havege && enable_polarssl_option POLARSSL_HAVEGE_C + use threads && enable_polarssl_option POLARSSL_THREADING_C + use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD + + epatch "${FILESDIR}"/${P}-ssl_pthread_server.patch +} + +multilib_src_configure() { + local mycmakeargs=( + $(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \ + || echo -DENABLE_PROGRAMS=OFF) + $(cmake-utils_use_enable zlib ZLIB_SUPPORT) + $(cmake-utils_use_use static-libs STATIC_POLARSSL_LIBRARY) + $(cmake-utils_use_enable test TESTING) + -DUSE_SHARED_POLARSSL_LIBRARY=ON + -DINSTALL_POLARSSL_HEADERS=ON + -DLIB_INSTALL_DIR="/usr/$(get_libdir)" + ) + + cmake-utils_src_configure +} + +multilib_src_compile() { + cmake-utils_src_compile + use doc && multilib_is_native_abi && emake apidoc +} + +multilib_src_test() { + LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \ + cmake-utils_src_test +} + +multilib_src_install() { + cmake-utils_src_install +} + +multilib_src_install_all() { + einstalldocs + + use doc && dohtml -r apidoc + + if use programs ; then + # avoid file collisions with sys-apps/coreutils + local p e + for p in "${ED%/}"/usr/bin/* ; do + if [[ -x "${p}" && ! -d "${p}" ]] ; then + mv "${p}" "${ED%/}"/usr/bin/polarssl_${p##*/} || die + fi + done + for e in aes hash pkey ssl test ; do + docinto "${e}" + dodoc programs/"${e}"/*.c + dodoc programs/"${e}"/*.txt + done + fi +} |