Module Name: src
Committed By: bouyer
Date: Sat Apr 20 15:24:44 UTC 2013
Modified Files:
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 shl.mi
src/lib/libpthread [netbsd-6]: shlib_version
Log Message:
Pull up following revision(s) (requested by christos in ticket #863) via patch:
distrib/sets/lists/base/ad.mips64eb: patch
distrib/sets/lists/base/ad.mips64el: patch
distrib/sets/lists/base/md.amd64: patch
distrib/sets/lists/base/md.sparc64: patch
distrib/sets/lists/base/shl.mi: patch
distrib/sets/lists/comp/ad.mips64eb: patch
distrib/sets/lists/comp/ad.mips64el: patch
distrib/sets/lists/comp/md.amd64: patch
distrib/sets/lists/comp/md.sparc64: patch
distrib/sets/lists/comp/shl.mi: patch
lib/libpthread/shlib_version: patch
bump libpthread minor for pthread_cond_setclock to libpthread.so.1.1.
Note that this is not the same as libpthread.so.1.1 from HEAD.
To generate a diff of this commit:
cvs rdiff -u -r1.82.2.9 -r1.82.2.10 src/distrib/sets/lists/base/ad.mips64eb
cvs rdiff -u -r1.81.2.9 -r1.81.2.10 src/distrib/sets/lists/base/ad.mips64el
cvs rdiff -u -r1.156.2.9 -r1.156.2.10 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.147.2.9 -r1.147.2.10 src/distrib/sets/lists/base/md.sparc64
cvs rdiff -u -r1.616.2.9 -r1.616.2.10 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.69.2.6 -r1.69.2.7 src/distrib/sets/lists/comp/ad.mips64eb
cvs rdiff -u -r1.69.2.7 -r1.69.2.8 src/distrib/sets/lists/comp/ad.mips64el
cvs rdiff -u -r1.155.2.6 -r1.155.2.7 src/distrib/sets/lists/comp/md.amd64
cvs rdiff -u -r1.138.2.6 -r1.138.2.7 src/distrib/sets/lists/comp/md.sparc64
cvs rdiff -u -r1.209.2.11 -r1.209.2.12 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.14 -r1.14.10.1 src/lib/libpthread/shlib_version
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.82.2.9 src/distrib/sets/lists/base/ad.mips64eb:1.82.2.10
--- src/distrib/sets/lists/base/ad.mips64eb:1.82.2.9 Sat Jan 5 23:10:31 2013
+++ src/distrib/sets/lists/base/ad.mips64eb Sat Apr 20 15:24:38 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.82.2.9 2013/01/05 23:10:31 riz Exp $
+# $NetBSD: ad.mips64eb,v 1.82.2.10 2013/04/20 15:24:38 bouyer 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
@@ -198,7 +198,7 @@
./usr/lib/64/libprop.so.1 base-compat-shlib compat,pic
./usr/lib/64/libprop.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libpthread.so.1 base-compat-shlib compat,pic
-./usr/lib/64/libpthread.so.1.0 base-compat-shlib compat,pic
+./usr/lib/64/libpthread.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libpthread_dbg.so.2 base-compat-shlib compat,pic
./usr/lib/64/libpthread_dbg.so.2.0 base-compat-shlib compat,pic
./usr/lib/64/libpuffs.so.2 base-compat-shlib compat,pic
@@ -506,7 +506,7 @@
./usr/lib/o32/libprop.so.1 base-compat-shlib compat,pic
./usr/lib/o32/libprop.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libpthread.so.1 base-compat-shlib compat,pic
-./usr/lib/o32/libpthread.so.1.0 base-compat-shlib compat,pic
+./usr/lib/o32/libpthread.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libpthread_dbg.so.2 base-compat-shlib compat,pic
./usr/lib/o32/libpthread_dbg.so.2.0 base-compat-shlib compat,pic
./usr/lib/o32/libpuffs.so.2 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/ad.mips64el
diff -u src/distrib/sets/lists/base/ad.mips64el:1.81.2.9 src/distrib/sets/lists/base/ad.mips64el:1.81.2.10
--- src/distrib/sets/lists/base/ad.mips64el:1.81.2.9 Sat Jan 5 23:10:31 2013
+++ src/distrib/sets/lists/base/ad.mips64el Sat Apr 20 15:24:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.81.2.9 2013/01/05 23:10:31 riz Exp $
+# $NetBSD: ad.mips64el,v 1.81.2.10 2013/04/20 15:24:39 bouyer 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
@@ -198,7 +198,7 @@
./usr/lib/64/libprop.so.1 base-compat-shlib compat,pic
./usr/lib/64/libprop.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libpthread.so.1 base-compat-shlib compat,pic
-./usr/lib/64/libpthread.so.1.0 base-compat-shlib compat,pic
+./usr/lib/64/libpthread.so.1.1 base-compat-shlib compat,pic
./usr/lib/64/libpthread_dbg.so.2 base-compat-shlib compat,pic
./usr/lib/64/libpthread_dbg.so.2.0 base-compat-shlib compat,pic
./usr/lib/64/libpuffs.so.2 base-compat-shlib compat,pic
@@ -506,7 +506,7 @@
./usr/lib/o32/libprop.so.1 base-compat-shlib compat,pic
./usr/lib/o32/libprop.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libpthread.so.1 base-compat-shlib compat,pic
-./usr/lib/o32/libpthread.so.1.0 base-compat-shlib compat,pic
+./usr/lib/o32/libpthread.so.1.1 base-compat-shlib compat,pic
./usr/lib/o32/libpthread_dbg.so.2 base-compat-shlib compat,pic
./usr/lib/o32/libpthread_dbg.so.2.0 base-compat-shlib compat,pic
./usr/lib/o32/libpuffs.so.2 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.156.2.9 src/distrib/sets/lists/base/md.amd64:1.156.2.10
--- src/distrib/sets/lists/base/md.amd64:1.156.2.9 Sat Jan 5 23:10:31 2013
+++ src/distrib/sets/lists/base/md.amd64 Sat Apr 20 15:24:39 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.156.2.9 2013/01/05 23:10:31 riz Exp $
+# $NetBSD: md.amd64,v 1.156.2.10 2013/04/20 15:24:39 bouyer Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -205,7 +205,7 @@
./usr/lib/i386/libprop.so.1 base-compat-shlib compat,pic
./usr/lib/i386/libprop.so.1.1 base-compat-shlib compat,pic
./usr/lib/i386/libpthread.so.1 base-compat-shlib compat,pic
-./usr/lib/i386/libpthread.so.1.0 base-compat-shlib compat,pic
+./usr/lib/i386/libpthread.so.1.1 base-compat-shlib compat,pic
./usr/lib/i386/libpthread_dbg.so.2 base-compat-shlib compat,pic
./usr/lib/i386/libpthread_dbg.so.2.0 base-compat-shlib compat,pic
./usr/lib/i386/libpuffs.so.2 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/md.sparc64
diff -u src/distrib/sets/lists/base/md.sparc64:1.147.2.9 src/distrib/sets/lists/base/md.sparc64:1.147.2.10
--- src/distrib/sets/lists/base/md.sparc64:1.147.2.9 Sat Jan 5 23:10:31 2013
+++ src/distrib/sets/lists/base/md.sparc64 Sat Apr 20 15:24:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.147.2.9 2013/01/05 23:10:31 riz Exp $
+# $NetBSD: md.sparc64,v 1.147.2.10 2013/04/20 15:24:40 bouyer Exp $
./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic
./sbin/edlabel base-sysutil-root obsolete
./usr/bin/fdformat base-util-bin
@@ -201,7 +201,7 @@
./usr/lib/sparc/libprop.so.1 base-compat-shlib compat,pic
./usr/lib/sparc/libprop.so.1.1 base-compat-shlib compat,pic
./usr/lib/sparc/libpthread.so.1 base-compat-shlib compat,pic
-./usr/lib/sparc/libpthread.so.1.0 base-compat-shlib compat,pic
+./usr/lib/sparc/libpthread.so.1.1 base-compat-shlib compat,pic
./usr/lib/sparc/libpthread_dbg.so.2 base-compat-shlib compat,pic
./usr/lib/sparc/libpthread_dbg.so.2.0 base-compat-shlib compat,pic
./usr/lib/sparc/libpuffs.so.2 base-compat-shlib compat,pic
Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.616.2.9 src/distrib/sets/lists/base/shl.mi:1.616.2.10
--- src/distrib/sets/lists/base/shl.mi:1.616.2.9 Sat Dec 15 23:45:57 2012
+++ src/distrib/sets/lists/base/shl.mi Sat Apr 20 15:24:40 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.616.2.9 2012/12/15 23:45:57 riz Exp $
+# $NetBSD: shl.mi,v 1.616.2.10 2013/04/20 15:24:40 bouyer Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -385,7 +385,7 @@
./usr/lib/libprop.so.1.1 base-sys-shlib
./usr/lib/libpthread.so base-sys-shlib
./usr/lib/libpthread.so.1 base-sys-shlib
-./usr/lib/libpthread.so.1.0 base-sys-shlib
+./usr/lib/libpthread.so.1.1 base-sys-shlib
./usr/lib/libpthread_dbg.so base-sys-shlib
./usr/lib/libpthread_dbg.so.2 base-sys-shlib
./usr/lib/libpthread_dbg.so.2.0 base-sys-shlib
Index: src/distrib/sets/lists/comp/ad.mips64eb
diff -u src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.6 src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.7
--- src/distrib/sets/lists/comp/ad.mips64eb:1.69.2.6 Sat Jan 5 23:10:31 2013
+++ src/distrib/sets/lists/comp/ad.mips64eb Sat Apr 20 15:24:41 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64eb,v 1.69.2.6 2013/01/05 23:10:31 riz Exp $
+# $NetBSD: ad.mips64eb,v 1.69.2.7 2013/04/20 15:24:41 bouyer 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
@@ -1359,7 +1359,7 @@
./usr/libdata/debug/usr/lib/64/libposix.so.0.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libppath.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libprop.so.1.1.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/64/libpthread.so.1.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/64/libpthread.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libpthread_dbg.so.2.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libpuffs.so.2.0.debug comp-puffs-debug debug,compat
./usr/libdata/debug/usr/lib/64/libquota.so.1.0.debug comp-sys-debug debug,compat
@@ -1515,7 +1515,7 @@
./usr/libdata/debug/usr/lib/o32/libposix.so.0.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libppath.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libprop.so.1.1.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/libpthread.so.1.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/libpthread.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libpthread_dbg.so.2.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libpuffs.so.2.0.debug comp-puffs-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libquota.so.1.0.debug comp-sys-debug debug,compat
Index: src/distrib/sets/lists/comp/ad.mips64el
diff -u src/distrib/sets/lists/comp/ad.mips64el:1.69.2.7 src/distrib/sets/lists/comp/ad.mips64el:1.69.2.8
--- src/distrib/sets/lists/comp/ad.mips64el:1.69.2.7 Sat Jan 5 23:10:31 2013
+++ src/distrib/sets/lists/comp/ad.mips64el Sat Apr 20 15:24:42 2013
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips64el,v 1.69.2.7 2013/01/05 23:10:31 riz Exp $
+# $NetBSD: ad.mips64el,v 1.69.2.8 2013/04/20 15:24:42 bouyer 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
@@ -1359,7 +1359,7 @@
./usr/libdata/debug/usr/lib/64/libposix.so.0.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libppath.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libprop.so.1.1.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/64/libpthread.so.1.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/64/libpthread.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libpthread_dbg.so.2.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/64/libpuffs.so.2.0.debug comp-puffs-debug debug,compat
./usr/libdata/debug/usr/lib/64/libquota.so.1.0.debug comp-sys-debug debug,compat
@@ -1515,7 +1515,7 @@
./usr/libdata/debug/usr/lib/o32/libposix.so.0.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libppath.so.0.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libprop.so.1.1.debug comp-sys-debug debug,compat
-./usr/libdata/debug/usr/lib/o32/libpthread.so.1.0.debug comp-sys-debug debug,compat
+./usr/libdata/debug/usr/lib/o32/libpthread.so.1.1.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libpthread_dbg.so.2.0.debug comp-sys-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libpuffs.so.2.0.debug comp-puffs-debug debug,compat
./usr/libdata/debug/usr/lib/o32/libquota.so.1.0.debug comp-sys-debug debug,compat
Index: src/distrib/sets/lists/comp/md.amd64
diff -u src/distrib/sets/lists/comp/md.amd64:1.155.2.6 src/distrib/sets/lists/comp/md.amd64:1.155.2.7
--- src/distrib/sets/lists/comp/md.amd64:1.155.2.6 Sat Jan 5 23:10:31 2013
+++ src/distrib/sets/lists/comp/md.amd64 Sat Apr 20 15:24:42 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.155.2.6 2013/01/05 23:10:31 riz Exp $
+# $NetBSD: md.amd64,v 1.155.2.7 2013/04/20 15:24:42 bouyer Exp $
./usr/include/amd64 comp-c-include
./usr/include/amd64/ansi.h comp-c-include
./usr/include/amd64/aout_machdep.h comp-c-include
@@ -1133,7 +1133,7 @@
./usr/libdata/debug/usr/lib/i386/libposix.so.0.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libppath.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libprop.so.1.1.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/i386/libpthread.so.1.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/i386/libpthread.so.1.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libpthread_dbg.so.2.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libpuffs.so.2.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/i386/libquota.so.1.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.138.2.6 src/distrib/sets/lists/comp/md.sparc64:1.138.2.7
--- src/distrib/sets/lists/comp/md.sparc64:1.138.2.6 Sat Jan 5 23:10:32 2013
+++ src/distrib/sets/lists/comp/md.sparc64 Sat Apr 20 15:24:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.138.2.6 2013/01/05 23:10:32 riz Exp $
+# $NetBSD: md.sparc64,v 1.138.2.7 2013/04/20 15:24:43 bouyer 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
@@ -971,7 +971,7 @@
./usr/libdata/debug/usr/lib/sparc/libposix.so.0.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libppath.so.0.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libprop.so.1.1.debug comp-compat-shlib compat,pic,debug
-./usr/libdata/debug/usr/lib/sparc/libpthread.so.1.0.debug comp-compat-shlib compat,pic,debug
+./usr/libdata/debug/usr/lib/sparc/libpthread.so.1.1.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libpthread_dbg.so.2.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libpuffs.so.2.0.debug comp-compat-shlib compat,pic,debug
./usr/libdata/debug/usr/lib/sparc/libquota.so.1.0.debug comp-compat-shlib compat,pic,debug
Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.209.2.11 src/distrib/sets/lists/comp/shl.mi:1.209.2.12
--- src/distrib/sets/lists/comp/shl.mi:1.209.2.11 Sat Jan 5 23:10:34 2013
+++ src/distrib/sets/lists/comp/shl.mi Sat Apr 20 15:24:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.209.2.11 2013/01/05 23:10:34 riz Exp $
+# $NetBSD: shl.mi,v 1.209.2.12 2013/04/20 15:24:43 bouyer Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -328,7 +328,7 @@
./usr/libdata/debug/usr/lib/libposix.so.0.1.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libppath.so.0.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libprop.so.1.1.debug comp-sys-debug debug
-./usr/libdata/debug/usr/lib/libpthread.so.1.0.debug comp-sys-debug debug
+./usr/libdata/debug/usr/lib/libpthread.so.1.1.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libpthread_dbg.so.2.0.debug comp-sys-debug debug
./usr/libdata/debug/usr/lib/libpuffs.so.2.0.debug comp-puffs-debug debug
./usr/libdata/debug/usr/lib/libquota.so.1.0.debug comp-sys-debug debug
Index: src/lib/libpthread/shlib_version
diff -u src/lib/libpthread/shlib_version:1.14 src/lib/libpthread/shlib_version:1.14.10.1
--- src/lib/libpthread/shlib_version:1.14 Sun Jan 11 02:46:48 2009
+++ src/lib/libpthread/shlib_version Sat Apr 20 15:24:43 2013
@@ -1,4 +1,4 @@
-# $NetBSD: shlib_version,v 1.14 2009/01/11 02:46:48 christos Exp $
+# $NetBSD: shlib_version,v 1.14.10.1 2013/04/20 15:24:43 bouyer Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
# Things to do when bumping major version:
@@ -16,4 +16,4 @@
# without compat_netbsd32 shims??
#
major=1
-minor=0
+minor=1
