Module Name:    src
Committed By:   agc
Date:           Sun May  6 17:57:11 UTC 2012

Added Files:
        src/crypto/external/bsd/netpgp/bin/hkpc [agc-netpgp-standalone]:
            Makefile
        src/crypto/external/bsd/netpgp/bin/hkpd [agc-netpgp-standalone]:
            Makefile
        src/crypto/external/bsd/netpgp/bin/netpgp [agc-netpgp-standalone]:
            Makefile
        src/crypto/external/bsd/netpgp/bin/netpgpkeys [agc-netpgp-standalone]:
            Makefile
        src/crypto/external/bsd/netpgp/bin/netpgpverify [agc-netpgp-standalone]:
            Makefile
        src/crypto/external/bsd/netpgp/bin/pgp2ssh [agc-netpgp-standalone]:
            Makefile

Log Message:
reachover build infrastructure for standalone version of netpgp


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/bin/hkpd/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
    src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
    src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
cvs rdiff -u -r0 -r1.1.2.1 \
    src/crypto/external/bsd/netpgp/bin/pgp2ssh/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/crypto/external/bsd/netpgp/bin/hkpc/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/hkpc/Makefile:1.1.2.1
--- /dev/null	Sun May  6 17:57:11 2012
+++ src/crypto/external/bsd/netpgp/bin/hkpc/Makefile	Sun May  6 17:57:11 2012
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1.2.1 2012/05/06 17:57:11 agc Exp $
+
+.include <bsd.own.mk>
+
+PROG=hkpc
+BINDIR=/usr/bin
+SRCS=hkpc.c main.c
+
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
+DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!=	cd ${.CURDIR}/../../lib/mj && ${PRINTOBJDIR}
+LDADD+=		-L${LIBMJDIR} -lmj
+DPADD+=		${LIBMJDIR}/libmj.a
+
+LDADD+=		-lz -lbz2
+DPADD+=		${LIBZ} ${LIBBZ2}
+
+WARNS=0
+MAN=hkpc.1
+
+EXTDIST=	${.CURDIR}/../../dist/src/hkpclient
+.PATH:		${EXTDIST}/src/hkpclient
+
+.include <bsd.prog.mk>

Index: src/crypto/external/bsd/netpgp/bin/hkpd/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/hkpd/Makefile:1.1.2.1
--- /dev/null	Sun May  6 17:57:11 2012
+++ src/crypto/external/bsd/netpgp/bin/hkpd/Makefile	Sun May  6 17:57:11 2012
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.1.2.1 2012/05/06 17:57:11 agc Exp $
+
+.include <bsd.own.mk>
+
+PROG=hkpd
+BINDIR=/usr/sbin
+SRCS=hkpd.c main.c
+
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
+DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!=	cd ${.CURDIR}/../../lib/mj && ${PRINTOBJDIR}
+LDADD+=		-L${LIBMJDIR} -lmj
+DPADD+=		${LIBMJDIR}/libmj.a
+
+LIBNETRSADIR!=	cd ${.CURDIR}/../../lib/rsa && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETRSADIR} -lnetpgprsa
+DPADD+=		${LIBNETRSADIR}/libnetpgprsa.a
+
+LIBNETBNDIR!=	cd ${.CURDIR}/../../lib/bn && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETBNDIR} -lnetpgpbn
+DPADD+=		${LIBNETBNDIR}/libnetpgpbn.a
+
+LIBNETCIPHERDIR!=	cd ${.CURDIR}/../../lib/cipher && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETCIPHERDIR} -lnetpgpcipher
+DPADD+=		${LIBNETCIPHERDIR}/libnetpgpcipher.a
+
+LIBNETPGPVERIFYDIR!=	cd ${.CURDIR}/../../lib/verify && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPVERIFYDIR} -lnetpgpverify
+DPADD+=		${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
+
+LDADD+=		-lz -lbz2
+DPADD+=		${LIBZ} ${LIBBZ2}
+
+MAN=hkpd.1
+WARNS=0 # anything over 0 will fail at the link stage with IDEA errors
+
+EXTDIST=	${.CURDIR}/../dist/src/hkpd
+.PATH:		${EXTDIST}/src/hkpd
+
+.include <bsd.prog.mk>
+
+t: ${PROG}
+	./${PROG} -D &
+	sleep 1
+	ftp -o- 'http://localhost:11371/pks/lookup?op=index&search=agc&options=json'
+	ftp -o- 'http://localhost:11371/pks/lookup?op=get&search=agc&options=json'
+	ftp -o- 'http://localhost:11371/pks/lookup?op=get&search=agc&options=mr'
+	pkill hkpd

Index: src/crypto/external/bsd/netpgp/bin/netpgp/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/netpgp/Makefile:1.1.2.1
--- /dev/null	Sun May  6 17:57:11 2012
+++ src/crypto/external/bsd/netpgp/bin/netpgp/Makefile	Sun May  6 17:57:11 2012
@@ -0,0 +1,50 @@
+#	$NetBSD: Makefile,v 1.1.2.1 2012/05/06 17:57:11 agc Exp $
+
+.include <bsd.own.mk>
+
+PROG=		netpgp
+BINDIR=		/usr/bin
+
+CPPFLAGS+=	-I${EXTDIST}/include
+
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
+DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
+
+LIBNETPGPVERIFYDIR!=	cd ${.CURDIR}/../../lib/verify && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPVERIFYDIR} -lnetpgpverify
+DPADD+=		${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
+
+LIBNETCIPHERDIR!=	cd ${.CURDIR}/../../lib/cipher && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETCIPHERDIR} -lnetpgpcipher
+DPADD+=		${LIBNETCIPHERDIR}/libnetpgpcipher.a
+
+LIBNETRSADIR!=	cd ${.CURDIR}/../../lib/rsa && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETRSADIR} -lnetpgprsa
+DPADD+=		${LIBNETRSADIR}/libnetpgprsa.a
+
+LIBNETBNDIR!=	cd ${.CURDIR}/../../lib/bn && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETBNDIR} -lnetpgpbn
+DPADD+=		${LIBNETBNDIR}/libnetpgpbn.a
+
+LIBMJDIR!=	cd ${.CURDIR}/../../lib/mj && ${PRINTOBJDIR}
+LDADD+=		-L${LIBMJDIR} -lmj
+DPADD+=		${LIBMJDIR}/libmj.a
+
+# XXX
+#LIBNETBNDIR!=	cd ${.CURDIR}/../libnetbn && ${PRINTOBJDIR}
+#LDADD+=		-L${LIBNETBNDIR} -lnetbn
+#DPADD+=		${LIBNETBNDIR}/libnetbn.a
+#LDADD+=		-lnetpgpverify -lnetcipher -lnetbn
+
+LDADD+=		-lz -lbz2
+DPADD+=		${LIBZ} ${LIBBZ2}
+
+MAN=		netpgp.1
+
+WARNS=		4
+
+EXTDIST=	${.CURDIR}/../../dist
+.PATH:		${EXTDIST}/src/netpgp
+
+.include <bsd.prog.mk>

