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

[Jiachen Yang]

    Date: Monday, October 4, 2021 @ 22:47:53
  Author: farseerfc
Revision: 1027674

upgpkg: stratisd 2.4.2-1

Modified:
  stratisd/trunk/PKGBUILD

----------+
 PKGBUILD |   22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-10-04 22:47:52 UTC (rev 1027673)
+++ PKGBUILD	2021-10-04 22:47:53 UTC (rev 1027674)
@@ -2,7 +2,7 @@
 # Contributor: Dan Beste <dan.ray.beste at gmail.com>
 
 pkgname='stratisd'
-pkgver=2.4.0
+pkgver=2.4.2
 pkgrel=1
 pkgdesc='Easy to use local storage management for Linux.'
 arch=('x86_64')
@@ -13,12 +13,17 @@
 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")
-b2sums=('f6e0cf98b5c320d4766e157f2fab158167b8ebd8ac24a0ecd99f13154697693d0f54a2eacac1138a977a448b203e19c32d3bf4b696cc93515e7b9038559f713a')
+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')
 
 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
@@ -35,6 +40,7 @@
   cd "${pkgname}-${pkgver}"
 
   # Release
+  export LIBEXECDIR=/usr/lib
   make release
   make release-min
   make docs/stratisd.8
@@ -49,18 +55,10 @@
 package() {
   cd "${pkgname}-${pkgver}"
 
+  export LIBEXECDIR=/usr/lib
   install -dm755 "${pkgdir}/usr/lib/systemd/system-generators"
   install -dm755 "${pkgdir}/usr/bin"
   make install DESTDIR="${pkgdir}" PREFIX="/usr" LIBEXECDIR="/usr/lib"
-  #install -D -m755 "target/release/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
-  #install -D -m755 "target/release/stratis_dbusquery_version" "${pkgdir}/usr/bin/stratis_dbusquery_version"
-  #install -D -m755 "target/release/stratis_uuids_to_names" "${pkgdir}/usr/lib/udev/stratis_uuids_to_names"
-  #install -D -m755 "developer_tools/stratis_migrate_symlinks.sh" "${pkgdir}/usr/bin/stratis_migrate_symlinks.sh"
-  #install -D -m644 udev/11-stratisd.rules "${pkgdir}/usr/lib/udev/rules.d/11-stratisd.rules"
-  #install -D -m644 stratisd.service "${pkgdir}/usr/lib/systemd/system/stratisd.service"
-  #install -D -m644 org.storage.stratis2.service "${pkgdir}/usr/share/dbus-1/system-services/org.storage.stratis2.service"
-  #install -D -m644 stratisd.conf "${pkgdir}/usr/share/dbus-1/system.d/stratisd.conf"
-  #install -D -m644 docs/stratisd.8 "${pkgdir}/usr/share/man/man8/stratisd.8"
   install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }