From 618c3037024b4e5328531cdc07c6ceb7486f5329 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 31 Dec 2017 22:30:36 +0000 Subject: gentoo resync : 31.12.2017 (final resync this year) --- dev-libs/Manifest.gz | Bin 85483 -> 85469 bytes dev-libs/elfutils/Manifest | 2 +- dev-libs/elfutils/elfutils-0.170-r1.ebuild | 2 +- dev-libs/iksemel/Manifest | 5 +- dev-libs/iksemel/iksemel-1.3.ebuild | 36 -- dev-libs/iksemel/iksemel-1.4-r1.ebuild | 29 +- dev-libs/iksemel/iksemel-1.4.ebuild | 35 -- dev-libs/log4cpp/Manifest | 12 +- dev-libs/log4cpp/files/1.0-asneeded.patch | 4 +- dev-libs/log4cpp/files/1.0-doc_install_path.patch | 7 +- .../log4cpp/files/log4cpp-1.1-automake-1.13.patch | 7 +- dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch | 4 +- dev-libs/log4cpp/log4cpp-1.0.ebuild | 36 -- dev-libs/log4cpp/log4cpp-1.1.ebuild | 40 +- dev-libs/mdsplib/Manifest | 2 +- dev-libs/mdsplib/mdsplib-0.11.ebuild | 26 +- dev-libs/mm/Manifest | 2 +- dev-libs/mm/mm-1.4.2-r2.ebuild | 16 +- dev-libs/openssl/Manifest | 19 +- .../openssl/files/openssl-1.0.0a-ldflags.patch | 29 - .../files/openssl-1.0.1p-default-source.patch | 30 - dev-libs/openssl/files/openssl-1.0.2-ipv6.patch | 611 --------------------- .../openssl-1.0.2a-parallel-install-dirs.patch | 64 --- .../openssl-1.0.2a-parallel-obj-headers.patch | 37 -- .../files/openssl-1.0.2a-parallel-symlinking.patch | 63 --- .../files/openssl-1.0.2i-parallel-build.patch | 326 ----------- dev-libs/openssl/openssl-1.0.2k.ebuild | 254 --------- dev-libs/openssl/openssl-1.0.2l-r1.ebuild | 296 ---------- dev-libs/openssl/openssl-1.0.2l.ebuild | 254 --------- dev-libs/openssl/openssl-1.0.2m.ebuild | 254 --------- dev-libs/openssl/openssl-1.0.2n.ebuild | 2 +- dev-libs/pslib/Manifest | 3 +- .../pslib/files/pslib-0.4.5-fix-build-system.patch | 22 + dev-libs/pslib/pslib-0.4.5.ebuild | 22 +- dev-libs/rlog/Manifest | 5 +- dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch | 4 +- .../rlog/files/rlog-1.4-fix-build-system.patch | 59 ++ dev-libs/rlog/rlog-1.4.ebuild | 21 +- dev-libs/xmlrpc-epi/Manifest | 3 +- .../files/xmlrpc-epi-0.54.2-fix-build-system.patch | 13 + dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild | 42 +- 41 files changed, 231 insertions(+), 2467 deletions(-) delete mode 100644 dev-libs/iksemel/iksemel-1.3.ebuild delete mode 100644 dev-libs/iksemel/iksemel-1.4.ebuild delete mode 100644 dev-libs/log4cpp/log4cpp-1.0.ebuild delete mode 100644 dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch delete mode 100644 dev-libs/openssl/files/openssl-1.0.1p-default-source.patch delete mode 100644 dev-libs/openssl/files/openssl-1.0.2-ipv6.patch delete mode 100644 dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch delete mode 100644 dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch delete mode 100644 dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch delete mode 100644 dev-libs/openssl/files/openssl-1.0.2i-parallel-build.patch delete mode 100644 dev-libs/openssl/openssl-1.0.2k.ebuild delete mode 100644 dev-libs/openssl/openssl-1.0.2l-r1.ebuild delete mode 100644 dev-libs/openssl/openssl-1.0.2l.ebuild delete mode 100644 dev-libs/openssl/openssl-1.0.2m.ebuild create mode 100644 dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch create mode 100644 dev-libs/rlog/files/rlog-1.4-fix-build-system.patch create mode 100644 dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index fd57513a4c6c..78c358e3ac80 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest index 6de42be4a8d2..4819b63cda84 100644 --- a/dev-libs/elfutils/Manifest +++ b/dev-libs/elfutils/Manifest @@ -2,6 +2,6 @@ AUX elfutils-0.118-PaX-support.patch 962 BLAKE2B f631b1dcf20cf257efd83f24cf53b33 DIST elfutils-0.169.tar.bz2 8067758 BLAKE2B cf4c11619442fe19a5df95b79546af879771890b069de44743440ca5f6b44ac471125cce21fb4b1533d5265760e9fdf2ea3371c36bca39713c3e587987b69cd9 SHA512 0a81a20bb2aff533d035d6b76f1403437b2e11bce390db57e34b8c26e4b9b3150346d83dddcbfbbdc58063f046ca3223508dba35c6ce88e375d201e7a777a8b9 DIST elfutils-0.170.tar.bz2 8358001 BLAKE2B 03ea3ba7d3feaac43065312c475f4a3cd9083a6c56c9982fa00c0ed02b28440f6a37bbeca4be18db13749647ea1c8a6f00dae7efcb1c70235110e60ad7d56d06 SHA512 aca0b5e271138eaf86e36505ffb101181207b151e833e6cd7c18986ac50678542a5ecd2250f8dd6923ca497142f197c8b08fd225e4130b16b6203c24013d6d28 EBUILD elfutils-0.169-r1.ebuild 1807 BLAKE2B 3740f463d0df20cc0cc706f0ebdcc5785b6a1e3eef60722cbf322e073c21130fce50db293df352549a9eb1f1a26104b1c79e8b8e1d56f0cafada1887bdde2f66 SHA512 5ae2adb8d3263555993d269e015985e40a1d979bd65ee3731168455babc0c16169a3c32cbc1ef237db92edca74cb45d50b327721fd11cb5c1ad0a028cc5d1538 -EBUILD elfutils-0.170-r1.ebuild 1808 BLAKE2B 8905d8c0c5e73aa4c3532fbf9b74b811ee45579124d6652b978c8d4bc91a49465c424b21f5f0284ecf1254f922d27cc39c952325b2ad52f4b2280b10307d6aab SHA512 7c76ef622a096df1b05cee2f8d863d8915a8dd762947392e8c028e2e1ba41b6b69eff35185d0f4f8f3e51eed1f37f72c5f9740ee21fa484975bacf3fa99aa172 +EBUILD elfutils-0.170-r1.ebuild 1807 BLAKE2B 5674dc6de2bca1cd5bde706893c6092e03bdf111b5b8ae95262e73175ddffe0154e593476a90fa7f5643a22e2c9f9111f5c670f5cf0cfa05c4e7e7d9950af8dd SHA512 133ae942d2d7f0a81284545db5b9c30448c79b4d99d3ef07475b446927caf48d8b04b68f53c5bb78befcf0864f38d5995843b2c733e0ff13ae32092d02584ca1 EBUILD elfutils-0.170.ebuild 1811 BLAKE2B 460aafa4c30eecc5cebae1409280fd9a334f8c9dc3ebcbc96903eebe69805ab62668d1b467427e9feea035ce564aff0bbf1be195f78d63c7e49b0f8359cbccb1 SHA512 c86b7cf333da96fb7704aacf2bb836a42dabfb30d3aec60fcfa524b96ce549607b4ad25aee69f1fde9753cf7b8b82bb4590ed15a2980fc0329be7629476a37d8 MISC metadata.xml 536 BLAKE2B 49d8ded66c5d9ea3fb5b23ee6c4a1860647abfd71339faff04c4c5f83eb32811d005ccc8c23479170b35938456b8132a9d919f6b8a93bdc14fead64e70c39e8e SHA512 ad625d13a4e5411db4423030760ac51dd44e8da599409bff3e5607c02ed158421e90d7cec8c0b4c0228049b975d3c65a7dbebef78eedd7aca700d38612873cac diff --git a/dev-libs/elfutils/elfutils-0.170-r1.ebuild b/dev-libs/elfutils/elfutils-0.170-r1.ebuild index b3d09b13a9b6..b01d0ec89fdf 100644 --- a/dev-libs/elfutils/elfutils-0.170-r1.ebuild +++ b/dev-libs/elfutils/elfutils-0.170-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2" LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux" IUSE="bzip2 lzma nls static-libs test +threads +utils" RDEPEND=">=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] diff --git a/dev-libs/iksemel/Manifest b/dev-libs/iksemel/Manifest index 89a769d80a7b..1a28f40f0f26 100644 --- a/dev-libs/iksemel/Manifest +++ b/dev-libs/iksemel/Manifest @@ -1,9 +1,6 @@ AUX iksemel-1.3-gnutls-2.8.patch 488 BLAKE2B 7834ca7b056b44534cc1c3301c9b58b66035c7d20e0f1e2c1f23ec6ec2d227ab4914c4c16c555e33fe9a5d39d6171864229071048d0ca9a93273b84e6c25c65e SHA512 6b2d4f71f5da6da8dcdd9f6a8921129d2f2bc71e6eb0c331d74784ced1bc3a0fb974ff1e0342f93d8ba3b4217b72ade15b1bc4015d2f2486aa86ca75549a1a42 AUX iksemel-1.4-gnutls-3.4.patch 1656 BLAKE2B 83d8e5f2e5aa7fca4721e35be46ee08cbaf8f6ab66be86e1d01766c567fbf8762ed7e7d13d729afc2b44b460e0fddcc9474e61af3c81fd2696fbe1ed71f57c1f SHA512 305990e760218b1ce59e55aefb31126174f6a8066b9ef20ed3073332ad4e925871709e4c5b52d1e3fcde7b2fc9776dfd3f74a763e897cba4eb45657d3946d518 AUX iksemel-1.4-ikstack.patch 955 BLAKE2B 62223a269c7079fe40a0b835c1a6d2a34d0dd9b3424ae45e0f14712d388547321e66cbce2763bb73065ed53df626a572e6a72d4550e85801e3390a5a61dde7ca SHA512 d97dc724c9b41983e91889e742d604ad9cf752536b012c13a5667c59baa1f5467dc02e7e390e4eba02475e5c994484428c26079351f8e9450b7de14e08eb0cbd -DIST iksemel-1.3.tar.gz 485208 BLAKE2B 868ae403cdd0fea6bb765620bb9e2823a88220d1781a2ee1bdbb826a0b3305a2e2bd5ead3924aeb3106174bc8bae9365e4c713f3f71d2036c79cc9acfdf0c7b7 SHA512 57a0f8d5c3e675419b8d4d04580c144ed20466d1b41ea23006bbb588eead595f189088b3fe559b62d527a2773cc4f92b6c09d19ed7a2b8f446d9ba13546a9d03 DIST iksemel-1.4.tar.gz 515581 BLAKE2B a0e9b8dc6f9dadc04d17d2952034b56c4665c7a9c0549bfb52e3adfbc7fb6af17d1b0de978835081e0d39c8200e41d5528f6b3e1dbf51a4fae160f59d5c474fe SHA512 902e326647b63a5e58b1c396a401bdd136ad01ecabca81b543c0ed76ebd8d2110377015fec1be09551b92651ee093e480fa37aa2186f7791147f29e0933852cc -EBUILD iksemel-1.3.ebuild 821 BLAKE2B 5bc8f3bc36564cdaa175df9c69f0f90abc75887c56334449255bc4c26d73a3bb5fbc0d90d2fdb7742cb5358a5f3c13cfd6143ea256f9ba6107da2136d98dd18c SHA512 031f30ea70c8300882eea2c91aebcdb0bc46e1a584e70ec6ac6dd33a81fd56dc791e08b427287b7a7162e5b658887fe2cf6910a69ea90ff2bbba35fa30b1d09f -EBUILD iksemel-1.4-r1.ebuild 836 BLAKE2B 1715b449776fb2cf9457105fad61aff226f04e0198f2e119566dc9b1ef39fce583c9f0360aebbd81e2317c77278121ee1d9e55b47a6a04678a2731c487576163 SHA512 0ef2940c397bb5570fdf906c7c90831441b76f931e968af17b5c5758e8f37750428231e70acc8fda13d5b9c3d2a46e328c0a22dc8248fd54c000d13db58a4667 -EBUILD iksemel-1.4.ebuild 861 BLAKE2B e96f7039339a17f84eb2afa8ca05e36d5a4cecad22548b548db3ab54068cc4b67d5737d18bbde1619a6b824e47a2006fb933642fd3114aa0427d7fca0cf2afe7 SHA512 6704e457ee5422bf64a042dc6d4ff6a4e59e695c076269b75c86ecae9f04dfdf981ed0a83d711e925d89fc71a6222bdce0615f7539889b8876f685d73a08ec6c +EBUILD iksemel-1.4-r1.ebuild 893 BLAKE2B 13a4ca3121c7337093c9694009b0491072626c281194f571dac61bd44d2d29f9372a44df5933941f3131649d50682e0612554749f6caba08925d33a2f6c863fb SHA512 1eee495e88774df647b8604e52801b6a229de535fae9599d686d93f6512fec381c4f7766f9235476e16f346ac6d22c62d970372bbe7a5e0160e738cdea7e8a0c MISC metadata.xml 301 BLAKE2B e3de81d61c491692f64943d6478ab64332cccceac5947b522a6d6b62127217792205e16c2ea9d04de150772b3337a38793a79e950500b43e837f309651cbcd6f SHA512 91ac21f435ad0c2943e17058fec736cb0371690f38427302eb360a284b48017841b807cf5f6f13c6c837af9d1c330dc9a7980ff77a5699e2efe399b01ca840c0 diff --git a/dev-libs/iksemel/iksemel-1.3.ebuild b/dev-libs/iksemel/iksemel-1.3.ebuild deleted file mode 100644 index 1dc6fa062b8b..000000000000 --- a/dev-libs/iksemel/iksemel-1.3.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit autotools eutils - -DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications" -HOMEPAGE="https://github.com/meduketto/iksemel" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="gnutls" - -RDEPEND="gnutls? ( net-libs/gnutls )" -DEPEND="${RDEPEND} - gnutls? ( virtual/pkgconfig )" - -# https://code.google.com/p/iksemel/issues/detail?id=4 -RESTRICT="test" - -src_prepare() { - epatch "${FILESDIR}/${P}-gnutls-2.8.patch" - eautoreconf -} - -src_configure() { - econf $(use_with gnutls) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog HACKING NEWS README TODO -} diff --git a/dev-libs/iksemel/iksemel-1.4-r1.ebuild b/dev-libs/iksemel/iksemel-1.4-r1.ebuild index 502052fabde1..9865b314e4a5 100644 --- a/dev-libs/iksemel/iksemel-1.4-r1.ebuild +++ b/dev-libs/iksemel/iksemel-1.4-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -inherit autotools eutils +inherit autotools DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications" HOMEPAGE="https://github.com/meduketto/iksemel" @@ -11,16 +11,18 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd" -IUSE="ssl" +KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" +IUSE="ssl static-libs" -RDEPEND="ssl? ( net-libs/gnutls )" +RDEPEND="ssl? ( net-libs/gnutls:= )" DEPEND="${RDEPEND} - ssl? ( virtual/pkgconfig )" + ssl? ( virtual/pkgconfig )" -PATCHES=( "${FILESDIR}/${PN}-1.3-gnutls-2.8.patch" - "${FILESDIR}/${PN}-1.4-gnutls-3.4.patch" - "${FILESDIR}/${PN}-1.4-ikstack.patch" ) +PATCHES=( + "${FILESDIR}"/${PN}-1.3-gnutls-2.8.patch + "${FILESDIR}"/${PN}-1.4-gnutls-3.4.patch + "${FILESDIR}"/${PN}-1.4-ikstack.patch +) src_prepare() { default @@ -28,10 +30,15 @@ src_prepare() { } src_configure() { - econf $(use_with ssl gnutls) + econf \ + $(use_with ssl gnutls) \ + $(use_enable static-libs static) } src_install() { - emake DESTDIR="${D}" install - dodoc AUTHORS ChangeLog HACKING NEWS README TODO + default + dodoc HACKING + + # package installs .pc files + find "${D}" -name '*.la' -delete || die } diff --git a/dev-libs/iksemel/iksemel-1.4.ebuild b/dev-libs/iksemel/iksemel-1.4.ebuild deleted file mode 100644 index fb97bd0b62ba..000000000000 --- a/dev-libs/iksemel/iksemel-1.4.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="2" - -inherit autotools eutils - -DESCRIPTION="eXtensible Markup Language parser library designed for Jabber applications" -HOMEPAGE="https://github.com/meduketto/iksemel" -SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-fbsd" -IUSE="ssl" - -RDEPEND="ssl? ( net-libs/gnutls )" -DEPEND="${RDEPEND} - ssl? ( virtual/pkgconfig )" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.3-gnutls-2.8.patch" - epatch "${FILESDIR}/${PN}-1.4-gnutls-3.4.patch" - epatch "${FILESDIR}/${PN}-1.4-ikstack.patch" - eautoreconf -} - -src_configure() { - econf $(use_with ssl gnutls) -} - -src_install() { - emake DESTDIR="${D}" install || die "emake install failed" - dodoc AUTHORS ChangeLog HACKING NEWS README TODO -} diff --git a/dev-libs/log4cpp/Manifest b/dev-libs/log4cpp/Manifest index ed7b4d27cfb2..fbbd3ea9c984 100644 --- a/dev-libs/log4cpp/Manifest +++ b/dev-libs/log4cpp/Manifest @@ -1,10 +1,8 @@ -AUX 1.0-asneeded.patch 4256 BLAKE2B e73a7100bb87af13af4ceeceda2c7fe0dbc3bd88577600e585ab7f763fa43120c4d8f0cb2a66f79070bac2d545e2ce2d0ead85138ff9e7b90002f37dcb88d45d SHA512 fde4d6ee84f3865f84ebb61d42c6c8689e81211cf09987a2167638e46ab490cf87271e592f7a430d6228f5164eb8922e6f882b97689342669a4b364e621116ea -AUX 1.0-doc_install_path.patch 1150 BLAKE2B 40af6eca8f584d2fb334e069e3833211f5b7ffcc44a6a21b6624e4dc4f8561ba45e09e01db4bd93ba482e81ccbe280d5ddb86b916caa790d123a5292e8e9daca SHA512 d65b1313830536a78ba5cf0ea45e95650c1e58ccc79cbe8e060dc50dfab0a1d1590c75e972407441f4ddfa51fd58731207e548442f81089efd4404581641e2cd +AUX 1.0-asneeded.patch 4260 BLAKE2B 1ca62ef0541f632474d8be23cf23caacc8fe153c70dd58c51af173a8e4b8c0a7a743b425ade6bcab422974e0f41f11308569d94316d44587328079f0fef15299 SHA512 36031e48cdbc6a94b18a399fab3257b433ef5ea873b3fbe57e373f87f491945aba5c99cce901fa4203cba04aa5f420872a957dc066f53afe5315a41c233b450d +AUX 1.0-doc_install_path.patch 1010 BLAKE2B 1f8f1b488e2ee87ad29738d175e2a2cb205c174553bdd5f7f6d6095fb371e8a255e2fefe023ada1fbcbdd8fd60953c5d944bf74566975fa0b0a1cc6fff1a2d1c SHA512 1f72992eaef44bfb214132736590514b57bb4321d3fc28412b19e5f9f6a7a67fc63a00e91af9cd85f6b921de36b835ce238b40590850f1a7f19011dab595b73d AUX 1.0-gcc43.patch 1166 BLAKE2B 2669ceaed022d24e5090a6b96e856ab9612c5818b216949c78732d887e0749818da1d94ae7f9e85d53ec2631e73b3baff2c2cab98ef926d38e0fa6bb0b2c083d SHA512 61ffeddb968a4cc138db1ec854460ad86d864cabc48e4801da8e6e886783d34b112115441090039307d2f7305caee1c0275ad988176adf339170f981fba41262 -AUX log4cpp-1.1-automake-1.13.patch 288 BLAKE2B 3cf6c23fad3827e6762af9689a9978aa4b41261750456db561466909637a02806f59e91f77b89268cfd57ce4b0d526cb5ed090d7e7af19cd636e47b85a1f960c SHA512 344c1cb481139debc8c2f79185ad1ba2abead0b1c39ee42bede44078273951f2b207a6e906227fe0acab2b83067311ded6daf4ac9d701fe7c18413d84362ccbf -AUX log4cpp-1.1-cmath-fix.patch 286 BLAKE2B 5f8eac41610972c061fdbc0844d9151cf32733d6392351611d981021f3475ceb6f7a7e2b1744f8e9583d419dc55489d77ba9249e3a61cb5ebb9767ccd71c7b5a SHA512 e1af4f7e6f33b5d28eb4c9058730689c9570ab156aa4848fd9c7ec8c1395052d75dec2a6cef556050cb5919d1205c918002458183192441f3f44ca67d5ae8d24 -DIST log4cpp-1.0.tar.gz 495726 BLAKE2B 9b639eab2b1f9c56202901a19595f220fda5355630835d28012f45e9d570be7149b477a8e6512f6998de48aebe7374d6e12126982fa0b4fbbee7eae91cfdc3a9 SHA512 461ce64aa6343c90a909b4f877dd5cfae8aad12a94965c41ad619da137e76fdf48f045a2575273971115aa56ee9649f59453f7c3c265678bafca93289bd9a012 +AUX log4cpp-1.1-automake-1.13.patch 242 BLAKE2B 17ac8a6529025edf8f46109906ec2bb2087f56ced626f4f3ddf47c000714b85ba558af1680ae3ab29f5aca8799185e25bed7a7c563d6950f1f3159e58f60eba8 SHA512 22abe490efd1a6b500265744abb2f58345fd9f6df881f1d932d7a95e6076397009c0bbd190eb803c0a4800035c0e435493164393674d19c611825235cb59fcc5 +AUX log4cpp-1.1-cmath-fix.patch 206 BLAKE2B 7caa58dcb66cc184b1f88a99ea6c6c0d21233c9bbd9b7da6727f735f73c98849c0cc95a3e90913847805ecbc1bd84ee56436d3fed6736259251e1c94363f436f SHA512 926e10166d162863c6c1774ce3a6e523a27ae999df68f9423c2ee94042152078d931eda77b07c323890850918832396a3603c3a9226310af90cd3946a7de7ffe DIST log4cpp-1.1.tar.gz 547676 BLAKE2B 3fee8e575b404215d308a0d6c72feef612dcfb9c881c97500937d1a94d1c435108a24ae1ad20f19cedb1613735c22a37354226699fe6cafbf6d23dcd12668271 SHA512 e1a723641c75a0b7f9ad2338134b327cd9a0a1bd67ff76bca726389ad76e8ba0ee5a95abe6f29e05a77980255dc08b0aa5c906395b0a0ad094994c9e450e3ecb -EBUILD log4cpp-1.0.ebuild 797 BLAKE2B 046cb6292041178752f33dc47d8cba3e89f321846af7cb0b882fce0677e1ad85f9a870d44758097461e979bf97c7dd2d710ba886492ef8e4cf834d5796268a26 SHA512 5930cb65a8a6654fa89a36be70f580bcb628d919aa0ca258a2de2bdb143409a9147889ad57b522f903358a7665388fa3381369ce91ddc9cc9ee8cefb6b3f88ea -EBUILD log4cpp-1.1.ebuild 1145 BLAKE2B 5b8718e75b90726921e38dc9932d5314f2c257a04bb73deea3362095b73c7353e0ebe08fd7f418005b3692ada6c4d8c8ce2ceb766451cb5d997e6db56043836f SHA512 a32421f79c6ae075c7c6db2db169e0c3611dc0e9fccd5b090626e67ee9c632bd05ee881eaec33c560dbfa5719af84ae9a27f709c477c6ebac38c5c7495ebce96 +EBUILD log4cpp-1.1.ebuild 1180 BLAKE2B d2479b287b38fc15721b40067055239de919631624c61f969ae4b7cf42ae493d95e3480ec850eae0f1add7bae2aa421c00faefe4486dc2f16ec29915e7b50e5e SHA512 759252ba0fe75e6654980f45ec40474dcc5105b302545bf299f4918b39570d19e2fe6b57c0f125c7a1a18d1fcee9ffbb8c1bb0fa8e69418b002bd57e17136382 MISC metadata.xml 326 BLAKE2B 5a3581c83f878d7a0f3c9426a9b66b711087cf6d4234e7e9337108c148ae808100cfb54864d7c7db6ea951109bd8c178dd42f676e14c804e5620e1797e2213ad SHA512 007af73e5317d5cb942a532e2535e1b6a55d3a39300706eff6ac9d9215e017a3334dde7c2608289ccbbfc020bb7cea1ba75c4670d5770d4d63128cae902c81cf diff --git a/dev-libs/log4cpp/files/1.0-asneeded.patch b/dev-libs/log4cpp/files/1.0-asneeded.patch index e9fb05f4ae99..7e88c545a374 100644 --- a/dev-libs/log4cpp/files/1.0-asneeded.patch +++ b/dev-libs/log4cpp/files/1.0-asneeded.patch @@ -1,7 +1,7 @@ http://bugs.gentoo.org/247067 ---- m4/ACX_PTHREAD.m4 -+++ m4/ACX_PTHREAD.m4 +--- a/m4/ACX_PTHREAD.m4 ++++ b/m4/ACX_PTHREAD.m4 @@ -266,6 +266,117 @@ else PTHREAD_CC=$CC diff --git a/dev-libs/log4cpp/files/1.0-doc_install_path.patch b/dev-libs/log4cpp/files/1.0-doc_install_path.patch index 8f9ef5137619..abe88dfd123b 100644 --- a/dev-libs/log4cpp/files/1.0-doc_install_path.patch +++ b/dev-libs/log4cpp/files/1.0-doc_install_path.patch @@ -1,11 +1,10 @@ ---- doc/Makefile.am.orig 2007-10-13 09:39:44.000000000 +0200 -+++ doc/Makefile.am 2007-10-13 09:40:03.000000000 +0200 -@@ -1,7 +1,7 @@ +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,7 +1,6 @@ SUBDIRS = html man3dir = $(mandir)/man3 -docdir = $(prefix)/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ -+docdir = $(prefix)/share/doc/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ EXTRA_DIST = \ mainPage.txt diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch b/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch index ffac4a1dbfc7..3e7cb560a509 100644 --- a/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch +++ b/dev-libs/log4cpp/files/log4cpp-1.1-automake-1.13.patch @@ -1,11 +1,12 @@ ---- configure.ac.orig 2015-01-14 09:37:13.616446476 +0300 -+++ configure.ac 2015-01-14 09:37:26.119445770 +0300 -@@ -17,7 +17,7 @@ +--- a/configure.in ++++ b/configure.in +@@ -17,7 +17,8 @@ #AC_CONFIG_SRCDIR(configure.in) AC_CONFIG_AUX_DIR(config) -AM_CONFIG_HEADER(include/config.h) +AC_CONFIG_HEADERS([include/config.h]) ++AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE diff --git a/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch b/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch index fe3c810814bd..0180580717ab 100644 --- a/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch +++ b/dev-libs/log4cpp/files/log4cpp-1.1-cmath-fix.patch @@ -1,5 +1,5 @@ ---- src/PatternLayout.cpp.orig 2015-01-14 09:24:32.332489499 +0300 -+++ src/PatternLayout.cpp 2015-01-14 09:23:18.162493691 +0300 +--- a/src/PatternLayout.cpp ++++ b/src/PatternLayout.cpp @@ -24,6 +24,7 @@ #include #include diff --git a/dev-libs/log4cpp/log4cpp-1.0.ebuild b/dev-libs/log4cpp/log4cpp-1.0.ebuild deleted file mode 100644 index b5571d38673a..000000000000 --- a/dev-libs/log4cpp/log4cpp-1.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=2 -inherit autotools eutils - -DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations" -HOMEPAGE="http://log4cpp.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 ~arm ppc s390 x86" -IUSE="doc" - -DEPEND="doc? ( app-doc/doxygen )" -RDEPEND="" - -src_prepare() { - epatch "${FILESDIR}"/${PV}-doc_install_path.patch \ - "${FILESDIR}"/${PV}-gcc43.patch \ - "${FILESDIR}"/${PV}-asneeded.patch - - AT_M4DIR="m4" eautoreconf -} - -src_configure() { - econf \ - --without-idsa \ - $(use_enable doc doxygen) -} - -src_install () { - emake DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog NEWS README THANKS TODO -} diff --git a/dev-libs/log4cpp/log4cpp-1.1.ebuild b/dev-libs/log4cpp/log4cpp-1.1.ebuild index bea580222cae..c2371180dd30 100644 --- a/dev-libs/log4cpp/log4cpp-1.1.ebuild +++ b/dev-libs/log4cpp/log4cpp-1.1.ebuild @@ -1,11 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 -AT_M4DIR="m4" -AUTOTOOLS_AUTORECONF=1 -inherit autotools-multilib +inherit autotools multilib-minimal DESCRIPTION="C++ classes for flexible logging to files, syslog and other destinations" HOMEPAGE="http://log4cpp.sourceforge.net/" @@ -13,20 +11,18 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1" SLOT="0/5" -KEYWORDS="~amd64 ~arm ~ppc ~s390 ~x86" +KEYWORDS="amd64 ~arm ppc s390 x86" IUSE="doc static-libs test" DEPEND="doc? ( app-doc/doxygen )" RDEPEND="" -DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO ) - PATCHES=( - "${FILESDIR}/1.0-doc_install_path.patch" - "${FILESDIR}/1.0-gcc43.patch" - "${FILESDIR}/1.0-asneeded.patch" - "${FILESDIR}/${P}-cmath-fix.patch" - "${FILESDIR}/${P}-automake-1.13.patch" + "${FILESDIR}"/1.0-doc_install_path.patch + "${FILESDIR}"/1.0-gcc43.patch + "${FILESDIR}"/1.0-asneeded.patch + "${FILESDIR}"/${P}-cmath-fix.patch + "${FILESDIR}"/${P}-automake-1.13.patch ) S="${WORKDIR}/${PN}" @@ -36,6 +32,8 @@ MULTILIB_CHOST_TOOLS=( ) src_prepare() { + default + mv configure.{in,ac} || die # Build tests conditionally @@ -43,13 +41,19 @@ src_prepare() { sed -i -e '/^SUBDIRS/s/ tests//' Makefile.am || die fi - autotools-multilib_src_prepare + eautoreconf } multilib_src_configure() { - local myeconfargs=( - --without-idsa - $(use_enable doc doxygen) - ) - autotools-utils_src_configure + ECONF_SOURCE=${S} econf \ + --without-idsa \ + $(use_enable doc doxygen) \ + $(use_enable static-libs static) +} + +multilib_src_install_all() { + einstalldocs + + # package installs .pc files + find "${D}" -name '*.la' -delete || die } diff --git a/dev-libs/mdsplib/Manifest b/dev-libs/mdsplib/Manifest index 425128906a2e..d81736e49b5e 100644 --- a/dev-libs/mdsplib/Manifest +++ b/dev-libs/mdsplib/Manifest @@ -1,4 +1,4 @@ AUX mdsplib-0.11-gentoo.patch 1696 BLAKE2B ffcac6d7bd2b7500b93aed0566ae198515dbe7d1cc8544ba8ee04b861be53ca938f328ffb68bc58891e16079c53b1247855a77416b43d59c5243c4fb4d6c6fc6 SHA512 fe38e841473c82eababd0e40a7cf226f5545b1da0c957e50c737aaa8303a4aff6b5baf52b10dda5711c4313ce4712e9eee60e0b8d2a298fcf8c45be87f83ec46 DIST mdsplib-0.11.tar.gz 70435 BLAKE2B 8a2de901d8f386a989eedb95f85171e93d51e9c87c45b0fb6bfcb76bb3d6394a0a2453cdbbb6cd2b87e64a16eb18201107f7b61fb0747a1c9e53df77f0479c04 SHA512 5baf7c23884ab21d2111a05c97a988ff82b003f0b3243ce5fabe5a9757c149a007e7ec6e0baf80de4fa75630c640b2411598a0b06848c7b96fd6ef070e76a687 -EBUILD mdsplib-0.11.ebuild 697 BLAKE2B 63e05259083a7a6c13cf8781272b6cde2d7f9f6baf0575d9d969b806f522c202667be082ad9bacdb7e478aff53b6a73babb4bc9a952c188579a5f019d5159efe SHA512 8fd2e846db16bbd94402a5e44b30d4d2341a0677950cc89b9047585b2079ad06585f7ca95829e7adc0742a1e6767e8a329f321133e4bcbe3e4cdd7002eec53c6 +EBUILD mdsplib-0.11.ebuild 557 BLAKE2B d59bf5fba6582c20ed1161c35030b4727e4a6e0519b2acbc66f68177ce0c473c58646d6560cc9dcc5c7faeb71d71ac6c4260a3e19571019fcd6640fc048b11ff SHA512 dbf14ed89a15d4f93042e9370c3ecdc12d40087a74f7444127bbb2cb7e1592639394108fdb12b271d78aab5519e3783122e24b1721d629c05897c9c4f5af51f8 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-libs/mdsplib/mdsplib-0.11.ebuild b/dev-libs/mdsplib/mdsplib-0.11.ebuild index 6247e54974ef..47af62190af3 100644 --- a/dev-libs/mdsplib/mdsplib-0.11.ebuild +++ b/dev-libs/mdsplib/mdsplib-0.11.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit eutils toolchain-funcs +EAPI=6 + +inherit toolchain-funcs DESCRIPTION="METAR Decoder Software Package Library" HOMEPAGE="http://limulus.net/mdsplib/" @@ -13,20 +14,19 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="" -src_prepare() { - epatch "${FILESDIR}"/${P}-gentoo.patch +PATCHES=( "${FILESDIR}"/${P}-gentoo.patch ) + +src_configure() { + tc-export AR CC RANLIB } src_compile() { - tc-export AR CC RANLIB - emake all || die "emake all failed" + emake all } src_install() { - insinto /usr/include - insopts -m0644 - doins metar.h || die "doins failed" - dolib.a libmetar.a || die "dolib.a failed" - dodoc README README.MDSP - dobin dmetar || die "dobin failed" + dobin dmetar + doheader metar.h + dolib.a libmetar.a + einstalldocs } diff --git a/dev-libs/mm/Manifest b/dev-libs/mm/Manifest index 8c7720d7d1f2..ba2682060a75 100644 --- a/dev-libs/mm/Manifest +++ b/dev-libs/mm/Manifest @@ -1,4 +1,4 @@ DIST mm-1.4.2.tar.gz 344903 BLAKE2B 5fec1eeea52e9ff77f94081f4e77dfd627c356cc94591169fa89f5564882e2e3a4712c90c3f1e133024ef0adf095da8063916145159e5023c4191748bd622c6c SHA512 dcc12676453cfaf19560f99fa97e905428051d72b46aeaf574300f51e64f689caa70c81b619b8794ad604e8a2efe6bde1e486a2e315263b5694d6eab1cacc182 EBUILD mm-1.4.2-r1.ebuild 829 BLAKE2B 31dfd5f23e9f9516d531428fe89482bbe56db4a222e38941d69420f66705135d1dd98ad4c45dd680e0a72c828fd09803b217b2c1524272e3220a66367a8fc7d0 SHA512 2d8134d6cbcbf8c7fbef54dfdf6c9651c56243f325c073b9310692e5eeac3ef4f9a88612d5f2f73de8e5b6939103528ccb7cd9c7cb216b600917483f4e2271dd -EBUILD mm-1.4.2-r2.ebuild 797 BLAKE2B 343f85d0fdbcae1cebcf3f2024b1d44a3b2acd09bbcf5b35a8ad7cc929d2451fa38fef154841eee5e068f3e0fe2bcf4eddb9cd7524e7217cb69c9d1621ed0222 SHA512 f14a0fec4efc37bb8fb3d588d152266d4ea81baed792b44fae66da80eb51eaf00cb179589ecac32424b8342de2a62d6516dbcba294e5f066fe62674bb39ca5a3 +EBUILD mm-1.4.2-r2.ebuild 713 BLAKE2B 9e682e847fca4b0edf7ba67237a5cc0f2e5df76477bce479291a5a39bfa35b08f397fe19f1e389fbcd4a7971bd8de7b305ba10124de73dc710bf5207af17ecb4 SHA512 56c41a233d8c96a9babcd2125adb1eba5eb2d47dd88a63de076ed436d97c3a7e8c9ca2766fd754fe8fe36d97738813d447a26f5cef472c6cb51cf569d7abee7b MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/dev-libs/mm/mm-1.4.2-r2.ebuild b/dev-libs/mm/mm-1.4.2-r2.ebuild index 405cb0a82e8d..23b44f79179c 100644 --- a/dev-libs/mm/mm-1.4.2-r2.ebuild +++ b/dev-libs/mm/mm-1.4.2-r2.ebuild @@ -13,10 +13,14 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa IUSE="" src_prepare() { + default sed -i Makefile.in \ -e '/--mode=link/s| -o | $(LDFLAGS)&|g' \ || die "sed Makefile.in" - default +} + +src_configure() { + econf --disable-static } src_test() { @@ -24,11 +28,9 @@ src_test() { } src_install() { - emake install DESTDIR="${D}" - dodoc README ChangeLog INSTALL PORTING THANKS -} + default + dodoc PORTING -pkg_postinst() { - ewarn 'if you upgraded from mm-1.3 or earlier please run:' - ewarn "revdep-rebuild --library \"/usr/$(get_libdir)/libmm.so.13\"" + # no static archive installed + find "${D}" -name '*.la' -delete || die } diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest index 2e713567872b..b7560bcf2f78 100644 --- a/dev-libs/openssl/Manifest +++ b/dev-libs/openssl/Manifest @@ -4,23 +4,10 @@ AUX openssl-0.9.8e-bsd-sparc64.patch 1484 BLAKE2B 6cfba6ee4fa849e6d7799fbe749abf AUX openssl-0.9.8h-ldflags.patch 1151 BLAKE2B b215e46c380e571f153445f902803cf5d03d44f6f8b95a677c08bdf542e6d199c58f1f4699eb7dbd9de8bdc02b697a7971a9a06157d96c3dbd4295090a778723 SHA512 7f98c5ad310710aeceefd6fac440682bf2baaf41ce17de535add54af88c45fa0689e6e6c26bafb4fe2290fd3b6d80c51d85ffda1e276a73a3d66a319585aab11 AUX openssl-0.9.8m-binutils.patch 684 BLAKE2B 35650e98595910d2e6b6fc846b49fecbb2a8e4a8b647bbec009a829ae4af8afdc7e7edac7a1eec8f13af1ad69b7036ca6af28bfd9509e6bba58f2b3906d6bdd5 SHA512 5e8a20111bd4809e7375c7323dab2c2edd6a131d1ec2377ee99c5e06ceb7b4b000e9606ba6d0e68cd67d8e001cc8194e11e301eace0feb066d5f3c5b331b5f04 AUX openssl-0.9.8z_p8-perl-5.26.patch 310 BLAKE2B 29c46391d127cd2b1cb3943f1bb162a8b931e455f35f9e045372102d1461e3e3fd4cf4e4f544ec06a0b46a573d2009c8decf22678df03707c2487bade64f27b5 SHA512 b8e745ff90e447b000ace9cfd5f746c1bc8f3bb8249064d1d2f1072a1a628f5a89c405c7f384c73f0310f2a2f7af672950a9b7adbc583b1ee94b41d911b8a708 -AUX openssl-1.0.0a-ldflags.patch 1095 BLAKE2B 505148de509219e062c519365e48fb05bdd8592201be0577357010b2029e6a8152d3971eb1b19826bd3dea2b3940e3385eac7f4cd6f83396ac8bdf095445c991 SHA512 80c3677313a6268fdc2eb7b556dc081f1047694cf932a8669820923952bf0e3002da4cd92d6a335b44f8a6ece7d88319c15e9c0171118bfc03ff7a9b718726d8 -AUX openssl-1.0.1p-default-source.patch 861 BLAKE2B fbe909dbe7b202f36541b541033f6883c12d78dc43e496ac61785ae11497f34665db57069c95fce0b8cad6d10f34affabcc8ec6dbbeeea421b7e45aa6e1020da SHA512 cbd47ae5553ec0e683a92171cb1c2e68d7eb0cf2b1787e3fe332ca2df0aefa31a1a74d60345d5e42d00bdda439019d089560cf2f5464dfe19ff7a3d6a310d06b -AUX openssl-1.0.2-ipv6.patch 18811 BLAKE2B 56036b62751ddc9ce9e73546a56fc68ed2f97ffad94ed6a983e044f16828e8bb7bac9795852694bbc2f0990449292d2e7de7d8a43e506a493a8d39476980c917 SHA512 58e293f8f19a3fad08729b842dd977b73fedb0c49208d87a056bfea857c0e2b79a310d7d098c04429b65564fce64defeda6d1dcc3068ad5a80ef276db6421e54 -AUX openssl-1.0.2a-parallel-install-dirs.patch 2013 BLAKE2B 208d06d19f9e753e418619dae73b36c11eb86b090d61fd1fc35f0f819c52c09b6b0c194b1caeee269960a8774d6357ec86530227c405b110d0a28e9af6948917 SHA512 c3b97fa318b9627bcaf4f39d1615c46322c1081cded135af5b5115beb2be74ead46084119fce5643b12c54b6851c33bfb624694ccf6f3d32060b6d56239d3674 -AUX openssl-1.0.2a-parallel-obj-headers.patch 1359 BLAKE2B a9655a872a7dd75adcf5cdc7e3e344adc369243e30f23c9f3fad1f20a22d0a4a195590c1d9bc6335721ffd6d5c8823ca6d6d79118ebed94fafeb6665c6f42022 SHA512 ac8224bc088099d72e7e6761303b8653766372bd027536951c458bd22fd0526163de22bf27675e0292a12ae7257a5c1edf26a92747e00cc139e13e1b624b4072 -AUX openssl-1.0.2a-parallel-symlinking.patch 2041 BLAKE2B adf1701b1e02786032ae546d77fb4967aa1a67adef17cf5ec284df2593776128564ea81b77dcd499598f3a6ca3f3c525a0a06fec2fd79b131adb3e2fb02c6ebc SHA512 b87ab581784c285ef394b31baa1196a831a86c3b2d578704c9d8b80d68c70a8b19cfa88bd29b84578ed024135ae2d2ac4d622c91e1040074016b8fd104d6c05a AUX openssl-1.0.2a-x32-asm.patch 1561 BLAKE2B ee5e5b91e4babacff71edf36cce80fbcb2b8dbb9a7ea63a816d3a5de544fbffd8b4216d7a95bd44e718c7a83dd8b8b5ad85caed4205eab5de566b0b7e5054fc1 SHA512 fbb23393e68776e9d34953f85ba3cbb285421d50f06bd297b485c7cffc8d89ca8caff6783f21038ae668b5c75056c89dc652217ac8609b5328e2c28e70ac294c -AUX openssl-1.0.2i-parallel-build.patch 10065 BLAKE2B 3221de2e479e6c77d70637300bd8eac254164947de8f22f8dbaf7c6928d25975871c87e40fed4b95a3a008fb9d3b95324551f105b1b15d2d99353d04b8e9dd27 SHA512 2a95103d22263ca68582caccfb6860d45da20b92741824a794697eaa4e199199abc95ac8a62b821fc42aeab96098aeb89731ee535726e0a9e779dcd9bf39d12d AUX openssl-1.1.0g-CVE-2017-3738.patch 2317 BLAKE2B 93ec481b15075ecb94c175659314d6e5a90c1a513d8e82948823bce8c51214e7e27f72a56f9043f0771d5458159f1844e4ac8f6d12d0ed78cbc75a1b9630094b SHA512 4b033443d49d385d6ef9e89975af0e1d8108b97d28492239a427ac15ecc4e9c995b6a0df324361baefbe3ae04ecb97508ad7c80eb22b5b4a157a1a1b5c875b61 DIST openssl-0.9.8zh.tar.gz 3818524 BLAKE2B 610bb4858900983cf4519fa8b63f1e03b3845e39e68884fd8bebd738cd5cd6c2c75513643af49bf9e2294adc446a6516480fe9b62de55d9b6379bf9e7c5cd364 SHA512 b97fa2468211f86c0719c68ad1781eff84f772c479ed5193d6da14bac086b4ca706e7d851209d9df3f0962943b5e5333ab0def00110fb2e517caa73c0c6674c6 DIST openssl-1.0.2-patches-1.0.tar.xz 11572 BLAKE2B bdb9d2b8388f1aadf3a9274133aa8f86b0029fae1ce86d005baa39a7347657f8d4d84395b54e8ccd67944356ee197dfb527f843b4f146e305533e2ad5450721d SHA512 15234ade359a0acf001cf10c7a7fc05f54603a44c67831529c2a6eda03342f9ba1cf40664ac782b5b73c50b23ec5649fb48ccff2aea8f0df2ef634959c47e3e9 -DIST openssl-1.0.2k.tar.gz 5309236 BLAKE2B 97069b9c7aaab2381ae5be989caff6907cd44ab1831d84685c3421ad985889a2bbc3a462decdff9c4c158ace96975de2b9e49e4f1b9f306990c3dc0f03767dad SHA512 0d314b42352f4b1df2c40ca1094abc7e9ad684c5c35ea997efdd58204c70f22a1abcb17291820f0fff3769620a4e06906034203d31eb1a4d540df3e0db294016 -DIST openssl-1.0.2l.tar.gz 5365054 BLAKE2B 0a459a93a0013269dea79bd6df96a434b9dad95b6d98b24a48bc1b1438415c0a8de01b67166ac13a73ae65fb64131568924c3e6f945d862b7e960f05332cf097 SHA512 047d964508ad6025c79caabd8965efd2416dc026a56183d0ef4de7a0a6769ce8e0b4608a3f8393d326f6d03b26a2b067e6e0c750f35b20be190e595e8290c0e3 -DIST openssl-1.0.2l_ec_curve.c 17254 BLAKE2B d40d8d6e770443f07abe70e2c4ddda6aec1cc8e37dc1f226a3fdd9ed5d228f09c6d372e8956b1948b55ee1d57d1429493e7288d0f54d9466a37fec805c85aacb SHA512 8e92fb100bcf4bd918c82b9a6cbd75a55abe1a2c08230a007e441c51577f974f8cc336e9ac8a672b32641480428ca8cead5380da1fe81bacb088145a1b754a15 -DIST openssl-1.0.2l_ectest.c 30735 BLAKE2B 95333a27f1cf0a4305a3cee7f6d46b9d4673582ca9acfcf5ba2a0d9d317ab6219cd0d2ff0ba3a55a317c8f5819342f05cc17ba80ec2c92b2b4cab9a3552382e1 SHA512 f2e4d34327b490bc8371f0845c69df3f9fc51ea16f0ea0de0411a0c1fa9d49bb2b6fafc363eb3b3cd919dc7c24e4a0d075c6ff878c01d70dae918f2540874c19 -DIST openssl-1.0.2l_hobble-openssl 1302 BLAKE2B 647caa6a0f4c53a2e77baa3b8e5961eaef3bb0ff38e7d5475eab8deef3439f7fe49028ec9ed0406f3453870b62cac67c496b3a048ee4c9ff4c6866d520235960 SHA512 3d757a4708e74a03dd5cb9b8114dfe442ed9520739a6eca693be4c4265771696f1449ea06d1c9bcfc6e94fc9b0dd0c10e153f1c3b0334831c0550b36cd63326e -DIST openssl-1.0.2m.tar.gz 5373776 BLAKE2B f40cbea061f84087a079d541f7ba841894c86c00827865f0f508ee297df45e8825d7d74bbbe16bf1f81d46f9af503a6191c9e65df674c4a5ae28172b5b03986f SHA512 7619aa223ee50d0f5e270ac9090e95b2b1ba5dfc656c98f625a9a277dda472fb960a4e89a7ba300044cb401b2072b2ca6a6fcce8206d927bf373d1c981806a93 DIST openssl-1.0.2n.tar.gz 5375802 BLAKE2B 2e04f8c3d5e2296859b8474d7e100e270f53f18a26c6d37a4cf5e01cd14f44d24d334b4e705da05d77c33b5dc91cffea0feea9f7c83c77ba16c9b6d5f5085894 SHA512 144bf0d6aa27b4af01df0b7b734c39962649e1711554247d42e05e14d8945742b18745aefdba162e2dfc762b941fd7d3b2d5dc6a781ae4ba10a6f5a3cadb0687 DIST openssl-1.1.0-build.patch 3028 BLAKE2B f8cf981ed3717af234ce02fa50f27cdbcbf2b766968a5957fc6f0a4ea997549505fa77398444d7f3b9a75f66048447fe62542b9cb1d5f0268add87c44915a6fd SHA512 b19a912900970052f80c67f28975e793ae9e70ebfc62efae0544e09931079e98c4cd29ce1cc8d937ceca97aff9a12fdc1ff9ce6c2b47fea68c79e7065464a0f0 DIST openssl-1.1.0-ec-curves.patch 2967 BLAKE2B 1c639514445ea85cf731732aa7901b5a03ddb5f637b0483ab2ec6825433ad978723c5a07316db684bdaca4a12fc673b4e049a49c0cd4dbe5f25a5e2bd3b75cf5 SHA512 8fb9c6759ae2077ad3697ba77e85ab3970fd8b3f64b21eb260b4f6333b7ebf2f5a53c7eee311229edfbd96a2b904ec5e5e00dfa5b62cf1105fece13069077bd2 @@ -30,10 +17,6 @@ DIST openssl-1.1.0g_ectest.c 29907 BLAKE2B 73dc800c1de5449f14d7753f7f7b8e672cd36 DIST openssl-1.1.0g_hobble-openssl 1117 BLAKE2B c3a1477e63331e83cf1cbe58e9ef131ec500a311e22d3da55034800ca353c387b2e202575acf3badb00b236ff91d4bac1bb131a33930939646d26bec27be6e04 SHA512 fa9cc70afa11a7a292548b4bddbba8159824a364ce5c279b483768e6ae2aa4b5491d9bf2cc734819f30a11c8ee0d91bcb991c4a7ab357296aeb4c04feac74826 EBUILD openssl-0.9.8z_p8-r1.ebuild 5076 BLAKE2B 7e57a4541dacfc7a43720248334e8c46748e533b4fa455f70a9304fd5c4807a0202c796eeffdd5a3b096fb37549e4ca8780b8ab8e5d51872eb057aa5bae3cf7c SHA512 0df6324f095514b94b2d15bf44d269624d631cd03d5d7eaf45645fbb1d3c07880d6c927c91f6a2b3d8c5cc7a406aeb435b58e6aeb3f3311a979a3501d3f7a7de EBUILD openssl-0.9.8z_p8.ebuild 4997 BLAKE2B a65c31fb7e443ae990b8b434edcae82794eef0150eb5a352536af9fb7ddc39eabdef24b8a52f5a307b91e9704ce94f9ed55cf9c388076a9a8526891656295596 SHA512 15767d6ed531a7b27a37e9276f3ae02b1d3a57103db2bc256dad4ac9af8d1797f078731ac6a7325a36ca7b9cec34840dac2e3723343dca69050a524c300e7059 -EBUILD openssl-1.0.2k.ebuild 8334 BLAKE2B c79e9dc5d3f456cce76d99b388d7920083c7cbeed265ec7ec3949a8235f4648ae2da2583cef4c6a5a67910ed0353817ff7a6c98a1de24d458bab4ce15b7687bb SHA512 69041d575f7542984cdbc9ef32aa04af49610e1e5752ce77e2566b63d0c60d0cfde6aab808d9c32390ca986911de3b67de057d09c1e036204bf119136e386efb -EBUILD openssl-1.0.2l-r1.ebuild 9930 BLAKE2B 724272b844780bc005bc0f202519adf01e2f2e39412fe4e8c10b4e07e897bae486e7420abd89abfd03dae7c303d238ca9d4ca1ea36be43792fa5711ff06c34b2 SHA512 86ffa8e9d2ad2e69fdfdf7888cdc3f885ee3b5fb7bae6af3a9dbcf977d4fe00d1f4fce1642b7c1bc5eab0f7d8a3c2247beb2d80a731d0b14e6aa0b545e323c23 -EBUILD openssl-1.0.2l.ebuild 8338 BLAKE2B 86556289e8c1189d2c552623a96f8b14c4f5f0b5687951d64f04ba58463645c3395ffbbec158d378fd1589af2337fa4552368d34543280244a10dcea01b50492 SHA512 2435e1f4b4b8f766d1ea5ed0a21fece5109559e16c9d4260d2ef052ab82795bb7005d3f2777bed3978f0f4940521eeb5bd10c85ab2e2037ac2d053f501646f3d -EBUILD openssl-1.0.2m.ebuild 8339 BLAKE2B 5f38ad7c7fbf5ed897deea4594b2131bcad8853cd7692274f8758236aedfc9da3d271a6003762d6673b2afa3e0a73d6a14783abd6bb140ff2e914549b5485532 SHA512 b7541775edb2be3294669f3fcb42f266ae781081f22b07ea9bed465f6f3a654e0d4bddcf5ad17d075f0e2281b0a1a18e1e8dbb834b5039f9b219e5c650d123bf -EBUILD openssl-1.0.2n.ebuild 8037 BLAKE2B d1f608d0bc6a27dd80a56238562eb87c146fa1e6deb186aa29a909a0affe343508f99cd87802a2631c48eea31a13bdf6df5724c20faa4df5427f18eb576f1cb9 SHA512 dcc181406923ed773eb05116422d71b1ba6d8ba08746046b3e85351e210924a1eee5dd325ed8465466bb2319c05428587eb6c9b5f3a32439f77b932b5f74daf0 +EBUILD openssl-1.0.2n.ebuild 8036 BLAKE2B 15a1ba6ce7cc2c45dcb3a9eb776f212a00238db5384ff7ea74e3ec90089131273ec89c1d3a485b2efb496e66075a4cc825226ecc17b224f80183ba36ec8d8cf7 SHA512 f89fdfcdc4a7f86f8eca280fde92b3c6698c1993bbef5722e920535328b2330f5d0ab55b56b7a66be0192be87222a470cbe1a2ee2e571bff1cce6e6be773b6cc EBUILD openssl-1.1.0g-r2.ebuild 9045 BLAKE2B 7693bbe13e6bc635920e260895380ba5ddb163351860ae7f69ae3cb20076f1b0faf61b1fbc04f439281609f35a21603156ee646898b2b006e0ed668d08ac7232 SHA512 c32902a4f49648e1fc118586abfe38defddff8418f338d3d8334cd45b9a0d605fe2450af5fe4b5dbac648776c41e79dfa589f666ee2daa9dd2474a30b7290c9b MISC metadata.xml 1273 BLAKE2B 8eb61c2bfd56f428fa4c262972c0b140662a68c95fdf5e3101624b307985f83dc6d757fc13565e467c99188de93d90ec2db6de3719e22495da67155cbaa91aa9 SHA512 3ffb56f8bc35d71c2c67b4cb97d350825260f9d78c97f4ba9462c2b08b8ef65d7f684139e99bb2f7f32698d3cb62404567b36ce849e7dc4e7f7c5b6367c723a7 diff --git a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch b/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch deleted file mode 100644 index c99ef4abb852..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.0a-ldflags.patch +++ /dev/null @@ -1,29 +0,0 @@ -http://bugs.gentoo.org/181438 -http://bugs.gentoo.org/327421 -https://rt.openssl.org/Ticket/Display.html?id=3331&user=guest&pass=guest - -make sure we respect LDFLAGS - -also make sure we don't add useless -rpath flags to the system libdir - ---- Makefile.org -+++ Makefile.org -@@ -189,6 +189,7 @@ - MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD $(MAKEDEPPROG)' \ - DEPFLAG='-DOPENSSL_NO_DEPRECATED $(DEPFLAG)' \ - MAKEDEPPROG='$(MAKEDEPPROG)' \ -+ LDFLAGS='${LDFLAGS}' \ - SHARED_LDFLAGS='$(SHARED_LDFLAGS)' \ - KRB5_INCLUDES='$(KRB5_INCLUDES)' LIBKRB5='$(LIBKRB5)' \ - ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ ---- Makefile.shared -+++ Makefile.shared -@@ -153,7 +153,7 @@ - NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \ - SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX" - --DO_GNU_APP=LDFLAGS="$(CFLAGS) -Wl,-rpath,$(LIBRPATH)" -+DO_GNU_APP=LDFLAGS="$(LDFLAGS) $(CFLAGS)" - - #This is rather special. It's a special target with which one can link - #applications without bothering with any features that have anything to diff --git a/dev-libs/openssl/files/openssl-1.0.1p-default-source.patch b/dev-libs/openssl/files/openssl-1.0.1p-default-source.patch deleted file mode 100644 index 73029985ae09..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.1p-default-source.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/554338 -https://rt.openssl.org/Ticket/Display.html?id=3934&user=guest&pass=guest - -From 7c2e97f8bbae517496fdc11f475b4ae54b2534f5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 10 Jul 2015 01:50:52 -0400 -Subject: [PATCH] test: use _DEFAULT_SOURCE with newer glibc versions - -The _BSD_SOURCE macro is replaced by the _DEFAULT_SOURCE macro. Using -just the former with newer versions leads to a build time warning, so -make sure to use the new macro too. ---- - ssl/ssltest.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/ssl/ssltest.c b/ssl/ssltest.c -index 26cf96c..b36f667 100644 ---- a/ssl/ssltest.c -+++ b/ssl/ssltest.c -@@ -141,6 +141,7 @@ - */ - - /* Or gethostname won't be declared properly on Linux and GNU platforms. */ -+#define _DEFAULT_SOURCE 1 - #define _BSD_SOURCE 1 - - #include --- -2.4.4 - diff --git a/dev-libs/openssl/files/openssl-1.0.2-ipv6.patch b/dev-libs/openssl/files/openssl-1.0.2-ipv6.patch deleted file mode 100644 index 27574ea616de..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.2-ipv6.patch +++ /dev/null @@ -1,611 +0,0 @@ -http://rt.openssl.org/Ticket/Display.html?id=2051&user=guest&pass=guest - ---- openssl-1.0.2/apps/s_apps.h -+++ openssl-1.0.2/apps/s_apps.h -@@ -154,7 +154,7 @@ - int do_server(int port, int type, int *ret, - int (*cb) (char *hostname, int s, int stype, - unsigned char *context), unsigned char *context, -- int naccept); -+ int naccept, int use_ipv4, int use_ipv6); - #ifdef HEADER_X509_H - int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx); - #endif -@@ -167,7 +167,8 @@ - int ssl_print_curves(BIO *out, SSL *s, int noshared); - #endif - int ssl_print_tmp_key(BIO *out, SSL *s); --int init_client(int *sock, char *server, int port, int type); -+int init_client(int *sock, char *server, int port, int type, -+ int use_ipv4, int use_ipv6); - int should_retry(int i); - int extract_port(char *str, short *port_ptr); - int extract_host_port(char *str, char **host_ptr, unsigned char *ip, ---- openssl-1.0.2/apps/s_client.c -+++ openssl-1.0.2/apps/s_client.c -@@ -302,6 +302,10 @@ - { - BIO_printf(bio_err, "usage: s_client args\n"); - BIO_printf(bio_err, "\n"); -+ BIO_printf(bio_err, " -4 - use IPv4 only\n"); -+#if OPENSSL_USE_IPV6 -+ BIO_printf(bio_err, " -6 - use IPv6 only\n"); -+#endif - BIO_printf(bio_err, " -host host - use -connect instead\n"); - BIO_printf(bio_err, " -port port - use -connect instead\n"); - BIO_printf(bio_err, -@@ -658,6 +662,7 @@ - int sbuf_len, sbuf_off; - fd_set readfds, writefds; - short port = PORT; -+ int use_ipv4, use_ipv6; - int full_log = 1; - char *host = SSL_HOST_NAME; - char *cert_file = NULL, *key_file = NULL, *chain_file = NULL; -@@ -709,7 +714,11 @@ - #endif - char *sess_in = NULL; - char *sess_out = NULL; -- struct sockaddr peer; -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage peer; -+#else -+ struct sockaddr_in peer; -+#endif - int peerlen = sizeof(peer); - int fallback_scsv = 0; - int enable_timeouts = 0; -@@ -737,6 +746,12 @@ - - meth = SSLv23_client_method(); - -+ use_ipv4 = 1; -+#if OPENSSL_USE_IPV6 -+ use_ipv6 = 1; -+#else -+ use_ipv6 = 0; -+#endif - apps_startup(); - c_Pause = 0; - c_quiet = 0; -@@ -1096,6 +1111,16 @@ - jpake_secret = *++argv; - } - #endif -+ else if (strcmp(*argv,"-4") == 0) { -+ use_ipv4 = 1; -+ use_ipv6 = 0; -+ } -+#if OPENSSL_USE_IPV6 -+ else if (strcmp(*argv,"-6") == 0) { -+ use_ipv4 = 0; -+ use_ipv6 = 1; -+ } -+#endif - #ifndef OPENSSL_NO_SRTP - else if (strcmp(*argv, "-use_srtp") == 0) { - if (--argc < 1) -@@ -1421,7 +1446,7 @@ - - re_start: - -- if (init_client(&s, host, port, socket_type) == 0) { -+ if (init_client(&s, host, port, socket_type, use_ipv4, use_ipv6) == 0) { - BIO_printf(bio_err, "connect:errno=%d\n", get_last_socket_error()); - SHUTDOWN(s); - goto end; -@@ -1444,7 +1469,7 @@ - if (socket_type == SOCK_DGRAM) { - - sbio = BIO_new_dgram(s, BIO_NOCLOSE); -- if (getsockname(s, &peer, (void *)&peerlen) < 0) { -+ if (getsockname(s, (struct sockaddr *)&peer, (void *)&peerlen) < 0) { - BIO_printf(bio_err, "getsockname:errno=%d\n", - get_last_socket_error()); - SHUTDOWN(s); ---- openssl-1.0.2/apps/s_server.c -+++ openssl-1.0.2/apps/s_server.c -@@ -643,6 +643,10 @@ - BIO_printf(bio_err, - " -alpn arg - set the advertised protocols for the ALPN extension (comma-separated list)\n"); - #endif -+ BIO_printf(bio_err, " -4 - use IPv4 only\n"); -+#if OPENSSL_USE_IPV6 -+ BIO_printf(bio_err, " -6 - use IPv6 only\n"); -+#endif - BIO_printf(bio_err, - " -keymatexport label - Export keying material using label\n"); - BIO_printf(bio_err, -@@ -1070,6 +1074,7 @@ - int state = 0; - const SSL_METHOD *meth = NULL; - int socket_type = SOCK_STREAM; -+ int use_ipv4, use_ipv6; - ENGINE *e = NULL; - char *inrand = NULL; - int s_cert_format = FORMAT_PEM, s_key_format = FORMAT_PEM; -@@ -1111,6 +1116,12 @@ - - meth = SSLv23_server_method(); - -+ use_ipv4 = 1; -+#if OPENSSL_USE_IPV6 -+ use_ipv6 = 1; -+#else -+ use_ipv6 = 0; -+#endif - local_argc = argc; - local_argv = argv; - -@@ -1503,6 +1514,16 @@ - jpake_secret = *(++argv); - } - #endif -+ else if (strcmp(*argv,"-4") == 0) { -+ use_ipv4 = 1; -+ use_ipv6 = 0; -+ } -+#if OPENSSL_USE_IPV6 -+ else if (strcmp(*argv,"-6") == 0) { -+ use_ipv4 = 0; -+ use_ipv6 = 1; -+ } -+#endif - #ifndef OPENSSL_NO_SRTP - else if (strcmp(*argv, "-use_srtp") == 0) { - if (--argc < 1) -@@ -2023,13 +2044,13 @@ - (void)BIO_flush(bio_s_out); - if (rev) - do_server(port, socket_type, &accept_socket, rev_body, context, -- naccept); -+ naccept, use_ipv4, use_ipv6); - else if (www) - do_server(port, socket_type, &accept_socket, www_body, context, -- naccept); -+ naccept, use_ipv4, use_ipv6); - else - do_server(port, socket_type, &accept_socket, sv_body, context, -- naccept); -+ naccept, use_ipv4, use_ipv6); - print_stats(bio_s_out, ctx); - ret = 0; - end: ---- openssl-1.0.2/apps/s_socket.c -+++ openssl-1.0.2/apps/s_socket.c -@@ -101,16 +101,16 @@ - # include "netdb.h" - # endif - --static struct hostent *GetHostByName(char *name); -+static struct hostent *GetHostByName(char *name, int domain); - # if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)) - static void ssl_sock_cleanup(void); - # endif - static int ssl_sock_init(void); --static int init_client_ip(int *sock, unsigned char ip[4], int port, int type); --static int init_server(int *sock, int port, int type); --static int init_server_long(int *sock, int port, char *ip, int type); -+static int init_client_ip(int *sock, unsigned char *ip, int port, int type, int domain); -+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6); -+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6); - static int do_accept(int acc_sock, int *sock, char **host); --static int host_ip(char *str, unsigned char ip[4]); -+static int host_ip(char *str, unsigned char *ip, int domain); - - # ifdef OPENSSL_SYS_WIN16 - # define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ -@@ -231,38 +231,68 @@ - return (1); - } - --int init_client(int *sock, char *host, int port, int type) -+int init_client(int *sock, char *host, int port, int type, int use_ipv4, int use_ipv6) - { -+# if OPENSSL_USE_IPV6 -+ unsigned char ip[16]; -+# else - unsigned char ip[4]; -+# endif - -- memset(ip, '\0', sizeof ip); -- if (!host_ip(host, &(ip[0]))) -- return 0; -- return init_client_ip(sock, ip, port, type); --} -- --static int init_client_ip(int *sock, unsigned char ip[4], int port, int type) --{ -- unsigned long addr; -+ if (use_ipv4) -+ if (host_ip(host, ip, AF_INET)) -+ return(init_client_ip(sock, ip, port, type, AF_INET)); -+# if OPENSSL_USE_IPV6 -+ if (use_ipv6) -+ if (host_ip(host, ip, AF_INET6)) -+ return(init_client_ip(sock, ip, port, type, AF_INET6)); -+# endif -+ return 0; -+} -+ -+static int init_client_ip(int *sock, unsigned char ip[4], int port, int type, int domain) -+{ -+# if OPENSSL_USE_IPV6 -+ struct sockaddr_storage them; -+ struct sockaddr_in *them_in = (struct sockaddr_in *)&them; -+ struct sockaddr_in6 *them_in6 = (struct sockaddr_in6 *)&them; -+# else - struct sockaddr_in them; -+ struct sockaddr_in *them_in = &them; -+# endif -+ socklen_t addr_len; - int s, i; - - if (!ssl_sock_init()) - return (0); - - memset((char *)&them, 0, sizeof(them)); -- them.sin_family = AF_INET; -- them.sin_port = htons((unsigned short)port); -- addr = (unsigned long) -- ((unsigned long)ip[0] << 24L) | -- ((unsigned long)ip[1] << 16L) | -- ((unsigned long)ip[2] << 8L) | ((unsigned long)ip[3]); -- them.sin_addr.s_addr = htonl(addr); -+ if (domain == AF_INET) { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in); -+ them_in->sin_family=AF_INET; -+ them_in->sin_port=htons((unsigned short)port); -+# ifndef BIT_FIELD_LIMITS -+ memcpy(&them_in->sin_addr.s_addr, ip, 4); -+# else -+ memcpy(&them_in->sin_addr, ip, 4); -+# endif -+ } -+ else -+# if OPENSSL_USE_IPV6 -+ { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in6); -+ them_in6->sin6_family=AF_INET6; -+ them_in6->sin6_port=htons((unsigned short)port); -+ memcpy(&(them_in6->sin6_addr), ip, sizeof(struct in6_addr)); -+ } -+# else -+ return(0); -+# endif - - if (type == SOCK_STREAM) -- s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL); -+ s = socket(domain, SOCK_STREAM, SOCKET_PROTOCOL); - else /* ( type == SOCK_DGRAM) */ -- s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); -+ s = socket(domain, SOCK_DGRAM, IPPROTO_UDP); - - if (s == INVALID_SOCKET) { - perror("socket"); -@@ -280,7 +310,7 @@ - } - # endif - -- if (connect(s, (struct sockaddr *)&them, sizeof(them)) == -1) { -+ if (connect(s, (struct sockaddr *)&them, addr_len) == -1) { - closesocket(s); - perror("connect"); - return (0); -@@ -292,14 +322,14 @@ - int do_server(int port, int type, int *ret, - int (*cb) (char *hostname, int s, int stype, - unsigned char *context), unsigned char *context, -- int naccept) -+ int naccept, int use_ipv4, int use_ipv6) - { - int sock; - char *name = NULL; - int accept_socket = 0; - int i; - -- if (!init_server(&accept_socket, port, type)) -+ if (!init_server(&accept_socket, port, type, use_ipv4, use_ipv6)) - return (0); - - if (ret != NULL) { -@@ -328,32 +358,41 @@ - } - } - --static int init_server_long(int *sock, int port, char *ip, int type) -+static int init_server_long(int *sock, int port, char *ip, int type, int use_ipv4, int use_ipv6) - { - int ret = 0; -+ int domain; -+# if OPENSSL_USE_IPV6 -+ struct sockaddr_storage server; -+ struct sockaddr_in *server_in = (struct sockaddr_in *)&server; -+ struct sockaddr_in6 *server_in6 = (struct sockaddr_in6 *)&server; -+# else - struct sockaddr_in server; -+ struct sockaddr_in *server_in = &server; -+# endif -+ socklen_t addr_len; - int s = -1; - -+ if (!use_ipv4 && !use_ipv6) -+ goto err; -+# if OPENSSL_USE_IPV6 -+ /* we are fine here */ -+# else -+ if (use_ipv6) -+ goto err; -+# endif - if (!ssl_sock_init()) - return (0); - -- memset((char *)&server, 0, sizeof(server)); -- server.sin_family = AF_INET; -- server.sin_port = htons((unsigned short)port); -- if (ip == NULL) -- server.sin_addr.s_addr = INADDR_ANY; -- else --/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ --# ifndef BIT_FIELD_LIMITS -- memcpy(&server.sin_addr.s_addr, ip, 4); -+#if OPENSSL_USE_IPV6 -+ domain = use_ipv6 ? AF_INET6 : AF_INET; - # else -- memcpy(&server.sin_addr, ip, 4); -+ domain = AF_INET; - # endif -- - if (type == SOCK_STREAM) -- s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL); -- else /* type == SOCK_DGRAM */ -- s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); -+ s=socket(domain, SOCK_STREAM, SOCKET_PROTOCOL); -+ else /* type == SOCK_DGRAM */ -+ s=socket(domain, SOCK_DGRAM, IPPROTO_UDP); - - if (s == INVALID_SOCKET) - goto err; -@@ -363,7 +402,42 @@ - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (void *)&j, sizeof j); - } - # endif -- if (bind(s, (struct sockaddr *)&server, sizeof(server)) == -1) { -+# if OPENSSL_USE_IPV6 -+ if ((use_ipv4 == 0) && (use_ipv6 == 1)) { -+ const int on = 1; -+ -+ setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, -+ (const void *) &on, sizeof(int)); -+ } -+# endif -+ if (domain == AF_INET) { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in); -+ memset(server_in, 0, sizeof(struct sockaddr_in)); -+ server_in->sin_family=AF_INET; -+ server_in->sin_port = htons((unsigned short)port); -+ if (ip == NULL) -+ server_in->sin_addr.s_addr = htonl(INADDR_ANY); -+ else -+/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */ -+# ifndef BIT_FIELD_LIMITS -+ memcpy(&server_in->sin_addr.s_addr, ip, 4); -+# else -+ memcpy(&server_in->sin_addr, ip, 4); -+# endif -+ } -+# if OPENSSL_USE_IPV6 -+ else { -+ addr_len = (socklen_t)sizeof(struct sockaddr_in6); -+ memset(server_in6, 0, sizeof(struct sockaddr_in6)); -+ server_in6->sin6_family = AF_INET6; -+ server_in6->sin6_port = htons((unsigned short)port); -+ if (ip == NULL) -+ server_in6->sin6_addr = in6addr_any; -+ else -+ memcpy(&server_in6->sin6_addr, ip, sizeof(struct in6_addr)); -+ } -+# endif -+ if (bind(s, (struct sockaddr *)&server, addr_len) == -1) { - # ifndef OPENSSL_SYS_WINDOWS - perror("bind"); - # endif -@@ -381,16 +455,23 @@ - return (ret); - } - --static int init_server(int *sock, int port, int type) -+static int init_server(int *sock, int port, int type, int use_ipv4, int use_ipv6) - { -- return (init_server_long(sock, port, NULL, type)); -+ return (init_server_long(sock, port, NULL, type, use_ipv4, use_ipv6)); - } - - static int do_accept(int acc_sock, int *sock, char **host) - { - int ret; - struct hostent *h1, *h2; -- static struct sockaddr_in from; -+#if OPENSSL_USE_IPV6 -+ struct sockaddr_storage from; -+ struct sockaddr_in *from_in = (struct sockaddr_in *)&from; -+ struct sockaddr_in6 *from_in6 = (struct sockaddr_in6 *)&from; -+#else -+ struct sockaddr_in from; -+ struct sockaddr_in *from_in = &from; -+#endif - int len; - /* struct linger ling; */ - -@@ -440,14 +521,25 @@ - - if (host == NULL) - goto end; -+# if OPENSSL_USE_IPV6 -+ if (from.ss_family == AF_INET) -+# else -+ if (from.sin_family == AF_INET) -+# endif - # ifndef BIT_FIELD_LIMITS -- /* I should use WSAAsyncGetHostByName() under windows */ -- h1 = gethostbyaddr((char *)&from.sin_addr.s_addr, -- sizeof(from.sin_addr.s_addr), AF_INET); -+ /* I should use WSAAsyncGetHostByName() under windows */ -+ h1 = gethostbyaddr((char *)&from_in->sin_addr.s_addr, -+ sizeof(from_in->sin_addr.s_addr), AF_INET); - # else -- h1 = gethostbyaddr((char *)&from.sin_addr, -- sizeof(struct in_addr), AF_INET); -+ h1 = gethostbyaddr((char *)&from_in->sin_addr, -+ sizeof(struct in_addr), AF_INET); -+# endif -+# if OPENSSL_USE_IPV6 -+ else -+ h1 = gethostbyaddr((char *)&from_in6->sin6_addr, -+ sizeof(struct in6_addr), AF_INET6); - # endif -+ - if (h1 == NULL) { - BIO_printf(bio_err, "bad gethostbyaddr\n"); - *host = NULL; -@@ -460,14 +552,22 @@ - } - BUF_strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1); - -- h2 = GetHostByName(*host); -+# if OPENSSL_USE_IPV6 -+ h2=GetHostByName(*host, from.ss_family); -+# else -+ h2=GetHostByName(*host, from.sin_family); -+# endif - if (h2 == NULL) { - BIO_printf(bio_err, "gethostbyname failure\n"); - closesocket(ret); - return (0); - } -- if (h2->h_addrtype != AF_INET) { -- BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n"); -+# if OPENSSL_USE_IPV6 -+ if (h2->h_addrtype != from.ss_family) { -+# else -+ if (h2->h_addrtype != from.sin_family) { -+# endif -+ BIO_printf(bio_err, "gethostbyname addr is not correct\n"); - closesocket(ret); - return (0); - } -@@ -483,14 +583,14 @@ - char *h, *p; - - h = str; -- p = strchr(str, ':'); -+ p = strrchr(str, ':'); - if (p == NULL) { - BIO_printf(bio_err, "no port defined\n"); - return (0); - } - *(p++) = '\0'; - -- if ((ip != NULL) && !host_ip(str, ip)) -+ if ((ip != NULL) && !host_ip(str, ip, AF_INET)) - goto err; - if (host_ptr != NULL) - *host_ptr = h; -@@ -502,44 +602,51 @@ - return (0); - } - --static int host_ip(char *str, unsigned char ip[4]) -+static int host_ip(char *str, unsigned char *ip, int domain) - { - unsigned int in[4]; -+ unsigned long l; - int i; - -- if (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) == -- 4) { -+ if ((domain == AF_INET) && (sscanf(str, "%u.%u.%u.%u", &(in[0]), &(in[1]), &(in[2]), &(in[3])) == 4)) { - for (i = 0; i < 4; i++) - if (in[i] > 255) { - BIO_printf(bio_err, "invalid IP address\n"); - goto err; - } -- ip[0] = in[0]; -- ip[1] = in[1]; -- ip[2] = in[2]; -- ip[3] = in[3]; -- } else { /* do a gethostbyname */ -+ l=htonl((in[0]<<24L)|(in[1]<<16L)|(in[2]<<8L)|in[3]); -+ memcpy(ip, &l, 4); -+ return 1; -+ } -+# if OPENSSL_USE_IPV6 -+ else if ((domain == AF_INET6) && (inet_pton(AF_INET6, str, ip) == 1)) -+ return 1; -+# endif -+ else { /* do a gethostbyname */ - struct hostent *he; - - if (!ssl_sock_init()) - return (0); - -- he = GetHostByName(str); -+ he = GetHostByName(str, domain); - if (he == NULL) { - BIO_printf(bio_err, "gethostbyname failure\n"); - goto err; - } - /* cast to short because of win16 winsock definition */ -- if ((short)he->h_addrtype != AF_INET) { -- BIO_printf(bio_err, "gethostbyname addr is not AF_INET\n"); -+ if ((short)he->h_addrtype != domain) { -+ BIO_printf(bio_err, "gethostbyname addr is not correct\n"); - return (0); - } -- ip[0] = he->h_addr_list[0][0]; -- ip[1] = he->h_addr_list[0][1]; -- ip[2] = he->h_addr_list[0][2]; -- ip[3] = he->h_addr_list[0][3]; -+ if (domain == AF_INET) -+ memset(ip, 0, 4); -+# if OPENSSL_USE_IPV6 -+ else -+ memset(ip, 0, 16); -+# endif -+ memcpy(ip, he->h_addr_list[0], he->h_length); -+ return 1; - } -- return (1); - err: - return (0); - } -@@ -573,7 +680,7 @@ - static unsigned long ghbn_hits = 0L; - static unsigned long ghbn_miss = 0L; - --static struct hostent *GetHostByName(char *name) -+static struct hostent *GetHostByName(char *name, int domain) - { - struct hostent *ret; - int i, lowi = 0; -@@ -585,13 +692,18 @@ - lowi = i; - } - if (ghbn_cache[i].order > 0) { -- if (strncmp(name, ghbn_cache[i].name, 128) == 0) -+ if ((strncmp(name, ghbn_cache[i].name, 128) == 0) && (ghbn_cache[i].ent.h_addrtype == domain)) - break; - } - } - if (i == GHBN_NUM) { /* no hit */ - ghbn_miss++; -- ret = gethostbyname(name); -+ if (domain == AF_INET) -+ ret = gethostbyname(name); -+# if OPENSSL_USE_IPV6 -+ else -+ ret = gethostbyname2(name, AF_INET6); -+# endif - if (ret == NULL) - return (NULL); - /* else add to cache */ diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch deleted file mode 100644 index 0198818c5fa3..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch +++ /dev/null @@ -1,64 +0,0 @@ -https://rt.openssl.org/Ticket/Display.html?id=3736&user=guest&pass=guest - -From aba899f2eca21e11e5e9797bf8258e7265dea9f5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 8 Mar 2015 01:32:01 -0500 -Subject: [PATCH] fix parallel install with dir creation - -The mkdir-p.pl does not handle parallel creation of directories. -This comes up when the install_sw and install_docs rules run and -both call mkdir-p.pl on sibling directory trees. - -Instead, lets create a single install_dirs rule that makes all of -the dirs we need, and have these two install steps depend on that. ---- - Makefile.org | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/Makefile.org b/Makefile.org -index a6d9471..78e6143 100644 ---- a/Makefile.org -+++ b/Makefile.org -@@ -536,9 +536,9 @@ - dist_pem_h: - (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) - --install: all install_docs install_sw -+install: install_docs install_sw - --install_sw: -+install_dirs: - @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ - $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \ - $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \ -@@ -547,6 +547,13 @@ - $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \ - $(INSTALL_PREFIX)$(OPENSSLDIR)/private -+ @$(PERL) $(TOP)/util/mkdir-p.pl \ -+ $(INSTALL_PREFIX)$(MANDIR)/man1 \ -+ $(INSTALL_PREFIX)$(MANDIR)/man3 \ -+ $(INSTALL_PREFIX)$(MANDIR)/man5 \ -+ $(INSTALL_PREFIX)$(MANDIR)/man7 -+ -+install_sw: install_dirs - @set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\ - do \ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ -@@ -636,12 +643,7 @@ - done; \ - done - --install_docs: -- @$(PERL) $(TOP)/util/mkdir-p.pl \ -- $(INSTALL_PREFIX)$(MANDIR)/man1 \ -- $(INSTALL_PREFIX)$(MANDIR)/man3 \ -- $(INSTALL_PREFIX)$(MANDIR)/man5 \ -- $(INSTALL_PREFIX)$(MANDIR)/man7 -+install_docs: install_dirs - @pod2man="`cd ./util; ./pod2mantest $(PERL)`"; \ - here="`pwd`"; \ - filecase=; \ --- -2.3.4 - diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch deleted file mode 100644 index a7d6f4effea7..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://rt.openssl.org/Ticket/Display.html?id=3737&user=guest&pass=guest - -From ce279d4361e07e9af9ceca8a6e326e661758ad53 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sun, 8 Mar 2015 01:34:48 -0500 -Subject: [PATCH] fix parallel generation of obj headers - -The current code has dummy sleep/touch commands to try and work -around the parallel issue, but that is obviously racy. Instead -lets force one of the files to depend on the other so we know -they'll never run in parallel. ---- - crypto/objects/Makefile | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/crypto/objects/Makefile b/crypto/objects/Makefile -index ad2db1e..7d32504 100644 ---- a/crypto/objects/Makefile -+++ b/crypto/objects/Makefile -@@ -44,11 +44,11 @@ - # objects.pl both reads and writes obj_mac.num - obj_mac.h: objects.pl objects.txt obj_mac.num - $(PERL) objects.pl objects.txt obj_mac.num obj_mac.h -- @sleep 1; touch obj_mac.h; sleep 1 - --obj_xref.h: objxref.pl obj_xref.txt obj_mac.num -+# This doesn't really need obj_mac.h, but since that rule reads & writes -+# obj_mac.num, we can't run in parallel with it. -+obj_xref.h: objxref.pl obj_xref.txt obj_mac.num obj_mac.h - $(PERL) objxref.pl obj_mac.num obj_xref.txt > obj_xref.h -- @sleep 1; touch obj_xref.h; sleep 1 - - files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO --- -2.3.4 - diff --git a/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch b/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch deleted file mode 100644 index f2be696b1068..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch +++ /dev/null @@ -1,63 +0,0 @@ -https://rt.openssl.org/Ticket/Display.html?id=3780&user=guest&pass=guest - -From cc81af135bda47eaa6956a0329cbbc55bf993ac1 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 3 Apr 2015 01:16:23 -0400 -Subject: [PATCH] fix race when symlink shareds libs - -When the crypto/ssl targets attempt to build their shared libs, they run: - cd ..; make libcrypto.so.1.0.0 -The top level Makefile in turn runs the build-shared target for that lib. - -The build-shared target depends on both do_$(SHLIB_TARGET) & link-shared. -When building in parallel, make is allowed to run both of these. They -both run Makefile.shared for their respective targets: -do_$(SHLIB_TARGET) -> - link_a.linux-shared -> - link_a.gnu -> - ...; $(LINK_SO_A) -> - $(LINK_SO) -> - $(SYMLINK_SO) -link-shared -> - symlink.linux-shared -> - symlink.gnu -> - ...; $(SYMLINK_SO) - -The shell code for SYMLINK_SO attempts to do a [ -e lib ] check, but fails -basic TOCTOU semantics. Depending on the load, that means two processes -will run the sequence: - rm -f libcrypto.so - ln -s libcrypto.so.1.0.0 libcrypto.so - -Which obviously fails: - ln: failed to create symbolic link 'libcrypto.so': File exists - -Since we know do_$(SHLIB_TARGET) will create the symlink for us, don't -bother depending on link-shared at all in the top level Makefile when -building things. - -Reported-by: Martin von Gagern -URL: https://bugs.gentoo.org/545028 ---- - Makefile.org | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.org b/Makefile.org -index 890bfe4..576c60e 100644 ---- a/Makefile.org -+++ b/Makefile.org -@@ -350,7 +350,10 @@ link-shared: - libs="$$libs -l$$i"; \ - done - --build-shared: do_$(SHLIB_TARGET) link-shared -+# The link target in Makefile.shared will create the symlink for us, so no need -+# to call link-shared directly. Doing so will cause races with two processes -+# trying to symlink the lib. -+build-shared: do_$(SHLIB_TARGET) - - do_$(SHLIB_TARGET): - @ set -e; libs='-L. $(SHLIBDEPS)'; for i in $(SHLIBDIRS); do \ --- -2.3.4 - diff --git a/dev-libs/openssl/files/openssl-1.0.2i-parallel-build.patch b/dev-libs/openssl/files/openssl-1.0.2i-parallel-build.patch deleted file mode 100644 index 387a077da27d..000000000000 --- a/dev-libs/openssl/files/openssl-1.0.2i-parallel-build.patch +++ /dev/null @@ -1,326 +0,0 @@ ---- openssl-1.0.2i/crypto/Makefile -+++ openssl-1.0.2i/crypto/Makefile -@@ -85,11 +85,11 @@ - @if [ -z "$(THIS)" ]; then $(MAKE) -f $(TOP)/Makefile reflect THIS=$@; fi - - subdirs: -- @target=all; $(RECURSIVE_MAKE) -+ +@target=all; $(RECURSIVE_MAKE) - - files: - $(PERL) $(TOP)/util/files.pl "CPUID_OBJ=$(CPUID_OBJ)" Makefile >> $(TOP)/MINFO -- @target=files; $(RECURSIVE_MAKE) -+ +@target=files; $(RECURSIVE_MAKE) - - links: - @$(PERL) $(TOP)/util/mklink.pl ../include/openssl $(EXHEADER) -@@ -100,7 +100,7 @@ - # lib: $(LIB): are splitted to avoid end-less loop - lib: $(LIB) - @touch lib --$(LIB): $(LIBOBJ) -+$(LIB): $(LIBOBJ) | subdirs - $(AR) $(LIB) $(LIBOBJ) - test -z "$(FIPSLIBDIR)" || $(AR) $(LIB) $(FIPSLIBDIR)fipscanister.o - $(RANLIB) $(LIB) || echo Never mind. -@@ -111,7 +111,7 @@ - fi - - libs: -- @target=lib; $(RECURSIVE_MAKE) -+ +@target=lib; $(RECURSIVE_MAKE) - - install: - @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... -@@ -120,7 +120,7 @@ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; -- @target=install; $(RECURSIVE_MAKE) -+ +@target=install; $(RECURSIVE_MAKE) - - lint: - @target=lint; $(RECURSIVE_MAKE) ---- openssl-1.0.2i/engines/Makefile -+++ openssl-1.0.2i/engines/Makefile -@@ -72,7 +72,7 @@ - - all: lib subdirs - --lib: $(LIBOBJ) -+lib: $(LIBOBJ) | subdirs - @if [ -n "$(SHARED_LIBS)" ]; then \ - set -e; \ - for l in $(LIBNAMES); do \ -@@ -89,7 +89,7 @@ - - subdirs: - echo $(EDIRS) -- @target=all; $(RECURSIVE_MAKE) -+ +@target=all; $(RECURSIVE_MAKE) - - files: - $(PERL) $(TOP)/util/files.pl Makefile >> $(TOP)/MINFO -@@ -128,7 +128,7 @@ - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ - done; \ - fi -- @target=install; $(RECURSIVE_MAKE) -+ +@target=install; $(RECURSIVE_MAKE) - - tags: - ctags $(SRC) ---- openssl-1.0.2i/Makefile.org -+++ openssl-1.0.2i/Makefile.org -@@ -281,17 +281,17 @@ - build_libssl: build_ssl libssl.pc - - build_crypto: -- @dir=crypto; target=all; $(BUILD_ONE_CMD) -+ +@dir=crypto; target=all; $(BUILD_ONE_CMD) - build_ssl: build_crypto -- @dir=ssl; target=all; $(BUILD_ONE_CMD) -+ +@dir=ssl; target=all; $(BUILD_ONE_CMD) - build_engines: build_crypto -- @dir=engines; target=all; $(BUILD_ONE_CMD) -+ +@dir=engines; target=all; $(BUILD_ONE_CMD) - build_apps: build_libs -- @dir=apps; target=all; $(BUILD_ONE_CMD) -+ +@dir=apps; target=all; $(BUILD_ONE_CMD) - build_tests: build_libs -- @dir=test; target=all; $(BUILD_ONE_CMD) -+ +@dir=test; target=all; $(BUILD_ONE_CMD) - build_tools: build_libs -- @dir=tools; target=all; $(BUILD_ONE_CMD) -+ +@dir=tools; target=all; $(BUILD_ONE_CMD) - - all_testapps: build_libs build_testapps - build_testapps: -@@ -547,7 +547,7 @@ - (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \ - chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \ - done; -- @set -e; target=install; $(RECURSIVE_BUILD_CMD) -+ +@set -e; target=install; $(RECURSIVE_BUILD_CMD) - @set -e; liblist="$(LIBS)"; for i in $$liblist ;\ - do \ - if [ -f "$$i" ]; then \ ---- openssl-1.0.2i/Makefile.shared -+++ openssl-1.0.2i/Makefile.shared -@@ -105,6 +105,7 @@ - SHAREDFLAGS="$${SHAREDFLAGS:-$(CFLAGS) $(SHARED_LDFLAGS)}"; \ - LIBPATH=`for x in $$LIBDEPS; do echo $$x; done | sed -e 's/^ *-L//;t' -e d | uniq`; \ - LIBPATH=`echo $$LIBPATH | sed -e 's/ /:/g'`; \ -+ [ -e $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX ] && exit 0; \ - LD_LIBRARY_PATH=$$LIBPATH:$$LD_LIBRARY_PATH \ - $${SHAREDCMD} $${SHAREDFLAGS} \ - -o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \ -@@ -122,6 +123,7 @@ - done; \ - fi; \ - if [ -n "$$SHLIB_SOVER" ]; then \ -+ [ -e "$$SHLIB$$SHLIB_SUFFIX" ] || \ - ( $(SET_X); rm -f $$SHLIB$$SHLIB_SUFFIX; \ - ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \ - fi; \ ---- openssl-1.0.2i/test/Makefile -+++ openssl-1.0.2i/test/Makefile -@@ -144,7 +144,7 @@ - tags: - ctags $(SRC) - --tests: exe apps $(TESTS) -+tests: exe $(TESTS) - - apps: - @(cd ..; $(MAKE) DIRS=apps all) -@@ -435,136 +435,136 @@ - link_app.$${shlib_target} - - $(RSATEST)$(EXE_EXT): $(RSATEST).o $(DLIBCRYPTO) -- @target=$(RSATEST); $(BUILD_CMD) -+ +@target=$(RSATEST); $(BUILD_CMD) - - $(BNTEST)$(EXE_EXT): $(BNTEST).o $(DLIBCRYPTO) -- @target=$(BNTEST); $(BUILD_CMD) -+ +@target=$(BNTEST); $(BUILD_CMD) - - $(ECTEST)$(EXE_EXT): $(ECTEST).o $(DLIBCRYPTO) -- @target=$(ECTEST); $(BUILD_CMD) -+ +@target=$(ECTEST); $(BUILD_CMD) - - $(EXPTEST)$(EXE_EXT): $(EXPTEST).o $(DLIBCRYPTO) -- @target=$(EXPTEST); $(BUILD_CMD) -+ +@target=$(EXPTEST); $(BUILD_CMD) - - $(IDEATEST)$(EXE_EXT): $(IDEATEST).o $(DLIBCRYPTO) -- @target=$(IDEATEST); $(BUILD_CMD) -+ +@target=$(IDEATEST); $(BUILD_CMD) - - $(MD2TEST)$(EXE_EXT): $(MD2TEST).o $(DLIBCRYPTO) -- @target=$(MD2TEST); $(BUILD_CMD) -+ +@target=$(MD2TEST); $(BUILD_CMD) - - $(SHATEST)$(EXE_EXT): $(SHATEST).o $(DLIBCRYPTO) -- @target=$(SHATEST); $(BUILD_CMD) -+ +@target=$(SHATEST); $(BUILD_CMD) - - $(SHA1TEST)$(EXE_EXT): $(SHA1TEST).o $(DLIBCRYPTO) -- @target=$(SHA1TEST); $(BUILD_CMD) -+ +@target=$(SHA1TEST); $(BUILD_CMD) - - $(SHA256TEST)$(EXE_EXT): $(SHA256TEST).o $(DLIBCRYPTO) -- @target=$(SHA256TEST); $(BUILD_CMD) -+ +@target=$(SHA256TEST); $(BUILD_CMD) - - $(SHA512TEST)$(EXE_EXT): $(SHA512TEST).o $(DLIBCRYPTO) -- @target=$(SHA512TEST); $(BUILD_CMD) -+ +@target=$(SHA512TEST); $(BUILD_CMD) - - $(RMDTEST)$(EXE_EXT): $(RMDTEST).o $(DLIBCRYPTO) -- @target=$(RMDTEST); $(BUILD_CMD) -+ +@target=$(RMDTEST); $(BUILD_CMD) - - $(MDC2TEST)$(EXE_EXT): $(MDC2TEST).o $(DLIBCRYPTO) -- @target=$(MDC2TEST); $(BUILD_CMD) -+ +@target=$(MDC2TEST); $(BUILD_CMD) - - $(MD4TEST)$(EXE_EXT): $(MD4TEST).o $(DLIBCRYPTO) -- @target=$(MD4TEST); $(BUILD_CMD) -+ +@target=$(MD4TEST); $(BUILD_CMD) - - $(MD5TEST)$(EXE_EXT): $(MD5TEST).o $(DLIBCRYPTO) -- @target=$(MD5TEST); $(BUILD_CMD) -+ +@target=$(MD5TEST); $(BUILD_CMD) - - $(HMACTEST)$(EXE_EXT): $(HMACTEST).o $(DLIBCRYPTO) -- @target=$(HMACTEST); $(BUILD_CMD) -+ +@target=$(HMACTEST); $(BUILD_CMD) - - $(WPTEST)$(EXE_EXT): $(WPTEST).o $(DLIBCRYPTO) -- @target=$(WPTEST); $(BUILD_CMD) -+ +@target=$(WPTEST); $(BUILD_CMD) - - $(RC2TEST)$(EXE_EXT): $(RC2TEST).o $(DLIBCRYPTO) -- @target=$(RC2TEST); $(BUILD_CMD) -+ +@target=$(RC2TEST); $(BUILD_CMD) - - $(BFTEST)$(EXE_EXT): $(BFTEST).o $(DLIBCRYPTO) -- @target=$(BFTEST); $(BUILD_CMD) -+ +@target=$(BFTEST); $(BUILD_CMD) - - $(CASTTEST)$(EXE_EXT): $(CASTTEST).o $(DLIBCRYPTO) -- @target=$(CASTTEST); $(BUILD_CMD) -+ +@target=$(CASTTEST); $(BUILD_CMD) - - $(RC4TEST)$(EXE_EXT): $(RC4TEST).o $(DLIBCRYPTO) -- @target=$(RC4TEST); $(BUILD_CMD) -+ +@target=$(RC4TEST); $(BUILD_CMD) - - $(RC5TEST)$(EXE_EXT): $(RC5TEST).o $(DLIBCRYPTO) -- @target=$(RC5TEST); $(BUILD_CMD) -+ +@target=$(RC5TEST); $(BUILD_CMD) - - $(DESTEST)$(EXE_EXT): $(DESTEST).o $(DLIBCRYPTO) -- @target=$(DESTEST); $(BUILD_CMD) -+ +@target=$(DESTEST); $(BUILD_CMD) - - $(RANDTEST)$(EXE_EXT): $(RANDTEST).o $(DLIBCRYPTO) -- @target=$(RANDTEST); $(BUILD_CMD) -+ +@target=$(RANDTEST); $(BUILD_CMD) - - $(DHTEST)$(EXE_EXT): $(DHTEST).o $(DLIBCRYPTO) -- @target=$(DHTEST); $(BUILD_CMD) -+ +@target=$(DHTEST); $(BUILD_CMD) - - $(DSATEST)$(EXE_EXT): $(DSATEST).o $(DLIBCRYPTO) -- @target=$(DSATEST); $(BUILD_CMD) -+ +@target=$(DSATEST); $(BUILD_CMD) - - $(METHTEST)$(EXE_EXT): $(METHTEST).o $(DLIBCRYPTO) -- @target=$(METHTEST); $(BUILD_CMD) -+ +@target=$(METHTEST); $(BUILD_CMD) - - $(SSLTEST)$(EXE_EXT): $(SSLTEST).o $(DLIBSSL) $(DLIBCRYPTO) -- @target=$(SSLTEST); $(FIPS_BUILD_CMD) -+ +@target=$(SSLTEST); $(FIPS_BUILD_CMD) - - $(ENGINETEST)$(EXE_EXT): $(ENGINETEST).o $(DLIBCRYPTO) -- @target=$(ENGINETEST); $(BUILD_CMD) -+ +@target=$(ENGINETEST); $(BUILD_CMD) - - $(EVPTEST)$(EXE_EXT): $(EVPTEST).o $(DLIBCRYPTO) -- @target=$(EVPTEST); $(BUILD_CMD) -+ +@target=$(EVPTEST); $(BUILD_CMD) - - $(EVPEXTRATEST)$(EXE_EXT): $(EVPEXTRATEST).o $(DLIBCRYPTO) -- @target=$(EVPEXTRATEST); $(BUILD_CMD) -+ +@target=$(EVPEXTRATEST); $(BUILD_CMD) - - $(ECDSATEST)$(EXE_EXT): $(ECDSATEST).o $(DLIBCRYPTO) -- @target=$(ECDSATEST); $(BUILD_CMD) -+ +@target=$(ECDSATEST); $(BUILD_CMD) - - $(ECDHTEST)$(EXE_EXT): $(ECDHTEST).o $(DLIBCRYPTO) -- @target=$(ECDHTEST); $(BUILD_CMD) -+ +@target=$(ECDHTEST); $(BUILD_CMD) - - $(IGETEST)$(EXE_EXT): $(IGETEST).o $(DLIBCRYPTO) -- @target=$(IGETEST); $(BUILD_CMD) -+ +@target=$(IGETEST); $(BUILD_CMD) - - $(JPAKETEST)$(EXE_EXT): $(JPAKETEST).o $(DLIBCRYPTO) -- @target=$(JPAKETEST); $(BUILD_CMD) -+ +@target=$(JPAKETEST); $(BUILD_CMD) - - $(ASN1TEST)$(EXE_EXT): $(ASN1TEST).o $(DLIBCRYPTO) -- @target=$(ASN1TEST); $(BUILD_CMD) -+ +@target=$(ASN1TEST); $(BUILD_CMD) - - $(SRPTEST)$(EXE_EXT): $(SRPTEST).o $(DLIBCRYPTO) -- @target=$(SRPTEST); $(BUILD_CMD) -+ +@target=$(SRPTEST); $(BUILD_CMD) - - $(V3NAMETEST)$(EXE_EXT): $(V3NAMETEST).o $(DLIBCRYPTO) -- @target=$(V3NAMETEST); $(BUILD_CMD) -+ +@target=$(V3NAMETEST); $(BUILD_CMD) - - $(HEARTBEATTEST)$(EXE_EXT): $(HEARTBEATTEST).o $(DLIBCRYPTO) -- @target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) -+ +@target=$(HEARTBEATTEST); $(BUILD_CMD_STATIC) - - $(CONSTTIMETEST)$(EXE_EXT): $(CONSTTIMETEST).o -- @target=$(CONSTTIMETEST) $(BUILD_CMD) -+ +@target=$(CONSTTIMETEST) $(BUILD_CMD) - - $(VERIFYEXTRATEST)$(EXE_EXT): $(VERIFYEXTRATEST).o -- @target=$(VERIFYEXTRATEST) $(BUILD_CMD) -+ +@target=$(VERIFYEXTRATEST) $(BUILD_CMD) - - $(CLIENTHELLOTEST)$(EXE_EXT): $(CLIENTHELLOTEST).o -- @target=$(CLIENTHELLOTEST) $(BUILD_CMD) -+ +@target=$(CLIENTHELLOTEST) $(BUILD_CMD) - - $(BADDTLSTEST)$(EXE_EXT): $(BADDTLSTEST).o -- @target=$(BADDTLSTEST) $(BUILD_CMD) -+ +@target=$(BADDTLSTEST) $(BUILD_CMD) - - $(SSLV2CONFTEST)$(EXE_EXT): $(SSLV2CONFTEST).o -- @target=$(SSLV2CONFTEST) $(BUILD_CMD) -+ +@target=$(SSLV2CONFTEST) $(BUILD_CMD) - - $(DTLSTEST)$(EXE_EXT): $(DTLSTEST).o ssltestlib.o $(DLIBSSL) $(DLIBCRYPTO) -- @target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD) -+ +@target=$(DTLSTEST); exobj=ssltestlib.o; $(BUILD_CMD) - - #$(AESTEST).o: $(AESTEST).c - # $(CC) -c $(CFLAGS) -DINTERMEDIATE_VALUE_KAT -DTRACE_KAT_MCT $(AESTEST).c -@@ -577,7 +577,7 @@ - # fi - - dummytest$(EXE_EXT): dummytest.o $(DLIBCRYPTO) -- @target=dummytest; $(BUILD_CMD) -+ +@target=dummytest; $(BUILD_CMD) - - # DO NOT DELETE THIS LINE -- make depend depends on it. - diff --git a/dev-libs/openssl/openssl-1.0.2k.ebuild b/dev-libs/openssl/openssl-1.0.2k.ebuild deleted file mode 100644 index 9ba2eeef6ad4..000000000000 --- a/dev-libs/openssl/openssl-1.0.2k.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal - -MY_P=${P/_/-} -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" - -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="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist )" - -RDEPEND=">=app-misc/c_rehash-1.7-r1 - 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}] )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - )" -PDEPEND="app-misc/ca-certificates" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -src_prepare() { - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # 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.2i-parallel-build.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 - epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 - - 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.2 gentoo.config || die - chmod a+rx gentoo.config - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - 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: Expired 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 - - # https://github.com/openssl/openssl/issues/2286 - if use ia64 ; then - replace-flags -g3 -g2 - replace-flags -ggdb3 -ggdb2 - fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - $(use_ssl !bindist ec) \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - enable-rc5 \ - enable-tlsext \ - $(use_ssl asm) \ - $(use_ssl gmp gmp -lgmp) \ - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl sslv2 ssl2) \ - $(use_ssl sslv3 ssl3) \ - $(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() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - 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_postinst() { - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-libs/openssl/openssl-1.0.2l-r1.ebuild b/dev-libs/openssl/openssl-1.0.2l-r1.ebuild deleted file mode 100644 index 4c78a177bf6b..000000000000 --- a/dev-libs/openssl/openssl-1.0.2l-r1.ebuild +++ /dev/null @@ -1,296 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal - -MY_P=${P/_/-} -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" - -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="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist )" - -RDEPEND=">=app-misc/c_rehash-1.7-r1 - 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}] )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - )" -PDEPEND="app-misc/ca-certificates" - -# This does not copy the entire Fedora patchset, but JUST the parts that -# are needed to make it safe to use EC with RESTRICT=bindist. -# See openssl.spec for the matching numbering of SourceNNN, PatchNNN -SOURCE1=hobble-openssl -SOURCE12=ec_curve.c -SOURCE13=ectest.c -#PATCH1=openssl-1.1.0-build.patch # Fixes EVP testcase for EC -#PATCH37=openssl-1.1.0-ec-curves.patch -FEDORA_GIT_BASE='https://src.fedoraproject.org/cgit/rpms/openssl.git/plain/' -FEDORA_GIT_BRANCH='f25' -FEDORA_SRC_URI=() -FEDORA_SOURCE=( $SOURCE1 $SOURCE12 $SOURCE13 ) -FEDORA_PATCH=( $PATCH1 $PATCH37 ) -for i in "${FEDORA_SOURCE[@]}" ; do - FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${P}_${i}" ) -done -for i in "${FEDORA_PATCH[@]}" ; do # Already have a version prefix - FEDORA_SRC_URI+=( "${FEDORA_GIT_BASE}/${i}?h=${FEDORA_GIT_BRANCH} -> ${i}" ) -done -SRC_URI+=" bindist? ( ${FEDORA_SRC_URI[@]} )" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -src_prepare() { - if use bindist; then - # This just removes the prefix, and puts it into WORKDIR like the RPM. - for i in "${FEDORA_SOURCE[@]}" ; do - cp -f "${DISTDIR}"/"${P}_${i}" "${WORKDIR}"/"${i}" || die - done - # .spec %prep - bash "${WORKDIR}"/"${SOURCE1}" || die - cp -f "${WORKDIR}"/"${SOURCE12}" "${S}"/crypto/ec/ || die - cp -f "${WORKDIR}"/"${SOURCE13}" "${S}"/crypto/ec/ || die # Moves to test/ in OpenSSL-1.1 - for i in "${FEDORA_PATCH[@]}" ; do - epatch "${DISTDIR}"/"${i}" - done - # Also see the configure parts below: - # enable-ec \ - # $(use_ssl !bindist ec2m) \ - # $(use_ssl !bindist srp) \ - - fi - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # 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.2i-parallel-build.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 - epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 - - 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.2 gentoo.config || die - chmod a+rx gentoo.config - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - 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: Expired 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 - - # https://github.com/openssl/openssl/issues/2286 - if use ia64 ; then - replace-flags -g3 -g2 - replace-flags -ggdb3 -ggdb2 - fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - # Fedora hobbled-EC needs 'no-ec2m', 'no-srp' - echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - enable-ec \ - $(use_ssl !bindist ec2m) \ - $(use_ssl !bindist srp) \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - enable-rc5 \ - enable-tlsext \ - $(use_ssl asm) \ - $(use_ssl gmp gmp -lgmp) \ - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl sslv2 ssl2) \ - $(use_ssl sslv3 ssl3) \ - $(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() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - 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_postinst() { - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-libs/openssl/openssl-1.0.2l.ebuild b/dev-libs/openssl/openssl-1.0.2l.ebuild deleted file mode 100644 index 324313704504..000000000000 --- a/dev-libs/openssl/openssl-1.0.2l.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal - -MY_P=${P/_/-} -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="http://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" - -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="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist )" - -RDEPEND=">=app-misc/c_rehash-1.7-r1 - 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}] )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - )" -PDEPEND="app-misc/ca-certificates" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -src_prepare() { - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # 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.2i-parallel-build.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 - epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 - - 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.2 gentoo.config || die - chmod a+rx gentoo.config - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - 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: Expired 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 - - # https://github.com/openssl/openssl/issues/2286 - if use ia64 ; then - replace-flags -g3 -g2 - replace-flags -ggdb3 -ggdb2 - fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - $(use_ssl !bindist ec) \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - enable-rc5 \ - enable-tlsext \ - $(use_ssl asm) \ - $(use_ssl gmp gmp -lgmp) \ - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl sslv2 ssl2) \ - $(use_ssl sslv3 ssl3) \ - $(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() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - 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_postinst() { - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-libs/openssl/openssl-1.0.2m.ebuild b/dev-libs/openssl/openssl-1.0.2m.ebuild deleted file mode 100644 index c356e4ff2bd5..000000000000 --- a/dev-libs/openssl/openssl-1.0.2m.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic toolchain-funcs multilib multilib-minimal - -MY_P=${P/_/-} -DESCRIPTION="full-strength general purpose cryptography library (including SSL and TLS)" -HOMEPAGE="https://www.openssl.org/" -SRC_URI="mirror://openssl/source/${MY_P}.tar.gz" - -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="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" -RESTRICT="!bindist? ( bindist )" - -RDEPEND=">=app-misc/c_rehash-1.7-r1 - 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}] )" -DEPEND="${RDEPEND} - >=dev-lang/perl-5 - sctp? ( >=net-misc/lksctp-tools-1.0.12 ) - test? ( - sys-apps/diffutils - sys-devel/bc - )" -PDEPEND="app-misc/ca-certificates" - -S="${WORKDIR}/${MY_P}" - -MULTILIB_WRAPPED_HEADERS=( - usr/include/openssl/opensslconf.h -) - -src_prepare() { - # keep this in sync with app-misc/c_rehash - SSL_CNF_DIR="/etc/ssl" - - # 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.2i-parallel-build.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-obj-headers.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-install-dirs.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-parallel-symlinking.patch #545028 - epatch "${FILESDIR}"/${PN}-1.0.2-ipv6.patch - epatch "${FILESDIR}"/${PN}-1.0.2a-x32-asm.patch #542618 - epatch "${FILESDIR}"/${PN}-1.0.1p-default-source.patch #554338 - - 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.2 gentoo.config || die - chmod a+rx gentoo.config - - append-flags -fno-strict-aliasing - append-flags $(test-flags-CC -Wa,--noexecstack) - append-cppflags -DOPENSSL_NO_BUF_FREELISTS - - 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: Expired 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 - - # https://github.com/openssl/openssl/issues/2286 - if use ia64 ; then - replace-flags -g3 -g2 - replace-flags -ggdb3 -ggdb2 - fi - - local sslout=$(./gentoo.config) - einfo "Use configuration ${sslout:-(openssl knows best)}" - local config="Configure" - [[ -z ${sslout} ]] && config="config" - - echoit \ - ./${config} \ - ${sslout} \ - $(use cpu_flags_x86_sse2 || echo "no-sse2") \ - enable-camellia \ - $(use_ssl !bindist ec) \ - ${ec_nistp_64_gcc_128} \ - enable-idea \ - enable-mdc2 \ - enable-rc5 \ - enable-tlsext \ - $(use_ssl asm) \ - $(use_ssl gmp gmp -lgmp) \ - $(use_ssl kerberos krb5 --with-krb5-flavor=${krb5}) \ - $(use_ssl rfc3779) \ - $(use_ssl sctp) \ - $(use_ssl sslv2 ssl2) \ - $(use_ssl sslv3 ssl3) \ - $(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() { - # openssl installs perl version of c_rehash by default, but - # we provide a shell version via app-misc/c_rehash - rm "${ED}"/usr/bin/c_rehash || die - - 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_postinst() { - ebegin "Running 'c_rehash ${EROOT%/}${SSL_CNF_DIR}/certs/' to rebuild hashes #333069" - c_rehash "${EROOT%/}${SSL_CNF_DIR}/certs" >/dev/null - eend $? -} diff --git a/dev-libs/openssl/openssl-1.0.2n.ebuild b/dev-libs/openssl/openssl-1.0.2n.ebuild index a88355e47eff..4ace32192cec 100644 --- a/dev-libs/openssl/openssl-1.0.2n.ebuild +++ b/dev-libs/openssl/openssl-1.0.2n.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://openssl/source/${MY_P}.tar.gz 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" +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="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 sslv2 +sslv3 static-libs test +tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist )" diff --git a/dev-libs/pslib/Manifest b/dev-libs/pslib/Manifest index ff02d1684da9..137e6b4e0d60 100644 --- a/dev-libs/pslib/Manifest +++ b/dev-libs/pslib/Manifest @@ -1,7 +1,8 @@ +AUX pslib-0.4.5-fix-build-system.patch 530 BLAKE2B 69693c754bd4e348e8f4af2876ee0ae19b9278bc192194e9d61bd007701868bd1d676d1c19133aa390301aef7eeee9a5abb7cc8750a05f1ef1d93676dd1df917 SHA512 d9baf7bddff0ebe673d7396e4e4873ba71156d149b4544a537d31734771f4b91b8bfa809b92fcc44f3f9a9f28bd758bcf805ec26cef3e8731281581ccf933044 AUX pslib-getline.patch 1249 BLAKE2B 02dfbb72459468618f472f6c09c229b22d241a8c4425a49f11deb06678fb25934aa8ec8b90c93a064d8feedb5d6136bb051f8004dfaed34186a638ca8b9c889f SHA512 11e492dd77a74629da3700ab4c21a80fbd05465adc7a9bbb5c9044883bb2e9027b0e25b9280d8c3346d759a2a4e0e78726c2a434e35ce1574a737be889bb9312 AUX pslib-lm.patch 317 BLAKE2B 4ee5ef10537a6535f8fd4b9a3c2dc65feead6d8ba4f41516d6e171d7638314fbeb6c1a63a5e834d8638b8609d9f453267451bb9c904195a1dbd85f7f460fcebc SHA512 e3cb1e8a48d29a9215d681c051f0a6b66155037d0ddd4b1eea68e5aec446b30ad26f71a1129bd887e291e8118dd3334761909d33bfa7afd4f4267e70ea566bf4 DIST pslib-0.4.1.tar.gz 531797 BLAKE2B 28224be5411739d20118e3457050b7fc388ad0c5f1f14403080732588b16b2bfc89bad5ce8383db5d5da85fceca466fe81588550c949d18c5c4965889c26f9bc SHA512 012c0b2de1cb151fc41498ca4e6f62ec15138b35afddd0199c6366b818c7b544877eea9575df0e1aee49a67cd52dcac47eae405854e7390abeb64fda221327cf DIST pslib-0.4.5.tar.gz 493687 BLAKE2B cca0709bc3fa9f464166b02ca54d85056c510f677b478b4f187fba653b3a17af38c3c7ffbea23113d5ad3a146e881d183f138d836cd5f373a116e836ba8d4974 SHA512 410abfdca6c52f16c07b7d0157930fbb7a996f03bfb84aee2bc951b2d859bc2186d3ba742b724cd957b9b1c48201364fbeb11c15d7f4ead34f78b0d0746abc6f EBUILD pslib-0.4.1-r2.ebuild 1094 BLAKE2B f1723233d1e6a94818b926a4b3552658cdf3be9d2aa22518d65475419977cd2ea835e9520665fcbea9d022425cf3eb79386d1350a3e2083c8918f3ff28c9bd2c SHA512 6258000303c0729c472875a4d4569fa13d2b3b7585a9769d3698049dd12436c904574fed7532815f037489881b2a555b6cc1c8781910f09139d3eedd1556b324 -EBUILD pslib-0.4.5.ebuild 1098 BLAKE2B 31d69eb995dcb26af67f8d79942835329909ec8847ff4345550227df766140b06a3ec42ef90212716f89b5c3fbdbc5cf1bb27dc8565c9861b8b974e49c50a562 SHA512 c6ca1f1bfb43f7c5bfad6cbae87174416ea2f0596dd213d045697a2c6256cc72e03d0d848d97064bf634015acda09c5f5469323dea5b754a73864dcf258ea3b2 +EBUILD pslib-0.4.5.ebuild 1060 BLAKE2B e5fd165c8ae4c77adcd146bc7494bfd4f9ce03f0d71489a3d88eae39ff315eeeaa1b171093e3136fcf4519caf48c274e89b06665538a58dd576449121a3e8372 SHA512 c94021a8bdad8f9c4628cf9ee63c619261bf1d8e2c947bcdae6380e73702b6467a2306b1f00e9816272241f89fbb6c3e9fc3e4a1c32f485edff63b1fed2af4b4 MISC metadata.xml 444 BLAKE2B 62c386b9fc2facb334d02520386624241580034bfb227c243f5b589eafef655084b84cb5e5f6dac3cfe73afbd0dfbf41c161261ede4e780bd84bec56a2302a14 SHA512 e50857e3a1c443849c5eafbeb72d41558c1bd8c6a58f22a4ab6b1590647db278e598bfb123eac6a8b50754d8bbd524dc574c3181c1e08bc24fdcce3f13a148bb diff --git a/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch b/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch new file mode 100644 index 000000000000..242a819d0da9 --- /dev/null +++ b/dev-libs/pslib/files/pslib-0.4.5-fix-build-system.patch @@ -0,0 +1,22 @@ +--- a/configure.in ++++ b/configure.in +@@ -4,7 +4,7 @@ + AC_CONFIG_SRCDIR(src/pslib.c) + AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) + +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS([config.h]) + AM_MAINTAINER_MODE + + AC_PROG_INTLTOOL +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -36,7 +36,7 @@ + ps_fontenc.c \ + ps_strbuf.c + +-libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS) ++libps_la_LIBADD = $(LIBHNJ_LIBS) $(PNG_LIBS) $(JPEG_LIBS) $(GIF_LIBS) $(TIFF_LIBS) -lm + + BUILD_LIBS = -lm + diff --git a/dev-libs/pslib/pslib-0.4.5.ebuild b/dev-libs/pslib/pslib-0.4.5.ebuild index f3a704c4f436..b81fc2baa5c4 100644 --- a/dev-libs/pslib/pslib-0.4.5.ebuild +++ b/dev-libs/pslib/pslib-0.4.5.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=4 +EAPI=6 -inherit eutils autotools +inherit autotools DESCRIPTION="pslib is a C-library to create PostScript files on the fly" HOMEPAGE="http://pslib.sourceforge.net/" @@ -15,9 +15,9 @@ KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="debug jpeg png static-libs tiff" RDEPEND=" - png? ( >=media-libs/libpng-1.2.43-r2:0 ) - jpeg? ( virtual/jpeg ) - tiff? ( media-libs/tiff )" + png? ( media-libs/libpng:0= ) + jpeg? ( virtual/jpeg:0 ) + tiff? ( media-libs/tiff:0= )" #gif? requires libungif, not in portage DEPEND="${RDEPEND} dev-lang/perl @@ -25,10 +25,11 @@ DEPEND="${RDEPEND} dev-util/intltool dev-perl/XML-Parser" +PATCHES=( "${FILESDIR}"/${PN}-0.4.5-fix-build-system.patch ) + src_prepare() { - # hackpatchfix underlinking - sed -i -e 's/$(TIFF_LIBS)/$(TIFF_LIBS) -lm/' src/Makefile.am || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die + default + mv configure.{in,ac} || die eautoreconf } @@ -45,5 +46,6 @@ src_configure() { src_install() { default - prune_libtool_files --all + # package installs .pc files + find "${D}" -name '*.la' -delete || die } diff --git a/dev-libs/rlog/Manifest b/dev-libs/rlog/Manifest index c1696ebbabdc..3b73edb20c02 100644 --- a/dev-libs/rlog/Manifest +++ b/dev-libs/rlog/Manifest @@ -1,4 +1,5 @@ -AUX rlog-1.3.7-gcc-4.3.patch 199 BLAKE2B da3f30d44d024c4b32ce22f7e4e5b13280f5c365939725d97e57d149bcb1f02e16d16f3ca0d0c8df8860677c12686428d5e807402a2739eeba06f453baad7a39 SHA512 6f1df1b960e7ecbf4ffc24f71f6f9c6293a501cb181e453771480a38c84e7a47ec37766e7d98d24225f52d95312a5af600bbb9e19c0424f8b5f8e9f236c95f51 +AUX rlog-1.3.7-gcc-4.3.patch 203 BLAKE2B 805bae9fa8ab6f9d069056cd8c0c2df96f5b50994a7f14cc4f4e1efbd69ff1be433edcd200dadc986462ed9d8cc0caacfd515dd1480638d48a9156a3aeebd4a1 SHA512 e3d07bcd0aad871c5cbda75335cd20f598bbe25401ee5a6fb735f0d0f5a37946c78c9eb8190fa8ae31351704c2e0806b89d06db56d225d7e6f477a2a9b78ae1d +AUX rlog-1.4-fix-build-system.patch 1283 BLAKE2B 2e7d38de9be902224dd82ade699ed9aedb56cdbf9ea272373e74d541c126c4edf2a5814cd078e4309887c8f732c3731ed035bf3018ebfbee55adc3f74328198d SHA512 e956ae108f61d8e71379d0b2722e670d52d9954713725629309f91176f419b9a188578e4e3381992ad4bbf577fb2b747d8680ad01b5e92864f4c6be721095b4f DIST rlog-1.4.tar.gz 640641 BLAKE2B ff17c9cefb20045a95d69954dd6d1756a342a5a97b640e8a286db98e5e55d1cb05da48a5df7ba1ad4b5f23678cfefd677cbf6f9f45ab647373858a2ddf25881e SHA512 a0af9afd6c5329ec4269a7778c3236b9e0b438cba65ed0a6f9cd7e802d196b7908eed5ab663f52905869cacffc7f1964b20ab2a53b37dbe65f1c8a9226cc423e -EBUILD rlog-1.4.ebuild 521 BLAKE2B f536b2e7a1f51aca7f09fbb75a4bfab9d21841c275b7eeda2469631d05acbd89bab2014148330795f9523b2710743e776e9bf59fd4e4e18275b5691f5cbefbad SHA512 09907de502f2b3865a8e7ef082afb5bb83597d3633a4a6265778a447a8a5a522cd49d3013f5e46fc400f4f8c9efd3a2c68de95f1a9de1ec8c71352f10a64bbdd +EBUILD rlog-1.4.ebuild 580 BLAKE2B e428c653b3fdf30a7d0d49932981fb0352ea77aba0739bb111e20a01972eb6e0711c3e1b25c0874e32a33a80267256c90f1b7fb0831eb0d0b66d89da371f282f SHA512 cfed6a79af238dbdace3fdf28a0042ba711cdad6070aa2e3ff3ba7e28e481e7ce6223bc3b82f276e96c0b6f8602dcc59cd74c8660617d57ed6d7b38fc127e24f MISC metadata.xml 323 BLAKE2B 24c50af72b0366021e5909c8c82cd536a8cff3ff1ec24e5120810782bec14088b0a2c60f46ecc819a08e009a98b38c58f89c4c1b2886604e8583f3c3eb23a943 SHA512 5a15daf1a6599a6b93b64475aa4dec483281d4d1622fb24bfab2a27c4806846027a16bffb910d0881621879a6209d8d00c816b37a0397983d1d1e951fa32a006 diff --git a/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch b/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch index 5e4bb91bf1e3..07770791cd77 100644 --- a/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch +++ b/dev-libs/rlog/files/rlog-1.3.7-gcc-4.3.patch @@ -1,5 +1,5 @@ ---- rlog/RLogChannel.cpp -+++ rlog/RLogChannel.cpp +--- a/rlog/RLogChannel.cpp ++++ b/rlog/RLogChannel.cpp @@ -20,6 +20,7 @@ #include "RLogChannel.h" #include "rlog.h" diff --git a/dev-libs/rlog/files/rlog-1.4-fix-build-system.patch b/dev-libs/rlog/files/rlog-1.4-fix-build-system.patch new file mode 100644 index 000000000000..b7959a79cd02 --- /dev/null +++ b/dev-libs/rlog/files/rlog-1.4-fix-build-system.patch @@ -0,0 +1,59 @@ +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -1,15 +1,13 @@ + + SOURCES = index.dox channel.dox component.dox + +-docdir = $(datadir)/doc +-pkgdocdir = $(docdir)/$(PACKAGE) + #pkghtmldir = $(pkgdocdir)/html + + + # have both html and html/index.html to force build of index.html if necessary + EXTRA_DIST = latex/refman.pdf html html/index.html $(SOURCES) + +-pkgdoc_DATA = \ ++pdf_DATA = \ + latex/refman.pdf + + #pkghtml_DATA = \ +@@ -17,22 +15,21 @@ + + if BUILD_DOCS + latex/refman.pdf: html/index.html +- -cd latex && make ++ $(MAKE) -C latex + + html/index.html: ../Doxyfile $(SOURCES) +- -rm -rf html +- -cd .. && @DOXYGEN@ Doxyfile ++ rm -rf html && $(DOXYGEN) Doxyfile + + clean-local: +- -rm -rf html +- -rm -rf latex ++ rm -rf html ++ rm -rf latex + endif + + all-local: html/index.html + +-install-data-local: all-local +- -echo installing to ${DESTDIR}${pkgdocdir}/html +- /bin/sh ../mkinstalldirs ${DESTDIR}${pkgdocdir}/html +- install html/* ${DESTDIR}${pkgdocdir}/html ++install-data-hook: all-local ++ -echo installing to $(DESTDIR)$(htmldir) ++ /bin/sh ../mkinstalldirs $(DESTDIR)$(htmldir) ++ install html/* $(DESTDIR)$(htmldir) + + +--- a/Makefile.am ++++ b/Makefile.am +@@ -10,6 +10,3 @@ + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = librlog.pc + +-documentation: +- cd docs && make +- diff --git a/dev-libs/rlog/rlog-1.4.ebuild b/dev-libs/rlog/rlog-1.4.ebuild index c24fabb7a48c..0a937d761f36 100644 --- a/dev-libs/rlog/rlog-1.4.ebuild +++ b/dev-libs/rlog/rlog-1.4.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit eutils +EAPI=6 + +inherit autotools DESCRIPTION="A C++ logging library" HOMEPAGE="http://www.arg0.net/rlog" @@ -13,11 +14,19 @@ SLOT="0" KEYWORDS="amd64 ~arm ~ppc sparc x86" IUSE="" +PATCHES=( + "${FILESDIR}"/${PN}-1.3.7-gcc-4.3.patch + "${FILESDIR}"/${PN}-1.4-fix-build-system.patch +) + src_prepare() { - epatch "${FILESDIR}"/${PN}-1.3.7-gcc-4.3.patch + default + eautoreconf } src_install() { - emake DESTDIR="${D}" pkgdocdir="/usr/share/doc/${PF}" install || die - dodoc AUTHORS ChangeLog README + default + + # package installs .pc files + find "${D}" -name '*.la' -delete || die } diff --git a/dev-libs/xmlrpc-epi/Manifest b/dev-libs/xmlrpc-epi/Manifest index 72f6b9533643..792dc88aca9d 100644 --- a/dev-libs/xmlrpc-epi/Manifest +++ b/dev-libs/xmlrpc-epi/Manifest @@ -1,3 +1,4 @@ +AUX xmlrpc-epi-0.54.2-fix-build-system.patch 370 BLAKE2B eedf67329806af7ab1674cb81c20feff2d2e155a2294838a9183ae33ff37ba71a5f95daf783e2d07621f31a4a015548fa56838b6a610fdd4369b3f1697d6a093 SHA512 993ff2f38d7a1b8f1acf45212607e0499c0b7072152c9c2e30b9cb86fa67108644bf62f69aa954c245d86577c6a2fae0a77a1e6e473e21abbb4b396c67ab22f9 DIST xmlrpc-epi-0.54.2.tar.bz2 348478 BLAKE2B 43f460445d129def3ca238747598ffd43c51e6d28ac3065bf8e0bc7b888dca77d71960346bd79b9d200d81d17df4f37be39f049f67f356f746b58d5b965c9ddb SHA512 2a8e818bd0eff4d1b0ad0c1cb26f93bc65d941096cf9f4555d1969c69601c452ab26edccee511b06efc9927c5deb7bd2a93fe44da23e5e4f78f6c77ca8e1e9c5 -EBUILD xmlrpc-epi-0.54.2.ebuild 1226 BLAKE2B 2e39c3ad98ea24b3ae8e734b9e2a95c40fa141138d05f51689ec7bb86af434eeac923429586202a369cedf62cd9aaf93963bc2d72c738f1fa30745b7d5858260 SHA512 c7f3cc72cadc1c163959b86a009902ccf50070ca7062004746e11dad79b3323b8f3111651c056343c12a6803a08aa33777d603cf7bde9920a2245968b948acf7 +EBUILD xmlrpc-epi-0.54.2.ebuild 961 BLAKE2B ba6d88bbd4876a6d265fdb7c65befaae2351923d619d07cc126f585338c411e03c08819518e5acff0f9be64b909971b0adbebad55670e338446d7758da554149 SHA512 1f9d6f2a0c8f0f593d40b9b52b2485f7a257e56e10ef15f869b60d0c7ae7f6ff26695dcf95e75b8ae586155c330f085251faba7be15b744279412118e0d3150c MISC metadata.xml 247 BLAKE2B 2c8eebb25dce4086826f2899e097abfd82be265330efaccf1b0a70dc6ddd7db762b9c7705869f43b6778474ac42c3fe2ea538d9ef75d16ad4bf54086378f2b1f SHA512 9d95e81a0ea01ed0693e8aaff3c55cffc38aa7d6dedad6212e7d0914791702da5b7434f13deee6fd8b05744002b3d8e60ede232ed1b7b6addd54cd09d50a6824 diff --git a/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch b/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch new file mode 100644 index 000000000000..0772836e6bae --- /dev/null +++ b/dev-libs/xmlrpc-epi/files/xmlrpc-epi-0.54.2-fix-build-system.patch @@ -0,0 +1,13 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -218,8 +218,8 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = src sample +-DIST_SUBDIRS = src sample ++SUBDIRS = src ++DIST_SUBDIRS = src + ACLOCAL_AMFLAGS = -I m4 + CHANGE_LOG_GEN_BIN = scripts/cvs2cl.pl + CHANGE_LOG_GEN_FLAGS = -t -r -b --accum -I ChangeLog --gmt --prune diff --git a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild b/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild index c3a93596ff91..45df6e8ea284 100644 --- a/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild +++ b/dev-libs/xmlrpc-epi/xmlrpc-epi-0.54.2.ebuild @@ -1,9 +1,7 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="2" - -inherit multilib +EAPI=6 DESCRIPTION="Epinions implementation of XML-RPC protocol in C" HOMEPAGE="http://xmlrpc-epi.sourceforge.net/" @@ -12,40 +10,32 @@ SRC_URI="mirror://sourceforge/xmlrpc-epi/${P}.tar.bz2" LICENSE="Epinions" SLOT="0" KEYWORDS="amd64 ~ppc ~x86" -IUSE="examples static-libs" +IUSE="static-libs" -DEPEND="dev-libs/expat" +DEPEND="dev-libs/expat:=" RDEPEND="${DEPEND}" -# NOTES: -# to prevent conflict with xmlrpc-c, headers are installed in -# /usr/include/${PN} instead of /usr/include (bug 274291) - -src_prepare() { - # do not build examples - sed -i -e "s:sample::" Makefile.in || die "sed failed" -} +PATCHES=( "${FILESDIR}"/${PN}-0.54.2-fix-build-system.patch ) src_configure() { + # NOTES: + # to prevent conflict with xmlrpc-c, headers are installed in + # /usr/include/${PN} instead of /usr/include (bug 274291) econf \ - --includedir=/usr/include/${PN} \ - --disable-dependency-tracking \ + --includedir="${EPREFIX}"/usr/include/${PN} \ $(use_enable static-libs static) } src_install() { - emake DESTDIR="${D}" install || die "emake install failed" + default if ! use static-libs; then - # remove useless la files - rm "${D}"/usr/$(get_libdir)/lib${PN}.la || die "rm failed" + # remove useless .la files + find "${D}" -name '*.la' -delete || die fi - dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed" - - if use examples; then - insinto "/usr/share/doc/${PF}/examples" - doins sample/*.c sample/*.php || die "doins failed" - doins -r sample/tests || die "doins failed" - fi + docinto examples + docompress -x /usr/share/doc/${PF}/examples + dodoc sample/*.c sample/*.php + dodoc -r sample/tests } -- cgit v1.2.3