[src/trunk]: src/crypto/external/bsd/netpgp Move hkpc and hkpd into the corre...

[agc <agc%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d2dc80ba2568
branches:  trunk
changeset: 327476:d2dc80ba2568
user:      agc <agc%NetBSD.org@localhost>
date:      Sun Mar 09 00:39:31 2014 +0000

description:
Move hkpc and hkpd into the correct place in the reachover insfrastructure

diffstat:

 crypto/external/bsd/netpgp/Makefile          |   3 +-
 crypto/external/bsd/netpgp/bin/Makefile      |   4 ++-
 crypto/external/bsd/netpgp/bin/hkpc/Makefile |  25 +++++++++++++++++++++
 crypto/external/bsd/netpgp/hkpd/Makefile     |  32 ----------------------------
 4 files changed, 29 insertions(+), 35 deletions(-)

diffs (93 lines):

diff -r 189432cc94a3 -r d2dc80ba2568 crypto/external/bsd/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/Makefile       Sun Mar 09 00:33:50 2014 +0000
+++ b/crypto/external/bsd/netpgp/Makefile       Sun Mar 09 00:39:31 2014 +0000
@@ -1,9 +1,8 @@
-#      $NetBSD: Makefile,v 1.7 2014/03/09 00:33:50 agc Exp $
+#      $NetBSD: Makefile,v 1.8 2014/03/09 00:39:31 agc Exp $
 
 SUBDIR+=       libmj .WAIT
 SUBDIR+=       lib/verify .WAIT
 SUBDIR+=       lib .WAIT
 SUBDIR+=       bin
-#SUBDIR+=      hkpc hkpd
 
 .include <bsd.subdir.mk>
diff -r 189432cc94a3 -r d2dc80ba2568 crypto/external/bsd/netpgp/bin/Makefile
--- a/crypto/external/bsd/netpgp/bin/Makefile   Sun Mar 09 00:33:50 2014 +0000
+++ b/crypto/external/bsd/netpgp/bin/Makefile   Sun Mar 09 00:39:31 2014 +0000
@@ -1,7 +1,9 @@
-#      $NetBSD: Makefile,v 1.6 2014/03/09 00:33:50 agc Exp $
+#      $NetBSD: Makefile,v 1.7 2014/03/09 00:39:31 agc Exp $
 
 SUBDIR+=       netpgp
 SUBDIR+=       netpgpkeys
 SUBDIR+=       netpgpverify
+#SUBDIR+=      hkpc
+#SUBDIR+=      hkpd
 
 .include <bsd.subdir.mk>
diff -r 189432cc94a3 -r d2dc80ba2568 crypto/external/bsd/netpgp/bin/hkpc/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/bin/hkpc/Makefile      Sun Mar 09 00:39:31 2014 +0000
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.2 2014/03/09 00:39:31 agc Exp $
+
+.include <bsd.own.mk>
+
+PROG=hkpc
+BINDIR=/usr/bin
+SRCS=hkpc.c main.c
+
+LIBNETPGPDIR!= cd ${.CURDIR}/../../lib && ${PRINTOBJDIR}
+LDADD+=                -L${LIBNETPGPDIR} -lnetpgp
+DPADD+=                ${LIBNETPGPDIR}/libnetpgp.a
+
+LIBMJDIR!=     cd ${.CURDIR}/../../libmj && ${PRINTOBJDIR}
+LDADD+=                -L${LIBMJDIR} -lmj
+DPADD+=                ${LIBMJDIR}/libmj.a
+
+LDADD+=                -lcrypto -lz -lbz2
+DPADD+=                ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
+
+WARNS=0
+MAN=hkpc.1
+
+.PATH: ${.CURDIR}/../../dist/src/hkpclient
+
+.include <bsd.prog.mk>
diff -r 189432cc94a3 -r d2dc80ba2568 crypto/external/bsd/netpgp/hkpd/Makefile
--- a/crypto/external/bsd/netpgp/hkpd/Makefile  Sun Mar 09 00:33:50 2014 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-# $NetBSD: Makefile,v 1.2 2012/07/10 19:38:17 christos Exp $
-
-.include <bsd.own.mk>
-
-PROG=hkpd
-BINDIR=/usr/sbin
-SRCS=hkpd.c main.c
-
-LIBNETPGPDIR!= cd ${.CURDIR}/../lib && ${PRINTOBJDIR}
-LDADD+=                -L${LIBNETPGPDIR} -lnetpgp
-DPADD+=                ${LIBNETPGPDIR}/libnetpgp.a
-
-LIBMJDIR!=     cd ${.CURDIR}/../libmj && ${PRINTOBJDIR}
-LDADD+=                -L${LIBMJDIR} -lmj
-DPADD+=                ${LIBMJDIR}/libmj.a
-
-LDADD+=                -lcrypto -lz -lbz2
-DPADD+=                ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
-
-MAN=hkpd.1
-
-.PATH: ${.CURDIR}/../dist/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