1.6.6

6 files changed, 53 insertions, 100 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 74899e7a1ced..9154bc49ae5a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,20 @@
-# Generated by mksrcinfo v8
-# Fri Aug 23 08:04:28 UTC 2019
 pkgbase = freeipmi
-	pkgdesc = sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL)
-	pkgver = 1.6.4
+	pkgdesc = Provides in-band and out-of-band IPMI software based on the IPMI v1.5/2.0 specification.
+	pkgver = 1.6.6
 	pkgrel = 1
-	url = http://www.gnu.org/software/freeipmi/
-	arch = i686
+	url = https://www.gnu.org/software/freeipmi
 	arch = x86_64
+	arch = aarch64
 	license = GPL
 	depends = libgcrypt
+	provides = libipmimonitoring.so=6
+	provides = libipmidetect.so=0
+	provides = libipmiconsole.so=2
+	provides = libfreeipmi.so=17
 	options = !libtool
-	source = http://ftp.gnu.org/gnu/freeipmi/freeipmi-1.6.4.tar.gz
-	source = bmc-watchdog.service
-	source = ipmidetectd.service
-	source = ipmiseld.service
-	sha256sums = 65dfbb95a30438ba247f01a58498862a37d2e71c8c950bcfcee459d079241a3c
-	sha256sums = ac2aadac0f1be10134b2f2aef4652dfa9c32bf48bcb0326d39a583cce4bf2d56
-	sha256sums = 53e79cb652e8840a5e3178b797544ef44d6405f74a862d8b4d430165cf070e35
-	sha256sums = d8a117fecae35c9d9f3fe3572d6abd660744ceebfe2fa1cc9fabddd0e9a38746
+	backup = etc/freeipmi/*.conf
+	source = https://ftp.gnu.org/gnu/freeipmi/freeipmi-1.6.6.tar.gz
+	sha256sums = cfa30179b44c582e73cf92c2ad0e54fe49f9fd87f7a0889be9dc2db5802e6aab
 
 pkgname = freeipmi
 
diff --git a/.gitignore b/.gitignore
index d6f819d5c0ec..4dab8d6386e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,7 @@
-freeipmi-*.pkg.tar.xz
-freeipmi-*.tar.gz
-pkg/
-src/
+# Ignore everything
+*
+
+# But not these files...
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 08b523b19fce..6243277d7cbc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,64 +1,48 @@
-# Maintainer: Phillip Smith <pkgbuild@phs.id.au>
+# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
+# Contributor: Phillip Smith <pkgbuild@phs.id.au>
 # Contributor: Nathan Owe <ndowens04 at gmail>
-
-### I AM ONLY THE PACKAGER, NOT THE DEVELOPER
-### Please ask support questions about this software in one of:
-###   1) The AUR comments; OR
-###   2) Upstream forums/maillist etc; OR
-###   3) The ArchLinux forums
-### I do not always know enough about the software itself, or don't have the
-### time to promptly respond to direct emails.
-### If you have found a problem with the package/PKGBUILD (as opposed to
-### the software) then please do email me or post an AUR comment.
-
 pkgname=freeipmi
-pkgver=1.6.4
+pkgver=1.6.6
 pkgrel=1
-pkgdesc="sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL)"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/freeipmi/"
+pkgdesc="Provides in-band and out-of-band IPMI software based on the IPMI v1.5/2.0 specification."
+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'
+          'libfreeipmi.so=17')
+backup=("etc/$pkgname/*.conf")
 options=('!libtool')
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-        'bmc-watchdog.service'
-        'ipmidetectd.service'
-        'ipmiseld.service')
-sha256sums=('65dfbb95a30438ba247f01a58498862a37d2e71c8c950bcfcee459d079241a3c'
-            'ac2aadac0f1be10134b2f2aef4652dfa9c32bf48bcb0326d39a583cce4bf2d56'
-            '53e79cb652e8840a5e3178b797544ef44d6405f74a862d8b4d430165cf070e35'
-            'd8a117fecae35c9d9f3fe3572d6abd660744ceebfe2fa1cc9fabddd0e9a38746')
+source=("https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz")
+sha256sums=('cfa30179b44c582e73cf92c2ad0e54fe49f9fd87f7a0889be9dc2db5802e6aab')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-
-  ./configure \
-    --prefix=/usr \
-    --sbindir=/usr/bin \
-    --mandir=/usr/share/man \
-    --sysconfdir=/etc \
-    --localstatedir=/var/lib \
-    --infodir=/usr/share/info
-
-  make
+	cd "$pkgname-$pkgver"
+
+	if [[ "$CARCH" == "x86_64" ]]; then
+	./configure \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--mandir=/usr/share/man
+	else
+	./configure \
+		--prefix=/usr \
+		--exec-prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--mandir=/usr/share/man \
+		--build-arm
+	fi
+
+	make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+	cd "$pkgname-$pkgver"
+	make DESTDIR="$pkgdir" install
 
-  make DESTDIR=$pkgdir/ install
-
-  rm -Rf $pkgdir/usr/share/info/dir
-
-  # Move init scripts and config to Arch paths
-  mv $pkgdir/etc/sysconfig $pkgdir/etc/conf.d
-
-  # We need system units, not rc scripts
-  rm -Rf "$pkgdir"/etc/init.d/
-  for svcname in bmc-watchdog ipmidetectd ipmiseld ; do
-    install -Dm644 "$srcdir"/${svcname}.service \
-      "$pkgdir"/usr/lib/systemd/system/${svcname}.service
-  done
+	# Move init scripts and config to Arch paths
+	mv "$pkgdir"/etc/sysconfig "$pkgdir"/etc/conf.d
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/bmc-watchdog.service b/bmc-watchdog.service
deleted file mode 100644
index 8ad449a71691..000000000000
--- a/bmc-watchdog.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=BMC Watchdog Timer Daemon
-After=network.target
-
-[Service]
-Type=forking
-EnvironmentFile=-/etc/conf.d/bmc-watchdog
-ExecStart=/usr/bin/bmc-watchdog $OPTIONS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/ipmidetectd.service b/ipmidetectd.service
deleted file mode 100644
index 637060225e7d..000000000000
--- a/ipmidetectd.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=IPMI Node Detection Monitoring Daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/ipmidetectd 
-
-[Install]
-WantedBy=multi-user.target
diff --git a/ipmiseld.service b/ipmiseld.service
deleted file mode 100644
index 1c4caf5df620..000000000000
--- a/ipmiseld.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=IPMI SEL syslog logging daemon
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/ipmiseld 
-
-[Install]
-WantedBy=multi-user.target