Module Name: src
Committed By: riz
Date: Mon Sep 17 19:00:35 UTC 2012
Modified Files:
src/distrib/sets [netbsd-6]: sets.subr
src/distrib/sets/lists/base [netbsd-6]: ad.mips64eb ad.mips64el
md.amd64 md.sparc64 shl.mi
src/distrib/sets/lists/comp [netbsd-6]: ad.mips64eb ad.mips64el
md.amd64 md.sparc64 mi shl.mi
src/distrib/sets/lists/tests [netbsd-6]: mi
src/etc [netbsd-6]: Makefile
src/share/man/man5 [netbsd-6]: mk.conf.5
src/share/mk [netbsd-6]: bsd.README bsd.own.mk
src/tests/crypto/libcrypto [netbsd-6]: t_ciphers.sh t_hashes.sh
src/usr.sbin/racoon [netbsd-6]: Makefile
Log Message:
Pull up following revision(s) (requested by spz in ticket #557):
distrib/sets/lists/base/ad.mips64eb 1.94-1.95 via patch
distrib/sets/lists/base/ad.mips64el 1.93-1.94 via patch
distrib/sets/lists/base/md.amd64 1.169-1.170 via patch
distrib/sets/lists/base/md.sparc64 1.159-1.160 via patch
distrib/sets/lists/base/shl.mi 1.629,1.630,1.632 via patch
distrib/sets/lists/comp/ad.mips64eb 1.81-1.82 via patch
distrib/sets/lists/comp/ad.mips64el 1.821.83 via patch
distrib/sets/lists/comp/md.amd64 1.168-1.169 via patch
distrib/sets/lists/comp/md.sparc64 1.150-1.151 via patch
distrib/sets/lists/comp/mi 1.1769 via patch
distrib/sets/lists/comp/shl.mi 1.226-1.227 via patch
distrib/sets/lists/tests/mi 1.477 via patch
distrib/sets/sets.subr 1.137 via patch
etc/Makefile 1.397 via patch
share/man/man5/mk.conf.5 1.60 via patch
share/mk/bsd.README 1.297 via patch
share/mk/bsd.own.mk 1.700 via patch
tests/crypto/libcrypto/Makefile patch
tests/crypto/libcrypto/t_ciphers.sh 1.4 via patch
tests/crypto/libcrypto/t_hashes.sh 1.2 via patch
tests/crypto/libcrypto/idea/Makefile patch
tests/crypto/libcrypto/mdc2/Makefile patch
usr.sbin/racoon/Makefile 1.25 via patch
Clean up MKCRYPTO_IDEA and MKCRYPTO_MDC2 removal, so that
a tree with MKCRYPTO_RC5=yes actually builds.
[spz, ticket #557]
The "iso" directory never made it into this file, but now
that "iso" is "images", document it here for the edification of
folks browsing the download directories.
add crypto shared libraries
mark idea and mdc2 libraries obsolete.
remove mdc2 and idea handling
MKCRYPTO_{IDEA,MDC2} is no more
MKCRYPTO_IDEA is no more
no more CRYPTO_{IDEA,MDC2}
more MKCRYPTO_IDEA and MKCRYPTO_MDC2 removal (resp, adjustment to IDEA and
MBC2 now always being included)
MKCRYPTO_RC5 now builds shared libs, add the missing files to sets
To generate a diff of this commit:
cvs rdiff -u -r1.135.2.1 -r1.135.2.2 src/distrib/sets/sets.subr
cvs rdiff -u -r1.82.2.4 -r1.82.2.5 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.81.2.4 -r1.81.2.5 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.156.2.4 -r1.156.2.5 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.147.2.4 -r1.147.2.5 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.616.2.4 -r1.616.2.5 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.69.2.4 -r1.69.2.5 src/distrib/sets/lists/comp/ad.mips64eb
cvs rdiff -u -r1.69.2.5 -r1.69.2.6 src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.155.2.4 -r1.155.2.5 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.138.2.4 -r1.138.2.5 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1738.2.6 -r1.1738.2.7 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.209.2.4 -r1.209.2.5 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.439.2.2 -r1.439.2.3 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.396.2.1 -r1.396.2.2 src/etc/Makefile
cvs rdiff -u -r1.58 -r1.58.2.1 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.292.2.2 -r1.292.2.3 src/share/mk/bsd.README
cvs rdiff -u -r1.696.2.2 -r1.696.2.3 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.3 -r1.3.4.1 src/tests/crypto/libcrypto/t_ciphers.sh
cvs rdiff -u -r1.1 -r1.1.8.1 src/tests/crypto/libcrypto/t_hashes.sh
cvs rdiff -u -r1.24 -r1.24.2.1 src/usr.sbin/racoon/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.135.2.1 src/distrib/sets/sets.subr:1.135.2.2
--- src/distrib/sets/sets.subr:1.135.2.1 Fri Feb 17 00:08:37 2012
+++ src/distrib/sets/sets.subr Mon Sep 17 19:00:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.135.2.1 2012/02/17 00:08:37 riz Exp $
+# $NetBSD: sets.subr,v 1.135.2.2 2012/09/17 19:00:32 riz Exp $
#
#
@@ -172,7 +172,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.135.2.1 2012/02/17 00:08:37 riz Exp $
+# # $NetBSD: sets.subr,v 1.135.2.2 2012/09/17 19:00:32 riz Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -199,8 +199,6 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# catpages ${MKCATPAGES} != no
# compat ${MKCOMPAT} != no
# crypto ${MKCRYPTO} != no
-# crypto_idea ${MKCRYPTO_IDEA} != no
-# crypto_mdc2 ${MKCRYPTO_MDC2} != no
# crypto_rc5 ${MKCRYPTO_RC5} != no
# cvs ${MKCVS} != no
# debug ${MKDEBUG} != no
Index: src/distrib/sets/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.82.2.4 src/distrib/sets/lists/base/ad.mips64eb:1.82.2.5
--- src/distrib/sets/lists/base/ad.mips64eb:1.82.2.4 Mon Aug 13 20:19:24 2012
+++ src/distrib/sets/lists/base/ad.mips64eb Mon Sep 17 19:00:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.82.2.4 2012/08/13 20:19:24 riz Exp $
+# $NetBSD: ad.mips64eb,v 1.82.2.5 2012/09/17 19:00:26 riz Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -73,6 +73,8 @@
./usr/lib/64/libcrypt.so.1.0 base-compat-shlib compat,pic
./usr/lib/64/libcrypto.so.8 base-compat-shlib compat,pic,crypto
./usr/lib/64/libcrypto.so.8.0 base-compat-shlib compat,pic,crypto
+./usr/lib/64/libcrypto_rc5.so.7 base-compat-shlib compat,pic,crypto,crypto_rc5
+./usr/lib/64/libcrypto_rc5.so.7.0 base-compat-shlib compat,pic,crypto,crypto_rc5
./usr/lib/64/libcurses.so.7 base-compat-shlib compat,pic
./usr/lib/64/libcurses.so.7.0 base-compat-shlib compat,pic
./usr/lib/64/libdes.so.8 base-compat-shlib compat,pic,crypto
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.81.2.4 src/distrib/sets/lists/base/ad.mips64el:1.81.2.5
--- src/distrib/sets/lists/base/ad.mips64el:1.81.2.4 Mon Aug 13 20:19:24 2012
+++ src/distrib/sets/lists/base/ad.mips64el Mon Sep 17 19:00:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.81.2.4 2012/08/13 20:19:24 riz Exp $
+# $NetBSD: ad.mips64el,v 1.81.2.5 2012/09/17 19:00:26 riz Exp $
./libexec/ld.elf_so-64 base-compat-shlib compat,pic
./libexec/ld.elf_so-o32 base-sysutil-bin compat,pic
./usr/lib/64 base-compat-lib
@@ -73,6 +73,8 @@
./usr/lib/64/libcrypt.so.1.0 base-compat-shlib compat,pic
./usr/lib/64/libcrypto.so.8 base-compat-shlib compat,pic,crypto
./usr/lib/64/libcrypto.so.8.0 base-compat-shlib compat,pic,crypto
+./usr/lib/64/libcrypto_rc5.so.7 base-compat-shlib compat,pic,crypto,crypto_rc5
+./usr/lib/64/libcrypto_rc5.so.7.0 base-compat-shlib compat,pic,crypto,crypto_rc5
./usr/lib/64/libcurses.so.7 base-compat-shlib compat,pic
./usr/lib/64/libcurses.so.7.0 base-compat-shlib compat,pic
./usr/lib/64/libdes.so.8 base-compat-shlib compat,pic,crypto
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.156.2.4 src/distrib/sets/lists/base/md.amd64:1.156.2.5
--- src/distrib/sets/lists/base/md.amd64:1.156.2.4 Mon Aug 13 20:19:23 2012
+++ src/distrib/sets/lists/base/md.amd64 Mon Sep 17 19:00:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.156.2.4 2012/08/13 20:19:23 riz Exp $
+# $NetBSD: md.amd64,v 1.156.2.5 2012/09/17 19:00:25 riz Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -76,6 +76,8 @@
./usr/lib/i386/libcrypt.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/libcrypto.so.8 base-compat-shlib compat,pic
./usr/lib/i386/libcrypto.so.8.0 base-compat-shlib compat,pic
+./usr/lib/i386/libcrypto_rc5.so.7 base-compat-shlib compat,pic,crypto,crypto_rc5
+./usr/lib/i386/libcrypto_rc5.so.7.0 base-compat-shlib compat,pic,crypto,crypto_rc5
./usr/lib/i386/libcurses.so.7 base-compat-shlib compat,pic
./usr/lib/i386/libcurses.so.7.0 base-compat-shlib compat,pic
./usr/lib/i386/libgmp.so.10 base-compat-shlib obsolete
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.147.2.4 src/distrib/sets/lists/base/md.sparc64:1.147.2.5
--- src/distrib/sets/lists/base/md.sparc64:1.147.2.4 Mon Aug 13 20:19:24 2012
+++ src/distrib/sets/lists/base/md.sparc64 Mon Sep 17 19:00:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.147.2.4 2012/08/13 20:19:24 riz Exp $
+# $NetBSD: md.sparc64,v 1.147.2.5 2012/09/17 19:00:25 riz Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -74,6 +74,8 @@
./usr/lib/sparc/libcrypt.so.1.0 base-compat-shlib compat,pic
./usr/lib/sparc/libcrypto.so.8 base-compat-shlib compat,pic,crypto
./usr/lib/sparc/libcrypto.so.8.0 base-compat-shlib compat,pic,crypto
+./usr/lib/sparc/libcrypto_rc5.so.7 base-compat-shlib compat,pic,crypto,crypto_rc5
+./usr/lib/sparc/libcrypto_rc5.so.7.0 base-compat-shlib compat,pic,crypto,crypto_rc5
./usr/lib/sparc/libcurses.so.7 base-compat-shlib compat,pic
./usr/lib/sparc/libcurses.so.7.0 base-compat-shlib compat,pic
./usr/lib/sparc/libdes.so.8 base-compat-shlib compat,pic,crypto
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.616.2.4 src/distrib/sets/lists/base/shl.mi:1.616.2.5
--- src/distrib/sets/lists/base/shl.mi:1.616.2.4 Mon Aug 13 20:19:23 2012
+++ src/distrib/sets/lists/base/shl.mi Mon Sep 17 19:00:25 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.616.2.4 2012/08/13 20:19:23 riz Exp $
+# $NetBSD: shl.mi,v 1.616.2.5 2012/09/17 19:00:25 riz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -184,6 +184,10 @@
./usr/lib/libcrypto.so base-crypto-shlib crypto
./usr/lib/libcrypto.so.8 base-crypto-shlib crypto
./usr/lib/libcrypto.so.8.0 base-crypto-shlib crypto
+./usr/lib/libcrypto_rc5.so base-crypto-shlib crypto,crypto_rc5
+./usr/lib/libcrypto_rc5.so.7 base-crypto-shlib crypto,crypto_rc5
+./usr/lib/libcrypto_rc5.so.7.0 base-crypto-shlib crypto,crypto_rc5
+./usr/lib/libcrypto_rc5_pic.a base-crypto-shlib crypto,crypto_rc5
./usr/lib/libctf.so base-sys-shlib dtrace
./usr/lib/libctf.so.2 base-sys-shlib dtrace
./usr/lib/libctf.so.2.0 base-sys-shlib dtrace
Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.4 src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.5
--- src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.4 Mon Aug 13 20:19:22 2012
+++ src/distrib/sets/lists/comp/ad.mips64eb Mon Sep 17 19:00:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.69.2.4 2012/08/13 20:19:22 riz Exp $
+# $NetBSD: ad.mips64eb,v 1.69.2.5 2012/09/17 19:00:27 riz Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -213,14 +213,17 @@
./usr/lib/64/libcrypt_pic.a comp-c-piclib compat,pic
./usr/lib/64/libcrypto.a comp-c-lib compat,crypto
./usr/lib/64/libcrypto.so base-sys-shlib compat,crypto,pic
-./usr/lib/64/libcrypto_idea.a comp-c-lib crypto_idea,compat
-./usr/lib/64/libcrypto_idea_p.a comp-c-proflib crypto_idea,compat,profile
-./usr/lib/64/libcrypto_mdc2.a comp-c-lib crypto_mdc2,compat
-./usr/lib/64/libcrypto_mdc2_p.a comp-c-proflib crypto_mdc2,compat,profile
+./usr/lib/64/libcrypto_idea.a comp-obsolete obsolete
+./usr/lib/64/libcrypto_idea_p.a comp-obsolete obsolete
+./usr/lib/64/libcrypto_mdc2.a comp-obsolete obsolete
+./usr/lib/64/libcrypto_mdc2_p.a comp-obsolete obsolete
./usr/lib/64/libcrypto_p.a comp-c-proflib compat,crypto,profile
./usr/lib/64/libcrypto_pic.a comp-c-piclib compat,crypto,pic
./usr/lib/64/libcrypto_rc5.a comp-c-lib crypto_rc5,compat
+./usr/lib/64/libcrypto_rc5.so base-sys-shlib compat,crypto,crypto_rc5,pic
+./usr/lib/64/libcrypto_rc5_g.a comp-c-proflib compat,crypto,crypto_rc5,debuglib
./usr/lib/64/libcrypto_rc5_p.a comp-c-proflib crypto_rc5,compat,profile
+./usr/lib/64/libcrypto_rc5_pic.a comp-c-piclib compat,crypto,crypto_rc5,pic
./usr/lib/64/libcurses.a comp-c-lib compat
./usr/lib/64/libcurses.so base-sys-shlib compat,pic
./usr/lib/64/libcurses_p.a comp-c-proflib compat,profile
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.69.2.5 src/distrib/sets/lists/comp/ad.mips64el:1.69.2.6
--- src/distrib/sets/lists/comp/ad.mips64el:1.69.2.5 Mon Aug 13 20:19:21 2012
+++ src/distrib/sets/lists/comp/ad.mips64el Mon Sep 17 19:00:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.69.2.5 2012/08/13 20:19:21 riz Exp $
+# $NetBSD: ad.mips64el,v 1.69.2.6 2012/09/17 19:00:27 riz Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45
@@ -213,14 +213,17 @@
./usr/lib/64/libcrypt_pic.a comp-c-piclib compat,pic
./usr/lib/64/libcrypto.a comp-c-lib compat,crypto
./usr/lib/64/libcrypto.so base-sys-shlib compat,crypto,pic
-./usr/lib/64/libcrypto_idea.a comp-c-lib crypto_idea,compat
-./usr/lib/64/libcrypto_idea_p.a comp-c-proflib crypto_idea,compat,profile
-./usr/lib/64/libcrypto_mdc2.a comp-c-lib crypto_mdc2,compat
-./usr/lib/64/libcrypto_mdc2_p.a comp-c-proflib crypto_mdc2,compat,profile
+./usr/lib/64/libcrypto_idea.a comp-obsolete obsolete
+./usr/lib/64/libcrypto_idea_p.a comp-obsolete obsolete
+./usr/lib/64/libcrypto_mdc2.a comp-obsolete obsolete
+./usr/lib/64/libcrypto_mdc2_p.a comp-obsolete obsolete
./usr/lib/64/libcrypto_p.a comp-c-proflib compat,crypto,profile
./usr/lib/64/libcrypto_pic.a comp-c-piclib compat,crypto,pic
./usr/lib/64/libcrypto_rc5.a comp-c-lib crypto_rc5,compat
+./usr/lib/64/libcrypto_rc5.so base-sys-shlib compat,crypto,crypto_rc5,pic
+./usr/lib/64/libcrypto_rc5_g.a comp-c-proflib compat,crypto,crypto_rc5,debuglib
./usr/lib/64/libcrypto_rc5_p.a comp-c-proflib crypto_rc5,compat,profile
+./usr/lib/64/libcrypto_rc5_pic.a comp-c-piclib compat,crypto,crypto_rc5,pic
./usr/lib/64/libcurses.a comp-c-lib compat
./usr/lib/64/libcurses.so base-sys-shlib compat,pic
./usr/lib/64/libcurses_p.a comp-c-proflib compat,profile
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.155.2.4 src/distrib/sets/lists/comp/md.amd64:1.155.2.5
--- src/distrib/sets/lists/comp/md.amd64:1.155.2.4 Mon Aug 13 20:19:23 2012
+++ src/distrib/sets/lists/comp/md.amd64 Mon Sep 17 19:00:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.155.2.4 2012/08/13 20:19:23 riz Exp $
+# $NetBSD: md.amd64,v 1.155.2.5 2012/09/17 19:00:27 riz Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -479,14 +479,17 @@
./usr/lib/i386/libcrypto.a comp-c-lib compat
./usr/lib/i386/libcrypto.so comp-sys-shlib compat,pic
./usr/lib/i386/libcrypto_g.a comp-c-proflib compat,debuglib
-./usr/lib/i386/libcrypto_idea.a comp-c-lib crypto_idea,compat
-./usr/lib/i386/libcrypto_idea_p.a comp-c-proflib crypto_idea,compat,profile
-./usr/lib/i386/libcrypto_mdc2.a comp-c-lib crypto_mdc2,compat
-./usr/lib/i386/libcrypto_mdc2_p.a comp-c-proflib crypto_mdc2,compat,profile
+./usr/lib/i386/libcrypto_idea.a comp-obsolete obsolete
+./usr/lib/i386/libcrypto_idea_p.a comp-obsolete obsolete
+./usr/lib/i386/libcrypto_mdc2.a comp-obsolete obsolete
+./usr/lib/i386/libcrypto_mdc2_p.a comp-obsolete obsolete
./usr/lib/i386/libcrypto_p.a comp-c-proflib compat,profile
./usr/lib/i386/libcrypto_pic.a comp-c-piclib compat,pic
./usr/lib/i386/libcrypto_rc5.a comp-c-lib crypto_rc5,compat
+./usr/lib/i386/libcrypto_rc5.so base-sys-shlib compat,crypto,crypto_rc5,pic
+./usr/lib/i386/libcrypto_rc5_g.a comp-c-proflib compat,crypto,crypto_rc5,debuglib
./usr/lib/i386/libcrypto_rc5_p.a comp-c-proflib crypto_rc5,compat,profile
+./usr/lib/i386/libcrypto_rc5_pic.a comp-c-piclib compat,crypto,crypto_rc5,pic
./usr/lib/i386/libcurses.a comp-c-lib compat
./usr/lib/i386/libcurses.so comp-sys-shlib compat,pic
./usr/lib/i386/libcurses_g.a comp-c-proflib compat,debuglib
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.138.2.4 src/distrib/sets/lists/comp/md.sparc64:1.138.2.5
--- src/distrib/sets/lists/comp/md.sparc64:1.138.2.4 Mon Aug 13 20:19:22 2012
+++ src/distrib/sets/lists/comp/md.sparc64 Mon Sep 17 19:00:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.138.2.4 2012/08/13 20:19:22 riz Exp $
+# $NetBSD: md.sparc64,v 1.138.2.5 2012/09/17 19:00:27 riz Exp $
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
@@ -326,17 +326,19 @@
./usr/lib/sparc/libcrypto.a comp-c-lib compat,crypto
./usr/lib/sparc/libcrypto.so base-sys-shlib compat,pic,crypto
./usr/lib/sparc/libcrypto_g.a -unknown- compat,debuglib,crypto
-./usr/lib/sparc/libcrypto_idea.a comp-c-lib crypto_idea,compat
-./usr/lib/sparc/libcrypto_idea_g.a -unknown- crypto_idea,compat,debuglib
-./usr/lib/sparc/libcrypto_idea_p.a comp-c-proflib crypto_idea,compat,profile
-./usr/lib/sparc/libcrypto_mdc2.a comp-c-lib crypto_mdc2,compat
-./usr/lib/sparc/libcrypto_mdc2_g.a -unknown- crypto_mdc2,compat,debuglib
-./usr/lib/sparc/libcrypto_mdc2_p.a comp-c-proflib crypto_mdc2,compat,profile
+./usr/lib/sparc/libcrypto_idea.a comp-obsolete obsolete
+./usr/lib/sparc/libcrypto_idea_g.a comp-obsolete obsolete
+./usr/lib/sparc/libcrypto_idea_p.a comp-obsolete obsolete
+./usr/lib/sparc/libcrypto_mdc2.a comp-obsolete obsolete
+./usr/lib/sparc/libcrypto_mdc2_g.a comp-obsolete obsolete
+./usr/lib/sparc/libcrypto_mdc2_p.a comp-obsolete obsolete
./usr/lib/sparc/libcrypto_p.a comp-c-proflib compat,profile,crypto
./usr/lib/sparc/libcrypto_pic.a comp-c-piclib compat,pic,crypto
./usr/lib/sparc/libcrypto_rc5.a comp-c-lib crypto_rc5,compat
+./usr/lib/sparc/libcrypto_rc5.so base-sys-shlib compat,crypto,crypto_rc5,pic
./usr/lib/sparc/libcrypto_rc5_g.a -unknown- crypto_rc5,compat,debuglib
./usr/lib/sparc/libcrypto_rc5_p.a comp-c-proflib crypto_rc5,compat,profile
+./usr/lib/sparc/libcrypto_rc5_pic.a comp-c-piclib compat,crypto,crypto_rc5,pic
./usr/lib/sparc/libcurses.a comp-c-lib compat
./usr/lib/sparc/libcurses.so base-sys-shlib compat,pic
./usr/lib/sparc/libcurses_g.a -unknown- compat,debuglib
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1738.2.6 src/distrib/sets/lists/comp/mi:1.1738.2.7
--- src/distrib/sets/lists/comp/mi:1.1738.2.6 Mon Aug 13 20:19:20 2012
+++ src/distrib/sets/lists/comp/mi Mon Sep 17 19:00:28 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1738.2.6 2012/08/13 20:19:20 riz Exp $
+# $NetBSD: mi,v 1.1738.2.7 2012/09/17 19:00:28 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2765,12 +2765,12 @@
./usr/lib/libcrypt_p.a comp-c-proflib profile
./usr/lib/libcrypto.a comp-c-lib crypto
./usr/lib/libcrypto_g.a -unknown- debuglib,crypto
-./usr/lib/libcrypto_idea.a comp-c-lib crypto_idea
-./usr/lib/libcrypto_idea_g.a -unknown- debuglib,crypto_idea
-./usr/lib/libcrypto_idea_p.a comp-c-proflib profile,crypto_idea
-./usr/lib/libcrypto_mdc2.a comp-c-lib crypto_mdc2
-./usr/lib/libcrypto_mdc2_g.a -unknown- debuglib,crypto_mdc2
-./usr/lib/libcrypto_mdc2_p.a comp-c-proflib profile,crypto_mdc2
+./usr/lib/libcrypto_idea.a comp-obsolete obsolete
+./usr/lib/libcrypto_idea_g.a comp-obsolete obsolete
+./usr/lib/libcrypto_idea_p.a comp-obsolete obsolete
+./usr/lib/libcrypto_mdc2.a comp-obsolete obsolete
+./usr/lib/libcrypto_mdc2_g.a comp-obsolete obsolete
+./usr/lib/libcrypto_mdc2_p.a comp-obsolete obsolete
./usr/lib/libcrypto_p.a comp-c-proflib profile,crypto
./usr/lib/libcrypto_rc5.a comp-c-lib crypto_rc5
./usr/lib/libcrypto_rc5_g.a -unknown- debuglib,crypto_rc5
@@ -4354,8 +4354,8 @@
./usr/libdata/lint/llib-lcompat.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lcrypt.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lcrypto.ln comp-c-lintlib lint,crypto
-./usr/libdata/lint/llib-lcrypto_idea.ln comp-c-lintlib lint,crypto_idea
-./usr/libdata/lint/llib-lcrypto_mdc2.ln comp-c-lintlib lint,crypto_mdc2
+./usr/libdata/lint/llib-lcrypto_idea.ln comp-obsolete obsolete
+./usr/libdata/lint/llib-lcrypto_mdc2.ln comp-obsolete obsolete
./usr/libdata/lint/llib-lcrypto_rc5.ln comp-c-lintlib lint,crypto_rc5
./usr/libdata/lint/llib-lcurses.ln comp-c-lintlib lint
./usr/libdata/lint/llib-ldes.ln comp-c-lintlib lint,crypto
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.209.2.4 src/distrib/sets/lists/comp/shl.mi:1.209.2.5
--- src/distrib/sets/lists/comp/shl.mi:1.209.2.4 Mon Aug 13 20:19:22 2012
+++ src/distrib/sets/lists/comp/shl.mi Mon Sep 17 19:00:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.209.2.4 2012/08/13 20:19:22 riz Exp $
+# $NetBSD: shl.mi,v 1.209.2.5 2012/09/17 19:00:32 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -253,6 +253,7 @@
./usr/libdata/debug/usr/lib/libcom_err.so.7.0.debug comp-krb5-debug kerberos,debug
./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libcrypto.so.8.0.debug comp-crypto-debug crypto,debug
+./usr/libdata/debug/usr/lib/libcrypto_rc5.so.7.0.debug comp-crypto-debug crypto,crypto_rc5,debug
./usr/libdata/debug/usr/lib/libctf.so.2.0.debug comp-sys-debug dtrace,debug
./usr/libdata/debug/usr/lib/libcurses.so.7.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libdes.so.8.1.debug comp-crypto-debug crypto,debug
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.439.2.2 src/distrib/sets/lists/tests/mi:1.439.2.3
--- src/distrib/sets/lists/tests/mi:1.439.2.2 Sat Jun 23 22:54:59 2012
+++ src/distrib/sets/lists/tests/mi Mon Sep 17 19:00:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.439.2.2 2012/06/23 22:54:59 riz Exp $
+# $NetBSD: mi,v 1.439.2.3 2012/09/17 19:00:34 riz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -195,13 +195,13 @@
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_enginetest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_evp_test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_exptest.debug tests-crypto-debug debug,crypto
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ideatest.debug tests-crypto-debug debug,crypto_idea,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ideatest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_hmactest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_lhashtest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md2test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md4test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md5test.debug tests-crypto-debug debug,crypto
-./usr/libdata/debug/usr/tests/crypto/libcrypto/h_mdc2test.debug tests-crypto-debug debug,crypto_mdc2,crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_mdc2test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_randtest.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc2test.debug tests-crypto-debug debug,crypto
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_rc4test.debug tests-crypto-debug debug,crypto
@@ -1367,12 +1367,12 @@
./usr/tests/crypto/libcrypto/evptests.txt tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_exptest tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_hmactest tests-crypto-tests crypto
-./usr/tests/crypto/libcrypto/h_ideatest tests-crypto-tests crypto_idea,crypto
+./usr/tests/crypto/libcrypto/h_ideatest tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_lhashtest tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_md2test tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_md4test tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_md5test tests-crypto-tests crypto
-./usr/tests/crypto/libcrypto/h_mdc2test tests-crypto-tests crypto_mdc2,crypto
+./usr/tests/crypto/libcrypto/h_mdc2test tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_randtest tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_rc2test tests-crypto-tests crypto
./usr/tests/crypto/libcrypto/h_rc4test tests-crypto-tests crypto
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.396.2.1 src/etc/Makefile:1.396.2.2
--- src/etc/Makefile:1.396.2.1 Fri Aug 17 20:50:51 2012
+++ src/etc/Makefile Mon Sep 17 19:00:34 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.396.2.1 2012/08/17 20:50:51 martin Exp $
+# $NetBSD: Makefile,v 1.396.2.2 2012/09/17 19:00:34 riz Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -188,7 +188,7 @@ RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID
MACHINE MACHINE_ARCH MAKE MAKECONF MAKEFLAGS \
MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \
MKBFD MKBINUTILS MKCATPAGES \
- MKCRYPTO MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKCVS \
+ MKCRYPTO MKCRYPTO_RC5 MKCVS \
MKDEBUG MKDEBUGLIB MKDOC MKDTRACE MKDYNAMICROOT \
MKGCC MKGCCCMDS MKGDB \
MKHESIOD MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \
Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.58 src/share/man/man5/mk.conf.5:1.58.2.1
--- src/share/man/man5/mk.conf.5:1.58 Sun Nov 6 22:34:47 2011
+++ src/share/man/man5/mk.conf.5 Mon Sep 17 19:00:26 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.58 2011/11/06 22:34:47 tron Exp $
+.\" $NetBSD: mk.conf.5,v 1.58.2.1 2012/09/17 19:00:26 riz Exp $
.\"
.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -266,18 +266,6 @@ If
acts as
.Sy MKKERBEROS=no .
.
-.It Sy MKCRYPTO_IDEA
-.YorN
-Indicates whether IDEA support will be built into
-.Sy libcrypto_idea.a .
-.DFLTn
-.
-.It Sy MKCRYPTO_MDC2
-.YorN
-Indicates whether MDC2 support will be built into
-.Sy libcrypto_mdc2.a .
-.DFLTn
-.
.It Sy MKCRYPTO_RC5
.YorN
Indicates whether RC5 support will be built into
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.292.2.2 src/share/mk/bsd.README:1.292.2.3
--- src/share/mk/bsd.README:1.292.2.2 Fri Mar 2 18:27:55 2012
+++ src/share/mk/bsd.README Mon Sep 17 19:00:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.292.2.2 2012/03/02 18:27:55 riz Exp $
+# $NetBSD: bsd.README,v 1.292.2.3 2012/09/17 19:00:33 riz Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -140,12 +140,6 @@ MKCRYPTO If "no", no cryptography suppor
and also acts as "MKKERBEROS=no".
Default: yes
-MKCRYPTO_IDEA If not "no", IDEA support will be built into libcrypto_idea.a.
- Default: no
-
-MKCRYPTO_MDC2 If not "no", MDC2 support will be built into libcrypto_mdc2.a
- Default: no
-
MKCRYPTO_RC5 If not "no", RC5 support will be built into libcrypto_rc5.a.
Default: no
@@ -1402,8 +1396,6 @@ DPADD Additional dependencies for the p
LIBCRT0?= ${DESTDIR}/usr/lib/crt0.o
LIBCRYPT?= ${DESTDIR}/usr/lib/libcrypt.a
LIBCRYPTO?= ${DESTDIR}/usr/lib/libcrypto.a
- LIBCRYPTO_IDEA?=${DESTDIR}/usr/lib/libcrypto_idea.a
- LIBCRYPTO_MDC2?=${DESTDIR}/usr/lib/libcrypto_mdc2.a
LIBCRYPTO_RC5?= ${DESTDIR}/usr/lib/libcrypto_rc5.a
LIBCURSES?= ${DESTDIR}/usr/lib/libcurses.a
LIBC_PIC?= ${DESTDIR}/usr/lib/libc_pic.a
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.696.2.2 src/share/mk/bsd.own.mk:1.696.2.3
--- src/share/mk/bsd.own.mk:1.696.2.2 Thu May 17 18:02:30 2012
+++ src/share/mk/bsd.own.mk Mon Sep 17 19:00:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.696.2.2 2012/05/17 18:02:30 riz Exp $
+# $NetBSD: bsd.own.mk,v 1.696.2.3 2012/09/17 19:00:33 riz Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -840,7 +840,7 @@ ${var}?= yes
#
_MKVARS.no= \
MKBSDGREP MKBSDTAR \
- MKCATPAGES MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG \
+ MKCATPAGES MKCRYPTO_RC5 MKDEBUG \
MKDEBUGLIB MKDTRACE MKEXTSRC \
MKMANZ MKOBJDIRS \
MKLLVM MKPCC \
Index: src/tests/crypto/libcrypto/t_ciphers.sh
diff -u src/tests/crypto/libcrypto/t_ciphers.sh:1.3 src/tests/crypto/libcrypto/t_ciphers.sh:1.3.4.1
--- src/tests/crypto/libcrypto/t_ciphers.sh:1.3 Thu Jun 9 05:25:21 2011
+++ src/tests/crypto/libcrypto/t_ciphers.sh Mon Sep 17 19:00:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_ciphers.sh,v 1.3 2011/06/09 05:25:21 spz Exp $
+# $NetBSD: t_ciphers.sh,v 1.3.4.1 2012/09/17 19:00:26 riz Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -93,9 +93,6 @@ idea_head()
}
idea_body()
{
- [ -x "$(atf_get_srcdir)/h_ideatest" ] \
- || atf_skip "IDEA support not available; system built" \
- "with MKCRYPTO_IDEA=no"
atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_ideatest"
}
Index: src/tests/crypto/libcrypto/t_hashes.sh
diff -u src/tests/crypto/libcrypto/t_hashes.sh:1.1 src/tests/crypto/libcrypto/t_hashes.sh:1.1.8.1
--- src/tests/crypto/libcrypto/t_hashes.sh:1.1 Sat Jul 10 16:43:25 2010
+++ src/tests/crypto/libcrypto/t_hashes.sh Mon Sep 17 19:00:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_hashes.sh,v 1.1 2010/07/10 16:43:25 jmmv Exp $
+# $NetBSD: t_hashes.sh,v 1.1.8.1 2012/09/17 19:00:26 riz Exp $
#
# Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -93,9 +93,6 @@ mdc2_head()
}
mdc2_body()
{
- [ -x "$(atf_get_srcdir)/h_mdc2test" ] \
- || atf_skip "MDC2 support not available; system built" \
- "with MKCRYPTO_MDC2=no"
atf_check -o ignore -e ignore "$(atf_get_srcdir)/h_mdc2test"
}
Index: src/usr.sbin/racoon/Makefile
diff -u src/usr.sbin/racoon/Makefile:1.24 src/usr.sbin/racoon/Makefile:1.24.2.1
--- src/usr.sbin/racoon/Makefile:1.24 Wed Jan 4 15:55:36 2012
+++ src/usr.sbin/racoon/Makefile Mon Sep 17 19:00:33 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2012/01/04 15:55:36 drochner Exp $
+# $NetBSD: Makefile,v 1.24.2.1 2012/09/17 19:00:33 riz Exp $
WARNS?= 0 # XXX third-party program, many issues
NOCLANGERROR= # defined
@@ -51,11 +51,6 @@ LDADD+= -lgssapi -lkrb5 -lhx509 -lheimnt
DPADD+= ${LIBGSSAPI} ${LIBKRB5} ${LIBHX509} ${LIBHEIMNTLM} ${LIBCOM_ERR} \
${LIBROKEN} ${LIBASN1}
.endif
-.if (${MKCRYPTO_IDEA} != "no")
-CPPFLAGS+=-DHAVE_OPENSSL_IDEA_H
-LDADD+= -lcrypto_idea
-LDADD+= ${LIBCRYPTO_IDEA}
-.endif
.if (${MKCRYPTO_RC5} != "no")
CPPFLAGS+=-DHAVE_OPENSSL_RC5_H
LDADD+= -lcrypto_rc5
