[gentoo-commits] repo/gentoo:master commit in: app-crypt/nitrocli/, app-crypt/nitrocli/files/

[gentoo-commits] repo/gentoo:master commit in: app-crypt/nitrocli/, app-crypt/nitrocli/files/

[Georgy Yakovlev]

commit:     e2f4fcdd819a8b4812c2aacd303a28654d575ece
Author:     Daniel Mueller <deso <AT> posteo <DOT> net>
AuthorDate: Mon May 27 18:18:32 2019 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue May 28 02:36:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f4fcdd

app-crypt/nitrocli: Add patch for build failure with Rust 1.35

With dev-lang/rust-1.35 (or higher, presumably) nitrocli fails to build
because of a unused comments that are flagged starting with this
version.
The change has been fixed upstream and with this change we add a patch
back porting the fix to 0.2.3.

Closes: https://bugs.gentoo.org/686870
Signed-off-by: Daniel Müller <deso <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/12119
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 .../files/nitrocli_-_fix-rust-1.35-build.patch     | 52 ++++++++++++++++++++++
 app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild        |  5 +++
 2 files changed, 57 insertions(+)

diff --git a/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch b/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
new file mode 100644
index 00000000000..d5da3b1f48d
--- /dev/null
+++ b/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
@@ -0,0 +1,52 @@
+From 5383aa73b339e6a53ff027ee6012a3428f67466a Mon Sep 17 00:00:00 2001
+From: Daniel Mueller <deso@posteo.net>
+Date: Fri, 24 May 2019 17:39:14 -0700
+Subject: [PATCH] Allow for unused doc comments on macros
+
+With Rust 1.35 we get compile errors due to doc comments that are added
+to macro invocations but not actually included in the expanded output.
+The rustc wrongly assumes that we want to document the resulting code
+and not just provide details about the invocation itself.
+This change explicitly allows for those cases. Alternatively we could
+have "downgraded" the doc comments to normal comments or removed them
+altogether. There is little difference between those alternatives.
+---
+ nitrocli/src/args.rs     | 2 ++
+ nitrocli/src/pinentry.rs | 1 +
+ 2 files changed, 3 insertions(+)
+
+diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs
+index 7f0bfc..7e4f83 100644
+--- a/nitrocli/src/args.rs
++++ b/nitrocli/src/args.rs
+@@ -101,6 +101,7 @@ impl<'io> Stdio for ExecCtx<'io> {
+ }
+ 
+ /// The available Nitrokey models.
++#[allow(unused_doc_comments)]
+ Enum! {DeviceModel, [
+   Pro => "pro",
+   Storage => "storage"
+@@ -116,6 +117,7 @@ impl From<DeviceModel> for nitrokey::Model {
+ }
+ 
+ /// A top-level command for nitrocli.
++#[allow(unused_doc_comments)]
+ Enum! {Command, [
+   Config => ("config", config),
+   Lock => ("lock", lock),
+diff --git a/nitrocli/src/pinentry.rs b/nitrocli/src/pinentry.rs
+index 837032..8bab65 100644
+--- a/nitrocli/src/pinentry.rs
++++ b/nitrocli/src/pinentry.rs
+@@ -30,6 +30,7 @@ type CowStr = borrow::Cow<'static, str>;
+ ///
+ /// The available PIN types correspond to the PIN types used by the Nitrokey devices:  user and
+ /// admin.
++#[allow(unused_doc_comments)]
+ Enum! {PinType, [
+   Admin => "admin",
+   User => "user"
+-- 
+2.21.0
+

diff --git a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
index 40b62ff2d19..fb74af29209 100644
--- a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
@@ -67,6 +67,11 @@ RDEPEND="
 RESTRICT="test"
 QA_FLAGS_IGNORED="/usr/bin/nitrocli"
 
+src_prepare() {
+	eapply -p2 "${FILESDIR}/${PN}_-_fix-rust-1.35-build.patch"
+	default
+}
+
 src_install() {
 	cargo_src_install --path=.
 

[gentoo-commits] repo/gentoo:master commit in: app-crypt/nitrocli/, app-crypt/nitrocli/files/

[Joonas Niilola]

commit:     547348238fb6d1d3cc7d48f611aef7c01b89152b
Author:     Daniel Mueller <deso <AT> posteo <DOT> net>
AuthorDate: Wed Nov  6 02:03:34 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Nov  7 05:42:30 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54734823

app-crypt/nitrocli: Remove 0.2.3-r1 ebuild

This change removes the nitrocli-0.2.3-r1 ebuild. Version 0.2.4 of
the program should be used as there are no known problems with it.

Signed-off-by: Daniel Müller <deso <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-crypt/nitrocli/Manifest                        | 13 ----
 .../files/nitrocli_-_fix-rust-1.35-build.patch     | 52 --------------
 app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild        | 80 ----------------------
 3 files changed, 145 deletions(-)

diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 384989d25e8..7808c648998 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -2,43 +2,30 @@ DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f0
 DIST argparse-0.2.2.crate 19440 BLAKE2B 7b15b2072ff52149bc08c5d02a266f2eef78a3aa8844e49154cf2ae1a9cb960ddc2a96a065b4aa44637aca8216211f2965291364d9f06ff6f68524a1f15dfed9 SHA512 97691566d3adc6f6be1c00cdca48424fd3576c372d1c995e7e31658bd20e17ef13553f7de21968ba189fd812928aeb93ef0fa89fe2fd258f45a0a8e095783706
 DIST base32-0.4.0.crate 7791 BLAKE2B 6e457d08f6fe17159b0231b62774d2c366c623b07c7b37196edb8f33b886cdf7affece70afae6dd0b64fc4d2be10d3a01f2f0b81ed12d5c5e1cf50d39c80e68b SHA512 4c999f2fcded06d803471d08b8d9e42512a85f81974388afb3d5b450c86e5ea60e7b1fdaccc49b1e0346663827408f847e897523955edcaf397f20fe97038345
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
-DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
 DIST cc-1.0.37.crate 44499 BLAKE2B d12551225fc4e20691a09fecc8a2a487090ce10ad7fe64b385cf54b74a124cf737aa31966f82d9a68e1a932dccb4ec495eb32cdb4dc808c985384fd0fa4b6950 SHA512 85cf4679d16df14a815563c459227ae85206eb79826099fcbd5f602fdfdc052f36237916a842d65d9a5ab57c559c18e645bb219422d85aa3690c11c0a8dcc92c
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
-DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
-DIST libc-0.2.47.crate 351491 BLAKE2B 10ff90405b911c40478793cadc9a1962e14eb4d7b4ff758554a225bb87340989bbd6089441eaa2638db93782de7d0faba20f77a7e3569a52cec40ba55eb56c06 SHA512 f0eddcbe456b1ee2da22963585ff689ad44f0f8d70af33d9bec41a1ec5a1b3dee26fbeaa29786792cd44d020fc56461b44bbb2da962662377552fa562b2694f6
 DIST libc-0.2.57.crate 408902 BLAKE2B 5c84f490037b5e108400f710da79f5471d5f76c384641bbcb721aee21da84e6a2b523487dbf5984b746d070d23c449968ed546e0bfcdfa961dfd57bfb2f3dce6 SHA512 8f210c0e28d647cd2911ad2b7d2450b6e8ea3d628c0cc68000109a7bfdd64fa31706ed7e9bda0f71b920b38a3580fce3d53fe49e9cc53b6ab9e3aeb2eae0cb8e
-DIST memchr-2.1.2.crate 19520 BLAKE2B 4a8409fa4e019ab5cdbfc2787eeebacbbcfd21415d1ea6a3796ef18434ddfad0f63f6df3027eea5d286e08eda892e21cae66e3f25ffee9d6a2a3327b841e5377 SHA512 ba3bad3b911fdd767b6c770209e93dfc367c6228117a5d85bfa95d70ec66df9842f3cf788ac560d1255415dba49028187542000b9a71fbe79ec51a386afda38f
 DIST memchr-2.1.3.crate 20069 BLAKE2B 6afd95538abae42fdb22b82964b64657555734f2505e12c650f844b91d60a3f6f61277065e15289b6e6b7ef8ae5345674ce7465ce2320822e13734949ddcd49c SHA512 95fca57233f023191da0c0abf4835c63ca38404b05c2021e1fcb910068c29321e0b89660088e1be432ed8aea2c4d53f14587e08dba0b258892f2e608606b3b57
-DIST nitrocli-0.2.3.crate 60731 BLAKE2B 52e8a13179ef0391698b87e0172b4beae902c7586b48718538e55f2497a1d31dd645224041a81c8311512a905cd574f34f817b66b2b2f469c1a278437a6cba93 SHA512 e3467dedecc27dbe8b818c63bce9e29d22bf65af03ff53c4f85f1c3730f4b55a359dfe210875efdc8bee7e05147e066ca963d9a5ff1b68b5fc258c8a7d4d82e0
 DIST nitrocli-0.2.4.crate 63798 BLAKE2B 64a4998f9b232993692f85ca3890ecdd20e1027dee61b6f31f06be459a02f11a3cff2c035aa462ee5ea1d680f9e201e25cffdd4ca8d54de80c13d78d9a877fa4 SHA512 cf10287591d55378956118a213e4f9752087be37c67d4c89f7660f51c98dbbf3a877afaf11af7625d3776bdf2c7944b25637873af70119d514f2be93131f9733
 DIST nitrokey-0.3.4.crate 27462 BLAKE2B 07412e0d3d98a0fcaa54be3d494b107a0a4d999da41dc39f8710a5eb845911d175ca15918e212a1025a34e3ddfff89b5ca4a138d66effd47b639afcb19572ca4 SHA512 abb43ca94b7d4ba55cfabce56b712c99bc4e50671149ae2001de77c2cfae25f17465130729a4a856005a692b846c67b54b2992e41b708e8ad94a8c3af0843e20
 DIST nitrokey-sys-3.4.3.crate 61875 BLAKE2B 8c2abf91a40f54907f225c21df9d1e40ac22022a3b8229a8bd6c7a5cb8f87df74675ed5eadf6441bc81025e0cf3ebb21d8301004fe1fc76799e11568317bbf0e SHA512 ae69bc8d3fd0a58224ecfaacd159fbab4f7686daaecd96480a6c824ffbd22a8d2c948c5b2c803fa20ae41adfd4334c6462335f5d02dd7acbae0ab19b33cf0a3b
 DIST nitrokey-test-0.1.1.crate 8044 BLAKE2B de775515a73a500d3c37a58431c14a1cb6d2f715808c855466b78373f983b948b9e257f03fbcb16729a3f17a3f930ddf3eaac913955286e27e0b27f573659d04 SHA512 4dfbc79e64ed77f58599bc570b126f7975e614de07fa30b3c7da421bf184fbf059f401da42110b14eae5a953599e3875430cd4f0e117df5ce9bd03a753026cec
-DIST proc-macro2-0.4.24.crate 30970 BLAKE2B d6b0a5fe633c5773e6d8b4bc2c9f32c66f8072f85ff48bf449fd3d8ada87e639ee730f8bd3d3170acd1528806698bcf1c329c57f102cd79833f96e2fd1bb7e0e SHA512 57ae6a761fcc14f22277df025db6b09f1173035e1496d1c4906d9af9231c19f0b93750abf36e4013ae82799069869047a7e3f1b3e095344e55c603fe5a462d03
 DIST proc-macro2-0.4.26.crate 33854 BLAKE2B 833db134470a8f12342248c514b08463836ea22eec90162ba96364686e593e3048fe16de669316d88ed5f44b27f948613cf98f4952d49f6b5f37f2da51584c2d SHA512 e35ce0e0a05559417475abc402ef88e6214d7f27ee6cff35577077c5334ec7c6dd5d1d8099f25617391cd4fd2f54838a16ae74039ea6f99ea1d2f0ef58dec010
-DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
-DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
-DIST rand_os-0.1.1.crate 18553 BLAKE2B 5b74bbce5ee3f20f7c92204c4b60f9450b3a19518356c70737c8dad9873da775c90b8786bc75f0fa166388f6bfc585240c56445a39603704df5e99a4c505e17a SHA512 a7ccc054fd4a60e868520af3fc15e6eb22e62411975923e4d968a4825a48cbf87238338cbf1336792d996da5cc2183ac465a6bf8094358f0e5fc56380ce16193
 DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
-DIST regex-syntax-0.6.4.crate 272048 BLAKE2B 921cb35d306d796baeb9e3f2fd243bd6c90e92ff175cb9be23e12b1a0f19f51a40075aaf66a56e32fe9b1f08eb30b2a1f47469127061542c96b4f68733780b9a SHA512 7a199c43668f7d660a28a1324ce1951cd6ec299cd98edbfde3b6a6d172e9f1a52135457673b432a0318163a5c23e541abca58607623a310f15fbefeafb50ee3b
 DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
-DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
 DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
-DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513

diff --git a/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch b/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
deleted file mode 100644
index d5da3b1f48d..00000000000
--- a/app-crypt/nitrocli/files/nitrocli_-_fix-rust-1.35-build.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5383aa73b339e6a53ff027ee6012a3428f67466a Mon Sep 17 00:00:00 2001
-From: Daniel Mueller <deso@posteo.net>
-Date: Fri, 24 May 2019 17:39:14 -0700
-Subject: [PATCH] Allow for unused doc comments on macros
-
-With Rust 1.35 we get compile errors due to doc comments that are added
-to macro invocations but not actually included in the expanded output.
-The rustc wrongly assumes that we want to document the resulting code
-and not just provide details about the invocation itself.
-This change explicitly allows for those cases. Alternatively we could
-have "downgraded" the doc comments to normal comments or removed them
-altogether. There is little difference between those alternatives.
----
- nitrocli/src/args.rs     | 2 ++
- nitrocli/src/pinentry.rs | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/nitrocli/src/args.rs b/nitrocli/src/args.rs
-index 7f0bfc..7e4f83 100644
---- a/nitrocli/src/args.rs
-+++ b/nitrocli/src/args.rs
-@@ -101,6 +101,7 @@ impl<'io> Stdio for ExecCtx<'io> {
- }
- 
- /// The available Nitrokey models.
-+#[allow(unused_doc_comments)]
- Enum! {DeviceModel, [
-   Pro => "pro",
-   Storage => "storage"
-@@ -116,6 +117,7 @@ impl From<DeviceModel> for nitrokey::Model {
- }
- 
- /// A top-level command for nitrocli.
-+#[allow(unused_doc_comments)]
- Enum! {Command, [
-   Config => ("config", config),
-   Lock => ("lock", lock),
-diff --git a/nitrocli/src/pinentry.rs b/nitrocli/src/pinentry.rs
-index 837032..8bab65 100644
---- a/nitrocli/src/pinentry.rs
-+++ b/nitrocli/src/pinentry.rs
-@@ -30,6 +30,7 @@ type CowStr = borrow::Cow<'static, str>;
- ///
- /// The available PIN types correspond to the PIN types used by the Nitrokey devices:  user and
- /// admin.
-+#[allow(unused_doc_comments)]
- Enum! {PinType, [
-   Admin => "admin",
-   User => "user"
--- 
-2.21.0
-

diff --git a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild b/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
deleted file mode 100644
index fb74af29209..00000000000
--- a/app-crypt/nitrocli/nitrocli-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.6.9
-argparse-0.2.2
-base32-0.4.0
-bitflags-1.0.4
-cc-1.0.28
-cfg-if-0.1.6
-cloudabi-0.0.3
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-lazy_static-1.2.0
-libc-0.2.47
-memchr-2.1.2
-nitrocli-0.2.3
-nitrokey-0.3.4
-nitrokey-sys-3.4.3
-nitrokey-test-0.1.1
-proc-macro2-0.4.24
-quote-0.6.10
-rand_core-0.3.0
-rand_os-0.1.1
-rdrand-0.4.0
-regex-1.1.0
-regex-syntax-0.6.4
-syn-0.15.23
-thread_local-0.3.6
-ucd-util-0.1.3
-unicode-xid-0.1.0
-utf8-ranges-1.0.2
-version_check-0.1.5
-winapi-0.3.6
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit cargo
-
-DESCRIPTION="A command line application for interacting with Nitrokey devices"
-HOMEPAGE="https://github.com/d-e-s-o/nitrocli/tree/master/nitrocli"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-BDEPEND="
-	>=virtual/rust-1.31.0
-"
-DEPEND="
-	dev-libs/hidapi
-"
-# We require gnupg for /usr/bin/gpg-connect-agent.
-RDEPEND="
-	${DEPEND}
-	app-crypt/gnupg
-"
-
-# Uses a plugged-in Nitrokey and runs tests on it. These tests assumes a
-# pristine configuration and will modify the device's state. Not meant
-# to be run as part of the installation.
-RESTRICT="test"
-QA_FLAGS_IGNORED="/usr/bin/nitrocli"
-
-src_prepare() {
-	eapply -p2 "${FILESDIR}/${PN}_-_fix-rust-1.35-build.patch"
-	default
-}
-
-src_install() {
-	cargo_src_install --path=.
-
-	einstalldocs
-	doman "doc/nitrocli.1"
-}

[gentoo-commits] repo/gentoo:master commit in: app-crypt/nitrocli/, app-crypt/nitrocli/files/

[Joonas Niilola]

commit:     8e9efa2ffcb018b6ca676404e5d1aeaf17e99bc1
Author:     Daniel Müller <deso <AT> posteo <DOT> net>
AuthorDate: Fri Jan 19 15:21:22 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jan 20 13:20:09 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e9efa2f

app-crypt/nitrocli: Add patch fixing musl 1.2.4 build

On a system with sys-libs/musl 1.2.4, the crate fails to build with an
undefined reference to `open64'.
Fix the issue by adding a patch bumping the version of the libc crate.

Closes: https://bugs.gentoo.org/922317
Signed-off-by: Daniel Müller <deso <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/34902
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 app-crypt/nitrocli/Manifest                              |  2 +-
 .../files/nitrocli-0.4.1-fix-musl-1.2.4-build.patch      | 16 ++++++++++++++++
 app-crypt/nitrocli/nitrocli-0.4.1.ebuild                 |  8 ++++++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app-crypt/nitrocli/Manifest b/app-crypt/nitrocli/Manifest
index 59fc2dabc1ae..894bcb824499 100644
--- a/app-crypt/nitrocli/Manifest
+++ b/app-crypt/nitrocli/Manifest
@@ -13,7 +13,7 @@ DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a2
 DIST getrandom-0.2.2.crate 26010 BLAKE2B f2df79db0fff4a4e57bb5c748932dd7a8d24f7072f9a81fa92159ea79de29a70e7b834af6ffc5178e898af456188f16476043e9be4dd25c6e7edde06d93cbb8a SHA512 f498fe00c9887748a0be88fbd698a6087ccb79874cfeb35a18f90994603be29cb2aacfbc65fb8ba967190ccbc41ff9ff56bfff1de40811e1bc99a08b0568f59b
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.94.crate 511713 BLAKE2B 6ad3fe9aa5ea5fb06a7b2beeb68fa245e5ed7d19aa7e4b21c9e2ab73da11a9249913e604f0f87fbcc82676cceee16f14403cd2f27ae462730e1682c539666283 SHA512 316717d2e46b57c200d67d0ebb4fb162cb1f0b688895b9eb6075924cda3be8ba7fae85319692682178b6fc5cb2764e8b3a9d3e7ce234fd8a21a0a9c453ca174c
+DIST libc-0.2.146.crate 684707 BLAKE2B 53091a46262389e327973185c26bf187beba392c45a92bfa424fc0976333d6c8afdac6527484032574086e32412a712bc2616468f7cb14e6bd0480ca2bef6da6 SHA512 4112c17cfda83041f33a7b616a365a0eb6603ba857fd7bedd64162021a6305c81da6ae8f37395732d7eea40d4fe648bae435ee0bf0b1a1a48400e6546d4d50b6
 DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8fe6258b369b140928fe677a02b1b3ca5bdec36ff2b16abd85a9f49688fd5f3d1ba2b2905e7f96b8a84c1 SHA512 796100167663d85a7bc4244cd305e9b3f0a1b1520764b63464698eb136318d0928c40c16f5d19d9f602a5bf769851275bbd48d66b088b0c37be7a6fb62def7cc
 DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST merge-0.1.0.crate 16946 BLAKE2B 1389893fdb788371e8f2526ef9fcc9e1b7a61a6f55fd092cc595339b9df9bc550546056191c1479ecaa13b88633e12656d2a8e217927495e0096ee5ca5641e47 SHA512 2adfef5cf142b06343e8f5816ffba7d031bc71b4a4e54170e36b88267d0c203ecc0cf084041cb25ae55df874fc80d55bd051c76f608ab85fd55f1b5512efe238

diff --git a/app-crypt/nitrocli/files/nitrocli-0.4.1-fix-musl-1.2.4-build.patch b/app-crypt/nitrocli/files/nitrocli-0.4.1-fix-musl-1.2.4-build.patch
new file mode 100644
index 000000000000..4a5eed1b8951
--- /dev/null
+++ b/app-crypt/nitrocli/files/nitrocli-0.4.1-fix-musl-1.2.4-build.patch
@@ -0,0 +1,16 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index de9dee..5d7737 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -124,9 +124,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.94"
++version = "0.2.146"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e"
++checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
+ 
+ [[package]]
+ name = "log"

diff --git a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild
index fcfc2efba490..f41366c4a624 100644
--- a/app-crypt/nitrocli/nitrocli-0.4.1.ebuild
+++ b/app-crypt/nitrocli/nitrocli-0.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2023 Gentoo Authors
+# Copyright 2017-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ getrandom-0.1.16
 getrandom-0.2.2
 heck-0.3.2
 lazy_static-1.4.0
-libc-0.2.94
+libc-0.2.146
 log-0.4.14
 memchr-2.4.0
 merge-0.1.0
@@ -93,6 +93,10 @@ RDEPEND="
 RESTRICT="test"
 QA_FLAGS_IGNORED="usr/bin/nitrocli"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.1-fix-musl-1.2.4-build.patch
+)
+
 src_compile() {
 	cargo_src_compile --bin=nitrocli
 	# Install shell-complete binary into source directory to be able to