[src/trunk]: src/crypto/external/bsd/netpgp - centralize WARNS=4, no need for...

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

details:   https://anonhg.NetBSD.org/src/rev/e2b032d48783
branches:  trunk
changeset: 780066:e2b032d48783
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Jul 10 19:38:17 2012 +0000

description:
- 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?

diffstat:

 crypto/external/bsd/netpgp/Makefile.inc          |   3 +++
 crypto/external/bsd/netpgp/hkpd/Makefile         |   3 +--
 crypto/external/bsd/netpgp/lib/Makefile          |  13 ++++++++-----
 crypto/external/bsd/netpgp/libmj/Makefile        |   3 +--
 crypto/external/bsd/netpgp/libpaa/Makefile       |   3 +--
 crypto/external/bsd/netpgp/netpgp/Makefile       |   7 +------
 crypto/external/bsd/netpgp/netpgpkeys/Makefile   |   7 +------
 crypto/external/bsd/netpgp/netpgpverify/Makefile |   7 +------
 crypto/external/bsd/netpgp/pgp2ssh/Makefile      |   3 +--
 9 files changed, 18 insertions(+), 31 deletions(-)

diffs (172 lines):

diff -r 1e2ad7d499a8 -r e2b032d48783 crypto/external/bsd/netpgp/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/crypto/external/bsd/netpgp/Makefile.inc   Tue Jul 10 19:38:17 2012 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: Makefile.inc,v 1.1 2012/07/10 19:38:17 christos Exp $
+
+WARNS?=4
diff -r 1e2ad7d499a8 -r e2b032d48783 crypto/external/bsd/netpgp/hkpd/Makefile
--- a/crypto/external/bsd/netpgp/hkpd/Makefile  Tue Jul 10 19:35:58 2012 +0000
+++ b/crypto/external/bsd/netpgp/hkpd/Makefile  Tue Jul 10 19:38:17 2012 +0000
@@ -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 @@
 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
 
diff -r 1e2ad7d499a8 -r e2b032d48783 crypto/external/bsd/netpgp/lib/Makefile
--- a/crypto/external/bsd/netpgp/lib/Makefile   Tue Jul 10 19:35:58 2012 +0000
+++ b/crypto/external/bsd/netpgp/lib/Makefile   Tue Jul 10 19:38:17 2012 +0000
@@ -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+= ssh2pgp.c bufgap.c
 CPPFLAGS+= -I${.CURDIR} -I${EXTDIST}/include
 MAN= libnetpgp.3
-WARNS?= 4
 
 EXTDIST=${.CURDIR}/../dist
 
@@ -21,9 +20,13 @@
 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>
diff -r 1e2ad7d499a8 -r e2b032d48783 crypto/external/bsd/netpgp/libmj/Makefile
--- a/crypto/external/bsd/netpgp/libmj/Makefile Tue Jul 10 19:35:58 2012 +0000
+++ b/crypto/external/bsd/netpgp/libmj/Makefile Tue Jul 10 19:38:17 2012 +0000
@@ -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 @@
 LIB= mj
 SRCS= mj.c
 MAN= libmj.3
-WARNS=4
 
 EXTDIST=${.CURDIR}/../dist
 
diff -r 1e2ad7d499a8 -r e2b032d48783 crypto/external/bsd/netpgp/libpaa/Makefile
--- a/crypto/external/bsd/netpgp/libpaa/Makefile        Tue Jul 10 19:35:58 2012 +0000
+++ b/crypto/external/bsd/netpgp/libpaa/Makefile        Tue Jul 10 19:38:17 2012 +0000
@@ -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+=    bz2     ${NETBSDSRCDIR}/lib/libbz2
 
 MAN=           libpaa.3
-WARNS=         4
 
 .PATH: ${.CURDIR}/../dist/src/pgp2ssh ${.CURDIR}/../dist/src/libpaa
 
diff -r 1e2ad7d499a8 -r e2b032d48783 crypto/external/bsd/netpgp/netpgp/Makefile
--- a/crypto/external/bsd/netpgp/netpgp/Makefile        Tue Jul 10 19:35:58 2012 +0000
+++ b/crypto/external/bsd/netpgp/netpgp/Makefile        Tue Jul 10 19:38:17 2012 +0000
@@ -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 @@
 
 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>
diff -r 1e2ad7d499a8 -r e2b032d48783 crypto/external/bsd/netpgp/netpgpkeys/Makefile
--- a/crypto/external/bsd/netpgp/netpgpkeys/Makefile    Tue Jul 10 19:35:58 2012 +0000
+++ b/crypto/external/bsd/netpgp/netpgpkeys/Makefile    Tue Jul 10 19:38:17 2012 +0000
@@ -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 @@
 
 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>
diff -r 1e2ad7d499a8 -r e2b032d48783 crypto/external/bsd/netpgp/netpgpverify/Makefile
--- a/crypto/external/bsd/netpgp/netpgpverify/Makefile  Tue Jul 10 19:35:58 2012 +0000
+++ b/crypto/external/bsd/netpgp/netpgpverify/Makefile  Tue Jul 10 19:38:17 2012 +0000
@@ -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 @@
 
 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
diff -r 1e2ad7d499a8 -r e2b032d48783 crypto/external/bsd/netpgp/pgp2ssh/Makefile
--- a/crypto/external/bsd/netpgp/pgp2ssh/Makefile       Tue Jul 10 19:35:58 2012 +0000
+++ b/crypto/external/bsd/netpgp/pgp2ssh/Makefile       Tue Jul 10 19:38:17 2012 +0000
@@ -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 @@
 DPADD+=                ${LIBCRYPTO} ${LIBZ} ${LIBBZ2}
 
 MAN=           pgp2ssh.1
-WARNS=         0
 
 .PATH: ${.CURDIR}/../dist/src/pgp2ssh ${.CURDIR}/../dist/src/hkpclient