From 3c99fa62f9dd8979d8d9d15095e9111205c5649d Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Fri, 8 Mar 2019 02:31:05 +0000
Subject: system/lvm2: bump to 2.03.02, modernise

---
 system/lvm2/APKBUILD | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(limited to 'system/lvm2/APKBUILD')

diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD
index 94319c098..efb73d48f 100644
--- a/system/lvm2/APKBUILD
+++ b/system/lvm2/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=lvm2
-pkgver=2.02.181
+pkgver=2.03.02
 pkgrel=0
 pkgdesc="Logical Volume Manager 2 utilities"
 url="https://sourceware.org/lvm2/"
@@ -32,14 +32,11 @@ subpackages="
 	device-mapper-libs:dm_libs
 	device-mapper-event-libs:dm_event_libs
 	$pkgname-libs
-	$pkgname-extra::noarch
 	"
 
 builddir="$srcdir/LVM2.$pkgver"
 
 build () {
-	cd "$builddir"
-
 	# during cross-compilation malloc test goes wrong
 	export ac_cv_func_malloc_0_nonnull=yes
 	export ac_cv_func_realloc_0_nonnull=yes
@@ -54,20 +51,17 @@ build () {
 		--localstatedir=/var \
 		--disable-readline \
 		--enable-pkgconfig \
-		--enable-applib \
 		--with-thin=internal \
 		--enable-dmeventd \
 		--enable-cmdlib \
 		--with-thin-check=/sbin/thin_check \
 		--with-thin-dump=/sbin/thin_dump \
 		--with-thin-repair=/sbin/thin_repair \
-		--with-dmeventd-path=/sbin/dmeventd \
-		CLDFLAGS="$LDFLAGS"
+		--with-dmeventd-path=/sbin/dmeventd
 	make
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 	install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup
 	install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm
@@ -111,17 +105,7 @@ dm_event_libs() {
 	mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/
 }
 
-extra() {
-	pkgdesc="LVM2 extra utilities"
-	depends="bash coreutils"
-	local util
-	for util in sbin/lvmdump sbin/lvmconf sbin/fsadm sbin/blkdeactivate; do
-		mkdir -p "$subpkgdir/${util%/*}"
-		mv $pkgdir/$util $subpkgdir/$util
-	done
-}
-
-sha512sums="599d992823510e27f3ec3ceaf0d2332402b731afc0d2df88096ab55ed98dba8c3bdc5408d51b9f5b0ffbbb9ac3760ee37b878a0f36ab379449dc076c58e59511  LVM2.2.02.181.tgz
+sha512sums="b8ccd96a98bee36272492ed056aa0bd65e074e476f29d6e5562ff4604a18326cbf40a7948f2c37d8d4758a1403c3c98106f2698e1e2ba5e014e4cb91aeb3cf90  LVM2.2.03.02.tgz
 6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9  fix-stdio-usage.patch
 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408  mallinfo.patch
 33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2  library_dir-default-config.patch
-- 
cgit v1.2.3-60-g2f50