diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-03-20 00:40:44 +0000 |
| commit | 4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch) | |
| tree | 356496503d52354aa6d9f2d36126302fed5f3a73 /sys-apps/nvme-cli | |
| parent | fcc5224904648a8e6eb528d7603154160a20022f (diff) | |
gentoo resync : 20.03.2022
Diffstat (limited to 'sys-apps/nvme-cli')
| -rw-r--r-- | sys-apps/nvme-cli/Manifest | 4 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch | 13 | ||||
| -rw-r--r-- | sys-apps/nvme-cli/nvme-cli-1.16.ebuild | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest index e34a9280fb1a..c599a3f000fd 100644 --- a/sys-apps/nvme-cli/Manifest +++ b/sys-apps/nvme-cli/Manifest @@ -1,8 +1,8 @@ -AUX nvme-cli-1.16-musl-limits.patch 805 BLAKE2B ed13b647b9687c99c0d3acaaf49f5574287735512ec9edeb8da9dabb37956f3734513173a0b5094eee44f94f6bce1456c72f5250144a3e99a1508834e60ea5b2 SHA512 43c5a9d037ae3d081d58119929b94c8e6c906d92a55760639115325669c4c4c865ab2219261d60c812bf3227139ffe6937e6f18255f7176ce4fd8557d8233c77 +AUX nvme-cli-1.16-musl-limits.patch 1148 BLAKE2B ee1206a23ee11d6badaed70a98cd2ea405d3ad144def7d00e44a49b2f2579fc61efbaa3325856e426be097e52b02e4b18c4122ab74c1f20d58ced1c1748419c0 SHA512 e7c8c387446360eb2ed816006fe7d9a7f6a1b9c81dd6d3171f909ae760236243278a4b42be727b39381f95c9b50dce09f816400a280da929da8453b6c9851004 DIST nvme-cli-1.14.tar.gz 579561 BLAKE2B e27dade228ee47d88ef5cbab4d9d6163e75af44fb3345ed2ae566e875b973355255a5aba1b1846e53006f9676922cf7901a5e6e4867fcf04c591bf372a119bca SHA512 b5e18708233fd37069d84ee34232d737ed6d6909b0ec523d82cc2c4940172f7ce769b9bbec0d8615ebee544a5174cb4d752ad6d96ea05cfaa1177efc760f0e9e DIST nvme-cli-1.15.tar.gz 610927 BLAKE2B 66278904d49987d92083c1bb28a98d362adee8e85ee92e44e9dee381f3efcc76ac53ddf82957495ac7b2ef82e717c570d55e1b2052224740c1bc7e5af8af137e SHA512 0614105153edf7217d4c428927423628b63f6bee034c59926370a13d433c9c3af217338fb6fe2f8bbf781fc17ebae0102e8c072371b7ea4324c18dfdffd40305 DIST nvme-cli-1.16.tar.gz 598246 BLAKE2B 8aef6ae82ec9a2c67de6c69addd72c87ade6554e6d374c717f8e3c0585565974a2b2870eb172b3ebdc1ae307bd3a55a14a17d3feea8d437265db136b434b519f SHA512 c713eb15b979ad17791cf95717b42d5f638cb4803d646bca1f4825e6bb50f086226b44b108b61571709b2cb615ae6ba86dbad309f675b240ebd3968d1cf536ff EBUILD nvme-cli-1.14.ebuild 844 BLAKE2B b88134580f9f4fb22ffd24bd2e8aca6f7778bc7c68af526e1002963cabe9766f39c69513eac46a7e3426e755e4ba2e1dee651b45ca1ffdd6ae2362d5d5e3a91e SHA512 aa1fecc32da2ac0e456cd73f516e7760a45ccd91fa9b9d4f4fb080e93024c69b5476621a1cbe8d9fcb26292eca6ab79f0c5cd0c35122e2dd70a1f5304c520d26 EBUILD nvme-cli-1.15-r1.ebuild 1283 BLAKE2B f90189f1d7d34d340dc3e9f4ca7a1fa611d32ed0913d43e4d74707b159889b3bda123352454bb051541e1168d9eeb9746607bafaf0894566df4c9c4d8036edeb SHA512 506471a6dfc87c346c9a1bd46c19415f795e0a4b11dd8cc8ff59254929d7a59477d254fbeebea5badf53eb8c72cfda2ac85bdbc4dac4d0ede15f5d619d78b4c2 -EBUILD nvme-cli-1.16.ebuild 1334 BLAKE2B ce57c359c899256bdd133ce5df04ac51715bf5ddc19f48e665ce491624192f3000bbb4c0b47de37035b392119dea7a02893846f461c061b853167ed08f0cee68 SHA512 80a67a631b5aa6031fcb0580f90b2012334457d8668d4c736c5b339fce2753a9d1ba5266614308deaa3ae4ada97290dfc21982cb792f76488dcd2fb3dc3e685a +EBUILD nvme-cli-1.16.ebuild 1330 BLAKE2B dca5bcee7da2e65799bed14ba6eec3484b19d025061f1068d343891f2e76aa2c000c017b03bc977be76f51d9b0d38180ba7e44e6d7ce27eeed338a2b1741ba07 SHA512 44c68fa403731bd0d8f54f361e6d7b84cbb7f9222f7070ef174354c29e0314fa1007f0c1caba48e30afb607e5a6c56f355eb2d02b80079f62a8c2defc073b55f MISC metadata.xml 594 BLAKE2B 52ac0579fd52797d0c9b2ec0528b134f67ef927987f9b99cf72d1010f13088af42d5eddb761b53939b196bc96ef4b8589b1bfc02242c95a56bf6a6a40afbad91 SHA512 d971b4fd68f8574b4e93377e9c4eef1f5901e81099ae97003ccfafbbd1657db92ce8a975cae38e6516cc4652b54259013c0c5e3ba53e80d717e42dab71440464 diff --git a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch b/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch index 12e66577d69d..27c9667c827c 100644 --- a/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch +++ b/sys-apps/nvme-cli/files/nvme-cli-1.16-musl-limits.patch @@ -1,5 +1,6 @@ https://github.com/linux-nvme/nvme-cli/commit/4729b13f36d4713ce1162dc1d4425d44e1474078.patch https://bugs.gentoo.org/829705 +(and an additional hunk for https://bugs.gentoo.org/830744) From: Ariadne Conill <ariadne@dereferenced.org> Date: Mon, 26 Apr 2021 00:41:20 -0600 @@ -22,3 +23,15 @@ Signed-off-by: Daniel Wagner <dwagner@suse.de> #include "nvme.h" #include "libnvme.h" +diff --git a/nvme-topology.c b/nvme-topology.c +index 0a22f6b..6d510f2 100644 +--- a/nvme-topology.c ++++ b/nvme-topology.c +@@ -1,6 +1,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <errno.h> ++#include <limits.h> + #include <unistd.h> + #include <fcntl.h> + #include <sys/stat.h> diff --git a/sys-apps/nvme-cli/nvme-cli-1.16.ebuild b/sys-apps/nvme-cli/nvme-cli-1.16.ebuild index 1f0ebaf7bde5..57126d5159de 100644 --- a/sys-apps/nvme-cli/nvme-cli-1.16.ebuild +++ b/sys-apps/nvme-cli/nvme-cli-1.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -12,7 +12,7 @@ RESTRICT="test" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 arm64 ppc64 ~riscv x86" IUSE="hugepages +json systemd +uuid" RDEPEND="json? ( dev-libs/json-c:= ) |