CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: adam Date: Tue Sep 8 13:01:47 UTC 2020 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: Restore libgomp, liblsan, and libstdc++ as GCC-only To generate a diff of this commit: cvs rdiff -u -r1.900 -r1.901 src/distrib/sets/lists/base/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: adam Date: Tue Sep 8 13:01:47 UTC 2020 Modified Files: src/distrib/sets/lists/base: shl.mi Log Message: Restore libgomp, liblsan, and libstdc++ as GCC-only To generate a diff of this commit: cvs rdiff -u -r1.900 -r1.901 src/distrib/sets/lists/base/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/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.900 src/distrib/sets/lists/base/shl.mi:1.901 --- src/distrib/sets/lists/base/shl.mi:1.900 Sun Sep 6 10:54:26 2020 +++ src/distrib/sets/lists/base/shl.mi Tue Sep 8 13:01:47 2020 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.900 2020/09/06 10:54:26 mrg Exp $ +# $NetBSD: shl.mi,v 1.901 2020/09/08 13:01:47 adam Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -348,8 +348,8 @@ ./usr/lib/libgomp.sobase-sys-shlib compatfile,gcc ./usr/lib/libgomp.so.1base-sys-shlib compatfile,obsolete ./usr/lib/libgomp.so.1.3 base-sys-shlib obsolete -./usr/lib/libgomp.so.2base-sys-shlib compatfile -./usr/lib/libgomp.so.2.0 base-sys-shlib compatfile,!machine_arch=mips64eb,!machine_arch=mips64el +./usr/lib/libgomp.so.2base-sys-shlib compatfile,gcc +./usr/lib/libgomp.so.2.0 base-sys-shlib compatfile,gcc,!machine_arch=mips64eb,!machine_arch=mips64el ./usr/lib/libgomp.so.2.0 base-sys-shlib machine_arch=mips64eb ./usr/lib/libgomp.so.2.0 base-sys-shlib machine_arch=mips64el ./usr/lib/libgssapi.sobase-krb5-shlib compatfile,kerberos @@ -428,8 +428,8 @@ ./usr/lib/liblsan.sobase-sys-shlib compatfile,cxx,gcc ./usr/lib/liblsan.so.1base-sys-shlib compatfile,obsolete ./usr/lib/liblsan.so.1.0 base-sys-shlib compatfile,obsolete -./usr/lib/liblsan.so.2base-sys-shlib compatfile,cxx -./usr/lib/liblsan.so.2.0 base-sys-shlib compatfile,cxx +./usr/lib/liblsan.so.2base-sys-shlib compatfile,cxx,gcc +./usr/lib/liblsan.so.2.0 base-sys-shlib compatfile,cxx,gcc ./usr/lib/liblua.sobase-sys-shlib compatfile ./usr/lib/liblua.so.5base-sys-shlib compatfile ./usr/lib/liblua.so.5.3base-sys-shlib compatfile @@ -878,8 +878,8 @@ ./usr/lib/libssl.so.14base-crypto-shlib compatfile,openssl=11 ./usr/lib/libssl.so.14.0 base-crypto-shlib compatfile,openssl=11 ./usr/lib/libstdc++.sobase-sys-shlib compatfile,gcc,cxx,libstdcxx -./usr/lib/libstdc++.so.9 base-sys-shlib compatfile,cxx,libstdcxx -./usr/lib/libstdc++.so.9.0 base-sys-shlib compatfile,cxx,libstdcxx +./usr/lib/libstdc++.so.9 base-sys-shlib compatfile,gcc,cxx,libstdcxx +./usr/lib/libstdc++.so.9.0 base-sys-shlib compatfile,gcc,cxx,libstdcxx ./usr/lib/libtelnet.sobase-obsolete obsolete ./usr/lib/libtermcap.sobase-sys-shlib compatfile ./usr/lib/libtermcap.so.0 base-sys-shlib compatfile
CVS commit: src
Module Name:src Committed By: adam Date: Thu Aug 22 18:15:44 UTC 2019 Modified Files: src/distrib/sets/lists/base: md.amd64 src/external/bsd/compiler_rt/lib/clang/lib/netbsd: Makefile Log Message: Fix building compiler_rt with MKCOMPAT=no; approved by kamil@ To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile 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/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.278 src/distrib/sets/lists/base/md.amd64:1.279 --- src/distrib/sets/lists/base/md.amd64:1.278 Wed Aug 14 01:42:08 2019 +++ src/distrib/sets/lists/base/md.amd64 Thu Aug 22 18:15:44 2019 @@ -1,21 +1,21 @@ -# $NetBSD: md.amd64,v 1.278 2019/08/14 01:42:08 kamil Exp $ +# $NetBSD: md.amd64,v 1.279 2019/08/22 18:15:44 adam Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic ./usr/bin/fdformatbase-util-bin ./usr/bin/iasl base-util-bin ./usr/bin/pmc base-obsolete obsolete -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.a comp-cxx-lib compat,llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.a comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0 comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so comp-cxx-lib compat,llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0 comp-cxx-lib compat,llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-i386.so.0.0 comp-cxx-lib compat,llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0 comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-x86_64.so.0.0 comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-i386.a comp-cxx-lib compat,llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan-preinit-x86_64.a comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-i386.a comp-cxx-lib compat,llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.asan_cxx-x86_64.a comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dd-x86_64.a comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.dyndd-x86_64.so comp-cxx-lib llvm @@ -25,27 +25,27 @@ ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.fuzzer_no_main-x86_64.a comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan-x86_64.a comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.msan_cxx-x86_64.a comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-i386.a comp-cxx-lib compat,llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.safestack-x86_64.a comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan-x86_64.a comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.tsan_cxx-x86_64.a comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.a comp-cxx-lib compat,llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.a comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0 comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0 comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so comp-cxx-lib compat,llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0 comp-cxx-lib compat,llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-i386.so.0.0 comp-cxx-lib compat,llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0 comp-cxx-lib llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_minimal-x86_64.so.0.0 comp-cxx-lib llvm -./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a comp-cxx-lib llvm +./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-i386.a comp-cxx-lib compat,llvm ./usr/lib/clang/7.0.0/lib/netbsd/libclang_rt.ubsan_standalone-x86_64.a comp-cxx-lib llvm
CVS commit: src
Module Name:src Committed By: adam Date: Thu Aug 22 18:15:44 UTC 2019 Modified Files: src/distrib/sets/lists/base: md.amd64 src/external/bsd/compiler_rt/lib/clang/lib/netbsd: Makefile Log Message: Fix building compiler_rt with MKCOMPAT=no; approved by kamil@ To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.1 -r1.2 \ src/external/bsd/compiler_rt/lib/clang/lib/netbsd/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/modules/pf
Module Name:src
Committed By: adam
Date: Mon Feb 12 20:47:09 UTC 2018
Modified Files:
src/sys/modules/pf: Makefile
Log Message:
Fix building with MKGCC=no
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/pf/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/pf/Makefile
diff -u src/sys/modules/pf/Makefile:1.6 src/sys/modules/pf/Makefile:1.7
--- src/sys/modules/pf/Makefile:1.6 Tue Feb 6 12:58:17 2018
+++ src/sys/modules/pf/Makefile Mon Feb 12 20:47:09 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/02/06 12:58:17 martin Exp $
+# $NetBSD: Makefile,v 1.7 2018/02/12 20:47:09 adam Exp $
.include "../Makefile.inc"
@@ -20,7 +20,7 @@ SRCS+= tcp_rndiss.c
CPPFLAGS+= -I${S}/dist/pf -I${S} -DINET6 -DINET
-.if ${HAVE_GCC} != 5
+.if defined(HAVE_GCC) && ${HAVE_GCC} != 5
COPTS.pf_table.c+= -Wno-error=shift-negative-value
.endif
CVS commit: src/sys/modules/pf
Module Name:src Committed By: adam Date: Mon Feb 12 20:47:09 UTC 2018 Modified Files: src/sys/modules/pf: Makefile Log Message: Fix building with MKGCC=no To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/modules/pf/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/compiler_rt
Module Name:src Committed By: adam Date: Mon Feb 29 14:57:07 UTC 2016 Modified Files: src/lib/libc/compiler_rt: Makefile.inc Log Message: Fix buidling with MKPROFILE=no To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libc/compiler_rt/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: adam
Date: Mon Feb 29 14:57:07 UTC 2016
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Fix buidling with MKPROFILE=no
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.28 src/lib/libc/compiler_rt/Makefile.inc:1.29
--- src/lib/libc/compiler_rt/Makefile.inc:1.28 Sat Feb 27 19:08:23 2016
+++ src/lib/libc/compiler_rt/Makefile.inc Mon Feb 29 14:57:07 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2016/02/27 19:08:23 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.29 2016/02/29 14:57:07 adam Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
@@ -216,7 +216,9 @@ GENERIC_SRCS+= \
InstrProfilingValue.c \
InstrProfilingWriter.c
+.if ${MKPROFILE} != "no"
POBJS+= InstrProfilingRuntime.po
+.endif
.if ${LIBC_MACHINE_ARCH} == "powerpc" || ${LIBC_MACHINE_ARCH} == "powerpc64"
GENERIC_SRCS+= \
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: adam Date: Sat Mar 29 20:22:16 UTC 2014 Modified Files: src/distrib/sets/lists/comp: md.amd64 Log Message: Fix for /usr/include/g++/bits directory, which is only for MKGCC=yes To generate a diff of this commit: cvs rdiff -u -r1.216 -r1.217 src/distrib/sets/lists/comp/md.amd64 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.216 src/distrib/sets/lists/comp/md.amd64:1.217 --- src/distrib/sets/lists/comp/md.amd64:1.216 Tue Feb 18 22:03:52 2014 +++ src/distrib/sets/lists/comp/md.amd64 Sat Mar 29 20:22:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.216 2014/02/18 22:03:52 dsl Exp $ +# $NetBSD: md.amd64,v 1.217 2014/03/29 20:22:16 adam Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include @@ -203,9 +203,9 @@ ./usr/include/clang-3.5/xmmintrin.h comp-c-include llvm ./usr/include/clang-3.5/xopintrin.h comp-c-include llvm ./usr/include/emmintrin.h comp-obsolete obsolete -./usr/include/g++/bits/i386 comp-c-include +./usr/include/g++/bits/i386 comp-c-include gcccmds,compat ./usr/include/g++/bits/i386/c++config.h comp-c-include gcccmds,gcc=48,compat -./usr/include/g++/bits/x86_64 comp-c-include +./usr/include/g++/bits/x86_64 comp-c-include gcccmds,compat ./usr/include/g++/bits/x86_64/c++config.h comp-c-include gcccmds,gcc=48,compat ./usr/include/gcc-4.1/emmintrin.h comp-c-include gcccmds,gcc=4 ./usr/include/gcc-4.1/emmintrin.h comp-obsolete gcc=45,obsolete
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: adam Date: Sat Mar 29 20:22:16 UTC 2014 Modified Files: src/distrib/sets/lists/comp: md.amd64 Log Message: Fix for /usr/include/g++/bits directory, which is only for MKGCC=yes To generate a diff of this commit: cvs rdiff -u -r1.216 -r1.217 src/distrib/sets/lists/comp/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: adam
Date: Sun Sep 22 09:21:56 UTC 2013
Modified Files:
src/sys/dev/ic: sl811hs.c
Log Message:
Removed duplicated lines introduced in version 1.36.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/sl811hs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/sl811hs.c
diff -u src/sys/dev/ic/sl811hs.c:1.37 src/sys/dev/ic/sl811hs.c:1.38
--- src/sys/dev/ic/sl811hs.c:1.37 Sun Sep 22 06:54:35 2013
+++ src/sys/dev/ic/sl811hs.c Sun Sep 22 09:21:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sl811hs.c,v 1.37 2013/09/22 06:54:35 skrll Exp $ */
+/* $NetBSD: sl811hs.c,v 1.38 2013/09/22 09:21:56 adam Exp $ */
/*
* Not (c) 2007 Matthew Orgass
@@ -85,7 +85,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sl811hs.c,v 1.37 2013/09/22 06:54:35 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: sl811hs.c,v 1.38 2013/09/22 09:21:56 adam Exp $);
#include opt_slhci.h
@@ -2326,12 +2326,6 @@ slhci_dotransfer(struct slhci_softc *sc)
PT_ROOT_INTR, sc, spipe, NULL, return);
/* Check that this transfer can fit in the remaining memory. */
- spipe, t))) {
- LK_SLASSERT(spipe-xfer != NULL, sc, spipe, NULL, return);
- LK_SLASSERT(spipe-ptype != PT_ROOT_CTRL spipe-ptype !=
- PT_ROOT_INTR, sc, spipe, NULL, return);
-
- /* Check that this transfer can fit in the remaining memory. */
if (t-len[A] + t-len[B] + spipe-tregs[LEN] + 1
SL11_MAX_PACKET_SIZE) {
DLOG(D_XFER, Transfer does not fit. alen %d blen %d
CVS commit: src/sys/dev/ic
Module Name:src Committed By: adam Date: Sun Sep 22 09:21:56 UTC 2013 Modified Files: src/sys/dev/ic: sl811hs.c Log Message: Removed duplicated lines introduced in version 1.36. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/dev/ic/sl811hs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: adam Date: Sat Aug 3 19:31:26 UTC 2013 Modified Files: src/share/mk: bsd.README Log Message: Fixed a typo To generate a diff of this commit: cvs rdiff -u -r1.318 -r1.319 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.318 src/share/mk/bsd.README:1.319 --- src/share/mk/bsd.README:1.318 Sun Jun 2 11:02:40 2013 +++ src/share/mk/bsd.README Sat Aug 3 19:31:26 2013 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.318 2013/06/02 11:02:40 mbalmer Exp $ +# $NetBSD: bsd.README,v 1.319 2013/08/03 19:31:26 adam Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make include files for the NetBSD @@ -352,7 +352,7 @@ MKSKEY If no, disables building of S/ infrastructure (libraries and support programs). Default: yes -MKSLJIT If no, disables buildin of sljit (stack-less platform +MKSLJIT If no, disables building of sljit (stack-less platform independent JIT compiler) private library and tests. Default: yes on amd64, i386 and sparc, no elsewhere.
CVS commit: src/share/mk
Module Name:src Committed By: adam Date: Sat Aug 3 19:31:26 UTC 2013 Modified Files: src/share/mk: bsd.README Log Message: Fixed a typo To generate a diff of this commit: cvs rdiff -u -r1.318 -r1.319 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/bsd/wpa/dist
Module Name:src Committed By: adam Date: Wed Jul 17 21:35:52 UTC 2013 Update of /cvsroot/src/external/bsd/wpa/dist In directory ivanova.netbsd.org:/tmp/cvs-serv24233 Log Message: Import wpa_supplicant and hostapd Status: Vendor Tag: MALINEN Release Tags: v1_1 U src/external/bsd/wpa/dist/COPYING U src/external/bsd/wpa/dist/README U src/external/bsd/wpa/dist/hostapd/Android.mk U src/external/bsd/wpa/dist/hostapd/ChangeLog U src/external/bsd/wpa/dist/hostapd/config_file.c U src/external/bsd/wpa/dist/hostapd/config_file.h U src/external/bsd/wpa/dist/hostapd/ctrl_iface.c U src/external/bsd/wpa/dist/hostapd/ctrl_iface.h U src/external/bsd/wpa/dist/hostapd/defconfig U src/external/bsd/wpa/dist/hostapd/dump_state.c U src/external/bsd/wpa/dist/hostapd/dump_state.h U src/external/bsd/wpa/dist/hostapd/eap_register.c U src/external/bsd/wpa/dist/hostapd/eap_register.h U src/external/bsd/wpa/dist/hostapd/eap_testing.txt U src/external/bsd/wpa/dist/hostapd/hlr_auc_gw.c U src/external/bsd/wpa/dist/hostapd/hlr_auc_gw.milenage_db U src/external/bsd/wpa/dist/hostapd/hostapd.8 U src/external/bsd/wpa/dist/hostapd/hostapd.accept U src/external/bsd/wpa/dist/hostapd/hostapd.conf U src/external/bsd/wpa/dist/hostapd/hostapd.deny U src/external/bsd/wpa/dist/hostapd/hostapd.eap_user U src/external/bsd/wpa/dist/hostapd/hostapd.radius_clients U src/external/bsd/wpa/dist/hostapd/hostapd.sim_db U src/external/bsd/wpa/dist/hostapd/hostapd.vlan U src/external/bsd/wpa/dist/hostapd/hostapd.wpa_psk U src/external/bsd/wpa/dist/hostapd/hostapd_cli.1 U src/external/bsd/wpa/dist/hostapd/hostapd_cli.c U src/external/bsd/wpa/dist/hostapd/main.c U src/external/bsd/wpa/dist/hostapd/Makefile U src/external/bsd/wpa/dist/hostapd/nt_password_hash.c U src/external/bsd/wpa/dist/hostapd/README U src/external/bsd/wpa/dist/hostapd/README-WPS U src/external/bsd/wpa/dist/hostapd/wired.conf U src/external/bsd/wpa/dist/hostapd/logwatch/hostapd U src/external/bsd/wpa/dist/hostapd/logwatch/hostapd.conf U src/external/bsd/wpa/dist/hostapd/logwatch/README U src/external/bsd/wpa/dist/patches/openssl-0.9.8-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8d-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8e-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8g-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8h-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.8i-tls-extensions.patch U src/external/bsd/wpa/dist/patches/openssl-0.9.9-session-ticket.patch U src/external/bsd/wpa/dist/src/lib.rules U src/external/bsd/wpa/dist/src/Makefile U src/external/bsd/wpa/dist/src/ap/accounting.c U src/external/bsd/wpa/dist/src/ap/accounting.h U src/external/bsd/wpa/dist/src/ap/ap_config.c U src/external/bsd/wpa/dist/src/ap/ap_config.h U src/external/bsd/wpa/dist/src/ap/ap_drv_ops.c U src/external/bsd/wpa/dist/src/ap/ap_drv_ops.h U src/external/bsd/wpa/dist/src/ap/ap_list.c U src/external/bsd/wpa/dist/src/ap/ap_list.h U src/external/bsd/wpa/dist/src/ap/ap_mlme.c U src/external/bsd/wpa/dist/src/ap/ap_mlme.h U src/external/bsd/wpa/dist/src/ap/authsrv.c U src/external/bsd/wpa/dist/src/ap/authsrv.h U src/external/bsd/wpa/dist/src/ap/beacon.c U src/external/bsd/wpa/dist/src/ap/beacon.h U src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.c U src/external/bsd/wpa/dist/src/ap/ctrl_iface_ap.h U src/external/bsd/wpa/dist/src/ap/drv_callbacks.c U src/external/bsd/wpa/dist/src/ap/hostapd.c U src/external/bsd/wpa/dist/src/ap/hostapd.h U src/external/bsd/wpa/dist/src/ap/hw_features.c U src/external/bsd/wpa/dist/src/ap/hw_features.h U src/external/bsd/wpa/dist/src/ap/iapp.c U src/external/bsd/wpa/dist/src/ap/iapp.h U src/external/bsd/wpa/dist/src/ap/ieee802_11.c U src/external/bsd/wpa/dist/src/ap/ieee802_11.h U src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.c U src/external/bsd/wpa/dist/src/ap/ieee802_11_auth.h U src/external/bsd/wpa/dist/src/ap/ieee802_11_ht.c U src/external/bsd/wpa/dist/src/ap/ieee802_11_shared.c U src/external/bsd/wpa/dist/src/ap/ieee802_1x.c U src/external/bsd/wpa/dist/src/ap/ieee802_1x.h U src/external/bsd/wpa/dist/src/ap/Makefile U src/external/bsd/wpa/dist/src/ap/p2p_hostapd.c U src/external/bsd/wpa/dist/src/ap/p2p_hostapd.h U src/external/bsd/wpa/dist/src/ap/peerkey_auth.c U src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.c U src/external/bsd/wpa/dist/src/ap/pmksa_cache_auth.h U src/external/bsd/wpa/dist/src/ap/preauth_auth.c U src/external/bsd/wpa/dist/src/ap/preauth_auth.h U src/external/bsd/wpa/dist/src/ap/sta_info.c U src/external/bsd/wpa/dist/src/ap/sta_info.h U src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.c U src/external/bsd/wpa/dist/src/ap/tkip_countermeasures.h U src/external/bsd/wpa/dist/src/ap/utils.c U src/external/bsd/wpa/dist/src/ap/vlan_init.c U src/external/bsd/wpa/dist/src/ap/vlan_init.h U src/external/bsd/wpa/dist/src/ap/wmm.c U src/external/bsd/wpa/dist/src/ap/wmm.h C
CVS commit: src/external/bsd/wpa/dist/src
Module Name:src
Committed By: adam
Date: Wed Jul 17 21:47:50 UTC 2013
Modified Files:
src/external/bsd/wpa/dist/src/ap: wpa_auth.c
src/external/bsd/wpa/dist/src/eap_server: eap_server_tls_common.c
Log Message:
merge v1.1
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/ap/wpa_auth.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/src/ap/wpa_auth.c
diff -u src/external/bsd/wpa/dist/src/ap/wpa_auth.c:1.4 src/external/bsd/wpa/dist/src/ap/wpa_auth.c:1.5
--- src/external/bsd/wpa/dist/src/ap/wpa_auth.c:1.4 Mon Oct 8 00:03:20 2012
+++ src/external/bsd/wpa/dist/src/ap/wpa_auth.c Wed Jul 17 21:47:50 2013
@@ -2334,6 +2334,9 @@ static void wpa_group_gtk_init(struct wp
static int wpa_group_update_sta(struct wpa_state_machine *sm, void *ctx)
{
+ if (ctx != NULL ctx != sm-group)
+ return 0;
+
if (sm-wpa_ptk_state != WPA_PTK_PTKINITDONE) {
wpa_auth_logger(sm-wpa_auth, sm-addr, LOGGER_DEBUG,
Not in PTKINITDONE; skip Group Key update);
@@ -2388,7 +2391,7 @@ static void wpa_group_setkeys(struct wpa
group-GKeyDoneStations);
group-GKeyDoneStations = 0;
}
- wpa_auth_for_each_sta(wpa_auth, wpa_group_update_sta, NULL);
+ wpa_auth_for_each_sta(wpa_auth, wpa_group_update_sta, group);
wpa_printf(MSG_DEBUG, wpa_group_setkeys: GKeyDoneStations=%d,
group-GKeyDoneStations);
}
Index: src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c
diff -u src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c:1.2 src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c:1.3
--- src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c:1.2 Mon Oct 8 14:03:09 2012
+++ src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c Wed Jul 17 21:47:50 2013
@@ -230,6 +230,14 @@ static int eap_server_tls_process_fragme
return -1;
}
+ if (len message_length) {
+ wpa_printf(MSG_INFO, SSL: Too much data (%d bytes) in
+ first fragment of frame (TLS Message
+ Length %d bytes),
+ (int) len, (int) message_length);
+ return -1;
+ }
+
data-tls_in = wpabuf_alloc(message_length);
if (data-tls_in == NULL) {
wpa_printf(MSG_DEBUG, SSL: No memory for message);
CVS commit: src/doc
Module Name:src Committed By: adam Date: Wed Jul 17 21:58:14 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import wpa_supplicant and hostapd 1.1 To generate a diff of this commit: cvs rdiff -u -r1.1043 -r1.1044 src/doc/3RDPARTY cvs rdiff -u -r1.1832 -r1.1833 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1043 src/doc/3RDPARTY:1.1044 --- src/doc/3RDPARTY:1.1043 Wed Jul 17 20:15:49 2013 +++ src/doc/3RDPARTY Wed Jul 17 21:58:14 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1043 2013/07/17 20:15:49 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1044 2013/07/17 21:58:14 adam Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1269,8 +1269,8 @@ upstream but there is too much inertia t files. Package: wpa_supplicant/hostapd -Version: 1.0 -Current Vers: 1.0 +Version: 1.1 +Current Vers: 2.0 Maintainer: Jouni Malinen jkmal...@cc.hut.fi Archive Site: http://hostap.epitest.fi/releases/ Home Page: http://hostap.epitest.fi/wpa_supplicant/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1832 src/doc/CHANGES:1.1833 --- src/doc/CHANGES:1.1832 Wed Jul 17 20:16:50 2013 +++ src/doc/CHANGES Wed Jul 17 21:58:14 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1832 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1833 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -255,4 +255,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: zoneinfo: Import tzdata2013d. [apb 20130707] openresolv(8): Import openresolv-3.5.6 [roy 20130712] libc: Update to tzcode2013d. [christo 20130717] + wpa: Import wpa_supplicant and hostapd 1.1 [adam 20130717]
CVS commit: src/external/bsd/wpa/dist/src
Module Name:src Committed By: adam Date: Wed Jul 17 21:47:50 UTC 2013 Modified Files: src/external/bsd/wpa/dist/src/ap: wpa_auth.c src/external/bsd/wpa/dist/src/eap_server: eap_server_tls_common.c Log Message: merge v1.1 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/wpa/dist/src/ap/wpa_auth.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/wpa/dist/src/eap_server/eap_server_tls_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: adam Date: Wed Jul 17 21:58:14 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Import wpa_supplicant and hostapd 1.1 To generate a diff of this commit: cvs rdiff -u -r1.1043 -r1.1044 src/doc/3RDPARTY cvs rdiff -u -r1.1832 -r1.1833 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/fdpass
Module Name:src
Committed By: adam
Date: Mon Sep 10 11:29:06 UTC 2012
Modified Files:
src/tests/net/fdpass: Makefile
Log Message:
Fix building with MKCOMPAT=no
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/fdpass/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/fdpass/Makefile
diff -u src/tests/net/fdpass/Makefile:1.2 src/tests/net/fdpass/Makefile:1.3
--- src/tests/net/fdpass/Makefile:1.2 Thu Aug 16 10:14:03 2012
+++ src/tests/net/fdpass/Makefile Mon Sep 10 11:29:06 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2012/08/16 10:14:03 martin Exp $
+# $NetBSD: Makefile,v 1.3 2012/09/10 11:29:06 adam Exp $
#
.include bsd.own.mk
@@ -11,7 +11,7 @@ PROGS= fdpass64 fdpass32
MAN.fdpass64=# empty
BINDIR.fdpass64= ${TESTSDIR}
-.if ${MACHINE} == sparc64 || ${MACHINE} == amd64
+.if (${MACHINE} == sparc64 || ${MACHINE} == amd64) ${MKCOMPAT} != no
COPTS.fdpass32.c += -m32
LDFLAGS.fdpass32 += -m32
.endif
CVS commit: src/usr.sbin/makefs/chfs
Module Name:src
Committed By: adam
Date: Fri Apr 20 13:28:27 UTC 2012
Modified Files:
src/usr.sbin/makefs/chfs: Makefile.inc chfs_mkfs.c
Log Message:
Fix building tools
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/makefs/chfs/Makefile.inc
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/makefs/chfs/chfs_mkfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/makefs/chfs/Makefile.inc
diff -u src/usr.sbin/makefs/chfs/Makefile.inc:1.1 src/usr.sbin/makefs/chfs/Makefile.inc:1.2
--- src/usr.sbin/makefs/chfs/Makefile.inc:1.1 Thu Apr 19 15:36:06 2012
+++ src/usr.sbin/makefs/chfs/Makefile.inc Fri Apr 20 13:28:27 2012
@@ -5,5 +5,7 @@ CHFS= ${NETBSDSRCDIR}/sys/ufs/chfs
CPPFLAGS+= -I${CHFS}
SRCS+= chfs_mkfs.c
+.if !defined(HOSTPROG)
LDADD+= -lz
DPADD+= ${LIBZ}
+.endif
Index: src/usr.sbin/makefs/chfs/chfs_mkfs.c
diff -u src/usr.sbin/makefs/chfs/chfs_mkfs.c:1.3 src/usr.sbin/makefs/chfs/chfs_mkfs.c:1.4
--- src/usr.sbin/makefs/chfs/chfs_mkfs.c:1.3 Thu Apr 19 17:28:26 2012
+++ src/usr.sbin/makefs/chfs/chfs_mkfs.c Fri Apr 20 13:28:27 2012
@@ -209,7 +209,11 @@ write_dirent(fsinfo_t *fsopts, fsnode *n
}
fdirent.version = htole64(version++);
+#ifdef HAVE_STRUCT_STAT_ST_MTIMENSEC
fdirent.mctime = htole32(node-inode-st.st_mtimensec);
+#else
+ fdirent.mctime = htole32(node-inode-st.st_mtimespec.tv_nsec);
+#endif
fdirent.nsize = htole32(strlen(name));
fdirent.dtype = htole32(IFTOCHT(node-type S_IFMT));
fdirent.name_crc = htole32(crc32(0, (uint8_t *)name, fdirent.nsize));
CVS commit: src/usr.sbin/makefs/chfs
Module Name:src Committed By: adam Date: Fri Apr 20 13:28:27 UTC 2012 Modified Files: src/usr.sbin/makefs/chfs: Makefile.inc chfs_mkfs.c Log Message: Fix building tools To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/makefs/chfs/Makefile.inc cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/makefs/chfs/chfs_mkfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/llvm
Module Name:src
Committed By: adam
Date: Mon Jul 18 18:37:15 UTC 2011
Modified Files:
src/tools/llvm: Makefile
Log Message:
Pass HOST_CC otherwise fails e.g. on Mac OS X; fixed typo in
--disable-assertions
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tools/llvm/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/llvm/Makefile
diff -u src/tools/llvm/Makefile:1.9 src/tools/llvm/Makefile:1.10
--- src/tools/llvm/Makefile:1.9 Thu Jul 7 05:41:59 2011
+++ src/tools/llvm/Makefile Mon Jul 18 18:37:15 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/07/07 05:41:59 matt Exp $
+# $NetBSD: Makefile,v 1.10 2011/07/18 18:37:15 adam Exp $
.include bsd.init.mk
@@ -19,10 +19,11 @@
config/config.status: ${LLVM_SRCDIR}/configure
mkdir -p config
- cd config ${LLVM_SRCDIR}/configure --prefix=/usr \
- --enable-targets=x86,powerpc,sparc,arm,mips --host=${MACHINE_GNU_PLATFORM} \
+ cd config ${LLVM_SRCDIR}/configure CC=${HOST_CC:Q} --prefix=/usr \
+ --enable-targets=x86,powerpc,sparc,arm,mips \
+ --host=${MACHINE_GNU_PLATFORM} \
--with-c-include-dirs=/usr/include/clang-3.0:/usr/include \
- --enable-optimized --disable--assertions
+ --enable-optimized --disable-assertions
need-dl:
printf '#include dlfcn.h\nint main(void){void *p; return dladdr(p, p);}' need-dl.c
CVS commit: src/tools/llvm
Module Name:src Committed By: adam Date: Mon Jul 18 18:37:15 UTC 2011 Modified Files: src/tools/llvm: Makefile Log Message: Pass HOST_CC otherwise fails e.g. on Mac OS X; fixed typo in --disable-assertions To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tools/llvm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: adam Date: Thu May 19 06:09:36 UTC 2011 Modified Files: src/share/mk: bsd.own.mk Log Message: Reverting last change; joerg has a better approach To generate a diff of this commit: cvs rdiff -u -r1.665 -r1.666 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: adam
Date: Wed May 18 13:08:14 UTC 2011
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add support for LLVM/Clang
To generate a diff of this commit:
cvs rdiff -u -r1.664 -r1.665 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.664 src/share/mk/bsd.own.mk:1.665
--- src/share/mk/bsd.own.mk:1.664 Mon May 9 14:36:48 2011
+++ src/share/mk/bsd.own.mk Wed May 18 13:08:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.664 2011/05/09 14:36:48 haad Exp $
+# $NetBSD: bsd.own.mk,v 1.665 2011/05/18 13:08:14 adam Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -47,7 +47,7 @@
TOOLCHAIN_MISSING?= no
# default to GCC4
-.if !defined(HAVE_GCC) !defined(HAVE_PCC)
+.if !defined(HAVE_GCC) !defined(HAVE_PCC) !defined(HAVE_LLVM)
HAVE_GCC= 4
.endif
@@ -207,6 +207,14 @@
OBJC= false
.endif
+.if defined(HAVE_LLVM) ${USETOOLS_LLVM:Uyes} == yes
+CC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang
+CPP= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang-cpp
+CXX= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang++
+FC= false
+OBJC= ${TOOLDIR}/bin/${MACHINE_GNU_PLATFORM}-clang
+.endif
+
#
# Make sure DESTDIR is set, so that builds with these tools always
# get appropriate -nostdinc, -nostdlib, etc. handling. The default is
CVS commit: src/share/mk
Module Name:src Committed By: adam Date: Wed May 18 13:08:14 UTC 2011 Modified Files: src/share/mk: bsd.own.mk Log Message: Add support for LLVM/Clang To generate a diff of this commit: cvs rdiff -u -r1.664 -r1.665 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: adam Date: Fri Apr 22 08:19:25 UTC 2011 Modified Files: src/external/bsd/pkg_install/dist/lib: license.c Log Message: Added postgresql-license To generate a diff of this commit: cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/pkg_install/dist/lib/license.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/pkg_install/dist/lib/license.c diff -u src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.10 src/external/bsd/pkg_install/dist/lib/license.c:1.2 --- src/external/bsd/pkg_install/dist/lib/license.c:1.1.1.10 Fri Feb 18 22:32:30 2011 +++ src/external/bsd/pkg_install/dist/lib/license.c Fri Apr 22 08:19:25 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: license.c,v 1.1.1.10 2011/02/18 22:32:30 aymeric Exp $ */ +/* $NetBSD: license.c,v 1.2 2011/04/22 08:19:25 adam Exp $ */ /*- * Copyright (c) 2009 Joerg Sonnenberger jo...@netbsd.org. @@ -59,6 +59,7 @@ open-font-license mpl-1.0 mpl-1.1 png-license +postgresql-license zpl python-software-foundation ipafont
CVS commit: src/external/bsd/pkg_install/dist/lib
Module Name:src Committed By: adam Date: Fri Apr 22 08:19:25 UTC 2011 Modified Files: src/external/bsd/pkg_install/dist/lib: license.c Log Message: Added postgresql-license To generate a diff of this commit: cvs rdiff -u -r1.1.1.10 -r1.2 src/external/bsd/pkg_install/dist/lib/license.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/sysinst
Module Name:src
Committed By: adam
Date: Tue Mar 8 11:24:28 UTC 2011
Modified Files:
src/distrib/utils/sysinst: msg.mbr.pl msg.mi.pl
src/distrib/utils/sysinst/arch/cats: msg.md.pl
src/distrib/utils/sysinst/arch/i386: msg.md.pl
src/distrib/utils/sysinst/arch/mac68k: msg.md.pl
src/distrib/utils/sysinst/arch/zaurus: msg.md.pl
Log Message:
Added missing Polish translations
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/msg.mbr.pl
cvs rdiff -u -r1.70 -r1.71 src/distrib/utils/sysinst/msg.mi.pl
cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/cats/msg.md.pl
cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/sysinst/arch/i386/msg.md.pl
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/mac68k/msg.md.pl
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/zaurus/msg.md.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/sysinst/msg.mbr.pl
diff -u src/distrib/utils/sysinst/msg.mbr.pl:1.12 src/distrib/utils/sysinst/msg.mbr.pl:1.13
--- src/distrib/utils/sysinst/msg.mbr.pl:1.12 Mon Apr 19 19:22:41 2010
+++ src/distrib/utils/sysinst/msg.mbr.pl Tue Mar 8 11:24:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mbr.pl,v 1.12 2010/04/19 19:22:41 martin Exp $ */
+/* $NetBSD: msg.mbr.pl,v 1.13 2011/03/08 11:24:28 adam Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -157,7 +157,7 @@
{Inny typ, podaj identyfikator liczbowy}
-message reeditpart /* XXX translate */
+message reeditpart
{
Czy chcesz zmienic tablice partycji (MBR)? Brak zgody przerwie instalacje.
Index: src/distrib/utils/sysinst/msg.mi.pl
diff -u src/distrib/utils/sysinst/msg.mi.pl:1.70 src/distrib/utils/sysinst/msg.mi.pl:1.71
--- src/distrib/utils/sysinst/msg.mi.pl:1.70 Tue Feb 1 01:42:07 2011
+++ src/distrib/utils/sysinst/msg.mi.pl Tue Mar 8 11:24:28 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.70 2011/02/01 01:42:07 joerg Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.71 2011/03/08 11:24:28 adam Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -239,9 +239,9 @@
message toobigdisklabel
{
-This disk is too large for a disklabel partition table to be used
-and hence cannot be used as a bootable disk or to hold the root
-partition.
+Ten dysk jest zbyt duzy dla tablicy partycji disklabel i dlatego
+nie moze zostac uzyty jako dysk starowy ani nie moze przechowywac
+glownej partycji.
}
message fspart
@@ -354,7 +354,7 @@
nie zostalo jeszcze zapisane. Masz teraz ostatnia szanse na przerwanie tego
procesu poki nic nie zostalo jeszcze zmienione.
-Czy kontynuowac ?
+Czy kontynuowac?
}
message disksetupdone
@@ -374,7 +374,7 @@
}
message mountfail
-{zamountowanie urzadzenia /dev/%s%c na %s nie powiodlo sie.
+{zamontowanie urzadzenia /dev/%s%c na %s nie powiodlo sie.
}
message extractcomplete
@@ -466,14 +466,14 @@
}
message Available_cds
-{Available CDs}
+{Dostepne CD}
message ask_cd
-{Multiple CDs found, please select the one containing the install CD.}
+{Znaleziono kilka CD, prosze wybrac CD zawierajcy instalacje.}
message cd_path_not_found
-{The installation sets have not been found at the default location on this
-CD. Please check device and path name.}
+{Zbiory instalacyjne nie zostaly znalezione w domyslnym polozeniu na tym
+CD. Prosze sprawdzic urzadzenie i sciezke.}
message localfssource
{Podaj niezamountowane lokalne urzadzenie oraz katalog na nim, gdzie
@@ -673,7 +673,7 @@
message netnotup_continueanyway
{Czy chcesz kontynuowac proces instalacji i zalozyc, ze twoja siec dziala?
-(Nie przerywa proces instalacji.)
+(Nie przerywa procesu instalacji.)
}
message makedev
@@ -746,10 +746,10 @@
{Inne}
message set_modules
-{Kernel Modules}
+{Moduly kernela}
message set_tests
-{Test programs}
+{Programy testujace}
message set_text_tools
{Narzedzia Przetwarzania Tekstu}
@@ -764,7 +764,7 @@
{Konfiguracja X11}
message set_X11_fonts
-{Fonty X11}
+{Czcionki X11}
message set_X11_servers
{Serwery X11}
@@ -798,11 +798,11 @@
{partycje %c i %c pokrycia.}
message No_Bootcode
-{No bootcode for root partition}
+{Brak kodu startowego dla glownej partycji}
message cannot_ufs2_root
-{Sorry, the root file system can't be FFSv2 due to lack of bootloader support
-on this port.}
+{Glowny system plikow nie moze byc FFSv2 poniewaz nie ma kodu startowego dla
+tej platformy.}
message edit_partitions_again
{
@@ -941,14 +941,14 @@
.endif
message oldsendmail
-{Sendmail is no longer in this release of NetBSD, default MTA is
-postfix. The file /etc/mailer.conf still chooses the removed
-sendmail. Do you want to upgrade /etc/mailer.conf automatically for
-postfix? If you choose No you will have to update /etc/mailer.conf
-yourself to ensure proper email delivery.}
+{Sendmail nie jest dostepny w tym wydaniu NetBSD. Domyslnym MTA
CVS commit: src/distrib/utils/sysinst
Module Name:src Committed By: adam Date: Tue Mar 8 11:24:28 UTC 2011 Modified Files: src/distrib/utils/sysinst: msg.mbr.pl msg.mi.pl src/distrib/utils/sysinst/arch/cats: msg.md.pl src/distrib/utils/sysinst/arch/i386: msg.md.pl src/distrib/utils/sysinst/arch/mac68k: msg.md.pl src/distrib/utils/sysinst/arch/zaurus: msg.md.pl Log Message: Added missing Polish translations To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/utils/sysinst/msg.mbr.pl cvs rdiff -u -r1.70 -r1.71 src/distrib/utils/sysinst/msg.mi.pl cvs rdiff -u -r1.8 -r1.9 src/distrib/utils/sysinst/arch/cats/msg.md.pl cvs rdiff -u -r1.31 -r1.32 src/distrib/utils/sysinst/arch/i386/msg.md.pl cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/sysinst/arch/mac68k/msg.md.pl cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/sysinst/arch/zaurus/msg.md.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/openldap/dist
Module Name:src Committed By: adam Date: Sun Dec 12 15:46:33 UTC 2010 Modified Files: src/external/bsd/openldap/dist/build: mkversion src/external/bsd/openldap/dist/clients/tools: common.c src/external/bsd/openldap/dist/include: Makefile.in portable.hin src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c tls_o.c src/external/bsd/openldap/dist/libraries/liblutil: passwd.c Removed Files: src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd: AUTHORS COPYING ChangeLog HACKING INSTALL Makefile.am Makefile.in NEWS README TODO aclocal.m4 compile config.guess config.h.in config.sub configure configure.ac depcomp install-sh missing mkinstalldirs nslcd-common.h nslcd.h nss-ldapd.conf src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common: Makefile.am Makefile.in dict.c dict.h set.c set.h tio.c tio.h src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat: Makefile.am Makefile.in attrs.h daemon.c daemon.h ether.c ether.h getopt_long.c getopt_long.h getpeercred.c getpeercred.h pagectrl.c pagectrl.h src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/m4: acx_pthread.m4 src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man: Makefile.am Makefile.in nslcd.8 nslcd.8.xml nss-ldapd.conf.5 nss-ldapd.conf.5.xml src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd: Makefile.am Makefile.in alias.c attmap.c attmap.h cfg.c cfg.h common.c common.h ether.c group.c host.c log.c log.h myldap.c myldap.h netgroup.c network.c nslcd.c passwd.c protocol.c rpc.c service.c shadow.c src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss: Makefile.am Makefile.in aliases.c common.c common.h ethers.c exports.linux group.c hosts.c netgroup.c networks.c pam.c passwd.c protocols.c prototypes.h rpc.c services.c shadow.c src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests: Makefile.am Makefile.in nss-ldapd-test.conf test_aliases.c test_cfg.c test_dict.c test_ethers.c test_group.c test_hosts.c test_myldap.c test_myldap.sh test_netgroup.c test_networks.c test_nslcd_group.c test_nsscmds.sh test_passwd.c test_protocols.c test_rpc.c test_services.c test_set.c test_shadow.c test_tio.c usernames.txt src/external/bsd/openldap/dist/doc/drafts: draft-zeilenga-ldap-txn-xx.txt src/external/bsd/openldap/dist/libraries/liblutil: csn.c src/external/bsd/openldap/dist/tests/scripts: acfilter.sh Log Message: Merge 2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/build/mkversion cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/dist/clients/tools/common.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/AUTHORS \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/COPYING \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/ChangeLog \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/HACKING \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/INSTALL \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.am \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.in \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/NEWS \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/README \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/TODO \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/aclocal.m4 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compile \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.guess \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.h.in \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.sub \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure.ac \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/depcomp \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/install-sh \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/missing \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/mkinstalldirs \
CVS commit: src/external/bsd/openldap/dist/include
Module Name:src Committed By: adam Date: Sun Dec 12 16:10:19 UTC 2010 Modified Files: src/external/bsd/openldap/dist/include: portable.hin Log Message: Use conditional WORDS_BIGENDIAN To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/include/portable.hin Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/openldap/dist/include/portable.hin diff -u src/external/bsd/openldap/dist/include/portable.hin:1.3 src/external/bsd/openldap/dist/include/portable.hin:1.4 --- src/external/bsd/openldap/dist/include/portable.hin:1.3 Sun Dec 12 15:46:32 2010 +++ src/external/bsd/openldap/dist/include/portable.hin Sun Dec 12 16:10:18 2010 @@ -1077,7 +1077,9 @@ /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +#if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +#endif /* Define to the type of arg 3 for `accept'. */ #undef ber_socklen_t
CVS commit: src/doc
Module Name:src Committed By: adam Date: Sun Dec 12 16:13:37 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Imported OpenLDAP-2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.793 -r1.794 src/doc/3RDPARTY cvs rdiff -u -r1.1472 -r1.1473 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.793 src/doc/3RDPARTY:1.794 --- src/doc/3RDPARTY:1.793 Fri Dec 10 07:23:46 2010 +++ src/doc/3RDPARTY Sun Dec 12 16:13:37 2010 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.793 2010/12/10 07:23:46 wiz Exp $ +# $NetBSD: 3RDPARTY,v 1.794 2010/12/12 16:13:37 adam Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -730,8 +730,8 @@ We have lots of local fixes. Package: OpenLDAP -Version: 2.4.21 -Current Vers: 2.4.21 +Version: 2.4.23 +Current Vers: 2.4.23 Maintainer: OpenLDAP Foundation Archive Site: http://www.openldap.org/ Home Page: http://www.openldap.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1472 src/doc/CHANGES:1.1473 --- src/doc/CHANGES:1.1472 Thu Dec 9 23:40:12 2010 +++ src/doc/CHANGES Sun Dec 12 16:13:37 2010 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1472 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1473 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -809,3 +809,4 @@ prenice(1): Add new command to change process priorities based upon the command name, like pkill(1) and pgrep(1). [mrg 20101205] bnx(4): Add support for Broadcom BCM5709S (SerDes) chip. [jym 20101210] + openldap: Import 2.4.23. [adam 20101212]
CVS commit: src/external/bsd/openldap/lib
Module Name:src Committed By: adam Date: Sun Dec 12 16:19:55 UTC 2010 Modified Files: src/external/bsd/openldap/lib/liblber: shlib_version src/external/bsd/openldap/lib/libldap: shlib_version src/external/bsd/openldap/lib/libldap_r: shlib_version Log Message: bump minor version for 2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/liblber/shlib_version cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/libldap/shlib_version cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/openldap/lib/libldap_r/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/external/bsd/openldap/lib/liblber/shlib_version diff -u src/external/bsd/openldap/lib/liblber/shlib_version:1.3 src/external/bsd/openldap/lib/liblber/shlib_version:1.4 --- src/external/bsd/openldap/lib/liblber/shlib_version:1.3 Mon Mar 8 05:45:24 2010 +++ src/external/bsd/openldap/lib/liblber/shlib_version Sun Dec 12 16:19:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.3 2010/03/08 05:45:24 lukem Exp $ +# $NetBSD: shlib_version,v 1.4 2010/12/12 16:19:54 adam Exp $ # major=3 -minor=1 +minor=2 Index: src/external/bsd/openldap/lib/libldap/shlib_version diff -u src/external/bsd/openldap/lib/libldap/shlib_version:1.4 src/external/bsd/openldap/lib/libldap/shlib_version:1.5 --- src/external/bsd/openldap/lib/libldap/shlib_version:1.4 Mon Mar 8 05:45:24 2010 +++ src/external/bsd/openldap/lib/libldap/shlib_version Sun Dec 12 16:19:55 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.4 2010/03/08 05:45:24 lukem Exp $ +# $NetBSD: shlib_version,v 1.5 2010/12/12 16:19:55 adam Exp $ # major=4 -minor=1 +minor=2 Index: src/external/bsd/openldap/lib/libldap_r/shlib_version diff -u src/external/bsd/openldap/lib/libldap_r/shlib_version:1.4 src/external/bsd/openldap/lib/libldap_r/shlib_version:1.5 --- src/external/bsd/openldap/lib/libldap_r/shlib_version:1.4 Mon Mar 8 05:45:24 2010 +++ src/external/bsd/openldap/lib/libldap_r/shlib_version Sun Dec 12 16:19:55 2010 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.4 2010/03/08 05:45:24 lukem Exp $ +# $NetBSD: shlib_version,v 1.5 2010/12/12 16:19:55 adam Exp $ # major=4 -minor=1 +minor=2
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: adam Date: Sun Dec 12 16:27:25 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 shl.mi Log Message: setlists updated for OpenLDAP 2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.564 -r1.565 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.146 -r1.147 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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.32 src/distrib/sets/lists/base/ad.mips64eb:1.33 --- src/distrib/sets/lists/base/ad.mips64eb:1.32 Sun Dec 5 20:11:22 2010 +++ src/distrib/sets/lists/base/ad.mips64eb Sun Dec 12 16:27:24 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.32 2010/12/05 20:11:22 pooka Exp $ +# $NetBSD: ad.mips64eb,v 1.33 2010/12/12 16:27:24 adam Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -128,11 +128,11 @@ ./usr/lib/64/libkvm.so.6 base-compat-shlib compat,pic ./usr/lib/64/libkvm.so.6.0 base-compat-shlib compat,pic ./usr/lib/64/liblber.so.3 base-compat-shlib compat,pic,ldap -./usr/lib/64/liblber.so.3.1 base-compat-shlib compat,pic,ldap +./usr/lib/64/liblber.so.3.2 base-compat-shlib compat,pic,ldap ./usr/lib/64/libldap.so.4 base-compat-shlib compat,pic,ldap -./usr/lib/64/libldap.so.4.1 base-compat-shlib compat,pic,ldap +./usr/lib/64/libldap.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/64/libldap_r.so.4 base-compat-shlib compat,pic,ldap -./usr/lib/64/libldap_r.so.4.1 base-compat-shlib compat,pic,ldap +./usr/lib/64/libldap_r.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/64/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/64/liblua.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/liblwres.so.5 base-compat-shlib compat,pic @@ -381,11 +381,11 @@ ./usr/lib/o32/libkvm.so.6 base-compat-shlib compat,pic ./usr/lib/o32/libkvm.so.6.0 base-compat-shlib compat,pic ./usr/lib/o32/liblber.so.3 base-compat-shlib compat,pic,ldap -./usr/lib/o32/liblber.so.3.1 base-compat-shlib compat,pic,ldap +./usr/lib/o32/liblber.so.3.2 base-compat-shlib compat,pic,ldap ./usr/lib/o32/libldap.so.4 base-compat-shlib compat,pic,ldap -./usr/lib/o32/libldap.so.4.1 base-compat-shlib compat,pic,ldap +./usr/lib/o32/libldap.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/o32/libldap_r.so.4 base-compat-shlib compat,pic,ldap -./usr/lib/o32/libldap_r.so.4.1 base-compat-shlib compat,pic,ldap +./usr/lib/o32/libldap_r.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/o32/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/o32/liblua.so.1.0 base-compat-shlib compat,pic ./usr/lib/o32/liblwres.so.5 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.30 src/distrib/sets/lists/base/ad.mips64el:1.31 --- src/distrib/sets/lists/base/ad.mips64el:1.30 Sun Dec 5 20:11:22 2010 +++ src/distrib/sets/lists/base/ad.mips64el Sun Dec 12 16:27:25 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.30 2010/12/05 20:11:22 pooka Exp $ +# $NetBSD: ad.mips64el,v 1.31 2010/12/12 16:27:25 adam Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -128,11 +128,11 @@ ./usr/lib/64/libkvm.so.6 base-compat-shlib compat,pic ./usr/lib/64/libkvm.so.6.0 base-compat-shlib compat,pic ./usr/lib/64/liblber.so.3 base-compat-shlib compat,pic,ldap -./usr/lib/64/liblber.so.3.1 base-compat-shlib compat,pic,ldap +./usr/lib/64/liblber.so.3.2 base-compat-shlib compat,pic,ldap ./usr/lib/64/libldap.so.4 base-compat-shlib compat,pic,ldap -./usr/lib/64/libldap.so.4.1 base-compat-shlib compat,pic,ldap +./usr/lib/64/libldap.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/64/libldap_r.so.4 base-compat-shlib compat,pic,ldap -./usr/lib/64/libldap_r.so.4.1 base-compat-shlib compat,pic,ldap +./usr/lib/64/libldap_r.so.4.2 base-compat-shlib compat,pic,ldap ./usr/lib/64/liblua.so.1 base-compat-shlib compat,pic ./usr/lib/64/liblua.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/liblwres.so.5 base-compat-shlib compat,pic @@ -381,11 +381,11 @@ ./usr/lib/o32/libkvm.so.6 base-compat-shlib compat,pic ./usr/lib/o32/libkvm.so.6.0 base-compat-shlib
CVS commit: src/external/bsd/openldap/dist
Module Name:src Committed By: adam Date: Sun Dec 12 15:46:33 UTC 2010 Modified Files: src/external/bsd/openldap/dist/build: mkversion src/external/bsd/openldap/dist/clients/tools: common.c src/external/bsd/openldap/dist/include: Makefile.in portable.hin src/external/bsd/openldap/dist/libraries/libldap: os-ip.c os-local.c tls_o.c src/external/bsd/openldap/dist/libraries/liblutil: passwd.c Removed Files: src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd: AUTHORS COPYING ChangeLog HACKING INSTALL Makefile.am Makefile.in NEWS README TODO aclocal.m4 compile config.guess config.h.in config.sub configure configure.ac depcomp install-sh missing mkinstalldirs nslcd-common.h nslcd.h nss-ldapd.conf src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/common: Makefile.am Makefile.in dict.c dict.h set.c set.h tio.c tio.h src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compat: Makefile.am Makefile.in attrs.h daemon.c daemon.h ether.c ether.h getopt_long.c getopt_long.h getpeercred.c getpeercred.h pagectrl.c pagectrl.h src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/m4: acx_pthread.m4 src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/man: Makefile.am Makefile.in nslcd.8 nslcd.8.xml nss-ldapd.conf.5 nss-ldapd.conf.5.xml src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nslcd: Makefile.am Makefile.in alias.c attmap.c attmap.h cfg.c cfg.h common.c common.h ether.c group.c host.c log.c log.h myldap.c myldap.h netgroup.c network.c nslcd.c passwd.c protocol.c rpc.c service.c shadow.c src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/nss: Makefile.am Makefile.in aliases.c common.c common.h ethers.c exports.linux group.c hosts.c netgroup.c networks.c pam.c passwd.c protocols.c prototypes.h rpc.c services.c shadow.c src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/tests: Makefile.am Makefile.in nss-ldapd-test.conf test_aliases.c test_cfg.c test_dict.c test_ethers.c test_group.c test_hosts.c test_myldap.c test_myldap.sh test_netgroup.c test_networks.c test_nslcd_group.c test_nsscmds.sh test_passwd.c test_protocols.c test_rpc.c test_services.c test_set.c test_shadow.c test_tio.c usernames.txt src/external/bsd/openldap/dist/doc/drafts: draft-zeilenga-ldap-txn-xx.txt src/external/bsd/openldap/dist/libraries/liblutil: csn.c src/external/bsd/openldap/dist/tests/scripts: acfilter.sh Log Message: Merge 2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/build/mkversion cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/dist/clients/tools/common.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/AUTHORS \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/COPYING \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/ChangeLog \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/HACKING \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/INSTALL \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.am \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/Makefile.in \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/NEWS \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/README \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/TODO \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/aclocal.m4 \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/compile \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.guess \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.h.in \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/config.sub \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/configure.ac \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/depcomp \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/install-sh \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/missing \ src/external/bsd/openldap/dist/contrib/slapd-modules/nssov/nss-ldapd/mkinstalldirs \
CVS commit: src/external/bsd/openldap/dist/include
Module Name:src Committed By: adam Date: Sun Dec 12 16:10:19 UTC 2010 Modified Files: src/external/bsd/openldap/dist/include: portable.hin Log Message: Use conditional WORDS_BIGENDIAN To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/include/portable.hin Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/openldap
Module Name:src Committed By: adam Date: Sun Dec 12 16:10:44 UTC 2010 Modified Files: src/external/bsd/openldap: openldap.mk src/external/bsd/openldap/include: lber_types.h ldap_config.h ldap_features.h portable.h src/external/bsd/openldap/lib/liblutil: Makefile src/external/bsd/openldap/man: lber-decode.3 lber-encode.3 lber-memory.3 lber-sockbuf.3 lber-types.3 ldap.3 ldap.conf.5 ldap_abandon.3 ldap_add.3 ldap_bind.3 ldap_compare.3 ldap_controls.3 ldap_delete.3 ldap_error.3 ldap_extended_operation.3 ldap_first_attribute.3 ldap_first_entry.3 ldap_first_message.3 ldap_first_reference.3 ldap_get_dn.3 ldap_get_option.3 ldap_get_values.3 ldap_memory.3 ldap_modify.3 ldap_modrdn.3 ldap_open.3 ldap_parse_reference.3 ldap_parse_result.3 ldap_parse_sort_control.3 ldap_parse_vlv_control.3 ldap_rename.3 ldap_result.3 ldap_schema.3 ldap_search.3 ldap_sort.3 ldap_sync.3 ldap_tls.3 ldap_url.3 ldapcompare.1 ldapdelete.1 ldapmodify.1 ldapmodrdn.1 ldappasswd.1 ldapsearch.1 ldapurl.1 ldapwhoami.1 ldif.5 slapacl.8 slapadd.8 slapauth.8 slapcat.8 slapd-bdb.5 slapd-config.5 slapd-dnssrv.5 slapd-ldap.5 slapd-ldbm.5 slapd-ldif.5 slapd-meta.5 slapd-monitor.5 slapd-ndb.5 slapd-null.5 slapd-passwd.5 slapd-perl.5 slapd-relay.5 slapd-shell.5 slapd-sock.5 slapd-sql.5 slapd.8 slapd.access.5 slapd.backends.5 slapd.conf.5 slapd.overlays.5 slapd.plugin.5 slapdn.8 slapindex.8 slapo-accesslog.5 slapo-auditlog.5 slapo-chain.5 slapo-collect.5 slapo-constraint.5 slapo-dds.5 slapo-dyngroup.5 slapo-dynlist.5 slapo-memberof.5 slapo-pcache.5 slapo-ppolicy.5 slapo-refint.5 slapo-retcode.5 slapo-rwm.5 slapo-sssvlv.5 slapo-syncprov.5 slapo-translucent.5 slapo-unique.5 slapo-valsort.5 slappasswd.8 slapschema.8 slaptest.8 Added Files: src/external/bsd/openldap/man: slapo-pbind.5 Log Message: Update to OpenLDAP 2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/openldap.mk cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/include/lber_types.h \ src/external/bsd/openldap/include/ldap_config.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/include/ldap_features.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/include/portable.h cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/liblutil/Makefile cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/man/lber-decode.3 \ src/external/bsd/openldap/man/lber-encode.3 \ src/external/bsd/openldap/man/lber-memory.3 \ src/external/bsd/openldap/man/lber-sockbuf.3 \ src/external/bsd/openldap/man/lber-types.3 \ src/external/bsd/openldap/man/ldap.3 \ src/external/bsd/openldap/man/ldap_abandon.3 \ src/external/bsd/openldap/man/ldap_add.3 \ src/external/bsd/openldap/man/ldap_bind.3 \ src/external/bsd/openldap/man/ldap_compare.3 \ src/external/bsd/openldap/man/ldap_controls.3 \ src/external/bsd/openldap/man/ldap_delete.3 \ src/external/bsd/openldap/man/ldap_error.3 \ src/external/bsd/openldap/man/ldap_extended_operation.3 \ src/external/bsd/openldap/man/ldap_first_attribute.3 \ src/external/bsd/openldap/man/ldap_first_entry.3 \ src/external/bsd/openldap/man/ldap_first_message.3 \ src/external/bsd/openldap/man/ldap_first_reference.3 \ src/external/bsd/openldap/man/ldap_get_dn.3 \ src/external/bsd/openldap/man/ldap_get_option.3 \ src/external/bsd/openldap/man/ldap_get_values.3 \ src/external/bsd/openldap/man/ldap_memory.3 \ src/external/bsd/openldap/man/ldap_modify.3 \ src/external/bsd/openldap/man/ldap_modrdn.3 \ src/external/bsd/openldap/man/ldap_open.3 \ src/external/bsd/openldap/man/ldap_parse_reference.3 \ src/external/bsd/openldap/man/ldap_parse_result.3 \ src/external/bsd/openldap/man/ldap_parse_sort_control.3 \ src/external/bsd/openldap/man/ldap_parse_vlv_control.3 \ src/external/bsd/openldap/man/ldap_rename.3 \ src/external/bsd/openldap/man/ldap_result.3 \ src/external/bsd/openldap/man/ldap_schema.3 \ src/external/bsd/openldap/man/ldap_search.3 \ src/external/bsd/openldap/man/ldap_sort.3 \ src/external/bsd/openldap/man/ldap_sync.3 \ src/external/bsd/openldap/man/ldap_tls.3 \ src/external/bsd/openldap/man/ldap_url.3 \ src/external/bsd/openldap/man/ldapcompare.1 \ src/external/bsd/openldap/man/ldapdelete.1 \ src/external/bsd/openldap/man/ldapmodify.1 \ src/external/bsd/openldap/man/ldapmodrdn.1 \ src/external/bsd/openldap/man/ldappasswd.1 \ src/external/bsd/openldap/man/ldapsearch.1 \ src/external/bsd/openldap/man/ldapwhoami.1 \ src/external/bsd/openldap/man/ldif.5 \ src/external/bsd/openldap/man/slapacl.8 \
CVS commit: src/doc
Module Name:src Committed By: adam Date: Sun Dec 12 16:13:37 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Imported OpenLDAP-2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.793 -r1.794 src/doc/3RDPARTY cvs rdiff -u -r1.1472 -r1.1473 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/openldap/lib
Module Name:src Committed By: adam Date: Sun Dec 12 16:19:55 UTC 2010 Modified Files: src/external/bsd/openldap/lib/liblber: shlib_version src/external/bsd/openldap/lib/libldap: shlib_version src/external/bsd/openldap/lib/libldap_r: shlib_version Log Message: bump minor version for 2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/lib/liblber/shlib_version cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openldap/lib/libldap/shlib_version cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/openldap/lib/libldap_r/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: adam Date: Sun Dec 12 16:27:25 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 shl.mi Log Message: setlists updated for OpenLDAP 2.4.23 To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.564 -r1.565 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.74 -r1.75 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.146 -r1.147 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.
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader
Module Name:src
Committed By: adam
Date: Sun Dec 5 15:57:40 UTC 2010
Modified Files:
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile
Log Message:
Fix building on case-insensitive file-system.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile:1.8 Tue Nov 23 10:19:55 2010
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Sun Dec 5 15:57:40 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/11/23 10:19:55 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2010/12/05 15:57:40 adam Exp $
.include ../../../Makefile.serverlib
.include ../../../Makefile.servermod
@@ -29,7 +29,6 @@
-I${X11SRCDIR.xorg-server}/mi \
-I${X11SRCDIR.xorg-server}/xfixes \
-I${DESTDIR}${X11INCDIR}/X11 \
- -I${DESTDIR}${X11INCDIR}/X11/extensions \
-I${DESTDIR}${X11INCDIR}/pixman-1 \
-I${DESTDIR}${X11INCDIR}/xorg
CVS commit: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader
Module Name:src Committed By: adam Date: Sun Dec 5 15:57:40 UTC 2010 Modified Files: src/external/mit/xorg/server/xorg-server/hw/xfree86/loader: Makefile Log Message: Fix building on case-insensitive file-system. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 \ src/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: adam
Date: Mon Nov 22 09:53:01 UTC 2010
Modified Files:
src/crypto/external/bsd/openssh/dist: servconf.c sftp.c ssh-keygen.c
Log Message:
Fix compiler warnings
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/servconf.c
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/sftp.c \
src/crypto/external/bsd/openssh/dist/ssh-keygen.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/servconf.c
diff -u src/crypto/external/bsd/openssh/dist/servconf.c:1.5 src/crypto/external/bsd/openssh/dist/servconf.c:1.6
--- src/crypto/external/bsd/openssh/dist/servconf.c:1.5 Sun Nov 21 18:59:04 2010
+++ src/crypto/external/bsd/openssh/dist/servconf.c Mon Nov 22 09:53:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: servconf.c,v 1.5 2010/11/21 18:59:04 adam Exp $ */
+/* $NetBSD: servconf.c,v 1.6 2010/11/22 09:53:01 adam Exp $ */
/* $OpenBSD: servconf.c,v 1.209 2010/06/22 04:22:59 djm Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen y...@cs.hut.fi, Espoo, Finland
@@ -12,7 +12,7 @@
*/
#include includes.h
-__RCSID($NetBSD: servconf.c,v 1.5 2010/11/21 18:59:04 adam Exp $);
+__RCSID($NetBSD: servconf.c,v 1.6 2010/11/22 09:53:01 adam Exp $);
#include sys/types.h
#include sys/socket.h
#include sys/queue.h
@@ -816,7 +816,8 @@
int cmdline = 0, *intptr, value, n;
SyslogFacility *log_facility_ptr;
LogLevel *log_level_ptr;
- unsigned long lvalue, *longptr;
+ unsigned long lvalue;
+ time_t *timetptr;
ServerOpCodes opcode;
int port = 0;
u_int i, flags = 0;
@@ -831,7 +832,7 @@
if (!arg || !*arg || *arg == '#')
return 0;
intptr = NULL;
- longptr = NULL;
+ timetptr = NULL;
charptr = NULL;
opcode = parse_token(arg, filename, linenum, flags);
@@ -1627,19 +1628,19 @@
*intptr = value;
break;
case sBindTimeout:
- longptr = (unsigned long *) options-lpk.b_timeout.tv_sec;
+ timetptr = options-lpk.b_timeout.tv_sec;
parse_ulong:
arg = strdelim(cp);
if (!arg || *arg == '\0')
fatal(%s line %d: missing integer value.,
filename, linenum);
lvalue = atol(arg);
- if (*activep *longptr == -1)
- *longptr = lvalue;
+ if (*activep *timetptr == -1)
+ *timetptr = lvalue;
break;
case sSearchTimeout:
- longptr = (unsigned long *) options-lpk.s_timeout.tv_sec;
+ timetptr = options-lpk.s_timeout.tv_sec;
goto parse_ulong;
break;
case sLdapConf:
Index: src/crypto/external/bsd/openssh/dist/sftp.c
diff -u src/crypto/external/bsd/openssh/dist/sftp.c:1.4 src/crypto/external/bsd/openssh/dist/sftp.c:1.5
--- src/crypto/external/bsd/openssh/dist/sftp.c:1.4 Sun Nov 21 18:29:49 2010
+++ src/crypto/external/bsd/openssh/dist/sftp.c Mon Nov 22 09:53:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sftp.c,v 1.4 2010/11/21 18:29:49 adam Exp $ */
+/* $NetBSD: sftp.c,v 1.5 2010/11/22 09:53:01 adam Exp $ */
/* $OpenBSD: sftp.c,v 1.125 2010/06/18 00:58:39 djm Exp $ */
/*
* Copyright (c) 2001-2004 Damien Miller d...@openbsd.org
@@ -17,7 +17,7 @@
*/
#include includes.h
-__RCSID($NetBSD: sftp.c,v 1.4 2010/11/21 18:29:49 adam Exp $);
+__RCSID($NetBSD: sftp.c,v 1.5 2010/11/22 09:53:01 adam Exp $);
#include sys/types.h
#include sys/ioctl.h
#include sys/wait.h
@@ -1778,7 +1778,7 @@
struct complete_ctx *complete_ctx;
lf = el_line(el);
- if (el_get(el, EL_CLIENTDATA, (void**)complete_ctx) != 0)
+ if (el_get(el, EL_CLIENTDATA, complete_ctx) != 0)
fatal(%s: el_get failed, __func__);
/* Figure out which argument the cursor points to */
Index: src/crypto/external/bsd/openssh/dist/ssh-keygen.c
diff -u src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.4 src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.5
--- src/crypto/external/bsd/openssh/dist/ssh-keygen.c:1.4 Sun Nov 21 18:29:49 2010
+++ src/crypto/external/bsd/openssh/dist/ssh-keygen.c Mon Nov 22 09:53:01 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ssh-keygen.c,v 1.4 2010/11/21 18:29:49 adam Exp $ */
+/* $NetBSD: ssh-keygen.c,v 1.5 2010/11/22 09:53:01 adam Exp $ */
/* $OpenBSD: ssh-keygen.c,v 1.199 2010/08/16 04:06:06 djm Exp $ */
/*
* Author: Tatu Ylonen y...@cs.hut.fi
@@ -14,7 +14,7 @@
*/
#include includes.h
-__RCSID($NetBSD: ssh-keygen.c,v 1.4 2010/11/21 18:29:49 adam Exp $);
+__RCSID($NetBSD: ssh-keygen.c,v 1.5 2010/11/22 09:53:01 adam Exp $);
#include sys/types.h
#include sys/socket.h
#include sys/stat.h
@@ -1445,7 +1445,7 @@
if (!quiet) {
logit(Signed %s key %s: id \%s\ serial %llu%s%s
valid %s, key_cert_type(public),
- out, public-cert-key_id, public-cert-serial,
+ out, public-cert-key_id, (unsigned long long)public-cert-serial,
cert_principals != NULL ? for : ,
cert_principals != NULL ? cert_principals : ,
fmt_validity(cert_valid_from, cert_valid_to));
@@ -1671,7 +1671,7 @@
key_type(key-cert-signature_key), ca_fp);
printf(Key ID:
CVS commit: src/crypto/external/bsd/openssh/lib
Module Name:src
Committed By: adam
Date: Tue Nov 23 07:12:02 UTC 2010
Modified Files:
src/crypto/external/bsd/openssh/lib: Makefile
Log Message:
Removed roaming_common.c from COPTS sections
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.6 src/crypto/external/bsd/openssh/lib/Makefile:1.7
--- src/crypto/external/bsd/openssh/lib/Makefile:1.6 Mon Nov 22 22:19:54 2010
+++ src/crypto/external/bsd/openssh/lib/Makefile Tue Nov 23 07:12:01 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/11/22 22:19:54 christos Exp $
+# $NetBSD: Makefile,v 1.7 2010/11/23 07:12:01 adam Exp $
.include bsd.own.mk
@@ -29,7 +29,7 @@
z ${NETBSDSRCDIR}/lib/libz
.if (defined(HAVE_GCC) ${HAVE_GCC} == 4) || defined(HAVE_PCC)
-.for f in dns channels hostfile roaming_common ssh-pkcs11
+.for f in dns channels hostfile ssh-pkcs11
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
.endif
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: adam Date: Mon Nov 22 09:53:01 UTC 2010 Modified Files: src/crypto/external/bsd/openssh/dist: servconf.c sftp.c ssh-keygen.c Log Message: Fix compiler warnings To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/dist/servconf.c cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/sftp.c \ src/crypto/external/bsd/openssh/dist/ssh-keygen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/lib
Module Name:src Committed By: adam Date: Tue Nov 23 07:12:02 UTC 2010 Modified Files: src/crypto/external/bsd/openssh/lib: Makefile Log Message: Removed roaming_common.c from COPTS sections To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/lib/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: adam Date: Sun Nov 21 17:06:13 UTC 2010 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13101 Log Message: Imported openssh-5.6 Status: Vendor Tag: OPENSSH Release Tags: v56-20101121 C src/crypto/external/bsd/openssh/dist/addrmatch.c U src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/auth-chall.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c C src/crypto/external/bsd/openssh/dist/auth-options.c C src/crypto/external/bsd/openssh/dist/auth-options.h U src/crypto/external/bsd/openssh/dist/auth-passwd.c C src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c C src/crypto/external/bsd/openssh/dist/auth-rhosts.c C src/crypto/external/bsd/openssh/dist/auth-rsa.c C src/crypto/external/bsd/openssh/dist/auth.c C src/crypto/external/bsd/openssh/dist/auth.h C src/crypto/external/bsd/openssh/dist/auth1.c U src/crypto/external/bsd/openssh/dist/auth2-chall.c U src/crypto/external/bsd/openssh/dist/auth2-gss.c C src/crypto/external/bsd/openssh/dist/auth2-hostbased.c U src/crypto/external/bsd/openssh/dist/auth2-jpake.c U src/crypto/external/bsd/openssh/dist/auth2-kbdint.c C src/crypto/external/bsd/openssh/dist/auth2-none.c U src/crypto/external/bsd/openssh/dist/auth2.c U src/crypto/external/bsd/openssh/dist/auth2-passwd.c C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c C src/crypto/external/bsd/openssh/dist/authfd.c C src/crypto/external/bsd/openssh/dist/authfd.h C src/crypto/external/bsd/openssh/dist/authfile.c C src/crypto/external/bsd/openssh/dist/authfile.h C src/crypto/external/bsd/openssh/dist/bufaux.c U src/crypto/external/bsd/openssh/dist/bufbn.c C src/crypto/external/bsd/openssh/dist/buffer.c C src/crypto/external/bsd/openssh/dist/buffer.h C src/crypto/external/bsd/openssh/dist/canohost.c U src/crypto/external/bsd/openssh/dist/canohost.h C src/crypto/external/bsd/openssh/dist/channels.c C src/crypto/external/bsd/openssh/dist/channels.h U src/crypto/external/bsd/openssh/dist/cipher-3des1.c U src/crypto/external/bsd/openssh/dist/cipher-bf1.c U src/crypto/external/bsd/openssh/dist/cipher-ctr.c U src/crypto/external/bsd/openssh/dist/cipher.c U src/crypto/external/bsd/openssh/dist/cipher.h U src/crypto/external/bsd/openssh/dist/cleanup.c C src/crypto/external/bsd/openssh/dist/clientloop.c C src/crypto/external/bsd/openssh/dist/clientloop.h U src/crypto/external/bsd/openssh/dist/compat.c U src/crypto/external/bsd/openssh/dist/compat.h U src/crypto/external/bsd/openssh/dist/compress.c U src/crypto/external/bsd/openssh/dist/compress.h U src/crypto/external/bsd/openssh/dist/crc32.c U src/crypto/external/bsd/openssh/dist/crc32.h U src/crypto/external/bsd/openssh/dist/deattack.c U src/crypto/external/bsd/openssh/dist/deattack.h C src/crypto/external/bsd/openssh/dist/dh.c U src/crypto/external/bsd/openssh/dist/dh.h U src/crypto/external/bsd/openssh/dist/dispatch.c U src/crypto/external/bsd/openssh/dist/dispatch.h C src/crypto/external/bsd/openssh/dist/dns.c C src/crypto/external/bsd/openssh/dist/dns.h U src/crypto/external/bsd/openssh/dist/fatal.c U src/crypto/external/bsd/openssh/dist/groupaccess.c U src/crypto/external/bsd/openssh/dist/groupaccess.h U src/crypto/external/bsd/openssh/dist/gss-genr.c U src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c U src/crypto/external/bsd/openssh/dist/gss-serv.c C src/crypto/external/bsd/openssh/dist/hostfile.c C src/crypto/external/bsd/openssh/dist/hostfile.h C src/crypto/external/bsd/openssh/dist/jpake.c U src/crypto/external/bsd/openssh/dist/jpake.h C src/crypto/external/bsd/openssh/dist/kex.c C src/crypto/external/bsd/openssh/dist/kex.h U src/crypto/external/bsd/openssh/dist/kexdh.c U src/crypto/external/bsd/openssh/dist/kexdhc.c C src/crypto/external/bsd/openssh/dist/kexdhs.c U src/crypto/external/bsd/openssh/dist/kexgex.c U src/crypto/external/bsd/openssh/dist/kexgexc.c C src/crypto/external/bsd/openssh/dist/kexgexs.c C src/crypto/external/bsd/openssh/dist/key.c C src/crypto/external/bsd/openssh/dist/key.h U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/log.c U src/crypto/external/bsd/openssh/dist/log.h U src/crypto/external/bsd/openssh/dist/mac.c U src/crypto/external/bsd/openssh/dist/mac.h U src/crypto/external/bsd/openssh/dist/match.c C src/crypto/external/bsd/openssh/dist/match.h C src/crypto/external/bsd/openssh/dist/misc.c C src/crypto/external/bsd/openssh/dist/misc.h U src/crypto/external/bsd/openssh/dist/moduli.c C src/crypto/external/bsd/openssh/dist/monitor.c U src/crypto/external/bsd/openssh/dist/monitor.h C src/crypto/external/bsd/openssh/dist/monitor_fdpass.c U src/crypto/external/bsd/openssh/dist/monitor_fdpass.h U src/crypto/external/bsd/openssh/dist/monitor_mm.c U src/crypto/external/bsd/openssh/dist/monitor_mm.h C
CVS commit: src/crypto/external/bsd/openssh
Module Name:src
Committed By: adam
Date: Sun Nov 21 19:19:23 UTC 2010
Modified Files:
src/crypto/external/bsd/openssh: Makefile.inc
src/crypto/external/bsd/openssh/bin: Makefile
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/ssh-agent: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/lib: Makefile shlib_version
Added Files:
src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper: Makefile
Log Message:
Updated custom makefiles for OpenSSH 5.6
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/Makefile.inc
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/Makefile
cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r0 -r1.1 \
src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile
cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/lib/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/crypto/external/bsd/openssh/Makefile.inc
diff -u src/crypto/external/bsd/openssh/Makefile.inc:1.1 src/crypto/external/bsd/openssh/Makefile.inc:1.2
--- src/crypto/external/bsd/openssh/Makefile.inc:1.1 Sat Dec 19 18:00:26 2009
+++ src/crypto/external/bsd/openssh/Makefile.inc Sun Nov 21 19:19:21 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2009/12/19 18:00:26 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2010/11/21 19:19:21 adam Exp $
WARNS?= 1 # XXX -Wshadow -Wcast-qual
@@ -8,7 +8,10 @@
SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
-CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY
+CPPFLAGS+=-I${SSHDIST} -DHAVE_LOGIN_CAP -DHAVE_MMAP -DHAVE_OPENPTY -DENABLE_PKCS11
+.if !defined(NOPIC)
+CPPFLAGS+=-DHAVE_DLOPEN
+.endif
.PATH: ${SSHDIST}
.if (${USE_PAM} != no)
@@ -24,6 +27,10 @@
CPPFLAGS+=-DKRB5 -I${DESTDIR}/usr/include/krb5 -DHEIMDAL
.endif
+.if (${USE_LDAP} != no)
+CPPFLAGS+=-DWITH_LDAP_PUBKEY
+.endif
+
.if ${X11FLAVOUR} == Xorg
CPPFLAGS+=-DX11BASE=\/usr/X11R7\
.endif
Index: src/crypto/external/bsd/openssh/bin/Makefile
diff -u src/crypto/external/bsd/openssh/bin/Makefile:1.2 src/crypto/external/bsd/openssh/bin/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/Makefile:1.2 Tue Jul 21 00:47:23 2009
+++ src/crypto/external/bsd/openssh/bin/Makefile Sun Nov 21 19:19:21 2010
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.2 2009/07/21 00:47:23 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/21 19:19:21 adam Exp $
.include bsd.own.mk
SSHDIST?= ${NETBSDSRCDIR}/crypto/external/bsd/openssh/dist
SUBDIR= ssh sshd ssh-add ssh-keygen ssh-agent scp sftp-server \
- ssh-keysign ssh-keyscan sftp
-#SUBDIR+=scard
+ ssh-keysign ssh-keyscan sftp ssh-pkcs11-helper
.PATH: ${SSHDIST}
.MADE: moduli
Index: src/crypto/external/bsd/openssh/bin/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.2 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.3
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.2 Wed Feb 3 15:34:37 2010
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Sun Nov 21 19:19:22 2010
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2010/02/03 15:34:37 roy Exp $
+# $NetBSD: Makefile,v 1.3 2010/11/21 19:19:22 adam Exp $
BINDIR= /usr/bin
PROG= sftp
-SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c misc.c fmt_scaled.c
+SRCS= sftp.c sftp-client.c sftp-common.c sftp-glob.c
MAN= sftp.1
LDADD+= -ledit -lterminfo
@@ -12,5 +12,6 @@
.include bsd.prog.mk
.if (defined(HAVE_GCC) ${HAVE_GCC} == 4) || defined(HAVE_PCC)
-COPTS.sftp-client.c+= -Wno-pointer-sign
+COPTS.sftp.c+= -Wno-pointer-sign
+COPTS.sftp-client.c+= -Wno-pointer-sign
.endif
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.1 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.2
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.1 Sun Jun 7 22:38:45 2009
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Sun Nov 21 19:19:22 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/06/07 22:38:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2010/11/21 19:19:22 adam Exp $
.include bsd.own.mk
@@ -6,10 +6,12 @@
PROG= ssh
SRCS= ssh.c readconf.c clientloop.c sshtty.c \
- sshconnect.c sshconnect1.c sshconnect2.c mux.c
+ sshconnect.c sshconnect1.c
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: adam Date: Sun Nov 21 19:58:04 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/man: mi Log Message: setlists updated for OpenSSH 5.6 To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.887 -r1.888 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.554 -r1.555 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1524 -r1.1525 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.137 -r1.138 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.1252 -r1.1253 src/distrib/sets/lists/man/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/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.26 src/distrib/sets/lists/base/ad.mips64eb:1.27 --- src/distrib/sets/lists/base/ad.mips64eb:1.26 Sat Nov 6 09:40:31 2010 +++ src/distrib/sets/lists/base/ad.mips64eb Sun Nov 21 19:58:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.26 2010/11/06 09:40:31 plunky Exp $ +# $NetBSD: ad.mips64eb,v 1.27 2010/11/21 19:58:03 adam Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -196,7 +196,7 @@ ./usr/lib/64/libss.so.6base-compat-shlib compat,pic,kerberos ./usr/lib/64/libss.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libssh.so.15 base-compat-shlib compat,pic,crypto -./usr/lib/64/libssh.so.15.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssh.so.15.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libstdc++.so.7 base-compat-shlib compat,pic,cxx @@ -437,7 +437,7 @@ ./usr/lib/o32/libss.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libss.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libssh.so.15 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libssh.so.15.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssh.so.15.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libstdc++.so.7 base-compat-shlib compat,pic,cxx Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.24 src/distrib/sets/lists/base/ad.mips64el:1.25 --- src/distrib/sets/lists/base/ad.mips64el:1.24 Sat Nov 6 09:40:31 2010 +++ src/distrib/sets/lists/base/ad.mips64el Sun Nov 21 19:58:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.24 2010/11/06 09:40:31 plunky Exp $ +# $NetBSD: ad.mips64el,v 1.25 2010/11/21 19:58:03 adam Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -196,7 +196,7 @@ ./usr/lib/64/libss.so.6base-compat-shlib compat,pic,kerberos ./usr/lib/64/libss.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/64/libssh.so.15 base-compat-shlib compat,pic,crypto -./usr/lib/64/libssh.so.15.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssh.so.15.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libstdc++.so.7 base-compat-shlib compat,pic,cxx @@ -437,7 +437,7 @@ ./usr/lib/o32/libss.so.6 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libss.so.6.0 base-compat-shlib compat,pic,kerberos ./usr/lib/o32/libssh.so.15 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libssh.so.15.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssh.so.15.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.8 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libstdc++.so.7 base-compat-shlib compat,pic,cxx Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.98 src/distrib/sets/lists/base/md.amd64:1.99 --- src/distrib/sets/lists/base/md.amd64:1.98 Thu Nov 4 21:15:54 2010 +++ src/distrib/sets/lists/base/md.amd64 Sun Nov 21 19:58:03 2010 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.98 2010/11/04 21:15:54 pooka Exp $ +# $NetBSD: md.amd64,v 1.99 2010/11/21 19:58:03 adam Exp $
CVS commit: src/lib/libpam/modules/pam_ssh
Module Name:src
Committed By: adam
Date: Sun Nov 21 20:41:36 UTC 2010
Modified Files:
src/lib/libpam/modules/pam_ssh: pam_ssh.c
Log Message:
Use ssh_add_identity_constrained() instead of ssh_add_identity()
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libpam/modules/pam_ssh/pam_ssh.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libpam/modules/pam_ssh/pam_ssh.c
diff -u src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.15 src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.16
--- src/lib/libpam/modules/pam_ssh/pam_ssh.c:1.15 Sun Jan 27 01:23:20 2008
+++ src/lib/libpam/modules/pam_ssh/pam_ssh.c Sun Nov 21 20:41:36 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: pam_ssh.c,v 1.15 2008/01/27 01:23:20 christos Exp $ */
+/* $NetBSD: pam_ssh.c,v 1.16 2010/11/21 20:41:36 adam Exp $ */
/*-
* Copyright (c) 2003 Networks Associates Technology, Inc.
@@ -38,7 +38,7 @@
#ifdef __FreeBSD__
__FBSDID($FreeBSD: src/lib/libpam/modules/pam_ssh/pam_ssh.c,v 1.40 2004/02/10 10:13:21 des Exp $);
#else
-__RCSID($NetBSD: pam_ssh.c,v 1.15 2008/01/27 01:23:20 christos Exp $);
+__RCSID($NetBSD: pam_ssh.c,v 1.16 2010/11/21 20:41:36 adam Exp $);
#endif
#include sys/param.h
@@ -376,7 +376,7 @@
pam_err = pam_get_data(pamh, *kfn, vp);
psk = vp;
if (pam_err == PAM_SUCCESS psk != NULL) {
- if (ssh_add_identity(ac, psk-key, psk-comment))
+ if (ssh_add_identity_constrained(ac, psk-key, psk-comment, 0, 0))
openpam_log(PAM_LOG_DEBUG,
added %s to ssh agent, psk-comment);
else
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: adam Date: Sun Nov 21 19:11:10 UTC 2010 Modified Files: src/crypto/external/bsd/openssh/dist: openssh2netbsd Removed Files: src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper: Makefile Log Message: We don't need dist/ssh-pkcs11-helper/Makefile To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/dist/openssh2netbsd cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssh/dist/openssh2netbsd diff -u src/crypto/external/bsd/openssh/dist/openssh2netbsd:1.1 src/crypto/external/bsd/openssh/dist/openssh2netbsd:1.2 --- src/crypto/external/bsd/openssh/dist/openssh2netbsd:1.1 Sun Jun 7 22:38:47 2009 +++ src/crypto/external/bsd/openssh/dist/openssh2netbsd Sun Nov 21 19:11:09 2010 @@ -1,6 +1,6 @@ #! /bin/sh # -# $NetBSD: openssh2netbsd,v 1.1 2009/06/07 22:38:47 christos Exp $ +# $NetBSD: openssh2netbsd,v 1.2 2010/11/21 19:11:09 adam Exp $ # # Copyright (c) 2001 The NetBSD Foundation, Inc. # All rights reserved. @@ -33,7 +33,7 @@ ### Remove Makefile and subdirs rm -r Makefile Makefile.inc -rm -r lib ssh-add ssh scp ssh-agent sshd sftp-server ssh-keygen sftp ssh-keyscan ssh-keysign +rm -r lib ssh-add ssh scp ssh-agent sshd sftp-server ssh-keygen sftp ssh-keyscan ssh-keysign ssh-pkcs11-helper ### add NetBSD RCS tag for i in *.c *.h; do
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: adam Date: Sun Nov 21 17:06:13 UTC 2010 Update of /cvsroot/src/crypto/external/bsd/openssh/dist In directory ivanova.netbsd.org:/tmp/cvs-serv13101 Log Message: Imported openssh-5.6 Status: Vendor Tag: OPENSSH Release Tags: v56-20101121 C src/crypto/external/bsd/openssh/dist/addrmatch.c U src/crypto/external/bsd/openssh/dist/atomicio.c U src/crypto/external/bsd/openssh/dist/atomicio.h U src/crypto/external/bsd/openssh/dist/auth-bsdauth.c U src/crypto/external/bsd/openssh/dist/auth-chall.c U src/crypto/external/bsd/openssh/dist/auth-krb5.c C src/crypto/external/bsd/openssh/dist/auth-options.c C src/crypto/external/bsd/openssh/dist/auth-options.h U src/crypto/external/bsd/openssh/dist/auth-passwd.c C src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c C src/crypto/external/bsd/openssh/dist/auth-rhosts.c C src/crypto/external/bsd/openssh/dist/auth-rsa.c C src/crypto/external/bsd/openssh/dist/auth.c C src/crypto/external/bsd/openssh/dist/auth.h C src/crypto/external/bsd/openssh/dist/auth1.c U src/crypto/external/bsd/openssh/dist/auth2-chall.c U src/crypto/external/bsd/openssh/dist/auth2-gss.c C src/crypto/external/bsd/openssh/dist/auth2-hostbased.c U src/crypto/external/bsd/openssh/dist/auth2-jpake.c U src/crypto/external/bsd/openssh/dist/auth2-kbdint.c C src/crypto/external/bsd/openssh/dist/auth2-none.c U src/crypto/external/bsd/openssh/dist/auth2.c U src/crypto/external/bsd/openssh/dist/auth2-passwd.c C src/crypto/external/bsd/openssh/dist/auth2-pubkey.c C src/crypto/external/bsd/openssh/dist/authfd.c C src/crypto/external/bsd/openssh/dist/authfd.h C src/crypto/external/bsd/openssh/dist/authfile.c C src/crypto/external/bsd/openssh/dist/authfile.h C src/crypto/external/bsd/openssh/dist/bufaux.c U src/crypto/external/bsd/openssh/dist/bufbn.c C src/crypto/external/bsd/openssh/dist/buffer.c C src/crypto/external/bsd/openssh/dist/buffer.h C src/crypto/external/bsd/openssh/dist/canohost.c U src/crypto/external/bsd/openssh/dist/canohost.h C src/crypto/external/bsd/openssh/dist/channels.c C src/crypto/external/bsd/openssh/dist/channels.h U src/crypto/external/bsd/openssh/dist/cipher-3des1.c U src/crypto/external/bsd/openssh/dist/cipher-bf1.c U src/crypto/external/bsd/openssh/dist/cipher-ctr.c U src/crypto/external/bsd/openssh/dist/cipher.c U src/crypto/external/bsd/openssh/dist/cipher.h U src/crypto/external/bsd/openssh/dist/cleanup.c C src/crypto/external/bsd/openssh/dist/clientloop.c C src/crypto/external/bsd/openssh/dist/clientloop.h U src/crypto/external/bsd/openssh/dist/compat.c U src/crypto/external/bsd/openssh/dist/compat.h U src/crypto/external/bsd/openssh/dist/compress.c U src/crypto/external/bsd/openssh/dist/compress.h U src/crypto/external/bsd/openssh/dist/crc32.c U src/crypto/external/bsd/openssh/dist/crc32.h U src/crypto/external/bsd/openssh/dist/deattack.c U src/crypto/external/bsd/openssh/dist/deattack.h C src/crypto/external/bsd/openssh/dist/dh.c U src/crypto/external/bsd/openssh/dist/dh.h U src/crypto/external/bsd/openssh/dist/dispatch.c U src/crypto/external/bsd/openssh/dist/dispatch.h C src/crypto/external/bsd/openssh/dist/dns.c C src/crypto/external/bsd/openssh/dist/dns.h U src/crypto/external/bsd/openssh/dist/fatal.c U src/crypto/external/bsd/openssh/dist/groupaccess.c U src/crypto/external/bsd/openssh/dist/groupaccess.h U src/crypto/external/bsd/openssh/dist/gss-genr.c U src/crypto/external/bsd/openssh/dist/gss-serv-krb5.c U src/crypto/external/bsd/openssh/dist/gss-serv.c C src/crypto/external/bsd/openssh/dist/hostfile.c C src/crypto/external/bsd/openssh/dist/hostfile.h C src/crypto/external/bsd/openssh/dist/jpake.c U src/crypto/external/bsd/openssh/dist/jpake.h C src/crypto/external/bsd/openssh/dist/kex.c C src/crypto/external/bsd/openssh/dist/kex.h U src/crypto/external/bsd/openssh/dist/kexdh.c U src/crypto/external/bsd/openssh/dist/kexdhc.c C src/crypto/external/bsd/openssh/dist/kexdhs.c U src/crypto/external/bsd/openssh/dist/kexgex.c U src/crypto/external/bsd/openssh/dist/kexgexc.c C src/crypto/external/bsd/openssh/dist/kexgexs.c C src/crypto/external/bsd/openssh/dist/key.c C src/crypto/external/bsd/openssh/dist/key.h U src/crypto/external/bsd/openssh/dist/LICENCE U src/crypto/external/bsd/openssh/dist/log.c U src/crypto/external/bsd/openssh/dist/log.h U src/crypto/external/bsd/openssh/dist/mac.c U src/crypto/external/bsd/openssh/dist/mac.h U src/crypto/external/bsd/openssh/dist/match.c C src/crypto/external/bsd/openssh/dist/match.h C src/crypto/external/bsd/openssh/dist/misc.c C src/crypto/external/bsd/openssh/dist/misc.h U src/crypto/external/bsd/openssh/dist/moduli.c C src/crypto/external/bsd/openssh/dist/monitor.c U src/crypto/external/bsd/openssh/dist/monitor.h C src/crypto/external/bsd/openssh/dist/monitor_fdpass.c U src/crypto/external/bsd/openssh/dist/monitor_fdpass.h U src/crypto/external/bsd/openssh/dist/monitor_mm.c U src/crypto/external/bsd/openssh/dist/monitor_mm.h C
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: adam Date: Sun Nov 21 18:29:49 UTC 2010 Modified Files: src/crypto/external/bsd/openssh/dist: addrmatch.c auth-options.c auth-options.h auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth.c auth.h auth1.c auth2-hostbased.c auth2-none.c auth2-pubkey.c authfd.c authfd.h authfile.c authfile.h bufaux.c buffer.c buffer.h canohost.c channels.c channels.h clientloop.c clientloop.h dh.c dns.c dns.h hostfile.c hostfile.h jpake.c kex.c kex.h kexdhs.c kexgexs.c key.c key.h match.h misc.c misc.h monitor.c monitor_fdpass.c monitor_wrap.c mux.c myproposal.h nchan.c packet.c pathnames.h readconf.c readconf.h roaming_common.c scp.1 scp.c servconf.c servconf.h session.c sftp-client.c sftp-client.h sftp-common.c sftp-common.h sftp-server.8 sftp-server.c sftp.1 sftp.c ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-dss.c ssh-keygen.1 ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh-keysign.c ssh-rsa.c ssh.1 ssh.c ssh.h ssh2.h ssh_config ssh_config.5 sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config sshd_config.5 sshpty.h sshtty.c version.h Removed Files: src/crypto/external/bsd/openssh/dist: README.smartcard scard.c scard.h src/crypto/external/bsd/openssh/dist/scard: Makefile Ssh.bin.uu Ssh.java Log Message: Resolve conflicts To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssh/dist/README.smartcard cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/addrmatch.c \ src/crypto/external/bsd/openssh/dist/auth-options.c \ src/crypto/external/bsd/openssh/dist/auth-options.h \ src/crypto/external/bsd/openssh/dist/auth-rh-rsa.c \ src/crypto/external/bsd/openssh/dist/auth-rhosts.c \ src/crypto/external/bsd/openssh/dist/auth-rsa.c \ src/crypto/external/bsd/openssh/dist/auth.c \ src/crypto/external/bsd/openssh/dist/auth.h \ src/crypto/external/bsd/openssh/dist/auth1.c \ src/crypto/external/bsd/openssh/dist/auth2-hostbased.c \ src/crypto/external/bsd/openssh/dist/auth2-none.c \ src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \ src/crypto/external/bsd/openssh/dist/authfd.c \ src/crypto/external/bsd/openssh/dist/authfd.h \ src/crypto/external/bsd/openssh/dist/authfile.c \ src/crypto/external/bsd/openssh/dist/authfile.h \ src/crypto/external/bsd/openssh/dist/bufaux.c \ src/crypto/external/bsd/openssh/dist/buffer.c \ src/crypto/external/bsd/openssh/dist/buffer.h \ src/crypto/external/bsd/openssh/dist/channels.h \ src/crypto/external/bsd/openssh/dist/clientloop.h \ src/crypto/external/bsd/openssh/dist/dh.c \ src/crypto/external/bsd/openssh/dist/dns.c \ src/crypto/external/bsd/openssh/dist/dns.h \ src/crypto/external/bsd/openssh/dist/hostfile.c \ src/crypto/external/bsd/openssh/dist/hostfile.h \ src/crypto/external/bsd/openssh/dist/key.c \ src/crypto/external/bsd/openssh/dist/key.h \ src/crypto/external/bsd/openssh/dist/match.h \ src/crypto/external/bsd/openssh/dist/misc.h \ src/crypto/external/bsd/openssh/dist/monitor_fdpass.c \ src/crypto/external/bsd/openssh/dist/mux.c \ src/crypto/external/bsd/openssh/dist/myproposal.h \ src/crypto/external/bsd/openssh/dist/nchan.c \ src/crypto/external/bsd/openssh/dist/roaming_common.c \ src/crypto/external/bsd/openssh/dist/scp.1 \ src/crypto/external/bsd/openssh/dist/servconf.h \ src/crypto/external/bsd/openssh/dist/sftp-client.h \ src/crypto/external/bsd/openssh/dist/sftp-common.c \ src/crypto/external/bsd/openssh/dist/sftp-common.h \ src/crypto/external/bsd/openssh/dist/ssh-add.c \ src/crypto/external/bsd/openssh/dist/ssh-dss.c \ src/crypto/external/bsd/openssh/dist/ssh-keysign.c \ src/crypto/external/bsd/openssh/dist/ssh-rsa.c \ src/crypto/external/bsd/openssh/dist/ssh.h \ src/crypto/external/bsd/openssh/dist/ssh2.h \ src/crypto/external/bsd/openssh/dist/sshpty.h \ src/crypto/external/bsd/openssh/dist/sshtty.c cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/canohost.c \ src/crypto/external/bsd/openssh/dist/channels.c \ src/crypto/external/bsd/openssh/dist/clientloop.c \ src/crypto/external/bsd/openssh/dist/jpake.c \ src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/kex.h \ src/crypto/external/bsd/openssh/dist/kexdhs.c \ src/crypto/external/bsd/openssh/dist/kexgexs.c \ src/crypto/external/bsd/openssh/dist/misc.c \ src/crypto/external/bsd/openssh/dist/monitor.c \ src/crypto/external/bsd/openssh/dist/monitor_wrap.c \ src/crypto/external/bsd/openssh/dist/packet.c \ src/crypto/external/bsd/openssh/dist/pathnames.h \ src/crypto/external/bsd/openssh/dist/readconf.c \
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: adam Date: Sun Nov 21 19:11:10 UTC 2010 Modified Files: src/crypto/external/bsd/openssh/dist: openssh2netbsd Removed Files: src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper: Makefile Log Message: We don't need dist/ssh-pkcs11-helper/Makefile To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/dist/openssh2netbsd cvs rdiff -u -r1.1.1.1 -r0 \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh
Module Name:src Committed By: adam Date: Sun Nov 21 19:19:23 UTC 2010 Modified Files: src/crypto/external/bsd/openssh: Makefile.inc src/crypto/external/bsd/openssh/bin: Makefile src/crypto/external/bsd/openssh/bin/sftp: Makefile src/crypto/external/bsd/openssh/bin/ssh: Makefile src/crypto/external/bsd/openssh/bin/ssh-agent: Makefile src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile src/crypto/external/bsd/openssh/bin/sshd: Makefile src/crypto/external/bsd/openssh/lib: Makefile shlib_version Added Files: src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper: Makefile Log Message: Updated custom makefiles for OpenSSH 5.6 To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/Makefile cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/sftp/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/ssh/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssh/bin/ssh-agent/Makefile cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile cvs rdiff -u -r0 -r1.1 \ src/crypto/external/bsd/openssh/bin/ssh-pkcs11-helper/Makefile cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/bin/sshd/Makefile cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/lib/Makefile cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: adam Date: Sun Nov 21 19:58:04 UTC 2010 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/comp: md.amd64 md.sparc64 mi shl.mi src/distrib/sets/lists/man: mi Log Message: setlists updated for OpenSSH 5.6 To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/base/ad.mips64eb cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.887 -r1.888 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.554 -r1.555 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.1524 -r1.1525 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.137 -r1.138 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.1252 -r1.1253 src/distrib/sets/lists/man/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: adam Date: Sun Nov 21 20:02:35 UTC 2010 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Imported openssh-5.6 To generate a diff of this commit: cvs rdiff -u -r1.784 -r1.785 src/doc/3RDPARTY cvs rdiff -u -r1.1460 -r1.1461 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libpam/modules/pam_ssh
Module Name:src Committed By: adam Date: Sun Nov 21 20:41:36 UTC 2010 Modified Files: src/lib/libpam/modules/pam_ssh: pam_ssh.c Log Message: Use ssh_add_identity_constrained() instead of ssh_add_identity() To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/lib/libpam/modules/pam_ssh/pam_ssh.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src Committed By: adam Date: Sun Nov 21 18:59:05 UTC 2010 Modified Files: src/crypto/external/bsd/openssh/dist: auth-rsa.c auth2-pubkey.c channels.c cipher-ctr-mt.c jpake.c kex.c key.c monitor.c packet.c roaming.h roaming_client.c roaming_common.c schnorr.c servconf.c servconf.h session.c sftp-common.c ssh-pkcs11-client.c ssh-pkcs11-helper.c ssh-pkcs11.c ssh.c sshd.c sshd_config sshd_config.5 version.h Added Files: src/crypto/external/bsd/openssh/dist: README.lpk ldapauth.c ldapauth.h lpk-user-example.txt openssh-lpk_openldap.schema openssh-lpk_sun.schema Log Message: Merge in our changes: - Updated OpenSSH-HPN to hpn13v10 - Added OpenSSH-LPK patches to retrive pubkey from LDAP - Replaced arc4random_buf() (which is not available on NetBSD) with arc4random - Disabled roaming reconnect (otherwise: problem with undef symbols in libssh) To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/crypto/external/bsd/openssh/dist/README.lpk \ src/crypto/external/bsd/openssh/dist/ldapauth.c \ src/crypto/external/bsd/openssh/dist/ldapauth.h \ src/crypto/external/bsd/openssh/dist/lpk-user-example.txt \ src/crypto/external/bsd/openssh/dist/openssh-lpk_openldap.schema \ src/crypto/external/bsd/openssh/dist/openssh-lpk_sun.schema cvs rdiff -u -r1.3 -r1.4 src/crypto/external/bsd/openssh/dist/auth-rsa.c \ src/crypto/external/bsd/openssh/dist/auth2-pubkey.c \ src/crypto/external/bsd/openssh/dist/key.c \ src/crypto/external/bsd/openssh/dist/roaming_common.c \ src/crypto/external/bsd/openssh/dist/schnorr.c \ src/crypto/external/bsd/openssh/dist/servconf.h \ src/crypto/external/bsd/openssh/dist/sftp-common.c cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/dist/channels.c \ src/crypto/external/bsd/openssh/dist/jpake.c \ src/crypto/external/bsd/openssh/dist/kex.c \ src/crypto/external/bsd/openssh/dist/monitor.c \ src/crypto/external/bsd/openssh/dist/packet.c \ src/crypto/external/bsd/openssh/dist/servconf.c \ src/crypto/external/bsd/openssh/dist/session.c \ src/crypto/external/bsd/openssh/dist/ssh.c \ src/crypto/external/bsd/openssh/dist/sshd.c \ src/crypto/external/bsd/openssh/dist/sshd_config \ src/crypto/external/bsd/openssh/dist/version.h cvs rdiff -u -r1.1 -r1.2 src/crypto/external/bsd/openssh/dist/cipher-ctr-mt.c cvs rdiff -u -r1.1.1.2 -r1.2 src/crypto/external/bsd/openssh/dist/roaming.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/crypto/external/bsd/openssh/dist/roaming_client.c \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-client.c \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11-helper.c \ src/crypto/external/bsd/openssh/dist/ssh-pkcs11.c cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/openssh/dist/sshd_config.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
