upgpkg: freeipmi 1.6.8-2

Added upstream patch-set that enabled setting config path directory
instead of using sed/mv.

1 files changed, 14 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 2392dea65b8e..b1d1938a04f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=freeipmi
 pkgver=1.6.8
-pkgrel=1
+pkgrel=2
 pkgdesc="IPMI remote console and system management software"
 arch=('x86_64' 'aarch64')
 url="https://www.gnu.org/software/freeipmi"
@@ -28,21 +28,25 @@ backup=(
 )
 options=('!libtool')
 source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        "tmpfiles.conf")
+        'tmpfiles.conf'
+        '0001-configure-support-with-systemconfigdir-option.patch')
+
 b2sums=('afe3238955786b13aae0e0062028f5c969a8e686b46bea3850696361355b3bd82a55bd93523ea7fe2223fe5bb04922c26b46023f783bd879bbd01e34ffd6d59e'
         'SKIP'
-        '5354e0b716b0806ac6f82dbbae533cb86f302d1952b948df6b5ab5bd41bf194ec927c9c39fd4d5969c2f4de8cfdbf3b66a4a1c1faaee4e5768201eaef83ca991')
+        '5354e0b716b0806ac6f82dbbae533cb86f302d1952b948df6b5ab5bd41bf194ec927c9c39fd4d5969c2f4de8cfdbf3b66a4a1c1faaee4e5768201eaef83ca991'
+        '3afcd95716b61a7d542193e78e6fe3598711b7641c98c771d01aacb3bb6c94112a6df78236c27d15879a51da5a4b6b2ad3fcfacbd380fce3cdfafc826197fcc8')
 validpgpkeys=('A865A9FB6F0387624468543A3EFB7C4BE8303927') # Albert Chu <chu11@llnl.gov>
 
 prepare() {
   cd "$pkgname-$pkgver"
 
-  # use arch-specific config dir
-  sed -i "s/sysconfig/conf.d/" etc/bmc-watchdog.service.in
+  # apply upstream patch fixing config dir
+  patch --forward --strip=1 --input="$srcdir/0001-configure-support-with-systemconfigdir-option.patch"
 }
 
 build() {
   cd "$pkgname-$pkgver"
+  autoreconf -vi
 
   if [[ "$CARCH" == "x86_64" ]]; then
   ./configure \
@@ -53,7 +57,8 @@ build() {
     --mandir=/usr/share/man \
     --sbindir=/usr/bin \
     --disable-init-scripts \
-    --with-systemdsystemunitdir=/usr/lib/systemd/system
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-systemconfigdir=/etc/conf.d
   else
   ./configure \
     --prefix=/usr \
@@ -64,6 +69,7 @@ build() {
     --sbindir=/usr/bin \
     --disable-init-scripts \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --with-systemconfigdir=/etc/conf.d \
     --build-arm
 
   fi
@@ -75,10 +81,9 @@ package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 
-  # move config to Arch paths
-  mv "$pkgdir"/etc/sysconfig "$pkgdir"/etc/conf.d
-
   # systemd-tmpfiles integration
   install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/$pkgname.conf"
+
+  # delete cache
   rm -rf "$pkgdir/var/cache"
 }