Module Name: src
Committed By: pooka
Date: Sun Dec 5 20:11:23 UTC 2010
Modified Files:
src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64
md.sparc64 shl.mi
src/distrib/sets/lists/comp: ad.mips64eb ad.mips64el md.amd64
md.sparc64 mi shl.mi
src/lib: Makefile
src/sys/rump/kern: Makefile.rumpkerncomp
src/sys/rump/librump: Makefile
Added Files:
src/sys/rump/kern/lib/libcrypto: Makefile shlib_version
Removed Files:
src/lib/librumpcrypto: Makefile
src/sys/rump/librump/rumpcrypto: Makefile Makefile.rumpcrypto
Log Message:
rumpcrypto should never have been its own faction, so finally make
it a component under kern, i.e. rumpcrypto -> rumpkern_crypto.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.103 -r1.104 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.560 -r1.561 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/comp/ad.mips64eb \
src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.83 -r1.84 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.1529 -r1.1530 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.142 -r1.143 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.156 -r1.157 src/lib/Makefile
cvs rdiff -u -r1.1 -r0 src/lib/librumpcrypto/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/kern/Makefile.rumpkerncomp
cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libcrypto/Makefile \
src/sys/rump/kern/lib/libcrypto/shlib_version
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/librump/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/rump/librump/rumpcrypto/Makefile
cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpcrypto/Makefile.rumpcrypto
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/lists/base/ad.mips64eb
diff -u src/distrib/sets/lists/base/ad.mips64eb:1.31 src/distrib/sets/lists/base/ad.mips64eb:1.32
--- src/distrib/sets/lists/base/ad.mips64eb:1.31 Sun Dec 5 06:02:28 2010
+++ src/distrib/sets/lists/base/ad.mips64eb Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.31 2010/12/05 06:02:28 christos Exp $
+# $NetBSD: ad.mips64eb,v 1.32 2010/12/05 20:11:22 pooka 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
@@ -193,8 +193,8 @@
./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic
./usr/lib/64/librumpuser.so.0.0 base-compat-shlib compat,pic
-./usr/lib/64/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
-./usr/lib/64/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
+./usr/lib/64/librumpcrypto.so.0 base-obsolete obsolete
+./usr/lib/64/librumpcrypto.so.0.0 base-obsolete obsolete
./usr/lib/64/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/64/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/librumpvfs.so.0 base-compat-shlib compat,pic
@@ -446,8 +446,8 @@
./usr/lib/o32/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpuser.so.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpuser.so.0.0 base-compat-shlib compat,pic
-./usr/lib/o32/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
-./usr/lib/o32/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
+./usr/lib/o32/librumpcrypto.so.0 base-obsolete obsolete
+./usr/lib/o32/librumpcrypto.so.0.0 base-obsolete obsolete
./usr/lib/o32/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpvfs.so.0 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.29 src/distrib/sets/lists/base/ad.mips64el:1.30
--- src/distrib/sets/lists/base/ad.mips64el:1.29 Sun Dec 5 06:02:28 2010
+++ src/distrib/sets/lists/base/ad.mips64el Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.29 2010/12/05 06:02:28 christos Exp $
+# $NetBSD: ad.mips64el,v 1.30 2010/12/05 20:11:22 pooka 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
@@ -193,8 +193,8 @@
./usr/lib/64/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/librumpuser.so.0 base-compat-shlib compat,pic
./usr/lib/64/librumpuser.so.0.0 base-compat-shlib compat,pic
-./usr/lib/64/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
-./usr/lib/64/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
+./usr/lib/64/librumpcrypto.so.0 base-obsolete obsolete
+./usr/lib/64/librumpcrypto.so.0.0 base-obsolete obsolete
./usr/lib/64/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/64/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/64/librumpvfs.so.0 base-compat-shlib compat,pic
@@ -446,8 +446,8 @@
./usr/lib/o32/librumpnet.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpuser.so.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpuser.so.0.0 base-compat-shlib compat,pic
-./usr/lib/o32/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
-./usr/lib/o32/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
+./usr/lib/o32/librumpcrypto.so.0 base-obsolete obsolete
+./usr/lib/o32/librumpcrypto.so.0.0 base-obsolete obsolete
./usr/lib/o32/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/o32/librumpvfs.so.0 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.103 src/distrib/sets/lists/base/md.amd64:1.104
--- src/distrib/sets/lists/base/md.amd64:1.103 Sun Dec 5 06:02:28 2010
+++ src/distrib/sets/lists/base/md.amd64 Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.103 2010/12/05 06:02:28 christos Exp $
+# $NetBSD: md.amd64,v 1.104 2010/12/05 20:11:22 pooka Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -193,8 +193,8 @@
./usr/lib/i386/librt.so.1.0 base-compat-shlib compat,pic
./usr/lib/i386/librump.so.0 base-compat-shlib compat,pic
./usr/lib/i386/librump.so.0.0 base-compat-shlib compat,pic
-./usr/lib/i386/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
-./usr/lib/i386/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
+./usr/lib/i386/librumpcrypto.so.0 base-obsolete obsolete
+./usr/lib/i386/librumpcrypto.so.0.0 base-obsolete obsolete
./usr/lib/i386/librumpclient.so.0 base-compat-shlib compat,pic
./usr/lib/i386/librumpclient.so.0.0 base-compat-shlib compat,pic
./usr/lib/i386/librumpdev.so.0 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.97 src/distrib/sets/lists/base/md.sparc64:1.98
--- src/distrib/sets/lists/base/md.sparc64:1.97 Sun Dec 5 06:02:28 2010
+++ src/distrib/sets/lists/base/md.sparc64 Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.97 2010/12/05 06:02:28 christos Exp $
+# $NetBSD: md.sparc64,v 1.98 2010/12/05 20:11:22 pooka Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -192,8 +192,8 @@
./usr/lib/sparc/librump.so.0.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpclient.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpclient.so.0.0 base-compat-shlib compat,pic
-./usr/lib/sparc/librumpcrypto.so.0 base-compat-shlib compat,pic,crypto
-./usr/lib/sparc/librumpcrypto.so.0.0 base-compat-shlib compat,pic,crypto
+./usr/lib/sparc/librumpcrypto.so.0 base-obsolete obsolete
+./usr/lib/sparc/librumpcrypto.so.0.0 base-obsolete obsolete
./usr/lib/sparc/librumpdev.so.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpdev.so.0.0 base-compat-shlib compat,pic
./usr/lib/sparc/librumpnet.so.0 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.560 src/distrib/sets/lists/base/shl.mi:1.561
--- src/distrib/sets/lists/base/shl.mi:1.560 Sun Dec 5 06:02:28 2010
+++ src/distrib/sets/lists/base/shl.mi Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.560 2010/12/05 06:02:28 christos Exp $
+# $NetBSD: shl.mi,v 1.561 2010/12/05 20:11:22 pooka Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -378,9 +378,9 @@
./usr/lib/librumpclient.so base-rumpclient-shlib
./usr/lib/librumpclient.so.0 base-rumpclient-shlib
./usr/lib/librumpclient.so.0.0 base-rumpclient-shlib
-./usr/lib/librumpcrypto.so base-rump-shlib crypto
-./usr/lib/librumpcrypto.so.0 base-rump-shlib crypto
-./usr/lib/librumpcrypto.so.0.0 base-rump-shlib crypto
+./usr/lib/librumpcrypto.so base-obsolete obsolete
+./usr/lib/librumpcrypto.so.0 base-obsolete obsolete
+./usr/lib/librumpcrypto.so.0.0 base-obsolete obsolete
./usr/lib/librumpdev.so base-rump-shlib
./usr/lib/librumpdev.so.0 base-rump-shlib
./usr/lib/librumpdev.so.0.0 base-rump-shlib
@@ -528,6 +528,9 @@
./usr/lib/librumpfs_union.so base-rump-shlib
./usr/lib/librumpfs_union.so.0 base-rump-shlib
./usr/lib/librumpfs_union.so.0.0 base-rump-shlib
+./usr/lib/librumpkern_crypto.so base-rump-shlib
+./usr/lib/librumpkern_crypto.so.0 base-rump-shlib
+./usr/lib/librumpkern_crypto.so.0.0 base-rump-shlib
./usr/lib/librumpkern_ksem.so base-rump-shlib
./usr/lib/librumpkern_ksem.so.0 base-rump-shlib
./usr/lib/librumpkern_ksem.so.0.0 base-rump-shlib
Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.14 src/distrib/sets/lists/comp/ad.mips64eb:1.15
--- src/distrib/sets/lists/comp/ad.mips64eb:1.14 Fri Dec 3 21:38:48 2010
+++ src/distrib/sets/lists/comp/ad.mips64eb Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.14 2010/12/03 21:38:48 plunky Exp $
+# $NetBSD: ad.mips64eb,v 1.15 2010/12/05 20:11:22 pooka Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/mips comp-c-include
@@ -471,10 +471,10 @@
./usr/lib/64/librumpclient.so base-sys-shlib compat,pic
./usr/lib/64/librumpclient_p.a comp-c-proflib compat,profile
./usr/lib/64/librumpclient_pic.a comp-c-piclib compat,pic
-./usr/lib/64/librumpcrypto.a comp-c-lib compat,crypto
-./usr/lib/64/librumpcrypto.so base-sys-shlib compat,pic,crypto
-./usr/lib/64/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
-./usr/lib/64/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
+./usr/lib/64/librumpcrypto.a comp-obsolete obsolete
+./usr/lib/64/librumpcrypto.so base-obsolete obsolete
+./usr/lib/64/librumpcrypto_p.a comp-obsolete obsolete
+./usr/lib/64/librumpcrypto_pic.a comp-obsolete obsolete
./usr/lib/64/librumpdev.a comp-c-lib compat
./usr/lib/64/librumpdev.so base-sys-shlib compat,pic
./usr/lib/64/librumpdev_p.a comp-c-proflib compat,profile
@@ -972,10 +972,10 @@
./usr/lib/o32/librumpclient.so base-sys-shlib compat,pic
./usr/lib/o32/librumpclient_p.a comp-c-proflib compat,profile
./usr/lib/o32/librumpclient_pic.a comp-c-piclib compat,pic
-./usr/lib/o32/librumpcrypto.a comp-c-lib compat,crypto
-./usr/lib/o32/librumpcrypto.so base-sys-shlib compat,pic,crypto
-./usr/lib/o32/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
-./usr/lib/o32/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
+./usr/lib/o32/librumpcrypto.a comp-obsolete obsolete
+./usr/lib/o32/librumpcrypto.so base-obsolete obsolete
+./usr/lib/o32/librumpcrypto_p.a comp-obsolete obsolete
+./usr/lib/o32/librumpcrypto_pic.a comp-obsolete obsolete
./usr/lib/o32/librumpdev.a comp-c-lib compat
./usr/lib/o32/librumpdev.so base-sys-shlib compat,pic
./usr/lib/o32/librumpdev_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.14 src/distrib/sets/lists/comp/ad.mips64el:1.15
--- src/distrib/sets/lists/comp/ad.mips64el:1.14 Fri Dec 3 21:38:48 2010
+++ src/distrib/sets/lists/comp/ad.mips64el Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.14 2010/12/03 21:38:48 plunky Exp $
+# $NetBSD: ad.mips64el,v 1.15 2010/12/05 20:11:22 pooka Exp $
./usr/bin/elf2aout comp-obsolete obsolete
./usr/bin/elf2ecoff comp-sysutil-bin
./usr/include/mips comp-c-include
@@ -471,10 +471,10 @@
./usr/lib/64/librumpclient.so base-sys-shlib compat,pic
./usr/lib/64/librumpclient_p.a comp-c-proflib compat,profile
./usr/lib/64/librumpclient_pic.a comp-c-piclib compat,pic
-./usr/lib/64/librumpcrypto.a comp-c-lib compat,crypto
-./usr/lib/64/librumpcrypto.so base-sys-shlib compat,pic,crypto
-./usr/lib/64/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
-./usr/lib/64/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
+./usr/lib/64/librumpcrypto.a comp-obsolete obsolete
+./usr/lib/64/librumpcrypto.so base-obsolete obsolete
+./usr/lib/64/librumpcrypto_p.a comp-obsolete obsolete
+./usr/lib/64/librumpcrypto_pic.a comp-obsolete obsolete
./usr/lib/64/librumpdev.a comp-c-lib compat
./usr/lib/64/librumpdev.so base-sys-shlib compat,pic
./usr/lib/64/librumpdev_p.a comp-c-proflib compat,profile
@@ -972,10 +972,10 @@
./usr/lib/o32/librumpclient.so base-sys-shlib compat,pic
./usr/lib/o32/librumpclient_p.a comp-c-proflib compat,profile
./usr/lib/o32/librumpclient_pic.a comp-c-piclib compat,pic
-./usr/lib/o32/librumpcrypto.a comp-c-lib compat,crypto
-./usr/lib/o32/librumpcrypto.so base-sys-shlib compat,pic,crypto
-./usr/lib/o32/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
-./usr/lib/o32/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
+./usr/lib/o32/librumpcrypto.a comp-obsolete obsolete
+./usr/lib/o32/librumpcrypto.so base-obsolete obsolete
+./usr/lib/o32/librumpcrypto_p.a comp-obsolete obsolete
+./usr/lib/o32/librumpcrypto_pic.a comp-obsolete obsolete
./usr/lib/o32/librumpdev.a comp-c-lib compat
./usr/lib/o32/librumpdev.so base-sys-shlib compat,pic
./usr/lib/o32/librumpdev_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.83 src/distrib/sets/lists/comp/md.amd64:1.84
--- src/distrib/sets/lists/comp/md.amd64:1.83 Sun Dec 5 06:02:28 2010
+++ src/distrib/sets/lists/comp/md.amd64 Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.83 2010/12/05 06:02:28 christos Exp $
+# $NetBSD: md.amd64,v 1.84 2010/12/05 20:11:22 pooka Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -749,11 +749,11 @@
./usr/lib/i386/librumpclient_g.a comp-c-proflib compat,debuglib
./usr/lib/i386/librumpclient_p.a comp-c-proflib compat,profile
./usr/lib/i386/librumpclient_pic.a comp-c-piclib compat,pic
-./usr/lib/i386/librumpcrypto.a comp-c-lib compat,crypto
-./usr/lib/i386/librumpcrypto.so comp-sys-shlib compat,pic,crypto
-./usr/lib/i386/librumpcrypto_g.a comp-c-proflib compat,debuglib,crypto
-./usr/lib/i386/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
-./usr/lib/i386/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
+./usr/lib/i386/librumpcrypto.a comp-obsolete obsolete
+./usr/lib/i386/librumpcrypto.so comp-obsolete obsolete
+./usr/lib/i386/librumpcrypto_g.a comp-obsolete obsolete
+./usr/lib/i386/librumpcrypto_p.a comp-obsolete obsolete
+./usr/lib/i386/librumpcrypto_pic.a comp-obsolete obsolete
./usr/lib/i386/librumpdev.a comp-c-lib compat
./usr/lib/i386/librumpdev.so comp-sys-shlib compat,pic
./usr/lib/i386/librumpdev_g.a comp-c-proflib compat,debuglib
@@ -958,7 +958,7 @@
./usr/libdata/debug/usr/lib/i386/librt.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/librump.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/librumpclient.so.0.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/librumpcrypto.so.0.0.debug comp-compat-shlib compat,pic,debug,crypto
+./usr/libdata/debug/usr/lib/i386/librumpcrypto.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/i386/librumpdev.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/librumpnet.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/librumpuser.so.0.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/md.sparc64
diff -u src/distrib/sets/lists/comp/md.sparc64:1.73 src/distrib/sets/lists/comp/md.sparc64:1.74
--- src/distrib/sets/lists/comp/md.sparc64:1.73 Sun Dec 5 06:02:28 2010
+++ src/distrib/sets/lists/comp/md.sparc64 Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.73 2010/12/05 06:02:28 christos Exp $
+# $NetBSD: md.sparc64,v 1.74 2010/12/05 20:11:22 pooka Exp $
./usr/include/ieeefp.h comp-c-include
./usr/include/sparc comp-c-include
./usr/include/sparc/_G_config.h comp-obsolete obsolete
@@ -543,10 +543,10 @@
./usr/lib/sparc/librumpclient.so base-sys-shlib compat,pic
./usr/lib/sparc/librumpclient_p.a comp-c-proflib compat,profile
./usr/lib/sparc/librumpclient_pic.a comp-c-piclib compat,pic
-./usr/lib/sparc/librumpcrypto.a comp-c-lib compat,crypto
-./usr/lib/sparc/librumpcrypto.so base-sys-shlib compat,pic,crypto
-./usr/lib/sparc/librumpcrypto_p.a comp-c-proflib compat,profile,crypto
-./usr/lib/sparc/librumpcrypto_pic.a comp-c-piclib compat,pic,crypto
+./usr/lib/sparc/librumpcrypto.a comp-obsolete obsolete
+./usr/lib/sparc/librumpcrypto.so base-obsolete obsolete
+./usr/lib/sparc/librumpcrypto_p.a comp-obsolete obsolete
+./usr/lib/sparc/librumpcrypto_pic.a comp-obsolete obsolete
./usr/lib/sparc/librumpdev.a comp-c-lib compat
./usr/lib/sparc/librumpdev.so base-sys-shlib compat,pic
./usr/lib/sparc/librumpdev_p.a comp-c-proflib compat,profile
@@ -726,7 +726,7 @@
./usr/libdata/debug/usr/lib/sparc/librpcsvc.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/librt.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/librump.so.0.0.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/librumpcrypto.so.0.0.debug comp-compat-shlib compat,pic,debug,crypto
+./usr/libdata/debug/usr/lib/sparc/librumpcrypto.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/sparc/librumpdev.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/librumpnet.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/librumpuser.so.0.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1529 src/distrib/sets/lists/comp/mi:1.1530
--- src/distrib/sets/lists/comp/mi:1.1529 Sun Dec 5 17:37:33 2010
+++ src/distrib/sets/lists/comp/mi Sun Dec 5 20:11:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1529 2010/12/05 17:37:33 pooka Exp $
+# $NetBSD: mi,v 1.1530 2010/12/05 20:11:22 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -2625,9 +2625,9 @@
./usr/lib/librumpclient.a comp-c-lib
./usr/lib/librumpclient_g.a -unknown- debuglib
./usr/lib/librumpclient_p.a comp-c-proflib profile
-./usr/lib/librumpcrypto.a comp-c-lib crypto
-./usr/lib/librumpcrypto_g.a -unknown- debuglib,crypto
-./usr/lib/librumpcrypto_p.a comp-c-proflib profile,crypto
+./usr/lib/librumpcrypto.a comp-obsolete obsolete
+./usr/lib/librumpcrypto_g.a comp-obsolete obsolete
+./usr/lib/librumpcrypto_p.a comp-obsolete obsolete
./usr/lib/librumpdev.a comp-c-lib
./usr/lib/librumpdev_audio.a comp-c-lib
./usr/lib/librumpdev_audio_g.a -unknown- debuglib
@@ -2775,6 +2775,9 @@
./usr/lib/librumpfs_union.a comp-c-lib
./usr/lib/librumpfs_union_g.a -unknown- debuglib
./usr/lib/librumpfs_union_p.a comp-c-proflib profile
+./usr/lib/librumpkern_crypto.a comp-c-lib
+./usr/lib/librumpkern_crypto_g.a -unknown- debuglib
+./usr/lib/librumpkern_crypto_p.a comp-c-proflib profile
./usr/lib/librumpkern_ksem.a comp-c-lib
./usr/lib/librumpkern_ksem_g.a -unknown- debuglib
./usr/lib/librumpkern_ksem_p.a comp-c-proflib profile
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.142 src/distrib/sets/lists/comp/shl.mi:1.143
--- src/distrib/sets/lists/comp/shl.mi:1.142 Sun Dec 5 06:02:29 2010
+++ src/distrib/sets/lists/comp/shl.mi Sun Dec 5 20:11:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.142 2010/12/05 06:02:29 christos Exp $
+# $NetBSD: shl.mi,v 1.143 2010/12/05 20:11:23 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -95,7 +95,7 @@
./usr/lib/librpcsvc_pic.a comp-c-piclib
./usr/lib/librt_pic.a comp-c-piclib
./usr/lib/librump_pic.a comp-c-piclib
-./usr/lib/librumpcrypto_pic.a comp-c-piclib crypto
+./usr/lib/librumpcrypto_pic.a comp-obsolete obsolete
./usr/lib/librumpdev_audio_pic.a comp-c-piclib
./usr/lib/librumpdev_bpf_pic.a comp-c-piclib
./usr/lib/librumpdev_cgd_pic.a comp-c-piclib
@@ -145,6 +145,7 @@
./usr/lib/librumpfs_umap_pic.a comp-c-piclib
./usr/lib/librumpfs_umapfs_pic.a comp-obsolete obsolete
./usr/lib/librumpfs_union_pic.a comp-c-piclib
+./usr/lib/librumpkern_crypto_pic.a comp-c-piclib
./usr/lib/librumpkern_ksem_pic.a comp-c-piclib
./usr/lib/librumpkern_tty_pic.a comp-c-piclib
./usr/lib/librumpkern_z_pic.a comp-c-piclib
@@ -281,7 +282,7 @@
./usr/libdata/debug/usr/lib/librpcsvc.so.1.0.debug comp-net-debug debug
./usr/libdata/debug/usr/lib/librt.so.1.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/librump.so.0.0.debug comp-rump-debug debug
-./usr/libdata/debug/usr/lib/librumpcrypto.so.0.0.debug comp-rump-debug debug,crypto
+./usr/libdata/debug/usr/lib/librumpcrypto.so.0.0.debug comp-obsolete obsolete
./usr/libdata/debug/usr/lib/librumpdev.so.0.0.debug comp-rump-debug debug
./usr/libdata/debug/usr/lib/librumpdev_audio.so.0.0.debug comp-rump-debug debug
./usr/libdata/debug/usr/lib/librumpdev_bpf.so.0.0.debug comp-rump-debug debug
@@ -328,6 +329,7 @@
./usr/libdata/debug/usr/lib/librumpfs_udf.so.0.0.debug comp-rump-debug debug
./usr/libdata/debug/usr/lib/librumpfs_umap.so.0.0.debug comp-rump-debug debug
./usr/libdata/debug/usr/lib/librumpfs_union.so.0.0.debug comp-rump-debug debug
+./usr/libdata/debug/usr/lib/librumpkern_crypto.so.0.0.debug comp-rump-debug debug
./usr/libdata/debug/usr/lib/librumpkern_ksem.so.0.0.debug comp-rump-debug debug
./usr/libdata/debug/usr/lib/librumpkern_tty.so.0.0.debug comp-rump-debug debug
./usr/libdata/debug/usr/lib/librumpkern_z.so.0.0.debug comp-rump-debug debug
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.156 src/lib/Makefile:1.157
--- src/lib/Makefile:1.156 Sun Dec 5 05:58:12 2010
+++ src/lib/Makefile Sun Dec 5 20:11:21 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.156 2010/12/05 05:58:12 christos Exp $
+# $NetBSD: Makefile,v 1.157 2010/12/05 20:11:21 pooka Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -157,9 +157,6 @@
SUBDIR+= libpam # depends on libkrb5, libkafs and more
.endif
-.if (${MKCRYPTO} != "no")
-SUBDIR+= librumpcrypto # depends on librump
-.endif
SUBDIR+= librumpdev # depends on librump
SUBDIR+= librumpnet # depends on librump
SUBDIR+= librumpvfs # depends on librump
Index: src/sys/rump/kern/Makefile.rumpkerncomp
diff -u src/sys/rump/kern/Makefile.rumpkerncomp:1.1 src/sys/rump/kern/Makefile.rumpkerncomp:1.2
--- src/sys/rump/kern/Makefile.rumpkerncomp:1.1 Sun Dec 5 16:27:42 2010
+++ src/sys/rump/kern/Makefile.rumpkerncomp Sun Dec 5 20:11:22 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.rumpkerncomp,v 1.1 2010/12/05 16:27:42 pooka Exp $
+# $NetBSD: Makefile.rumpkerncomp,v 1.2 2010/12/05 20:11:22 pooka Exp $
#
-RUMPKERNCOMPS= ksem tty z
+RUMPKERNCOMPS= crypto ksem tty z
.for var in ${RUMPKERNCOMPS}
RUMPKERNLIBS+=lib${var}
Index: src/sys/rump/librump/Makefile
diff -u src/sys/rump/librump/Makefile:1.8 src/sys/rump/librump/Makefile:1.9
--- src/sys/rump/librump/Makefile:1.8 Fri Feb 26 18:54:20 2010
+++ src/sys/rump/librump/Makefile Sun Dec 5 20:11:21 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2010/02/26 18:54:20 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2010/12/05 20:11:21 pooka Exp $
#
SUBDIR= rumpkern
-SUBDIR+= rumpcrypto rumpdev rumpnet rumpvfs
+SUBDIR+= rumpdev rumpnet rumpvfs
.include <bsd.subdir.mk>
Added files:
Index: src/sys/rump/kern/lib/libcrypto/Makefile
diff -u /dev/null src/sys/rump/kern/lib/libcrypto/Makefile:1.1
--- /dev/null Sun Dec 5 20:11:24 2010
+++ src/sys/rump/kern/lib/libcrypto/Makefile Sun Dec 5 20:11:22 2010
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1 2010/12/05 20:11:22 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../crypto/arc4 \
+ ${.CURDIR}/../../../../crypto/blowfish \
+ ${.CURDIR}/../../../../crypto/cast128 \
+ ${.CURDIR}/../../../../crypto/des \
+ ${.CURDIR}/../../../../crypto/rijndael \
+ ${.CURDIR}/../../../../crypto/skipjack
+
+LIB= rumpkern_crypto
+
+# arc4
+SRCS+= arc4.c
+
+# blowfish
+SRCS+= bf_ecb.c bf_enc.c bf_cbc.c bf_skey.c
+
+# cast128
+SRCS+= cast128.c
+
+# DES
+SRCS+= des_ecb.c des_setkey.c des_enc.c des_cbc.c
+
+# rijndael
+SRCS+= rijndael-alg-fst.c rijndael-api-fst.c rijndael.c
+
+# skipjack
+SRCS+= skipjack.c
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/kern/lib/libcrypto/shlib_version
diff -u /dev/null src/sys/rump/kern/lib/libcrypto/shlib_version:1.1
--- /dev/null Sun Dec 5 20:11:24 2010
+++ src/sys/rump/kern/lib/libcrypto/shlib_version Sun Dec 5 20:11:22 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/12/05 20:11:22 pooka Exp $
+#
+major=0
+minor=0
