# HG changeset patch
# User David Demelier <markand@malikania.fr>
# Date 1636612199 -3600
# Node ID 5dd427fff12eae2515f928a5fb335521bf95a2df
# Parent  5e4b7e6fe8ed9b57e5ecddf431d4ec0559ff0867
core/kbd: upgrade to 2.4.0

diff -r 5e4b7e6fe8ed -r 5dd427fff12e core/kbd/kbd.sh
--- a/core/kbd/kbd.sh	Thu Nov 11 07:28:44 2021 +0100
+++ b/core/kbd/kbd.sh	Thu Nov 11 07:29:59 2021 +0100
@@ -16,13 +16,14 @@
 #
 
 PKGNAME=kbd
-PKGVERSION=2.0.4
+PKGVERSION=2.4.0
 PKGREVISION=1
-PKGLICENSE="GPL-2.0-only+"
+PKGLICENSE="GPL-2.0-or-later"
 PKGSUMMARY="console configuration tools"
+PKGWWW="https://kbd-project.org"
 PKGDOWNLOAD="https://www.kernel.org/pub/linux/utils/$PKGNAME/$PKGNAME-$PKGVERSION.tar.gz"
 PKGDEPENDS="linux-headers"
-PKGOPTIONS="NLS"
+PKGOPTIONS="NLS PAM"
 
 : ${CHOST:=$(uname -m)-linux-musl}
 : ${CBUILD:=$(uname -m)-linux-musl}
@@ -30,7 +31,8 @@
 : ${CFLAGS:=-O2}
 : ${LDFLAGS:=}
 : ${LIBS:=}
-: ${NLS:=}
+: ${NLS:=yes}
+: ${PAM:=yes}
 
 if [ "$NLS" = "yes" ]; then
 	PKGDEPENDS="gettext $PKGDEPENDS"
@@ -39,13 +41,19 @@
 	with_nls="--disable-nls"
 fi
 
+if [ "$PAM" = "yes" ]; then
+	PKGDEPENDS="linux-pam $PKGDEPENDS"
+	with_pam="--enable-vlock"
+else
+	with_pam="--disable-vlock"
+fi
+
 build()
 {
 	rm -rf $PKGNAME-$PKGVERSION
-	tar xvf $PKGNAME-$PKGVERSION.tar.gz
+	tar -xvf $PKGNAME-$PKGVERSION.tar.gz
 	cd $PKGNAME-$PKGVERSION
 
-	# disable vlock until we get PAM.
 	CC="$CC" \
 	CFLAGS="$CFLAGS" \
 	LDFLAGS="$LDFLAGS" \
@@ -55,8 +63,9 @@
 		--host=$CHOST \
 		--prefix= \
 		--enable-shared \
-		--disable-vlock \
-		$with_nls
+		--disable-tests \
+		$with_nls \
+		$with_pam
 	make
 	make install DESTDIR=$DESTDIR
 
diff -r 5e4b7e6fe8ed -r 5dd427fff12e core/kbd/kbd.sha1
--- a/core/kbd/kbd.sha1	Thu Nov 11 07:28:44 2021 +0100
+++ b/core/kbd/kbd.sha1	Thu Nov 11 07:29:59 2021 +0100
@@ -1,1 +1,1 @@
-574c787fc11a3a40b8a490379f61874fdc9f399f  kbd-2.0.4.tar.gz
+f9560d7620d8b709a6b92544979a0756d7de12fb  kbd-2.4.0.tar.gz