Module Name: pkgsrc-wip
Committed By: Sijmen J. Mulder <sjmulder%NetBSD.org@localhost>
Pushed By: sjmulder
Date: Fri Aug 6 01:02:52 2021 +0200
Changeset: 1a1965f491e9915a104dcb3ac278bc5b4ff92786
Modified Files:
lvm2/Makefile
lvm2/PLIST
lvm2/buildlink3.mk
lvm2/distinfo
lvm2/patches/patch-configure
Log Message:
lvm2: Update to 2.03.12
Adds libaio dependency!
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a1965f491e9915a104dcb3ac278bc5b4ff92786
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
lvm2/Makefile | 7 ++++---
lvm2/PLIST | 24 +++++++++++++++++++-----
lvm2/buildlink3.mk | 2 +-
lvm2/distinfo | 10 +++++-----
lvm2/patches/patch-configure | 32 +++++++-------------------------
5 files changed, 36 insertions(+), 39 deletions(-)
diffs:
diff --git a/lvm2/Makefile b/lvm2/Makefile
index 8c9fb990dd..d644054245 100644
--- a/lvm2/Makefile
+++ b/lvm2/Makefile
@@ -1,13 +1,13 @@
# $NetBSD: Makefile,v 1.1 2016/07/08 09:09:47 kamil Exp $
-DISTNAME= LVM2.2.02.98
+DISTNAME= LVM2.2.03.12
PKGNAME= ${DISTNAME:S/LVM2./lvm2-/}
CATEGORIES= sysutils
-MASTER_SITES= ftp://sources.redhat.com/pub/lvm2/
+MASTER_SITES= ftp://sourceware.org/pub/lvm2/
EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://sources.redhat.com/lvm2
+HOMEPAGE= https://www.sourceware.org/lvm2/
COMMENT= Linux userspace toolset for volume management facilities
LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
@@ -20,4 +20,5 @@ PKGCONFIG_OVERRIDE+= daemons/dmeventd/libdevmapper-event.pc.in
PKGCONFIG_OVERRIDE+= libdm/libdevmapper.pc.in
PKGCONFIG_OVERRIDE+= liblvm/liblvm2app.pc.in
+.include "../../wip/libaio/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lvm2/PLIST b/lvm2/PLIST
index 528465ad4b..0d1052ca94 100644
--- a/lvm2/PLIST
+++ b/lvm2/PLIST
@@ -1,19 +1,30 @@
-@comment $NetBSD: PLIST,v 1.1 2016/07/08 09:09:47 kamil Exp $
+@comment $NetBSD$
include/libdevmapper.h
lib/libdevmapper.so
lib/libdevmapper.so.1.02
man/man5/lvm.conf.5
+man/man7/lvmcache.7
+man/man7/lvmraid.7
+man/man7/lvmreport.7
+man/man7/lvmsystemid.7
+man/man7/lvmthin.7
+man/man7/lvmvdo.7
man/man8/blkdeactivate.8
man/man8/dmsetup.8
+man/man8/dmstats.8
man/man8/fsadm.8
man/man8/lvchange.8
man/man8/lvconvert.8
man/man8/lvcreate.8
man/man8/lvdisplay.8
man/man8/lvextend.8
+man/man8/lvm-config.8
+man/man8/lvm-dumpconfig.8
+man/man8/lvm-fullreport.8
+man/man8/lvm-lvpoll.8
man/man8/lvm.8
-man/man8/lvmchange.8
-man/man8/lvmconf.8
+man/man8/lvmconfig.8
+man/man8/lvmdevices.8
man/man8/lvmdiskscan.8
man/man8/lvmdump.8
man/man8/lvmsadc.8
@@ -44,6 +55,7 @@ man/man8/vgexport.8
man/man8/vgextend.8
man/man8/vgimport.8
man/man8/vgimportclone.8
+man/man8/vgimportdevices.8
man/man8/vgmerge.8
man/man8/vgmknodes.8
man/man8/vgreduce.8
@@ -54,6 +66,7 @@ man/man8/vgscan.8
man/man8/vgsplit.8
sbin/blkdeactivate
sbin/dmsetup
+sbin/dmstats
sbin/fsadm
sbin/lvchange
sbin/lvconvert
@@ -61,8 +74,8 @@ sbin/lvcreate
sbin/lvdisplay
sbin/lvextend
sbin/lvm
-sbin/lvmchange
-sbin/lvmconf
+sbin/lvmconfig
+sbin/lvmdevices
sbin/lvmdiskscan
sbin/lvmdump
sbin/lvmsadc
@@ -93,6 +106,7 @@ sbin/vgexport
sbin/vgextend
sbin/vgimport
sbin/vgimportclone
+sbin/vgimportdevices
sbin/vgmerge
sbin/vgmknodes
sbin/vgreduce
diff --git a/lvm2/buildlink3.mk b/lvm2/buildlink3.mk
index b098d376e1..4c11b74ea0 100644
--- a/lvm2/buildlink3.mk
+++ b/lvm2/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+= lvm2
.if !defined(LVM2_BUILDLINK3_MK)
LVM2_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.lvm2+= lvm2>=2.02.98
+BUILDLINK_API_DEPENDS.lvm2+= lvm2>=2.03.12
BUILDLINK_PKGSRCDIR.lvm2?= ../../sysutils/lvm2
.endif # LVM2_BUILDLINK3_MK
diff --git a/lvm2/distinfo b/lvm2/distinfo
index 237d1ffdb9..46708444e9 100644
--- a/lvm2/distinfo
+++ b/lvm2/distinfo
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.1 2016/07/08 09:09:47 kamil Exp $
-SHA1 (LVM2.2.02.98.tgz) = 077425115b164c335a9930df745943e9ea666a8a
-RMD160 (LVM2.2.02.98.tgz) = acd22f3315dc903d5d599cefbb30272ac8dc33ee
-SHA512 (LVM2.2.02.98.tgz) = 9dd1f98f47af1724a2ff64c6d728a03254c46a499a21d48d305a34ae5728ff7b51ef4d32646a96e424c21a44fc8abc87ab5a25e59fcb75beabbf0d3446e41d7b
-Size (LVM2.2.02.98.tgz) = 1227919 bytes
-SHA1 (patch-configure) = b56244369c4789de8cf33d11c515e916aae3a32b
+SHA1 (LVM2.2.03.12.tgz) = 6d74d987b474dd0b45f239eb6dcc050622ad6962
+RMD160 (LVM2.2.03.12.tgz) = 997e07fd3ff78a81987d607337dffdd817e82546
+SHA512 (LVM2.2.03.12.tgz) = e4d3bfb38b346251a2ea2cee7b79f2e12ed407652b659b35b65f58c8bb252943cee1c511713aeec8ff3400790e0e99ea6b83e8740050defe5cbb118f18bf7700
+Size (LVM2.2.03.12.tgz) = 2594040 bytes
+SHA1 (patch-configure) = ce48968f66d7a6ec4997da43ad3ef835615d9aea
diff --git a/lvm2/patches/patch-configure b/lvm2/patches/patch-configure
index f083d1d5bb..a8b1e3e04a 100644
--- a/lvm2/patches/patch-configure
+++ b/lvm2/patches/patch-configure
@@ -2,32 +2,14 @@ $NetBSD: patch-configure,v 1.1 2016/07/08 09:09:47 kamil Exp $
Fix unportable shell constructs.
---- configure.orig 2012-10-15 14:24:58.000000000 +0000
+--- configure.orig 2021-05-07 21:14:09.000000000 +0000
+++ configure
-@@ -9259,7 +9259,7 @@ $as_echo "no" >&6; }
- fi
+@@ -12956,7 +12956,7 @@ done
-- if test x$PYTHON == xnotfound; then
-+ if test x$PYTHON = xnotfound; then
- as_fn_error $? "python is required for --enable-python_bindings but cannot be found
- " "$LINENO" 5
- fi
-@@ -9305,7 +9305,7 @@ $as_echo "no" >&6; }
- fi
+ ################################################################################
+-if test "$EDITLINE" == yes; then
++if test "$EDITLINE" = yes; then
-
-- if test x$PYTHON_CONFIG == xnotfound; then
-+ if test x$PYTHON_CONFIG = xnotfound; then
- as_fn_error $? "python headers are required for --enable-python_bindings but cannot be found
- " "$LINENO" 5
- fi
-@@ -10040,7 +10040,7 @@ $as_echo "no" >&6; }
- fi
-
-
-- if [ "x$MSGFMT" == x ];
-+ if [ "x$MSGFMT" = x ];
- then as_fn_error $? "msgfmt not found in path $PATH
- " "$LINENO" 5
- fi;
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EDITLINE" >&5