From 9168198c19ba786ff605c41ebb800ee7127c4ccb Mon Sep 17 00:00:00 2001 From: Lars Wendler Date: Thu, 15 Jan 2015 20:30:25 +0000 Subject: [PATCH] Version bump. Removed old Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x981CA6FC --- dev-libs/openssl/ChangeLog | 11 +- dev-libs/openssl/Manifest | 36 +-- dev-libs/openssl/openssl-0.9.8z_p5.ebuild | 159 +++++++++++ ...sl-1.0.0p.ebuild => openssl-1.0.0q.ebuild} | 2 +- dev-libs/openssl/openssl-1.0.1l.ebuild | 258 ++++++++++++++++++ 5 files changed, 448 insertions(+), 18 deletions(-) create mode 100644 dev-libs/openssl/openssl-0.9.8z_p5.ebuild rename dev-libs/openssl/{openssl-1.0.0p.ebuild => openssl-1.0.0q.ebuild} (99%) create mode 100644 dev-libs/openssl/openssl-1.0.1l.ebuild diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog index 90029c7a223e..0abca63dd663 100644 --- a/dev-libs/openssl/ChangeLog +++ b/dev-libs/openssl/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-libs/openssl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.623 2015/01/14 13:50:53 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.624 2015/01/15 20:30:22 polynomial-c Exp $ + +*openssl-1.0.1l (15 Jan 2015) +*openssl-1.0.0q (15 Jan 2015) +*openssl-0.9.8z_p5 (15 Jan 2015) + + 15 Jan 2015; Lars Wendler + +openssl-0.9.8z_p5.ebuild, -openssl-1.0.0p.ebuild, +openssl-1.0.0q.ebuild, + +openssl-1.0.1l.ebuild: + Version bump. Removed old. 14 Jan 2015; Agostino Sarubbo openssl-1.0.1k.ebuild: Stable for ppc64, wrt bug #536042 diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 81513c389ad3..381e48bc28bf 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -23,35 +23,39 @@ DIST openssl-0.9.8za.tar.gz 3787508 SHA256 cdcb98d0fbc026ca798b17919334310271d3a DIST openssl-0.9.8zb.tar.gz 3727934 SHA256 950e2298237de1697168debd42860bf41ead618e0c03dc9a3a56e23258e435be SHA512 b563a7d9c7ae602aefb3ba8e5cd54d0460c805b7a4ef0b1b369907d6447f5b1977ebb1e261d37254a487d74d56f40bf825e2a279c6ae56ffcc9b7fd785dc7dbd WHIRLPOOL 60aeeb8171222d358c26361494c2d06f3cc6d66a385f3fcd58005e1220c3819add0e952cd4add16457191d8317b11efcdb7f6ae4696880d21a77c95df2c56a6a DIST openssl-0.9.8zc.tar.gz 3735406 SHA256 461cc694f29e72f59c22e7ea61bf44671a5fc2f8b3fc2eeac89714b7be915881 SHA512 e4a68857b509bbaa5c66bf43491541e309e37f136816a1380664488420805edc74dc7f94c6318e34e077b29d53d060f971ba69b9efcfa0da9605934b2be45ef4 WHIRLPOOL 5fef377db08b93dc67cda509beb7c366af10cca3dfab3ce9e9f89798169984691ddec784a02bc839e190ddc08641d337f3adf6b0ced3ed796a5ed4f247805e90 DIST openssl-0.9.8zd.tar.gz 3737538 SHA256 59266dcfb0be0fbe6181edead044ac3edaf83bc58991f264dcf532b01d531ee3 SHA512 97c1dd58d57ebe76aa4d5aa4a31ad62660401c4dd5283276148a95de78a6f7c9547c14559cc3be2563af15b7b69eba35418496de6b39fa030fe055596758fb41 WHIRLPOOL 48bfda1d8f2c7919a95e59fa5a470ad4e19e82018818c7a1d84f86922ba626d01479777a6675113fa7038183dae089245ca0134a6fcc7303265ad4d4e0efc36b -DIST openssl-1.0.0p.tar.gz 4008663 SHA256 b745d11f19531620a2e7402167d54845d253f2da3e523c2d0950595aef104fc8 SHA512 0f9fc847160b4139f778cf64eaf7ad3220710f86dab9812cdade04638f236e069059b05caff47880b40db7bba8fedb3d7e944abff081f78f164c78fbab048953 WHIRLPOOL 6d0cadef7f4f9657cf55f12d76139a82ae9b854d4cbfa0c749708d09e6022a1299e0368c2713a0120b32e15c879be63557ee515747abcfcac71773cd34add067 +DIST openssl-0.9.8ze.tar.gz 3734873 SHA256 ee3da602826e975b47e4d7af8a27be8258c160876194898c58881eab814b55b8 SHA512 6ab08065ab2cdf6699e462e2a082e6d4c21f027383e12d4dd1d0dce2a4073ae52230494215b3fe24b8a8d73f5f5dd3a1fe53c66acd8db6e162e4bf3636e229c3 WHIRLPOOL 8a5de0aed7b48007b3b8092726c9c8eb6771c49d388baaff4d7ba3591be0b1856cb17842db5bc608994b38f5d87a8b07a441c874523e577b786a4612bba7789f +DIST openssl-1.0.0q.tar.gz 4004090 SHA256 230dc19ea33b87836c388c1117a71f8eb539cbf8be41d93c3b6c8a6ae29dec39 SHA512 4a28d2901af07dc41831e2606b362207c446590ef60571926b2778b5f164dae390dc02c18afc9fc84b77363bf6e8b317a815f0ec329196eb007fb7c5684acd0f WHIRLPOOL 0758b2665058a4a7985546ad8dd3ba4e9a4a11b9f0b7d4950b5f5e64a9b13bbc6fd34e7454ff094cbafc646018a99234f0252332408fe2a079ef08b4a91740d9 DIST openssl-1.0.1j.tar.gz 4432964 SHA256 1b60ca8789ba6f03e8ef20da2293b8dc131c39d83814e775069f02d26354edf3 SHA512 a786bb99b68d88c1de79d3c5372767f091ebeefb5abc1d4883253fd3ab5a86af53389f5ff36fdd8faa27c5fb78be8bbff406392c373358697da80d250eadebb8 WHIRLPOOL 467aa3b02d04837e3281670401985e492d15b561c03b97246e3c8e61b0d3b1927332e3a226de4ed5bd02265a04fb31ce84c3501f4af9685633d00a9b43c56978 DIST openssl-1.0.1k.tar.gz 4434910 SHA256 8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c SHA512 8b000fbd1bf919d9913a314f99aedd48a69f6caa4ccf43237889e73e08cbe0d82bfc27e9c7c4cade09fc459f91d6c4a831a9b3fc8bca0344fb864eadd7d1e8e8 WHIRLPOOL 5236a966d610c971e473cfc30e5412a72eef116fd259ada9c50da08bcd4ca967f80bb19babf530b4e5b9f1f24e9275e00391eb2e12a26d4544f593e2b4ba20b8 +DIST openssl-1.0.1l.tar.gz 4429979 SHA256 b2cf4d48fe5d49f240c61c9e624193a6f232b5ed0baf010681e725963c40d1d4 SHA512 27fe42f33815a3aafff75f2b9a5604c328fe5945c5cecaca74e5d2c2a1e066d64ddcc1fdb14b54fc7523cc730ab8a57d7d56b2879c289e86673f91fee0cca65e WHIRLPOOL 79f5698585c68ba647fcdfc4b342a43d06d69230658ca1bc265dd10d8da939c3e27b9a4125bd2adfbf50002b1dddef18be086dfc23a5050e69fb77350131909f DIST openssl-1.0.2-beta3.tar.gz 5149260 SHA256 264d2d5114d3da3c0e1712312ad0c77bd41757f1cc12f543250063d1e57259e6 SHA512 d18ce87429d0addba11a02d121affd16ec63237a97474167ae1ed914dbc5d284b090d72443b0bfed1e0ad165a37655dd96d3be87053b792a871515e819ccfa72 WHIRLPOOL 26bbce30122106cb5f36d426fb1f50c0bca952caf6d7224e17a6252a5731e3b4ec9da1a96553f152631e7b0243332d3c0f7c8bc2e512b64f3a126955d4355a53 DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1 EBUILD openssl-0.9.8z_p1-r2.ebuild 4538 SHA256 f66c582eae2dd464bd42393c675d1452a7693681af7d479d346cd5e896fca697 SHA512 fd93cb629f8853964922547a8e8ff04f840eeedeacdd266e8bb75b96d12853c83a325ee45058a3f07265c1ac143f2be73616677465e1eeea95bde57d62093223 WHIRLPOOL b3b42ae1ef384ef220a5503d302674608578bd015b7041f33b782aa3cb79d69e35d51fb4f1b38d499187864fae755cf09fe7b71e81ebf86829e72f8f7e45f86c EBUILD openssl-0.9.8z_p2.ebuild 4981 SHA256 2e5abcc57ef84f093dfea05047746af19b364a885c72febf2d82e9b7fedac6e3 SHA512 fcf9fe7e968c89e74c905a5d21b75cbee92157cde55cfd7b345c37a26cf0c4e632c4883276bcc7fe6053e9c1eedb08d462034f8742f32964920a24ae498137f5 WHIRLPOOL 1d4e415755a4f6cb5f531c0e043b5aa3ffccc6f3b0e42e29708335dbcbee8f79076cb6602e190cefa649e2a1213fd8735935711fedfd29deee2c5f70985c4d97 EBUILD openssl-0.9.8z_p3.ebuild 4989 SHA256 c9aa34c65343bbcfb7036186dff3a88015075afc5b4fe6c1c5cc2d103b76db64 SHA512 98699bb16870c53790b670f71e74dac94d2aeb4bc766e217872b2d79e007c52d7e25bcc86ea2f63fe3761a7a3a70d81bf288597fbc07e2b6c5b04d34bfec1a1e WHIRLPOOL 92c304ecf1f27edece67b4711429a94263bb82cc53c6e22425ade7e6f35129a1f80994892435deccbc7ea95cfe20a705b46362f5db950d123c1f3ab42c8a69bd EBUILD openssl-0.9.8z_p4.ebuild 4989 SHA256 4ad367a1769c444efbf61c5c4da2f3e048e8e2b58d7040ae3a84cfb16a525eef SHA512 551e6ca5de599f1cbdb9e1523ec937dd8502d4cefc7af6614a6f1e891ba43acb418467bd9b2690ea885db9d4bf08a40a26189e09f532845c63140424eb54c4ce WHIRLPOOL 65ccc1f15ce80510ac15e8edb36089d65a69b82c1d0f7ae6c90ded0e2313e04484bb4d7a0483cb481b207d459990ef7c1b962dd3616c00b6cbf72164131b0423 -EBUILD openssl-1.0.0p.ebuild 7053 SHA256 9b9256cacd42ec7f7c454c985b759c3dc38cfa677c30626aff2952788532fd69 SHA512 58657ce4aa34f7efc7f6a97f50ae3e282c6a61cdfc87372eebc570e766fa2979752692e4cdff521fef66f0eaa13364b1424559793cba07e3e29eb3387cf7faca WHIRLPOOL 27cf19bd2a79c0742f3ec9592a1b1b14fef15695c4bba15e46399dc55ee869feacc1f611a5ecbccccfa5b66067caf2b60d40ce6d02af8750cb8fda4752574080 +EBUILD openssl-0.9.8z_p5.ebuild 4999 SHA256 27422fdd79368636b163fd96677dfcfed074e047f631b601a8fb5487fa7a26be SHA512 139473d425b70d1babe21ef13e37ed63fb4510e3d5127eddcbb5d7b609d142b7325ce4d6af2766c3ef37659bb574aa1e1efab0fc949b57b4f383436bd5f99c42 WHIRLPOOL a7bbcece0fb70c6629feee25cd98d3a85966c1bc27fa45a4a480b0c1be19cb461999701fdf927eda9006b20470734f536e4616e6cb47180fad1b97bfc4c9ac0f +EBUILD openssl-1.0.0q.ebuild 7053 SHA256 88a36b82d5ab5b248435fbbf6b9c9e2ac4c3d1a1d23f426b20523d043c040c1e SHA512 c5e40b91686de034f551dda4a1d790c467c07ed54d84e18acde22b4e7262726dc281abffdcfa5d362e90770ecc423510cb7831ea6176ccd0e5cfb4039633bcb4 WHIRLPOOL 89e3c88497b7e330b665fa0f4fa3ae8ee3b33aabfe8b101b31a187ce4f90ba604131ef1e078f3cfd2b8ace4670bca3ccc3494d9d7996f57776cf82f6cfbc6c34 EBUILD openssl-1.0.1j.ebuild 8753 SHA256 d8d6837da8e3e74531d752a181836087d214de18ce57ca985317badb1e4a8b97 SHA512 02a154b3aeb6ec4e51f872ae811c83ed27c0caac2ca25450f1ec54b4ce82367042e09600ddfc9e4fd4bcd439e24c8a5a0d787f74ba0d148e0d6fe44e0d6eb6d2 WHIRLPOOL b36cdf732b11cb9d36b4a328d67d000a99c3ab50a9372937e988734e705787ec2f68c195dfed1047df8b746abf6de6ea0a8961401c309af141531847a3e9eb9c EBUILD openssl-1.0.1k.ebuild 8754 SHA256 a89762b7e83cecc5f61eec494bb76febfc931258e4450adadb691f9ad9d4a993 SHA512 03b22134748f6cf9837cca004d999d2399ecc096ea06757335926e0451d9289069cd2a88b1d1fc702db66ae89199a591e5e7bd664115fea0523820f9a5801f35 WHIRLPOOL 7cf8ec01d09db9f3479c55c2191c1c30a53b1a577fef6a32a8f83c2db9a4f7716bf8aa9350cce4eacd3820c6476ad8a5a22b955d1390b5e38e44d03c37e87445 +EBUILD openssl-1.0.1l.ebuild 8771 SHA256 7c16b419102480fecd2482374e2503a6726e5e37b9eb187a2ce5b498bea531e5 SHA512 d1eb045844db5e13f177bf7f5977e90e2b6dd412185276b16aab271d8b051e1019d06a48a1f7f7fe09ebb7ba6a7fb72e3648f79bcf34675dbb0673c223e22787 WHIRLPOOL 8d213d74d57fb8394e34128ad3a0bb8f40de216d867a5dd83d5baa5caf486ac77e0145bdce98b3aae8802b86b260180efaf491b86c770bd25075ae518ab4859a EBUILD openssl-1.0.2_beta3.ebuild 8651 SHA256 f0a4eece15dd48460b0a3e7fcb2bdadd087d049ec0f5ff67194e4ce78dffa540 SHA512 a6c915f4c03d638470c8edb8f57a09b01d9709feb09c65a8fc4562088f28f94898946dcbbe800b4ecd8a523a100ac7e90a7003163c9159ef1c188711f7f36ce0 WHIRLPOOL 3624424fe3435d492035964b8c7bce134bce13b27cd3e508673aefe31477b42231cd3957e6bf0236ca2352a39e236db5939b4ece2709eecbafb2881117637b73 -MISC ChangeLog 95016 SHA256 2121c11343f7991261d54cfd8f9a55be6c8a781a5cadfb603ae84d260ae32d59 SHA512 a3ba0a244409de01a0ba9d3faad9449a935515daa9ec213ba8db94bf564d0102b21d26365c3fe89017a1369861c0e4cc3696d85edd017c449a218418260a82c7 WHIRLPOOL 7d04f9bf6646d971392fc7ebdb57279d26e1287b3b19a7b6a6c75f2be0defd75e73443b40b601b762658353073c5efc6b6b51d5811c15a9065887eaa369c0ca7 +MISC ChangeLog 95306 SHA256 a34ba63196ee0bfe71a42a23fca7b853dfbe9e348955311180b4e17335d51e88 SHA512 c6091572f8d37352f54ca3381b1ed41c1500f55ba2257eca13327730c6bbc45acc8c1c562e0bc329376e37c39c14ed6973a9fda6c15e975b9bdba744e9d40258 WHIRLPOOL f54e588c98557e16f9115a8848d3d08bc9bbed309a159c7d9acca833e55d542740db3e96e235e7a2a9bc4fddb4da10749837f86f14c4b7cebeada9e11308fef0 MISC metadata.xml 562 SHA256 5c61e2a07ffdb4ba157e0add7f84ff74458c890092d5e6980fd936dfdb457c34 SHA512 f83769af7ffd223923b72a62db27cbc80ca31925b95b720845b6bedd2a9b52837f70f9da93ee43e272ceb3c8424a8c9f35a31ebd5274bc04c91cd63ace1af844 WHIRLPOOL d98f2af2cf3e13c09ad526a2fe06fe8ef02e1db20fd4e3843f1793a97c9ae6a2897308c84038a9a37d6d68fadc7af6d913b980f4f079dac36ea3860a33aca8c2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUtnQ+AAoJELp701BxlEWfL6YQAMa6kSnzvtklUNUSgATr4lMW -P95Q9bNW8Lp3Kez/u7VCuBOLeDGp244NLbMwky+f12PjXyXexfGmZnVekP9Z+U5e -2QFAr2ULODZkcCwpDD2WZ5+fCFgqFGXWykHhXqBZLgGh7EC29xOIlary9W2S2cyV -6cVaf6MT1oWfgs23FZ2RzSI/TujsfK8cGFNu64fuRbkFCMpeLYdBZRPwn4mdlsAH -OfK4dO/X4VcUUGOZQI5T+EQfqag2qHQ2BKt6RysT/e6uqhEjT6EOL1EbgQB30cxI -Jfib7oa9ukMAVUgS1iI6h0MsjMW945L4lrR/VgG2VCCSUTXUBaIRdb5dLyconn6i -ZC3qFPsup2d7XBZzOv5cjtrmlOGDC4MMIwH6feHX2qqnVk/GXtNV/kXTiNIGqac+ -0gq4W4sZvAKceIyKOUNf1NzNlLr/410i7NU8/A5o46aSrFQfiMF4O+4Z84zTglxB -UjdvO/sFyRcc72ZzXOGpvXiFERX45s85PxCbIA1/etSb9z8iK0NykxbXJZjV8kqE -3qt6Gmyh3Qw99L1TOjBDdwEEsVmmjy7u4a52CFFT2vcN+pSbQBgCC4QDnN7Y5+PA -mKqCeN9bFtH1yrywOF+rAu8cAogIc+elwGJnCZ2lZgqVmUWrjnK2p8ccA04oS6Ml -p14+moLHM6Xv9f4xPW/J -=N++A +iQIcBAEBCAAGBQJUuCNgAAoJEPiazRVxLXTFrwAQALyeYR/sRvV+qtUbyShgf2Re +Tso+bPjDFyx9EGvkXCjwwnJftgatE/WG5twFhCCya/bTT2mmRj4tjV6h2kBClG2S +IUoV9MqVspcL+GAwB8YBS3tMO+bsiuzKKuAo3SHFoX1i0+4yUO6x6c/yqG0VGlsq +huGSiLcq+LnBhBNr3EtwXBBnEevnrj7y55qTBMqzE4LPrr2aCbXGBz47WTdisuY8 +YRQFInh5X1xuD8Dmu4VBDbTPOHhEeoTr9/Y9Vu8WiiQjsgv1kl9Ff6cQvmLNzHif +V9To4QgCv7zQbVYx/6ZX4MXDQj7Cq7h5CK94p5V61BbrOLXFBzL4F2ISnqEafAyz +mah6c0FL0POTao3iE6RSXLLUX/yjxHNRk8QyU7Ogeeqo0Y5DiZmxzHcIqBTJHiQl ++dMhiePLbgEBN7oZF4D49qLrWaQNp8IM16peI5rW39QLRiyhXc5+17s/mgQ/5JVi +if7DNSRrpoEV7vawwrm0fxFnb4+k3RtU2FjcKLTbDNJY6s7HG82gli3Yq9OvqaLA +ESJFisCMnqvX6f5Tmp2bDyxs1aCqvU3fVa6xUg1HHOhu9tRfVl6wgF1oOdfCZvSA +YQ4uSZQfO9Xcdjts4ysI18wr6Q+a2rlVIxbNquFFZKBUr5NKMKyo53FPw/oBmshR +G4pBQqzj/s01R3h0n3s4 +=YiY5 -----END PGP SIGNATURE----- diff --git a/dev-libs/openssl/openssl-0.9.8z_p5.ebuild b/dev-libs/openssl/openssl-0.9.8z_p5.ebuild new file mode 100644 index 000000000000..2278d9370e46 --- /dev/null +++ b/dev-libs/openssl/openssl-0.9.8z_p5.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.8z_p5.ebuild,v 1.1 2015/01/15 20:30:22 polynomial-c Exp $ + +# this ebuild is only for the libcrypto.so.0.9.8 and libssl.so.0.9.8 SONAME for ABI compat + +EAPI="5" + +inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal + +PLEVEL=$(echo "${PV##*_p}" | tr '[1-9]' '[a-i]') +MY_PV=${PV/_p*/${PLEVEL}} +MY_P=${PN}-${MY_PV} +S="${WORKDIR}/${MY_P}" +DESCRIPTION="Toolkit for SSL v2/v3 and TLS v1" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" + +LICENSE="openssl" +SLOT="0.9.8" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd" +IUSE="bindist gmp kerberos sse2 test zlib" + +RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140508-r4 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) + !=dev-libs/openssl-0.9.8*:0" +DEPEND="${RDEPEND} + sys-apps/diffutils + >=dev-lang/perl-5 + test? ( sys-devel/bc )" + +# Do not install any docs +DOCS=() + +src_prepare() { + epatch "${FILESDIR}"/${PN}-0.9.8e-bsd-sparc64.patch + epatch "${FILESDIR}"/${PN}-0.9.8h-ldflags.patch #181438 + epatch "${FILESDIR}"/${PN}-0.9.8m-binutils.patch #289130 + + # disable fips in the build + # make sure the man pages are suffixed #302165 + # don't bother building man pages if they're disabled + sed -i \ + -e '/DIRS/s: fips : :g' \ + -e '/^MANSUFFIX/s:=.*:=ssl:' \ + -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ + -e $(has noman FEATURES \ + && echo '/^install:/s:install_docs::' \ + || echo '/^MANDIR=/s:=.*:=/usr/share/man:') \ + Makefile{,.org} \ + || die + # show the actual commands in the log + sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared + # update the enginedir path. + # punt broken config we don't care about as it fails sanity check. + sed -i \ + -e '/^"debug-ben-debug-64"/d' \ + -e "/foo.*engines/s|/lib/engines|/$(get_libdir)/engines|" \ + Configure || die + + # since we're forcing $(CC) as makedep anyway, just fix + # the conditional as always-on + # helps clang (#417795), and versioned gcc (#499818) + sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die + + # quiet out unknown driver argument warnings since openssl + # doesn't have well-split CFLAGS and we're making it even worse + # and 'make depend' uses -Werror for added fun (#417795 again) + [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments + + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-0.9.8 gentoo.config || die "cp cross-compile failed" + chmod a+rx gentoo.config + + append-flags -fno-strict-aliasing + append-flags -Wa,--noexecstack + + sed -i '1s,^:$,#!/usr/bin/perl,' Configure #141906 + sed -i '/^"debug-bodo/d' Configure # 0.9.8za shipped broken + ./config --test-sanity || die "I AM NOT SANE" + + multilib_copy_sources +} + +multilib_src_configure() { + unset APPS #197996 + unset SCRIPTS #312551 + + tc-export CC AR RANLIB + + # Clean out patent-or-otherwise-encumbered code + # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) + # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm + # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography + # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 + # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5 + + use_ssl() { use $1 && echo "enable-${2:-$1} ${*:3}" || echo "no-${2:-$1}" ; } + echoit() { echo "$@" ; "$@" ; } + + local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + echoit \ + ./${config} \ + ${sslout} \ + $(use sse2 || echo "no-sse2") \ + enable-camellia \ + $(use_ssl !bindist ec) \ + enable-idea \ + enable-mdc2 \ + $(use_ssl !bindist rc5) \ + enable-tlsext \ + $(use_ssl gmp gmp -lgmp) \ + $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ + $(use_ssl zlib) \ + --prefix=/usr \ + --openssldir=/etc/ssl \ + shared threads \ + || die "Configure failed" + + # Clean out hardcoded flags that openssl uses + local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ + -e 's:^CFLAG=::' \ + -e 's:-fomit-frame-pointer ::g' \ + -e 's:-O[0-9] ::g' \ + -e 's:-march=[-a-z0-9]* ::g' \ + -e 's:-mcpu=[-a-z0-9]* ::g' \ + -e 's:-m[a-z0-9]* ::g' \ + ) + sed -i \ + -e "/^LIBDIR=/s|=.*|=$(get_libdir)|" \ + -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ + -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ + Makefile || die +} + +multilib_src_compile() { + # depend is needed to use $confopts + emake -j1 depend + emake -j1 build_libs +} + +multilib_src_test() { + emake -j1 test +} + +multilib_src_install() { + dolib.so lib{crypto,ssl}.so.0.9.8 +} diff --git a/dev-libs/openssl/openssl-1.0.0p.ebuild b/dev-libs/openssl/openssl-1.0.0q.ebuild similarity index 99% rename from dev-libs/openssl/openssl-1.0.0p.ebuild rename to dev-libs/openssl/openssl-1.0.0q.ebuild index 1b05d96e0aba..7e5024251408 100644 --- a/dev-libs/openssl/openssl-1.0.0p.ebuild +++ b/dev-libs/openssl/openssl-1.0.0q.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0p.ebuild,v 1.1 2015/01/08 17:28:53 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.0q.ebuild,v 1.1 2015/01/15 20:30:22 polynomial-c Exp $ EAPI="4" diff --git a/dev-libs/openssl/openssl-1.0.1l.ebuild b/dev-libs/openssl/openssl-1.0.1l.ebuild new file mode 100644 index 000000000000..650cf4428937 --- /dev/null +++ b/dev-libs/openssl/openssl-1.0.1l.ebuild @@ -0,0 +1,258 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-1.0.1l.ebuild,v 1.1 2015/01/15 20:30:22 polynomial-c Exp $ + +EAPI="4" + +inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal + +REV="1.7" +DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" +HOMEPAGE="http://www.openssl.org/" +SRC_URI="mirror://openssl/source/${P}.tar.gz + http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/${PN}/${PN}-c_rehash.sh?rev=${REV} -> ${PN}-c_rehash.sh.${REV}" + +LICENSE="openssl" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +IUSE="bindist gmp kerberos rfc3779 sse2 static-libs test +tls-heartbeat vanilla zlib" + +# The blocks are temporary just to make sure people upgrade to a +# version that lack runtime version checking. We'll drop them in +# the future. +RDEPEND="gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) + kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) + abi_x86_32? ( + !<=app-emulation/emul-linux-x86-baselibs-20140406-r3 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] + ) + ! "${WORKDIR}"/c_rehash || die #416717 +} + +MULTILIB_WRAPPED_HEADERS=( + usr/include/openssl/opensslconf.h +) + +src_prepare() { + # Make sure we only ever touch Makefile.org and avoid patching a file + # that gets blown away anyways by the Configure script in src_configure + rm -f Makefile + + if ! use vanilla ; then + epatch "${FILESDIR}"/${PN}-1.0.0a-ldflags.patch #327421 + epatch "${FILESDIR}"/${PN}-1.0.0d-windres.patch #373743 + epatch "${FILESDIR}"/${PN}-1.0.0h-pkg-config.patch + epatch "${FILESDIR}"/${PN}-1.0.1-parallel-build.patch + epatch "${FILESDIR}"/${PN}-1.0.1-x32.patch + epatch "${FILESDIR}"/${PN}-1.0.1h-ipv6.patch + epatch "${FILESDIR}"/${PN}-1.0.1e-s_client-verify.patch #472584 + epatch "${FILESDIR}"/${PN}-1.0.1f-revert-alpha-perl-generation.patch #499086 + epatch_user #332661 + fi + + # disable fips in the build + # make sure the man pages are suffixed #302165 + # don't bother building man pages if they're disabled + sed -i \ + -e '/DIRS/s: fips : :g' \ + -e '/^MANSUFFIX/s:=.*:=ssl:' \ + -e '/^MAKEDEPPROG/s:=.*:=$(CC):' \ + -e $(has noman FEATURES \ + && echo '/^install:/s:install_docs::' \ + || echo '/^MANDIR=/s:=.*:='${EPREFIX}'/usr/share/man:') \ + Makefile.org \ + || die + # show the actual commands in the log + sed -i '/^SET_X/s:=.*:=set -x:' Makefile.shared + + # since we're forcing $(CC) as makedep anyway, just fix + # the conditional as always-on + # helps clang (#417795), and versioned gcc (#499818) + sed -i 's/expr.*MAKEDEPEND.*;/true;/' util/domd || die + + # quiet out unknown driver argument warnings since openssl + # doesn't have well-split CFLAGS and we're making it even worse + # and 'make depend' uses -Werror for added fun (#417795 again) + [[ ${CC} == *clang* ]] && append-flags -Qunused-arguments + + # allow openssl to be cross-compiled + cp "${FILESDIR}"/gentoo.config-1.0.1 gentoo.config || die + chmod a+rx gentoo.config + + append-flags -fno-strict-aliasing + append-flags $(test-flags-CC -Wa,--noexecstack) + + sed -i '1s,^:$,#!'${EPREFIX}'/usr/bin/perl,' Configure #141906 + # The config script does stupid stuff to prompt the user. Kill it. + sed -i '/stty -icanon min 0 time 50; read waste/d' config || die + ./config --test-sanity || die "I AM NOT SANE" + + multilib_copy_sources +} + +multilib_src_configure() { + unset APPS #197996 + unset SCRIPTS #312551 + unset CROSS_COMPILE #311473 + + tc-export CC AR RANLIB RC + + # Clean out patent-or-otherwise-encumbered code + # Camellia: Royalty Free http://en.wikipedia.org/wiki/Camellia_(cipher) + # IDEA: Expired http://en.wikipedia.org/wiki/International_Data_Encryption_Algorithm + # EC: ????????? ??/??/2015 http://en.wikipedia.org/wiki/Elliptic_Curve_Cryptography + # MDC2: Expired http://en.wikipedia.org/wiki/MDC-2 + # RC5: 5,724,428 03/03/2015 http://en.wikipedia.org/wiki/RC5 + + use_ssl() { usex $1 "enable-${2:-$1}" "no-${2:-$1}" " ${*:3}" ; } + echoit() { echo "$@" ; "$@" ; } + + local krb5=$(has_version app-crypt/mit-krb5 && echo "MIT" || echo "Heimdal") + + # See if our toolchain supports __uint128_t. If so, it's 64bit + # friendly and can use the nicely optimized code paths. #460790 + local ec_nistp_64_gcc_128 + # Disable it for now though #469976 + #if ! use bindist ; then + # echo "__uint128_t i;" > "${T}"/128.c + # if ${CC} ${CFLAGS} -c "${T}"/128.c -o /dev/null >&/dev/null ; then + # ec_nistp_64_gcc_128="enable-ec_nistp_64_gcc_128" + # fi + #fi + + local sslout=$(./gentoo.config) + einfo "Use configuration ${sslout:-(openssl knows best)}" + local config="Configure" + [[ -z ${sslout} ]] && config="config" + + echoit \ + ./${config} \ + ${sslout} \ + $(use sse2 || echo "no-sse2") \ + enable-camellia \ + $(use_ssl !bindist ec) \ + ${ec_nistp_64_gcc_128} \ + enable-idea \ + enable-mdc2 \ + $(use_ssl !bindist rc5) \ + enable-tlsext \ + $(use_ssl gmp gmp -lgmp) \ + $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ + $(use_ssl rfc3779) \ + $(use_ssl tls-heartbeat heartbeats) \ + $(use_ssl zlib) \ + --prefix="${EPREFIX}"/usr \ + --openssldir="${EPREFIX}"${SSL_CNF_DIR} \ + --libdir=$(get_libdir) \ + shared threads \ + || die + + # Clean out hardcoded flags that openssl uses + local CFLAG=$(grep ^CFLAG= Makefile | LC_ALL=C sed \ + -e 's:^CFLAG=::' \ + -e 's:-fomit-frame-pointer ::g' \ + -e 's:-O[0-9] ::g' \ + -e 's:-march=[-a-z0-9]* ::g' \ + -e 's:-mcpu=[-a-z0-9]* ::g' \ + -e 's:-m[a-z0-9]* ::g' \ + ) + sed -i \ + -e "/^CFLAG/s|=.*|=${CFLAG} ${CFLAGS}|" \ + -e "/^SHARED_LDFLAGS=/s|$| ${LDFLAGS}|" \ + Makefile || die +} + +multilib_src_compile() { + # depend is needed to use $confopts; it also doesn't matter + # that it's -j1 as the code itself serializes subdirs + emake -j1 depend + emake all + # rehash is needed to prep the certs/ dir; do this + # separately to avoid parallel build issues. + emake rehash +} + +multilib_src_test() { + emake -j1 test +} + +multilib_src_install() { + emake INSTALL_PREFIX="${D}" install +} + +multilib_src_install_all() { + dobin "${WORKDIR}"/c_rehash #333117 + dodoc CHANGES* FAQ NEWS README doc/*.txt doc/c-indentation.el + dohtml -r doc/* + use rfc3779 && dodoc engines/ccgost/README.gost + + # This is crappy in that the static archives are still built even + # when USE=static-libs. But this is due to a failing in the openssl + # build system: the static archives are built as PIC all the time. + # Only way around this would be to manually configure+compile openssl + # twice; once with shared lib support enabled and once without. + use static-libs || rm -f "${ED}"/usr/lib*/lib*.a + + # create the certs directory + dodir ${SSL_CNF_DIR}/certs + cp -RP certs/* "${ED}"${SSL_CNF_DIR}/certs/ || die + rm -r "${ED}"${SSL_CNF_DIR}/certs/{demo,expired} + + # Namespace openssl programs to prevent conflicts with other man pages + cd "${ED}"/usr/share/man + local m d s + for m in $(find . -type f | xargs grep -L '#include') ; do + d=${m%/*} ; d=${d#./} ; m=${m##*/} + [[ ${m} == openssl.1* ]] && continue + [[ -n $(find -L ${d} -type l) ]] && die "erp, broken links already!" + mv ${d}/{,ssl-}${m} + # fix up references to renamed man pages + sed -i '/^[.]SH "SEE ALSO"/,/^[.]/s:\([^(, ]*(1)\):ssl-\1:g' ${d}/ssl-${m} + ln -s ssl-${m} ${d}/openssl-${m} + # locate any symlinks that point to this man page ... we assume + # that any broken links are due to the above renaming + for s in $(find -L ${d} -type l) ; do + s=${s##*/} + rm -f ${d}/${s} + ln -s ssl-${m} ${d}/ssl-${s} + ln -s ssl-${s} ${d}/openssl-${s} + done + done + [[ -n $(find -L ${d} -type l) ]] && die "broken manpage links found :(" + + dodir /etc/sandbox.d #254521 + echo 'SANDBOX_PREDICT="/dev/crypto"' > "${ED}"/etc/sandbox.d/10openssl + + diropts -m0700 + keepdir ${SSL_CNF_DIR}/private +} + +pkg_preinst() { + has_version ${CATEGORY}/${PN}:0.9.8 && return 0 + preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 +} + +pkg_postinst() { + ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" + c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null + eend $? + + has_version ${CATEGORY}/${PN}:0.9.8 && return 0 + preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}.so.0.9.8 +} -- 2.26.2