Wed Nov 4 13:46:46 2020 UTC ()
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.


(khorben)
diff -r1.3 -r1.4 src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile
diff -r1.4 -r1.5 src/external/bsd/pam-u2f/lib/security/pam-u2f/Makefile
cvs diff -r1.3 -r1.4 src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile (expand / switch to unified diff)

--- src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile 2020/11/02 06:40:11 1.3
+++ src/external/bsd/pam-u2f/bin/pamu2fcfg/Makefile 2020/11/04 13:46:46 1.4
@@ -1,25 +1,30 @@ @@ -1,25 +1,30 @@
1# $NetBSD: Makefile,v 1.3 2020/11/02 06:40:11 khorben Exp $ 1# $NetBSD: Makefile,v 1.4 2020/11/04 13:46:46 khorben Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5DIST=${NETBSDSRCDIR}/external/bsd/pam-u2f/dist 5DIST=${NETBSDSRCDIR}/external/bsd/pam-u2f/dist
6 6
7.PATH: ${DIST} ${DIST}/pamu2fcfg 7.PATH: ${DIST} ${DIST}/pamu2fcfg
8 8
9CFFILE=${DIST}/configure.ac 9CFFILE=${DIST}/configure.ac
10PACKAGE!= ${TOOL_SED} -ne 's/AC_INIT(\[\([a-zA-Z0-9_-]*\)\].*/\1/p' ${CFFILE} 10PACKAGE!= ${TOOL_SED} -ne 's/AC_INIT(\[\([a-zA-Z0-9_-]*\)\].*/\1/p' ${CFFILE}
11VERSION!= ${TOOL_SED} -ne 's/AC_INIT(\[[a-zA-Z0-9_-]*\], \[\([0-9.]*\)\].*/\1/p' ${CFFILE} 11VERSION!= ${TOOL_SED} -ne 's/AC_INIT(\[[a-zA-Z0-9_-]*\], \[\([0-9.]*\)\].*/\1/p' ${CFFILE}
12 12
13CPPFLAGS+= -I${DIST} -I${.CURDIR} 13CPPFLAGS+= -I${DIST} -I${.CURDIR}
14CPPFLAGS+= -DPACKAGE='"${PACKAGE}"' -DVERSION='"${VERSION}"' 14CPPFLAGS+= -DPACKAGE='"${PACKAGE}"' -DVERSION='"${VERSION}"'
15CPPFLAGS+= -DHAVE_UNISTD_H 15CPPFLAGS+= -DHAVE_UNISTD_H
16 16
17BINDIR=/usr/bin 17BINDIR=/usr/bin
18PROG=pamu2fcfg 18PROG=pamu2fcfg
19SRCS=pamu2fcfg.c cmdline.c b64.c readpassphrase.c explicit_bzero.c util.c 19SRCS=pamu2fcfg.c cmdline.c b64.c readpassphrase.c explicit_bzero.c util.c
20COPTS.util.c += -Wno-error=stack-protector 20COPTS.util.c += -Wno-error=stack-protector
21 21
22LDADD+=-lpam -lfido2 -lcbor -lusbhid -lcrypto -lm 22LDADD+=-lpam -lfido2 -lcbor -lusbhid -lcrypto -lm
23DPADD+=${LIBPAM} ${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBCRYPTO} ${LIBM} 23DPADD+=${LIBPAM} ${LIBFIDO2} ${LIBCBOR} ${LIBUSBHID} ${LIBCRYPTO} ${LIBM}
24 24
 25pamu2fcfg.1:
 26 asciidoc -b docbook45 -d manpage -o pamu2fcfg.1.xml ../../dist/man/pamu2fcfg.1.txt
 27 xsltproc --nonet --xinclude -o pamu2fcfg.1 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' pamu2fcfg.1.xml
 28 rm -f pamu2fcfg.1.xml
 29
25.include <bsd.prog.mk> 30.include <bsd.prog.mk>
cvs diff -r1.4 -r1.5 src/external/bsd/pam-u2f/lib/security/pam-u2f/Makefile (expand / switch to unified diff)

--- src/external/bsd/pam-u2f/lib/security/pam-u2f/Makefile 2020/11/02 06:40:11 1.4
+++ src/external/bsd/pam-u2f/lib/security/pam-u2f/Makefile 2020/11/04 13:46:46 1.5
@@ -1,21 +1,26 @@ @@ -1,21 +1,26 @@
1# $NetBSD: Makefile,v 1.4 2020/11/02 06:40:11 khorben Exp $ 1# $NetBSD: Makefile,v 1.5 2020/11/04 13:46:46 khorben Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4.PATH: ${NETBSDSRCDIR}/external/bsd/pam-u2f/dist 4.PATH: ${NETBSDSRCDIR}/external/bsd/pam-u2f/dist
5 5
6CPPFLAGS+= -DHAVE_SECURITY_PAM_APPL_H #-DHAVE_SECURITY_PAM_MODULES_H 6CPPFLAGS+= -DHAVE_SECURITY_PAM_APPL_H #-DHAVE_SECURITY_PAM_MODULES_H
7#CPPFLAGS+= -DPAM_DEBUG -DDEBUG_PAM 7#CPPFLAGS+= -DPAM_DEBUG -DDEBUG_PAM
8 8
9LIB= pam_u2f 9LIB= pam_u2f
10SRCS= pam-u2f.c drop_privs.c util.c b64.c explicit_bzero.c 10SRCS= pam-u2f.c drop_privs.c util.c b64.c explicit_bzero.c
11MAN= pam_u2f.8 11MAN= pam_u2f.8
12 12
13COPTS.util.c += -Wno-error=stack-protector 13COPTS.util.c += -Wno-error=stack-protector
14 14
15LIBDPLIBS+= \ 15LIBDPLIBS+= \
16 fido2 ${NETBSDSRCDIR}/external/bsd/libfido2/lib \ 16 fido2 ${NETBSDSRCDIR}/external/bsd/libfido2/lib \
17 cbor ${NETBSDSRCDIR}/external/mit/libcbor/lib \ 17 cbor ${NETBSDSRCDIR}/external/mit/libcbor/lib \
18 crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \ 18 crypto ${NETBSDSRCDIR}/crypto/external/bsd/${EXTERNAL_OPENSSL_SUBDIR}/lib/libcrypto \
19 m ${NETBSDSRCDIR}/lib/libm 19 m ${NETBSDSRCDIR}/lib/libm
20 20
 21pam_u2f.8:
 22 asciidoc -b docbook45 -d manpage -o pam_u2f.8.xml ../../../dist/man/pam_u2f.8.txt
 23 xsltproc --nonet --xinclude -o pam_u2f.8 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' pam_u2f.8.xml
 24 rm -f pam_u2f.8.xml
 25
21.include "${NETBSDSRCDIR}/lib/libpam/modules/mod.mk" 26.include "${NETBSDSRCDIR}/lib/libpam/modules/mod.mk"