From 693cc9b6e847a01c1bb692153021aaf9fb0fab25 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Jan 2019 08:09:37 +0000 Subject: gentoo resync : 25.01.2019 --- dev-libs/Manifest.gz | Bin 87374 -> 87378 bytes dev-libs/appstream/Manifest | 2 +- dev-libs/appstream/appstream-0.12.4.ebuild | 3 + dev-libs/icu/Manifest | 2 +- dev-libs/icu/icu-63.1-r1.ebuild | 2 +- dev-libs/json-c/Manifest | 2 +- dev-libs/json-c/json-c-0.13.1-r1.ebuild | 2 +- dev-libs/libburn/Manifest | 2 +- dev-libs/libburn/libburn-1.5.0.ebuild | 4 +- dev-libs/libevdev/Manifest | 2 +- dev-libs/libevdev/libevdev-1.6.0.ebuild | 2 +- dev-libs/libical/Manifest | 2 +- dev-libs/libical/libical-3.0.4.ebuild | 2 +- dev-libs/libinput/Manifest | 4 +- dev-libs/libinput/libinput-1.12.4.ebuild | 79 --- dev-libs/libinput/libinput-1.12.6.ebuild | 81 ++++ dev-libs/libisoburn/Manifest | 2 +- dev-libs/libisoburn/libisoburn-1.5.0.ebuild | 4 +- dev-libs/libisofs/Manifest | 2 +- dev-libs/libisofs/libisofs-1.5.0.ebuild | 4 +- dev-libs/libutf8proc/Manifest | 2 +- .../libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild | 2 +- dev-libs/nss/Manifest | 4 +- dev-libs/nss/files/nss-3.36.7-fix-cms.patch | 531 +++++++++++++++++++++ dev-libs/nss/nss-3.40.1-r1.ebuild | 373 +++++++++++++++ dev-libs/nss/nss-3.41-r1.ebuild | 373 +++++++++++++++ dev-libs/nss/nss-3.41.ebuild | 371 -------------- dev-libs/spdlog/Manifest | 2 + dev-libs/spdlog/spdlog-1.3.1.ebuild | 40 ++ dev-libs/wayland-protocols/Manifest | 2 +- .../wayland-protocols-1.17.ebuild | 2 +- 31 files changed, 1430 insertions(+), 475 deletions(-) delete mode 100644 dev-libs/libinput/libinput-1.12.4.ebuild create mode 100644 dev-libs/libinput/libinput-1.12.6.ebuild create mode 100644 dev-libs/nss/files/nss-3.36.7-fix-cms.patch create mode 100644 dev-libs/nss/nss-3.40.1-r1.ebuild create mode 100644 dev-libs/nss/nss-3.41-r1.ebuild delete mode 100644 dev-libs/nss/nss-3.41.ebuild create mode 100644 dev-libs/spdlog/spdlog-1.3.1.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 47cb819c2385..2a07602ee7a1 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/appstream/Manifest b/dev-libs/appstream/Manifest index 51daed462032..ca2e61272897 100644 --- a/dev-libs/appstream/Manifest +++ b/dev-libs/appstream/Manifest @@ -1,5 +1,5 @@ DIST AppStream-0.12.3.tar.xz 1940064 BLAKE2B a0160c4a922abfe315bdbfe6b7b32fea8d5eda5631347be4a39dcf102660ad26a3f40c5fed9dd0bdfb1b91956780ff7cf58e61d7f38b03d2f48a5bf67f2871f6 SHA512 3d54bb499e4056d341ffde2878549011708e6699b3ec58756ef2e4080864279ff5e5003224fcbad601007fd9296bb9ed062da7843e3e02272837ecc5d4c802f9 DIST AppStream-0.12.4.tar.xz 1944416 BLAKE2B 3a315b167084f9f6d8f50a86fa2853444a12beb63e3c7e77bf97c861e1a31dd7fd5ff9c4406d0da1b551b1fbb366531740cd4efdde354b857613507c06eabe62 SHA512 8a7a10b0c577a22b89e0b5505415d5b799f3316b4c87b0a2a9281e7b2672e041225896ac847781504b2828c5ed8a250e3a0558355df838d58e174a984b04e3d0 EBUILD appstream-0.12.3.ebuild 1454 BLAKE2B f8bed2ff11275869ee9658151aa92d1b96ef3fa140a976d62ba417537c5b7fa2030f9189253f084f754bb42442e4b673a325fa7c75290e9652e8d543f2d7dd66 SHA512 82d1b5f662065ba4d14a0b065324cd99335d2fa7a8ef6aed20256ffe8b88207cf989cc604cc2459cefca4a02836c127fcfba150287fdb30af3a456552e7a8293 -EBUILD appstream-0.12.4.ebuild 1466 BLAKE2B 4bc1eaa29302a305b0dcf8d9bfe8146c2d19349beee0254b1bfd178899826436e1f11290aa1734457f9a2ddf259ec69d8eefa47115124cb7871b065a49efae4a SHA512 26bc38f438438d972abcd74ae0b91be715ac83feb8d0f2940446bdb4adf308c239f8fd1947a6de52452657e7ac369d8a5772ce78c9ebb4728e1f7003f561c3c5 +EBUILD appstream-0.12.4.ebuild 1571 BLAKE2B adafb3c31f13e991d6c665169c5ac1ab986d7bcfdd1462aebe2b431ac7823dedd28a7bbdc1ab8b5786bb020a47a3dcc05b137e01b23169d227046097740be5c5 SHA512 41000771c6651d3a90a9aef13186222c5950543350fe2037c03963116baead8c5463c465674bfb8180a5e902b1564bab9c6ca113ba5cb42586895407d2b36f97 MISC metadata.xml 399 BLAKE2B 433fcfbb840f3efc4130de1a4b9a18ce3b1762363bfa67d994a063098da0397b6776a6154250ad5a35a4960241234f2ba3dc2464b760cf19cbb680590d559049 SHA512 1f81f3603fc34a3dbeb570fe83ed2ff97e4ea2391cda7d7ceef017624a8498052cda4a21dee1f6b8eb41407998dfcecd765bde556837d00b13caaa41989f934f diff --git a/dev-libs/appstream/appstream-0.12.4.ebuild b/dev-libs/appstream/appstream-0.12.4.ebuild index 315dc0c2acdb..b64ac55e0487 100644 --- a/dev-libs/appstream/appstream-0.12.4.ebuild +++ b/dev-libs/appstream/appstream-0.12.4.ebuild @@ -47,6 +47,9 @@ RDEPEND="${DEPEND}" src_prepare() { default sed -e "/^as_doc_target_dir/s/appstream/${PF}/" -i docs/meson.build || die + if ! use test; then + sed -e "/^subdir.*tests/s/^/#DONT /" -i {,qt/}meson.build || die # bug 675944 + fi } src_configure() { diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest index 61033d01eac6..978b5589d946 100644 --- a/dev-libs/icu/Manifest +++ b/dev-libs/icu/Manifest @@ -9,5 +9,5 @@ DIST icu4c-60_2-src.tgz 23317835 BLAKE2B dabd24a9317b44f6852c61c83e808c920d7d29f DIST icu4c-63_1-src.tgz 23746939 BLAKE2B 5a665554506ff705c83c7a03a1b5598b1a48afbe1c6caaccd5a2d7d5aae16b3e18d7bc65ed552fc4df86248a2f13962438f19bca6c2a579843204c7dc52e6278 SHA512 9ab407ed840a00cdda7470dcc4c40299a125ad246ae4d019c4b1ede54781157fd63af015a8228cd95dbc47e4d15a0932b2c657489046a19788e5e8266eac079c EBUILD icu-58.2-r1.ebuild 4052 BLAKE2B 7f3258a4b34395d70fe644255021236f8db6a7e064dae9c0133655d0a51e80ab029e63e6f76fb0d5b063b47ec8b68f239e68bf8f58b66d0e83ac29b8676da061 SHA512 aa772b809d2fda7b50d9ff58bce94324bb3d76be3a4d64e395895a1a3d079a51a71019b610b6155052c5ad0a9cc7d33700104b1688ec73790fe49b437d3d9b42 EBUILD icu-60.2.ebuild 3710 BLAKE2B 11a56611d570980031040391168bd5c18ca2000c30e9e56edf2662b9ead959c684cada13656726e5e868803ab9c4f81309b51f3b65693175298cb163417f32b0 SHA512 65919063056eb718f860664d42f466278da3bf5d78e54e4ad24b22768b244c76c81053ead55871fefd2d185dfcdfb065e93c38ccc4515000996d7ef307d4a1cb -EBUILD icu-63.1-r1.ebuild 3322 BLAKE2B 33029709ceccf6d6aac2688acb033b55b53b11a97c0b7ff166bdb17beb7c5f65b751ee0769afb8ee929d611628af2e274f29ddb71359fca0e5970e08216233d3 SHA512 784c35220bdbcaaea099f6eb0abd69530f843a18f9e9bc0c8bb103567a90b0fa9f1d9d4e19e375b121e8aaca9d4b51b4a6aab71ffca4af3d8abc94f496eae7e4 +EBUILD icu-63.1-r1.ebuild 3321 BLAKE2B b8e6b6ea9bb9379f0b09195382db18e7758fc919d626f49240f9b8a75b97c84833dc2741c528788348d090749229b18d610bcd5bb196506fec03803d3a78af3f SHA512 0efd9eeac3944f3ea14e20f99c3d3bf0f9a2ed22d62074a1d1342c8fb04f4bb76c30d51ca173a09a59abb832cdb134bd1120b065ce0c63536da08839f4abd2de MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 diff --git a/dev-libs/icu/icu-63.1-r1.ebuild b/dev-libs/icu/icu-63.1-r1.ebuild index 447f23db0cc1..2023747b6e8f 100644 --- a/dev-libs/icu/icu-63.1-r1.ebuild +++ b/dev-libs/icu/icu-63.1-r1.ebuild @@ -13,7 +13,7 @@ LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="debug doc examples static-libs" DEPEND=" diff --git a/dev-libs/json-c/Manifest b/dev-libs/json-c/Manifest index ce82547c27f1..08756bfab09a 100644 --- a/dev-libs/json-c/Manifest +++ b/dev-libs/json-c/Manifest @@ -4,6 +4,6 @@ DIST json-c-0.13.1.tar.gz 639425 BLAKE2B 1da310309f9ce03306a9fd4a161670e460cf0b2 DIST json-c-0.13.tar.gz 634720 BLAKE2B f83876921f94fca1eb0a3473315d4dc75bb52e36499b265dd60e9dfa46d5417a958725aa3a6da3aa50f2a64f2cd5308af2685ca18bb3f5becd464fc570313735 SHA512 7375e1678e40f79298226d070db4ac3dab8a94c9d2438db1bbbcf668284ab30236fc77d841207c25f71cc2cebc596e1b8116d480434d829c8d96007a32ddf636 EBUILD json-c-0.12.1.ebuild 1003 BLAKE2B 0ed22e1e1f8562ba0350ddaa3976a5ac66bd6edd97cacebbc6ee51ca401f7a78e3a566ee8865fa75b20352c1ba3053e64d4c2fa9f8a38441a0420b8d47628c1c SHA512 8b3fb8790b71761fa8dfc0634ab10887696255f7fe9856b7f9f043dc378a9c73794b95add30b698fd17d4c3f79e75f64d659454488cc39d5223bdc34668ec71f EBUILD json-c-0.12.ebuild 934 BLAKE2B 7ce3932192a70416f32220d08a86da5e889d50a4aed197c12926748bd3cc825a8f93cacaeaf242d99ea800169e4d75a6769ad0197562b32f54d104d81d4a8c88 SHA512 dcd19ea54f182d8d73dace713d3c364d394e83615c4912fdc9ad23980fa39801cfe04848f033578287ae533e9a87af8d13c35d00717f7c874ee2be4753d5904b -EBUILD json-c-0.13.1-r1.ebuild 992 BLAKE2B 54a7785ffcba37f05fb169cf615ee019763d9209a992168b91077db000189cde84e036ab16de99df77090130ca414d3bb2f225da9f80301164535a0d1bfc9be1 SHA512 37bc020c887442494a7bc701a64fed899b98a8f39f77111a9c63f33f5a07f0b511143dc5d89881e9db5d213207600893fd8a246ad4f58b3df46e40ac5d4f3db3 +EBUILD json-c-0.13.1-r1.ebuild 990 BLAKE2B 807f79eec2fb5af9a74e586f8a827efc4f1cd575fc55bf094a014bffca00548a03453166bfbfcb6893f74d92e59696a92f2544296a16bb66f71e1d5673fd15b1 SHA512 ea96375772c9b99e2e4c05a8466baf7f19123a5017ac9d8925722b9a1f2237a6eeebe591a163969b18fe7b794e16dea7e48063873f30cd232efc1861a0b6ac25 EBUILD json-c-0.13.ebuild 1000 BLAKE2B 8c2b018dc6783ebac76ecbb777a628ef59d8796752038f28e1e57437c28fd72145a930af858e16c52e70b0a173b0cf4bb9f476364c39df6da26d5bd360e43300 SHA512 d3719bb33500ea92f7376c4b2f6ba994a4c8a18281c525eaf8a7b81da6eb8e8b4a77caf47fa02bb6df6a771619a36b77fd236e976cd2f83c701ce15a44aa0181 MISC metadata.xml 605 BLAKE2B 2290e9eb5ca3ad7c82de9d23062cd6b4a5cf3bc3f3b56900e72be88a96b04f7f6ca4b904b8eec476da9ce450f335312b9774f022b8c16fb88a710ad1de57f031 SHA512 485dcf4f7c9e63ee399862f09448965d675ae6580eb74c13c430547a8eab78c3c9890f3a06daf76d028e2bb194daa407f6abb9911648e4827eaf92fd3714154c diff --git a/dev-libs/json-c/json-c-0.13.1-r1.ebuild b/dev-libs/json-c/json-c-0.13.1-r1.ebuild index bc00de833ec4..bb30f3f25f2c 100644 --- a/dev-libs/json-c/json-c-0.13.1-r1.ebuild +++ b/dev-libs/json-c/json-c-0.13.1-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://s3.amazonaws.com/json-c_releases/releases/${P}.tar.gz" LICENSE="MIT" SLOT="0/4" -KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha ~amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos" IUSE="doc static-libs" src_prepare() { diff --git a/dev-libs/libburn/Manifest b/dev-libs/libburn/Manifest index 8beeb459fe07..d4b9913261b7 100644 --- a/dev-libs/libburn/Manifest +++ b/dev-libs/libburn/Manifest @@ -1,5 +1,5 @@ DIST libburn-1.4.8.tar.gz 977757 BLAKE2B 2a59adbd104238857cd848cb76c2da3e5ea61112607832c42bba2c47999218bf87563fe2a3901370d2a8cbbfbe2a6dfb1615efc6be10f7ee52d7f822917504f4 SHA512 e02c08078313abb19108bb394741d4bde1c5098c1a200129940744e03078d8350b6ac951bf5523872a343b3f9b7a4954dda60a3336997f975abdee6dbae9b87c DIST libburn-1.5.0.tar.gz 979953 BLAKE2B 7fdd6d8314d65547e48baa3bb7c0b8f94c5d5a799e62d79d8dfcd5de644c555be437fc7c84134598703b9335c2330c49e8c7c7adbaefa9e1f288109e0010f8df SHA512 c524d672d79db2f6dc22f6381cd422ddaa3b61d6741c998c773772722e37c53576ae9549dd17a33c2d020c66857ecbb948f353bc22cdf28c2bb115bd2b82d4a2 EBUILD libburn-1.4.8-r2.ebuild 824 BLAKE2B d7df406726778b3752cdf5af3468893f09c1afc329e75f36f84a6e774b8a8706bdc3abb90cfefd1256a42a6783b4e8f6a089bd0ddbf1d78cb5315237fd0df915 SHA512 7f6c91c2cf05430cc03bf90c114fe577d674eff13a17d3477532adcc4d368078681fd2d8474692fdc6ca66a99e562c8de11edf0b32690583303bbd27b6113836 -EBUILD libburn-1.5.0.ebuild 847 BLAKE2B 94d035e5db069e9a32a866e7201a316825eb102b45c75356cc6ed91d922fb31b71121ce942d0fea67180ef58711b71fd817e280ebe63fb7c3244b23bcfe60846 SHA512 db74dac795a3b6f4803dfcbf6db42357b49d58a3d57f31b9a14a91a797823124302287866eb0c7fe5dc1ba9ad601611b5eac4ac4643faa7cf8d3a431a7676c9c +EBUILD libburn-1.5.0.ebuild 841 BLAKE2B e9f7fa0d5100bb05d1147b459db3615233103d2277faf1e12afdd549e705672041529dd912b5b4787983cc5f1b012b697f4cb1b9630416ee7cfbeb794b93bf6c SHA512 1366eb54fa76e2892b2412c38ce41238729ac597b6b661f53fd149f971967d4d80965eda5296da6f054ab14e0338e38d3cda75be1f44e910af5b7e0b0ae2e687 MISC metadata.xml 374 BLAKE2B ed3416052b36f8644d2231fd2d4d16e4177fd2feb09f4e5d81222dc9b4fb32cb5772d8eb86a739fc8ad11e398013c50ec802685848cc298a9e7f5efbe8928879 SHA512 1b78c0e0f60761b001b44216ac4c3de7fb6491a4d8b79b45c6e1f81f438df95ebe2cb70b273ed4a470283ec6e57c91d4fb1981fb365ed61a692214bed4097860 diff --git a/dev-libs/libburn/libburn-1.5.0.ebuild b/dev-libs/libburn/libburn-1.5.0.ebuild index 8b37ce1e6841..931d02863693 100644 --- a/dev-libs/libburn/libburn-1.5.0.ebuild +++ b/dev-libs/libburn/libburn-1.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86" IUSE="debug static-libs" BDEPEND=" diff --git a/dev-libs/libevdev/Manifest b/dev-libs/libevdev/Manifest index f105d7b8baf7..11c2c7bde9fb 100644 --- a/dev-libs/libevdev/Manifest +++ b/dev-libs/libevdev/Manifest @@ -1,6 +1,6 @@ DIST libevdev-1.5.9.tar.xz 408200 BLAKE2B b99974eab572693c9e2a915b21adf2e6c09e26af70011ce661084ac9add51cb6257f36bcfeb89d76c8987cf8724e69b027d30eda17c4457a40f3e047302efa19 SHA512 4496ab4d9dc165f416a574c21a7fcee54ae104c21ef4785a4dd0311fff428020cdbb5da7bf3f835e78dae05effdb1a557d189347f6e62dd6be2d8bcdc845850c DIST libevdev-1.6.0.tar.xz 411512 BLAKE2B 0e9190fd4c28b36bcf325953aa634c0d8c604cef7f56e46679fc88351536d78b0bddedbbdfffe4164e0039c7d56ef604b143e23de2c4bb9a66653a03d6844fa9 SHA512 73046da447773716c9f0c9f511f3a0a6ababcf92a146eba363014afcbdb465f4c3cd8be0917f2f01561a72f24f20fe8ecd333467437d9d85c03afcb433d05060 EBUILD libevdev-1.5.9-r1.ebuild 1055 BLAKE2B 0649ba066abbba41c50e0bdabcd823ef2fd456db0b2eeec4665731554c613fa8d6d24d1fd7210e061ee724aa0b7945ac9a682776235c47ac43e7daca3bbba682 SHA512 98f45981aa26a9fee942e7f361770e4b01c4f5607445bd69643c7f417814933aab7ff8913482077a560bf927770e307b21e459704baedb3d88e2cceb82c2932b -EBUILD libevdev-1.6.0.ebuild 1066 BLAKE2B f26dabb497d58d87e8ccff75445c7e16e8624b16e38785bc299a554a815c3711e6f50d011e6f258f230a7a5ac1400c6192e33b95a335a4cdc7a80ef18f1a71e0 SHA512 09b6354e014781cf106cf27e9feccced8099e1142520f68895fd64ca3ace7bde840e5c00ecb8aee7451b5778276ded2a587fd51e73ec83d150ec443fea7d0e1b +EBUILD libevdev-1.6.0.ebuild 1064 BLAKE2B 489e20451fbc908df0444f8f8e2d78d1b456411f4296026fcf6d1a65147cc3b1785891a3038a324bf4116fe7f424f0b54eabf1273bf72778d8c692490c87f0f5 SHA512 fe90e2f485fff98feb103a717e88fe8f0f714cc2fdf210bdad6c14d6ea12f8d79d7be8a7c2b3c4a1c2763765f06f9ca0042233f0fecb1a89640e773d4c7992f3 EBUILD libevdev-9999.ebuild 1070 BLAKE2B 19f6c9c38fafeac9484b236f0dfaeacf1fbad2d36f991e870db4651e20ddbdee765bd503991691f0d2f8e7091d33b5e1e6b473d74a4caaf22ad13a80a69cdb7f SHA512 1263c46fa3771c1c924b4efef99ad1c3b368317838df9feab79536befeea850cb5ed03dad42b66c6144b5d026991363982a01ffba11de7740b05567771a5a147 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/dev-libs/libevdev/libevdev-1.6.0.ebuild b/dev-libs/libevdev/libevdev-1.6.0.ebuild index b154f29239f0..89e403e8f427 100644 --- a/dev-libs/libevdev/libevdev-1.6.0.ebuild +++ b/dev-libs/libevdev/libevdev-1.6.0.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == 9999* ]] ; then inherit autotools git-r3 else SRC_URI="https://www.freedesktop.org/software/libevdev/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" fi LICENSE="MIT" diff --git a/dev-libs/libical/Manifest b/dev-libs/libical/Manifest index fcad8017b34a..5d0c10af8df9 100644 --- a/dev-libs/libical/Manifest +++ b/dev-libs/libical/Manifest @@ -8,5 +8,5 @@ AUX libical-3.0.4-tests.patch 747 BLAKE2B 41c72700e8a87c3665144bf12e7ea2c7f74c17 DIST libical-2.0.0.tar.gz 699099 BLAKE2B 81c1a12faf4436d1edee4ab3f080137135c2ec7ae05efeee70696b89f2122b8f8ff92f78b6ec5e017d31841adb796d467204c299335743a6a8c15eca667b8182 SHA512 0b80f9aa40e0a485371b5949152c10d7fffb6e0dfe8c2aabc3c6e4e97ba0cdd465ae7093343245be60173bc7b24e80e919c0c0e199ff0bb2b14ed94af7087c4f DIST libical-3.0.4.tar.gz 871853 BLAKE2B 478589bd60a8cf2cadf3cb7d2a7502810ccea7c553db206135ba3f4d5f4ea28acbe670b76844306957c8a137b381f8d8b885c1fef56fad2afd5c6e8e9c14b28c SHA512 491a1dd0c33bb823a79165eb6e4f86ef048a44642adfe44f8e69c83598b458ddf8e4365b11afc37d0b21bc1367e0a99096fc7887aae29e7ff4e3bd1cdee64dd9 EBUILD libical-2.0.0-r3.ebuild 1708 BLAKE2B a6fc6d8a7ca16ad6a629c5a708b138535a098d65cb0c89c39df889d2d6087c11ddf884afb18fc1d7fcbb297262c2b5b53fa7d0108b825d8cd0057948a3c3efdc SHA512 24d4b757d3bc4657c3d24cdd442b91f7b64113a88c023de39a7f01ec13ad91f255595acb9c0767835837a660fabe316cb3f160f4beab6614a8e20b3cf7ea77ef -EBUILD libical-3.0.4.ebuild 2046 BLAKE2B f3eeb5d6856f4e137dd775b9671a611c8055eeab8232fa8d7e04b205a870649e5a2885b2275fdd771a4b639a1f63e29b0341061e4cd78bf16c955b8962fa171e SHA512 e668562dc2bb9bf814a306af76f0a22b0cf0f8e81b153718190074045515e660c26eda30563f969020a3bc3e1b39568a3b463fcbad1e839a8fcd517ee4d3df1c +EBUILD libical-3.0.4.ebuild 2045 BLAKE2B ecd99387988661e0623b3b64ee0ad434c35034ec72f7769d997fac4af4da00756c147a8b509a879ce92625ab2086073a9d830266c5ee36389813af710a85a5e0 SHA512 b928a7a833d3097057d948290c425c960cfcb8327fdf6644b429f7f6217534ff96541136c1b85d5e9b0253e23006d128236d89d14ba1e363b0a7629962a09bcf MISC metadata.xml 333 BLAKE2B 48ec5d867610d142260cd1d0154f2762acd3c695935a37ae5e344a828a84ea6907be5cf69b3b19a6886b20ac3df73a8d7cd5c800afdbce0320b2fcfe4e0b62d2 SHA512 ad7a78aff5c325aa5a289cb96a98c55d52c60bb78b6dff207d393157d1dc7e408032453be4da87e9a7e8c6a2ca1f12226e416be2f5d04e4dd908642461eb3b8c diff --git a/dev-libs/libical/libical-3.0.4.ebuild b/dev-libs/libical/libical-3.0.4.ebuild index d38481874cc6..b989b6e001c5 100644 --- a/dev-libs/libical/libical-3.0.4.ebuild +++ b/dev-libs/libical/libical-3.0.4.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="|| ( MPL-2.0 LGPL-2.1 )" SLOT="0/3" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="berkdb doc examples static-libs test" # TODO: disabled until useful diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index f620c882b4fa..fa9780fdf43a 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -1,9 +1,9 @@ DIST libinput-1.11.3.tar.xz 487408 BLAKE2B 38dc14cf018ca59279e8b6e85fd91f4b29545b4a55ab968cb11d9a8afc8d80c311efc6e57339b9baa9fb270f52cfb0758ff8ea313991867c35f3da47910977ac SHA512 5e18daab6202bcbfddeebc35dac4cabb5f726b5b73f5fc87975b58f3019a54a4b1f506a3200e920638ddddfb978a0b96c23c2e90b081942f86d33c16d4836949 DIST libinput-1.12.1.tar.xz 520072 BLAKE2B 2d2b2d82f27ac01ff25b3bf6fd7b77ca56467ab818cdc5d4a641629fed623ef5042915889f54f71b1881595af1d85770bbf4ecfd798c079878efa0a0546c4a36 SHA512 de1714526ee1244e3086729efa5b72724b2b989fa8d04418e633d1ef5a8ea777ae3cd4b8c5b015ca0da2b8cf5b07111bff2283c7d6068abcdfa81c3f71b81d68 -DIST libinput-1.12.4.tar.xz 519596 BLAKE2B 87802d2eb841360ada3216a4064cdf750f43f3bf85377f08d35b4e9144319dc0115b03bf9a67f819c708763c677650100ffb783e8432d3c1a42cfb2355e7acaa SHA512 4e43ed5213059a481e5a73549c8325e5729d08512c4f580b924d4338a1b69dabd77fb612bec418f294c1da96c738ce26e45f8de8fbc222ab1af71a1535b3240f DIST libinput-1.12.5.tar.xz 518612 BLAKE2B 6bd4c770aa4e22f3ef80cff12731dd8ed8f50ddfbc6d06c02af7b4f1b38122baea412b806825ed511ac3e586505c2dfec66061ed459c6526a74af91d275e7709 SHA512 9365b91b3ac2c4ff0f9927913242afac7677979682dd7b541001b13d09d7982acd854f6d348101cfa4b0854c6a92b4c683f62593a97870e32ae3d607eaeae3ff +DIST libinput-1.12.6.tar.xz 518784 BLAKE2B 7462f47be3628f9c66ef5b7c8265b588bd0ca328bafe91932f5341a010ac882648b4e7cfd0db241ae526836172e0829d68d21f8966d2be8b49f4e1c0c40df018 SHA512 02ad90c77a0c8c27fd96ec34e1546c5f0947ced49bad386372c1ef7c41b3b2157c39020f0766f20aaf2ab3c97128567e169279bea21115ced39499dda325d2ef EBUILD libinput-1.11.3.ebuild 1430 BLAKE2B 6be00d5d69e9e6c4fde5c59a3856ce50e95798809863ead833404e8f49be8a3c85801b13ad1e9ca802642f627d8435132cf9257fa4965898720628da0c0e0908 SHA512 20cc0c87ed32c22e5c7e2b9b1420eeb82e064ac1e59535e3af02bfdc84640ab84c09f0c18dc82ce9a399bd48a3ff5cde1785354869a7f459af63c1abe1986c68 EBUILD libinput-1.12.1.ebuild 1460 BLAKE2B 066dfe5ee976f24475f2572d040c685b2a429cc27d22d2199bcaaa0e92886a9e76b2dc489457e5657f8b4ac6a0e61af75cd7041af96647bc1dd911d5c84e3585 SHA512 3bd9c1fb51fee929bcf85349996e679b202d2e064bcb88926a4d0cda0453f82c7ec9f8bd0ba0e4870781fc936a36da034b91e23223ad3f9764b4781468bf8b19 -EBUILD libinput-1.12.4.ebuild 2023 BLAKE2B d76d9b71d668379ade2dd7d251343224a10272c3772f99a614f03e234123e475155cf38222ee9c25daa69a0ea29f58a4978a802415fe22600ff78828fcbdbcd2 SHA512 03f2517d8298708ec6e7f9360f48e6f90559844fdb3c3a4cd0c45c21ff8a369f5a54d157a142c61ff1239f8362a78cc61ed206722b4c7eb8f29914eaf5341f97 EBUILD libinput-1.12.5.ebuild 2035 BLAKE2B 0befaa539fd44efec19a1a9aefe0762633974120c288087c0a6b7ad553ca7dc0409a83ad729494012853c424f7855eced3d6d34c3b9e5d13fb43f8da5875628e SHA512 722b84a7ebfab778425eb87b5a08c8c6fa02679cee22a0d1355cb20137bc87061412630dbd7f564be40665737c8703f190162d32bc0138cc43eedee4a2a7c471 +EBUILD libinput-1.12.6.ebuild 2035 BLAKE2B 0befaa539fd44efec19a1a9aefe0762633974120c288087c0a6b7ad553ca7dc0409a83ad729494012853c424f7855eced3d6d34c3b9e5d13fb43f8da5875628e SHA512 722b84a7ebfab778425eb87b5a08c8c6fa02679cee22a0d1355cb20137bc87061412630dbd7f564be40665737c8703f190162d32bc0138cc43eedee4a2a7c471 MISC metadata.xml 448 BLAKE2B c7a735047f8d22e10d1094dc4bbcbd118c025f318280dafd36029484956465c5e459326fb765f04fbdddc03743760a9008c6ac2494ad113387134fb4e79c4c48 SHA512 945c1005dccddac8085fd8b2be635c08d5b4da1f8264d564d10526d11cf814131d1fa5fd7620f35811a90b43686517519f4e9aba9253f5d5d5b69daa25be52bf diff --git a/dev-libs/libinput/libinput-1.12.4.ebuild b/dev-libs/libinput/libinput-1.12.4.ebuild deleted file mode 100644 index fd569fa961e8..000000000000 --- a/dev-libs/libinput/libinput-1.12.4.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) - -inherit meson python-any-r1 udev - -DESCRIPTION="Library to handle input devices in Wayland" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/" -SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" - -LICENSE="MIT" -SLOT="0/10" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc input_devices_wacom" -# Tests require write access to udev rules directory which is a no-no for live system. -# Other tests are just about logs, exported symbols and autotest of the test library. -RESTRICT="test" - -RDEPEND=" - input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) - >=dev-libs/libevdev-1.3 - >=sys-libs/mtdev-1.1 - virtual/libudev:= - virtual/udev -" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - $(python_gen_any_dep ' - dev-python/commonmark[${PYTHON_USEDEP}] - dev-python/recommonmark[${PYTHON_USEDEP}] - dev-python/sphinx[${PYTHON_USEDEP}] - >=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}] - ') - >=app-doc/doxygen-1.8.3 - >=media-gfx/graphviz-2.38.0 - ) -" -# test? ( -# >=dev-libs/check-0.9.10 -# dev-util/valgrind -# sys-libs/libunwind ) - -python_check_deps() { - has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \ - has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \ - has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \ - has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]" -} - -pkg_setup() { - use doc && python-any-r1_pkg_setup -} - -src_configure() { - # gui can be built but will not be installed - local emesonargs=( - -Ddebug-gui=false - $(meson_use doc documentation) - $(meson_use input_devices_wacom libwacom) - -Dtests=false # tests are restricted - -Dudev-dir="$(get_udevdir)" - ) - meson_src_configure -} - -src_install() { - meson_src_install - if use doc ; then - docinto html - dodoc -r "${BUILD_DIR}"/Documentation/. - fi -} - -pkg_postinst() { - udevadm hwdb --update --root="${ROOT%/}" -} diff --git a/dev-libs/libinput/libinput-1.12.6.ebuild b/dev-libs/libinput/libinput-1.12.6.ebuild new file mode 100644 index 000000000000..fe9e7e7cf8c1 --- /dev/null +++ b/dev-libs/libinput/libinput-1.12.6.ebuild @@ -0,0 +1,81 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} ) + +inherit meson python-any-r1 udev + +DESCRIPTION="Library to handle input devices in Wayland" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/libinput/" +SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0/10" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc input_devices_wacom" +# Tests require write access to udev rules directory which is a no-no for live system. +# Other tests are just about logs, exported symbols and autotest of the test library. +RESTRICT="test" + +RDEPEND=" + input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) + >=dev-libs/libevdev-1.3 + >=sys-libs/mtdev-1.1 + virtual/libudev:= + virtual/udev +" +DEPEND="${RDEPEND} + doc? ( + $(python_gen_any_dep ' + dev-python/commonmark[${PYTHON_USEDEP}] + dev-python/recommonmark[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + >=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}] + ') + >=app-doc/doxygen-1.8.3 + >=media-gfx/graphviz-2.38.0 + ) +" +# test? ( +# >=dev-libs/check-0.9.10 +# dev-util/valgrind +# sys-libs/libunwind ) +BDEPEND=" + virtual/pkgconfig +" + +python_check_deps() { + has_version "dev-python/commonmark[${PYTHON_USEDEP}]" && \ + has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" && \ + has_version "dev-python/sphinx[${PYTHON_USEDEP}]" && \ + has_version ">=dev-python/sphinx_rtd_theme-0.2.4[${PYTHON_USEDEP}]" +} + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_configure() { + # gui can be built but will not be installed + local emesonargs=( + -Ddebug-gui=false + $(meson_use doc documentation) + $(meson_use input_devices_wacom libwacom) + -Dtests=false # tests are restricted + -Dudev-dir="$(get_udevdir)" + ) + meson_src_configure +} + +src_install() { + meson_src_install + if use doc ; then + docinto html + dodoc -r "${BUILD_DIR}"/Documentation/. + fi +} + +pkg_postinst() { + udevadm hwdb --update --root="${ROOT%/}" +} diff --git a/dev-libs/libisoburn/Manifest b/dev-libs/libisoburn/Manifest index b20ccb241635..02036aca8f4f 100644 --- a/dev-libs/libisoburn/Manifest +++ b/dev-libs/libisoburn/Manifest @@ -1,5 +1,5 @@ DIST libisoburn-1.4.8.tar.gz 1537097 BLAKE2B 569684a115ac09506aa2fe6439f4dd80424ba7a5fb539b587e618a2a618c18512099117892ed0abc7268bb258c80a1ce8c2e4535f4eef963a14a5f8285806e23 SHA512 26dd6f6884d98d9d3f54bf18b529a688d28aa0ff54b7fe6fe7926c7765755a1c7f7b2d0ef02ca6ea2bdac9ddf6f928c01c89a3547aea1e9f0b47346b160d0d46 DIST libisoburn-1.5.0.tar.gz 1550656 BLAKE2B 447c383b3847b7ca0c4aca73f5317dec03ef79b34debc3ad2149fae4e7216f29c4a0dd918271087b530fb6c476b219430159e1515bec4bcf51c47d5b2ee05d89 SHA512 c74a9e2887244c28c82abe70d2603dbcd49b639c370e5b7fea03aabce59ff2b361345cd6ec88fe8152727e8a416d4759b88d91e2b5aec8a697408e00b7dc9e4d EBUILD libisoburn-1.4.8-r1.ebuild 1816 BLAKE2B 61a5f767137fb65a53bbd9780153c71b024886a204649d1a9345d2caf8a7e559c09c4cb6d09e570f9ad356ec828ae4330a704b4b86d79b04ecb630675fcc6a16 SHA512 2124db392eefc46dc9e88f0784270b2955ee96df145282cfc790c7cf0c023dcd78a12c249b83de9743b1bcd97f7065ca9969ed6d2b47c5507a12d3b47c298729 -EBUILD libisoburn-1.5.0.ebuild 1840 BLAKE2B ec5c21338a4ced948104c073fe612264731b27f2a56c53f22a0d3aafc7ae69fe62d5a50af16340f690c2a30d90a433763ef7b1faaac1eed8546a47d06ee55986 SHA512 aece802088d8a271ef063548bf2c6ae1a89ed6ff9cc23267ed0f572979bf87197c7e2fbbae09e056a64a914a6b80b771ef98527e64f11100c9ae0108c4056bce +EBUILD libisoburn-1.5.0.ebuild 1834 BLAKE2B 8cfedc6ff417ae09b24ddc28196e252ca30e062cf5437f199f3f9f01685f3408ae093efee7848086a2d73a14069949d812d2bca9109195d3b26c7e8a2b82a663 SHA512 f6fbe75803dfbebea49df27a9b3faebf1c1dab8cbc7b65d9c80b8df78353ad7e875b0855223be0cf9f7c834c2dfb993ef1e0228f7ca6c053ad9590ee0a451d4a MISC metadata.xml 829 BLAKE2B 3a7a3c710e8886e60f6447baba781e98cd29d64daeae498ed8423ba40ef08258e8b249530666c487a1ddff81e837a97dfa6a9746872ee1feb7c66dd949471edc SHA512 0a3690bc939275faf4c7179c1e26d4dd93464820d3c21e8694119faab3a417b823661ac399f33d423793b2cc234828445a5d6af7d5067150b5e5a3018ecdae7f diff --git a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild index a43cbf926906..104c4f19e764 100644 --- a/dev-libs/libisoburn/libisoburn-1.5.0.ebuild +++ b/dev-libs/libisoburn/libisoburn-1.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz" LICENSE="GPL-2 GPL-3" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86" IUSE="acl debug external-filters external-filters-setuid frontend-optional launch-frontend launch-frontend-setuid libedit readline static-libs xattr zlib" diff --git a/dev-libs/libisofs/Manifest b/dev-libs/libisofs/Manifest index 29ec7c12055c..1c70262401c2 100644 --- a/dev-libs/libisofs/Manifest +++ b/dev-libs/libisofs/Manifest @@ -1,5 +1,5 @@ DIST libisofs-1.4.8.tar.gz 829979 BLAKE2B 78275a8a1c2ed3824d25dcd2eb02675059d102f2f0b93ae469ea18c342bd6c72e79655eb9f3c700539f87ad46bb97b6a3e28950f84a03bf3d9f1fd982c4fc479 SHA512 0c6f505a951a1b7fce63bf63c715e5acb3158c15be2660627d2380771f025ec88bd67a4c2b8c86ef9dbb649a23cb26b826e875e7c87ff46c8bcd13d831fe8bcc DIST libisofs-1.5.0.tar.gz 834099 BLAKE2B 57dbdb4173df635d2811c61a0b88e49f617b628909a6f87eeca7715a2c94b25b381860722cd56752cac28993bb314c9b0371ae5c0ca73e37044192f50aa47179 SHA512 1d0bc488c18b95971b7aa89765d7b5772b64d17eadeae9ec52c0f880c6f68acee80ee39b603752a1f9fbe0f35029c27023d5a6710d149a0f568bb396c3dcede8 EBUILD libisofs-1.4.8.ebuild 943 BLAKE2B 09cf690c8c32b58001b18f2d09931c1beca88841dcb8ad9cbedb1f402b705bfe20eef27bbe5a5756fc71587c9eb24325cf9869c0c745e6e45f5f7e48699f7bea SHA512 1ac774332041b72c4decbf1c6e58aae3e1d7eac9be9f341289da5db72c66a76a03fc782bc9799f4adf8ee07d3858ad0a3429ab1cc34b320a1d6f379212c88e45 -EBUILD libisofs-1.5.0.ebuild 967 BLAKE2B 04b740e5a5037be4de303481ff9e5dd0c95f6392f5fbcfe45a0dde439d79ffcd80e68723d4e3f9b815eca33c10e2772cb9e5cf7421b07968d16811fe924adc2e SHA512 6175ee513504abf53cc36a401f6c1a120160332ddb06afde2b2b23948bba113315df9727145f2465ffb9b5e50aa7f5f37b391cf06f8ec3318c9db2a072d47207 +EBUILD libisofs-1.5.0.ebuild 961 BLAKE2B 56a3ac0d7a464f929771ba99750766b90f8a4b991f683e8d9c5a3992a7c6ea57fe3865d668d07ca07a103670f7849773f011e62d71f6358f6bed7df074351ae2 SHA512 69a333b4d33bfa43bdd8c9cc939a42d62eaba252dc387945ab1eaff4e3726886f00d4491aec6f32c81023b56efc635711d59b466445d9e176cd21ad11be66010 MISC metadata.xml 320 BLAKE2B 04767bbd76091dc5cbb1d5aad9f7c8b1adf5f36a98b82efb2047ee8c60f7c341b8cbff45c966bc549d975a7d7f4234609a47090cd8919a19c51b9d290c263366 SHA512 cce70181ca955dc89d0d02186bbc8fca4608e41ac59b00ad1e10dca94fb259797bf93d9bf942b38d00feaad274f85c0b79ab0f5e672dff405af799a4799871ce diff --git a/dev-libs/libisofs/libisofs-1.5.0.ebuild b/dev-libs/libisofs/libisofs-1.5.0.ebuild index 6c6df197b20a..4c4ad396d97d 100644 --- a/dev-libs/libisofs/libisofs-1.5.0.ebuild +++ b/dev-libs/libisofs/libisofs-1.5.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -9,7 +9,7 @@ SRC_URI="http://files.libburnia-project.org/releases/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86" IUSE="acl debug static-libs verbose-debug xattr zlib" BDEPEND=" diff --git a/dev-libs/libutf8proc/Manifest b/dev-libs/libutf8proc/Manifest index f3c23c3b0865..f9b07e6e408e 100644 --- a/dev-libs/libutf8proc/Manifest +++ b/dev-libs/libutf8proc/Manifest @@ -1,4 +1,4 @@ AUX libutf8proc-1.3.1_p2-overrun.patch 1358 BLAKE2B 4583a42923db3ad30cd407ee736b6758151e4060a2aed528a54a61ca012d0bf7113ec68994805039a725958ac5bdf15bb9b482d7ff0ab53af2188bea2d4c816e SHA512 e897917e6346f3a0c539d3e2a762a37fc553bda17c64327249835f6f64e981cd9e98c627ffc95e5b36bc54837254cbc43fe9192e7671308f18b7167f0d6cbf6b DIST libutf8proc-2.2.0-1-src.tar.gz 156447 BLAKE2B 1ccf32760bcb8a0d4d9fbf94177ffee97e735a8cb309d5522df1b5ecd5f313a6d0c681209adb066c16ac65573c9c1edaa336b52de1b057a4b74ed6a7e9ca2671 SHA512 eedaafb2fdb3b6bd47da002a48043c26c1cd3c6b96c447a02f2fea19954c1689dcdb5f64b7c662dd8c5de4f971d75b2d69c8483bd29d49675ef47b362ad0c9ad -EBUILD libutf8proc-2.2.0_p1-r1.ebuild 733 BLAKE2B 91b30dc23cb0ee7863d2ebac0615a4672d30d2d48b23f2f91ea2931e2049c599850e6d8ec139595585c47a3a5a1c3cecc158f02aa32a34894a1d6eb10d6991bc SHA512 dabbae478b90c3665048812d271101dc9b4d3f9207e73467f8ff08636743687781920ee2745d068504aa8b9dda953f24892df203a349a6efd6d28a3a23fbefa8 +EBUILD libutf8proc-2.2.0_p1-r1.ebuild 732 BLAKE2B 2b53e419c44d8a7d4b37513c3405f30e717d682e2410442c19b480c87d59bf8e0c6828baf572dfbca1f452bb62ee0ab3475910fbdd48526cfd9ecbeb462c2f54 SHA512 6ce6e921f3530db7510f860bbf384fe4a6d7626b933fa591c9a84e0dd0771d0830b886e33649aa2d7d689646ca5a5f7fdd02489a36e6eecbeac615dd20317b46 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc diff --git a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild index f437704fd95e..ddca0b7b2fd5 100644 --- a/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild +++ b/dev-libs/libutf8proc/libutf8proc-2.2.0_p1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}-src.tar.gz" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86" IUSE="" DEPEND="dev-util/netsurf-buildsystem" diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest index d758886239b7..3345bacd566e 100644 --- a/dev-libs/nss/Manifest +++ b/dev-libs/nss/Manifest @@ -2,10 +2,12 @@ AUX nss-3.21-enable-pem.patch 172 BLAKE2B dbb07fc3122ec7b108ba9cbfaa78870a3690a6 AUX nss-3.21-gentoo-fixup-warnings.patch 178 BLAKE2B b51f80310db3db416d8aeaf9117ef801389b5b2df47c04aff51bf0759dd5bff41b09d1e9011f99b345d5769a3aab19acb943ee97f8437465518115f6902a0da1 SHA512 7667a020311ca11e8f1836bc146e4a3c94ff2a489882dbe87debcccfeaafeb50e6607574c64254a826b4b6f0bb436b310a3386fff4a58324f0e5e58debaa9d51 AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef01039ceb08fd00792a7f7ef68409eb076022c03764ab079fdaa971a0358130002fa11c0c182ebeb33dcdf660be26408 SHA512 ad0097bb6cf409d61eb28202d7460c87e983d6db977aba38ff9ef2749b3f7bb8fdadce4174f5bf806350ae33733097a1f444792d31cc43574b28341893642e5a AUX nss-3.32-gentoo-fixups.patch 6443 BLAKE2B cfe0380832776b7e51f95f800e70436622332d90f61b6b75fcd5474faaf722342ab157694be26881acfae3baceb6d2fdcfabc0c7673101abedfe1667d3821e6f SHA512 36a6db836ab9210e8201a3987229cf18a6b1fe5adeb0d82037f9641da72e6280807123b18fc74d344c680751b04f883bc402cd1c505783c77f00f9962338da03 +AUX nss-3.36.7-fix-cms.patch 15889 BLAKE2B d58e656215e805461bc43ec10c95d8646fcddb93bc3a9870cc4c406af7de3ab2f5e474bbbcfa53cd8d405f96dfddc393e880c9528e156f87a7951bcb4b693e5b SHA512 930b032538eaf76ba354767790a75566b34e83334a1d382d3583bcc31c3cd721d46da8f268903bce2950bf73d705933c7a3887107cbf9bc5caa717b14eb7ce72 DIST nss-3.40.1.tar.gz 23311074 BLAKE2B 9cd723e983a3f70748b0734bb2a6cc1ddfa280f1c167c3b1b371a58900fb3d9b3bf3482293bb8614d39ffb538bcca815a2aedbe03d2d643731817452f82bc2ca SHA512 464ae843161e8deb911975d2117e8bf1194a968689b4ce70f9a12d5a33dba7ddd69f1248ec45244139c30fcc87678b206a4e124f032b26ead8bf894e4e8d0564 DIST nss-3.41.tar.gz 23319563 BLAKE2B 76636b704cd572f9b840c7699c29697a4a882e66afcc3895ceb7b59a7af7af2513074e1abc6a028a13126d44e0cf722ab29e52a4c69640a2247814292efa282d SHA512 b5a43fe86ded664002fd714c493d9222a64539cd6139b64720625d1742fec5100712cbe401c90c79196e9cbad9ec07d9b4f0f517ce34e4b207beaa3e01c9e114 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0 DIST nss-pem-20160329.tar.xz 27732 BLAKE2B 7c23133a7bfb969d8eac98fb6311e76ab60c5d6601c7329f3c492da30c017e66d64a1f8bc827dd36e52e65c1a1ec02b58816442aaf410345c5ed759a02264b84 SHA512 5834b06e4c64205447573d4f4c8989e20986ae67ee00eebce3817eb73794a6355a404143ba1c676ec302ceefaf9df103cb879b1d4ff14ba4e3790dbee3e40eb2 +EBUILD nss-3.40.1-r1.ebuild 9512 BLAKE2B d7a1b210f75113be775cbf68e775d2145617f5cfa5bf08c4f8b3fb778ed057b6d327dc251903a8df28a2f74d2f412a68349d0da8844ce484a2674ff3c6b67374 SHA512 9b50f6c04ecf157f9a934913d6d46bdc750f06f277e1c07ac459e6a6469c26ad8c0d0b7cc6a032454383ff87c0994ec1eb43e7f3ccb052356f845f194f750828 EBUILD nss-3.40.1.ebuild 9416 BLAKE2B 3ca8dff9adef57429a898b6c053c2887ab0ee2cb22c8e8d55cdd1d972c0c56cf4505a9fe9adcbce988a04598f6a726d1652058f0be43d5a42b2a82041178a485 SHA512 8c072e3107263ec03b41b18eb74e945868778f7a9a4bc538f34df1dc7891db7fabf6948aa7702a2a55a9566d4c3d02426449bee4c8516b49f30a4b4a42d2ac4f -EBUILD nss-3.41.ebuild 9427 BLAKE2B 979ee7a2382bd013c32aabadf6746872088878d5319832cd3d8b3149a55f9f0981126b824236ded714df7170e538ed7632ee575faf7605b2bbbe79be68148557 SHA512 143da8d4a2a5cfe8e6c8bdaab6dffe24745c85953346febfceec46d0e91d9d0fa7dbeedf2459174e4a1d872509ef81353c7721d0845cdb8033714f45e6dfff8c +EBUILD nss-3.41-r1.ebuild 9512 BLAKE2B d7a1b210f75113be775cbf68e775d2145617f5cfa5bf08c4f8b3fb778ed057b6d327dc251903a8df28a2f74d2f412a68349d0da8844ce484a2674ff3c6b67374 SHA512 9b50f6c04ecf157f9a934913d6d46bdc750f06f277e1c07ac459e6a6469c26ad8c0d0b7cc6a032454383ff87c0994ec1eb43e7f3ccb052356f845f194f750828 MISC metadata.xml 571 BLAKE2B 8c1d2f92910d9170240f17b28ac806d3c083fce45637526d0846ddcf0e957483fc458a4de14f239c433990f91a8996ea0be51f445a54a1a1f6a14c1f711654a3 SHA512 f6a7de1614f3bdbdea2d5ae627d82519c59e3703f293daefd9dc4692f84c3f0bc3000654b6a4fe595de95b433e698aaf1d3358897e22da283eb63b74a48d95b0 diff --git a/dev-libs/nss/files/nss-3.36.7-fix-cms.patch b/dev-libs/nss/files/nss-3.36.7-fix-cms.patch new file mode 100644 index 000000000000..57b4cdaf5a5d --- /dev/null +++ b/dev-libs/nss/files/nss-3.36.7-fix-cms.patch @@ -0,0 +1,531 @@ +From d54a1f812ae23ec11d2af6ed93ba1a11609421a8 Mon Sep 17 00:00:00 2001 +From: "J.C. Jones" +Date: Mon, 14 Jan 2019 10:35:25 -0700 +Subject: [PATCH] Bug 1507135 - Add additional null checks to CMS message + functions r=mt + +Differential review: https://phabricator.services.mozilla.com//D16488 + +--HG-- +branch : NSS_3_36_BRANCH +extra : transplant_source : 1%02%80%21%BE%C8B%D5%21%D7%0CR%00%ED%B6%EA%84a%FA%23 +--- + lib/smime/cmsmessage.c | 69 ++++++++++++++++++++++++++++++++++++------ + 1 file changed, 59 insertions(+), 10 deletions(-) + +diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c +index 27d1256ec..f41a432b1 100644 +--- a/lib/smime/cmsmessage.c ++++ b/lib/smime/cmsmessage.c +@@ -29,8 +29,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp) + + if (poolp == NULL) { + poolp = PORT_NewArena(1024); /* XXX what is right value? */ +- if (poolp == NULL) ++ if (poolp == NULL) { + return NULL; ++ } + poolp_is_ours = PR_TRUE; + } + +@@ -44,8 +45,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp) + if (mark) { + PORT_ArenaRelease(poolp, mark); + } +- } else ++ } else { + PORT_FreeArena(poolp, PR_FALSE); ++ } + return NULL; + } + +@@ -53,8 +55,9 @@ NSS_CMSMessage_Create(PLArenaPool *poolp) + cmsg->poolp_is_ours = poolp_is_ours; + cmsg->refCount = 1; + +- if (mark) ++ if (mark) { + PORT_ArenaUnmark(poolp, mark); ++ } + + return cmsg; + } +@@ -73,8 +76,13 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg, + NSSCMSGetDecryptKeyCallback decrypt_key_cb, void *decrypt_key_cb_arg, + SECAlgorithmID **detached_digestalgs, SECItem **detached_digests) + { +- if (pwfn) ++ if (cmsg == NULL) { ++ return; ++ } ++ if (pwfn) { + PK11_SetPasswordFunc(pwfn); ++ } ++ + cmsg->pwfn_arg = pwfn_arg; + cmsg->decrypt_key_cb = decrypt_key_cb; + cmsg->decrypt_key_cb_arg = decrypt_key_cb_arg; +@@ -89,18 +97,21 @@ void + NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg) + { + PORT_Assert(cmsg->refCount > 0); +- if (cmsg->refCount <= 0) /* oops */ ++ if (cmsg->refCount <= 0) { /* oops */ + return; ++ } + + cmsg->refCount--; /* thread safety? */ +- if (cmsg->refCount > 0) ++ if (cmsg->refCount > 0) { + return; ++ } + + NSS_CMSContentInfo_Destroy(&(cmsg->contentInfo)); + + /* if poolp is not NULL, cmsg is the owner of its arena */ +- if (cmsg->poolp_is_ours) ++ if (cmsg->poolp_is_ours) { + PORT_FreeArena(cmsg->poolp, PR_FALSE); /* XXX clear it? */ ++ } + } + + /* +@@ -112,8 +123,9 @@ NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg) + NSSCMSMessage * + NSS_CMSMessage_Copy(NSSCMSMessage *cmsg) + { +- if (cmsg == NULL) ++ if (cmsg == NULL) { + return NULL; ++ } + + PORT_Assert(cmsg->refCount > 0); + +@@ -127,6 +139,10 @@ NSS_CMSMessage_Copy(NSSCMSMessage *cmsg) + PLArenaPool * + NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg) + { ++ if (cmsg == NULL) { ++ return NULL; ++ } ++ + return cmsg->poolp; + } + +@@ -136,6 +152,10 @@ NSS_CMSMessage_GetArena(NSSCMSMessage *cmsg) + NSSCMSContentInfo * + NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg) + { ++ if (cmsg == NULL) { ++ return NULL; ++ } ++ + return &(cmsg->contentInfo); + } + +@@ -147,6 +167,10 @@ NSS_CMSMessage_GetContentInfo(NSSCMSMessage *cmsg) + SECItem * + NSS_CMSMessage_GetContent(NSSCMSMessage *cmsg) + { ++ if (cmsg == NULL) { ++ return NULL; ++ } ++ + /* this is a shortcut */ + NSSCMSContentInfo *cinfo = NSS_CMSMessage_GetContentInfo(cmsg); + SECItem *pItem = NSS_CMSContentInfo_GetInnerContent(cinfo); +@@ -164,6 +188,10 @@ NSS_CMSMessage_ContentLevelCount(NSSCMSMessage *cmsg) + int count = 0; + NSSCMSContentInfo *cinfo; + ++ if (cmsg == NULL) { ++ return 0; ++ } ++ + /* walk down the chain of contentinfos */ + for (cinfo = &(cmsg->contentInfo); cinfo != NULL;) { + count++; +@@ -183,6 +211,10 @@ NSS_CMSMessage_ContentLevel(NSSCMSMessage *cmsg, int n) + int count = 0; + NSSCMSContentInfo *cinfo; + ++ if (cmsg == NULL) { ++ return NULL; ++ } ++ + /* walk down the chain of contentinfos */ + for (cinfo = &(cmsg->contentInfo); cinfo != NULL && count < n; + cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) { +@@ -200,6 +232,10 @@ NSS_CMSMessage_ContainsCertsOrCrls(NSSCMSMessage *cmsg) + { + NSSCMSContentInfo *cinfo; + ++ if (cmsg == NULL) { ++ return PR_FALSE; ++ } ++ + /* descend into CMS message */ + for (cinfo = &(cmsg->contentInfo); cinfo != NULL; + cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) { +@@ -221,6 +257,10 @@ NSS_CMSMessage_IsEncrypted(NSSCMSMessage *cmsg) + { + NSSCMSContentInfo *cinfo; + ++ if (cmsg == NULL) { ++ return PR_FALSE; ++ } ++ + /* walk down the chain of contentinfos */ + for (cinfo = &(cmsg->contentInfo); cinfo != NULL; + cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) { +@@ -251,13 +291,21 @@ NSS_CMSMessage_IsSigned(NSSCMSMessage *cmsg) + { + NSSCMSContentInfo *cinfo; + ++ if (cmsg == NULL) { ++ return PR_FALSE; ++ } ++ + /* walk down the chain of contentinfos */ + for (cinfo = &(cmsg->contentInfo); cinfo != NULL; + cinfo = NSS_CMSContentInfo_GetChildContentInfo(cinfo)) { + switch (NSS_CMSContentInfo_GetContentTypeTag(cinfo)) { + case SEC_OID_PKCS7_SIGNED_DATA: +- if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos)) ++ if (cinfo->content.signedData == NULL) { ++ return PR_FALSE; ++ } ++ if (!NSS_CMSArray_IsEmpty((void **)cinfo->content.signedData->signerInfos)) { + return PR_TRUE; ++ } + break; + default: + /* callback here for generic wrappers? */ +@@ -278,8 +326,9 @@ NSS_CMSMessage_IsContentEmpty(NSSCMSMessage *cmsg, unsigned int minLen) + { + SECItem *item = NULL; + +- if (cmsg == NULL) ++ if (cmsg == NULL) { + return PR_TRUE; ++ } + + item = NSS_CMSContentInfo_GetContent(NSS_CMSMessage_GetContentInfo(cmsg)); + +From fa26771e9515cc82c941fcef689dd797a3e308c3 Mon Sep 17 00:00:00 2001 +From: "J.C. Jones" +Date: Fri, 11 Jan 2019 22:33:16 -0700 +Subject: [PATCH] Bug 1507174 - Add additional null checks to other CMS + functions r=mt + +Differential review: https://phabricator.services.mozilla.com//D16383 + +--HG-- +branch : NSS_3_36_BRANCH +extra : transplant_source : %B5%A8su%96%5B%BE%F9%CD%93%E0%EE%93a4c%1BYp%09 +--- + lib/smime/cmscinfo.c | 92 ++++++++++++++++++++++++++++++++++++------ + lib/smime/cmsdigdata.c | 4 +- + lib/smime/cmsencdata.c | 4 +- + lib/smime/cmsenvdata.c | 5 +++ + lib/smime/cmsmessage.c | 3 ++ + lib/smime/cmsudf.c | 2 +- + 6 files changed, 95 insertions(+), 15 deletions(-) + +diff --git a/lib/smime/cmscinfo.c b/lib/smime/cmscinfo.c +index 08db662f8..453ccaada 100644 +--- a/lib/smime/cmscinfo.c ++++ b/lib/smime/cmscinfo.c +@@ -51,6 +51,10 @@ NSS_CMSContentInfo_Destroy(NSSCMSContentInfo *cinfo) + { + SECOidTag kind; + ++ if (cinfo == NULL) { ++ return; ++ } ++ + kind = NSS_CMSContentInfo_GetContentTypeTag(cinfo); + switch (kind) { + case SEC_OID_PKCS7_ENVELOPED_DATA: +@@ -86,6 +90,11 @@ NSSCMSContentInfo * + NSS_CMSContentInfo_GetChildContentInfo(NSSCMSContentInfo *cinfo) + { + NSSCMSContentInfo *ccinfo = NULL; ++ ++ if (cinfo == NULL) { ++ return NULL; ++ } ++ + SECOidTag tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo); + switch (tag) { + case SEC_OID_PKCS7_SIGNED_DATA: +@@ -127,6 +136,9 @@ SECStatus + NSS_CMSContentInfo_SetDontStream(NSSCMSContentInfo *cinfo, PRBool dontStream) + { + SECStatus rv; ++ if (cinfo == NULL) { ++ return SECFailure; ++ } + + rv = NSS_CMSContentInfo_Private_Init(cinfo); + if (rv != SECSuccess) { +@@ -145,15 +157,20 @@ NSS_CMSContentInfo_SetContent(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, + SECOidTag type, void *ptr) + { + SECStatus rv; ++ if (cinfo == NULL || cmsg == NULL) { ++ return SECFailure; ++ } + + cinfo->contentTypeTag = SECOID_FindOIDByTag(type); +- if (cinfo->contentTypeTag == NULL) ++ if (cinfo->contentTypeTag == NULL) { + return SECFailure; ++ } + + /* do not copy the oid, just create a reference */ + rv = SECITEM_CopyItem(cmsg->poolp, &(cinfo->contentType), &(cinfo->contentTypeTag->oid)); +- if (rv != SECSuccess) ++ if (rv != SECSuccess) { + return SECFailure; ++ } + + cinfo->content.pointer = ptr; + +@@ -185,8 +202,9 @@ SECStatus + NSS_CMSContentInfo_SetContent_Data(NSSCMSMessage *cmsg, NSSCMSContentInfo *cinfo, + SECItem *data, PRBool detached) + { +- if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess) ++ if (NSS_CMSContentInfo_SetContent(cmsg, cinfo, SEC_OID_PKCS7_DATA, (void *)data) != SECSuccess) { + return SECFailure; ++ } + if (detached) { + cinfo->rawContent = NULL; + } +@@ -230,6 +248,10 @@ NSS_CMSContentInfo_SetContent_EncryptedData(NSSCMSMessage *cmsg, NSSCMSContentIn + void * + NSS_CMSContentInfo_GetContent(NSSCMSContentInfo *cinfo) + { ++ if (cinfo == NULL) { ++ return NULL; ++ } ++ + SECOidTag tag = cinfo->contentTypeTag + ? cinfo->contentTypeTag->offset + : SEC_OID_UNKNOWN; +@@ -260,6 +282,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo) + SECOidTag tag; + SECItem *pItem = NULL; + ++ if (cinfo == NULL) { ++ return NULL; ++ } ++ + tag = NSS_CMSContentInfo_GetContentTypeTag(cinfo); + if (NSS_CMSType_IsData(tag)) { + pItem = cinfo->content.data; +@@ -282,6 +308,10 @@ NSS_CMSContentInfo_GetInnerContent(NSSCMSContentInfo *cinfo) + SECOidTag + NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo) + { ++ if (cinfo == NULL) { ++ return SEC_OID_UNKNOWN; ++ } ++ + if (cinfo->contentTypeTag == NULL) + cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType)); + +@@ -294,11 +324,17 @@ NSS_CMSContentInfo_GetContentTypeTag(NSSCMSContentInfo *cinfo) + SECItem * + NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo) + { +- if (cinfo->contentTypeTag == NULL) ++ if (cinfo == NULL) { ++ return NULL; ++ } ++ ++ if (cinfo->contentTypeTag == NULL) { + cinfo->contentTypeTag = SECOID_FindOID(&(cinfo->contentType)); ++ } + +- if (cinfo->contentTypeTag == NULL) ++ if (cinfo->contentTypeTag == NULL) { + return NULL; ++ } + + return &(cinfo->contentTypeTag->oid); + } +@@ -310,8 +346,13 @@ NSS_CMSContentInfo_GetContentTypeOID(NSSCMSContentInfo *cinfo) + SECOidTag + NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo) + { +- if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN) ++ if (cinfo == NULL) { ++ return SEC_OID_UNKNOWN; ++ } ++ ++ if (cinfo->contentEncAlgTag == SEC_OID_UNKNOWN) { + cinfo->contentEncAlgTag = SECOID_GetAlgorithmTag(&(cinfo->contentEncAlg)); ++ } + + return cinfo->contentEncAlgTag; + } +@@ -322,6 +363,10 @@ NSS_CMSContentInfo_GetContentEncAlgTag(NSSCMSContentInfo *cinfo) + SECAlgorithmID * + NSS_CMSContentInfo_GetContentEncAlg(NSSCMSContentInfo *cinfo) + { ++ if (cinfo == NULL) { ++ return NULL; ++ } ++ + return &(cinfo->contentEncAlg); + } + +@@ -330,10 +375,14 @@ NSS_CMSContentInfo_SetContentEncAlg(PLArenaPool *poolp, NSSCMSContentInfo *cinfo + SECOidTag bulkalgtag, SECItem *parameters, int keysize) + { + SECStatus rv; ++ if (cinfo == NULL) { ++ return SECFailure; ++ } + + rv = SECOID_SetAlgorithmID(poolp, &(cinfo->contentEncAlg), bulkalgtag, parameters); +- if (rv != SECSuccess) ++ if (rv != SECSuccess) { + return SECFailure; ++ } + cinfo->keysize = keysize; + return SECSuccess; + } +@@ -343,27 +392,42 @@ NSS_CMSContentInfo_SetContentEncAlgID(PLArenaPool *poolp, NSSCMSContentInfo *cin + SECAlgorithmID *algid, int keysize) + { + SECStatus rv; ++ if (cinfo == NULL) { ++ return SECFailure; ++ } + + rv = SECOID_CopyAlgorithmID(poolp, &(cinfo->contentEncAlg), algid); +- if (rv != SECSuccess) ++ if (rv != SECSuccess) { + return SECFailure; +- if (keysize >= 0) ++ } ++ if (keysize >= 0) { + cinfo->keysize = keysize; ++ } + return SECSuccess; + } + + void + NSS_CMSContentInfo_SetBulkKey(NSSCMSContentInfo *cinfo, PK11SymKey *bulkkey) + { +- cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey); +- cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg)); ++ if (cinfo == NULL) { ++ return; ++ } ++ ++ if (bulkkey == NULL) { ++ cinfo->bulkkey = NULL; ++ cinfo->keysize = 0; ++ } else { ++ cinfo->bulkkey = PK11_ReferenceSymKey(bulkkey); ++ cinfo->keysize = PK11_GetKeyStrength(cinfo->bulkkey, &(cinfo->contentEncAlg)); ++ } + } + + PK11SymKey * + NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo) + { +- if (cinfo->bulkkey == NULL) ++ if (cinfo == NULL || cinfo->bulkkey == NULL) { + return NULL; ++ } + + return PK11_ReferenceSymKey(cinfo->bulkkey); + } +@@ -371,5 +435,9 @@ NSS_CMSContentInfo_GetBulkKey(NSSCMSContentInfo *cinfo) + int + NSS_CMSContentInfo_GetBulkKeySize(NSSCMSContentInfo *cinfo) + { ++ if (cinfo == NULL) { ++ return 0; ++ } ++ + return cinfo->keysize; + } +diff --git a/lib/smime/cmsdigdata.c b/lib/smime/cmsdigdata.c +index 9ea22702e..a249686bb 100644 +--- a/lib/smime/cmsdigdata.c ++++ b/lib/smime/cmsdigdata.c +@@ -56,7 +56,9 @@ void + NSS_CMSDigestedData_Destroy(NSSCMSDigestedData *digd) + { + /* everything's in a pool, so don't worry about the storage */ +- NSS_CMSContentInfo_Destroy(&(digd->contentInfo)); ++ if (digd != NULL) { ++ NSS_CMSContentInfo_Destroy(&(digd->contentInfo)); ++ } + return; + } + +diff --git a/lib/smime/cmsencdata.c b/lib/smime/cmsencdata.c +index c3a4549ad..8b520b439 100644 +--- a/lib/smime/cmsencdata.c ++++ b/lib/smime/cmsencdata.c +@@ -87,7 +87,9 @@ void + NSS_CMSEncryptedData_Destroy(NSSCMSEncryptedData *encd) + { + /* everything's in a pool, so don't worry about the storage */ +- NSS_CMSContentInfo_Destroy(&(encd->contentInfo)); ++ if (encd != NULL) { ++ NSS_CMSContentInfo_Destroy(&(encd->contentInfo)); ++ } + return; + } + +diff --git a/lib/smime/cmsenvdata.c b/lib/smime/cmsenvdata.c +index f2c8e171d..9bc77be8b 100644 +--- a/lib/smime/cmsenvdata.c ++++ b/lib/smime/cmsenvdata.c +@@ -144,6 +144,11 @@ NSS_CMSEnvelopedData_Encode_BeforeStart(NSSCMSEnvelopedData *envd) + poolp = envd->cmsg->poolp; + cinfo = &(envd->contentInfo); + ++ if (cinfo == NULL) { ++ PORT_SetError(SEC_ERROR_BAD_DATA); ++ goto loser; ++ } ++ + recipientinfos = envd->recipientInfos; + if (recipientinfos == NULL) { + PORT_SetError(SEC_ERROR_BAD_DATA); +diff --git a/lib/smime/cmsmessage.c b/lib/smime/cmsmessage.c +index f41a432b1..366b71aba 100644 +--- a/lib/smime/cmsmessage.c ++++ b/lib/smime/cmsmessage.c +@@ -96,6 +96,9 @@ NSS_CMSMessage_SetEncodingParams(NSSCMSMessage *cmsg, + void + NSS_CMSMessage_Destroy(NSSCMSMessage *cmsg) + { ++ if (cmsg == NULL) ++ return; ++ + PORT_Assert(cmsg->refCount > 0); + if (cmsg->refCount <= 0) { /* oops */ + return; +diff --git a/lib/smime/cmsudf.c b/lib/smime/cmsudf.c +index 3ef4268d4..5c8a81e6d 100644 +--- a/lib/smime/cmsudf.c ++++ b/lib/smime/cmsudf.c +@@ -239,7 +239,7 @@ NSS_CMSGenericWrapperData_Destroy(SECOidTag type, NSSCMSGenericWrapperData *gd) + { + const nsscmstypeInfo *typeInfo = nss_cmstype_lookup(type); + +- if (typeInfo && typeInfo->destroy) { ++ if (typeInfo && (typeInfo->destroy) && (gd != NULL)) { + (*typeInfo->destroy)(gd); + } + } diff --git a/dev-libs/nss/nss-3.40.1-r1.ebuild b/dev-libs/nss/nss-3.40.1-r1.ebuild new file mode 100644 index 000000000000..907e54788a66 --- /dev/null +++ b/dev-libs/nss/nss-3.40.1-r1.ebuild @@ -0,0 +1,373 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal + +NSPR_VER="4.16" +RTM_NAME="NSS_${PV//./_}_RTM" +# Rev of https://git.fedorahosted.org/cgit/nss-pem.git +PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116" +PEM_P="${PN}-pem-20160329" + +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz + cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch ) + nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )" + +LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="cacert +nss-pem utils" +CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" +DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] + ${CDEPEND}" +RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] + ${CDEPEND} +" + +RESTRICT="test" + +S="${WORKDIR}/${P}/${PN}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/nss-config +) + +PATCHES=( + # Custom changes for gentoo + "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch" + "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" + "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" + # fix for bugs ported forward from 3.36.7 + "${FILESDIR}/${PN}-3.36.7-fix-cms.patch" +) + +src_unpack() { + unpack ${A} + if use nss-pem ; then + mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die + fi +} + +src_prepare() { + if use nss-pem ; then + PATCHES+=( + "${FILESDIR}/${PN}-3.21-enable-pem.patch" + ) + fi + if use cacert ; then #521462 + PATCHES+=( + "${DISTDIR}/${PN}-cacert-class1-class3.patch" + ) + fi + + default + + pushd coreconf >/dev/null || die + # hack nspr paths + echo 'INCLUDES += -I$(DIST)/include/dbm' \ + >> headers.mk || die "failed to append include" + + # modify install path + sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i source.mk || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk + popd >/dev/null || die + + # Fix pkgconfig file for Prefix + sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ + config/Makefile || die + + # use host shlibsign if need be #436216 + if tc-is-cross-compiler ; then + sed -i \ + -e 's:"${2}"/shlibsign:shlibsign:' \ + cmd/shlibsign/sign.sh || die + fi + + # dirty hack + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ + lib/ssl/config.mk || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ + cmd/platlibs.mk || die + + multilib_copy_sources + + strip-flags +} + +multilib_src_configure() { + # Ensure we stay multilib aware + sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die +} + +nssarch() { + # Most of the arches are the same as $ARCH + local t=${1:-${CHOST}} + case ${t} in + aarch64*)echo "aarch64";; + hppa*) echo "parisc";; + i?86*) echo "i686";; + x86_64*) echo "x86_64";; + *) tc-arch ${t};; + esac +} + +nssbits() { + local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" + if [[ ${1} == BUILD_ ]]; then + cc=$(tc-getBUILD_CC) + else + cc=$(tc-getCC) + fi + echo > "${T}"/test.c || die + ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die + case $(file "${T}/${1}test.o") in + *32-bit*x86-64*) echo USE_X32=1;; + *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";; + esac +} + +multilib_src_compile() { + # use ABI to determine bit'ness, or fallback if unset + local buildbits mybits + case "${ABI}" in + n32) mybits="USE_N32=1";; + x32) mybits="USE_X32=1";; + s390x|*64) mybits="USE_64=1";; + ${DEFAULT_ABI}) + einfo "Running compilation test to determine bit'ness" + mybits=$(nssbits) + ;; + esac + # bitness of host may differ from target + if tc-is-cross-compiler; then + buildbits=$(nssbits BUILD_) + fi + + local makeargs=( + CC="$(tc-getCC)" + CCC="$(tc-getCXX)" + AR="$(tc-getAR) rc \$@" + RANLIB="$(tc-getRANLIB)" + OPTIMIZER= + ${mybits} + ) + + # Take care of nspr settings #436216 + local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)" + unset NSPR_INCLUDE_DIR + + # Do not let `uname` be used. + if use kernel_linux ; then + makeargs+=( + OS_TARGET=Linux + OS_RELEASE=2.6 + OS_TEST="$(nssarch)" + ) + fi + + export NSS_ENABLE_WERROR=0 #567158 + export BUILD_OPT=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSDISTMODE=copy + export NSS_ENABLE_ECC=1 + export FREEBL_NO_DEPEND=1 + export ASFLAGS="" + + local d + + # Build the host tools first. + LDFLAGS="${BUILD_LDFLAGS}" \ + XCFLAGS="${BUILD_CFLAGS}" \ + NSPR_LIB_DIR="${T}/fakedir" \ + emake -j1 -C coreconf \ + CC="$(tc-getBUILD_CC)" \ + ${buildbits:-${mybits}} + makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) + + # Then build the target tools. + for d in . lib/dbm ; do + CPPFLAGS="${myCPPFLAGS}" \ + XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ + NSPR_LIB_DIR="${T}/fakedir" \ + emake -j1 "${makeargs[@]}" -C ${d} + done +} + +# Altering these 3 libraries breaks the CHK verification. +# All of the following cause it to break: +# - stripping +# - prelink +# - ELF signing +# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html +# Either we have to NOT strip them, or we have to forcibly resign after +# stripping. +#local_libdir="$(get_libdir)" +#export STRIP_MASK=" +# */${local_libdir}/libfreebl3.so* +# */${local_libdir}/libnssdbm3.so* +# */${local_libdir}/libsoftokn3.so*" + +export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" + +generate_chk() { + local shlibsign="$1" + local libdir="$2" + einfo "Resigning core NSS libraries for FIPS validation" + shift 2 + local i + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libname=lib${i}.so + local chkname=lib${i}.chk + "${shlibsign}" \ + -i "${libdir}"/${libname} \ + -o "${libdir}"/${chkname}.tmp \ + && mv -f \ + "${libdir}"/${chkname}.tmp \ + "${libdir}"/${chkname} \ + || die "Failed to sign ${libname}" + done +} + +cleanup_chk() { + local libdir="$1" + shift 1 + local i + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libfname="${libdir}/lib${i}.so" + # If the major version has changed, then we have old chk files. + [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ + && rm -f "${libfname}.chk" + done +} + +multilib_src_install() { + pushd dist >/dev/null || die + + dodir /usr/$(get_libdir) + cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed" + local i + for i in crmf freebl nssb nssckfw ; do + cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed" + done + + # Install nss-config and pkgconfig file + dodir /usr/bin + cp -L */bin/nss-config "${ED%/}"/usr/bin || die + dodir /usr/$(get_libdir)/pkgconfig + cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die + + # create an nss-softokn.pc from nss.pc for libfreebl and some private headers + # bug 517266 + sed -e 's#Libs:#Libs: -lfreebl#' \ + -e 's#Cflags:#Cflags: -I${includedir}/private#' \ + */lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ + || die "could not create nss-softokn.pc" + + # all the include files + insinto /usr/include/nss + doins public/nss/*.{h,api} + insinto /usr/include/nss/private + doins private/nss/{blapi,alghmac}.h + + popd >/dev/null || die + + local f nssutils + # Always enabled because we need it for chk generation. + nssutils=( shlibsign ) + + if multilib_is_native_abi ; then + if use utils; then + # The tests we do not need to install. + #nssutils_test="bltest crmftest dbtest dertimetest + #fipstest remtest sdrtest" + # checkcert utils has been removed in nss-3.22: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545 + # https://hg.mozilla.org/projects/nss/rev/df1729d37870 + # certcgi has been removed in nss-3.36: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602 + nssutils+=( + addbuiltin + atob + baddbdir + btoa + certutil + cmsutil + conflict + crlutil + derdump + digest + makepqg + mangle + modutil + multinit + nonspr10 + ocspclnt + oidcalc + p7content + p7env + p7sign + p7verify + pk11mode + pk12util + pp + rsaperf + selfserv + signtool + signver + ssltap + strsclnt + symkeyutil + tstclnt + vfychain + vfyserv + ) + # install man-pages for utils (bug #516810) + doman doc/nroff/*.1 + fi + pushd dist/*/bin >/dev/null || die + for f in ${nssutils[@]}; do + dobin ${f} + done + popd >/dev/null || die + fi + + # Prelink breaks the CHK files. We don't have any reliable way to run + # shlibsign after prelink. + dodir /etc/prelink.conf.d + printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ + > "${ED%/}"/etc/prelink.conf.d/nss.conf +} + +pkg_postinst() { + multilib_pkg_postinst() { + # We must re-sign the libraries AFTER they are stripped. + local shlibsign="${EROOT}/usr/bin/shlibsign" + # See if we can execute it (cross-compiling & such). #436216 + "${shlibsign}" -h >&/dev/null + if [[ $? -gt 1 ]] ; then + shlibsign="shlibsign" + fi + generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) + } + + multilib_foreach_abi multilib_pkg_postinst +} + +pkg_postrm() { + multilib_pkg_postrm() { + cleanup_chk "${EROOT}"/usr/$(get_libdir) + } + + multilib_foreach_abi multilib_pkg_postrm +} diff --git a/dev-libs/nss/nss-3.41-r1.ebuild b/dev-libs/nss/nss-3.41-r1.ebuild new file mode 100644 index 000000000000..907e54788a66 --- /dev/null +++ b/dev-libs/nss/nss-3.41-r1.ebuild @@ -0,0 +1,373 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal + +NSPR_VER="4.16" +RTM_NAME="NSS_${PV//./_}_RTM" +# Rev of https://git.fedorahosted.org/cgit/nss-pem.git +PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116" +PEM_P="${PN}-pem-20160329" + +DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" +HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" +SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz + cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch ) + nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )" + +LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="cacert +nss-pem utils" +CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" +DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] + ${CDEPEND}" +RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] + ${CDEPEND} +" + +RESTRICT="test" + +S="${WORKDIR}/${P}/${PN}" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/nss-config +) + +PATCHES=( + # Custom changes for gentoo + "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch" + "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" + "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" + # fix for bugs ported forward from 3.36.7 + "${FILESDIR}/${PN}-3.36.7-fix-cms.patch" +) + +src_unpack() { + unpack ${A} + if use nss-pem ; then + mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die + fi +} + +src_prepare() { + if use nss-pem ; then + PATCHES+=( + "${FILESDIR}/${PN}-3.21-enable-pem.patch" + ) + fi + if use cacert ; then #521462 + PATCHES+=( + "${DISTDIR}/${PN}-cacert-class1-class3.patch" + ) + fi + + default + + pushd coreconf >/dev/null || die + # hack nspr paths + echo 'INCLUDES += -I$(DIST)/include/dbm' \ + >> headers.mk || die "failed to append include" + + # modify install path + sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ + -i source.mk || die + + # Respect LDFLAGS + sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk + popd >/dev/null || die + + # Fix pkgconfig file for Prefix + sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ + config/Makefile || die + + # use host shlibsign if need be #436216 + if tc-is-cross-compiler ; then + sed -i \ + -e 's:"${2}"/shlibsign:shlibsign:' \ + cmd/shlibsign/sign.sh || die + fi + + # dirty hack + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ + lib/ssl/config.mk || die + sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ + cmd/platlibs.mk || die + + multilib_copy_sources + + strip-flags +} + +multilib_src_configure() { + # Ensure we stay multilib aware + sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die +} + +nssarch() { + # Most of the arches are the same as $ARCH + local t=${1:-${CHOST}} + case ${t} in + aarch64*)echo "aarch64";; + hppa*) echo "parisc";; + i?86*) echo "i686";; + x86_64*) echo "x86_64";; + *) tc-arch ${t};; + esac +} + +nssbits() { + local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" + if [[ ${1} == BUILD_ ]]; then + cc=$(tc-getBUILD_CC) + else + cc=$(tc-getCC) + fi + echo > "${T}"/test.c || die + ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die + case $(file "${T}/${1}test.o") in + *32-bit*x86-64*) echo USE_X32=1;; + *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; + *32-bit*|*ppc*|*i386*) ;; + *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";; + esac +} + +multilib_src_compile() { + # use ABI to determine bit'ness, or fallback if unset + local buildbits mybits + case "${ABI}" in + n32) mybits="USE_N32=1";; + x32) mybits="USE_X32=1";; + s390x|*64) mybits="USE_64=1";; + ${DEFAULT_ABI}) + einfo "Running compilation test to determine bit'ness" + mybits=$(nssbits) + ;; + esac + # bitness of host may differ from target + if tc-is-cross-compiler; then + buildbits=$(nssbits BUILD_) + fi + + local makeargs=( + CC="$(tc-getCC)" + CCC="$(tc-getCXX)" + AR="$(tc-getAR) rc \$@" + RANLIB="$(tc-getRANLIB)" + OPTIMIZER= + ${mybits} + ) + + # Take care of nspr settings #436216 + local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)" + unset NSPR_INCLUDE_DIR + + # Do not let `uname` be used. + if use kernel_linux ; then + makeargs+=( + OS_TARGET=Linux + OS_RELEASE=2.6 + OS_TEST="$(nssarch)" + ) + fi + + export NSS_ENABLE_WERROR=0 #567158 + export BUILD_OPT=1 + export NSS_USE_SYSTEM_SQLITE=1 + export NSDISTMODE=copy + export NSS_ENABLE_ECC=1 + export FREEBL_NO_DEPEND=1 + export ASFLAGS="" + + local d + + # Build the host tools first. + LDFLAGS="${BUILD_LDFLAGS}" \ + XCFLAGS="${BUILD_CFLAGS}" \ + NSPR_LIB_DIR="${T}/fakedir" \ + emake -j1 -C coreconf \ + CC="$(tc-getBUILD_CC)" \ + ${buildbits:-${mybits}} + makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) + + # Then build the target tools. + for d in . lib/dbm ; do + CPPFLAGS="${myCPPFLAGS}" \ + XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ + NSPR_LIB_DIR="${T}/fakedir" \ + emake -j1 "${makeargs[@]}" -C ${d} + done +} + +# Altering these 3 libraries breaks the CHK verification. +# All of the following cause it to break: +# - stripping +# - prelink +# - ELF signing +# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html +# Either we have to NOT strip them, or we have to forcibly resign after +# stripping. +#local_libdir="$(get_libdir)" +#export STRIP_MASK=" +# */${local_libdir}/libfreebl3.so* +# */${local_libdir}/libnssdbm3.so* +# */${local_libdir}/libsoftokn3.so*" + +export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" + +generate_chk() { + local shlibsign="$1" + local libdir="$2" + einfo "Resigning core NSS libraries for FIPS validation" + shift 2 + local i + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libname=lib${i}.so + local chkname=lib${i}.chk + "${shlibsign}" \ + -i "${libdir}"/${libname} \ + -o "${libdir}"/${chkname}.tmp \ + && mv -f \ + "${libdir}"/${chkname}.tmp \ + "${libdir}"/${chkname} \ + || die "Failed to sign ${libname}" + done +} + +cleanup_chk() { + local libdir="$1" + shift 1 + local i + for i in ${NSS_CHK_SIGN_LIBS} ; do + local libfname="${libdir}/lib${i}.so" + # If the major version has changed, then we have old chk files. + [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ + && rm -f "${libfname}.chk" + done +} + +multilib_src_install() { + pushd dist >/dev/null || die + + dodir /usr/$(get_libdir) + cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed" + local i + for i in crmf freebl nssb nssckfw ; do + cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed" + done + + # Install nss-config and pkgconfig file + dodir /usr/bin + cp -L */bin/nss-config "${ED%/}"/usr/bin || die + dodir /usr/$(get_libdir)/pkgconfig + cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die + + # create an nss-softokn.pc from nss.pc for libfreebl and some private headers + # bug 517266 + sed -e 's#Libs:#Libs: -lfreebl#' \ + -e 's#Cflags:#Cflags: -I${includedir}/private#' \ + */lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ + || die "could not create nss-softokn.pc" + + # all the include files + insinto /usr/include/nss + doins public/nss/*.{h,api} + insinto /usr/include/nss/private + doins private/nss/{blapi,alghmac}.h + + popd >/dev/null || die + + local f nssutils + # Always enabled because we need it for chk generation. + nssutils=( shlibsign ) + + if multilib_is_native_abi ; then + if use utils; then + # The tests we do not need to install. + #nssutils_test="bltest crmftest dbtest dertimetest + #fipstest remtest sdrtest" + # checkcert utils has been removed in nss-3.22: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545 + # https://hg.mozilla.org/projects/nss/rev/df1729d37870 + # certcgi has been removed in nss-3.36: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602 + nssutils+=( + addbuiltin + atob + baddbdir + btoa + certutil + cmsutil + conflict + crlutil + derdump + digest + makepqg + mangle + modutil + multinit + nonspr10 + ocspclnt + oidcalc + p7content + p7env + p7sign + p7verify + pk11mode + pk12util + pp + rsaperf + selfserv + signtool + signver + ssltap + strsclnt + symkeyutil + tstclnt + vfychain + vfyserv + ) + # install man-pages for utils (bug #516810) + doman doc/nroff/*.1 + fi + pushd dist/*/bin >/dev/null || die + for f in ${nssutils[@]}; do + dobin ${f} + done + popd >/dev/null || die + fi + + # Prelink breaks the CHK files. We don't have any reliable way to run + # shlibsign after prelink. + dodir /etc/prelink.conf.d + printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ + > "${ED%/}"/etc/prelink.conf.d/nss.conf +} + +pkg_postinst() { + multilib_pkg_postinst() { + # We must re-sign the libraries AFTER they are stripped. + local shlibsign="${EROOT}/usr/bin/shlibsign" + # See if we can execute it (cross-compiling & such). #436216 + "${shlibsign}" -h >&/dev/null + if [[ $? -gt 1 ]] ; then + shlibsign="shlibsign" + fi + generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) + } + + multilib_foreach_abi multilib_pkg_postinst +} + +pkg_postrm() { + multilib_pkg_postrm() { + cleanup_chk "${EROOT}"/usr/$(get_libdir) + } + + multilib_foreach_abi multilib_pkg_postrm +} diff --git a/dev-libs/nss/nss-3.41.ebuild b/dev-libs/nss/nss-3.41.ebuild deleted file mode 100644 index 9ce8edd66595..000000000000 --- a/dev-libs/nss/nss-3.41.ebuild +++ /dev/null @@ -1,371 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit eutils flag-o-matic multilib toolchain-funcs multilib-minimal - -NSPR_VER="4.16" -RTM_NAME="NSS_${PV//./_}_RTM" -# Rev of https://git.fedorahosted.org/cgit/nss-pem.git -PEM_GIT_REV="429b0222759d8ad8e6dcd29e62875ae3efd69116" -PEM_P="${PN}-pem-20160329" - -DESCRIPTION="Mozilla's Network Security Services library that implements PKI support" -HOMEPAGE="http://www.mozilla.org/projects/security/pki/nss/" -SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz - cacert? ( https://dev.gentoo.org/~axs/distfiles/${PN}-cacert-class1-class3.patch ) - nss-pem? ( https://dev.gentoo.org/~polynomial-c/${PEM_P}.tar.xz )" - -LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="cacert +nss-pem utils" -CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" -DEPEND=">=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] - ${CDEPEND}" -RDEPEND=">=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}] - ${CDEPEND} -" - -RESTRICT="test" - -S="${WORKDIR}/${P}/${PN}" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/nss-config -) - -PATCHES=( - # Custom changes for gentoo - "${FILESDIR}/${PN}-3.32-gentoo-fixups.patch" - "${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch" - "${FILESDIR}/${PN}-3.23-hppa-byte_order.patch" -) - -src_unpack() { - unpack ${A} - if use nss-pem ; then - mv "${PN}"/lib/ckfw/pem/ "${S}"/lib/ckfw/ || die - fi -} - -src_prepare() { - if use nss-pem ; then - PATCHES+=( - "${FILESDIR}/${PN}-3.21-enable-pem.patch" - ) - fi - if use cacert ; then #521462 - PATCHES+=( - "${DISTDIR}/${PN}-cacert-class1-class3.patch" - ) - fi - - default - - pushd coreconf >/dev/null || die - # hack nspr paths - echo 'INCLUDES += -I$(DIST)/include/dbm' \ - >> headers.mk || die "failed to append include" - - # modify install path - sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \ - -i source.mk || die - - # Respect LDFLAGS - sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk - popd >/dev/null || die - - # Fix pkgconfig file for Prefix - sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \ - config/Makefile || die - - # use host shlibsign if need be #436216 - if tc-is-cross-compiler ; then - sed -i \ - -e 's:"${2}"/shlibsign:shlibsign:' \ - cmd/shlibsign/sign.sh || die - fi - - # dirty hack - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \ - lib/ssl/config.mk || die - sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \ - cmd/platlibs.mk || die - - multilib_copy_sources - - strip-flags -} - -multilib_src_configure() { - # Ensure we stay multilib aware - sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die -} - -nssarch() { - # Most of the arches are the same as $ARCH - local t=${1:-${CHOST}} - case ${t} in - aarch64*)echo "aarch64";; - hppa*) echo "parisc";; - i?86*) echo "i686";; - x86_64*) echo "x86_64";; - *) tc-arch ${t};; - esac -} - -nssbits() { - local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS" - if [[ ${1} == BUILD_ ]]; then - cc=$(tc-getBUILD_CC) - else - cc=$(tc-getCC) - fi - echo > "${T}"/test.c || die - ${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die - case $(file "${T}/${1}test.o") in - *32-bit*x86-64*) echo USE_X32=1;; - *64-bit*|*ppc64*|*x86_64*) echo USE_64=1;; - *32-bit*|*ppc*|*i386*) ;; - *) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";; - esac -} - -multilib_src_compile() { - # use ABI to determine bit'ness, or fallback if unset - local buildbits mybits - case "${ABI}" in - n32) mybits="USE_N32=1";; - x32) mybits="USE_X32=1";; - s390x|*64) mybits="USE_64=1";; - ${DEFAULT_ABI}) - einfo "Running compilation test to determine bit'ness" - mybits=$(nssbits) - ;; - esac - # bitness of host may differ from target - if tc-is-cross-compiler; then - buildbits=$(nssbits BUILD_) - fi - - local makeargs=( - CC="$(tc-getCC)" - CCC="$(tc-getCXX)" - AR="$(tc-getAR) rc \$@" - RANLIB="$(tc-getRANLIB)" - OPTIMIZER= - ${mybits} - ) - - # Take care of nspr settings #436216 - local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)" - unset NSPR_INCLUDE_DIR - - # Do not let `uname` be used. - if use kernel_linux ; then - makeargs+=( - OS_TARGET=Linux - OS_RELEASE=2.6 - OS_TEST="$(nssarch)" - ) - fi - - export NSS_ENABLE_WERROR=0 #567158 - export BUILD_OPT=1 - export NSS_USE_SYSTEM_SQLITE=1 - export NSDISTMODE=copy - export NSS_ENABLE_ECC=1 - export FREEBL_NO_DEPEND=1 - export ASFLAGS="" - - local d - - # Build the host tools first. - LDFLAGS="${BUILD_LDFLAGS}" \ - XCFLAGS="${BUILD_CFLAGS}" \ - NSPR_LIB_DIR="${T}/fakedir" \ - emake -j1 -C coreconf \ - CC="$(tc-getBUILD_CC)" \ - ${buildbits:-${mybits}} - makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" ) - - # Then build the target tools. - for d in . lib/dbm ; do - CPPFLAGS="${myCPPFLAGS}" \ - XCFLAGS="${CFLAGS} ${CPPFLAGS}" \ - NSPR_LIB_DIR="${T}/fakedir" \ - emake -j1 "${makeargs[@]}" -C ${d} - done -} - -# Altering these 3 libraries breaks the CHK verification. -# All of the following cause it to break: -# - stripping -# - prelink -# - ELF signing -# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html -# Either we have to NOT strip them, or we have to forcibly resign after -# stripping. -#local_libdir="$(get_libdir)" -#export STRIP_MASK=" -# */${local_libdir}/libfreebl3.so* -# */${local_libdir}/libnssdbm3.so* -# */${local_libdir}/libsoftokn3.so*" - -export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3" - -generate_chk() { - local shlibsign="$1" - local libdir="$2" - einfo "Resigning core NSS libraries for FIPS validation" - shift 2 - local i - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libname=lib${i}.so - local chkname=lib${i}.chk - "${shlibsign}" \ - -i "${libdir}"/${libname} \ - -o "${libdir}"/${chkname}.tmp \ - && mv -f \ - "${libdir}"/${chkname}.tmp \ - "${libdir}"/${chkname} \ - || die "Failed to sign ${libname}" - done -} - -cleanup_chk() { - local libdir="$1" - shift 1 - local i - for i in ${NSS_CHK_SIGN_LIBS} ; do - local libfname="${libdir}/lib${i}.so" - # If the major version has changed, then we have old chk files. - [ ! -f "${libfname}" -a -f "${libfname}.chk" ] \ - && rm -f "${libfname}.chk" - done -} - -multilib_src_install() { - pushd dist >/dev/null || die - - dodir /usr/$(get_libdir) - cp -L */lib/*$(get_libname) "${ED%/}"/usr/$(get_libdir) || die "copying shared libs failed" - local i - for i in crmf freebl nssb nssckfw ; do - cp -L */lib/lib${i}.a "${ED%/}"/usr/$(get_libdir) || die "copying libs failed" - done - - # Install nss-config and pkgconfig file - dodir /usr/bin - cp -L */bin/nss-config "${ED%/}"/usr/bin || die - dodir /usr/$(get_libdir)/pkgconfig - cp -L */lib/pkgconfig/nss.pc "${ED%/}"/usr/$(get_libdir)/pkgconfig || die - - # create an nss-softokn.pc from nss.pc for libfreebl and some private headers - # bug 517266 - sed -e 's#Libs:#Libs: -lfreebl#' \ - -e 's#Cflags:#Cflags: -I${includedir}/private#' \ - */lib/pkgconfig/nss.pc >"${ED%/}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \ - || die "could not create nss-softokn.pc" - - # all the include files - insinto /usr/include/nss - doins public/nss/*.{h,api} - insinto /usr/include/nss/private - doins private/nss/{blapi,alghmac}.h - - popd >/dev/null || die - - local f nssutils - # Always enabled because we need it for chk generation. - nssutils=( shlibsign ) - - if multilib_is_native_abi ; then - if use utils; then - # The tests we do not need to install. - #nssutils_test="bltest crmftest dbtest dertimetest - #fipstest remtest sdrtest" - # checkcert utils has been removed in nss-3.22: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1187545 - # https://hg.mozilla.org/projects/nss/rev/df1729d37870 - # certcgi has been removed in nss-3.36: - # https://bugzilla.mozilla.org/show_bug.cgi?id=1426602 - nssutils+=( - addbuiltin - atob - baddbdir - btoa - certutil - cmsutil - conflict - crlutil - derdump - digest - makepqg - mangle - modutil - multinit - nonspr10 - ocspclnt - oidcalc - p7content - p7env - p7sign - p7verify - pk11mode - pk12util - pp - rsaperf - selfserv - signtool - signver - ssltap - strsclnt - symkeyutil - tstclnt - vfychain - vfyserv - ) - # install man-pages for utils (bug #516810) - doman doc/nroff/*.1 - fi - pushd dist/*/bin >/dev/null || die - for f in ${nssutils[@]}; do - dobin ${f} - done - popd >/dev/null || die - fi - - # Prelink breaks the CHK files. We don't have any reliable way to run - # shlibsign after prelink. - dodir /etc/prelink.conf.d - printf -- "-b ${EPREFIX}/usr/$(get_libdir)/lib%s.so\n" ${NSS_CHK_SIGN_LIBS} \ - > "${ED%/}"/etc/prelink.conf.d/nss.conf -} - -pkg_postinst() { - multilib_pkg_postinst() { - # We must re-sign the libraries AFTER they are stripped. - local shlibsign="${EROOT}/usr/bin/shlibsign" - # See if we can execute it (cross-compiling & such). #436216 - "${shlibsign}" -h >&/dev/null - if [[ $? -gt 1 ]] ; then - shlibsign="shlibsign" - fi - generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir) - } - - multilib_foreach_abi multilib_pkg_postinst -} - -pkg_postrm() { - multilib_pkg_postrm() { - cleanup_chk "${EROOT}"/usr/$(get_libdir) - } - - multilib_foreach_abi multilib_pkg_postrm -} diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest index acb38bad0438..b5fca226d9fa 100644 --- a/dev-libs/spdlog/Manifest +++ b/dev-libs/spdlog/Manifest @@ -1,7 +1,9 @@ AUX spdlog-1.0.0-unbundle-fmt.patch 700 BLAKE2B d98e7dc4ad4b2911192053d1aec564f1e07c5dd7a5bfca39f30fd08e7210bc79749fed03b6e6137671156f814f4c07b6e47f56e11c69806cdb28a1a478cae8dd SHA512 cf86983ccbb975df3804f10fd581a4edbe11ba1d2b43312fb27c05ffc95269c8eeca75e38970697f34d9c5861b925537bc0a9b0bcfd84617d328d640cf668db8 DIST spdlog-1.2.1.tar.gz 188284 BLAKE2B c3491a9c44d8a94c51d50c9ef36a2105f77e8fb61bb7b2b81a341609f433abbe3a74e7b4a467dd715a5d906f976740716488d07b4510f366556ab59d160ceefe SHA512 418f91efc207fa227558212d82c41639c0bb59e84ea47447e0b6276c4842e97f1f8aaf5802c071ef15d80ec525e317e70b6a39661a6c96ab39d33d9bd1570da1 DIST spdlog-1.3.0.tar.gz 202637 BLAKE2B 97027a3672b826e294dbdc202afa913a42ddae5a02a569ac28c41d79b96128de045ac5df30a76d888d6b3bea5093fb75b006365d7b1b296842750a39f43835d6 SHA512 019a52d4b6c66287ee2a6e8177457ecbbb78e1cb894f4a0a90b83a84d66cd37b397cdf77892d9116e4c34113bd3277d606d578bc96ec6521ae7745f08b1aa54f +DIST spdlog-1.3.1.tar.gz 202634 BLAKE2B 2465a8d1a38af1527ae66d92f5dd91ad504d01e44ac47702e315f7448e19f01743627357132f0561e48807315df9b102f337f95cab5a7aae3ec0ae7ceff940b9 SHA512 a851a44b6384f493dd312ae0a611d068af46bbfe8daf1c2f61f13d8836a3801f41b339074fbe8da8e428131c82fa5c4a9e3320a55cbdd4b7aff8bb349dfff7dd EBUILD spdlog-1.2.1.ebuild 775 BLAKE2B fce5764a6d61b2748a5463fa319f03832af4deb3fdf505023483a6a48adddd1dcdcc03b9c8b3b73532927dcae68a1a592c5fd349cfd6befd54e7281fadd4e883 SHA512 394dd8bd0ba20cae5d3c37b59135eef5d784b9fcbe3eebf652319df34b4ee499d91478d934e326aafb9a221ef0aa3b260d5d0b4d0935ebf88e7562f713e9b00f EBUILD spdlog-1.3.0.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c +EBUILD spdlog-1.3.1.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c EBUILD spdlog-9999.ebuild 800 BLAKE2B 1b4c9b500f46918c1a124003cf8d1c0cbbb07aa9be815cf9d28ca326a18aa5c6d3e1e9bbc7996706f8ded5fcb21b025be0796a639baf9b1558ea60f269f7bfe6 SHA512 fbb75ca0dec6a85547fb24fc12763ed8b044cb5bcab35a90659438ae86c1e4d45a404328dfa022a9da15e51380b706e3b5c39607fbae4530e0501c4b69d4247c MISC metadata.xml 444 BLAKE2B 43dc7df0be06296bad03bcd8c479773dab68c409644907e7fc02f0467e1ff8bc291e090b1c9831acb1c66ee046326b6597edc7267be09498566a3f4abc2dd722 SHA512 3da6d49c08f56e11b065b4cd2cf3536fff75512ab729a958db07151c3bce234deeab22a95e7cc7f569edf5e42f7edc099a68c1572be936f2430144532e95b62c diff --git a/dev-libs/spdlog/spdlog-1.3.1.ebuild b/dev-libs/spdlog/spdlog-1.3.1.ebuild new file mode 100644 index 000000000000..497e7da9b419 --- /dev/null +++ b/dev-libs/spdlog/spdlog-1.3.1.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake-utils + +DESCRIPTION="Very fast, header only, C++ logging library" +HOMEPAGE="https://github.com/gabime/spdlog" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/gabime/spdlog" +else + SRC_URI="https://github.com/gabime/spdlog/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64" +fi + +LICENSE="MIT" +SLOT="0/1" +IUSE="test" + +DEPEND=" + >=dev-libs/libfmt-5.0.0 +" +RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${PN}-1.0.0-unbundle-fmt.patch" ) + +src_configure() { + rm -r include/spdlog/fmt/bundled || die + + local mycmakeargs=( + -DSPDLOG_BUILD_EXAMPLES=no + -DSPDLOG_BUILD_BENCH=no + -DSPDLOG_BUILD_TESTS=$(usex test) + ) + + cmake-utils_src_configure +} diff --git a/dev-libs/wayland-protocols/Manifest b/dev-libs/wayland-protocols/Manifest index c44bc7391a6a..ddd02fdd550d 100644 --- a/dev-libs/wayland-protocols/Manifest +++ b/dev-libs/wayland-protocols/Manifest @@ -1,6 +1,6 @@ DIST wayland-protocols-1.16.tar.xz 104156 BLAKE2B 7c6403e5498c2a9f1a97dfeef780a8df0bd05287e8866619657b29f5fc79c82fcc0892a7099b5eda80720dd136f8fa3c848c05aaf870e978e09ab2b04d883c2b SHA512 8ab33021854f3e8f6bca7a9e69427e7a3e53297cc0abd4c006de7e55fac66da3ad88489a6eb4e6c28c7ba2addd96e7f055309f3c8918643b18ef78a4fb637f84 DIST wayland-protocols-1.17.tar.xz 107680 BLAKE2B cde978ceeaa9d71ac76cd007c511011fed6a110e772a6a9e880a5fd07a0318239a11235aac25b855d0f7ed5ae9980dd2103886092e85a92ed606c8a2f53de726 SHA512 5f3aacbba58717092036659d9b665dc10ff05ee51df61b1de38b22f0417285a74fd8a6d15ca049ad60d204f28203aa13d773c52140c7c02db2c498a6964c2643 EBUILD wayland-protocols-1.16.ebuild 871 BLAKE2B 5545ecff86f62dad1e8fe4f3f823ac4137904b1a79e39dea836d3424bc68344065e3be4d1021a90f58f7814abfceb0f2a8e7a1b18076d3af653c8e1eb6990d10 SHA512 dc7a9bfb0e4f181a1951c1f43a04b7794e3cdd437b219bcfe4c5e7c64a253ef72271e9f46ed51e4f0d95d10cae60b2ba107bafeeda38b4b8919cf9ff599f063b -EBUILD wayland-protocols-1.17.ebuild 878 BLAKE2B 98991a4fe36c64e4330b4e84ceb4ba562e5c0eff4362a3d446219c12676ffc8868681f7dd7b0a74f953c223a48f75d017eb993fab5c4281af819f05683f48520 SHA512 7ce49596a163ab77ec5febf9e1b2de29ee9519bf88f35ed1b6dac41b4e52223b913a6f8892439ba09274c20d9ca922b9822837d89d74c7554b9a0af0099785aa +EBUILD wayland-protocols-1.17.ebuild 876 BLAKE2B 25c88be858ddae1af509f1bc5247038649d3755de01584bba6a9eda9322c8ced915dc45d9cf4846e6d025836c0af1119bea9ba3227510f587faf25cbfa2001bb SHA512 0380ce949ed884edf6ce715f05ab0fcac877c4a48bec7efc751234366136a3dc65a11fc25a4fad4cec2c85e84f09d79a0fb0a5b5c8270cd6914e3b04f8de06a7 EBUILD wayland-protocols-9999.ebuild 882 BLAKE2B fb9318354b7cebad42f935ebf85d5c09827c612e7cc9bebc85dd6ca4c2e2f3b2cf489825b7a001f0e9f03072ab022942a1d06a2ca8f4c0cdd57b14aee4a73192 SHA512 0bb80c936c9aa9cc77bc8dc91c982a91d385b7c923607729924d10aed1a17a6a3321b4ba1f2e4d961ba0422525bd9a63b6b9dc9bbdd25cf0ee407c16ebc2dc83 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild index b31c55f0b3b6..b6d840ece807 100644 --- a/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild +++ b/dev-libs/wayland-protocols/wayland-protocols-1.17.ebuild @@ -17,7 +17,7 @@ HOMEPAGE="https://wayland.freedesktop.org/" if [[ $PV != 9999* ]]; then SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz" - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86" fi LICENSE="MIT" -- cgit v1.2.3