Index: src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile:1.1.2.1
--- /dev/null	Sun May  6 17:57:11 2012
+++ src/crypto/external/bsd/netpgp/bin/netpgpkeys/Makefile	Sun May  6 17:57:11 2012
@@ -0,0 +1,43 @@
+#	$NetBSD: Makefile,v 1.1.2.1 2012/05/06 17:57:11 agc Exp $
+
+.include <bsd.own.mk>
+
+PROG=		netpgpkeys
+SRCS=		netpgpkeys.c
+BINDIR=		/usr/bin
+
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
+DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
+
+LIBNETPGPVERIFYDIR!=	cd ${.CURDIR}/../../lib/verify && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPVERIFYDIR} -lnetpgpverify
+DPADD+=		${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
+
+LIBNETCIPHERDIR!=	cd ${.CURDIR}/../../lib/cipher && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETCIPHERDIR} -lnetpgpcipher
+DPADD+=		${LIBNETCIPHERDIR}/libnetpgpcipher.a
+
+LIBNETRSADIR!=	cd ${.CURDIR}/../../lib/rsa && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETRSADIR} -lnetpgprsa
+DPADD+=		${LIBNETRSADIR}/libnetpgprsa.a
+
+LIBNETBNDIR!=	cd ${.CURDIR}/../../lib/bn && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETBNDIR} -lnetpgpbn
+DPADD+=		${LIBNETBNDIR}/libnetpgpbn.a
+
+LIBMJDIR!=	cd ${.CURDIR}/../../lib/mj && ${PRINTOBJDIR}
+LDADD+=		-L${LIBMJDIR} -lmj
+DPADD+=		${LIBMJDIR}/libmj.a
+
+LDADD+=		-lz -lbz2
+DPADD+=		${LIBZ} ${LIBBZ2}
+
+MAN=		netpgpkeys.1
+
+WARNS=		4
+
+EXTDIST=	${.CURDIR}/../../dist
+.PATH:		${EXTDIST}/src/netpgpkeys
+
+.include <bsd.prog.mk>

