Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src more MKCRYPTO_IDEA and MKCRYPTO_MDC2 removal (resp, adjustme...
details: https://anonhg.NetBSD.org/src/rev/eef38c3f81f5
branches: trunk
changeset: 780183:eef38c3f81f5
user: spz <spz%NetBSD.org@localhost>
date: Sat Jul 14 16:04:04 2012 +0000
description:
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
diffstat:
distrib/sets/lists/base/shl.mi | 4 +++-
distrib/sets/sets.subr | 6 ++----
share/man/man5/mk.conf.5 | 14 +-------------
share/mk/bsd.README | 10 ++--------
share/mk/bsd.own.mk | 4 ++--
tests/crypto/libcrypto/t_ciphers.sh | 5 +----
tests/crypto/libcrypto/t_hashes.sh | 5 +----
7 files changed, 12 insertions(+), 36 deletions(-)
diffs (155 lines):
diff -r 244480743319 -r eef38c3f81f5 distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi Sat Jul 14 15:06:26 2012 +0000
+++ b/distrib/sets/lists/base/shl.mi Sat Jul 14 16:04:04 2012 +0000
@@ -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
diff -r 244480743319 -r eef38c3f81f5 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr Sat Jul 14 15:06:26 2012 +0000
+++ b/distrib/sets/sets.subr Sat Jul 14 16:04:04 2012 +0000
@@ -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 @@
# 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 @@
# 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
diff -r 244480743319 -r eef38c3f81f5 share/man/man5/mk.conf.5
--- a/share/man/man5/mk.conf.5 Sat Jul 14 15:06:26 2012 +0000
+++ b/share/man/man5/mk.conf.5 Sat Jul 14 16:04:04 2012 +0000
@@ -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 @@
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
diff -r 244480743319 -r eef38c3f81f5 share/mk/bsd.README
--- a/share/mk/bsd.README Sat Jul 14 15:06:26 2012 +0000
+++ b/share/mk/bsd.README Sat Jul 14 16:04:04 2012 +0000
@@ -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 @@
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).
diff -r 244480743319 -r eef38c3f81f5 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk Sat Jul 14 15:06:26 2012 +0000
+++ b/share/mk/bsd.own.mk Sat Jul 14 16:04:04 2012 +0000
@@ -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 @@
#
_MKVARS.no= \
MKBSDGREP MKBSDTAR \
- MKCATPAGES MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKDEBUG \
+ MKCATPAGES MKCRYPTO_RC5 MKDEBUG \
MKDEBUGLIB MKDTRACE MKEXTSRC \
MKMANZ MKOBJDIRS \
MKLLVM MKPCC \
diff -r 244480743319 -r eef38c3f81f5 tests/crypto/libcrypto/t_ciphers.sh
--- a/tests/crypto/libcrypto/t_ciphers.sh Sat Jul 14 15:06:26 2012 +0000
+++ b/tests/crypto/libcrypto/t_ciphers.sh Sat Jul 14 16:04:04 2012 +0000
@@ -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_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"
}
diff -r 244480743319 -r eef38c3f81f5 tests/crypto/libcrypto/t_hashes.sh
--- a/tests/crypto/libcrypto/t_hashes.sh Sat Jul 14 15:06:26 2012 +0000
+++ b/tests/crypto/libcrypto/t_hashes.sh Sat Jul 14 16:04:04 2012 +0000
@@ -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_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"
}
Home |
Main Index |
Thread Index |
Old Index