summaryrefslogtreecommitdiffstats
path: root/subprojects
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2022-11-05 18:23:30 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2022-11-05 18:23:30 +0000
commit4ed089396bc7f14bcb94e80f0f9f4757fd8c48b7 (patch)
tree866986558761a9709a7af1940ba607128a45f775 /subprojects
parentReleasing debian version 2.1.2-2. (diff)
downloadnvme-cli-4ed089396bc7f14bcb94e80f0f9f4757fd8c48b7.tar.xz
nvme-cli-4ed089396bc7f14bcb94e80f0f9f4757fd8c48b7.zip
Merging upstream version 2.2.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/json-c.wrap9
-rw-r--r--subprojects/libnvme.wrap3
-rw-r--r--subprojects/uuid.wrap6
-rw-r--r--subprojects/zlib.wrap16
4 files changed, 14 insertions, 20 deletions
diff --git a/subprojects/json-c.wrap b/subprojects/json-c.wrap
index 5084932..ce9ff51 100644
--- a/subprojects/json-c.wrap
+++ b/subprojects/json-c.wrap
@@ -3,11 +3,10 @@ directory = json-c-0.16
source_url = https://s3.amazonaws.com/json-c_releases/releases/json-c-0.16.tar.gz
source_filename = json-c-0.16.tar.gz
source_hash = 8e45ac8f96ec7791eaf3bb7ee50e9c2100bbbc87b8d0f1d030c5ba8a0288d96b
-patch_filename = json-c_0.16-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/json-c_0.16-1/get_patch
-patch_hash = 69db1e0c391c6a00c42d05c0d845bd551d92db10171f4a40d0b070f29f918101
-wrapdb_version = 0.16-1
+patch_filename = json-c_0.16-3_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/json-c_0.16-3/get_patch
+patch_hash = 6e712826ba1e6e1b6d21c6157a764984fedc6b594c9f92443498b972b6377a94
+wrapdb_version = 0.16-3
[provide]
json-c = json_c_dep
-
diff --git a/subprojects/libnvme.wrap b/subprojects/libnvme.wrap
index 5bbc79d..a4f55dc 100644
--- a/subprojects/libnvme.wrap
+++ b/subprojects/libnvme.wrap
@@ -1,6 +1,7 @@
[wrap-git]
url = https://github.com/linux-nvme/libnvme.git
-revision = 47e3562a7d9b4bb871f374058c52c654fb4735e9
+revision = b25dc6102bc000ff4c8061e6448cfb4c034eaed6
[provide]
libnvme = libnvme_dep
+libnvme-mi = libnvme_mi_dep
diff --git a/subprojects/uuid.wrap b/subprojects/uuid.wrap
deleted file mode 100644
index 0692c4e..0000000
--- a/subprojects/uuid.wrap
+++ /dev/null
@@ -1,6 +0,0 @@
-[wrap-git]
-url = https://github.com/util-linux/util-linux.git
-revision = eefff5aac7bce6979c950e3931a578efe03acbac
-
-[provide]
-dependency_names = uuid \ No newline at end of file
diff --git a/subprojects/zlib.wrap b/subprojects/zlib.wrap
index 3c7b575..0482386 100644
--- a/subprojects/zlib.wrap
+++ b/subprojects/zlib.wrap
@@ -1,12 +1,12 @@
[wrap-file]
-directory = zlib-1.2.12
-source_url = http://zlib.net/fossils/zlib-1.2.12.tar.gz
-source_filename = zlib-1.2.12.tar.gz
-source_hash = 91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9
-patch_filename = zlib_1.2.12-1_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.12-1/get_patch
-patch_hash = 8ec8344f3fe7b06ad4be768fd416694bc56cb4545ce78b0f1c18b3e72b3ec936
+directory = zlib-1.2.13
+source_url = http://zlib.net/fossils/zlib-1.2.13.tar.gz
+source_filename = zlib-1.2.13.tar.gz
+source_hash = b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
+patch_filename = zlib_1.2.13-1_patch.zip
+patch_url = https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-1/get_patch
+patch_hash = 73a0103df54133b10f8774f92e23da048bd22554523e2b833cdb72b2702c0628
+wrapdb_version = 1.2.13-1
[provide]
zlib = zlib_dep
-