Index: src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile:1.1.2.1
--- /dev/null	Sun May  6 17:57:11 2012
+++ src/crypto/external/bsd/netpgp/bin/netpgpverify/Makefile	Sun May  6 17:57:11 2012
@@ -0,0 +1,47 @@
+#	$NetBSD: Makefile,v 1.1.2.1 2012/05/06 17:57:11 agc Exp $
+
+.include <bsd.own.mk>
+
+PROG=		netpgpverify
+BINDIR=		/usr/bin
+SRCS=		verify.c
+
+CPPFLAGS+=	-I${EXTDIST}/include -I${.CURDIR}/../../lib/netpgp
+CPPFLAGS+=	-I${EXTDIST}/src/libbn
+CPPFLAGS+=	-I${EXTDIST}/src/librsa
+
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
+DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
+
+LIBNETPGPVERIFYDIR!=	cd ${.CURDIR}/../../lib/verify && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPVERIFYDIR} -lnetpgpverify
+DPADD+=		${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
+
+LIBNETCIPHERDIR!=	cd ${.CURDIR}/../../lib/cipher && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETCIPHERDIR} -lnetpgpcipher
+DPADD+=		${LIBNETCIPHERDIR}/libnetpgpcipher.a
+
+LIBNETRSADIR!=	cd ${.CURDIR}/../../lib/rsa && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETRSADIR} -lnetpgprsa
+DPADD+=		${LIBNETRSADIR}/libnetpgprsa.a
+
+LIBNETBNDIR!=	cd ${.CURDIR}/../../lib/bn && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETBNDIR} -lnetpgpbn
+DPADD+=		${LIBNETBNDIR}/libnetpgpbn.a
+
+LIBMJDIR!=	cd ${.CURDIR}/../../lib/mj && ${PRINTOBJDIR}
+LDADD+=		-L${LIBMJDIR} -lmj
+DPADD+=		${LIBMJDIR}/libmj.a
+
+LDADD+=		-lz -lbz2
+DPADD+=		${LIBZ} ${LIBBZ2}
+
+MAN=		netpgpverify.1
+
+WARNS=		4
+
+EXTDIST=	${.CURDIR}/../../dist
+.PATH:		${EXTDIST}/src/netpgpverify ${EXTDIST}/src/libnetpgp
+
+.include <bsd.prog.mk>

Index: src/crypto/external/bsd/netpgp/bin/pgp2ssh/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/bin/pgp2ssh/Makefile:1.1.2.1
--- /dev/null	Sun May  6 17:57:12 2012
+++ src/crypto/external/bsd/netpgp/bin/pgp2ssh/Makefile	Sun May  6 17:57:11 2012
@@ -0,0 +1,44 @@
+#	$NetBSD: Makefile,v 1.1.2.1 2012/05/06 17:57:11 agc Exp $
+
+.include <bsd.own.mk>
+
+PROG=		pgp2ssh
+BINDIR=		/usr/bin
+
+SRCS=		b64.c hkpc.c main.c
+CPPFLAGS+=	-I${.CURDIR}/../dist/include -I${.CURDIR}/../dist/src/hkpclient
+
+LIBNETPGPDIR!=	cd ${.CURDIR}/../../lib/netpgp && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPDIR} -lnetpgp
+DPADD+=		${LIBNETPGPDIR}/libnetpgp.a
+
+LIBNETPGPVERIFYDIR!=	cd ${.CURDIR}/../../lib/verify && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETPGPVERIFYDIR} -lnetpgpverify
+DPADD+=		${LIBNETPGPVERIFYDIR}/libnetpgpverify.a
+
+LIBNETCIPHERDIR!=	cd ${.CURDIR}/../../lib/cipher && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETCIPHERDIR} -lnetpgpcipher
+DPADD+=		${LIBNETCIPHERDIR}/libnetpgpcipher.a
+
+LIBNETRSADIR!=	cd ${.CURDIR}/../../lib/rsa && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETRSADIR} -lnetpgprsa
+DPADD+=		${LIBNETRSADIR}/libnetpgprsa.a
+
+LIBNETBNDIR!=	cd ${.CURDIR}/../../lib/bn && ${PRINTOBJDIR}
+LDADD+=		-L${LIBNETBNDIR} -lnetpgpbn
+DPADD+=		${LIBNETBNDIR}/libnetpgpbn.a
+
+LIBMJDIR!=	cd ${.CURDIR}/../../lib/mj && ${PRINTOBJDIR}
+LDADD+=		-L${LIBMJDIR} -lmj
+DPADD+=		${LIBMJDIR}/libmj.a
+
+LDADD+=		-lz -lbz2
+DPADD+=		${LIBZ} ${LIBBZ2}
+
+MAN=		pgp2ssh.1
+WARNS=		0
+
+EXTDIST=	${.CURDIR}/../../dist
+.PATH:		${EXTDIST}/src/pgp2ssh ${EXTDIST}/src/hkpclient
+
+.include <bsd.prog.mk>

Reply via email to