Module Name: src
Committed By: christos
Date: Tue Jul 10 19:38:18 UTC 2012
Modified Files:
src/crypto/external/bsd/netpgp/hkpd: Makefile
src/crypto/external/bsd/netpgp/lib: Makefile
src/crypto/external/bsd/netpgp/libmj: Makefile
src/crypto/external/bsd/netpgp/libpaa: Makefile
src/crypto/external/bsd/netpgp/netpgp: Makefile
src/crypto/external/bsd/netpgp/netpgpkeys: Makefile
src/crypto/external/bsd/netpgp/netpgpverify: Makefile
src/crypto/external/bsd/netpgp/pgp2ssh: Makefile
Added Files:
src/crypto/external/bsd/netpgp: Makefile.inc
Log Message:
- centralize WARNS=4, no need for WARNS=0 for the linker errors
(linking against) dummy idea
- add MKCRYPTO_IDEA support. Alas the code does not seem work accept my
passphrase on the idea key. A bug?
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/netpgp/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/hkpd/Makefile
cvs rdiff -u -r1.13 -r1.14 src/crypto/external/bsd/netpgp/lib/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/libmj/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/libpaa/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/netpgp/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/netpgp/netpgpverify/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/netpgp/pgp2ssh/Makefile
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/hkpd/Makefile
diff -u src/crypto/external/bsd/netpgp/hkpd/Makefile:1.1 src/crypto/external/bsd/netpgp/hkpd/Makefile:1.2
--- src/crypto/external/bsd/netpgp/hkpd/Makefile:1.1 Thu Sep 2 01:58:00 2010
+++ src/crypto/external/bsd/netpgp/hkpd/Makefile Tue Jul 10 15:38:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/09/02 05:58:00 agc Exp $
+# $NetBSD: Makefile,v 1.2 2012/07/10 19:38:17 christos Exp $
.include <bsd.own.mk>
@@ -18,7 +18,6 @@ LDADD+= -lcrypto -lz -lbz2
DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
MAN=hkpd.1
-WARNS=0 # anything over 0 will fail at the link stage with IDEA errors
.PATH: ${.CURDIR}/../dist/src/hkpd
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.14
--- src/crypto/external/bsd/netpgp/lib/Makefile:1.13 Thu Oct 13 13:23:28 2011
+++ src/crypto/external/bsd/netpgp/lib/Makefile Tue Jul 10 15:38:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2011/10/13 17:23:28 plunky Exp $
+# $NetBSD: Makefile,v 1.14 2012/07/10 19:38:17 christos Exp $
.include <bsd.own.mk>
@@ -12,7 +12,6 @@ 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
@@ -21,9 +20,13 @@ EXTDIST=${.CURDIR}/../dist
INCS+= netpgp.h
INCSDIR=/usr/include
+OPENSSL=${NETBSDSRCDIR}/crypto/external/bsd/openssl
LIBDPLIBS+= mj ${.CURDIR}/../libmj
-LIBDPLIBS+= crypto ${NETBSDSRCDIR}/crypto/external/bsd/openssl/lib/libcrypto
-LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
-LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
+.if (${MKCRYPTO_IDEA} != "no")
+LIBDPLIBS+= crypto_idea ${OPENSSL}/lib/libcrypto_idea
+.endif # MKCRYPTO_IDEA != no
+LIBDPLIBS+= crypto ${OPENSSL}/lib/libcrypto
+LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
+LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
.include <bsd.lib.mk>
Index: src/crypto/external/bsd/netpgp/libmj/Makefile
diff -u src/crypto/external/bsd/netpgp/libmj/Makefile:1.1 src/crypto/external/bsd/netpgp/libmj/Makefile:1.2
--- src/crypto/external/bsd/netpgp/libmj/Makefile:1.1 Sat Aug 7 00:17:49 2010
+++ src/crypto/external/bsd/netpgp/libmj/Makefile Tue Jul 10 15:38:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/08/07 04:17:49 agc Exp $
+# $NetBSD: Makefile,v 1.2 2012/07/10 19:38:17 christos Exp $
.include <bsd.own.mk>
@@ -7,7 +7,6 @@ USE_FORT?= yes
LIB= mj
SRCS= mj.c
MAN= libmj.3
-WARNS=4
EXTDIST=${.CURDIR}/../dist
Index: src/crypto/external/bsd/netpgp/libpaa/Makefile
diff -u src/crypto/external/bsd/netpgp/libpaa/Makefile:1.1 src/crypto/external/bsd/netpgp/libpaa/Makefile:1.2
--- src/crypto/external/bsd/netpgp/libpaa/Makefile:1.1 Fri Sep 10 01:29:12 2010
+++ src/crypto/external/bsd/netpgp/libpaa/Makefile Tue Jul 10 15:38:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/09/10 05:29:12 agc Exp $
+# $NetBSD: Makefile,v 1.2 2012/07/10 19:38:17 christos Exp $
.include <bsd.own.mk>
@@ -16,7 +16,6 @@ LIBDPLIBS+= z ${NETBSDSRCDIR}/lib/libz
LIBDPLIBS+= bz2 ${NETBSDSRCDIR}/lib/libbz2
MAN= libpaa.3
-WARNS= 4
.PATH: ${.CURDIR}/../dist/src/pgp2ssh ${.CURDIR}/../dist/src/libpaa
Index: src/crypto/external/bsd/netpgp/netpgp/Makefile
diff -u src/crypto/external/bsd/netpgp/netpgp/Makefile:1.3 src/crypto/external/bsd/netpgp/netpgp/Makefile:1.4
--- src/crypto/external/bsd/netpgp/netpgp/Makefile:1.3 Wed Sep 1 02:02:58 2010
+++ src/crypto/external/bsd/netpgp/netpgp/Makefile Tue Jul 10 15:38:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/09/01 06:02:58 agc Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/10 19:38:17 christos Exp $
.include <bsd.own.mk>
@@ -20,11 +20,6 @@ DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
MAN= netpgp.1
-# although the code is/was WARNS=4 clean, when linking, there is a warning
-# about libidea being a patented algorithm, and WARNS>0 treats warnings as
-# errors. For now, just set WARNS off.
-WARNS= 0
-
.PATH: ${.CURDIR}/../dist/src/netpgp
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/netpgp/netpgpkeys/Makefile
diff -u src/crypto/external/bsd/netpgp/netpgpkeys/Makefile:1.3 src/crypto/external/bsd/netpgp/netpgpkeys/Makefile:1.4
--- src/crypto/external/bsd/netpgp/netpgpkeys/Makefile:1.3 Thu Sep 2 02:00:12 2010
+++ src/crypto/external/bsd/netpgp/netpgpkeys/Makefile Tue Jul 10 15:38:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/09/02 06:00:12 agc Exp $
+# $NetBSD: Makefile,v 1.4 2012/07/10 19:38:17 christos Exp $
.include <bsd.own.mk>
@@ -19,11 +19,6 @@ DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
MAN= netpgpkeys.1
-# although the code is/was WARNS=4 clean, when linking, there is a warning
-# about libidea being a patented algorithm, and WARNS>0 treats warnings as
-# errors. For now, just set WARNS off.
-WARNS= 0
-
.PATH: ${.CURDIR}/../dist/src/netpgpkeys
.include <bsd.prog.mk>
Index: src/crypto/external/bsd/netpgp/netpgpverify/Makefile
diff -u src/crypto/external/bsd/netpgp/netpgpverify/Makefile:1.5 src/crypto/external/bsd/netpgp/netpgpverify/Makefile:1.6
--- src/crypto/external/bsd/netpgp/netpgpverify/Makefile:1.5 Fri Aug 13 01:16:28 2010
+++ src/crypto/external/bsd/netpgp/netpgpverify/Makefile Tue Jul 10 15:38:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/08/13 05:16:28 he Exp $
+# $NetBSD: Makefile,v 1.6 2012/07/10 19:38:17 christos Exp $
.include <bsd.own.mk>
@@ -21,11 +21,6 @@ DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
MAN= netpgpverify.1
-# although the code is/was WARNS=4 clean, when linking, there is a warning
-# about libidea being a patented algorithm, and WARNS>0 treats warnings as
-# errors. For now, just set WARNS off.
-WARNS= 0
-
EXTDIST=${.CURDIR}/../dist
.PATH: ${EXTDIST}/src/netpgpverify
Index: src/crypto/external/bsd/netpgp/pgp2ssh/Makefile
diff -u src/crypto/external/bsd/netpgp/pgp2ssh/Makefile:1.1 src/crypto/external/bsd/netpgp/pgp2ssh/Makefile:1.2
--- src/crypto/external/bsd/netpgp/pgp2ssh/Makefile:1.1 Mon Sep 6 14:17:58 2010
+++ src/crypto/external/bsd/netpgp/pgp2ssh/Makefile Tue Jul 10 15:38:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/09/06 18:17:58 agc Exp $
+# $NetBSD: Makefile,v 1.2 2012/07/10 19:38:17 christos Exp $
.include <bsd.own.mk>
@@ -20,7 +20,6 @@ LDADD+= -lcrypto -lz -lbz2
DPADD+= ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
MAN= pgp2ssh.1
-WARNS= 0
.PATH: ${.CURDIR}/../dist/src/pgp2ssh ${.CURDIR}/../dist/src/hkpclient
Added files:
Index: src/crypto/external/bsd/netpgp/Makefile.inc
diff -u /dev/null src/crypto/external/bsd/netpgp/Makefile.inc:1.1
--- /dev/null Tue Jul 10 15:38:18 2012
+++ src/crypto/external/bsd/netpgp/Makefile.inc Tue Jul 10 15:38:17 2012
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2012/07/10 19:38:17 christos Exp $
+
+WARNS?=4
