upgpkg: freeipmi 1.6.7-2

enable systemd integration

4 files changed, 65 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6c4e0bea00a..0ed12e7a653f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = freeipmi
-	pkgdesc = Provides in-band and out-of-band IPMI software based on the IPMI v1.5/2.0 specification.
+	pkgdesc = IPMI remote console and system management software
 	pkgver = 1.6.7
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.gnu.org/software/freeipmi
 	arch = x86_64
 	arch = aarch64
@@ -21,9 +21,11 @@ pkgbase = freeipmi
 	backup = etc/freeipmi/libipmiconsole.conf
 	source = https://ftp.gnu.org/gnu/freeipmi/freeipmi-1.6.7.tar.gz
 	source = https://ftp.gnu.org/gnu/freeipmi/freeipmi-1.6.7.tar.gz.sig
+	source = tmpfiles.conf
 	validpgpkeys = A865A9FB6F0387624468543A3EFB7C4BE8303927
-	sha256sums = bb8519313933656c1e55e4f1ab3204748c26671d058e8aadd8e30a8053eadebf
-	sha256sums = SKIP
+	b2sums = 6e07afb7e93ec41c18c82725e781177d8a5fef78054ffca784cb951e360be9132ee35805014cd1ee92e1c167b2ec7dcfd07152b43f09a53eefff3e05c6f73789
+	b2sums = SKIP
+	b2sums = 5354e0b716b0806ac6f82dbbae533cb86f302d1952b948df6b5ab5bd41bf194ec927c9c39fd4d5969c2f4de8cfdbf3b66a4a1c1faaee4e5768201eaef83ca991
 
 pkgname = freeipmi
 
diff --git a/.gitignore b/.gitignore
index 4dab8d6386e3..1cd7f4c1860d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
+!tmpfiles.conf
diff --git a/PKGBUILD b/PKGBUILD
index 0e5ca08613a5..7914fb6dcb67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,18 @@
 # Co-Maintainer: George Rawlinson <george@rawlinson.net.nz>
 # Contributor: Phillip Smith <pkgbuild@phs.id.au>
 # Contributor: Nathan Owe <ndowens04 at gmail>
+
 pkgname=freeipmi
 pkgver=1.6.7
-pkgrel=1
-pkgdesc="Provides in-band and out-of-band IPMI software based on the IPMI v1.5/2.0 specification."
+pkgrel=2
+pkgdesc="IPMI remote console and system management software"
 arch=('x86_64' 'aarch64')
 url="https://www.gnu.org/software/freeipmi"
 license=('GPL')
 depends=('libgcrypt')
-provides=('libipmimonitoring.so=6' 'libipmidetect.so=0' 'libipmiconsole.so=2'
+provides=('libipmimonitoring.so=6'
+          'libipmidetect.so=0'
+          'libipmiconsole.so=2'
           'libfreeipmi.so=17')
 backup=("etc/$pkgname/$pkgname.conf"
         "etc/$pkgname/${pkgname}_interpret_sel.conf"
@@ -20,40 +23,61 @@ backup=("etc/$pkgname/$pkgname.conf"
         "etc/$pkgname/ipmiseld.conf"
         "etc/$pkgname/libipmiconsole.conf")
 options=('!libtool')
-source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
-sha256sums=('bb8519313933656c1e55e4f1ab3204748c26671d058e8aadd8e30a8053eadebf'
-            'SKIP')
+source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
+        "tmpfiles.conf")
+b2sums=('6e07afb7e93ec41c18c82725e781177d8a5fef78054ffca784cb951e360be9132ee35805014cd1ee92e1c167b2ec7dcfd07152b43f09a53eefff3e05c6f73789'
+        'SKIP'
+        '5354e0b716b0806ac6f82dbbae533cb86f302d1952b948df6b5ab5bd41bf194ec927c9c39fd4d5969c2f4de8cfdbf3b66a4a1c1faaee4e5768201eaef83ca991')
 validpgpkeys=('A865A9FB6F0387624468543A3EFB7C4BE8303927') # Albert Chu <chu11@llnl.gov>
 
+prepare() {
+  cd "$pkgname-$pkgver"
+
+  # replace /usr/sbin with /usr/bin
+  sed -i "s/sbin/bin/" etc/*.service
+
+  # use arch-specific config dir
+  sed -i "s/sysconfig/conf.d/" etc/bmc-watchdog.service
+}
+
 build() {
-	cd "$pkgname-$pkgver"
-
-	if [[ "$CARCH" == "x86_64" ]]; then
-	./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sbindir=/usr/bin
-	else
-	./configure \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--sysconfdir=/etc \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sbindir=/usr/bin \
-		--build-arm
-	fi
-
-	make
+  cd "$pkgname-$pkgver"
+
+  if [[ "$CARCH" == "x86_64" ]]; then
+  ./configure \
+    --prefix=/usr \
+    --exec-prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/share/man \
+    --sbindir=/usr/bin \
+    --disable-init-scripts \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system
+  else
+  ./configure \
+    --prefix=/usr \
+    --exec-prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
+    --mandir=/usr/share/man \
+    --sbindir=/usr/bin \
+    --disable-init-scripts \
+    --with-systemdsystemunitdir=/usr/lib/systemd/system \
+    --build-arm
+
+  fi
+
+  make
 }
 
 package() {
-	cd "$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+  cd "$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # move config to Arch paths
+  mv "$pkgdir"/etc/sysconfig "$pkgdir"/etc/conf.d
 
-	# Move init scripts and 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"
+  rm -rf "$pkgdir/var/cache"
 }
diff --git a/tmpfiles.conf b/tmpfiles.conf
new file mode 100644
index 000000000000..a760d2228a24
--- /dev/null
+++ b/tmpfiles.conf
@@ -0,0 +1,2 @@
+d /var/cache/ipmimonitoringsdrcache
+d /var/cache/ipmiseld