[PR PATCH] thin-provisioning-tools: update to 1.0.4.

[PR PATCH] thin-provisioning-tools: update to 1.0.4.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1275 bytes --]

There is a new pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages thin-provisioning-tools-1.0.4
https://github.com/void-linux/void-packages/pull/43722

thin-provisioning-tools: update to 1.0.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (testing appreciated)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-thin-provisioning-tools-1.0.4-43722.patch --]
[-- Type: text/x-diff, Size: 3684 bytes --]

From c52a2338a6f8f64daf5b1a3cf8fa6cdd4fb2d86e Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 3 May 2023 01:38:56 +0300
Subject: [PATCH] thin-provisioning-tools: update to 1.0.4.

---
 .../patches/fix-musl.diff                     | 36 +++++++++++++++++++
 srcpkgs/thin-provisioning-tools/template      | 22 +++++++-----
 2 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/thin-provisioning-tools/patches/fix-musl.diff

diff --git a/srcpkgs/thin-provisioning-tools/patches/fix-musl.diff b/srcpkgs/thin-provisioning-tools/patches/fix-musl.diff
new file mode 100644
index 000000000000..704285dc1a05
--- /dev/null
+++ b/srcpkgs/thin-provisioning-tools/patches/fix-musl.diff
@@ -0,0 +1,36 @@
+diff --git a/src/file_utils.rs b/src/file_utils.rs
+index 0ca3c0f..279a202 100644
+--- a/src/file_utils.rs
++++ b/src/file_utils.rs
+@@ -56,7 +56,12 @@ fn get_device_size<P: AsRef<Path>>(path: P) -> io::Result<u64> {
+     let fd = file.as_raw_fd();
+     let mut cap = 0u64;
+     unsafe {
+-        if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 {
++        #[cfg(target_env = "musl")]
++        let request = BLKGETSIZE64 as libc::c_int;
++        #[cfg(not(target_env = "musl"))]
++        let request = BLKGETSIZE64 as libc::c_ulong;
++
++        if libc::ioctl(fd, request, &mut cap) == 0 {
+             Ok(cap)
+         } else {
+             Err(io::Error::last_os_error())
+diff --git a/src/thin/trim.rs b/src/thin/trim.rs
+index 3d938ca..80f3d6f 100644
+--- a/src/thin/trim.rs
++++ b/src/thin/trim.rs
+@@ -135,7 +135,12 @@ impl<'a> Iterator for RangeIterator<'a> {
+ const BLKDISCARD: u32 = 0x1277;
+ fn ioctl_blkdiscard(fd: i32, range: &[u64; 2]) -> std::io::Result<()> {
+     unsafe {
+-        if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 {
++        #[cfg(target_env = "musl")]
++        let request = BLKDISCARD as libc::c_int;
++        #[cfg(not(target_env = "musl"))]
++        let request = BLKDISCARD as libc::c_ulong;
++
++        if libc::ioctl(fd, request, range) == 0 {
+             Ok(())
+         } else {
+             Err(std::io::Error::last_os_error())
diff --git a/srcpkgs/thin-provisioning-tools/template b/srcpkgs/thin-provisioning-tools/template
index d74be6fe5d72..1eb520953b0a 100644
--- a/srcpkgs/thin-provisioning-tools/template
+++ b/srcpkgs/thin-provisioning-tools/template
@@ -1,21 +1,25 @@
 # Template file for 'thin-provisioning-tools'
 pkgname=thin-provisioning-tools
-version=0.9.0
+version=1.0.4
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake autoconf libtool pkg-config"
-makedepends="boost-devel expat-devel libaio-devel"
+build_style=cargo
+hostmakedepends="pkg-config"
+# Note: links statically to libzstd
+makedepends="libzstd-devel"
 short_desc="Tools for manipulating the metadata of dm-thin device-mapper targets"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jthornber/thin-provisioning-tools"
+changelog="https://raw.githubusercontent.com/jthornber/thin-provisioning-tools/main/CHANGES"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a2508d9933ed8a3f6c8d302280d838d416668a1d914a83c4bd0fb01eaf0676e8
+checksum=a973786fb9cb49d30be6fb8178d6739bc23609d4114ab601f0983ecdbf349abf
+# Does a ton of disk IO.
+make_check=extended
 
-pre_configure() {
-	autoreconf -fi
+post_patch() {
+	vsed -e "s:target/release/pdata_tools:target/${RUST_TARGET}/release/pdata_tools:" -i Makefile
 }
 
-do_install() {
-	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin MANDIR=/usr/share/man install
+post_install() {
+	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install
 }

Re: [PR PATCH] [Updated] thin-provisioning-tools: update to 1.0.4.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages thin-provisioning-tools-1.0.4
https://github.com/void-linux/void-packages/pull/43722

thin-provisioning-tools: update to 1.0.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (testing appreciated)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-thin-provisioning-tools-1.0.4-43722.patch --]
[-- Type: text/x-diff, Size: 3682 bytes --]

From 1aa71e0d578c68400fe58b98256e9e7d64cda256 Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 3 May 2023 01:38:56 +0300
Subject: [PATCH] thin-provisioning-tools: update to 1.0.4.

---
 .../patches/fix-musl.diff                     | 36 +++++++++++++++++++
 srcpkgs/thin-provisioning-tools/template      | 22 +++++++-----
 2 files changed, 49 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/thin-provisioning-tools/patches/fix-musl.diff

diff --git a/srcpkgs/thin-provisioning-tools/patches/fix-musl.diff b/srcpkgs/thin-provisioning-tools/patches/fix-musl.diff
new file mode 100644
index 000000000000..5f0d03174139
--- /dev/null
+++ b/srcpkgs/thin-provisioning-tools/patches/fix-musl.diff
@@ -0,0 +1,36 @@
+diff --git a/src/file_utils.rs b/src/file_utils.rs
+index 0ca3c0f..279a202 100644
+--- a/src/file_utils.rs
++++ b/src/file_utils.rs
+@@ -56,7 +56,12 @@ fn get_device_size<P: AsRef<Path>>(path: P) -> io::Result<u64> {
+     let fd = file.as_raw_fd();
+     let mut cap = 0u64;
+     unsafe {
+-        if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 {
++        #[cfg(target_env = "musl")]
++        type RequestType = libc::c_int;
++        #[cfg(not(target_env = "musl"))]
++        type RequestType = libc::c_ulong;
++
++        if libc::ioctl(fd, BLKGETSIZE64 as RequestType, &mut cap) == 0 {
+             Ok(cap)
+         } else {
+             Err(io::Error::last_os_error())
+diff --git a/src/thin/trim.rs b/src/thin/trim.rs
+index 3d938ca..80f3d6f 100644
+--- a/src/thin/trim.rs
++++ b/src/thin/trim.rs
+@@ -135,7 +135,12 @@ impl<'a> Iterator for RangeIterator<'a> {
+ const BLKDISCARD: u32 = 0x1277;
+ fn ioctl_blkdiscard(fd: i32, range: &[u64; 2]) -> std::io::Result<()> {
+     unsafe {
+-        if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 {
++        #[cfg(target_env = "musl")]
++        type RequestType = libc::c_int;
++        #[cfg(not(target_env = "musl"))]
++        type RequestType = libc::c_ulong;
++
++        if libc::ioctl(fd, BLKDISCARD as RequestType, range) == 0 {
+             Ok(())
+         } else {
+             Err(std::io::Error::last_os_error())
diff --git a/srcpkgs/thin-provisioning-tools/template b/srcpkgs/thin-provisioning-tools/template
index d74be6fe5d72..1eb520953b0a 100644
--- a/srcpkgs/thin-provisioning-tools/template
+++ b/srcpkgs/thin-provisioning-tools/template
@@ -1,21 +1,25 @@
 # Template file for 'thin-provisioning-tools'
 pkgname=thin-provisioning-tools
-version=0.9.0
+version=1.0.4
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake autoconf libtool pkg-config"
-makedepends="boost-devel expat-devel libaio-devel"
+build_style=cargo
+hostmakedepends="pkg-config"
+# Note: links statically to libzstd
+makedepends="libzstd-devel"
 short_desc="Tools for manipulating the metadata of dm-thin device-mapper targets"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jthornber/thin-provisioning-tools"
+changelog="https://raw.githubusercontent.com/jthornber/thin-provisioning-tools/main/CHANGES"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a2508d9933ed8a3f6c8d302280d838d416668a1d914a83c4bd0fb01eaf0676e8
+checksum=a973786fb9cb49d30be6fb8178d6739bc23609d4114ab601f0983ecdbf349abf
+# Does a ton of disk IO.
+make_check=extended
 
-pre_configure() {
-	autoreconf -fi
+post_patch() {
+	vsed -e "s:target/release/pdata_tools:target/${RUST_TARGET}/release/pdata_tools:" -i Makefile
 }
 
-do_install() {
-	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin MANDIR=/usr/share/man install
+post_install() {
+	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install
 }

Re: [PR PATCH] [Updated] thin-provisioning-tools: update to 1.0.4.

[mhmdanas]

[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]

There is an updated pull request by mhmdanas against master on the void-packages repository

https://github.com/mhmdanas/void-packages thin-provisioning-tools-1.0.4
https://github.com/void-linux/void-packages/pull/43722

thin-provisioning-tools: update to 1.0.4.
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (testing appreciated)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/43722.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-thin-provisioning-tools-1.0.4-43722.patch --]
[-- Type: text/x-diff, Size: 5900 bytes --]

From 332e6d765a5706ca53265e78d6662c3d229cdbbd Mon Sep 17 00:00:00 2001
From: triallax <triallax@tutanota.com>
Date: Wed, 3 May 2023 01:38:56 +0300
Subject: [PATCH] thin-provisioning-tools: update to 1.0.4.

---
 .../patches/fix-musl.patch                    | 90 +++++++++++++++++++
 srcpkgs/thin-provisioning-tools/template      | 22 +++--
 2 files changed, 103 insertions(+), 9 deletions(-)
 create mode 100644 srcpkgs/thin-provisioning-tools/patches/fix-musl.patch

diff --git a/srcpkgs/thin-provisioning-tools/patches/fix-musl.patch b/srcpkgs/thin-provisioning-tools/patches/fix-musl.patch
new file mode 100644
index 000000000000..8e433e96a32a
--- /dev/null
+++ b/srcpkgs/thin-provisioning-tools/patches/fix-musl.patch
@@ -0,0 +1,90 @@
+From fbce51f27fa164ebad7994b177908e5a200b95c9 Mon Sep 17 00:00:00 2001
+From: triallax <triallax@tutanota.com>
+Date: Thu, 4 May 2023 20:42:39 +0300
+Subject: [PATCH] [build] fix build on musl
+
+Before this commit, compilation would fail with this error:
+
+```
+error[E0308]: mismatched types
+   --> src/file_utils.rs:59:28
+    |
+59  |         if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 {
+    |            -----------     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
+    |            |
+    |            arguments to this function are incorrect
+    |
+note: function defined here
+   --> /host/cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.142/src/unix/linux_like/linux/musl/mod.rs:739:12
+    |
+739 |     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
+    |            ^^^^^
+help: you can convert a `u32` to an `i32` and panic if the converted value doesn't fit
+    |
+59  |         if libc::ioctl(fd, (BLKGETSIZE64 as libc::c_ulong).try_into().unwrap(), &mut cap) == 0 {
+    |                            +                             +++++++++++++++++++++
+
+error[E0308]: mismatched types
+   --> src/thin/trim.rs:138:28
+    |
+138 |         if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 {
+    |            -----------     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `i32`, found `u32`
+    |            |
+    |            arguments to this function are incorrect
+    |
+note: function defined here
+   --> /host/cargo/registry/src/index.crates.io-6f17d22bba15001f/libc-0.2.142/src/unix/linux_like/linux/musl/mod.rs:739:12
+    |
+739 |     pub fn ioctl(fd: ::c_int, request: ::c_int, ...) -> ::c_int;
+    |            ^^^^^
+help: you can convert a `u32` to an `i32` and panic if the converted value doesn't fit
+    |
+138 |         if libc::ioctl(fd, (BLKDISCARD as libc::c_ulong).try_into().unwrap(), range) == 0 {
+    |                            +                           +++++++++++++++++++++
+
+For more information about this error, try `rustc --explain E0308`.
+```
+---
+ src/file_utils.rs | 8 +++++++-
+ src/thin/trim.rs  | 7 ++++++-
+ 2 files changed, 13 insertions(+), 2 deletions(-)
+
+diff --git a/src/file_utils.rs b/src/file_utils.rs
+index 0ca3c0fc..81d4a8a7 100644
+--- a/src/file_utils.rs
++++ b/src/file_utils.rs
+@@ -55,8 +55,14 @@ fn get_device_size<P: AsRef<Path>>(path: P) -> io::Result<u64> {
+     let file = File::open(path.as_ref())?;
+     let fd = file.as_raw_fd();
+     let mut cap = 0u64;
++
++    #[cfg(target_env = "musl")]
++    type RequestType = libc::c_int;
++    #[cfg(not(target_env = "musl"))]
++    type RequestType = libc::c_ulong;
++
+     unsafe {
+-        if libc::ioctl(fd, BLKGETSIZE64 as libc::c_ulong, &mut cap) == 0 {
++        if libc::ioctl(fd, BLKGETSIZE64 as RequestType, &mut cap) == 0 {
+             Ok(cap)
+         } else {
+             Err(io::Error::last_os_error())
+diff --git a/src/thin/trim.rs b/src/thin/trim.rs
+index 3d938caf..0d1fb590 100644
+--- a/src/thin/trim.rs
++++ b/src/thin/trim.rs
+@@ -134,8 +134,13 @@ impl<'a> Iterator for RangeIterator<'a> {
+ 
+ const BLKDISCARD: u32 = 0x1277;
+ fn ioctl_blkdiscard(fd: i32, range: &[u64; 2]) -> std::io::Result<()> {
++    #[cfg(target_env = "musl")]
++    type RequestType = libc::c_int;
++    #[cfg(not(target_env = "musl"))]
++    type RequestType = libc::c_ulong;
++
+     unsafe {
+-        if libc::ioctl(fd, BLKDISCARD as libc::c_ulong, range) == 0 {
++        if libc::ioctl(fd, BLKDISCARD as RequestType, range) == 0 {
+             Ok(())
+         } else {
+             Err(std::io::Error::last_os_error())
diff --git a/srcpkgs/thin-provisioning-tools/template b/srcpkgs/thin-provisioning-tools/template
index d74be6fe5d72..71b00ac1e89e 100644
--- a/srcpkgs/thin-provisioning-tools/template
+++ b/srcpkgs/thin-provisioning-tools/template
@@ -1,21 +1,25 @@
 # Template file for 'thin-provisioning-tools'
 pkgname=thin-provisioning-tools
-version=0.9.0
+version=1.0.4
 revision=1
-build_style=gnu-configure
-hostmakedepends="automake autoconf libtool pkg-config"
-makedepends="boost-devel expat-devel libaio-devel"
+build_style=cargo
+hostmakedepends="pkg-config"
+# Note: statically links to libzstd.
+makedepends="libzstd-devel"
 short_desc="Tools for manipulating the metadata of dm-thin device-mapper targets"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/jthornber/thin-provisioning-tools"
+changelog="https://raw.githubusercontent.com/jthornber/thin-provisioning-tools/main/CHANGES"
 distfiles="${homepage}/archive/v${version}.tar.gz"
-checksum=a2508d9933ed8a3f6c8d302280d838d416668a1d914a83c4bd0fb01eaf0676e8
+checksum=a973786fb9cb49d30be6fb8178d6739bc23609d4114ab601f0983ecdbf349abf
+# Does a ton of disk IO.
+make_check=extended
 
-pre_configure() {
-	autoreconf -fi
+post_patch() {
+	vsed -e "s:target/release/pdata_tools:target/${RUST_TARGET}/release/pdata_tools:" -i Makefile
 }
 
-do_install() {
-	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin MANDIR=/usr/share/man install
+post_install() {
+	make DESTDIR=${DESTDIR} BINDIR=${DESTDIR}/usr/bin install
 }

Re: [PR PATCH] [Closed]: thin-provisioning-tools: update to 1.0.4.

[abenson]

[-- Attachment #1: Type: text/plain, Size: 1100 bytes --]

There's a closed pull request on the void-packages repository

thin-provisioning-tools: update to 1.0.4.
https://github.com/void-linux/void-packages/pull/43722

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **NO** (testing appreciated)

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->