diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-09 16:53:27 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-09 16:53:27 +0000 |
commit | 80208fb578cf92cc308906660ca6d7860c6b2a1f (patch) | |
tree | 6f06818031b553c506fc10dfe9908a835df288aa /sys-auth | |
parent | 06a7b5647e11a8ddf69b1c3d3ded6a8ba28b923e (diff) |
gentoo resync : 09.03.2018
Diffstat (limited to 'sys-auth')
-rw-r--r-- | sys-auth/Manifest.gz | bin | 10878 -> 10885 bytes | |||
-rw-r--r-- | sys-auth/elogind/Manifest | 4 | ||||
-rw-r--r-- | sys-auth/elogind/elogind-235.2-r2.ebuild (renamed from sys-auth/elogind/elogind-235.2-r1.ebuild) | 29 | ||||
-rw-r--r-- | sys-auth/elogind/files/elogind-235.2-docs.patch (renamed from sys-auth/elogind/files/elogind-235.1-docs.patch) | 5 | ||||
-rw-r--r-- | sys-auth/libnss-mysql/Manifest | 2 | ||||
-rw-r--r-- | sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild | 2 | ||||
-rw-r--r-- | sys-auth/libyubikey/Manifest | 2 | ||||
-rw-r--r-- | sys-auth/libyubikey/libyubikey-1.13.ebuild | 4 | ||||
-rw-r--r-- | sys-auth/ykpers/Manifest | 4 | ||||
-rw-r--r-- | sys-auth/ykpers/ykpers-1.18.0.ebuild | 4 | ||||
-rw-r--r-- | sys-auth/ykpers/ykpers-1.18.1.ebuild | 47 | ||||
-rw-r--r-- | sys-auth/yubico-piv-tool/Manifest | 3 | ||||
-rw-r--r-- | sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch | 170 | ||||
-rw-r--r-- | sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild | 50 |
14 files changed, 296 insertions, 30 deletions
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz Binary files differindex f3dcd360cc19..8c814d02ce75 100644 --- a/sys-auth/Manifest.gz +++ b/sys-auth/Manifest.gz diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest index 081c9698ad54..c9928fbde43f 100644 --- a/sys-auth/elogind/Manifest +++ b/sys-auth/elogind/Manifest @@ -1,8 +1,8 @@ -AUX elogind-235.1-docs.patch 714 BLAKE2B 93271996cbff4cc8f1cb222c83672f491d3473839fffea4818e7a7341fdb0060de23cca70576d81d0c6783fc796d998b0b70a38237ec7ab14dd8e2521659d49e SHA512 2e530aa318d3ba0de3a1fceb4d8316f8215e1a8d769b077cf4b223ae2f8103c62c2852dd3fd45540646ad6272b0edbb4b23d70a379a2601765c61b4d78b4d81e +AUX elogind-235.2-docs.patch 652 BLAKE2B c1d5336d18942efb082e39b2278b8af88da5da37c54a9cca0a9fd45f11fc8751da720d80dfad2c2688ebe81cac3101b491a098b516403bd4c46d9c277d39b2e8 SHA512 59179098c638b8b7228ed6013ff133305138b4aff32e8210fddcc8b056e21d2baeb8619debc9c2231f629cd5c99b79040da677f1eddc958119e488a91222f011 AUX elogind-235.2-drop-logintest.patch 451 BLAKE2B 61c25c176fd85786d899b34831c320e364b91e8f250c323caf1a5badb531cd58281ef5ac43347a4b94f44e7a40232d5cfded4c3ee7a113cbfd440bc24b13fbd9 SHA512 9017ceb04a779dbc5a2dbc5f1fa4c412d8538626696815f9a6ace3acb4c7d3dc1ca7685292b02483a2f80bc6685769efc853dcedd0e71e13bdbd324bb16ceafe AUX elogind-235.2-legacy-cgroupmode.patch 2527 BLAKE2B de50970f6c930b2ff35f6ecc4119e06abb23cbc02fcdb649930258b717ab05cb5b4b1ad8de1e89da705c8a1b66093eedba984c0a831fd60cef3d9704e09c6161 SHA512 1c98981db6efc6afb779aef93fd4cd7ba31a1995d74d1edea9b486c4724fe7bc215df95745a3553324750794530466679cbde491bf01ed5bab99a20eda135bb2 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313 -EBUILD elogind-235.2-r1.ebuild 3480 BLAKE2B dda1cbaaa5dc3f355eb9d407df64c4d10e740071f575acdd9c47123c68eaae31c696dd6c150ee8d07dc2e2a57328de330450cef0feff6cc926a633916dd7ba18 SHA512 85d5d135c93599cdb77157aeefedf0b2670f38c5859433a1a611095feefc670b1114c743bdd34725aa0db275089e8aeeaef421798adf613e8de15e13a3ec5a86 +EBUILD elogind-235.2-r2.ebuild 3274 BLAKE2B 01b8ed8c003382dc7eaf676a2b95493c442c673306405a832f174dabf025c0787daee1b98bfc584480f78b608fe4281a81b3ed554e14156d3c045ddee6c95da8 SHA512 f866e80c5631e3fae2269f5f12350e76a15ccea6186325319bc7c05ddade5cf0055761b6e01e068391fcda7dcff107437dbba31745a91ed04fefdd81f90c3402 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68 diff --git a/sys-auth/elogind/elogind-235.2-r1.ebuild b/sys-auth/elogind/elogind-235.2-r2.ebuild index 0a887ba050c1..bae01cc02e4f 100644 --- a/sys-auth/elogind/elogind-235.2-r1.ebuild +++ b/sys-auth/elogind/elogind-235.2-r2.ebuild @@ -40,7 +40,7 @@ PDEPEND=" " PATCHES=( - "${FILESDIR}/${PN}-235.1-docs.patch" + "${FILESDIR}/${P}-docs.patch" "${FILESDIR}/${P}-legacy-cgroupmode.patch" "${FILESDIR}/${P}-drop-logintest.patch" # bug 645156 ) @@ -69,32 +69,35 @@ src_configure() { fi local emesonargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${P}" - -Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" + -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" + -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html" -Dpamlibdir=$(getpam_mod_dir) -Dudevrulesdir="$(get_udevdir)"/rules.d --libdir="${EPREFIX}"/usr/$(get_libdir) -Drootlibdir="${EPREFIX}"/$(get_libdir) -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind -Drootprefix="${EPREFIX}/" - -Dsmack=true + -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" + -Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions" -Dman=auto - -Dhtml=$(usex doc auto false) + -Dsmack=true -Dcgroup-controller=openrc -Ddefault-hierarchy=${cgroupmode} + -Ddefault-kill-user-processes=false + -Dacl=$(usex acl true false) -Ddebug=$(usex debug elogind false) --buildtype $(usex debug debug release) - -Dacl=$(usex acl true false) + -Dhtml=$(usex doc auto false) -Dpam=$(usex pam true false) -Dselinux=$(usex selinux true false) - -Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" - -Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions" ) meson_src_configure } src_install() { + DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION ) + meson_src_install newinitd "${FILESDIR}"/${PN}.init ${PN} @@ -105,7 +108,7 @@ src_install() { pkg_postinst() { if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then - ewarn "elogind is currently started from boot runlevel." + elog "elogind is currently started from boot runlevel." elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then ewarn "elogind is currently started from default runlevel." ewarn "Please remove elogind from the default runlevel and" @@ -117,12 +120,4 @@ pkg_postinst() { ewarn "You may add it to the boot runlevel by:" ewarn "# rc-update add elogind boot" fi - ewarn "Alternatively you can leave elogind out of any" - ewarn "runlevel. It will then be started automatically" - if use pam; then - ewarn "when the first service calls it via dbus, or the" - ewarn "first user logs into the system." - else - ewarn "when the first service calls it via dbus." - fi } diff --git a/sys-auth/elogind/files/elogind-235.1-docs.patch b/sys-auth/elogind/files/elogind-235.2-docs.patch index bb28bf412d4a..7fbb4594bdc4 100644 --- a/sys-auth/elogind/files/elogind-235.1-docs.patch +++ b/sys-auth/elogind/files/elogind-235.2-docs.patch @@ -1,6 +1,6 @@ --- a/meson.build 2018-01-14 18:59:36.141461154 +0100 +++ b/meson.build 2018-01-14 19:00:46.208461781 +0100 -@@ -2634,16 +2634,7 @@ +@@ -2634,16 +2634,5 @@ # install_data('modprobe.d/systemd.conf', # install_dir : modprobedir) #endif // 0 @@ -14,7 +14,6 @@ - 'LICENSE.GPL2', - 'LICENSE.LGPL2.1', - 'src/libelogind/sd-bus/GVARIANT-SERIALIZATION', -+install_data('src/libelogind/sd-bus/GVARIANT-SERIALIZATION', - install_dir : docdir) +- install_dir : docdir) meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir)) diff --git a/sys-auth/libnss-mysql/Manifest b/sys-auth/libnss-mysql/Manifest index 8db5a8573f8a..7ba40ddee168 100644 --- a/sys-auth/libnss-mysql/Manifest +++ b/sys-auth/libnss-mysql/Manifest @@ -1,5 +1,5 @@ AUX libnss-mysql-1.5_p20060915-no-automagic-debug.diff 610 BLAKE2B 2c1473fca6eddd1cf66db23268ca24dc824b90a2b155202110329c39083daa696142c85cfe50613a7da356275743a797f066d60d2c80c9b330aaac5c24a65d30 SHA512 f8e33bd221dd1662933510ccf9648a152e78c38e6b0d155ae82c3eff49f0f621b3661aa07bf8d8d84b53e14a048ea6765561c16c38e07286cb93bee6a51a91e7 DIST libnss-mysql-20060915.tgz 689970 BLAKE2B 147b5bb6c2fb53ca18f6db87054fa6665829671e9abdd7aa439287e301fc2d5ed4c9e2e5968ce6dacb4f74d86debb0c26d5cda56c6fe8f64e92ff3c9eba26a85 SHA512 fc92438b413b175b9bcead222013eab3bf63088a33ece0c4b6cc69edbefb9cc9145138ce786059acf502c2378a2af45588a5a506e45928b9ac600fe05e62e0c7 EBUILD libnss-mysql-1.5_p20060915-r2.ebuild 1220 BLAKE2B 9510d822fcbdc152dfd5d4b1670697f282dab665bda24ee361a03fb1e22aa708083aa60fca3dc8f27daa13db96174fede7e0ba6ddf0c2b5eadbf5cf3122d7f87 SHA512 6001953dfc5233d31fdbc84f60f63ce6103814157335f7d70c84ef22a47f6ef63c147718d1961414cc00f1252451e3e3848797a396672e39dd757c4340f52e38 -EBUILD libnss-mysql-1.5_p20060915-r3.ebuild 1194 BLAKE2B b20b9a1ffbe69edb338a0d08d83f1003bc3fef1e3be22dea282b3ba7b20e5552092c2045ffb8f41bd009d71cd6a0e5b9438236d30c6eb2cf406f5ab3d1d9a12c SHA512 5247070f6a03aea770cb0bea7b263f484de5a70997164b6af50bfc1143188b81dc0cf0e7851853e1addc73858094a2e370169ae4dcab4ead4ea0b16bf7be9f0e +EBUILD libnss-mysql-1.5_p20060915-r3.ebuild 1193 BLAKE2B fd63bcaed4f1d7178167deff9f8f0fd5c9f1a468bfb393d62541d37ac2265adf4effc705079e6ee113df07b4d24ed65da475ee495360ad50e0d04b9e297deba7 SHA512 c879be2cc7f109b20ea36e41db7880fa9ad5308c22a89c9c85e9ec6c40774c591aa2cf89814d5ef855e869fe23732f090dc6ef98e90264d44b618e878df72a9f MISC metadata.xml 325 BLAKE2B 894a3b266d3cba95496ca172f31fdd30d900bf174fef1f475c97b9ebd0b6c6e728c33b30741b17b8cd6e8d521a965392aa3ad484d2d3a6e1d8970aca40d61495 SHA512 b4755442527c73f4bd3fc338ad753c6067b94c9462f92bf36b6bef75ebe1befc397cc177ea3e4fe0477b1de767d977108ab6a89e01e18e2386cb23548682ec8b diff --git a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild index cdf220de864f..5abb27bcaa5a 100644 --- a/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild +++ b/sys-auth/libnss-mysql/libnss-mysql-1.5_p20060915-r3.ebuild @@ -5,7 +5,7 @@ EAPI=5 inherit eutils multilib autotools -KEYWORDS="amd64 ~ppc ~sparc ~x86" +KEYWORDS="amd64 ~ppc ~sparc x86" DESCRIPTION="NSS MySQL Library" HOMEPAGE="http://libnss-mysql.sourceforge.net/" diff --git a/sys-auth/libyubikey/Manifest b/sys-auth/libyubikey/Manifest index 2e81fb5dc891..1b6047a06f25 100644 --- a/sys-auth/libyubikey/Manifest +++ b/sys-auth/libyubikey/Manifest @@ -1,5 +1,5 @@ DIST libyubikey-1.12.tar.gz 346729 BLAKE2B 9311ce3ea95a87630bf29bbdddca708f965d54d7b31f6b3c67ee6e8d38337c23d63dd6d6486e72291c5e2d33656c282d44be869585320dedbafcb433b8fe3ca4 SHA512 dcfe0f0f33e98a56ca0971140e9fb0d7689236c0062f38eb92b6c3f6df3d576882aaffc153f5fc1c6f5edca5781c34801aa6a87e63c726999f5de003ad366d27 DIST libyubikey-1.13.tar.gz 347337 BLAKE2B 99bbcc16115d913ffd548625f3366405879b0537c4dbcb9f6cebc406a057de642ae621d5793f1828056bfac266eb56b9a409cde44eb26753f955c9da6bcf8c0e SHA512 28f45cb9817c30a70d168ae507d3f8014051058d730eed92b31d92e96784138dea291bda4275511c5f92a6427cb4249d76c802b8abb867cec50e62fb770950f2 EBUILD libyubikey-1.12.ebuild 472 BLAKE2B d6c11148ecb0634f7caac2ac15daca96a94afddadf7377eea5c57274bd1779e69dd677268bc62f541fafccda0ff4747176434e7bea4bde0e17cb3181dee068e6 SHA512 b89f450c4a0f62b0a9ab5ba29935226a38f37ca7b550c95012a1e8de39634fef795fd7c5af0d23d8907e01ee89477d825d0fe8ebe1987d4eae0ded3dc5f4ccb9 -EBUILD libyubikey-1.13.ebuild 472 BLAKE2B af8ce83879cdf24b3a6e11190387c88f184cca502cd036e0f0597bba9e146d523064f56c21943634ca8f4771f7e4aa5aa32fda764cca27d8693d92312e1c745c SHA512 578b97bb7e83aa067cb3463f8e4e68234db6c020efdf00cbdae5099e3f660b2bc84e2c1e60a7d4e874039a38591903460e8cef62e0e8f8e8895a19a9eb05dedc +EBUILD libyubikey-1.13.ebuild 470 BLAKE2B 22f084ae6efac02bfa5b8c23496ce4ce9ec9c197253d020620e3b710ae35bc6b93de70f0043ba0cd3e122d6b6f9f0d848d839f881f49ddb8b417ff1b08fdaa28 SHA512 64878f62d2f99d36ef7308b21027555b99b8c82b0792894f8cc0e055b800525b177509d946e2dd21c6cb49b6b09571e9fded5066c6f5638864ce2b3ce525ec3c MISC metadata.xml 396 BLAKE2B 0df2e85cec1becd01c21fde4eabed2f3b02ede1db3d0576f141962aad6a00314cf846a2e77787eab642f9a680525f3cb679936b12ca86bb3be89124c7141b85d SHA512 87cbf3538d70332da7b2ffb4019b62aa4cd330cc6bda41141c4afcd352e3bf25880004364b0aafa790d2c66db9c1a80cd7f94e2207abe713c3adfadbd369b7e1 diff --git a/sys-auth/libyubikey/libyubikey-1.13.ebuild b/sys-auth/libyubikey/libyubikey-1.13.ebuild index d59885a9cd42..b46c2ea79093 100644 --- a/sys-auth/libyubikey/libyubikey-1.13.ebuild +++ b/sys-auth/libyubikey/libyubikey-1.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="http://opensource.yubico.com/yubico-c/releases/${P}.tar.gz" SLOT="0" LICENSE="BSD-2" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="static-libs" DOCS=( AUTHORS ChangeLog NEWS README THANKS ) diff --git a/sys-auth/ykpers/Manifest b/sys-auth/ykpers/Manifest index 24f04e6c131b..bc2e4326a526 100644 --- a/sys-auth/ykpers/Manifest +++ b/sys-auth/ykpers/Manifest @@ -1,3 +1,5 @@ DIST ykpers-1.18.0.tar.gz 124932 BLAKE2B 48e7045429081c1e577ca560b3a10a4cc380820add40526dbb2a8e0fe347eae79c1dff8335c5363148da55cb374e193230ecb6273b08566ef94959848ceb848e SHA512 d636fcabf94a3fb48841572b7b0f03a12a3b3243b11ed7377654d01c33c7282dc321ee13b13c1ee3f2a49fc5015e326a96ef5bc1594b8592d07c1e5aa0521d20 -EBUILD ykpers-1.18.0.ebuild 939 BLAKE2B d1a0705963be56d9e372fbca8a9dbd7a23facc55928483699beafbaf1360005f5f4608238c958a39f267449e48b67e7ba3730081dfaf5b583b5edc99ab75ebd8 SHA512 76fc32d10f703bcbcff7ed285ea30960845670dca330ddbcd0f3151c4f316a3c55de772b9e9ec4923099eda3a961b78c2cf3deef4610680a478bb7772a9bbe08 +DIST ykpers-1.18.1.tar.gz 125397 BLAKE2B 7393373414f9f2f9474408c86b8abba0f2034f5908ab8c14fd1dbf9acab40994b43b19031a58f5e889acaf289869b82bd429199237da173e3fa19154b4424374 SHA512 faf9c98fc41a64ae17e2002cd22e89fa2f51de9941aa6eb10c49aa78fd2e2867a5d47fc91fd91ab8e916117cba08629f3f1b076d91698ac2fee6e43366d948a8 +EBUILD ykpers-1.18.0.ebuild 937 BLAKE2B ea45c65f0927b0a6c810b90c5662505f68f85e78eeb6aa1f0be6a83ffe13c3237d46aef84614da11321cdf02224629a2344413f1f5d8880fd0cbeb9db660cb5a SHA512 8313c2c13adeacf11427cfa6dfd8455f141ac5d992a3bd418731867e3d599a946edb02e0b9cfc319ceef9506c4e6e60ee75b46ce78f8a5f3c0925cab9a9f348c +EBUILD ykpers-1.18.1.ebuild 981 BLAKE2B af4f36e8d758a125997188c48e16083d3d45cc66334fdc3330dafa175ee552ebbf0a4a88a78c598e6f00b6d12097f7295d874381fcd653c3e0f60d209fe32beb SHA512 b118dd9c1897a434460ca12f3887868c7240eaa5c81035e3f6101300f4519267802aae1f6882e3a24b5a40e669031697635fb87ad8caa1ea35262b93665b0e3f MISC metadata.xml 632 BLAKE2B b03dff691e31f6d0ff188f1e10156140f0b9d5a91993be3be01f291e5edb75a0e8776a550ad3a66ac0244c402bbb40aa9e7948307d498d05d5c8d6b9b1997c4a SHA512 1cb1ba38e29077530438a94c0a2c4e6724abc4b8e3f946466d141497495b6f316094c5f6d2313e260b163c979f65a777570de03a7630c2908a085ce5da34580b diff --git a/sys-auth/ykpers/ykpers-1.18.0.ebuild b/sys-auth/ykpers/ykpers-1.18.0.ebuild index 0ce22ce63b07..f752624fdd0d 100644 --- a/sys-auth/ykpers/ykpers-1.18.0.ebuild +++ b/sys-auth/ykpers/ykpers-1.18.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ DESCRIPTION="Library and tool for personalization of Yubico's YubiKey" SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz" HOMEPAGE="https://github.com/Yubico/yubikey-personalization" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" SLOT="0" LICENSE="BSD-2" IUSE="static-libs consolekit" diff --git a/sys-auth/ykpers/ykpers-1.18.1.ebuild b/sys-auth/ykpers/ykpers-1.18.1.ebuild new file mode 100644 index 000000000000..0ffb8502d96b --- /dev/null +++ b/sys-auth/ykpers/ykpers-1.18.1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools udev + +DESCRIPTION="Library and tool for personalization of Yubico's YubiKey" +SRC_URI="https://github.com/Yubico/yubikey-personalization/archive/v${PV}.tar.gz -> ${P}.tar.gz" +HOMEPAGE="https://github.com/Yubico/yubikey-personalization" + +KEYWORDS="~amd64 ~x86" +SLOT="0" +LICENSE="BSD-2" +IUSE="static-libs consolekit" + +RDEPEND=" + >=sys-auth/libyubikey-1.6 + virtual/libusb:1" +DEPEND="${RDEPEND} + app-text/asciidoc + virtual/pkgconfig" +RDEPEND="${RDEPEND} + consolekit? ( sys-auth/consolekit[acl] )" + +S="${WORKDIR}/yubikey-personalization-${PV}" + +DOCS=( doc/. AUTHORS NEWS README ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf \ + --libdir=/usr/$(get_libdir) \ + --localstatedir=/var \ + $(use_enable static-libs static) +} + +src_install() { + default + use consolekit && udev_dorules *.rules + + find "${D}" -name '*.la' -delete || die +} diff --git a/sys-auth/yubico-piv-tool/Manifest b/sys-auth/yubico-piv-tool/Manifest index b9e69d18ea91..6b5740eba44a 100644 --- a/sys-auth/yubico-piv-tool/Manifest +++ b/sys-auth/yubico-piv-tool/Manifest @@ -1,3 +1,6 @@ +AUX yubico-piv-tool-1.5.0-openssl110.patch 5114 BLAKE2B f21851a171dc94a7862b47d094d25e1c39aa874c62c8753b5b6d6f01dbcecfe2db7b94322a9e8326fe66f6c800199e407a964a4cdf3a2dca7e5fb88fa83e4290 SHA512 d7561f1d9e0cc2f1ffae2ae46ad140ac63ee77daac0e0fc8c4e975678e3abe33c9ac2181ce7c1e237ebbd54511ecd65271f463fec55672e6e904c2edafd97b0e DIST yubico-piv-tool-1.4.4.tar.gz 109397 BLAKE2B ed1299508cd5f90c662a184527ae696e7cd463b0e8d327413c8acff47d41de7393570798b9582e845262afb1780e0c759246980051a62335d7033de913147bb9 SHA512 3edc341fdbeeacfbf541adc37d0bd2b1df9777ca04e13bc1825e99a151008213b816ff811e83e623f52eb1400a8146c36a5a874fc5e26a89c9398e79a0e234e1 +DIST yubico-piv-tool-1.5.0.tar.gz 179092 BLAKE2B d15eed89699989ff545f18cf54fd42349fc81862e7bb3e182fad59d0604cc9729dedcc4aaa40d3f28c1d40b78ddbb5ed073c107cb233d0fa66a17a2ef1e29d68 SHA512 10d7f7a2f163e5f61d6f7463f2124d06213506bff39f3fe0c5b361f90f8bc372de97ab1fa8d6bfcb77659f086d71f8ff536a064ee8f300a620b929ee76e8f8b9 EBUILD yubico-piv-tool-1.4.4.ebuild 647 BLAKE2B 527ff9328cdc01228974aaa7b4f846ec22aea8dc1b7b63078784a6100293db1b4c0992558fb26fd9b33f5b7f72404e06a675141b11fd785919d5a981362af184 SHA512 96360ad999f9f1af146b2ea6f2795791221f8b0803b4f6de2accd20d03e2bf5b1b8091cf00cdb05aea52995664bdafabe3a3bbf695f909de85d44ec9d8e3a0ac +EBUILD yubico-piv-tool-1.5.0.ebuild 1012 BLAKE2B 9f43dc92c0d0cdac06620494838a5f555d9bf7236289f48ed12a71a4579206202e0df3c471a88a2ac4fe1f680072b80ba13efb582f50826278174e36f679a672 SHA512 16de41a9380636e55add90752abc9cace3364607cfc6f4dac90fa3d11e5b59c7d28e8bdf14d702ec4216f324695ce96bb6a9eb0829dd1d8d45b48385e45727d2 MISC metadata.xml 254 BLAKE2B 469b2f4552e9db14cd35556a77359913ea2470137cd26ae2ecc0dd253c155a1e3bd04d19d16a8588c7e72b85057da2f3d62c5ca093992f121d9a32835f1b5ed4 SHA512 b30ec6f0a6c90d7e5d21552c23b34d6326e29fed03c766edf9da7a2a0848edbf694c0fca4fbb81cf291e607cd5de342b9e2f59a3ea5cf27e5b50d6dc2384e8b1 diff --git a/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch new file mode 100644 index 000000000000..86b8bf9bedc9 --- /dev/null +++ b/sys-auth/yubico-piv-tool/files/yubico-piv-tool-1.5.0-openssl110.patch @@ -0,0 +1,170 @@ +From c8372f27d791aa445e879ded4efe4a267e3ff48e Mon Sep 17 00:00:00 2001 +From: quentin <quentin@minster.io> +Date: Mon, 26 Feb 2018 02:43:41 +0100 +Subject: [PATCH] Improve compatibility with OpenSSL 1.1.0 + +* add missing headers +* stop using deprecated APIs +--- + tool/util.c | 1 + + tool/yubico-piv-tool.c | 24 +++++++++++++++++++++++- + ykcs11/openssl_types.h | 1 + + ykcs11/openssl_utils.c | 11 +++++++++++ + 4 files changed, 36 insertions(+), 1 deletion(-) + +diff --git a/tool/util.c b/tool/util.c +index de6b071..5b299ca 100644 +--- a/tool/util.c ++++ b/tool/util.c +@@ -38,6 +38,7 @@ + #endif + + #include "openssl-compat.h" ++#include <openssl/bn.h> + #include <openssl/evp.h> + #include <openssl/x509.h> + #include <openssl/rsa.h> +diff --git a/tool/yubico-piv-tool.c b/tool/yubico-piv-tool.c +index c40b027..f8b72b1 100644 +--- a/tool/yubico-piv-tool.c ++++ b/tool/yubico-piv-tool.c +@@ -43,10 +43,12 @@ + #endif + + #include "openssl-compat.h" ++#include <openssl/bn.h> + #include <openssl/des.h> + #include <openssl/pem.h> + #include <openssl/pkcs12.h> + #include <openssl/rand.h> ++#include <openssl/rsa.h> + + #include "cmdline.h" + #include "util.h" +@@ -868,11 +870,19 @@ static bool selfsign_certificate(ykpiv_state *state, enum enum_key_format key_fo + fprintf(stderr, "Failed to set certificate serial.\n"); + goto selfsign_out; + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if(!X509_gmtime_adj(X509_get_notBefore(x509), 0)) { ++#else ++ if(!X509_gmtime_adj(X509_getm_notBefore(x509), 0)) { ++#endif + fprintf(stderr, "Failed to set certificate notBefore.\n"); + goto selfsign_out; + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if(!X509_gmtime_adj(X509_get_notAfter(x509), 60L * 60L * 24L * validDays)) { ++#else ++ if(!X509_gmtime_adj(X509_getm_notAfter(x509), 60L * 60L * 24L * validDays)) { ++#endif + fprintf(stderr, "Failed to set certificate notAfter.\n"); + goto selfsign_out; + } +@@ -1241,7 +1251,7 @@ static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_M + + if(*ptr++ == 0x70) { + unsigned int md_len = sizeof(data); +- ASN1_TIME *not_before, *not_after; ++ const ASN1_TIME *not_before, *not_after; + + ptr += get_length(ptr, &cert_len); + x509 = X509_new(); +@@ -1299,13 +1309,21 @@ static void print_cert_info(ykpiv_state *state, enum enum_slot slot, const EVP_M + dump_data(data, md_len, output, false, format_arg_hex); + + bio = BIO_new_fp(output, BIO_NOCLOSE | BIO_FP_TEXT); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + not_before = X509_get_notBefore(x509); ++#else ++ not_before = X509_get0_notBefore(x509); ++#endif + if(not_before) { + fprintf(output, "\tNot Before:\t"); + ASN1_TIME_print(bio, not_before); + fprintf(output, "\n"); + } ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + not_after = X509_get_notAfter(x509); ++#else ++ not_after = X509_get0_notAfter(x509); ++#endif + if(not_after) { + fprintf(output, "\tNot After:\t"); + ASN1_TIME_print(bio, not_after); +@@ -1950,7 +1968,9 @@ int main(int argc, char *argv[]) { + + + /* openssl setup.. */ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + OpenSSL_add_all_algorithms(); ++#endif + + + for(i = 0; i < args_info.action_given; i++) { +@@ -2191,6 +2211,8 @@ int main(int argc, char *argv[]) { + } + + ykpiv_done(state); ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_cleanup(); ++#endif + return ret; + } +diff --git a/ykcs11/openssl_types.h b/ykcs11/openssl_types.h +index 307f746..08170fc 100644 +--- a/ykcs11/openssl_types.h ++++ b/ykcs11/openssl_types.h +@@ -31,6 +31,7 @@ + #ifndef OPENSSL_TYPES_H + #define OPENSSL_TYPES_H + ++#include <openssl/bn.h> + #include <openssl/x509.h> + #include <openssl/evp.h> + #include <openssl/rsa.h> +diff --git a/ykcs11/openssl_utils.c b/ykcs11/openssl_utils.c +index 5a7f85d..edfe0ea 100644 +--- a/ykcs11/openssl_utils.c ++++ b/ykcs11/openssl_utils.c +@@ -35,6 +35,11 @@ + #include "debug.h" + #include <string.h> + ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++# define X509_set_notBefore X509_set1_notBefore ++# define X509_set_notAfter X509_set1_notAfter ++#endif ++ + CK_RV do_store_cert(CK_BYTE_PTR data, CK_ULONG len, X509 **cert) { + + const unsigned char *p = data; // Mandatory temp variable required by OpenSSL +@@ -580,7 +585,9 @@ CK_RV do_pkcs_pss(ykcs11_rsa_key_t *key, CK_BYTE_PTR in, CK_ULONG in_len, + int nid, CK_BYTE_PTR out, CK_ULONG_PTR out_len) { + unsigned char em[RSA_size(key)]; + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + OpenSSL_add_all_digests(); ++#endif + + DBG("Apply PSS padding to %lu bytes and get %d", in_len, RSA_size(key)); + +@@ -590,14 +597,18 @@ CK_RV do_pkcs_pss(ykcs11_rsa_key_t *key, CK_BYTE_PTR in, CK_ULONG in_len, + + // In case of raw PSS (no hash) this function will fail because OpenSSL requires an MD + if (RSA_padding_add_PKCS1_PSS(key, em, out, EVP_get_digestbynid(nid), -2) == 0) { ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_cleanup(); ++#endif + return CKR_FUNCTION_FAILED; + } + + memcpy(out, em, sizeof(em)); + *out_len = (CK_ULONG) sizeof(em); + ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + EVP_cleanup(); ++#endif + + return CKR_OK; + } diff --git a/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild new file mode 100644 index 000000000000..7a72c9087c3f --- /dev/null +++ b/sys-auth/yubico-piv-tool/yubico-piv-tool-1.5.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +DESCRIPTION="Command line tool for the YubiKey PIV application" +SRC_URI="https://github.com/Yubico/yubico-piv-tool/archive/yubico-piv-tool-${PV}.tar.gz" +HOMEPAGE="https://developers.yubico.com/yubico-piv-tool/ https://github.com/Yubico/yubico-piv-tool" + +LICENSE="BSD-2" +SLOT="0/1" +KEYWORDS="~amd64" +IUSE="test" + +RDEPEND=" + dev-libs/openssl:0=[-bindist] + sys-apps/pcsc-lite +" +DEPEND="${RDEPEND} + dev-util/gengetopt + sys-apps/help2man + virtual/pkgconfig + test? ( dev-libs/check ) +" + +S=${WORKDIR}/${PN}-${P} + +PATCHES=( "${FILESDIR}/${P}-openssl110.patch" ) + +src_prepare() { + default + + if ! use test; then + sed -i -e "/PKG_CHECK_MODULES(\[CHECK/d" configure.ac || die + sed -i -e "s/@CHECK_CFLAGS@//" -e "s/@CHECK_LIBS@//" */*/Makefile.am || die + fi + + eautoreconf +} + +src_configure() { + econf --disable-static +} + +src_install() { + default + rm "${D}"/usr/$(get_libdir)/*.la || die +} |