Re: [PR PATCH] [Updated] whois: add mkpasswd subpkg

[voidlinux-github@inbox.vuxu.org]

[-- Attachment #1: Type: text/plain, Size: 320 bytes --]

There is an updated pull request by abenson against master on the void-packages repository

https://github.com/abenson/void-packages whois_5.5.0
https://github.com/void-linux/void-packages/pull/13653

whois: add mkpasswd subpkg


A patch file from https://github.com/void-linux/void-packages/pull/13653.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-whois_5.5.0-13653.patch --]
[-- Type: text/x-diff, Size: 2839 bytes --]

From 764596e3066da519e681f5ca9fcb5f4305d6c6a0 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 13 Aug 2019 16:41:29 -0500
Subject: [PATCH 1/2] expect: add mkpasswd alternatives

---
 srcpkgs/expect/template | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/expect/template b/srcpkgs/expect/template
index cc157437666..7128cf049fd 100644
--- a/srcpkgs/expect/template
+++ b/srcpkgs/expect/template
@@ -1,9 +1,10 @@
 # Template file for 'expect'
 pkgname=expect
 version=5.45.4
-revision=1
+revision=2
 wrksrc=${pkgname}${version}
 build_style=gnu-configure
+make_check_target="test"
 makedepends="tcl-devel"
 short_desc="Programmed dialogue with interactive programs"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
@@ -11,13 +12,18 @@ license="Public Domain"
 homepage="http://www.nist.gov/el/msid/expect.cfm"
 distfiles="${SOURCEFORGE_SITE}/${pkgname}/Expect/${version}/${pkgname}${version}.tar.gz"
 checksum=49a7da83b0bdd9f46d04a04deec19c7767bb9a323e40c4781f89caf760b92c34
-make_check_target="test"
 nocross=yes
 
+alternatives="
+	mkpasswd:mkpasswd:/usr/bin/expect-mkpasswd
+	mkpasswd:mkpasswd.1:/usr/share/man/man1/expect-mkpasswd.1"
+
 LDFLAGS+=" -Wl,-rpath=/usr/lib:/usr/lib/${pkgname}${version}"
 
 post_install() {
 	rm ${DESTDIR}/usr/bin/weather
+	mv ${DESTDIR}/usr/bin/{,expect-}mkpasswd
+	mv ${DESTDIR}/usr/share/man/man1/{,expect-}mkpasswd.1
 }
 expect-devel_package() {
 	depends="${sourcepkg}>=${version}_${revision}"

From 798bfccaa78b134522267d7d5b315246ec1368e2 Mon Sep 17 00:00:00 2001
From: Andrew Benson <abenson+void@gmail.com>
Date: Tue, 13 Aug 2019 16:41:46 -0500
Subject: [PATCH 2/2] whois: add mkpasswd subpkg

---
 srcpkgs/mkpasswd       |  1 +
 srcpkgs/whois/template | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/mkpasswd

diff --git a/srcpkgs/mkpasswd b/srcpkgs/mkpasswd
new file mode 120000
index 00000000000..2c656a9178a
--- /dev/null
+++ b/srcpkgs/mkpasswd
@@ -0,0 +1 @@
+whois
\ No newline at end of file
diff --git a/srcpkgs/whois/template b/srcpkgs/whois/template
index 18e28c70bba..d7fb85d1d6d 100644
--- a/srcpkgs/whois/template
+++ b/srcpkgs/whois/template
@@ -1,8 +1,8 @@
 # Template file for 'whois'
 pkgname=whois
 version=5.5.1
-revision=1
 wrksrc=whois
+revision=2
 hostmakedepends="perl pkg-config"
 makedepends="libidn2-devel"
 short_desc="Improved whois client"
@@ -25,3 +25,13 @@ do_install() {
 	mv ${DESTDIR}/usr/bin/{whois,gwhois}
 	mv ${DESTDIR}/usr/share/man/man1/{whois,gwhois}.1
 }
+
+mkpasswd_package() {
+	short_desc="Feature-rich front end to crypt(3) password encryption"
+	alternatives="mkpasswd:mkpasswd:/usr/bin/gmkpasswd
+	 mkpasswd:mkpasswd.1:/usr/share/man/man1/gmkpasswd.1"
+	pkg_install() {
+		vbin mkpasswd gmkpasswd
+		vman mkpasswd.1 gmkpasswd.1
+	}
+}