Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/pam-u2f PR/55747: Tobias Nygren: Install manpag...



details:   https://anonhg.NetBSD.org/src/rev/336873e6fac5
branches:  trunk
changeset: 945695:336873e6fac5
user:      khorben <khorben%NetBSD.org@localhost>
date:      Wed Nov 04 13:46:46 2020 +0000

description:
PR/55747: Tobias Nygren: Install manpages for pam-u2f

I have added a Makefile rule, indicating how to generate the manual
pages again. It has no dependency on the original file, in order to
avoid issues when building: the generation depends in asciidoc and
libxslt, which are not in tools or in the base tree anyway. It should
therefore never trigger, but should be used by the maintainer when
updating pam-u2f.

With this, I believe this PR can be closed.

Tested with "build.sh release" on amd64.

diffstat:

 external/bsd/pam-u2f/bin/pamu2fcfg/Makefile        |  7 ++++++-
 external/bsd/pam-u2f/lib/security/pam-u2f/Makefile |  7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r f1daecf035a6 -r 336873e6fac5 external/bsd/pam-u2f/bin/pamu2fcfg/Makefile
--- a/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile       Wed Nov 04 13:40:20 2020 +0000
+++ b/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile       Wed Nov 04 13:46:46 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2020/11/02 06:40:11 khorben Exp $
+# $NetBSD: Makefile,v 1.4 2020/11/04 13:46:46 khorben Exp $
 
 .include <bsd.own.mk>
 
@@ -22,4 +22,9 @@
 LDADD+=-lpam -lfido2 -lcbor -lusbhid -lcrypto -lm
 DPADD+=${LIBPAM} ${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBCRYPTO} ${LIBM}
 
+pamu2fcfg.1:
+       asciidoc -b docbook45 -d manpage -o pamu2fcfg.1.xml ../../dist/man/pamu2fcfg.1.txt
+       xsltproc --nonet --xinclude -o pamu2fcfg.1 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' pamu2fcfg.1.xml
+       rm -f pamu2fcfg.1.xml
+
 .include <bsd.prog.mk>
diff -r f1daecf035a6 -r 336873e6fac5 external/bsd/pam-u2f/lib/security/pam-u2f/Makefile
--- a/external/bsd/pam-u2f/lib/security/pam-u2f/Makefile        Wed Nov 04 13:40:20 2020 +0000
+++ b/external/bsd/pam-u2f/lib/security/pam-u2f/Makefile        Wed Nov 04 13:46:46 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2020/11/02 06:40:11 khorben Exp $
+# $NetBSD: Makefile,v 1.5 2020/11/04 13:46:46 khorben Exp $
 
 .include <bsd.own.mk>
 .PATH: ${NETBSDSRCDIR}/external/bsd/pam-u2f/dist
@@ -18,4 +18,9 @@
        crypto  ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \
        m       ${NETBSDSRCDIR}/lib/libm
 
+pam_u2f.8:
+       asciidoc -b docbook45 -d manpage -o pam_u2f.8.xml ../../../dist/man/pam_u2f.8.txt
+       xsltproc --nonet --xinclude -o pam_u2f.8 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' pam_u2f.8.xml
+       rm -f pam_u2f.8.xml
+
 .include "${NETBSDSRCDIR}/lib/libpam/modules/mod.mk"



Home | Main Index | Thread Index | Old Index