Module Name: src
Committed By: spz
Date: Sat Jul 14 16:04:06 UTC 2012
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/base: shl.mi
src/share/man/man5: mk.conf.5
src/share/mk: bsd.README bsd.own.mk
src/tests/crypto/libcrypto: t_ciphers.sh t_hashes.sh
Log Message:
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.136 -r1.137 src/distrib/sets/sets.subr
cvs rdiff -u -r1.631 -r1.632 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.59 -r1.60 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.296 -r1.297 src/share/mk/bsd.README
cvs rdiff -u -r1.699 -r1.700 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.3 -r1.4 src/tests/crypto/libcrypto/t_ciphers.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/libcrypto/t_hashes.sh
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.136 src/distrib/sets/sets.subr:1.137
--- src/distrib/sets/sets.subr:1.136 Fri Feb 17 00:00:39 2012
+++ src/distrib/sets/sets.subr Sat Jul 14 16:04:04 2012
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.136 2012/02/17 00:00:39 christos Exp $
+# $NetBSD: sets.subr,v 1.137 2012/07/14 16:04:04 spz 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.136 2012/02/17 00:00:39 christos Exp $
+# # $NetBSD: sets.subr,v 1.137 2012/07/14 16:04:04 spz 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/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.631 src/distrib/sets/lists/base/shl.mi:1.632
--- src/distrib/sets/lists/base/shl.mi:1.631 Wed Jul 11 22:42:39 2012
+++ src/distrib/sets/lists/base/shl.mi Sat Jul 14 16:04:05 2012
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.631 2012/07/11 22:42:39 jmmv Exp $
+# $NetBSD: shl.mi,v 1.632 2012/07/14 16:04:05 spz Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -194,8 +194,10 @@
./usr/lib/libcrypto_idea.so.7.0 base-obsolete obsolete
./usr/lib/libcrypto_mdc2.so.7 base-obsolete obsolete
./usr/lib/libcrypto_mdc2.so.7.0 base-obsolete obsolete
+./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/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.59 src/share/man/man5/mk.conf.5:1.60
--- src/share/man/man5/mk.conf.5:1.59 Sun Mar 11 23:42:06 2012
+++ src/share/man/man5/mk.conf.5 Sat Jul 14 16:04:05 2012
@@ -1,4 +1,4 @@
-.\" $NetBSD: mk.conf.5,v 1.59 2012/03/11 23:42:06 njoly Exp $
+.\" $NetBSD: mk.conf.5,v 1.60 2012/07/14 16:04:05 spz 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.296 src/share/mk/bsd.README:1.297
--- src/share/mk/bsd.README:1.296 Tue Jun 19 06:20:13 2012
+++ src/share/mk/bsd.README Sat Jul 14 16:04:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.296 2012/06/19 06:20:13 plunky Exp $
+# $NetBSD: bsd.README,v 1.297 2012/07/14 16:04:06 spz Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make "include" files for the NetBSD
@@ -140,13 +140,7 @@ 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.
+MKCRYPTO_RC5 If not "no", RC5 support will be built into libcrypto_rc5
Default: no
MKCVS If "no", don't build or install cvs(1).
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.699 src/share/mk/bsd.own.mk:1.700
--- src/share/mk/bsd.own.mk:1.699 Fri Jun 22 20:32:35 2012
+++ src/share/mk/bsd.own.mk Sat Jul 14 16:04:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.699 2012/06/22 20:32:35 abs Exp $
+# $NetBSD: bsd.own.mk,v 1.700 2012/07/14 16:04:06 spz Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -841,7 +841,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.4
--- src/tests/crypto/libcrypto/t_ciphers.sh:1.3 Thu Jun 9 05:25:21 2011
+++ src/tests/crypto/libcrypto/t_ciphers.sh Sat Jul 14 16:04:06 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.4 2012/07/14 16:04:06 spz 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.2
--- src/tests/crypto/libcrypto/t_hashes.sh:1.1 Sat Jul 10 16:43:25 2010
+++ src/tests/crypto/libcrypto/t_hashes.sh Sat Jul 14 16:04:06 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.2 2012/07/14 16:04:06 spz 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"
}
