Module Name: src
Committed By: agc
Date: Sun May 6 18:07:02 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/lib [agc-netpgp-standalone]: Makefile
Added Files:
src/crypto/external/bsd/netpgp/lib/bn [agc-netpgp-standalone]: Makefile
shlib_version
src/crypto/external/bsd/netpgp/lib/cipher [agc-netpgp-standalone]:
Makefile shlib_version
src/crypto/external/bsd/netpgp/lib/mj [agc-netpgp-standalone]: Makefile
shlib_version
src/crypto/external/bsd/netpgp/lib/netpgp [agc-netpgp-standalone]:
Makefile shlib_version
src/crypto/external/bsd/netpgp/lib/paa [agc-netpgp-standalone]:
Makefile shlib_version
src/crypto/external/bsd/netpgp/lib/rsa [agc-netpgp-standalone]:
Makefile shlib_version
src/crypto/external/bsd/netpgp/lib/verify [agc-netpgp-standalone]:
Makefile shlib_version
Log Message:
Add reachover build infrastructure for lib components of netpgp
standalone
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.13.6.1 src/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/bn/Makefile \
src/crypto/external/bsd/netpgp/lib/bn/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/cipher/Makefile \
src/crypto/external/bsd/netpgp/lib/cipher/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/mj/Makefile \
src/crypto/external/bsd/netpgp/lib/mj/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/netpgp/Makefile \
src/crypto/external/bsd/netpgp/lib/netpgp/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/paa/Makefile \
src/crypto/external/bsd/netpgp/lib/paa/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/rsa/Makefile \
src/crypto/external/bsd/netpgp/lib/rsa/shlib_version
cvs rdiff -u -r0 -r1.1.2.1 src/crypto/external/bsd/netpgp/lib/verify/Makefile \
src/crypto/external/bsd/netpgp/lib/verify/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/netpgp/lib/Makefile
diff -u src/crypto/external/bsd/netpgp/lib/Makefile:1.13 src/crypto/external/bsd/netpgp/lib/Makefile:1.13.6.1
--- src/crypto/external/bsd/netpgp/lib/Makefile:1.13 Thu Oct 13 17:23:28 2011
+++ src/crypto/external/bsd/netpgp/lib/Makefile Sun May 6 18:07:01 2012
@@ -1,29 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2011/10/13 17:23:28 plunky Exp $
+# $NetBSD: Makefile,v 1.13.6.1 2012/05/06 18:07:01 agc Exp $
-.include <bsd.own.mk>
+SUBDIR+= bn mj .WAIT
+SUBDIR+= cipher rsa
+SUBDIR+= netpgp verify
+#SUBDIR+= libpaa
-USE_FORT?= yes
-
-LIB= netpgp
-SRCS+= compress.c create.c crypto.c
-SRCS+= keyring.c misc.c netpgp.c openssl_crypto.c packet-parse.c
-SRCS+= packet-print.c packet-show.c reader.c signature.c
-SRCS+= symmetric.c validate.c writer.c
-SRCS+= ssh2pgp.c bufgap.c
-CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include
-MAN= libnetpgp.3
-WARNS?= 4
-
-EXTDIST=${.CURDIR}/../dist
-
-.PATH: ${EXTDIST}/include ${EXTDIST}/src/lib
-
-INCS+= netpgp.h
-INCSDIR=/usr/include
-
-LIBDPLIBS+= mj ${.CURDIR}/../libmj
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
-LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
-
-.include <bsd.lib.mk>
+.include <bsd.subdir.mk>
Added files:
Index: src/crypto/external/bsd/netpgp/lib/bn/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/bn/Makefile:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/bn/Makefile Sun May 6 18:07:01 2012
@@ -0,0 +1,14 @@
+LIB=netpgpbn
+SRCS= bignum.c digest.c misc.c rand.c
+SRCS+= stubs.c
+MAN=libnetpgpbn.3
+WARNS=4
+CPPFLAGS+=-I${EXTDIST}/src/libcipher
+
+INCS=bn.h digest.h
+INCSDIR=/usr/include/netpgp
+
+EXTDIST= ${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/libbn
+
+.include <bsd.lib.mk>
Index: src/crypto/external/bsd/netpgp/lib/bn/shlib_version
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/bn/shlib_version:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/bn/shlib_version Sun May 6 18:07:01 2012
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/crypto/external/bsd/netpgp/lib/cipher/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/cipher/Makefile:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/cipher/Makefile Sun May 6 18:07:01 2012
@@ -0,0 +1,15 @@
+LIB=netpgpcipher
+SRCS= rijndael-alg-fst.c rijndael-api-fst.c rijndael.c
+SRCS+= cast.c
+SRCS+= modes.c
+SRCS+= camellia.c
+MAN=libnetpgpcipher.3
+WARNS=4
+
+EXTDIST= ${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/libcipher
+
+INCS=aes.h rijndael.h cast.h camellia.h
+INCSDIR=/usr/include/netpgp
+
+.include <bsd.lib.mk>
Index: src/crypto/external/bsd/netpgp/lib/cipher/shlib_version
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/cipher/shlib_version:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/cipher/shlib_version Sun May 6 18:07:01 2012
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/crypto/external/bsd/netpgp/lib/mj/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/mj/Makefile:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/mj/Makefile Sun May 6 18:07:01 2012
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1.2.1 2012/05/06 18:07:01 agc Exp $
+
+.include <bsd.own.mk>
+
+USE_FORT?= yes
+
+LIB= mj
+SRCS= mj.c
+MAN= libmj.3
+WARNS=4
+
+EXTDIST=${.CURDIR}/../../dist
+
+.PATH: ${EXTDIST}/include ${EXTDIST}/src/libmj
+
+INCS+= mj.h
+INCSDIR=/usr/include
+
+.include <bsd.lib.mk>
Index: src/crypto/external/bsd/netpgp/lib/mj/shlib_version
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/mj/shlib_version:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/mj/shlib_version Sun May 6 18:07:01 2012
@@ -0,0 +1,2 @@
+major=1
+minor=0
Index: src/crypto/external/bsd/netpgp/lib/netpgp/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/netpgp/Makefile:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/netpgp/Makefile Sun May 6 18:07:01 2012
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1.2.1 2012/05/06 18:07:01 agc Exp $
+
+.include <bsd.own.mk>
+
+USE_FORT?= yes
+
+LIB= netpgp
+SRCS+= compress.c create.c crypto.c
+SRCS+= keyring.c misc.c netpgp.c openssl_crypto.c packet-parse.c
+SRCS+= packet-print.c packet-show.c reader.c signature.c
+SRCS+= symmetric.c validate.c writer.c
+SRCS+= ssh2pgp.c bufgap.c
+CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include
+CPPFLAGS+= -I${EXTDIST}/src/libcipher
+CPPFLAGS+= -I${EXTDIST}/src/libbn
+CPPFLAGS+= -I${EXTDIST}/src/librsa
+CPPFLAGS+= -I${EXTDIST}/src/libverify
+MAN= libnetpgp.3
+WARNS?= 4
+
+EXTDIST=${.CURDIR}/../../dist
+
+.PATH: ${EXTDIST}/include ${EXTDIST}/src/libnetpgp
+
+INCS+= netpgp.h
+INCSDIR=/usr/include/netpgp
+
+LDADD+= -lmj -lz -lbz2
+#LIBDPLIBS+= mj ${.CURDIR}/../libmj
+#LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
+#LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+#LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
+
+.include <bsd.lib.mk>
Index: src/crypto/external/bsd/netpgp/lib/netpgp/shlib_version
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/netpgp/shlib_version:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/netpgp/shlib_version Sun May 6 18:07:01 2012
@@ -0,0 +1,2 @@
+major=3
+minor=0
Index: src/crypto/external/bsd/netpgp/lib/paa/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/paa/Makefile:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/paa/Makefile Sun May 6 18:07:02 2012
@@ -0,0 +1,35 @@
+# $NetBSD: Makefile,v 1.1.2.1 2012/05/06 18:07:02 agc Exp $
+
+.include <bsd.own.mk>
+
+USE_FORT?= yes
+
+LIB= paa
+
+SRCS= b64.c libpaa.c
+CPPFLAGS+= -I${EXTDIST}/include -I${EXTDIST}/src/pgp2ssh
+
+LIBDPLIBS+= mj ${.CURDIR}/../mj
+LIBDPLIBS+= netpgp ${.CURDIR}/../netpgp
+LIBDPLIBS+= netpgpverify ${.CURDIR}/../verify
+LIBDPLIBS+= netpgpbn ${.CURDIR}/../bn
+LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
+
+MAN= libpaa.3
+WARNS= 4
+
+EXTDIST= ${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/pgp2ssh ${EXTDIST}/src/libpaa
+
+INCS+= libpaa.h
+INCSDIR=/usr/include/netpgp
+
+.include <bsd.lib.mk>
+
+SUBDIR+= client server
+
+.include <bsd.subdir.mk>
+
+t:
+ server/paaserver -r [email protected]
Index: src/crypto/external/bsd/netpgp/lib/paa/shlib_version
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/paa/shlib_version:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/paa/shlib_version Sun May 6 18:07:02 2012
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/crypto/external/bsd/netpgp/lib/rsa/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/rsa/Makefile:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/rsa/Makefile Sun May 6 18:07:02 2012
@@ -0,0 +1,13 @@
+LIB=netpgprsa
+SRCS=rsa.c rsastubs.c
+MAN=libnetpgprsa.3
+WARNS=4
+CPPFLAGS+=-I${EXTDIST}/src/libbn
+
+EXTDIST= ${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/librsa
+
+INCS=rsa.h
+INCSDIR=/usr/include/netpgp
+
+.include <bsd.lib.mk>
Index: src/crypto/external/bsd/netpgp/lib/rsa/shlib_version
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/rsa/shlib_version:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/rsa/shlib_version Sun May 6 18:07:02 2012
@@ -0,0 +1,2 @@
+major=0
+minor=0
Index: src/crypto/external/bsd/netpgp/lib/verify/Makefile
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/verify/Makefile:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/verify/Makefile Sun May 6 18:07:02 2012
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1.2.1 2012/05/06 18:07:02 agc Exp $
+
+LIB=netpgpverify
+SRCS= verify.c
+CPPFLAGS+=-I${EXTDIST}/src/libbn -I${EXTDIST}/src/librsa
+MAN=libnetpgpverify.3
+WARNS=4
+
+EXTDIST= ${.CURDIR}/../../dist
+.PATH: ${EXTDIST}/src/libverify
+
+INCS=verify.h
+INCSDIR=/usr/include/netpgp
+
+.include <bsd.lib.mk>
Index: src/crypto/external/bsd/netpgp/lib/verify/shlib_version
diff -u /dev/null src/crypto/external/bsd/netpgp/lib/verify/shlib_version:1.1.2.1
--- /dev/null Sun May 6 18:07:02 2012
+++ src/crypto/external/bsd/netpgp/lib/verify/shlib_version Sun May 6 18:07:02 2012
@@ -0,0 +1,2 @@
+major=3
+minor=0
