CVS commit: src/sys/opencrypto
Module Name:src Committed By: knakahara Date: Thu Feb 9 06:03:29 UTC 2017 Modified Files: src/sys/opencrypto: crypto.c Log Message: make some locks and condvar static To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/opencrypto/crypto.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/opencrypto/crypto.c diff -u src/sys/opencrypto/crypto.c:1.48 src/sys/opencrypto/crypto.c:1.49 --- src/sys/opencrypto/crypto.c:1.48 Thu Jul 7 06:55:43 2016 +++ src/sys/opencrypto/crypto.c Thu Feb 9 06:03:29 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: crypto.c,v 1.48 2016/07/07 06:55:43 msaitoh Exp $ */ +/* $NetBSD: crypto.c,v 1.49 2017/02/09 06:03:29 knakahara Exp $ */ /* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */ /* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */ @@ -53,7 +53,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.48 2016/07/07 06:55:43 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.49 2017/02/09 06:03:29 knakahara Exp $"); #include #include @@ -75,9 +75,9 @@ __KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1 #include #include /* XXX for M_XDATA */ -kmutex_t crypto_q_mtx; -kmutex_t crypto_ret_q_mtx; -kcondvar_t cryptoret_cv; +static kmutex_t crypto_q_mtx; +static kmutex_t crypto_ret_q_mtx; +static kcondvar_t cryptoret_cv; kmutex_t crypto_mtx; /* below are kludges for residual code wrtitten to FreeBSD interfaces */
CVS commit: src/sys/opencrypto
Module Name:src Committed By: knakahara Date: Thu Feb 9 06:03:29 UTC 2017 Modified Files: src/sys/opencrypto: crypto.c Log Message: make some locks and condvar static To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/opencrypto/crypto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs/ffs
Module Name:src
Committed By: kre
Date: Thu Feb 9 04:42:53 UTC 2017
Modified Files:
src/usr.sbin/makefs/ffs: ffs_extern.h mkfs.c
Log Message:
Revert the part of mkfs.c 1.36 that "gutted the const" (while
retaining the part that added a different one).
That is, re-constipate makefs (well, just a bit, no real pain here.)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/makefs/ffs/ffs_extern.h
cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/makefs/ffs/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/ffs/ffs_extern.h
diff -u src/usr.sbin/makefs/ffs/ffs_extern.h:1.6 src/usr.sbin/makefs/ffs/ffs_extern.h:1.7
--- src/usr.sbin/makefs/ffs/ffs_extern.h:1.6 Thu Aug 7 11:25:33 2003
+++ src/usr.sbin/makefs/ffs/ffs_extern.h Thu Feb 9 04:42:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_extern.h,v 1.6 2003/08/07 11:25:33 agc Exp $ */
+/* $NetBSD: ffs_extern.h,v 1.7 2017/02/09 04:42:53 kre Exp $ */
/* From: NetBSD: ffs_extern.h,v 1.19 2001/08/17 02:18:48 lukem Exp */
/*-
@@ -59,7 +59,7 @@ void ffs_clusteracct(struct fs *, struct
int ffs_balloc(struct inode *, off_t, int, struct buf **);
/* ffs_bswap.c */
-void ffs_sb_swap(struct fs*, struct fs *);
+void ffs_sb_swap(const struct fs*, struct fs *);
void ffs_dinode1_swap(struct ufs1_dinode *, struct ufs1_dinode *);
void ffs_dinode2_swap(struct ufs2_dinode *, struct ufs2_dinode *);
void ffs_csum_swap(struct csum *, struct csum *, int);
Index: src/usr.sbin/makefs/ffs/mkfs.c
diff -u src/usr.sbin/makefs/ffs/mkfs.c:1.36 src/usr.sbin/makefs/ffs/mkfs.c:1.37
--- src/usr.sbin/makefs/ffs/mkfs.c:1.36 Wed Feb 8 16:00:30 2017
+++ src/usr.sbin/makefs/ffs/mkfs.c Thu Feb 9 04:42:53 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.36 2017/02/08 16:00:30 christos Exp $ */
+/* $NetBSD: mkfs.c,v 1.37 2017/02/09 04:42:53 kre Exp $ */
/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -48,7 +48,7 @@
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else
#ifdef __RCSID
-__RCSID("$NetBSD: mkfs.c,v 1.36 2017/02/08 16:00:30 christos Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.37 2017/02/09 04:42:53 kre Exp $");
#endif
#endif
#endif /* not lint */
@@ -126,7 +126,7 @@ static int avgfilesize; /* expect
static int avgfpdir; /* expected number of files per directory */
static void
-ffs_sb_copy(struct fs *o, struct fs *i, size_t l, const fsinfo_t *fsopts)
+ffs_sb_copy(struct fs *o, const struct fs *i, size_t l, const fsinfo_t *fsopts)
{
memcpy(o, i, l);
/* Zero out pointers */
CVS commit: src/usr.sbin/makefs/ffs
Module Name:src Committed By: kre Date: Thu Feb 9 04:42:53 UTC 2017 Modified Files: src/usr.sbin/makefs/ffs: ffs_extern.h mkfs.c Log Message: Revert the part of mkfs.c 1.36 that "gutted the const" (while retaining the part that added a different one). That is, re-constipate makefs (well, just a bit, no real pain here.) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/makefs/ffs/ffs_extern.h cvs rdiff -u -r1.36 -r1.37 src/usr.sbin/makefs/ffs/mkfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/ffs
Module Name:src
Committed By: kre
Date: Thu Feb 9 04:37:35 UTC 2017
Modified Files:
src/sys/ufs/ffs: ffs_bswap.c ffs_extern.h
Log Message:
Sprinkle in a pinch of const, not too much, just enough
to add a little strength without affecting the overall balance...
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/ufs/ffs/ffs_bswap.c
cvs rdiff -u -r1.83 -r1.84 src/sys/ufs/ffs/ffs_extern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_bswap.c
diff -u src/sys/ufs/ffs/ffs_bswap.c:1.39 src/sys/ufs/ffs/ffs_bswap.c:1.40
--- src/sys/ufs/ffs/ffs_bswap.c:1.39 Wed May 20 18:21:17 2015
+++ src/sys/ufs/ffs/ffs_bswap.c Thu Feb 9 04:37:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_bswap.c,v 1.39 2015/05/20 18:21:17 riastradh Exp $ */
+/* $NetBSD: ffs_bswap.c,v 1.40 2017/02/09 04:37:35 kre Exp $ */
/*
* Copyright (c) 1998 Manuel Bouyer.
@@ -30,7 +30,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: ffs_bswap.c,v 1.39 2015/05/20 18:21:17 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_bswap.c,v 1.40 2017/02/09 04:37:35 kre Exp $");
#include
#if defined(_KERNEL)
@@ -52,17 +52,18 @@ __KERNEL_RCSID(0, "$NetBSD: ffs_bswap.c,
#endif
void
-ffs_sb_swap(struct fs *o, struct fs *n)
+ffs_sb_swap(const struct fs *o, struct fs *n)
{
size_t i;
- u_int32_t *o32, *n32;
+ const u_int32_t *o32;
+ u_int32_t *n32;
/*
* In order to avoid a lot of lines, as the first N fields (52)
* of the superblock up to fs_fmod are u_int32_t, we just loop
* here to convert them.
*/
- o32 = (u_int32_t *)o;
+ o32 = (const u_int32_t *)o;
n32 = (u_int32_t *)n;
for (i = 0; i < offsetof(struct fs, fs_fmod) / sizeof(u_int32_t); i++)
n32[i] = bswap32(o32[i]);
@@ -178,7 +179,7 @@ ffs_csum_swap(struct csum *o, struct csu
}
void
-ffs_csumtotal_swap(struct csum_total *o, struct csum_total *n)
+ffs_csumtotal_swap(const struct csum_total *o, struct csum_total *n)
{
n->cs_ndir = bswap64(o->cs_ndir);
n->cs_nbfree = bswap64(o->cs_nbfree);
Index: src/sys/ufs/ffs/ffs_extern.h
diff -u src/sys/ufs/ffs/ffs_extern.h:1.83 src/sys/ufs/ffs/ffs_extern.h:1.84
--- src/sys/ufs/ffs/ffs_extern.h:1.83 Sat Oct 1 13:15:45 2016
+++ src/sys/ufs/ffs/ffs_extern.h Thu Feb 9 04:37:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs_extern.h,v 1.83 2016/10/01 13:15:45 jdolecek Exp $ */
+/* $NetBSD: ffs_extern.h,v 1.84 2017/02/09 04:37:35 kre Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -186,13 +186,13 @@ void ffs_appleufs_set(struct appleufslab
uint64_t);
/* ffs_bswap.c */
-void ffs_sb_swap(struct fs*, struct fs *);
+void ffs_sb_swap(const struct fs *, struct fs *);
void ffs_dinode1_swap(struct ufs1_dinode *, struct ufs1_dinode *);
void ffs_dinode2_swap(struct ufs2_dinode *, struct ufs2_dinode *);
struct csum;
void ffs_csum_swap(struct csum *, struct csum *, int);
struct csum_total;
-void ffs_csumtotal_swap(struct csum_total *, struct csum_total *);
+void ffs_csumtotal_swap(const struct csum_total *, struct csum_total *);
void ffs_cg_swap(struct cg *, struct cg *, struct fs *);
/* ffs_subr.c */
CVS commit: src/sys/ufs/ffs
Module Name:src Committed By: kre Date: Thu Feb 9 04:37:35 UTC 2017 Modified Files: src/sys/ufs/ffs: ffs_bswap.c ffs_extern.h Log Message: Sprinkle in a pinch of const, not too much, just enough to add a little strength without affecting the overall balance... To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/ufs/ffs/ffs_bswap.c cvs rdiff -u -r1.83 -r1.84 src/sys/ufs/ffs/ffs_extern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src Committed By: msaitoh Date: Thu Feb 9 03:38:01 UTC 2017 Modified Files: src/sys/arch/x86/pci: pci_machdep.c Log Message: Supress verbose message "This pci host supports neither MSI nor MSI-X." on VMware and KVM. OK'd by k-nakahara. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/arch/x86/pci/pci_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: msaitoh
Date: Thu Feb 9 03:38:01 UTC 2017
Modified Files:
src/sys/arch/x86/pci: pci_machdep.c
Log Message:
Supress verbose message "This pci host supports neither MSI nor MSI-X."
on VMware and KVM. OK'd by k-nakahara.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/x86/pci/pci_machdep.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/arch/x86/pci/pci_machdep.c
diff -u src/sys/arch/x86/pci/pci_machdep.c:1.76 src/sys/arch/x86/pci/pci_machdep.c:1.77
--- src/sys/arch/x86/pci/pci_machdep.c:1.76 Thu Aug 25 12:21:21 2016
+++ src/sys/arch/x86/pci/pci_machdep.c Thu Feb 9 03:38:01 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.76 2016/08/25 12:21:21 nonaka Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.77 2017/02/09 03:38:01 msaitoh Exp $ */
/*-
* Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -73,7 +73,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.76 2016/08/25 12:21:21 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.77 2017/02/09 03:38:01 msaitoh Exp $");
#include
#include
@@ -483,7 +483,12 @@ pci_attach_hook(device_t parent, device_
PCI_SUBCLASS(class) != PCI_SUBCLASS_BRIDGE_HOST)
return;
- if (pci_has_msi_quirk(id, PCI_QUIRK_DISABLE_MSI)) {
+ /* VMware and KVM use old chipset, but they can use MSI/MSI-X */
+ if ((cpu_feature[1] & CPUID2_RAZ)
+ && (pci_has_msi_quirk(id, PCI_QUIRK_ENABLE_MSI_VM))) {
+ pba->pba_flags |= PCI_FLAGS_MSI_OKAY;
+ pba->pba_flags |= PCI_FLAGS_MSIX_OKAY;
+ } else if (pci_has_msi_quirk(id, PCI_QUIRK_DISABLE_MSI)) {
pba->pba_flags &= ~PCI_FLAGS_MSI_OKAY;
pba->pba_flags &= ~PCI_FLAGS_MSIX_OKAY;
aprint_verbose("\n");
@@ -500,14 +505,6 @@ pci_attach_hook(device_t parent, device_
pba->pba_flags |= PCI_FLAGS_MSIX_OKAY;
}
- /* VMware and KVM use old chipset, but they can use MSI/MSI-X */
- if (cpu_feature[1] & CPUID2_RAZ) {
- if (pci_has_msi_quirk(id, PCI_QUIRK_ENABLE_MSI_VM)) {
- pba->pba_flags |= PCI_FLAGS_MSI_OKAY;
- pba->pba_flags |= PCI_FLAGS_MSIX_OKAY;
- }
- }
-
/*
* Don't enable MSI on a HyperTransport bus. In order to
* determine that bus 0 is a HyperTransport bus, we look at
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Feb 9 03:29:55 UTC 2017 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: remove exect test To generate a diff of this commit: cvs rdiff -u -r1.198 -r1.199 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.717 -r1.718 src/distrib/sets/lists/tests/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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.198 src/distrib/sets/lists/debug/mi:1.199 --- src/distrib/sets/lists/debug/mi:1.198 Wed Feb 8 18:08:27 2017 +++ src/distrib/sets/lists/debug/mi Wed Feb 8 22:29:55 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.198 2017/02/08 23:08:27 rin Exp $ +# $NetBSD: mi,v 1.199 2017/02/09 03:29:55 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -1877,7 +1877,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/db/h_db.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/db/h_lfsr.debug tests-lib-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/db/t_db_hash_seq.debug tests-lib-debug debug,atf,compattestfile -./usr/libdata/debug/usr/tests/lib/libc/gen/exect/t_exect.debug tests-kernel-tests debug,atf,compattestfile +./usr/libdata/debug/usr/tests/lib/libc/gen/exect/t_exect.debug tests-kernel-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/gen/execve/t_execve.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_fileactions.debug tests-kernel-tests debug,atf,compattestfile ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn/h_spawn.debug tests-kernel-tests debug,atf,compattestfile Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.717 src/distrib/sets/lists/tests/mi:1.718 --- src/distrib/sets/lists/tests/mi:1.717 Tue Feb 7 22:44:41 2017 +++ src/distrib/sets/lists/tests/mi Wed Feb 8 22:29:55 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.717 2017/02/08 03:44:41 kamil Exp $ +# $NetBSD: mi,v 1.718 2017/02/09 03:29:55 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -91,7 +91,7 @@ ./usr/libdata/debug/usr/tests/lib/libc/c063tests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/dbtests-lib-debug compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/gentests-lib-debug compattestfile,atf -./usr/libdata/debug/usr/tests/lib/libc/gen/exect tests-kernel-tests compattestfile,atf +./usr/libdata/debug/usr/tests/lib/libc/gen/exect tests-obsolete obsolete ./usr/libdata/debug/usr/tests/lib/libc/gen/execve tests-kernel-tests compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/gen/posix_spawn tests-kernel-tests compattestfile,atf ./usr/libdata/debug/usr/tests/lib/libc/getaddrinfo tests-obsolete obsolete @@ -2430,10 +2430,10 @@ ./usr/tests/lib/libc/gen tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/gen/Atffile tests-lib-tests compattestfile,atf ./usr/tests/lib/libc/gen/Kyuafile tests-lib-tests compattestfile,atf,kyua -./usr/tests/lib/libc/gen/exect tests-kernel-tests compattestfile,atf -./usr/tests/lib/libc/gen/exect/Atffile tests-kernel-tests compattestfile,atf -./usr/tests/lib/libc/gen/exect/Kyuafile tests-kernel-tests compattestfile,atf,kyua -./usr/tests/lib/libc/gen/exect/t_exect tests-kernel-tests compattestfile,atf +./usr/tests/lib/libc/gen/exect tests-obsolete obsolete +./usr/tests/lib/libc/gen/exect/Atffile tests-obsolete obsoleteernel-tests compattestfile,atf +./usr/tests/lib/libc/gen/exect/Kyuafile tests-obsolete obsoleteernel-tests compattestfile,atf,kyua +./usr/tests/lib/libc/gen/exect/t_exect tests-obsolete obsoleteernel-tests compattestfile,atf ./usr/tests/lib/libc/gen/execve tests-kernel-tests compattestfile,atf ./usr/tests/lib/libc/gen/execve/Atffile tests-kernel-tests compattestfile,atf ./usr/tests/lib/libc/gen/execve/Kyuafile tests-kernel-tests compattestfile,atf,kyua
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Thu Feb 9 03:29:55 UTC 2017 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: remove exect test To generate a diff of this commit: cvs rdiff -u -r1.198 -r1.199 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.717 -r1.718 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/gen
Module Name:src Committed By: christos Date: Thu Feb 9 03:27:07 UTC 2017 Modified Files: src/tests/lib/libc/gen: Makefile Removed Files: src/tests/lib/libc/gen/exect: Makefile t_exect.c Log Message: remove exect, it will not be fixed and it will be removed. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/tests/lib/libc/gen/Makefile cvs rdiff -u -r1.1 -r0 src/tests/lib/libc/gen/exect/Makefile cvs rdiff -u -r1.6 -r0 src/tests/lib/libc/gen/exect/t_exect.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/mips
Module Name:src
Committed By: christos
Date: Thu Feb 9 03:24:06 UTC 2017
Modified Files:
src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/compat/linux/arch/mips/linux_syscall.h
cvs rdiff -u -r1.73 -r1.74 src/sys/compat/linux/arch/mips/linux_syscallargs.h \
src/sys/compat/linux/arch/mips/linux_syscalls.c \
src/sys/compat/linux/arch/mips/linux_sysent.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/compat/linux/arch/mips/linux_syscall.h
diff -u src/sys/compat/linux/arch/mips/linux_syscall.h:1.74 src/sys/compat/linux/arch/mips/linux_syscall.h:1.75
--- src/sys/compat/linux/arch/mips/linux_syscall.h:1.74 Sat Feb 4 13:14:55 2017
+++ src/sys/compat/linux/arch/mips/linux_syscall.h Wed Feb 8 22:24:05 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.74 2017/02/04 18:14:55 christos Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.75 2017/02/09 03:24:05 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.64 2017/02/04 18:14:44 christos Exp
+ * created from NetBSD: syscalls.master,v 1.65 2017/02/09 03:23:59 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
Index: src/sys/compat/linux/arch/mips/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.73 src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.74
--- src/sys/compat/linux/arch/mips/linux_syscallargs.h:1.73 Sat Feb 4 13:14:55 2017
+++ src/sys/compat/linux/arch/mips/linux_syscallargs.h Wed Feb 8 22:24:05 2017
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.73 2017/02/04 18:14:55 christos Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.74 2017/02/09 03:24:05 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.64 2017/02/04 18:14:44 christos Exp
+ * created from NetBSD: syscalls.master,v 1.65 2017/02/09 03:23:59 christos Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
@@ -593,7 +593,11 @@ struct linux_sys_getsockopt_args {
};
check_syscall_args(linux_sys_getsockopt)
-struct sys_listen_args;
+struct linux_sys_listen_args {
+ syscallarg(int) s;
+ syscallarg(int) backlog;
+};
+check_syscall_args(linux_sys_listen)
struct linux_sys_recv_args {
syscallarg(int) s;
@@ -1444,7 +1448,7 @@ int linux_sys_getsockname(struct lwp *,
int linux_sys_getsockopt(struct lwp *, const struct linux_sys_getsockopt_args *, register_t *);
-int sys_listen(struct lwp *, const struct sys_listen_args *, register_t *);
+int linux_sys_listen(struct lwp *, const struct linux_sys_listen_args *, register_t *);
int linux_sys_recv(struct lwp *, const struct linux_sys_recv_args *, register_t *);
Index: src/sys/compat/linux/arch/mips/linux_syscalls.c
diff -u src/sys/compat/linux/arch/mips/linux_syscalls.c:1.73 src/sys/compat/linux/arch/mips/linux_syscalls.c:1.74
--- src/sys/compat/linux/arch/mips/linux_syscalls.c:1.73 Sat Feb 4 13:14:55 2017
+++ src/sys/compat/linux/arch/mips/linux_syscalls.c Wed Feb 8 22:24:05 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.73 2017/02/04 18:14:55 christos Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.74 2017/02/09 03:24:05 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.64 2017/02/04 18:14:44 christos Exp
+ * created from NetBSD: syscalls.master,v 1.65 2017/02/09 03:23:59 christos Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.73 2017/02/04 18:14:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscalls.c,v 1.74 2017/02/09 03:24:05 christos Exp $");
#if defined(_KERNEL_OPT)
#include
Index: src/sys/compat/linux/arch/mips/linux_sysent.c
diff -u src/sys/compat/linux/arch/mips/linux_sysent.c:1.73 src/sys/compat/linux/arch/mips/linux_sysent.c:1.74
--- src/sys/compat/linux/arch/mips/linux_sysent.c:1.73 Sat Feb 4 13:14:55 2017
+++ src/sys/compat/linux/arch/mips/linux_sysent.c Wed Feb 8 22:24:05 2017
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.73 2017/02/04 18:14:55 christos Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.74 2017/02/09 03:24:05 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.64 2017/02/04 18:14:44 christos Exp
+ * created from NetBSD: syscalls.master,v 1.65 2017/02/09 03:23:59 christos Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.73 2017/02/04 18:14:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sysent.c,v 1.74 2017/02/09 03:24:05 christos Exp $");
#include
#include
@@ -763,8 +763,8 @@ struct sysent
CVS commit: src/sys/compat/linux/arch/mips
Module Name:src Committed By: christos Date: Thu Feb 9 03:24:06 UTC 2017 Modified Files: src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.73 -r1.74 src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/mips
Module Name:src
Committed By: christos
Date: Thu Feb 9 03:23:59 UTC 2017
Modified Files:
src/sys/compat/linux/arch/mips: syscalls.master
Log Message:
fix listen
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/compat/linux/arch/mips/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u src/sys/compat/linux/arch/mips/syscalls.master:1.64 src/sys/compat/linux/arch/mips/syscalls.master:1.65
--- src/sys/compat/linux/arch/mips/syscalls.master:1.64 Sat Feb 4 13:14:44 2017
+++ src/sys/compat/linux/arch/mips/syscalls.master Wed Feb 8 22:23:59 2017
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.64 2017/02/04 18:14:44 christos Exp $
+ $NetBSD: syscalls.master,v 1.65 2017/02/09 03:23:59 christos Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -295,7 +295,7 @@
int *alen); }
173 STD { int|linux_sys||getsockopt(int s, int level, \
int optname, void *optval, int *optlen); }
-174 NOARGS { int|sys||listen(int s, int backlog); }
+174 STD { int|linux_sys||listen(int s, int backlog); }
175 STD { int|linux_sys||recv(int s, void *buf, int len, \
int flags); }
176 STD { int|linux_sys||recvfrom(int s, void *buf, int len, \
CVS commit: src/sys/compat/linux/arch/mips
Module Name:src Committed By: christos Date: Thu Feb 9 03:23:59 UTC 2017 Modified Files: src/sys/compat/linux/arch/mips: syscalls.master Log Message: fix listen To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/compat/linux/arch/mips/syscalls.master 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/servers/slapd
Module Name:src Committed By: christos Date: Thu Feb 9 02:20:33 UTC 2017 Modified Files: src/external/bsd/openldap/dist/servers/slapd: filter.c Log Message: resolve conflict To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/openldap/dist/servers/slapd/filter.c 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/servers/slapd
Module Name:src
Committed By: christos
Date: Thu Feb 9 02:20:33 UTC 2017
Modified Files:
src/external/bsd/openldap/dist/servers/slapd: filter.c
Log Message:
resolve conflict
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/servers/slapd/filter.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/openldap/dist/servers/slapd/filter.c
diff -u src/external/bsd/openldap/dist/servers/slapd/filter.c:1.3 src/external/bsd/openldap/dist/servers/slapd/filter.c:1.4
--- src/external/bsd/openldap/dist/servers/slapd/filter.c:1.3 Wed Feb 8 20:53:51 2017
+++ src/external/bsd/openldap/dist/servers/slapd/filter.c Wed Feb 8 21:20:33 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: filter.c,v 1.3 2017/02/09 01:53:51 christos Exp $ */
+/* $NetBSD: filter.c,v 1.4 2017/02/09 02:20:33 christos Exp $ */
/* filter.c - routines for parsing and dealing with filters */
/* $OpenLDAP$ */
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: filter.c,v 1.3 2017/02/09 01:53:51 christos Exp $");
+__RCSID("$NetBSD: filter.c,v 1.4 2017/02/09 02:20:33 christos Exp $");
#include "portable.h"
@@ -1163,17 +1163,10 @@ get_vrFilter( Operation *op, BerElement
void
vrFilter_free( Operation *op, ValuesReturnFilter *vrf )
{
-<<< filter.c
- ValuesReturnFilter *next;
-
- for ( p = vrf; vrf != NULL; vrf = next ) {
- next = vrf->vrf_next;
-===
ValuesReturnFilter *next;
for ( ; vrf != NULL; vrf = next ) {
next = vrf->vrf_next;
->>> 1.1.1.5
switch ( vrf->vrf_choice & SLAPD_FILTER_MASK ) {
case LDAP_FILTER_PRESENT:
CVS commit: src/tests/net/bpf
Module Name:src Committed By: ozaki-r Date: Thu Feb 9 02:18:13 UTC 2017 Modified Files: src/tests/net/bpf: t_bpf.c Log Message: Add tests for several bpf ioctls To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/tests/net/bpf/t_bpf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/bpf
Module Name:src
Committed By: ozaki-r
Date: Thu Feb 9 02:18:13 UTC 2017
Modified Files:
src/tests/net/bpf: t_bpf.c
Log Message:
Add tests for several bpf ioctls
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/net/bpf/t_bpf.c
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/bpf/t_bpf.c
diff -u src/tests/net/bpf/t_bpf.c:1.7 src/tests/net/bpf/t_bpf.c:1.8
--- src/tests/net/bpf/t_bpf.c:1.7 Wed Feb 1 08:04:49 2017
+++ src/tests/net/bpf/t_bpf.c Thu Feb 9 02:18:13 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: t_bpf.c,v 1.7 2017/02/01 08:04:49 ozaki-r Exp $ */
+/* $NetBSD: t_bpf.c,v 1.8 2017/02/09 02:18:13 ozaki-r Exp $ */
/*-
* Copyright (c) 2010 Antti Kantee. All Rights Reserved.
@@ -25,7 +25,7 @@
* SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: t_bpf.c,v 1.7 2017/02/01 08:04:49 ozaki-r Exp $");
+__RCSID("$NetBSD: t_bpf.c,v 1.8 2017/02/09 02:18:13 ozaki-r Exp $");
#include
#include
@@ -37,6 +37,7 @@ __RCSID("$NetBSD: t_bpf.c,v 1.7 2017/02/
#include
#include
+#include
#include
#include
@@ -199,6 +200,138 @@ ATF_TC_BODY(bpf_ioctl_BLEN, tc)
"Don't allow to change buflen after binding bpf to an interface");
}
+ATF_TC(bpf_ioctl_PROMISC);
+ATF_TC_HEAD(bpf_ioctl_PROMISC, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Checks behaviors of BIOCPROMISC");
+}
+
+ATF_TC_BODY(bpf_ioctl_PROMISC, tc)
+{
+ struct ifreq ifr;
+ int ifnum, bpfd;
+
+ RZ(rump_init());
+ RZ(rump_pub_shmif_create(NULL, ));
+ sprintf(ifr.ifr_name, "shmif%d", ifnum);
+
+ RL(bpfd = rump_sys_open("/dev/bpf", O_RDWR));
+
+ ATF_REQUIRE_EQ_MSG(rump_sys_ioctl(bpfd, BIOCPROMISC, NULL), -1,
+ "Don't allow to call ioctl(BIOCPROMISC) without interface");
+
+ RL(rump_sys_ioctl(bpfd, BIOCSETIF, ));
+
+ RL(rump_sys_ioctl(bpfd, BIOCPROMISC, NULL));
+ /* TODO check if_flags */
+}
+
+ATF_TC(bpf_ioctl_SETIF);
+ATF_TC_HEAD(bpf_ioctl_SETIF, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Checks behaviors of BIOCSETIF");
+}
+
+ATF_TC_BODY(bpf_ioctl_SETIF, tc)
+{
+ struct ifreq ifr;
+ int ifnum, bpfd;
+
+ RZ(rump_init());
+
+ RL(bpfd = rump_sys_open("/dev/bpf", O_RDWR));
+
+ RZ(rump_pub_shmif_create(NULL, ));
+ sprintf(ifr.ifr_name, "shmif%d", ifnum);
+ RL(rump_sys_ioctl(bpfd, BIOCSETIF, ));
+
+ /* Change the listening interface */
+ RZ(rump_pub_shmif_create(NULL, ));
+ sprintf(ifr.ifr_name, "shmif%d", ifnum);
+ RL(rump_sys_ioctl(bpfd, BIOCSETIF, ));
+}
+
+ATF_TC(bpf_ioctl_DLT);
+ATF_TC_HEAD(bpf_ioctl_DLT, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Checks behaviors of BIOCGDLT and "
+ "BIOCSDLT");
+}
+
+ATF_TC_BODY(bpf_ioctl_DLT, tc)
+{
+ struct ifreq ifr;
+ int ifnum, bpfd;
+ u_int dlt;
+
+ RZ(rump_init());
+ RL(bpfd = rump_sys_open("/dev/bpf", O_RDWR));
+ RZ(rump_pub_shmif_create(NULL, ));
+ sprintf(ifr.ifr_name, "shmif%d", ifnum);
+
+ ATF_REQUIRE_EQ_MSG(rump_sys_ioctl(bpfd, BIOCGDLT, ), -1,
+ "Don't allow to get a DLT without interfaces");
+
+ RL(rump_sys_ioctl(bpfd, BIOCSETIF, ));
+
+ RL(rump_sys_ioctl(bpfd, BIOCGDLT, ));
+ ATF_REQUIRE(dlt == DLT_EN10MB);
+
+ dlt = DLT_NULL;
+ ATF_REQUIRE_EQ_MSG(rump_sys_ioctl(bpfd, BIOCSDLT, ), -1,
+ "Don't allow to set a DLT that doesn't match any listening "
+ "interfaces");
+}
+
+ATF_TC(bpf_ioctl_GDLTLIST);
+ATF_TC_HEAD(bpf_ioctl_GDLTLIST, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "Checks behaviors of BIOCGDLTLIST");
+}
+
+ATF_TC_BODY(bpf_ioctl_GDLTLIST, tc)
+{
+ struct ifreq ifr;
+ int ifnum, bpfd;
+ struct bpf_dltlist dltlist;
+
+ RZ(rump_init());
+ RL(bpfd = rump_sys_open("/dev/bpf", O_RDWR));
+ RZ(rump_pub_shmif_create(NULL, ));
+ sprintf(ifr.ifr_name, "shmif%d", ifnum);
+
+ dltlist.bfl_len = 0;
+ dltlist.bfl_list = NULL;
+ ATF_REQUIRE_EQ_MSG(rump_sys_ioctl(bpfd, BIOCGDLTLIST, ), -1,
+ "Don't allow to get a DLT list without interfaces");
+
+ RL(rump_sys_ioctl(bpfd, BIOCSETIF, ));
+
+ /* Get the size of an avaiable DLT list */
+ dltlist.bfl_len = 0;
+ dltlist.bfl_list = NULL;
+ RL(rump_sys_ioctl(bpfd, BIOCGDLTLIST, ));
+ ATF_REQUIRE(dltlist.bfl_len == 1);
+
+ /* Get an avaiable DLT list */
+ dltlist.bfl_list = calloc(sizeof(u_int), 1);
+ dltlist.bfl_len = 1;
+ RL(rump_sys_ioctl(bpfd, BIOCGDLTLIST, ));
+ ATF_REQUIRE(dltlist.bfl_len == 1);
+ ATF_REQUIRE(dltlist.bfl_list[0] == DLT_EN10MB);
+
+ /* Get an avaiable DLT list with a less buffer (fake with bfl_len) */
+ dltlist.bfl_len = 0;
+ ATF_REQUIRE_EQ_MSG(rump_sys_ioctl(bpfd, BIOCGDLTLIST, ), -1,
+ "This should fail with ENOMEM");
+
+ free(dltlist.bfl_list);
+}
+
ATF_TP_ADD_TCS(tp)
{
@@ -207,5 +340,9 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, bpfwritetrunc);
#endif
ATF_TP_ADD_TC(tp, bpf_ioctl_BLEN);
+ ATF_TP_ADD_TC(tp, bpf_ioctl_PROMISC);
+ ATF_TP_ADD_TC(tp, bpf_ioctl_SETIF);
+ ATF_TP_ADD_TC(tp, bpf_ioctl_DLT);
+ ATF_TP_ADD_TC(tp, bpf_ioctl_GDLTLIST);
return atf_no_error();
}
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Feb 9 01:55:41 UTC 2017 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openldap To generate a diff of this commit: cvs rdiff -u -r1.1410 -r1.1411 src/doc/3RDPARTY cvs rdiff -u -r1.2246 -r1.2247 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/doc
Module Name:src Committed By: christos Date: Thu Feb 9 01:55:41 UTC 2017 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openldap To generate a diff of this commit: cvs rdiff -u -r1.1410 -r1.1411 src/doc/3RDPARTY cvs rdiff -u -r1.2246 -r1.2247 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.1410 src/doc/3RDPARTY:1.1411 --- src/doc/3RDPARTY:1.1410 Wed Feb 8 19:25:22 2017 +++ src/doc/3RDPARTY Wed Feb 8 20:55:41 2017 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1410 2017/02/09 00:25:22 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1411 2017/02/09 01:55:41 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -982,7 +982,7 @@ Notes: We have lots of local fixes. Package: OpenLDAP -Version: 2.4.39 +Version: 2.4.44 Current Vers: 2.4.44 Maintainer: OpenLDAP Foundation Archive Site: http://www.openldap.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2246 src/doc/CHANGES:1.2247 --- src/doc/CHANGES:1.2246 Wed Feb 8 19:25:22 2017 +++ src/doc/CHANGES Wed Feb 8 20:55:41 2017 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2246 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2247 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -463,3 +463,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: ixv(4): Add Intel 10G Ethernet virtual function driver. [msaitoh 20170208] bind: Import version 9.10.4-P6. [christos 20170208] + openldap: Import 2.4.44. [christos 20170208]
CVS commit: src/external/bsd/openldap
Module Name:src Committed By: christos Date: Thu Feb 9 01:53:51 UTC 2017 Modified Files: src/external/bsd/openldap: openldap2netbsd src/external/bsd/openldap/dist/build: mkversion src/external/bsd/openldap/dist/clients/tools: common.c src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h 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: detach.c md5.c passwd.c src/external/bsd/openldap/dist/libraries/librewrite: session.c src/external/bsd/openldap/dist/servers/slapd: filter.c src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c Removed Files: src/external/bsd/openldap/dist/libraries/liblmdb: sample-bdb.c sample-mdb.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/openldap2netbsd cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/build/mkversion cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/openldap/dist/clients/tools/common.c cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/include/Makefile.in \ src/external/bsd/openldap/dist/include/portable.hin cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/include/ldap_queue.h cvs rdiff -u -r1.6 -r1.7 \ src/external/bsd/openldap/dist/libraries/libldap/os-ip.c cvs rdiff -u -r1.7 -r1.8 \ src/external/bsd/openldap/dist/libraries/libldap/os-local.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/openldap/dist/libraries/libldap/tls_o.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/openldap/dist/libraries/liblmdb/sample-bdb.c \ src/external/bsd/openldap/dist/libraries/liblmdb/sample-mdb.c cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/openldap/dist/libraries/liblutil/detach.c \ src/external/bsd/openldap/dist/libraries/liblutil/md5.c cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/openldap/dist/libraries/liblutil/passwd.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/dist/libraries/librewrite/session.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/dist/servers/slapd/filter.c cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/openldap/dist/servers/slapd/overlays/deref.c 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: christos
Date: Thu Feb 9 01:53:51 UTC 2017
Modified Files:
src/external/bsd/openldap: openldap2netbsd
src/external/bsd/openldap/dist/build: mkversion
src/external/bsd/openldap/dist/clients/tools: common.c
src/external/bsd/openldap/dist/include: Makefile.in ldap_queue.h
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: detach.c md5.c
passwd.c
src/external/bsd/openldap/dist/libraries/librewrite: session.c
src/external/bsd/openldap/dist/servers/slapd: filter.c
src/external/bsd/openldap/dist/servers/slapd/overlays: deref.c
Removed Files:
src/external/bsd/openldap/dist/libraries/liblmdb: sample-bdb.c
sample-mdb.c
Log Message:
merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/openldap/openldap2netbsd
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/build/mkversion
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/openldap/dist/clients/tools/common.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/openldap/dist/include/Makefile.in \
src/external/bsd/openldap/dist/include/portable.hin
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/openldap/dist/include/ldap_queue.h
cvs rdiff -u -r1.6 -r1.7 \
src/external/bsd/openldap/dist/libraries/libldap/os-ip.c
cvs rdiff -u -r1.7 -r1.8 \
src/external/bsd/openldap/dist/libraries/libldap/os-local.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/libldap/tls_o.c
cvs rdiff -u -r1.1.1.1 -r0 \
src/external/bsd/openldap/dist/libraries/liblmdb/sample-bdb.c \
src/external/bsd/openldap/dist/libraries/liblmdb/sample-mdb.c
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/openldap/dist/libraries/liblutil/detach.c \
src/external/bsd/openldap/dist/libraries/liblutil/md5.c
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/openldap/dist/libraries/liblutil/passwd.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/libraries/librewrite/session.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/servers/slapd/filter.c
cvs rdiff -u -r1.2 -r1.3 \
src/external/bsd/openldap/dist/servers/slapd/overlays/deref.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/openldap/openldap2netbsd
diff -u src/external/bsd/openldap/openldap2netbsd:1.2 src/external/bsd/openldap/openldap2netbsd:1.3
--- src/external/bsd/openldap/openldap2netbsd:1.2 Sat Oct 8 15:28:38 2011
+++ src/external/bsd/openldap/openldap2netbsd Wed Feb 8 20:53:50 2017
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# $NetBSD: openldap2netbsd,v 1.2 2011/10/08 19:28:38 christos Exp $
+# $NetBSD: openldap2netbsd,v 1.3 2017/02/09 01:53:50 christos Exp $
#
# Copyright (c) 1998, 1999, 2010 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -30,17 +30,27 @@
# netbsd openldap source tree, under src/external/bsd/openldap/dist.
#
-d=. #XXX
+if [ -z "$1" ]
+then
+ echo "Usage: $0 " 1>&2
+ exit 1
+fi
+
+d="$1"
### Remove the $'s around RCS tags
-cleantags $d
+cleantags "$d"
### Add our NetBSD RCS Id
-find $d -name '*.[chly]' -print | while read c; do
- sed 1q < $c | grep -q '\$NetBSD' || (
-echo "/* \$NetBSD\$ */" >/tmp/openldap3n$$
-echo "" >>/tmp/openldap3n$$
-cat $c >> /tmp/openldap3n$$
-mv /tmp/openldap3n$$ $c && echo added NetBSD RCS tag to $c
+find "$d" -name '*.[chly]' -print | while read c; do
+ sed 1q < "$c" | grep -q '\$NetBSD' || (
+sed -i -e '1i \
+/* $NetBSD: openldap2netbsd,v 1.3 2017/02/09 01:53:50 christos Exp $ */\
+
+' -e '/#include "portable.h"/i \
+#include \
+__RCSID("$NetBSD: openldap2netbsd,v 1.3 2017/02/09 01:53:50 christos Exp $");\
+
+' "$c"
)
done
Index: src/external/bsd/openldap/dist/build/mkversion
diff -u src/external/bsd/openldap/dist/build/mkversion:1.5 src/external/bsd/openldap/dist/build/mkversion:1.6
--- src/external/bsd/openldap/dist/build/mkversion:1.5 Wed May 28 06:12:43 2014
+++ src/external/bsd/openldap/dist/build/mkversion Wed Feb 8 20:53:50 2017
@@ -3,7 +3,7 @@
# $OpenLDAP$
## This work is part of OpenLDAP Software
CVS import: src/external/bsd/openldap/dist
Module Name:src Committed By: christos Date: Thu Feb 9 01:47:16 UTC 2017 Update of /cvsroot/src/external/bsd/openldap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1305 Log Message: OpenLDAP 2.4 Change Log OpenLDAP 2.4.44 Release (2016/02/05) Fixed slapd-bdb/hdb missing olcDbChecksum config attr (ITS#8337) Fixed slapd-mdb behavior with long lived read transactions (ITS#8226) Fixed slapd-mdb cleanup after failed transaction (ITS#8360) Fixed slapd-sql missing id_query/olcSqlIdQuery (ITS#8329) Fixed slapo-accesslog callback initialization (ITS#8351) Fixed slapo-ppolicy pwdMaxRecordedFailure must never be zero (ITS#8327) Fixed slapo-syncprov abandon processing (ITS#8354) Fixed slapo-syncprov ctxcsn snapshot on refresh (ITS#8281, ITS#8365) Documentation admin24 Stop linking to Berkeley DB downloads (ITS#8362) admin24 Update documentation for LMDB preference OpenLDAP 2.4.43 Release (2015/11/30) Fixed liblber remove obsolete assert (ITS#8240, ITS#8301) Fixed libldap file URLs on windows (ITS#8273) Fixed libldap microsecond timer for windows (ITS#8295) Fixed slap tools minor one time memory leak (ITS#8082) Fixed slapd to avoid redundant processing of abandon ops (ITS#8232) Fixed slapd syncrepl segv when present list is NULL (ITS#8231, ITS#8042) Fixed slapd segfault with invalid SASL URI (ITS#8218) Fixed slapd configuration parser with unbalanced quotes (ITS#8233) Fixed slapd syncrepl check with config db on windows (ITS#8277) Fixed slapd with mod Increment and inherited attribute type (ITS#8289) Fixed slapd-ldap SEGV after failed retry (ITS#8173) Fixed slapd-ldap to skip client controls in ldap_back_entry_get (ITS#8244) Fixed slapd-null to have an option to return a search entry (ITS#8249) Fixed slapd-relay to correctly handle quoted options (ITS#8284) Fixed slapo-accesslog delta-sync MMR with interrupted refresh phase (ITS#8281) Fixed slapo-dds segfault when using slapo-memberof (ITS#8133) Fixed slapo-ppolicy to allow purging of stale pwdFailureTime attributes (ITS#8185) Fixed slapo-ppolicy to release entry on failure (ITS#7537) Fixed slapo-ppolicy to fall back to default policy if there is a parsing error (ITS#8234) Fixed slapo-syncprov with interrupted refresh phase (ITS#8281) Fixed slapo-refint with subtree renames (ITS#8220) Fixed slapo-rwm missing olcDropUnrequested attribute (ITS#7889) Fixed slapo-rwm parsing to avoid double-escaping rewrite rules (ITS#7964) Build Environment Fixed ldif-filter option parsing (ITS#8292) Fixed slapd-tester EOL handling in test output for windows (ITS#8280) Fixed slapd-tester executable suffix for windows (ITS#8216) Fixed test061 timing issues (ITS#8297) Contrib Added libnettle support to pw-pbkdf2 (ITS#8198) Fixed smbk5pwd compiler warnings with libnettle (ITS#8235) Fixed passwd symbol collisions with other crypto libraries (ITS#8294) Documentation Updated guide to reflect changes to how TLS is handled with syncrepl (ITS#7897) OpenLDAP 2.4.42 Release (2015/08/14) Fixed liblber address length for CLDAP (ITS#8158) Fixed libldap dnssrv potential overflow with port number (ITS#7027,ITS#8195) Fixed slapd cn=config when updating olcAttributeTypes (ITS#8199) Fixed slapd-mdb to correctly update search candidates for scoped searches (ITS#8203) Fixed slapo-ppolicy with redundant mod ops on glued trees (ITS#8184) Fixed slapo-rwm crash when deleting rewrite rules (ITS#8213) Build Environment Fixed libdb detection with gcc 5.x (ITS#8056) OpenLDAP 2.4.41 Release (2015/06/21) Fixed ldapsearch to explicitly flush its buffer (ITS#8118) Fixed libldap async connections (ITS#8090) Fixed libldap double free of request during abandon (ITS#7967) Fixed libldap error string for LDAP_X_CONNECTING (ITS#8093) Fixed libldap segfault in ldap_sync_initialize (ITS#8001) Fixed libldap ldif-wrap off by one error (ITS#8003) Fixed libldap handling of TLS in async mode (ITS#8022) Fixed libldap null pointer dereference (ITS#8028) Fixed libldap mutex handling with LDAP_OPT_SESSION_REFCNT (ITS#8050) Fixed slapd slapadd config db import of minimal frontend entry (ITS#8150) Fixed slapd slapadd onetime leak with -w (ITS#8014) Fixed slapd sasl auxprop crash with invalid config (ITS#8092) Fixed slapd syncrepl delta-mmr issue with overlays and slapd.conf (ITS#7976) Fixed slapd syncrepl mutex for cookie state (ITS#7968) Fixed slapd syncrepl memory leaks
CVS import: src/external/bsd/openldap/dist
Module Name:src Committed By: christos Date: Thu Feb 9 01:47:16 UTC 2017 Update of /cvsroot/src/external/bsd/openldap/dist In directory ivanova.netbsd.org:/tmp/cvs-serv1305 Log Message: OpenLDAP 2.4 Change Log OpenLDAP 2.4.44 Release (2016/02/05) Fixed slapd-bdb/hdb missing olcDbChecksum config attr (ITS#8337) Fixed slapd-mdb behavior with long lived read transactions (ITS#8226) Fixed slapd-mdb cleanup after failed transaction (ITS#8360) Fixed slapd-sql missing id_query/olcSqlIdQuery (ITS#8329) Fixed slapo-accesslog callback initialization (ITS#8351) Fixed slapo-ppolicy pwdMaxRecordedFailure must never be zero (ITS#8327) Fixed slapo-syncprov abandon processing (ITS#8354) Fixed slapo-syncprov ctxcsn snapshot on refresh (ITS#8281, ITS#8365) Documentation admin24 Stop linking to Berkeley DB downloads (ITS#8362) admin24 Update documentation for LMDB preference OpenLDAP 2.4.43 Release (2015/11/30) Fixed liblber remove obsolete assert (ITS#8240, ITS#8301) Fixed libldap file URLs on windows (ITS#8273) Fixed libldap microsecond timer for windows (ITS#8295) Fixed slap tools minor one time memory leak (ITS#8082) Fixed slapd to avoid redundant processing of abandon ops (ITS#8232) Fixed slapd syncrepl segv when present list is NULL (ITS#8231, ITS#8042) Fixed slapd segfault with invalid SASL URI (ITS#8218) Fixed slapd configuration parser with unbalanced quotes (ITS#8233) Fixed slapd syncrepl check with config db on windows (ITS#8277) Fixed slapd with mod Increment and inherited attribute type (ITS#8289) Fixed slapd-ldap SEGV after failed retry (ITS#8173) Fixed slapd-ldap to skip client controls in ldap_back_entry_get (ITS#8244) Fixed slapd-null to have an option to return a search entry (ITS#8249) Fixed slapd-relay to correctly handle quoted options (ITS#8284) Fixed slapo-accesslog delta-sync MMR with interrupted refresh phase (ITS#8281) Fixed slapo-dds segfault when using slapo-memberof (ITS#8133) Fixed slapo-ppolicy to allow purging of stale pwdFailureTime attributes (ITS#8185) Fixed slapo-ppolicy to release entry on failure (ITS#7537) Fixed slapo-ppolicy to fall back to default policy if there is a parsing error (ITS#8234) Fixed slapo-syncprov with interrupted refresh phase (ITS#8281) Fixed slapo-refint with subtree renames (ITS#8220) Fixed slapo-rwm missing olcDropUnrequested attribute (ITS#7889) Fixed slapo-rwm parsing to avoid double-escaping rewrite rules (ITS#7964) Build Environment Fixed ldif-filter option parsing (ITS#8292) Fixed slapd-tester EOL handling in test output for windows (ITS#8280) Fixed slapd-tester executable suffix for windows (ITS#8216) Fixed test061 timing issues (ITS#8297) Contrib Added libnettle support to pw-pbkdf2 (ITS#8198) Fixed smbk5pwd compiler warnings with libnettle (ITS#8235) Fixed passwd symbol collisions with other crypto libraries (ITS#8294) Documentation Updated guide to reflect changes to how TLS is handled with syncrepl (ITS#7897) OpenLDAP 2.4.42 Release (2015/08/14) Fixed liblber address length for CLDAP (ITS#8158) Fixed libldap dnssrv potential overflow with port number (ITS#7027,ITS#8195) Fixed slapd cn=config when updating olcAttributeTypes (ITS#8199) Fixed slapd-mdb to correctly update search candidates for scoped searches (ITS#8203) Fixed slapo-ppolicy with redundant mod ops on glued trees (ITS#8184) Fixed slapo-rwm crash when deleting rewrite rules (ITS#8213) Build Environment Fixed libdb detection with gcc 5.x (ITS#8056) OpenLDAP 2.4.41 Release (2015/06/21) Fixed ldapsearch to explicitly flush its buffer (ITS#8118) Fixed libldap async connections (ITS#8090) Fixed libldap double free of request during abandon (ITS#7967) Fixed libldap error string for LDAP_X_CONNECTING (ITS#8093) Fixed libldap segfault in ldap_sync_initialize (ITS#8001) Fixed libldap ldif-wrap off by one error (ITS#8003) Fixed libldap handling of TLS in async mode (ITS#8022) Fixed libldap null pointer dereference (ITS#8028) Fixed libldap mutex handling with LDAP_OPT_SESSION_REFCNT (ITS#8050) Fixed slapd slapadd config db import of minimal frontend entry (ITS#8150) Fixed slapd slapadd onetime leak with -w (ITS#8014) Fixed slapd sasl auxprop crash with invalid config (ITS#8092) Fixed slapd syncrepl delta-mmr issue with overlays and slapd.conf (ITS#7976) Fixed slapd syncrepl mutex for cookie state (ITS#7968) Fixed slapd syncrepl memory leaks
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Feb 9 00:25:23 UTC 2017 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind To generate a diff of this commit: cvs rdiff -u -r1.1409 -r1.1410 src/doc/3RDPARTY cvs rdiff -u -r1.2245 -r1.2246 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.1409 src/doc/3RDPARTY:1.1410 --- src/doc/3RDPARTY:1.1409 Mon Feb 6 11:08:40 2017 +++ src/doc/3RDPARTY Wed Feb 8 19:25:22 2017 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1409 2017/02/06 16:08:40 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1410 2017/02/09 00:25:22 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -114,15 +114,15 @@ Notes: bc includes dc, both of which are in the NetBSD tree. Package: bind [named and utils] -Version: 9.10.4-P5/BSD 9.11.0-P2/MPL -Current Vers: 9.10.4-P5/BSD +Version: 9.10.4-P6/BSD 9.11.0-P3/MPL +Current Vers: 9.10.4-P6/BSD Maintainer: Paul Vixie <vi...@vix.com> Archive Site: ftp://ftp.isc.org/isc/bind9/ Home Page: http://www.isc.org/software/bind/ Mailing List: https://lists.isc.org/mailman/listinfo/bind-announce Mailing List: https://lists.isc.org/mailman/listinfo/bind-users Responsible: vixie, christos -License: BSD-like (2-clause) +License: BSD-like (2-clause) / MPL Location: external/bsd/bind/dist Notes: First bind2netbsd script to import into src/external/bsd/bind/dist. Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2245 src/doc/CHANGES:1.2246 --- src/doc/CHANGES:1.2245 Wed Feb 8 04:58:42 2017 +++ src/doc/CHANGES Wed Feb 8 19:25:22 2017 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2245 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2246 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -462,3 +462,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: pthread_dbg(3): Removed from the base distribution. [kamil 20170208] ixv(4): Add Intel 10G Ethernet virtual function driver. [msaitoh 20170208] + bind: Import version 9.10.4-P6. [christos 20170208]
CVS commit: src/doc
Module Name:src Committed By: christos Date: Thu Feb 9 00:25:23 UTC 2017 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new bind To generate a diff of this commit: cvs rdiff -u -r1.1409 -r1.1410 src/doc/3RDPARTY cvs rdiff -u -r1.2245 -r1.2246 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/bind/dist
Module Name:src Committed By: christos Date: Thu Feb 9 00:23:27 UTC 2017 Modified Files: src/external/bsd/bind/dist: CHANGES README srcid version src/external/bsd/bind/dist/bin/named: query.c src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html man.dnssec-dsfromkey.html man.dnssec-importkey.html man.dnssec-keyfromlabel.html man.dnssec-keygen.html man.dnssec-revoke.html man.dnssec-settime.html man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html man.host.html man.isc-hmac-fixup.html man.named-checkconf.html man.named-checkzone.html man.named-journalprint.html man.named-rrchecker.html man.named.html man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html man.rndc.html src/external/bsd/bind/dist/lib/dns: api message.c rdataset.c resolver.c Log Message: Merge 9.10.4-P6 4558. [bug] Synthesised CNAME before matching DNAME was still being cached when it should have been. [RT #44318] 4557. [security] Combining dns64 and rpz can result in dereferencing a NULL pointer (read). (CVE-2017-3135) [RT#44434] To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/bsd/bind/dist/CHANGES cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/README cvs rdiff -u -r1.18 -r1.19 src/external/bsd/bind/dist/srcid cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/version cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/bin/named/query.c cvs rdiff -u -r1.12 -r1.13 \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \ src/external/bsd/bind/dist/doc/arm/man.arpaname.html \ src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \ src/external/bsd/bind/dist/doc/arm/man.delv.html \ src/external/bsd/bind/dist/doc/arm/man.dig.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \ src/external/bsd/bind/dist/doc/arm/man.genrandom.html \ src/external/bsd/bind/dist/doc/arm/man.host.html \ src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \ src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \ src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \ src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \ src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \ src/external/bsd/bind/dist/doc/arm/man.named.html \ src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \ src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \ src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \ src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \ src/external/bsd/bind/dist/doc/arm/man.rndc.html cvs rdiff -u -r1.17 -r1.18 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/dns/api cvs rdiff -u -r1.21 -r1.22 src/external/bsd/bind/dist/lib/dns/message.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/rdataset.c cvs rdiff -u -r1.28 -r1.29 src/external/bsd/bind/dist/lib/dns/resolver.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/bind/dist
Module Name:src Committed By: christos Date: Thu Feb 9 00:23:27 UTC 2017 Modified Files: src/external/bsd/bind/dist: CHANGES README srcid version src/external/bsd/bind/dist/bin/named: query.c src/external/bsd/bind/dist/doc/arm: Bv9ARM.ch04.html Bv9ARM.ch06.html Bv9ARM.ch07.html Bv9ARM.ch08.html Bv9ARM.ch09.html Bv9ARM.html Bv9ARM.pdf man.arpaname.html man.ddns-confgen.html man.delv.html man.dig.html man.dnssec-checkds.html man.dnssec-coverage.html man.dnssec-dsfromkey.html man.dnssec-importkey.html man.dnssec-keyfromlabel.html man.dnssec-keygen.html man.dnssec-revoke.html man.dnssec-settime.html man.dnssec-signzone.html man.dnssec-verify.html man.genrandom.html man.host.html man.isc-hmac-fixup.html man.named-checkconf.html man.named-checkzone.html man.named-journalprint.html man.named-rrchecker.html man.named.html man.nsec3hash.html man.nsupdate.html man.rndc-confgen.html man.rndc.conf.html man.rndc.html src/external/bsd/bind/dist/lib/dns: api message.c rdataset.c resolver.c Log Message: Merge 9.10.4-P6 4558. [bug] Synthesised CNAME before matching DNAME was still being cached when it should have been. [RT #44318] 4557. [security] Combining dns64 and rpz can result in dereferencing a NULL pointer (read). (CVE-2017-3135) [RT#44434] To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/bsd/bind/dist/CHANGES cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/README cvs rdiff -u -r1.18 -r1.19 src/external/bsd/bind/dist/srcid cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/version cvs rdiff -u -r1.22 -r1.23 src/external/bsd/bind/dist/bin/named/query.c cvs rdiff -u -r1.12 -r1.13 \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch04.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch06.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch07.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch08.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.ch09.html \ src/external/bsd/bind/dist/doc/arm/Bv9ARM.html \ src/external/bsd/bind/dist/doc/arm/man.arpaname.html \ src/external/bsd/bind/dist/doc/arm/man.ddns-confgen.html \ src/external/bsd/bind/dist/doc/arm/man.delv.html \ src/external/bsd/bind/dist/doc/arm/man.dig.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-checkds.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-coverage.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-dsfromkey.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-importkey.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-keyfromlabel.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-keygen.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-revoke.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-settime.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-signzone.html \ src/external/bsd/bind/dist/doc/arm/man.dnssec-verify.html \ src/external/bsd/bind/dist/doc/arm/man.genrandom.html \ src/external/bsd/bind/dist/doc/arm/man.host.html \ src/external/bsd/bind/dist/doc/arm/man.isc-hmac-fixup.html \ src/external/bsd/bind/dist/doc/arm/man.named-checkconf.html \ src/external/bsd/bind/dist/doc/arm/man.named-checkzone.html \ src/external/bsd/bind/dist/doc/arm/man.named-journalprint.html \ src/external/bsd/bind/dist/doc/arm/man.named-rrchecker.html \ src/external/bsd/bind/dist/doc/arm/man.named.html \ src/external/bsd/bind/dist/doc/arm/man.nsec3hash.html \ src/external/bsd/bind/dist/doc/arm/man.nsupdate.html \ src/external/bsd/bind/dist/doc/arm/man.rndc-confgen.html \ src/external/bsd/bind/dist/doc/arm/man.rndc.conf.html \ src/external/bsd/bind/dist/doc/arm/man.rndc.html cvs rdiff -u -r1.17 -r1.18 src/external/bsd/bind/dist/doc/arm/Bv9ARM.pdf cvs rdiff -u -r1.12 -r1.13 src/external/bsd/bind/dist/lib/dns/api cvs rdiff -u -r1.21 -r1.22 src/external/bsd/bind/dist/lib/dns/message.c cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/rdataset.c cvs rdiff -u -r1.28 -r1.29 src/external/bsd/bind/dist/lib/dns/resolver.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/bind/dist/CHANGES diff -u src/external/bsd/bind/dist/CHANGES:1.24 src/external/bsd/bind/dist/CHANGES:1.25 --- src/external/bsd/bind/dist/CHANGES:1.24 Thu Jan 12 03:21:32 2017 +++ src/external/bsd/bind/dist/CHANGES Wed Feb 8 19:23:26 2017 @@ -1,3 +1,11 @@ + --- 9.10.4-P6 released --- + +4558. [bug] Synthesised CNAME before matching DNAME was still + being cached when it should have been. [RT #44318] + +4557. [security] Combining dns64 and rpz can result in dereferencing + a NULL pointer (read). (CVE-2017-3135) [RT#44434] + --- 9.10.4-P5 released
CVS commit: src/sbin/ifconfig
Module Name:src Committed By: rin Date: Wed Feb 8 23:34:15 UTC 2017 Modified Files: src/sbin/ifconfig: Makefile Makefile.common Log Message: Cosmetic changes. No functional changes. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sbin/ifconfig/Makefile cvs rdiff -u -r1.2 -r1.3 src/sbin/ifconfig/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/ifconfig
Module Name:src
Committed By: rin
Date: Wed Feb 8 23:34:15 UTC 2017
Modified Files:
src/sbin/ifconfig: Makefile Makefile.common
Log Message:
Cosmetic changes. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/ifconfig/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.59 src/sbin/ifconfig/Makefile:1.60
--- src/sbin/ifconfig/Makefile:1.59 Wed Feb 8 23:22:43 2017
+++ src/sbin/ifconfig/Makefile Wed Feb 8 23:34:15 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2017/02/08 23:22:43 rin Exp $
+# $NetBSD: Makefile,v 1.60 2017/02/08 23:34:15 rin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -7,25 +7,25 @@
.include
-RUMPPRG=ifconfig
-MAN= ifconfig.8
+RUMPPRG= ifconfig
+MAN= ifconfig.8
+
+SRCS= af_atalk.c af_link.c carp.c
+
+CPPFLAGS+= -I${NETBSDSRCDIR}/sys/dist/pf/
+SRCS+= pfsync.c
-#DBG+=-g
-SRCS= af_atalk.c af_link.c carp.c
.if (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
-SRCS+= af_inet6.c
+SRCS+= af_inet6.c
.endif
.include "Makefile.common"
.PATH: ${.CURDIR}/../../lib/libc/net
-RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c
+RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c
.if (${MKRUMP} != "no")
-CPPFLAGS+= -DRUMP_ACTION
+CPPFLAGS+= -DRUMP_ACTION
.endif
-CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/pf/
-SRCS+= pfsync.c
-
.include
Index: src/sbin/ifconfig/Makefile.common
diff -u src/sbin/ifconfig/Makefile.common:1.2 src/sbin/ifconfig/Makefile.common:1.3
--- src/sbin/ifconfig/Makefile.common:1.2 Wed Feb 8 23:22:43 2017
+++ src/sbin/ifconfig/Makefile.common Wed Feb 8 23:34:15 2017
@@ -1,27 +1,15 @@
-# $NetBSD: Makefile.common,v 1.2 2017/02/08 23:22:43 rin Exp $
+# $NetBSD: Makefile.common,v 1.3 2017/02/08 23:34:15 rin Exp $
# shared stuff with src/distrib/utils/x_ifconfig for install media.
# stuff not required by install media should be into Makefile.
.ifdef SMALLPROG
-CPPFLAGS+=-DSMALL
+CPPFLAGS+= -DSMALL
.endif
-DPADD+=${LIBUTIL}
-DPADD+=${LIBPROP}
-LDADD+=-lutil
-LDADD+=-lprop
+DPADD+= ${LIBUTIL} ${LIBPROP}
+LDADD+= -lutil -lprop
-INCS+=af_inetany.h env.h extern.h media.h parse.h util.h
-SRCS+= af_inet.c
-SRCS+= af_inetany.c
-SRCS+= agr.c
-SRCS+= env.c
-SRCS+= ether.c
-SRCS+= ieee80211.c
-SRCS+= ifconfig.c
-SRCS+= media.c
-SRCS+= parse.c
-SRCS+= tunnel.c
-SRCS+= util.c
-SRCS+= vlan.c
+INCS+= af_inetany.h env.h extern.h media.h parse.h util.h
+SRCS+= af_inet.c af_inetany.c agr.c env.c ether.c ieee80211.c \
+ ifconfig.c media.c parse.c tunnel.c util.c vlan.c
CVS commit: src/distrib/utils/x_ifconfig
Module Name:src
Committed By: rin
Date: Wed Feb 8 23:26:24 UTC 2017
Modified Files:
src/distrib/utils/x_ifconfig: Makefile
Log Message:
Cosmetic changes. No functional changes.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/x_ifconfig/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/utils/x_ifconfig/Makefile
diff -u src/distrib/utils/x_ifconfig/Makefile:1.37 src/distrib/utils/x_ifconfig/Makefile:1.38
--- src/distrib/utils/x_ifconfig/Makefile:1.37 Wed Feb 8 23:24:57 2017
+++ src/distrib/utils/x_ifconfig/Makefile Wed Feb 8 23:26:24 2017
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.37 2017/02/08 23:24:57 rin Exp $
+# $NetBSD: Makefile,v 1.38 2017/02/08 23:26:24 rin Exp $
# Build a smaller ifconfig (i.e. for boot media)
-NOMAN= # defined
+NOMAN= # defined
.include
+PROG= ifconfig
SRCDIR= ${.CURDIR}/../../../sbin/ifconfig
-
CPPFLAGS+= -DCRUNCHOPS
+
.if defined(SMALLPROG_INET6) && (${USE_INET6} != "no")
CPPFLAGS+= -DINET6
-SRCS+= af_inet6.c
+SRCS+= af_inet6.c
.endif
-PROG= ifconfig
-
.PATH: ${SRCDIR}
-.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.common"
+.include "${SRCDIR}/Makefile.common"
.include
CVS commit: src/distrib/utils/x_ifconfig
Module Name:src Committed By: rin Date: Wed Feb 8 23:26:24 UTC 2017 Modified Files: src/distrib/utils/x_ifconfig: Makefile Log Message: Cosmetic changes. No functional changes. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/distrib/utils/x_ifconfig/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/utils/x_ifconfig
Module Name:src
Committed By: rin
Date: Wed Feb 8 23:24:57 UTC 2017
Modified Files:
src/distrib/utils/x_ifconfig: Makefile
Log Message:
Replace ".PATH ${SRCDIR}" before including Makefile.common to ensure the
correct order of search path.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/x_ifconfig/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/distrib/utils/x_ifconfig
Module Name:src
Committed By: rin
Date: Wed Feb 8 23:24:57 UTC 2017
Modified Files:
src/distrib/utils/x_ifconfig: Makefile
Log Message:
Replace ".PATH ${SRCDIR}" before including Makefile.common to ensure the
correct order of search path.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/distrib/utils/x_ifconfig/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/utils/x_ifconfig/Makefile
diff -u src/distrib/utils/x_ifconfig/Makefile:1.36 src/distrib/utils/x_ifconfig/Makefile:1.37
--- src/distrib/utils/x_ifconfig/Makefile:1.36 Wed Feb 8 23:22:43 2017
+++ src/distrib/utils/x_ifconfig/Makefile Wed Feb 8 23:24:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2017/02/08 23:22:43 rin Exp $
+# $NetBSD: Makefile,v 1.37 2017/02/08 23:24:57 rin Exp $
# Build a smaller ifconfig (i.e. for boot media)
NOMAN= # defined
@@ -15,8 +15,9 @@ SRCS+= af_inet6.c
.endif
PROG= ifconfig
+
+.PATH: ${SRCDIR}
+
.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.common"
.include
-
-.PATH: ${SRCDIR}
CVS commit: src
Module Name:src
Committed By: rin
Date: Wed Feb 8 23:22:43 UTC 2017
Modified Files:
src/distrib/utils/x_ifconfig: Makefile
src/sbin/ifconfig: Makefile Makefile.common
Log Message:
Factor out a common part in Makefile's of ifconfig and x_ifconfig.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/x_ifconfig/Makefile
cvs rdiff -u -r1.58 -r1.59 src/sbin/ifconfig/Makefile
cvs rdiff -u -r1.1 -r1.2 src/sbin/ifconfig/Makefile.common
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/x_ifconfig/Makefile
diff -u src/distrib/utils/x_ifconfig/Makefile:1.35 src/distrib/utils/x_ifconfig/Makefile:1.36
--- src/distrib/utils/x_ifconfig/Makefile:1.35 Wed Feb 8 23:16:41 2017
+++ src/distrib/utils/x_ifconfig/Makefile Wed Feb 8 23:22:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2017/02/08 23:16:41 rin Exp $
+# $NetBSD: Makefile,v 1.36 2017/02/08 23:22:43 rin Exp $
# Build a smaller ifconfig (i.e. for boot media)
NOMAN= # defined
@@ -14,10 +14,6 @@ CPPFLAGS+= -DINET6
SRCS+= af_inet6.c
.endif
-.ifdef SMALLPROG
-CPPFLAGS+=-DSMALL
-.endif
-
PROG= ifconfig
.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.common"
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.58 src/sbin/ifconfig/Makefile:1.59
--- src/sbin/ifconfig/Makefile:1.58 Wed Feb 8 23:16:41 2017
+++ src/sbin/ifconfig/Makefile Wed Feb 8 23:22:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2017/02/08 23:16:41 rin Exp $
+# $NetBSD: Makefile,v 1.59 2017/02/08 23:22:43 rin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -25,10 +25,6 @@ RUMPSRCS= getifaddrs.c getnameinfo.c if_
CPPFLAGS+= -DRUMP_ACTION
.endif
-.ifdef SMALLPROG
-CPPFLAGS+=-DSMALL
-.endif
-
CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/pf/
SRCS+= pfsync.c
Index: src/sbin/ifconfig/Makefile.common
diff -u src/sbin/ifconfig/Makefile.common:1.1 src/sbin/ifconfig/Makefile.common:1.2
--- src/sbin/ifconfig/Makefile.common:1.1 Wed Feb 8 23:16:41 2017
+++ src/sbin/ifconfig/Makefile.common Wed Feb 8 23:22:43 2017
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile.common,v 1.1 2017/02/08 23:16:41 rin Exp $
+# $NetBSD: Makefile.common,v 1.2 2017/02/08 23:22:43 rin Exp $
# shared stuff with src/distrib/utils/x_ifconfig for install media.
# stuff not required by install media should be into Makefile.
+.ifdef SMALLPROG
+CPPFLAGS+=-DSMALL
+.endif
+
DPADD+=${LIBUTIL}
DPADD+=${LIBPROP}
LDADD+=-lutil
CVS commit: src
Module Name:src Committed By: rin Date: Wed Feb 8 23:22:43 UTC 2017 Modified Files: src/distrib/utils/x_ifconfig: Makefile src/sbin/ifconfig: Makefile Makefile.common Log Message: Factor out a common part in Makefile's of ifconfig and x_ifconfig. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/distrib/utils/x_ifconfig/Makefile cvs rdiff -u -r1.58 -r1.59 src/sbin/ifconfig/Makefile cvs rdiff -u -r1.1 -r1.2 src/sbin/ifconfig/Makefile.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: rin Date: Wed Feb 8 23:16:41 UTC 2017 Modified Files: src/distrib/utils/x_ifconfig: Makefile src/sbin/ifconfig: Makefile Added Files: src/sbin/ifconfig: Makefile.common Removed Files: src/sbin/ifconfig: Makefile.inc Log Message: Rename sbin/ifconfig/Makefile.inc to Makefile.common; the former can potentially conflict with bsd.subdir.mk. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/x_ifconfig/Makefile cvs rdiff -u -r1.57 -r1.58 src/sbin/ifconfig/Makefile cvs rdiff -u -r0 -r1.1 src/sbin/ifconfig/Makefile.common cvs rdiff -u -r1.9 -r0 src/sbin/ifconfig/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: rin
Date: Wed Feb 8 23:16:41 UTC 2017
Modified Files:
src/distrib/utils/x_ifconfig: Makefile
src/sbin/ifconfig: Makefile
Added Files:
src/sbin/ifconfig: Makefile.common
Removed Files:
src/sbin/ifconfig: Makefile.inc
Log Message:
Rename sbin/ifconfig/Makefile.inc to Makefile.common; the former can
potentially conflict with bsd.subdir.mk.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/distrib/utils/x_ifconfig/Makefile
cvs rdiff -u -r1.57 -r1.58 src/sbin/ifconfig/Makefile
cvs rdiff -u -r0 -r1.1 src/sbin/ifconfig/Makefile.common
cvs rdiff -u -r1.9 -r0 src/sbin/ifconfig/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/distrib/utils/x_ifconfig/Makefile
diff -u src/distrib/utils/x_ifconfig/Makefile:1.34 src/distrib/utils/x_ifconfig/Makefile:1.35
--- src/distrib/utils/x_ifconfig/Makefile:1.34 Tue Feb 7 16:49:40 2017
+++ src/distrib/utils/x_ifconfig/Makefile Wed Feb 8 23:16:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2017/02/07 16:49:40 rin Exp $
+# $NetBSD: Makefile,v 1.35 2017/02/08 23:16:41 rin Exp $
# Build a smaller ifconfig (i.e. for boot media)
NOMAN= # defined
@@ -19,7 +19,7 @@ CPPFLAGS+=-DSMALL
.endif
PROG= ifconfig
-.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.inc"
+.include "${.CURDIR}/../../../sbin/ifconfig/Makefile.common"
.include
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.57 src/sbin/ifconfig/Makefile:1.58
--- src/sbin/ifconfig/Makefile:1.57 Wed Feb 8 23:14:00 2017
+++ src/sbin/ifconfig/Makefile Wed Feb 8 23:16:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2017/02/08 23:14:00 rin Exp $
+# $NetBSD: Makefile,v 1.58 2017/02/08 23:16:41 rin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -17,7 +17,7 @@ CPPFLAGS+= -DINET6
SRCS+= af_inet6.c
.endif
-.include "Makefile.inc"
+.include "Makefile.common"
.PATH: ${.CURDIR}/../../lib/libc/net
RUMPSRCS= getifaddrs.c getnameinfo.c if_indextoname.c
Added files:
Index: src/sbin/ifconfig/Makefile.common
diff -u /dev/null src/sbin/ifconfig/Makefile.common:1.1
--- /dev/null Wed Feb 8 23:16:41 2017
+++ src/sbin/ifconfig/Makefile.common Wed Feb 8 23:16:41 2017
@@ -0,0 +1,23 @@
+# $NetBSD: Makefile.common,v 1.1 2017/02/08 23:16:41 rin Exp $
+
+# shared stuff with src/distrib/utils/x_ifconfig for install media.
+# stuff not required by install media should be into Makefile.
+
+DPADD+=${LIBUTIL}
+DPADD+=${LIBPROP}
+LDADD+=-lutil
+LDADD+=-lprop
+
+INCS+=af_inetany.h env.h extern.h media.h parse.h util.h
+SRCS+= af_inet.c
+SRCS+= af_inetany.c
+SRCS+= agr.c
+SRCS+= env.c
+SRCS+= ether.c
+SRCS+= ieee80211.c
+SRCS+= ifconfig.c
+SRCS+= media.c
+SRCS+= parse.c
+SRCS+= tunnel.c
+SRCS+= util.c
+SRCS+= vlan.c
CVS commit: src
Module Name:src
Committed By: rin
Date: Wed Feb 8 23:14:00 UTC 2017
Modified Files:
src/doc: HACKS
src/sbin/ifconfig: Makefile
Log Message:
Remove ifconfig hack on m68000. I've confirmed that the problem has already
gone with TME.
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/doc/HACKS
cvs rdiff -u -r1.56 -r1.57 src/sbin/ifconfig/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/HACKS
diff -u src/doc/HACKS:1.175 src/doc/HACKS:1.176
--- src/doc/HACKS:1.175 Thu Oct 20 07:33:28 2016
+++ src/doc/HACKS Wed Feb 8 23:13:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.175 2016/10/20 07:33:28 he Exp $
+# $NetBSD: HACKS,v 1.176 2017/02/08 23:13:59 rin Exp $
#
# This file is intended to document workarounds for currently unsolved
# (mostly) compiler bugs.
@@ -332,19 +332,6 @@ descr
Generate .hx files and copy it in the Makefiles if they changed.
kcah
-hack avoid gcc4 -O1 bug in loop optimize
-cdate 29 November 2008
-who tsutsui
-file src/sbin/ifconfig/Makefile : 1.39
-pr 40036 40066
-descr
- gcc -O1 seems to generate wrong code in loop optimize so that
- ifconfig lo0 inet6 doesn't return error even if a kernel
- doesn't have IPv6 support. (see the above PRs for details)
- For workaround, specify -fno-loop-optimize on m68000,
- which uses -O1 by default.
-kcah
-
hack MKPIE ldscript for /usr.sbin/crash
cdate 22 April 2010
who christos
Index: src/sbin/ifconfig/Makefile
diff -u src/sbin/ifconfig/Makefile:1.56 src/sbin/ifconfig/Makefile:1.57
--- src/sbin/ifconfig/Makefile:1.56 Tue May 19 08:14:38 2015
+++ src/sbin/ifconfig/Makefile Wed Feb 8 23:14:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2015/05/19 08:14:38 ozaki-r Exp $
+# $NetBSD: Makefile,v 1.57 2017/02/08 23:14:00 rin Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
# when making a change to this file, please check if the change is
@@ -32,9 +32,4 @@ CPPFLAGS+=-DSMALL
CPPFLAGS+=-I${NETBSDSRCDIR}/sys/dist/pf/
SRCS+= pfsync.c
-.if ${MACHINE_ARCH} == "m68000"
-# XXX workaround for gcc -O1 bug (PR bin/40036 and toolchain/40066)
-COPTS.ifconfig.c+= -fno-loop-optimize
-.endif
-
.include
CVS commit: src
Module Name:src Committed By: rin Date: Wed Feb 8 23:14:00 UTC 2017 Modified Files: src/doc: HACKS src/sbin/ifconfig: Makefile Log Message: Remove ifconfig hack on m68000. I've confirmed that the problem has already gone with TME. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/doc/HACKS cvs rdiff -u -r1.56 -r1.57 src/sbin/ifconfig/Makefile 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/debug
Module Name:src Committed By: rin Date: Wed Feb 8 23:08:28 UTC 2017 Modified Files: src/distrib/sets/lists/debug: mi shl.mi Log Message: Fix build with MKDEBUG=yes for sun2: - libgcc_g.a, libgcov_g.a, libobjc_g.a, libstdc++_g.a, and libsupc++_g.a are marked "gcc" instead of "gcccmds". - libbfd_g.a and libh_helper_*_g.a are moved from debug/mi to debug/shl.mi. This seems strange at first sight, but they are built only when shared libraries are enabled. To generate a diff of this commit: cvs rdiff -u -r1.197 -r1.198 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.160 -r1.161 src/distrib/sets/lists/debug/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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.197 src/distrib/sets/lists/debug/mi:1.198 --- src/distrib/sets/lists/debug/mi:1.197 Wed Feb 8 03:44:41 2017 +++ src/distrib/sets/lists/debug/mi Wed Feb 8 23:08:27 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.197 2017/02/08 03:44:41 kamil Exp $ +# $NetBSD: mi,v 1.198 2017/02/08 23:08:27 rin Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -32,7 +32,6 @@ ./usr/lib/libatf-c++_g.a comp-c-debuglib debuglib,compatfile,atf ./usr/lib/libatf-c_g.acomp-c-debuglib debuglib,compatfile,atf ./usr/lib/libavl_g.acomp-c-debuglib debuglib,compatfile,zfs -./usr/lib/libbfd_g.acomp-c-debuglib debuglib,compatfile,binutils ./usr/lib/libbind9_g.acomp-c-debuglib debuglib,compatfile ./usr/lib/libblacklist_g.a comp-c-debuglib debuglib,compatfile ./usr/lib/libbluetooth_g.a comp-c-debuglib debuglib,compatfile @@ -67,9 +66,9 @@ ./usr/lib/libfl_g.acomp-c-debuglib debuglib,compatfile ./usr/lib/libform_g.acomp-c-debuglib debuglib,compatfile ./usr/lib/libgcc_eh_g.acomp-c-debuglib debuglib,compatfile,gcccmds -./usr/lib/libgcc_g.acomp-c-debuglib debuglib,compatfile,gcccmds +./usr/lib/libgcc_g.acomp-c-debuglib debuglib,compatfile,gcc ./usr/lib/libgcc_s_g.acomp-c-debuglib debuglib,compatfile,gcccmds -./usr/lib/libgcov_g.acomp-c-debuglib debuglib,compatfile,gcccmds +./usr/lib/libgcov_g.acomp-c-debuglib debuglib,compatfile,gcc ./usr/lib/libgnumalloc_g.a comp-c-debuglib debuglib,compatfile ./usr/lib/libgomp_g.acomp-c-debuglib debuglib,compatfile,gcc ./usr/lib/libgssapi_g.acomp-c-debuglib debuglib,compatfile,kerberos @@ -110,7 +109,7 @@ ./usr/lib/libnetpgpverify_g.a comp-c-debuglib debuglib,compatfile,crypto ./usr/lib/libnpf_g.acomp-c-debuglib debuglib,compatfile ./usr/lib/libnvpair_g.acomp-c-debuglib debuglib,zfs,compatfile -./usr/lib/libobjc_g.acomp-c-debuglib debuglib,gcccmds,compatfile +./usr/lib/libobjc_g.acomp-c-debuglib debuglib,gcc,compatfile ./usr/lib/libopcodes_g.a comp-c-debuglib debuglib,compatfile,binutils ./usr/lib/libopenpgpsdk_g.a comp-obsolete obsolete,compatfile ./usr/lib/libossaudio_g.a comp-c-debuglib debuglib,compatfile @@ -239,8 +238,8 @@ ./usr/lib/libss_g.acomp-obsolete obsolete,compatfile ./usr/lib/libssh_g.acomp-c-debuglib debuglib,compatfile,crypto ./usr/lib/libssl_g.acomp-c-debuglib debuglib,compatfile,crypto -./usr/lib/libstdc++_g.acomp-c-debuglib debuglib,compatfile,cxx,gcccmds,libstdcxx -./usr/lib/libsupc++_g.acomp-c-debuglib debuglib,compatfile,cxx,gcccmds,libstdcxx +./usr/lib/libstdc++_g.acomp-c-debuglib debuglib,compatfile,cxx,gcc,libstdcxx +./usr/lib/libsupc++_g.acomp-c-debuglib debuglib,compatfile,cxx,gcc,libstdcxx ./usr/lib/libtddl_g.acomp-c-debuglib debuglib,compatfile,tpm ./usr/lib/libtermcap_g.a comp-obsolete obsolete,compatfile ./usr/lib/libterminfo_g.a comp-c-debuglib debuglib,compatfile @@ -2329,10 +2328,4 @@ ./usr/libdata/debug/usr/tests/util/id/h_id.debug tests-obsolete obsolete,compattestfile ./usr/libdata/debug/usr/tests/util/systrace/h_have_systrace.debug tests-obsolete obsolete,compattestfile ./usr/tests/lib/libc/tls/libh_tls_dynamic_g.a comp-c-debuglib atf,debuglib,compattestfile -./usr/tests/libexec/ld.elf_so/h_helper_symver_dso0/libh_helper_symver_dso_g.a comp-c-debuglib atf,debuglib,compattestfile -./usr/tests/libexec/ld.elf_so/h_helper_symver_dso1/libh_helper_symver_dso_g.a comp-c-debuglib atf,debuglib,compattestfile -./usr/tests/libexec/ld.elf_so/h_helper_symver_dso2/libh_helper_symver_dso_g.a comp-c-debuglib atf,debuglib,compattestfile -./usr/tests/libexec/ld.elf_so/libh_helper_dso1_g.a comp-c-debuglib atf,debuglib,compattestfile -./usr/tests/libexec/ld.elf_so/libh_helper_dso2_g.a comp-c-debuglib atf,debuglib,compattestfile -./usr/tests/libexec/ld.elf_so/libh_helper_ifunc_dso_g.a comp-c-debuglib atf,debuglib,compattestfile ./var/db/obsolete/debugbase-sys-root debug Index: src/distrib/sets/lists/debug/shl.mi diff -u
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: rin Date: Wed Feb 8 23:08:28 UTC 2017 Modified Files: src/distrib/sets/lists/debug: mi shl.mi Log Message: Fix build with MKDEBUG=yes for sun2: - libgcc_g.a, libgcov_g.a, libobjc_g.a, libstdc++_g.a, and libsupc++_g.a are marked "gcc" instead of "gcccmds". - libbfd_g.a and libh_helper_*_g.a are moved from debug/mi to debug/shl.mi. This seems strange at first sight, but they are built only when shared libraries are enabled. To generate a diff of this commit: cvs rdiff -u -r1.197 -r1.198 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.160 -r1.161 src/distrib/sets/lists/debug/shl.mi 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/openssl/lib/libcrypto/arch/m68k
Module Name:src Committed By: rin Date: Wed Feb 8 21:43:53 UTC 2017 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: aes.inc Log Message: Do not use the assembler version of AES routines for m68000; they contain instructions available for 68020 and later. Fix sun2 build. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/aes.inc 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/openssl/lib/libcrypto/arch/m68k
Module Name:src
Committed By: rin
Date: Wed Feb 8 21:43:53 UTC 2017
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k: aes.inc
Log Message:
Do not use the assembler version of AES routines for m68000; they contain
instructions available for 68020 and later.
Fix sun2 build.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/aes.inc
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/openssl/lib/libcrypto/arch/m68k/aes.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/aes.inc:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/aes.inc:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/aes.inc:1.1 Tue Feb 7 11:18:43 2017
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/m68k/aes.inc Wed Feb 8 21:43:53 2017
@@ -1,4 +1,6 @@
+.if ${MACHINE_ARCH} != "m68000"
.PATH.S: ${.PARSEDIR}
AES_SRCS = aes-m68k.S aes_cbc.c
AESCPPFLAGS = -DAES_ASM
+.endif
.include "../../aes.inc"
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Wed Feb 8 21:33:12 UTC 2017 Modified Files: src/usr.sbin/makefs: udf.c src/usr.sbin/makefs/cd9660: cd9660_conversion.c Log Message: If we are using a timestamp from the command line, don't pay attention to the user timezone, use UTC instead (for reproducible builds). To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/makefs/udf.c cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/makefs/cd9660/cd9660_conversion.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Wed Feb 8 21:33:12 UTC 2017
Modified Files:
src/usr.sbin/makefs: udf.c
src/usr.sbin/makefs/cd9660: cd9660_conversion.c
Log Message:
If we are using a timestamp from the command line, don't pay attention to
the user timezone, use UTC instead (for reproducible builds).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/usr.sbin/makefs/udf.c
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/makefs/cd9660/cd9660_conversion.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/udf.c
diff -u src/usr.sbin/makefs/udf.c:1.17 src/usr.sbin/makefs/udf.c:1.18
--- src/usr.sbin/makefs/udf.c:1.17 Tue Jun 16 19:04:14 2015
+++ src/usr.sbin/makefs/udf.c Wed Feb 8 16:33:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.c,v 1.17 2015/06/16 23:04:14 christos Exp $ */
+/* $NetBSD: udf.c,v 1.18 2017/02/08 21:33:12 christos Exp $ */
/*
* Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -30,7 +30,7 @@
#endif
#include
-__RCSID("$NetBSD: udf.c,v 1.17 2015/06/16 23:04:14 christos Exp $");
+__RCSID("$NetBSD: udf.c,v 1.18 2017/02/08 21:33:12 christos Exp $");
#include
#include
@@ -290,9 +290,6 @@ udf_update_trackinfo(struct mmc_discinfo
void
udf_prep_opts(fsinfo_t *fsopts)
{
- struct tm *tm;
- time_t now;
-
const option_t udf_options[] = {
OPT_STR('T', "disctype", "disc type (cdrom,dvdrom,bdrom,"
"dvdram,bdre,disk,cdr,dvdr,bdr,cdrw,dvdrw)"),
@@ -330,13 +327,16 @@ udf_prep_opts(fsinfo_t *fsopts)
context.max_udf = 0x201; /* 0x250 and 0x260 are not ready */
/* use user's time zone as default */
- (void)time();
- tm = localtime();
#ifdef HAVE_STRUCT_TM_TM_GMTOFF
- context.gmtoff = tm->tm_gmtoff;
-#else
- context.gmtoff = 0;
+ if (!stampst.st_ino) {
+ struct tm tm;
+ time_t now;
+ (void)time();
+ (void)localtime_r(, );
+ context.gmtoff = tm.tm_gmtoff;
+ } else
#endif
+ context.gmtoff = 0;
/* return info */
fsopts->fs_specific = NULL;
Index: src/usr.sbin/makefs/cd9660/cd9660_conversion.c
diff -u src/usr.sbin/makefs/cd9660/cd9660_conversion.c:1.4 src/usr.sbin/makefs/cd9660/cd9660_conversion.c:1.5
--- src/usr.sbin/makefs/cd9660/cd9660_conversion.c:1.4 Wed Mar 14 10:11:17 2007
+++ src/usr.sbin/makefs/cd9660/cd9660_conversion.c Wed Feb 8 16:33:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cd9660_conversion.c,v 1.4 2007/03/14 14:11:17 christos Exp $ */
+/* $NetBSD: cd9660_conversion.c,v 1.5 2017/02/08 21:33:12 christos Exp $ */
/*
* Copyright (c) 2005 Daniel Watt, Walter Deignan, Ryan Gabrys, Alan
@@ -35,7 +35,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: cd9660_conversion.c,v 1.4 2007/03/14 14:11:17 christos Exp $");
+__RCSID("$NetBSD: cd9660_conversion.c,v 1.5 2017/02/08 21:33:12 christos Exp $");
#endif /* !__lint */
@@ -150,6 +150,9 @@ cd9660_pad_string_spaces(char *str, int
static char
cd9660_compute_gm_offset(time_t tim)
{
+ if (stampst.st_ino)
+ return 0;
+
struct tm t, gm;
(void)localtime_r(, );
@@ -173,7 +176,10 @@ cd9660_time_8426(unsigned char *buf, tim
struct tm t;
char temp[18];
- (void)localtime_r(, );
+ if (stampst.st_ino)
+ (void)gmtime_r(, );
+ else
+ (void)localtime_r(, );
(void)snprintf(temp, sizeof(temp), "%04i%02i%02i%02i%02i%02i%02i",
1900+(int)t.tm_year,
(int)t.tm_mon+1,
@@ -192,7 +198,10 @@ cd9660_time_915(unsigned char *buf, time
{
struct tm t;
- (void)localtime_r(, );
+ if (stampst.st_ino)
+ (void)gmtime_r(, );
+ else
+ (void)localtime_r(, );
buf[0] = t.tm_year;
buf[1] = t.tm_mon+1;
buf[2] = t.tm_mday;
CVS commit: src/usr.sbin/makefs
Module Name:src Committed By: christos Date: Wed Feb 8 21:27:26 UTC 2017 Modified Files: src/usr.sbin/makefs: ffs.c Log Message: stampst.st_ion consistent treatment (non-zero vs zero instead of testing == 1) To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/usr.sbin/makefs/ffs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs
Module Name:src
Committed By: christos
Date: Wed Feb 8 21:27:26 UTC 2017
Modified Files:
src/usr.sbin/makefs: ffs.c
Log Message:
stampst.st_ion consistent treatment (non-zero vs zero instead of testing == 1)
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/usr.sbin/makefs/ffs.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/ffs.c
diff -u src/usr.sbin/makefs/ffs.c:1.68 src/usr.sbin/makefs/ffs.c:1.69
--- src/usr.sbin/makefs/ffs.c:1.68 Tue Feb 7 21:23:45 2017
+++ src/usr.sbin/makefs/ffs.c Wed Feb 8 16:27:26 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.68 2017/02/08 02:23:45 christos Exp $ */
+/* $NetBSD: ffs.c,v 1.69 2017/02/08 21:27:26 christos Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -71,7 +71,7 @@
#include
#if defined(__RCSID) && !defined(__lint)
-__RCSID("$NetBSD: ffs.c,v 1.68 2017/02/08 02:23:45 christos Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.69 2017/02/08 21:27:26 christos Exp $");
#endif /* !__lint */
#include
@@ -532,7 +532,7 @@ ffs_create_image(const char *image, fsin
if (debug & DEBUG_FS_CREATE_IMAGE)
printf("calling mkfs(\"%s\", ...)\n", image);
- if (stampst.st_ino == 1)
+ if (stampst.st_ino)
tstamp = stampst.st_ctime;
else
tstamp = start_time.tv_sec;
@@ -646,7 +646,7 @@ ffs_build_dinode1(struct ufs1_dinode *di
{
size_t slen;
void *membuf;
- struct stat *st = stampst.st_ino == 1 ? : >inode->st;
+ struct stat *st = stampst.st_ino ? : >inode->st;
memset(dinp, 0, sizeof(*dinp));
dinp->di_mode = cur->inode->st.st_mode;
@@ -696,7 +696,7 @@ ffs_build_dinode2(struct ufs2_dinode *di
{
size_t slen;
void *membuf;
- struct stat *st = stampst.st_ino == 1 ? : >inode->st;
+ struct stat *st = stampst.st_ino ? : >inode->st;
memset(dinp, 0, sizeof(*dinp));
dinp->di_mode = cur->inode->st.st_mode;
CVS commit: src
Module Name:src Committed By: maya Date: Wed Feb 8 20:26:27 UTC 2017 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi src/lib/libc: shlib_version Log Message: minor bump libc for accept4 To generate a diff of this commit: cvs rdiff -u -r1.800 -r1.801 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.270 -r1.271 src/lib/libc/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Wed Feb 8 20:26:27 UTC 2017 Modified Files: src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/debug: shl.mi src/lib/libc: shlib_version Log Message: minor bump libc for accept4 To generate a diff of this commit: cvs rdiff -u -r1.800 -r1.801 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.159 -r1.160 src/distrib/sets/lists/debug/shl.mi cvs rdiff -u -r1.270 -r1.271 src/lib/libc/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.800 src/distrib/sets/lists/base/shl.mi:1.801 --- src/distrib/sets/lists/base/shl.mi:1.800 Wed Feb 8 03:44:40 2017 +++ src/distrib/sets/lists/base/shl.mi Wed Feb 8 20:26:26 2017 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.800 2017/02/08 03:44:40 kamil Exp $ +# $NetBSD: shl.mi,v 1.801 2017/02/08 20:26:26 maya Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -18,7 +18,7 @@ ./lib/libblacklist.so.0.0 base-sys-shlib dynamicroot ./lib/libc.so base-sys-shlib dynamicroot ./lib/libc.so.12base-sys-shlib dynamicroot -./lib/libc.so.12.205base-sys-shlib dynamicroot +./lib/libc.so.12.206base-sys-shlib dynamicroot ./lib/libcrypt.sobase-sys-shlib dynamicroot ./lib/libcrypt.so.1base-sys-shlib dynamicroot ./lib/libcrypt.so.1.0base-sys-shlib dynamicroot @@ -214,7 +214,7 @@ ./usr/lib/libc++.so.1.0base-sys-shlib compatfile,libcxx ./usr/lib/libc.sobase-sys-shlib compatfile ./usr/lib/libc.so.12base-sys-shlib compatfile -./usr/lib/libc.so.12.205 base-sys-shlib compatfile +./usr/lib/libc.so.12.206 base-sys-shlib compatfile ./usr/lib/libcdk.sobase-obsolete compatfile,obsolete ./usr/lib/libcom_err.sobase-krb5-shlib compatfile,kerberos ./usr/lib/libcom_err.so.8 base-krb5-shlib compatfile,kerberos Index: src/distrib/sets/lists/debug/shl.mi diff -u src/distrib/sets/lists/debug/shl.mi:1.159 src/distrib/sets/lists/debug/shl.mi:1.160 --- src/distrib/sets/lists/debug/shl.mi:1.159 Wed Feb 8 03:44:41 2017 +++ src/distrib/sets/lists/debug/shl.mi Wed Feb 8 20:26:26 2017 @@ -1,7 +1,7 @@ -# $NetBSD: shl.mi,v 1.159 2017/02/08 03:44:41 kamil Exp $ +# $NetBSD: shl.mi,v 1.160 2017/02/08 20:26:26 maya Exp $ ./usr/libdata/debug/lib base-sys-usr debug,dynamicroot,compatdir ./usr/libdata/debug/lib/libblacklist.so.0.0.debug comp-sys-debug debug,dynamicroot -./usr/libdata/debug/lib/libc.so.12.205.debug comp-sys-debug debug,dynamicroot +./usr/libdata/debug/lib/libc.so.12.206.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypt.so.1.0.debug comp-sys-debug debug,dynamicroot ./usr/libdata/debug/lib/libcrypto.so.12.0.debug comp-sys-debug debug,dynamicroot,crypto ./usr/libdata/debug/lib/libdevmapper.so.1.0.debug comp-sys-debug debug,dynamicroot @@ -69,7 +69,7 @@ ./usr/libdata/debug/usr/lib/libbsdmalloc.so.0.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libbz2.so.1.1.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libc++.so.1.0.debug comp-sys-debug debug,compatfile,libcxx -./usr/libdata/debug/usr/lib/libc.so.12.205.debug comp-sys-debug debug,compatfile +./usr/libdata/debug/usr/lib/libc.so.12.206.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libcom_err.so.8.0.debug comp-krb5-debug debug,compatfile,kerberos ./usr/libdata/debug/usr/lib/libcrypt.so.1.0.debug comp-sys-debug debug,compatfile ./usr/libdata/debug/usr/lib/libcrypto.so.12.0.debug comp-crypto-debug debug,compatfile,crypto Index: src/lib/libc/shlib_version diff -u src/lib/libc/shlib_version:1.270 src/lib/libc/shlib_version:1.271 --- src/lib/libc/shlib_version:1.270 Tue Feb 7 15:33:25 2017 +++ src/lib/libc/shlib_version Wed Feb 8 20:26:26 2017 @@ -1,4 +1,4 @@ -# $NetBSD: shlib_version,v 1.270 2017/02/07 15:33:25 kamil Exp $ +# $NetBSD: shlib_version,v 1.271 2017/02/08 20:26:26 maya Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # # things we wish to do on next major version bump: @@ -47,4 +47,4 @@ # - boot obsolete signal functions to libcompat # - remove exect(3) API - tracing functionality has been moved to the kernel major=12 -minor=205 +minor=206
CVS commit: src
Module Name:src
Committed By: rin
Date: Wed Feb 8 20:11:18 UTC 2017
Modified Files:
src/distrib/zaurus/ramdisk: Makefile
src/sys/arch/zaurus/conf: INSTALL
Log Message:
Shrink the ramdisk of INSTALL kernel for zaurus in order to fit within 5MB.
Now free spaces of the main kernel and ramdisk are about 62KB and 215KB for
INSTALL, respectively.
OK christos
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/zaurus/ramdisk/Makefile
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/zaurus/conf/INSTALL
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/zaurus/ramdisk/Makefile
diff -u src/distrib/zaurus/ramdisk/Makefile:1.21 src/distrib/zaurus/ramdisk/Makefile:1.22
--- src/distrib/zaurus/ramdisk/Makefile:1.21 Tue Jan 24 18:04:05 2017
+++ src/distrib/zaurus/ramdisk/Makefile Wed Feb 8 20:11:18 2017
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2017/01/24 18:04:05 christos Exp $
+# $NetBSD: Makefile,v 1.22 2017/02/08 20:11:18 rin Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
IMAGE= ramdisk.fs
-IMAGESIZE= 2256k
+IMAGESIZE= 2176k
MAKEFS_FLAGS+= -f 14
WARNS= 1
Index: src/sys/arch/zaurus/conf/INSTALL
diff -u src/sys/arch/zaurus/conf/INSTALL:1.31 src/sys/arch/zaurus/conf/INSTALL:1.32
--- src/sys/arch/zaurus/conf/INSTALL:1.31 Mon Jan 30 02:41:12 2017
+++ src/sys/arch/zaurus/conf/INSTALL Wed Feb 8 20:11:18 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.31 2017/01/30 02:41:12 nonaka Exp $
+# $NetBSD: INSTALL,v 1.32 2017/02/08 20:11:18 rin Exp $
#
# INSTALL config file (GENERIC with memory disk root)
#
@@ -9,7 +9,7 @@ include "arch/zaurus/conf/GENERIC"
options MEMORY_DISK_HOOKS # enable root ramdisk
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=4516 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=4352 # size of memory disk, in blocks
options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode
# for reduce kernel size.
CVS commit: src
Module Name:src Committed By: rin Date: Wed Feb 8 20:11:18 UTC 2017 Modified Files: src/distrib/zaurus/ramdisk: Makefile src/sys/arch/zaurus/conf: INSTALL Log Message: Shrink the ramdisk of INSTALL kernel for zaurus in order to fit within 5MB. Now free spaces of the main kernel and ramdisk are about 62KB and 215KB for INSTALL, respectively. OK christos To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/distrib/zaurus/ramdisk/Makefile cvs rdiff -u -r1.31 -r1.32 src/sys/arch/zaurus/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: kre Date: Wed Feb 8 18:53:01 UTC 2017 Modified Files: src/sys/arch/i386/i386: gdt.c Log Message: Analagous fix to that just committed to the equiv amd64 sources. Note: this one has yet to be compile tested, so anything is possible... To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/i386/i386/gdt.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/arch/i386/i386/gdt.c diff -u src/sys/arch/i386/i386/gdt.c:1.59 src/sys/arch/i386/i386/gdt.c:1.60 --- src/sys/arch/i386/i386/gdt.c:1.59 Wed Feb 8 10:08:26 2017 +++ src/sys/arch/i386/i386/gdt.c Wed Feb 8 18:53:01 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: gdt.c,v 1.59 2017/02/08 10:08:26 maxv Exp $ */ +/* $NetBSD: gdt.c,v 1.60 2017/02/08 18:53:01 kre Exp $ */ /*- * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.59 2017/02/08 10:08:26 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.60 2017/02/08 18:53:01 kre Exp $"); #include "opt_multiprocessor.h" #include "opt_xen.h" @@ -60,7 +60,9 @@ int gdt_free[2]; /* next free slot; term static int ldt_count; /* number of LDTs */ static int ldt_max = 1000;/* max number of LDTs */ +#ifndef XEN static void setgdt(int, const void *, size_t, int, int, int, int); +#endif void gdt_init(void); static void gdt_grow(int); static int gdt_get_slot1(int); @@ -82,6 +84,7 @@ update_descriptor(union descriptor *tabl #endif } +#ifndef XEN /* * Called on a newly-allocated GDT slot, so no race between CPUs. */ @@ -106,6 +109,7 @@ setgdt(int sel, const void *base, size_t (union descriptor *)sd); } } +#endif /* * Initialize the GDT. We already have a gdtstore, which was temporarily used
CVS commit: src/sys/arch/i386/i386
Module Name:src Committed By: kre Date: Wed Feb 8 18:53:01 UTC 2017 Modified Files: src/sys/arch/i386/i386: gdt.c Log Message: Analagous fix to that just committed to the equiv amd64 sources. Note: this one has yet to be compile tested, so anything is possible... To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/arch/i386/i386/gdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: kre Date: Wed Feb 8 18:50:52 UTC 2017 Modified Files: src/sys/arch/amd64/amd64: gdt.c Log Message: All bow down before the Great Code Compiler. Specifically, it has been commanded that unused-functions is a warning, and, as all should know, all warnings be errors. Hence, since XEN kernels do not call set_sys_gdt(), that function may not be included (and the XEN kernel saves a few tens of bytes.) An alternate fix would be to just remove "static" - but that would be the equivalent to just giving the compiler the finger ... hmm, maybe that would have been a better fix... To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amd64/amd64/gdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: kre Date: Wed Feb 8 18:50:52 UTC 2017 Modified Files: src/sys/arch/amd64/amd64: gdt.c Log Message: All bow down before the Great Code Compiler. Specifically, it has been commanded that unused-functions is a warning, and, as all should know, all warnings be errors. Hence, since XEN kernels do not call set_sys_gdt(), that function may not be included (and the XEN kernel saves a few tens of bytes.) An alternate fix would be to just remove "static" - but that would be the equivalent to just giving the compiler the finger ... hmm, maybe that would have been a better fix... To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/sys/arch/amd64/amd64/gdt.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/arch/amd64/amd64/gdt.c diff -u src/sys/arch/amd64/amd64/gdt.c:1.36 src/sys/arch/amd64/amd64/gdt.c:1.37 --- src/sys/arch/amd64/amd64/gdt.c:1.36 Wed Feb 8 10:08:26 2017 +++ src/sys/arch/amd64/amd64/gdt.c Wed Feb 8 18:50:51 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: gdt.c,v 1.36 2017/02/08 10:08:26 maxv Exp $ */ +/* $NetBSD: gdt.c,v 1.37 2017/02/08 18:50:51 kre Exp $ */ /*- * Copyright (c) 1996, 1997, 2009 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.36 2017/02/08 10:08:26 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gdt.c,v 1.37 2017/02/08 18:50:51 kre Exp $"); #include "opt_multiprocessor.h" #include "opt_xen.h" @@ -63,7 +63,9 @@ int gdt_dynavail; int gdt_next; /* next available slot for sweeping */ int gdt_free; /* next free slot; terminated with GNULL_SEL */ +#if defined(USER_LDT) || !defined(XEN) static void set_sys_gdt(int, void *, size_t, int, int, int); +#endif void gdt_init(void); void @@ -85,6 +87,7 @@ update_descriptor(void *tp, void *ep) #endif } +#if defined(USER_LDT) || !defined(XEN) /* * Called on a newly-allocated GDT slot, so no race between CPUs. */ @@ -107,6 +110,7 @@ set_sys_gdt(int slot, void *base, size_t update_descriptor(>ci_gdt[idx + 1], [1]); } } +#endif /* USER_LDT || !XEN */ /* * Initialize the GDT. We already have a gdtstore, which was temporarily used
CVS commit: src/distrib/sets
Module Name:src
Committed By: christos
Date: Wed Feb 8 18:21:23 UTC 2017
Modified Files:
src/distrib/sets: sets.subr
Log Message:
Document sets programmatically instead of keeping a list that constantly is
out of date.
To generate a diff of this commit:
cvs rdiff -u -r1.178 -r1.179 src/distrib/sets/sets.subr
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/sets.subr
diff -u src/distrib/sets/sets.subr:1.178 src/distrib/sets/sets.subr:1.179
--- src/distrib/sets/sets.subr:1.178 Fri Aug 19 06:23:26 2016
+++ src/distrib/sets/sets.subr Wed Feb 8 13:21:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.178 2016/08/19 10:23:26 mrg Exp $
+# $NetBSD: sets.subr,v 1.179 2017/02/08 18:21:23 christos Exp $
#
#
@@ -179,7 +179,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.178 2016/08/19 10:23:26 mrg Exp $
+# # $NetBSD: sets.subr,v 1.179 2017/02/08 18:21:23 christos Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -194,90 +194,43 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
#
# The third field is an optional comma separated list of keywords to
# control if a record is printed; every keyword listed must be enabled
-# for the record to be printed. The following keywords are available:
-# dummy dummy entry (ignored)
-# obsolete file is obsolete, and only printed if
-#${obsolete} != 0
+# for the record to be printed. The list of all avalaible make variables
+# that can be turned on or off can be found by running in this directory:
#
-# atf ${MKATF} != no
-# bfd obsolete, use binutils.
-# binutils ${MKBINUTILS} != no
-# bsdgrep ${MKBSDGREP} != no
-# catpages ${MKCATPAGES} != no
-# compat ${MKCOMPAT} != no
-# compatmodules ${MKCOMPATMODULES} != no
-# compattests ${MKCOMPATTESTS} != no
-# crypto ${MKCRYPTO} != no
-# crypto_rc5 ${MKCRYPTO_RC5} != no
-# ctf ${MKCTF} != no
-# cvs ${MKCVS} != no
-# debug ${MKDEBUG} != no
-# debuglib ${MKDEBUGLIB} != no
-# doc ${MKDOC} != no
-# dtrace ${MKDTRACE} != no
-# dynamicroot ${MKDYNAMICROOT} != no
-# extsrc ${MKEXTSRC} != no
-# gcc ${MKGCC} != no
-# gcccmds ${MKGCCCMDS} != no
-# gdb ${MKGDB} != no
-# hesiod ${MKHESIOD} != no
-# html ${MKHTML} != no
-# inet6 ${MKINET6} != no
-# info ${MKINFO} != no
-# ipfilter ${MKIPFILTER} != no
-# iscsi ${MKISCSI} != no
-# kerberos ${MKKERBEROS} != no
-# kmod ${MKKMOD} != no
-# kyua ${MKKYUA} != no
-# ldap ${MKLDAP} != no
-# lint ${MKLINT} != no
-# libcxx ${MKLIBCXX} != no
-# libgcc_eh ${HAVE_LIBGCC_EH} != no
-# libstdcxx ${MKLIBSTDCXX} != no
-# lld ${MKLLD} != no
-# lldb ${MKLLDB} != no
-# llvm ${MKLLVM} != no
-# lvm ${MKLVM} != no
-# makemandb ${MKMAKEMANDB} != no
-# man ${MKMAN} != no
-# manpages ${MKMANPAGES} != no
-# manz ${MKMANZ} != no
-# mclinker ${MKMCLINKER} != no
-# mdns ${MKMDNS} != no
-# nls ${MKNLS} != no
-# nvi ${MKNVI} != no
-# pam ${MKPAM} != no
-# pcc ${MKPCC} != no
-# pf ${MKPF} != no
-# pic ${MKPIC} != no
-# picinstall ${MKPICINSTALL} != no
-# pigzgzip ${MKPIGZGZIP} != no
-# postfix ${MKPOSTFIX} != no
-# profile ${MKPROFILE} != no
-# perfuse ${MKPERFUSE} != no
-# rump ${MKRUMP} != no
-# share ${MKSHARE} != no
-# skey ${MKSKEY} != no
-# sljit ${MKSLJIT} != no
-# softfloat ${MKSOFTFLOAT} != no
-# solaris ${MKDTRACE} != no or ${MKZFS} != no or ${MKCTF} != no
-# ssp ${HAVE_SSP} != no
-# tpm ${MKTPM} != no
-# xorg ${MKX11} != no
-# xorg_server ${MKXORG_SERVER} != no
-# yp ${MKYP} != no
-# zfs ${MKZFS} != no
+# make -f mkvars.mk mkvarsyesno
#
-# endian= = value of ${TARGET_ENDIANNESS}
+# These MK variables can be used as selectors in the sets as .
+#
+# The following extra keywords are also available, listed by:
+#
+# make -f mkvars.mk mkextravars
+#
+# These are:
+#1. The HAVE_:
+# ssp ${HAVE_SSP} != no
+# libgcc_eh ${HAVE_LIBGCC_EH} != no
# binutils= = value of ${HAVE_BINUTILS}
# gcc= = value of ${HAVE_GCC}
# gdb= = value of ${HAVE_GDB}
# xorg_server_ver= = value of ${HAVE_XORG_SERVER_VER}
#
+#2. The USE_:
# use_inet6 ${USE_INET6} != no
# use_kerberos ${USE_KERBEROS} != no
+# use_ldap ${USE_LDAP} != no
# use_yp ${USE_YP} != no
#
+#3. Finally:
+# dummy dummy entry (ignored)
+# obsolete file is obsolete, and only printed if
+#${obsolete} != 0
+#
+# solaris ${MKDTRACE} != no or ${MKZFS} != no or ${MKCTF} != no
+#
+#
+# endian= = value of ${TARGET_ENDIANNESS}
+#
+#
# .cat if ${MKMANZ} != "no" && ${MKCATPAGES} != "no"
# automatically append ".gz" to the filename
#
CVS commit: src/distrib/sets
Module Name:src Committed By: christos Date: Wed Feb 8 18:21:23 UTC 2017 Modified Files: src/distrib/sets: sets.subr Log Message: Document sets programmatically instead of keeping a list that constantly is out of date. To generate a diff of this commit: cvs rdiff -u -r1.178 -r1.179 src/distrib/sets/sets.subr Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin
Module Name:src Committed By: rin Date: Wed Feb 8 18:05:25 UTC 2017 Modified Files: src/sbin/fsck_ffs: fsck.h src/sbin/newfs: extern.h Log Message: __empty -> __nothing To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sbin/fsck_ffs/fsck.h cvs rdiff -u -r1.17 -r1.18 src/sbin/newfs/extern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/fsck_ffs/fsck.h diff -u src/sbin/fsck_ffs/fsck.h:1.51 src/sbin/fsck_ffs/fsck.h:1.52 --- src/sbin/fsck_ffs/fsck.h:1.51 Wed Feb 8 16:23:24 2017 +++ src/sbin/fsck_ffs/fsck.h Wed Feb 8 18:05:25 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: fsck.h,v 1.51 2017/02/08 16:23:24 christos Exp $ */ +/* $NetBSD: fsck.h,v 1.52 2017/02/08 18:05:25 rin Exp $ */ /* * Copyright (c) 1980, 1986, 1993 @@ -307,11 +307,11 @@ int do_dirswap; /* need to do dir entry #define needswap (0) #define do_blkswap (0) #define do_dirswap (0) -#define ffs_cg_swap(a, b, c) __empty -#define ffs_csum_swap(a, b, c) __empty -#define ffs_sb_swap(a, b) __empty -#define swap_dinode1(a, b) __empty -#define swap_dinode2(a, b) __empty +#define ffs_cg_swap(a, b, c) __nothing +#define ffs_csum_swap(a, b, c) __nothing +#define ffs_sb_swap(a, b) __nothing +#define swap_dinode1(a, b) __nothing +#define swap_dinode2(a, b) __nothing #endif #ifndef NO_APPLE_UFS Index: src/sbin/newfs/extern.h diff -u src/sbin/newfs/extern.h:1.17 src/sbin/newfs/extern.h:1.18 --- src/sbin/newfs/extern.h:1.17 Wed Feb 8 16:56:56 2017 +++ src/sbin/newfs/extern.h Wed Feb 8 18:05:25 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: extern.h,v 1.17 2017/02/08 16:56:56 rin Exp $ */ +/* $NetBSD: extern.h,v 1.18 2017/02/08 18:05:25 rin Exp $ */ /* * Copyright (c) 1997 Christos Zoulas. All rights reserved. @@ -59,10 +59,10 @@ extern int needswap; /* Filesystem not i #else /* Disable Endian-Independent FFS support for install media */ #define needswap (0) -#define ffs_cg_swap(a, b, c) __empty -#define ffs_csum_swap(a, b, c) __empty -#define ffs_dinode1_swap(a, b) __empty -#define ffs_sb_swap(a, b) __empty +#define ffs_cg_swap(a, b, c) __nothing +#define ffs_csum_swap(a, b, c) __nothing +#define ffs_dinode1_swap(a, b) __nothing +#define ffs_sb_swap(a, b) __nothing #endif #ifndef NO_APPLE_UFS
CVS commit: src/sbin
Module Name:src Committed By: rin Date: Wed Feb 8 18:05:25 UTC 2017 Modified Files: src/sbin/fsck_ffs: fsck.h src/sbin/newfs: extern.h Log Message: __empty -> __nothing To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sbin/fsck_ffs/fsck.h cvs rdiff -u -r1.17 -r1.18 src/sbin/newfs/extern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src
Committed By: maya
Date: Wed Feb 8 18:03:57 UTC 2017
Modified Files:
src/lib/libc/sys: accept4.c
Log Message:
oops, do not write the same file twice -- accidentally ran patch twice
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/sys/accept4.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/libc/sys/accept4.c
diff -u src/lib/libc/sys/accept4.c:1.1 src/lib/libc/sys/accept4.c:1.2
--- src/lib/libc/sys/accept4.c:1.1 Wed Feb 8 17:58:41 2017
+++ src/lib/libc/sys/accept4.c Wed Feb 8 18:03:57 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $ */
+/* $NetBSD: accept4.c,v 1.2 2017/02/08 18:03:57 maya Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -27,49 +27,7 @@
*/
#include
-__RCSID("$NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $");
-
-#include "namespace.h"
-#include
-
-#include
-
-int
-accept4(int s, struct sockaddr * restrict addr, socklen_t * restrict addrlen,
-int flags)
-{
- return paccept(s, addr, addrlen, NULL, flags);
-}
-/* $NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $ */
-
-/*-
- * Copyright (c) 2017 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include
-__RCSID("$NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $");
+__RCSID("$NetBSD: accept4.c,v 1.2 2017/02/08 18:03:57 maya Exp $");
#include "namespace.h"
#include
CVS commit: src/lib/libc/sys
Module Name:src Committed By: maya Date: Wed Feb 8 18:03:57 UTC 2017 Modified Files: src/lib/libc/sys: accept4.c Log Message: oops, do not write the same file twice -- accidentally ran patch twice To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/sys/accept4.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: maya Date: Wed Feb 8 18:01:24 UTC 2017 Modified Files: src/lib/libc/sys: accept.2 Log Message: Document accept4 in accept(2) To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/sys/accept.2 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/sys/accept.2 diff -u src/lib/libc/sys/accept.2:1.31 src/lib/libc/sys/accept.2:1.32 --- src/lib/libc/sys/accept.2:1.31 Fri Aug 2 20:13:09 2013 +++ src/lib/libc/sys/accept.2 Wed Feb 8 18:01:24 2017 @@ -1,4 +1,4 @@ -.\" $NetBSD: accept.2,v 1.31 2013/08/02 20:13:09 wiz Exp $ +.\" $NetBSD: accept.2,v 1.32 2017/02/08 18:01:24 maya Exp $ .\" .\" Copyright (c) 1983, 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,11 +29,12 @@ .\" .\" @(#)accept.2 8.2 (Berkeley) 12/11/93 .\" -.Dd March 19, 2012 +.Dd February 8, 2017 .Dt ACCEPT 2 .Os .Sh NAME .Nm accept , +.Nm accept4 , .Nm paccept .Nd accept a connection on a socket .Sh LIBRARY @@ -43,6 +44,8 @@ .Ft int .Fn accept "int s" "struct sockaddr * restrict addr" "socklen_t * restrict addrlen" .Ft int +.Fn accept4 "int s" "struct sockaddr * restrict addr" "socklen_t * restrict addrlen" "int flags" +.Ft int .Fn paccept "int s" "struct sockaddr * restrict addr" "socklen_t * restrict addrlen" "const sigset_t * restrict sigmask" "int flags" .Sh DESCRIPTION The argument @@ -136,6 +139,11 @@ or by calling .Xr setsockopt 2 . .Pp The +.Fn accept4 +function is equivalent to paccept with sigmask +.Dv NULL . +.Pp +The .Fn paccept function behaves exactly like .Fn accept , @@ -184,6 +192,10 @@ It's a traditional behaviour for BSD der On the other hand, there are implementations which don't do so. Linux is an example of such implementations. Portable programs should not rely on either of the behaviours. +The +.Pp +.Fn accept4 +function is compatible with the Linux implementation. .Sh ERRORS The .Fn accept @@ -233,6 +245,10 @@ The function appeared in .Bx 4.2 . The +.Fn accept4 +function matches Linux semantics and appeared in +.Nx 8.0 . +The .Fn paccept function is inspired from Linux and appeared in .Nx 6.0 .
CVS commit: src/lib/libc/sys
Module Name:src Committed By: maya Date: Wed Feb 8 18:01:24 UTC 2017 Modified Files: src/lib/libc/sys: accept.2 Log Message: Document accept4 in accept(2) To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libc/sys/accept.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: christos Date: Wed Feb 8 18:01:12 UTC 2017 Modified Files: src/sys/arch/ia64/include: cpu.h Log Message: __empty -> __nothing To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/include
Module Name:src
Committed By: christos
Date: Wed Feb 8 18:01:12 UTC 2017
Modified Files:
src/sys/arch/ia64/include: cpu.h
Log Message:
__empty -> __nothing
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/include/cpu.h
diff -u src/sys/arch/ia64/include/cpu.h:1.14 src/sys/arch/ia64/include/cpu.h:1.15
--- src/sys/arch/ia64/include/cpu.h:1.14 Wed Feb 8 11:14:08 2017
+++ src/sys/arch/ia64/include/cpu.h Wed Feb 8 13:01:12 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.14 2017/02/08 16:14:08 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.15 2017/02/08 18:01:12 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -155,7 +155,7 @@ struct clockframe {
* out what to do about this.. XXX.
*/
/* extern void cpu_need_proftick(struct lwp *l); */
-#define cpu_need_proftick(l) __empty
+#define cpu_need_proftick(l) __nothing
/*
* Notify the LWP l that it has a signal pending, process as soon as possible.
@@ -168,14 +168,14 @@ struct clockframe {
__USE(f); \
} while(/*CONSTCOND*/0)
-#define setsoftclock()__empty /*XXX: FIXME */
+#define setsoftclock()__nothing /*XXX: FIXME */
/* machdep.c */
int cpu_maxproc(void); /*XXX: Fill in machdep.c */
-#define cpu_proc_fork(p1, p2) __empty /* XXX: Look into this. */
+#define cpu_proc_fork(p1, p2) __nothing /* XXX: Look into this. */
-#define DELAY(x) __empty /* XXX: FIXME */
+#define DELAY(x) __nothing /* XXX: FIXME */
static inline void cpu_idle(void);
static inline
CVS commit: src/lib/libc/include
Module Name:src Committed By: christos Date: Wed Feb 8 18:00:37 UTC 2017 Modified Files: src/lib/libc/include: reentrant.h Log Message: empty to nothing To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/include/reentrant.h 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/include/reentrant.h diff -u src/lib/libc/include/reentrant.h:1.19 src/lib/libc/include/reentrant.h:1.20 --- src/lib/libc/include/reentrant.h:1.19 Wed Feb 8 11:13:40 2017 +++ src/lib/libc/include/reentrant.h Wed Feb 8 13:00:37 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: reentrant.h,v 1.19 2017/02/08 16:13:40 christos Exp $ */ +/* $NetBSD: reentrant.h,v 1.20 2017/02/08 18:00:37 christos Exp $ */ /*- * Copyright (c) 1997, 1998, 2003 The NetBSD Foundation, Inc. @@ -278,35 +278,35 @@ __END_DECLS #else /* _REENTRANT */ -#define mutex_init(m, a) __empty -#define mutex_lock(m) __empty -#define mutex_trylock(m) __empty -#define mutex_unlock(m) __empty -#define mutex_destroy(m) __empty - -#define cond_init(c, t, a) __empty -#define cond_signal(c) __empty -#define cond_broadcast(c) __empty -#define cond_wait(c, m) __empty -#define cond_timedwait(c, m, t) __empty -#define cond_destroy(c) __empty - -#define rwlock_init(l, a) __empty -#define rwlock_rdlock(l) __empty -#define rwlock_wrlock(l) __empty -#define rwlock_tryrdlock(l) __empty -#define rwlock_trywrlock(l) __empty -#define rwlock_unlock(l) __empty -#define rwlock_destroy(l) __empty +#define mutex_init(m, a) __nothing +#define mutex_lock(m) __nothing +#define mutex_trylock(m) __nothing +#define mutex_unlock(m) __nothing +#define mutex_destroy(m) __nothing + +#define cond_init(c, t, a) __nothing +#define cond_signal(c) __nothing +#define cond_broadcast(c) __nothing +#define cond_wait(c, m) __nothing +#define cond_timedwait(c, m, t) __nothing +#define cond_destroy(c) __nothing + +#define rwlock_init(l, a) __nothing +#define rwlock_rdlock(l) __nothing +#define rwlock_wrlock(l) __nothing +#define rwlock_tryrdlock(l) __nothing +#define rwlock_trywrlock(l) __nothing +#define rwlock_unlock(l) __nothing +#define rwlock_destroy(l) __nothing #define thr_keycreate(k, d) /*LINTED*/0 -#define thr_setspecific(k, p) __empty +#define thr_setspecific(k, p) __nothing #define thr_getspecific(k) /*LINTED*/0 -#define thr_keydelete(k) __empty +#define thr_keydelete(k) __nothing -#define mutexattr_init(ma) __empty -#define mutexattr_settype(ma, t) __empty -#define mutexattr_destroy(ma) __empty +#define mutexattr_init(ma) __nothing +#define mutexattr_settype(ma, t) __nothing +#define mutexattr_destroy(ma) __nothing static inline int thr_once(once_t *once_control, void (*routine)(void)) @@ -317,12 +317,12 @@ thr_once(once_t *once_control, void (*ro } return 0; } -#define thr_sigsetmask(f, n, o) __empty -#define thr_self() __empty -#define thr_errno() __empty +#define thr_sigsetmask(f, n, o) __nothing +#define thr_self() __nothing +#define thr_errno() __nothing #define thr_curcpu() ((unsigned int)0) -#define FLOCKFILE(fp) __empty -#define FUNLOCKFILE(fp) __empty +#define FLOCKFILE(fp) __nothing +#define FUNLOCKFILE(fp) __nothing #endif /* _REENTRANT */
CVS commit: src/lib/libc/include
Module Name:src Committed By: christos Date: Wed Feb 8 18:00:37 UTC 2017 Modified Files: src/lib/libc/include: reentrant.h Log Message: empty to nothing To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/lib/libc/include/reentrant.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Wed Feb 8 17:59:35 UTC 2017
Modified Files:
src/sys/sys: cdefs.h
Log Message:
use __nothing instead since __empty is taken in stl_deque.h
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/sys/cdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/cdefs.h
diff -u src/sys/sys/cdefs.h:1.131 src/sys/sys/cdefs.h:1.132
--- src/sys/sys/cdefs.h:1.131 Wed Feb 8 11:26:19 2017
+++ src/sys/sys/cdefs.h Wed Feb 8 12:59:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.131 2017/02/08 16:26:19 christos Exp $ */
+/* $NetBSD: cdefs.h,v 1.132 2017/02/08 17:59:35 christos Exp $ */
/* * Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -312,13 +312,13 @@
* #ifdef DEBUG
* # define dprintf(a) printf(a)
* #else
- * # define dprintf(a) __empty
+ * # define dprintf(a) __nothing
* #endif
*
* We use ((void)0) instead of do {} while (0) so that it
* works on , expressions.
*/
-#define __empty ((void)0)
+#define __nothing ((void)0)
#if defined(__cplusplus)
#define __BEGIN_EXTERN_C extern "C" {
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Wed Feb 8 17:59:35 UTC 2017 Modified Files: src/sys/sys: cdefs.h Log Message: use __nothing instead since __empty is taken in stl_deque.h To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 src/sys/sys/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: maya Date: Wed Feb 8 17:58:41 UTC 2017 Modified Files: src/lib/libc/sys: Makefile.inc src/sys/sys: socket.h Added Files: src/lib/libc/sys: accept4.c Log Message: Add accept4, a tiny wrapper around paccept. accept4 is a syscall in Linux, FreeBSD and OpenBSD. It is used in LLVM, zeromq, and probably others. paccept is a superset of it. adding it to libc ensures it is used by programs and prevents the need to define the same wrapper in every program. To generate a diff of this commit: cvs rdiff -u -r1.233 -r1.234 src/lib/libc/sys/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/sys/accept4.c cvs rdiff -u -r1.120 -r1.121 src/sys/sys/socket.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: maya
Date: Wed Feb 8 17:58:41 UTC 2017
Modified Files:
src/lib/libc/sys: Makefile.inc
src/sys/sys: socket.h
Added Files:
src/lib/libc/sys: accept4.c
Log Message:
Add accept4, a tiny wrapper around paccept.
accept4 is a syscall in Linux, FreeBSD and OpenBSD. It is used in
LLVM, zeromq, and probably others. paccept is a superset of it.
adding it to libc ensures it is used by programs and prevents the
need to define the same wrapper in every program.
To generate a diff of this commit:
cvs rdiff -u -r1.233 -r1.234 src/lib/libc/sys/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/lib/libc/sys/accept4.c
cvs rdiff -u -r1.120 -r1.121 src/sys/sys/socket.h
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/sys/Makefile.inc
diff -u src/lib/libc/sys/Makefile.inc:1.233 src/lib/libc/sys/Makefile.inc:1.234
--- src/lib/libc/sys/Makefile.inc:1.233 Wed Feb 8 17:30:27 2017
+++ src/lib/libc/sys/Makefile.inc Wed Feb 8 17:58:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.233 2017/02/08 17:30:27 maya Exp $
+# $NetBSD: Makefile.inc,v 1.234 2017/02/08 17:58:41 maya Exp $
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
# sys sources
@@ -9,7 +9,7 @@ SRCS+= cpuset.c
# glue to offer userland wrappers for some syscalls
SRCS+= posix_fadvise.c posix_madvise.c sched.c sigqueue.c sigtimedwait.c \
sigwait.c sigwaitinfo.c statvfs.c swapon.c semctl.c \
- clock_getcpuclockid.c
+ clock_getcpuclockid.c accept4.c
.if ${RUMPRUN} != "yes"
# modules with non-default implementations on at least one architecture:
Index: src/sys/sys/socket.h
diff -u src/sys/sys/socket.h:1.120 src/sys/sys/socket.h:1.121
--- src/sys/sys/socket.h:1.120 Wed Sep 21 10:50:23 2016
+++ src/sys/sys/socket.h Wed Feb 8 17:58:41 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: socket.h,v 1.120 2016/09/21 10:50:23 roy Exp $ */
+/* $NetBSD: socket.h,v 1.121 2017/02/08 17:58:41 maya Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -644,6 +644,7 @@ __END_DECLS
__BEGIN_DECLS
int accept(int, struct sockaddr * __restrict, socklen_t * __restrict);
+int accept4(int, struct sockaddr * __restrict, socklen_t * __restrict, int);
int bind(int, const struct sockaddr *, socklen_t);
int connect(int, const struct sockaddr *, socklen_t);
int getpeername(int, struct sockaddr * __restrict, socklen_t * __restrict);
Added files:
Index: src/lib/libc/sys/accept4.c
diff -u /dev/null src/lib/libc/sys/accept4.c:1.1
--- /dev/null Wed Feb 8 17:58:41 2017
+++ src/lib/libc/sys/accept4.c Wed Feb 8 17:58:41 2017
@@ -0,0 +1,84 @@
+/* $NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $ */
+
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include
+__RCSID("$NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $");
+
+#include "namespace.h"
+#include
+
+#include
+
+int
+accept4(int s, struct sockaddr * restrict addr, socklen_t * restrict addrlen,
+int flags)
+{
+ return paccept(s, addr, addrlen, NULL, flags);
+}
+/* $NetBSD: accept4.c,v 1.1 2017/02/08 17:58:41 maya Exp $ */
+
+/*-
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions
CVS commit: src/distrib/sets/lists/misc
Module Name:src Committed By: christos Date: Wed Feb 8 17:51:21 UTC 2017 Modified Files: src/distrib/sets/lists/misc: mi Log Message: nsd is optional To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/distrib/sets/lists/misc/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/misc
Module Name:src Committed By: christos Date: Wed Feb 8 17:51:21 UTC 2017 Modified Files: src/distrib/sets/lists/misc: mi Log Message: nsd is optional To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/distrib/sets/lists/misc/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/misc/mi diff -u src/distrib/sets/lists/misc/mi:1.200 src/distrib/sets/lists/misc/mi:1.201 --- src/distrib/sets/lists/misc/mi:1.200 Tue Feb 7 17:37:18 2017 +++ src/distrib/sets/lists/misc/mi Wed Feb 8 12:51:21 2017 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.200 2017/02/07 22:37:18 christos Exp $ +# $NetBSD: mi,v 1.201 2017/02/08 17:51:21 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1463,7 +1463,7 @@ ./usr/share/examples/mount_portal/tcp.1 misc-sys-examples share ./usr/share/examples/mount_portal/tcp.1.conf misc-sys-examples share ./usr/share/examples/named/named.conf misc-obsolete obsolete -./usr/share/examples/nsd/nsd.conf misc-netutil-examples share +./usr/share/examples/nsd/nsd.conf misc-netutil-examples share,nsd ./usr/share/examples/openssl/CA.pl misc-crypto-examples crypto,share ./usr/share/examples/openssl/CA.sh misc-crypto-examples crypto,share ./usr/share/examples/openssl/der_chop misc-obsolete obsolete
CVS commit: src/usr.bin/make
Module Name:src
Committed By: christos
Date: Wed Feb 8 17:47:36 UTC 2017
Modified Files:
src/usr.bin/make: main.c
Log Message:
Use strncpy here because we need to be portable, and we have the +1 byte
to save us :-)
To generate a diff of this commit:
cvs rdiff -u -r1.256 -r1.257 src/usr.bin/make/main.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.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.256 src/usr.bin/make/main.c:1.257
--- src/usr.bin/make/main.c:1.256 Tue Feb 7 16:16:31 2017
+++ src/usr.bin/make/main.c Wed Feb 8 12:47:36 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.256 2017/02/07 21:16:31 christos Exp $ */
+/* $NetBSD: main.c,v 1.257 2017/02/08 17:47:36 christos Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.256 2017/02/07 21:16:31 christos Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.257 2017/02/08 17:47:36 christos Exp $";
#else
#include
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.256 2017/02/07 21:16:31 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.257 2017/02/08 17:47:36 christos Exp $");
#endif
#endif /* not lint */
#endif
@@ -449,7 +449,7 @@ rearg:
stat(curdir, ) != -1 &&
sa.st_ino == sb.st_ino &&
sa.st_dev == sb.st_dev)
-strlcpy(curdir, argvalue, MAXPATHLEN);
+strncpy(curdir, argvalue, MAXPATHLEN);
ignorePWD = TRUE;
break;
case 'D':
CVS commit: src/usr.bin/make
Module Name:src Committed By: christos Date: Wed Feb 8 17:47:36 UTC 2017 Modified Files: src/usr.bin/make: main.c Log Message: Use strncpy here because we need to be portable, and we have the +1 byte to save us :-) To generate a diff of this commit: cvs rdiff -u -r1.256 -r1.257 src/usr.bin/make/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc
Module Name:src Committed By: maya Date: Wed Feb 8 17:30:27 UTC 2017 Modified Files: src/lib/libc/include: namespace.h src/lib/libc/sys: Makefile.inc Log Message: Make paccept a weak symbol in preparation for using it in another function To generate a diff of this commit: cvs rdiff -u -r1.185 -r1.186 src/lib/libc/include/namespace.h cvs rdiff -u -r1.232 -r1.233 src/lib/libc/sys/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/include/namespace.h diff -u src/lib/libc/include/namespace.h:1.185 src/lib/libc/include/namespace.h:1.186 --- src/lib/libc/include/namespace.h:1.185 Fri Jan 13 14:41:27 2017 +++ src/lib/libc/include/namespace.h Wed Feb 8 17:30:27 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: namespace.h,v 1.185 2017/01/13 14:41:27 christos Exp $ */ +/* $NetBSD: namespace.h,v 1.186 2017/02/08 17:30:27 maya Exp $ */ /*- * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. @@ -524,6 +524,7 @@ #define pmap_rmtcall _pmap_rmtcall #define pmap_set _pmap_set #define pmap_unset _pmap_unset +#define paccept _paccept #define pollts _pollts #define popen _popen #define posix2time _posix2time Index: src/lib/libc/sys/Makefile.inc diff -u src/lib/libc/sys/Makefile.inc:1.232 src/lib/libc/sys/Makefile.inc:1.233 --- src/lib/libc/sys/Makefile.inc:1.232 Tue Feb 7 19:29:40 2017 +++ src/lib/libc/sys/Makefile.inc Wed Feb 8 17:30:27 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.232 2017/02/07 19:29:40 kamil Exp $ +# $NetBSD: Makefile.inc,v 1.233 2017/02/08 17:30:27 maya Exp $ # @(#)Makefile.inc 8.3 (Berkeley) 10/24/94 # sys sources @@ -130,7 +130,7 @@ ASM= access.S acct.S \ munmap.S \ nfssvc.S __ntp_gettime50.S \ openat.S \ - paccept.S pathconf.S pipe2.S pmc_get_info.S pmc_control.S \ + pathconf.S pipe2.S pmc_get_info.S pmc_control.S \ __posix_chown.S __posix_fchown.S __posix_lchown.S \ __posix_rename.S profil.S \ __quotactl.S \ @@ -170,7 +170,7 @@ WEAKASM= accept.S __aio_suspend50.S clos fcntl.S fdatasync.S fsync.S \ fsync_range.S __kevent50.S \ kill.S mq_receive.S mq_send.S __mq_timedreceive50.S __mq_timedsend50.S \ - msgrcv.S msgsnd.S __msync13.S __nanosleep50.S open.S poll.S \ + msgrcv.S msgsnd.S __msync13.S __nanosleep50.S open.S paccept.S poll.S \ __pollts50.S __pselect50.S read.S readlink.S \ readv.S _sched_setparam.S _sched_getparam.S _sched_setaffinity.S \ _sched_getaffinity.S sched_yield.S _sched_protect.S \
CVS commit: src/lib/libc
Module Name:src Committed By: maya Date: Wed Feb 8 17:30:27 UTC 2017 Modified Files: src/lib/libc/include: namespace.h src/lib/libc/sys: Makefile.inc Log Message: Make paccept a weak symbol in preparation for using it in another function To generate a diff of this commit: cvs rdiff -u -r1.185 -r1.186 src/lib/libc/include/namespace.h cvs rdiff -u -r1.232 -r1.233 src/lib/libc/sys/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs
Module Name:src Committed By: rin Date: Wed Feb 8 16:56:56 UTC 2017 Modified Files: src/sbin/newfs: extern.h Log Message: switch to __empty To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sbin/newfs/extern.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/newfs
Module Name:src
Committed By: rin
Date: Wed Feb 8 16:56:56 UTC 2017
Modified Files:
src/sbin/newfs: extern.h
Log Message:
switch to __empty
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sbin/newfs/extern.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/newfs/extern.h
diff -u src/sbin/newfs/extern.h:1.16 src/sbin/newfs/extern.h:1.17
--- src/sbin/newfs/extern.h:1.16 Wed Feb 8 16:11:40 2017
+++ src/sbin/newfs/extern.h Wed Feb 8 16:56:56 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.16 2017/02/08 16:11:40 rin Exp $ */
+/* $NetBSD: extern.h,v 1.17 2017/02/08 16:56:56 rin Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -59,10 +59,10 @@ extern int needswap; /* Filesystem not i
#else
/* Disable Endian-Independent FFS support for install media */
#define needswap (0)
-#define ffs_cg_swap(a, b, c) do {} while (/*CONSTCOND*/0)
-#define ffs_csum_swap(a, b, c) do {} while (/*CONSTCOND*/0)
-#define ffs_dinode1_swap(a, b) do {} while (/*CONSTCOND*/0)
-#define ffs_sb_swap(a, b) do {} while (/*CONSTCOND*/0)
+#define ffs_cg_swap(a, b, c) __empty
+#define ffs_csum_swap(a, b, c) __empty
+#define ffs_dinode1_swap(a, b) __empty
+#define ffs_sb_swap(a, b) __empty
#endif
#ifndef NO_APPLE_UFS
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Wed Feb 8 16:26:19 UTC 2017 Modified Files: src/sys/sys: cdefs.h Log Message: remove comment in comment To generate a diff of this commit: cvs rdiff -u -r1.130 -r1.131 src/sys/sys/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Wed Feb 8 16:26:19 UTC 2017
Modified Files:
src/sys/sys: cdefs.h
Log Message:
remove comment in comment
To generate a diff of this commit:
cvs rdiff -u -r1.130 -r1.131 src/sys/sys/cdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/cdefs.h
diff -u src/sys/sys/cdefs.h:1.130 src/sys/sys/cdefs.h:1.131
--- src/sys/sys/cdefs.h:1.130 Wed Feb 8 11:13:04 2017
+++ src/sys/sys/cdefs.h Wed Feb 8 11:26:19 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.130 2017/02/08 16:13:04 christos Exp $ */
+/* $NetBSD: cdefs.h,v 1.131 2017/02/08 16:26:19 christos Exp $ */
/* * Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -315,7 +315,7 @@
* # define dprintf(a) __empty
* #endif
*
- * We use ((void)0) instead of do {} while (/*CONSTCOND*/0) so that it
+ * We use ((void)0) instead of do {} while (0) so that it
* works on , expressions.
*/
#define __empty ((void)0)
CVS commit: src/sbin/fsck_ffs
Module Name:src Committed By: christos Date: Wed Feb 8 16:23:24 UTC 2017 Modified Files: src/sbin/fsck_ffs: fsck.h Log Message: use __empty To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_ffs/fsck.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/fsck_ffs
Module Name:src
Committed By: christos
Date: Wed Feb 8 16:23:24 UTC 2017
Modified Files:
src/sbin/fsck_ffs: fsck.h
Log Message:
use __empty
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_ffs/fsck.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/fsck.h
diff -u src/sbin/fsck_ffs/fsck.h:1.50 src/sbin/fsck_ffs/fsck.h:1.51
--- src/sbin/fsck_ffs/fsck.h:1.50 Wed Feb 8 11:11:40 2017
+++ src/sbin/fsck_ffs/fsck.h Wed Feb 8 11:23:24 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: fsck.h,v 1.50 2017/02/08 16:11:40 rin Exp $ */
+/* $NetBSD: fsck.h,v 1.51 2017/02/08 16:23:24 christos Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -307,11 +307,11 @@ int do_dirswap; /* need to do dir entry
#define needswap (0)
#define do_blkswap (0)
#define do_dirswap (0)
-#define ffs_cg_swap(a, b, c) do {} while (/*CONSTCOND*/0)
-#define ffs_csum_swap(a, b, c) do {} while (/*CONSTCOND*/0)
-#define ffs_sb_swap(a, b) do {} while (/*CONSTCOND*/0)
-#define swap_dinode1(a, b) do {} while (/*CONSTCOND*/0)
-#define swap_dinode2(a, b) do {} while (/*CONSTCOND*/0)
+#define ffs_cg_swap(a, b, c) __empty
+#define ffs_csum_swap(a, b, c) __empty
+#define ffs_sb_swap(a, b) __empty
+#define swap_dinode1(a, b) __empty
+#define swap_dinode2(a, b) __empty
#endif
#ifndef NO_APPLE_UFS
CVS commit: src/external/bsd/nsd/etc
Module Name:src Committed By: christos Date: Wed Feb 8 16:21:24 UTC 2017 Modified Files: src/external/bsd/nsd/etc: Makefile Log Message: need FILESBUILD_ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/etc/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/bsd/nsd/etc/Makefile diff -u src/external/bsd/nsd/etc/Makefile:1.2 src/external/bsd/nsd/etc/Makefile:1.3 --- src/external/bsd/nsd/etc/Makefile:1.2 Tue Feb 7 17:34:37 2017 +++ src/external/bsd/nsd/etc/Makefile Wed Feb 8 11:21:24 2017 @@ -1,10 +1,11 @@ -# $NetBSD: Makefile,v 1.2 2017/02/07 22:34:37 christos Exp $ +# $NetBSD: Makefile,v 1.3 2017/02/08 16:21:24 christos Exp $ SUBDIR=rc.d FILESDIR= /usr/share/examples/nsd FILESMODE=644 FILES= nsd.conf +FILESBUILD_nsd.conf=yes nsd.conf: nsd.conf.sample.in __subst CLEANFILES+= nsd.conf
CVS commit: src/external/bsd/nsd/etc
Module Name:src Committed By: christos Date: Wed Feb 8 16:21:24 UTC 2017 Modified Files: src/external/bsd/nsd/etc: Makefile Log Message: need FILESBUILD_ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/nsd/etc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/include
Module Name:src Committed By: christos Date: Wed Feb 8 16:14:08 UTC 2017 Modified Files: src/sys/arch/ia64/include: cpu.h Log Message: don't define __empty. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/include/cpu.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/ia64/include
Module Name:src
Committed By: christos
Date: Wed Feb 8 16:14:08 UTC 2017
Modified Files:
src/sys/arch/ia64/include: cpu.h
Log Message:
don't define __empty.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ia64/include/cpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/include/cpu.h
diff -u src/sys/arch/ia64/include/cpu.h:1.13 src/sys/arch/ia64/include/cpu.h:1.14
--- src/sys/arch/ia64/include/cpu.h:1.13 Sat Jan 14 11:12:51 2017
+++ src/sys/arch/ia64/include/cpu.h Wed Feb 8 11:14:08 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.13 2017/01/14 16:12:51 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.14 2017/02/08 16:14:08 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -149,7 +149,6 @@ struct clockframe {
#define TRAPF_CPL(tf) ((tf)->tf_special.psr & IA64_PSR_CPL)
#define TRAPF_USERMODE(tf) (TRAPF_CPL(tf) != IA64_PSR_CPL_KERN)
-#define __empty do { } while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process when the user profiling
* buffer pages are invalid. XXX:Fixme On the ia64 I haven't yet figured
CVS commit: src/lib/libc/include
Module Name:src
Committed By: christos
Date: Wed Feb 8 16:13:40 UTC 2017
Modified Files:
src/lib/libc/include: reentrant.h
Log Message:
__empty is defined in
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/include/reentrant.h
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/include/reentrant.h
diff -u src/lib/libc/include/reentrant.h:1.18 src/lib/libc/include/reentrant.h:1.19
--- src/lib/libc/include/reentrant.h:1.18 Tue Jan 20 13:31:25 2015
+++ src/lib/libc/include/reentrant.h Wed Feb 8 11:13:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: reentrant.h,v 1.18 2015/01/20 18:31:25 christos Exp $ */
+/* $NetBSD: reentrant.h,v 1.19 2017/02/08 16:13:40 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2003 The NetBSD Foundation, Inc.
@@ -278,9 +278,6 @@ __END_DECLS
#else /* _REENTRANT */
-#ifndef __empty
-#define __empty do {} while (/*CONSTCOND*/0)
-#endif
#define mutex_init(m, a) __empty
#define mutex_lock(m) __empty
#define mutex_trylock(m) __empty
CVS commit: src/lib/libc/include
Module Name:src Committed By: christos Date: Wed Feb 8 16:13:40 UTC 2017 Modified Files: src/lib/libc/include: reentrant.h Log Message: __empty is defined in To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/lib/libc/include/reentrant.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src Committed By: christos Date: Wed Feb 8 16:13:04 UTC 2017 Modified Files: src/sys/sys: cdefs.h Log Message: add __empty To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/sys/sys/cdefs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/atari/floppies/install
Module Name:src Committed By: rin Date: Wed Feb 8 16:12:59 UTC 2017 Modified Files: src/distrib/atari/floppies/install: list Log Message: Switch to x_fsck_ffs and x_newfs. Fix floppy image overflow. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/atari/floppies/install/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/atari/floppies/install/list diff -u src/distrib/atari/floppies/install/list:1.19 src/distrib/atari/floppies/install/list:1.20 --- src/distrib/atari/floppies/install/list:1.19 Sun Sep 18 16:36:02 2016 +++ src/distrib/atari/floppies/install/list Wed Feb 8 16:12:59 2017 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.19 2016/09/18 16:36:02 christos Exp $ +# $NetBSD: list,v 1.20 2017/02/08 16:12:59 rin Exp $ PROG bin/cat PROG bin/chmod @@ -46,9 +46,11 @@ PROG sbin/ahdilabel PROG usr/sbin/loadkmap SPECIAL installboot srcdir sys/arch/atari/stand/installboot +SPECIAL fsck_ffs srcdir distrib/utils/x_fsck_ffs SPECIAL gzip srcdir distrib/utils/x_gzip SPECIAL disklabel srcdir distrib/utils/x_disklabel SPECIAL ifconfig srcdir distrib/utils/x_ifconfig +SPECIAL newfs srcdir distrib/utils/x_newfs SPECIAL ping srcdir distrib/utils/x_ping SPECIAL route srcdir distrib/utils/x_route SPECIAL umount srcdir distrib/utils/x_umount
CVS commit: src/distrib/atari/floppies/install
Module Name:src Committed By: rin Date: Wed Feb 8 16:12:59 UTC 2017 Modified Files: src/distrib/atari/floppies/install: list Log Message: Switch to x_fsck_ffs and x_newfs. Fix floppy image overflow. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/atari/floppies/install/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: christos
Date: Wed Feb 8 16:13:04 UTC 2017
Modified Files:
src/sys/sys: cdefs.h
Log Message:
add __empty
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/sys/cdefs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/sys/cdefs.h
diff -u src/sys/sys/cdefs.h:1.129 src/sys/sys/cdefs.h:1.130
--- src/sys/sys/cdefs.h:1.129 Tue Dec 27 16:52:01 2016
+++ src/sys/sys/cdefs.h Wed Feb 8 11:13:04 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: cdefs.h,v 1.129 2016/12/27 21:52:01 christos Exp $ */
+/* $NetBSD: cdefs.h,v 1.130 2017/02/08 16:13:04 christos Exp $ */
/* * Copyright (c) 1991, 1993
* The Regents of the University of California. All rights reserved.
@@ -306,6 +306,20 @@
#define __unreachable() do {} while (/*CONSTCOND*/0)
#endif
+/*
+ * To be used when an empty body is required like:
+ *
+ * #ifdef DEBUG
+ * # define dprintf(a) printf(a)
+ * #else
+ * # define dprintf(a) __empty
+ * #endif
+ *
+ * We use ((void)0) instead of do {} while (/*CONSTCOND*/0) so that it
+ * works on , expressions.
+ */
+#define __empty ((void)0)
+
#if defined(__cplusplus)
#define __BEGIN_EXTERN_C extern "C" {
#define __END_EXTERN_C }
CVS commit: src
Module Name:src
Committed By: rin
Date: Wed Feb 8 16:11:40 UTC 2017
Modified Files:
src/sbin/fsck_ffs: Makefile dir.c fsck.h inode.c main.c pass1.c pass2.c
setup.c utilities.c
src/sbin/newfs: Makefile extern.h mkfs.c newfs.c
src/sys/ufs/ufs: ufs_bswap.h
Added Files:
src/distrib/utils/x_fsck_ffs: Makefile
src/distrib/utils/x_newfs: Makefile
src/sbin/fsck_ffs: Makefile.common
src/sbin/newfs: Makefile.common
Log Message:
Add smaller versions of fsck_ffs(8) and newfs(8) for install media, where
support for Endian-Independent FFS and Apple UFS is disabled unless FFS_EI=1
and APPLE_UFS=1 are added to CRUNCHENV, respectively.
This reduces the size of ramdisk image for atari by over 15KB.
Thanks tsutsui and christos for their useful comments.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/distrib/utils/x_fsck_ffs/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/utils/x_newfs/Makefile
cvs rdiff -u -r1.47 -r1.48 src/sbin/fsck_ffs/Makefile
cvs rdiff -u -r0 -r1.1 src/sbin/fsck_ffs/Makefile.common
cvs rdiff -u -r1.57 -r1.58 src/sbin/fsck_ffs/dir.c
cvs rdiff -u -r1.49 -r1.50 src/sbin/fsck_ffs/fsck.h
cvs rdiff -u -r1.71 -r1.72 src/sbin/fsck_ffs/inode.c
cvs rdiff -u -r1.83 -r1.84 src/sbin/fsck_ffs/main.c
cvs rdiff -u -r1.56 -r1.57 src/sbin/fsck_ffs/pass1.c
cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_ffs/pass2.c
cvs rdiff -u -r1.100 -r1.101 src/sbin/fsck_ffs/setup.c
cvs rdiff -u -r1.64 -r1.65 src/sbin/fsck_ffs/utilities.c
cvs rdiff -u -r1.39 -r1.40 src/sbin/newfs/Makefile
cvs rdiff -u -r0 -r1.1 src/sbin/newfs/Makefile.common
cvs rdiff -u -r1.15 -r1.16 src/sbin/newfs/extern.h
cvs rdiff -u -r1.127 -r1.128 src/sbin/newfs/mkfs.c
cvs rdiff -u -r1.114 -r1.115 src/sbin/newfs/newfs.c
cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/ufs/ufs_bswap.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/Makefile
diff -u src/sbin/fsck_ffs/Makefile:1.47 src/sbin/fsck_ffs/Makefile:1.48
--- src/sbin/fsck_ffs/Makefile:1.47 Tue Feb 7 16:14:47 2017
+++ src/sbin/fsck_ffs/Makefile Wed Feb 8 16:11:40 2017
@@ -1,45 +1,17 @@
-# $NetBSD: Makefile,v 1.47 2017/02/07 16:14:47 rin Exp $
+# $NetBSD: Makefile,v 1.48 2017/02/08 16:11:40 rin Exp $
# @(#)Makefile 8.2 (Berkeley) 4/27/95
+# when making a change to this file, please check if the change is
+# also needed for src/distrib/utils/x_fsck_ffs.
+# such stuff should be into Makefile.common.
+
.include
-PROG= fsck_ffs
MAN= fsck_ffs.8
-SRCS= dir.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \
- pass5.c pass6.c fsutil.c setup.c utilities.c ffs_bswap.c ffs_subr.c \
- ffs_tables.c ffs_appleufs.c partutil.c snapshot.c quota2.c quota2_subr.c
-
-FSCK= ${NETBSDSRCDIR}/sbin/fsck
-DUMP= ${NETBSDSRCDIR}/sbin/dump
-CPPFLAGS+=-I${FSCK} -I${DUMP}
-.ifndef SMALLPROG
-CPPFLAGS+=-DPROGRESS
-SRCS+= progress.c
-.endif
-.PATH: ${FSCK}
-
-.PATH: ${NETBSDSRCDIR}/sys/ufs/ffs ${NETBSDSRCDIR}/sys/ufs/ufs ${FSCK} ${DUMP}
-
-SRCS+= vfs_wapbl.c wapbl.c
-.PATH: ${NETBSDSRCDIR}/sys/kern
-CPPFLAGS+=-DWAPBL_DEBUG_PRINT=0
-
-LDADD+=-lutil
-DPADD+=${LIBUTIL}
-
-LDADD+=-lprop
-DPADD+=${LIBPROP}
-
-COPTS.ffs_appleufs.c+= -Wno-pointer-sign
-
-.if ${MACHINE_ARCH} == "m68000"
-COPTS.pass1.c+= -fno-tree-fre -fno-tree-lrs
-.endif
-.if ${MACHINE_ARCH} == "vax"
-COPTS.pass1.c+= -O0
-.endif
+SRCS= ffs_bswap.c ffs_appleufs.c
+SUBDIR= SMM.doc
-SUBDIR+=SMM.doc
+.include "Makefile.common"
.include
.include
Index: src/sbin/fsck_ffs/dir.c
diff -u src/sbin/fsck_ffs/dir.c:1.57 src/sbin/fsck_ffs/dir.c:1.58
--- src/sbin/fsck_ffs/dir.c:1.57 Sun Jun 23 07:28:36 2013
+++ src/sbin/fsck_ffs/dir.c Wed Feb 8 16:11:40 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: dir.c,v 1.57 2013/06/23 07:28:36 dholland Exp $ */
+/* $NetBSD: dir.c,v 1.58 2017/02/08 16:11:40 rin Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)dir.c 8.8 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: dir.c,v 1.57 2013/06/23 07:28:36 dholland Exp $");
+__RCSID("$NetBSD: dir.c,v 1.58 2017/02/08 16:11:40 rin Exp $");
#endif
#endif /* not lint */
@@ -154,10 +154,10 @@ dirscan(struct inodesc *idesc)
struct bufarea *bp;
int dsize, n;
long blksiz;
-#if UFS_DIRBLKSIZ > APPLEUFS_DIRBLKSIZ
- char dbuf[UFS_DIRBLKSIZ];
-#else
+#if !defined(NO_APPLE_UFS) && UFS_DIRBLKSIZ < APPLEUFS_DIRBLKSIZ
char dbuf[APPLEUFS_DIRBLKSIZ];
+#else
+ char dbuf[UFS_DIRBLKSIZ];
#endif
if (idesc->id_type != DATA)
@@ -703,10 +703,10 @@ expanddir(union dinode *dp, char *name)
daddr_t lastbn, newblk, dirblk;
struct bufarea *bp;
char *cp;
-#if DIRBLKSIZ > APPLEUFS_DIRBLKSIZ
- char firstblk[DIRBLKSIZ];
-#else
+#if !defined(NO_APPLE_UFS) && UFS_DIRBLKSIZ < APPLEUFS_DIRBLKSIZ
char firstblk[APPLEUFS_DIRBLKSIZ];
+#else
+ char firstblk[UFS_DIRBLKSIZ];
#endif
struct ufs1_dinode *dp1 = NULL;
struct ufs2_dinode *dp2 = NULL;
Index:
CVS commit: src
Module Name:src Committed By: rin Date: Wed Feb 8 16:11:40 UTC 2017 Modified Files: src/sbin/fsck_ffs: Makefile dir.c fsck.h inode.c main.c pass1.c pass2.c setup.c utilities.c src/sbin/newfs: Makefile extern.h mkfs.c newfs.c src/sys/ufs/ufs: ufs_bswap.h Added Files: src/distrib/utils/x_fsck_ffs: Makefile src/distrib/utils/x_newfs: Makefile src/sbin/fsck_ffs: Makefile.common src/sbin/newfs: Makefile.common Log Message: Add smaller versions of fsck_ffs(8) and newfs(8) for install media, where support for Endian-Independent FFS and Apple UFS is disabled unless FFS_EI=1 and APPLE_UFS=1 are added to CRUNCHENV, respectively. This reduces the size of ramdisk image for atari by over 15KB. Thanks tsutsui and christos for their useful comments. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/distrib/utils/x_fsck_ffs/Makefile cvs rdiff -u -r0 -r1.1 src/distrib/utils/x_newfs/Makefile cvs rdiff -u -r1.47 -r1.48 src/sbin/fsck_ffs/Makefile cvs rdiff -u -r0 -r1.1 src/sbin/fsck_ffs/Makefile.common cvs rdiff -u -r1.57 -r1.58 src/sbin/fsck_ffs/dir.c cvs rdiff -u -r1.49 -r1.50 src/sbin/fsck_ffs/fsck.h cvs rdiff -u -r1.71 -r1.72 src/sbin/fsck_ffs/inode.c cvs rdiff -u -r1.83 -r1.84 src/sbin/fsck_ffs/main.c cvs rdiff -u -r1.56 -r1.57 src/sbin/fsck_ffs/pass1.c cvs rdiff -u -r1.50 -r1.51 src/sbin/fsck_ffs/pass2.c cvs rdiff -u -r1.100 -r1.101 src/sbin/fsck_ffs/setup.c cvs rdiff -u -r1.64 -r1.65 src/sbin/fsck_ffs/utilities.c cvs rdiff -u -r1.39 -r1.40 src/sbin/newfs/Makefile cvs rdiff -u -r0 -r1.1 src/sbin/newfs/Makefile.common cvs rdiff -u -r1.15 -r1.16 src/sbin/newfs/extern.h cvs rdiff -u -r1.127 -r1.128 src/sbin/newfs/mkfs.c cvs rdiff -u -r1.114 -r1.115 src/sbin/newfs/newfs.c cvs rdiff -u -r1.21 -r1.22 src/sys/ufs/ufs/ufs_bswap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs/ffs
Module Name:src Committed By: christos Date: Wed Feb 8 16:00:30 UTC 2017 Modified Files: src/usr.sbin/makefs/ffs: mkfs.c Log Message: gut const for now. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/makefs/ffs/mkfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/makefs/ffs
Module Name:src
Committed By: christos
Date: Wed Feb 8 16:00:30 UTC 2017
Modified Files:
src/usr.sbin/makefs/ffs: mkfs.c
Log Message:
gut const for now.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/usr.sbin/makefs/ffs/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/ffs/mkfs.c
diff -u src/usr.sbin/makefs/ffs/mkfs.c:1.35 src/usr.sbin/makefs/ffs/mkfs.c:1.36
--- src/usr.sbin/makefs/ffs/mkfs.c:1.35 Tue Feb 7 23:08:53 2017
+++ src/usr.sbin/makefs/ffs/mkfs.c Wed Feb 8 11:00:30 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: mkfs.c,v 1.35 2017/02/08 04:08:53 christos Exp $ */
+/* $NetBSD: mkfs.c,v 1.36 2017/02/08 16:00:30 christos Exp $ */
/*
* Copyright (c) 2002 Networks Associates Technology, Inc.
@@ -48,7 +48,7 @@
static char sccsid[] = "@(#)mkfs.c 8.11 (Berkeley) 5/3/95";
#else
#ifdef __RCSID
-__RCSID("$NetBSD: mkfs.c,v 1.35 2017/02/08 04:08:53 christos Exp $");
+__RCSID("$NetBSD: mkfs.c,v 1.36 2017/02/08 16:00:30 christos Exp $");
#endif
#endif
#endif /* not lint */
@@ -126,7 +126,7 @@ static int avgfilesize; /* expect
static int avgfpdir; /* expected number of files per directory */
static void
-ffs_sb_copy(struct fs *o, const struct fs *i, size_t l, fsinfo_t *fsopts)
+ffs_sb_copy(struct fs *o, struct fs *i, size_t l, const fsinfo_t *fsopts)
{
memcpy(o, i, l);
/* Zero out pointers */
CVS commit: src/doc
Module Name:src Committed By: kamil Date: Wed Feb 8 14:53:50 UTC 2017 Modified Files: src/doc: TODO.ptrace Log Message: Add new entry in TODO.ptrace Added: add PT_SET_SIGMASK and PT_GET_SIGMASK - used by checkpointing software Example software: gdb, criu To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/doc/TODO.ptrace Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/TODO.ptrace diff -u src/doc/TODO.ptrace:1.15 src/doc/TODO.ptrace:1.16 --- src/doc/TODO.ptrace:1.15 Wed Feb 8 03:44:41 2017 +++ src/doc/TODO.ptrace Wed Feb 8 14:53:50 2017 @@ -1,4 +1,4 @@ -$NetBSD: TODO.ptrace,v 1.15 2017/02/08 03:44:41 kamil Exp $ +$NetBSD: TODO.ptrace,v 1.16 2017/02/08 14:53:50 kamil Exp $ Items we (currently) plan to finish in the ptrace(2) field: @@ -21,6 +21,7 @@ Items we (currently) plan to finish in t - add ATF tests for SIGCHLD - add si_code values for PT_SYSCALL: TRAP_SCE and TRAP_SCX - add ATF tests for PT_SYSCALL and PT_SYSCALLEMU + - add PT_SET_SIGMASK and PT_GET_SIGMASK - used by checkpointing software and of course: fix as many bugs as possible.
