main/openipmi: upgrade to 2.0.25

3 files changed, 14 insertions, 65 deletions

diff --git a/main/openipmi/APKBUILD b/main/openipmi/APKBUILD
index 8165b270ea..f489092744 100644
--- a/main/openipmi/APKBUILD
+++ b/main/openipmi/APKBUILD
@@ -1,36 +1,20 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openipmi
-pkgver=2.0.22
-pkgrel=2
+pkgver=2.0.25
+pkgrel=0
 pkgdesc="IPMI (Intelligent Platform Management Interface) library and tools"
 url="https://sourceforge.net/projects/openipmi/"
 arch="all"
 license="LGPL-2.0-or-later and GPL-2.0-or-later or BSD"
-depends=""
-depends_dev=""
 makedepends="$depends_dev popt-dev glib-dev net-snmp-dev ncurses-dev
-	libressl-dev"
-install=""
+	libressl-dev linux-headers"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lanserv $pkgname-libs"
 source="http://downloads.sourceforge.net/openipmi/OpenIPMI-$pkgver.tar.gz
-	pthread-pkgconfig.patch
-	stdint.patch
 	"
-
-_builddir="$srcdir"/OpenIPMI-$pkgver
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-	update_config_sub
-}
-
+builddir="$srcdir"/OpenIPMI-$pkgver
 build() {
-	cd "$_builddir"
+	cd "$builddir"
+	update_config_sub
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -40,30 +24,26 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--disable-static \
-		--with-ucdsnmp \
-		|| return 1
-	make || return 1
+		--with-ucdsnmp
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make -j1 DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make -j1 DESTDIR="$pkgdir" install
 }
 
 lanserv() {
 	pkgdesc="Emulates an IPMI network listener"
-	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib || return 1
+	mkdir -p "$subpkgdir"/usr/bin "$subpkgdir"/usr/lib
 	mv "$pkgdir"/etc "$subpkgdir"/ || return 1
-	mv "$pkgdir"/usr/lib/libIPMIlanserv.so.* "$subpkgdir"/usr/lib/ \
-		|| return 1
+	mv "$pkgdir"/usr/lib/libIPMIlanserv.so.* "$subpkgdir"/usr/lib/
 	mv "$pkgdir"/usr/bin/ipmilan \
 		"$pkgdir"/usr/bin/ipmi_sim \
 		"$pkgdir"/usr/bin/sdrcomp \
-		"$subpkgdir"/usr/bin/ || return 1
+		"$subpkgdir"/usr/bin/
 }
 
 
 
-sha512sums="78017fc0b52ce6a83db45f595f50170410120c9f7394429869c177ee40ea5b924bcc0e36bb60f9368a75a2f78ff71c70ae3631ba55a207cfb6eb4f62aa44ff89  OpenIPMI-2.0.22.tar.gz
-8a1f6e784326389eb1aa517283aaca0330ef5b8a6975d4731acbff3cc39e857e38e4510ba851be9347533bef462bb3ce0c20578979b56c8c31d87d901c446bb2  pthread-pkgconfig.patch
-ac0f8506320fa2433244c0a2d7ac46df1ef8f50ab4905e816e6f7953c69327d391182c7807aab8f61547aed24d510ac71ceb8e73c2c65e0e44f072e1ad0f2c9e  stdint.patch"
+sha512sums="5d89deb5d0d0ff44d6f62a9759577dba92aa58c208477e317aecbd01e71ccf7ba0dab138a1d8feff22d523c85d6ceaee9e478e26834ffcd91949b81d2d9c1f86  OpenIPMI-2.0.25.tar.gz"
diff --git a/main/openipmi/pthread-pkgconfig.patch b/main/openipmi/pthread-pkgconfig.patch
deleted file mode 100644
index 9a7620857b..0000000000
--- a/main/openipmi/pthread-pkgconfig.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-468067  - "pkg-config --libs OpenIPMIpthread" fails
-
-Fix the pkgconfig file.
-
-Reported upstream as http://sourceforge.net/tracker/index.php?func=detail&aid=2188750&group_id=36127&atid=416301
-
-diff -up OpenIPMI-2.0.18/OpenIPMIpthread.pc.in.orig OpenIPMI-2.0.18/OpenIPMIpthread.pc.in
---- OpenIPMI-2.0.18/OpenIPMIpthread.pc.in.orig	2005-08-17 05:56:02.000000000 +0200
-+++ OpenIPMI-2.0.18/OpenIPMIpthread.pc.in	2010-05-20 15:48:07.000000000 +0200
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: OpenIPMIpthread
- Description: Pthread OS handler for OpenIPMI
- Version: @VERSION@
--Requires: OpenIPMI pthread
-+Requires: OpenIPMI
- Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread
--Cflags: -I${includedir}
-+Cflags: -I${includedir} -pthread
diff --git a/main/openipmi/stdint.patch b/main/openipmi/stdint.patch
deleted file mode 100644
index 5def30aad1..0000000000
--- a/main/openipmi/stdint.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/ui/ui.c b/ui/ui.c
-index 8dcb41d..7dc7284 100644
---- a/ui/ui.c
-+++ b/ui/ui.c
-@@ -337,7 +337,7 @@ get_uint(char **toks, unsigned int *val, char *errstr)
- static int
- get_ip_addr(char **toks, struct in_addr *ip_addr, char *errstr)
- {
--    u_int32_t     addr;
-+    uint32_t      addr;
-     unsigned char val;
-     char          *str, *tmpstr, *istr;
-     char          *ntok;