Module Name: src
Committed By: msaitoh
Date: Fri Apr 11 10:59:02 UTC 2014
Modified Files:
src/distrib/sets/lists/comp [netbsd-6]: md.amd64 shl.mi
Log Message:
Pull up following revision(s) (requested by htodd in ticket #1046):
distrib/sets/lists/comp/md.amd64 patch
distrib/sets/lists/comp/shl.mi patch
Fix MKDEBUG=yes build problem.
To generate a diff of this commit:
cvs rdiff -u -r1.155.2.11 -r1.155.2.12 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.209.2.15 -r1.209.2.16 src/distrib/sets/lists/comp/shl.mi
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/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.155.2.11 src/distrib/sets/lists/comp/md.amd64:1.155.2.12
--- src/distrib/sets/lists/comp/md.amd64:1.155.2.11 Tue Apr 8 11:31:22 2014
+++ src/distrib/sets/lists/comp/md.amd64 Fri Apr 11 10:59:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.155.2.11 2014/04/08 11:31:22 msaitoh Exp $
+# $NetBSD: md.amd64,v 1.155.2.12 2014/04/11 10:59:02 msaitoh Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -1064,7 +1064,6 @@
./usr/libdata/debug/usr/lib/i386/libcom_err.so.7.0.debug comp-compat-shlib compat,pic,kerberos,debug
./usr/libdata/debug/usr/lib/i386/libcrypt.so.1.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libcrypto.so.8.2.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libcrypto_rc5.so.7.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libcurses.so.7.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libdes.so.8.2.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libdevmapper.so.1.0.debug comp-compat-shlib compat,pic,lvm,debug
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.209.2.15 src/distrib/sets/lists/comp/shl.mi:1.209.2.16
--- src/distrib/sets/lists/comp/shl.mi:1.209.2.15 Tue Apr 8 11:31:22 2014
+++ src/distrib/sets/lists/comp/shl.mi Fri Apr 11 10:59:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.209.2.15 2014/04/08 11:31:22 msaitoh Exp $
+# $NetBSD: shl.mi,v 1.209.2.16 2014/04/11 10:59:02 msaitoh Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -259,11 +259,11 @@
./usr/libdata/debug/usr/lib/libc.so.12.181.debug comp-sys-debug debug
./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.3.debug comp-crypto-debug crypto,debug
+./usr/libdata/debug/usr/lib/libcrypto.so.8.2.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.3.debug comp-crypto-debug crypto,debug
+./usr/libdata/debug/usr/lib/libdes.so.8.2.debug comp-crypto-debug crypto,debug
./usr/libdata/debug/usr/lib/libdevmapper.so.1.0.debug comp-lvm-debug lvm,debug
./usr/libdata/debug/usr/lib/libdm.so.0.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libdns.so.5.8.debug comp-bind-debug debug