[arch-commits] Commit in stratisd/trunk (PKGBUILD pr2665.patch)

[Antonio Rojas]

    Date: Saturday, April 23, 2022 @ 14:23:42
  Author: arojas
Revision: 1187625

4B1DE545A801D4549BFD3FEF90CB3D62C13D4796 key removal

Modified:
  stratisd/trunk/PKGBUILD
Deleted:
  stratisd/trunk/pr2665.patch

--------------+
 PKGBUILD     |   16 ++++++----------
 pr2665.patch |   51 ---------------------------------------------------
 2 files changed, 6 insertions(+), 61 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-23 13:48:23 UTC (rev 1187624)
+++ PKGBUILD	2022-04-23 14:23:42 UTC (rev 1187625)
@@ -2,8 +2,8 @@
 # Contributor: Dan Beste <dan.ray.beste at gmail.com>
 
 pkgname='stratisd'
-pkgver=2.4.2
-pkgrel=2
+pkgver=2.4.4
+pkgrel=1
 pkgdesc='Easy to use local storage management for Linux.'
 arch=('x86_64')
 url='https://stratis-storage.github.io/'
@@ -13,21 +13,15 @@
 optdepends=('stratis-cli: command line interface'
             'dracut: stratis as root filesystem support')
 checkdepends=('python-pyudev')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/stratis-storage/stratisd/archive/v${pkgver}.tar.gz"
-        "pr2665.patch::https://patch-diff.githubusercontent.com/raw/stratis-storage/stratisd/pull/2665.patch")
-b2sums=('6a3a4176216575cfb9eff75073ac126e7bf7048025c521d76a9840cb0d6ef0a261d7c175e69b51ce32b31ae00c7a3d1945178ced0cca6f213211b38d15dae831'
-        '68a0291b8837377f2e3c864d06c275d9aafa35cd9fb2836b37e10c774f2459b05879aafdf9634e669d819433bbea4825af73e982dd5b0205cfdce2aa3a4a7cf9')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/stratis-storage/stratisd/archive/v${pkgver}.tar.gz")
+b2sums=('254edcf50be984294bb4d7323f274032410ff1e7064d102a921fcbd9f4e6fe7e7cd171a9c3d664712540b19522496a2bac53d1206521ce4892d80e67989b845e')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
 
-  # patch to allow nullptr deref
-  patch -Np1 -i "$srcdir/pr2665.patch"
-
   # patch libexec path in configs
   configs=(systemd/stratisd.service
            dracut/90stratis/module-setup.sh
-           org.storage.stratis2.service
            dracut/90stratis/stratisd-min.service
            systemd/stratisd-min-postinitrd.service)
   for file in ${configs[@]}; do
@@ -34,6 +28,8 @@
       echo "Patching libexec in $file"
       sed -i 's,/usr/libexec,/usr/lib,g' $file 
   done
+
+  sed -e 's|-D unused||' -e 's|-D warnings||' -i Makefile # Fix build
 }
 
 build() {

Deleted: pr2665.patch
===================================================================
--- pr2665.patch	2022-04-23 13:48:23 UTC (rev 1187624)
+++ pr2665.patch	2022-04-23 14:23:42 UTC (rev 1187625)
@@ -1,51 +0,0 @@
-From 5e433304fac6864d2ef75b3124281d18cd5a35ba Mon Sep 17 00:00:00 2001
-From: John Baublitz <jbaublitz at redhat.com>
-Date: Thu, 17 Jun 2021 17:05:47 -0400
-Subject: [PATCH 1/2] Allow code generated by bindgen for testing struct
- layouts
-
----
- src/systemd/bindings.rs | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/systemd/bindings.rs b/src/systemd/bindings.rs
-index fda3e7425..d0e81a5cb 100644
---- a/src/systemd/bindings.rs
-+++ b/src/systemd/bindings.rs
-@@ -5,5 +5,9 @@
- #![allow(clippy::redundant_static_lifetimes)]
- #![allow(clippy::unreadable_literal)]
- #![allow(clippy::missing_safety_doc)]
-+// This allow should be removed once bindgen finds a way to
-+// generate struct alignment tests without triggering errors
-+// in the compiler. See https://github.com/rust-lang/rust-bindgen/issues/1651.
-+#![allow(deref_nullptr)]
- 
- include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
-
-From 3aafc75c991548a468631c6aa6e6b20d60632de1 Mon Sep 17 00:00:00 2001
-From: mulhern <amulhern at redhat.com>
-Date: Fri, 18 Jun 2021 20:53:48 -0400
-Subject: [PATCH 2/2] Allow lint in order to cover our lowest supported
- toolchain
-
-This would be unnecessary if it were a clippy lint, but it is a regular
-compiler lint.
-
-Signed-off-by: mulhern <amulhern at redhat.com>
----
- src/systemd/bindings.rs | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/systemd/bindings.rs b/src/systemd/bindings.rs
-index d0e81a5cb..9dd61cfc2 100644
---- a/src/systemd/bindings.rs
-+++ b/src/systemd/bindings.rs
-@@ -8,6 +8,7 @@
- // This allow should be removed once bindgen finds a way to
- // generate struct alignment tests without triggering errors
- // in the compiler. See https://github.com/rust-lang/rust-bindgen/issues/1651.
-+#![allow(unknown_lints)]
- #![allow(deref_nullptr)]
- 
- include!(concat!(env!("OUT_DIR"), "/bindings.rs"));