Re: CVS commit: src/usr.sbin/makemandb
Date:Thu, 16 Aug 2018 11:24:51 +0530 From:Abhinav Upadhyay Message-ID: | I will have a look at makemandb tonight | (Indian time). Usually every release mandoc's API has some small | changes and adjustments are needed in makemandb. Great thanks, It is not actually really proven yet that the build is fixed, though I have my fingers crossed now... (I did a complete build, but just "build.sh build" not "release"). makemandb from that appears to be working, though it says: Performing index update makemandb: Error in indexing `/usr/share/man/man7/mandoc_tbl.7' makemandb: Error in indexing `/usr/share/man/man7/mandoc_roff.7' makemandb: Error in indexing `/usr/share/man/man7/mandoc_mdoc.7' makemandb: Error in indexing `/usr/share/man/man7/mandoc_man.7' makemandb: Error in indexing `/usr/share/man/man7/mandoc_eqn.7' makemandb: Error in indexing `/usr/share/man/man7/mandoc_char.7' makemandb: Error in indexing `/usr/share/man/man4/tap.4' makemandb: Error in indexing `/usr/share/man/man4/l2tp.4' makemandb: Error in indexing `/usr/share/man/man4/gif.4' makemandb: Error in indexing `/usr/share/man/man4/bridge.4' makemandb: Error in indexing `/usr/share/man/man3/mandoc.3' makemandb: Error in indexing `/usr/share/man/man3/libarchive_changes.3' makemandb: Error in indexing `/usr/share/man/man3/getsubopt.3' makemandb: Error in indexing `/usr/share/man/man1/mandoc.1' Kind of interesting that (at least almost) all the mandoc man pages are included... kre
Re: CVS commit: src/usr.sbin/makemandb
On Thu, Aug 16, 2018 at 10:37 AM Robert Elz wrote: > > Module Name:src > Committed By: kre > Date: Thu Aug 16 05:07:22 UTC 2018 > > Modified Files: > src/usr.sbin/makemandb: makemandb.c > > Log Message: > In the latest mandoc (mdocml) the signature (prototype) of > mparse_alloc() altered - update the call here to compensate. > > This fixes the build (of makemandb), but I am not sure that > the changed version is what is desired - someone who knows > something about all of this should validate ... I just copied > the invocation from mandoc's demandoc.c (which seems likely > to be at least a similar kind of usage). Thanks for fixing the build. I will have a look at makemandb tonight (Indian time). Usually every release mandoc's API has some small changes and adjustments are needed in makemandb. - Abhinav
CVS commit: src/sys/arch/i386/stand/efiboot
Module Name:src Committed By: kre Date: Fri Aug 17 04:59:34 UTC 2018 Modified Files: src/sys/arch/i386/stand/efiboot: panic.c Log Message: Deal with gnu-efi upgrade - "efilib.h" now provides a prototype for VPrint() so it is no longer needed here, particularly not a slightly different prototype. Fixes the amd64 i386 & ia64 builds. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/i386/stand/efiboot/panic.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/stand/efiboot/panic.c diff -u src/sys/arch/i386/stand/efiboot/panic.c:1.4 src/sys/arch/i386/stand/efiboot/panic.c:1.5 --- src/sys/arch/i386/stand/efiboot/panic.c:1.4 Sat Feb 11 10:15:55 2017 +++ src/sys/arch/i386/stand/efiboot/panic.c Fri Aug 17 04:59:34 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: panic.c,v 1.4 2017/02/11 10:15:55 nonaka Exp $ */ +/* $NetBSD: panic.c,v 1.5 2018/08/17 04:59:34 kre Exp $ */ /*- * Copyright (c) 2016 Kimihiro Nonaka @@ -30,9 +30,6 @@ #include -/* from sys/external/bsd/gnu-efi/dist/lib/print.c */ -UINTN VPrint (IN CHAR16 *, va_list); - __dead VOID Panic( IN CHAR16 *fmt,
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Thu Aug 16 18:28:10 UTC 2018 Modified Files: src/doc: CHANGES Log Message: gnu-efi: Import version 3.0.8. To generate a diff of this commit: cvs rdiff -u -r1.2424 -r1.2425 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/CHANGES diff -u src/doc/CHANGES:1.2424 src/doc/CHANGES:1.2425 --- src/doc/CHANGES:1.2424 Tue Aug 14 14:56:33 2018 +++ src/doc/CHANGES Thu Aug 16 18:28:10 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2424 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2425 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -200,3 +200,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: [maxv 20180812] mdocml: Import 1.14.4. [christos 20180814] kernel: Remove etherip(4), replaced by l2tp(4). [maxv 20180814] + gnu-efi: Import version 3.0.8. [jmcneill 20180816]
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Thu Aug 16 18:26:59 UTC 2018 Modified Files: src/doc: 3RDPARTY Log Message: gnu-efi 3.0.8 has been imported To generate a diff of this commit: cvs rdiff -u -r1.1550 -r1.1551 src/doc/3RDPARTY 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.1550 src/doc/3RDPARTY:1.1551 --- src/doc/3RDPARTY:1.1550 Thu Aug 16 11:04:10 2018 +++ src/doc/3RDPARTY Thu Aug 16 18:26:59 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1550 2018/08/16 11:04:10 sevan Exp $ +# $NetBSD: 3RDPARTY,v 1.1551 2018/08/16 18:26:59 jmcneill Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1678,7 +1678,7 @@ License:BSD-like (3-clause) Location: usr.bin/nc Package: gnu-efi -Version: 3.0u +Version: 3.0.8 Current Vers: 3.0.8 Maintainer: https://sourceforge.net/projects/gnu-efi/ Archive Site: https://sourceforge.net/projects/gnu-efi/
CVS commit: src/sys/external/bsd/gnu-efi/dist/lib
Module Name:src Committed By: jmcneill Date: Thu Aug 16 18:25:45 UTC 2018 Modified Files: src/sys/external/bsd/gnu-efi/dist/lib: init.c Log Message: No need for private versions of memset/memcpy on NetBSD To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/sys/external/bsd/gnu-efi/dist/lib/init.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/external/bsd/gnu-efi/dist/lib/init.c diff -u src/sys/external/bsd/gnu-efi/dist/lib/init.c:1.1.1.2 src/sys/external/bsd/gnu-efi/dist/lib/init.c:1.2 --- src/sys/external/bsd/gnu-efi/dist/lib/init.c:1.1.1.2 Thu Aug 16 18:17:47 2018 +++ src/sys/external/bsd/gnu-efi/dist/lib/init.c Thu Aug 16 18:25:45 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: init.c,v 1.1.1.2 2018/08/16 18:17:47 jmcneill Exp $ */ +/* $NetBSD: init.c,v 1.2 2018/08/16 18:25:45 jmcneill Exp $ */ /*++ @@ -185,6 +185,7 @@ EFIDebugVariable ( } } +#if !defined(__NetBSD__) /* * Calls to memset/memcpy may be emitted implicitly by GCC or MSVC * even when -ffreestanding or /NODEFAULTLIB are in effect. @@ -214,3 +215,4 @@ void *memcpy(void *dest, const void *src return dest; } +#endif
CVS commit: src/sys/external/bsd/gnu-efi/dist/inc
Module Name:src
Committed By: jmcneill
Date: Thu Aug 16 18:24:36 UTC 2018
Modified Files:
src/sys/external/bsd/gnu-efi/dist/inc: eficompiler.h
src/sys/external/bsd/gnu-efi/dist/inc/aarch64: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/arm: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/ia32: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/ia64: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/mips64el: efisetjmp_arch.h
src/sys/external/bsd/gnu-efi/dist/inc/x86_64: efisetjmp_arch.h
Log Message:
Rename ALIGN macro to EFI_ALIGN
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/mips64el/efisetjmp_arch.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efisetjmp_arch.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/external/bsd/gnu-efi/dist/inc/eficompiler.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h Thu Aug 16 18:24:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: eficompiler.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: eficompiler.h,v 1.2 2018/08/16 18:24:35 jmcneill Exp $ */
/*++
@@ -21,9 +21,9 @@ Abstract:
#endif
#ifdef _MSC_EXTENSIONS
-#define ALIGN(x) __declspec(align(x))
+#define EFI_ALIGN(x) __declspec(align(x))
#else
-#define ALIGN(x) __attribute__((__aligned__(x)))
+#define EFI_ALIGN(x) __attribute__((__aligned__(x)))
#endif
/* Also add a catch-all on __attribute__() for MS compilers */
Index: src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/aarch64/efisetjmp_arch.h Thu Aug 16 18:24:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efisetjmp_arch.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: efisetjmp_arch.h,v 1.2 2018/08/16 18:24:36 jmcneill Exp $ */
#ifndef GNU_EFI_AARCH64_SETJMP_H
#define GNU_EFI_AARCH64_SETJMP_H
@@ -30,6 +30,6 @@ typedef struct {
UINT64 D13;
UINT64 D14;
UINT64 D15;
-} ALIGN(JMPBUF_ALIGN) jmp_buf;
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf;
#endif /* GNU_EFI_AARCH64_SETJMP_H */
Index: src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/arm/efisetjmp_arch.h Thu Aug 16 18:24:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efisetjmp_arch.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: efisetjmp_arch.h,v 1.2 2018/08/16 18:24:36 jmcneill Exp $ */
#ifndef GNU_EFI_ARM_SETJMP_H
#define GNU_EFI_ARM_SETJMP_H
@@ -18,6 +18,6 @@ typedef struct {
UINT32 R12;
UINT32 R13;
UINT32 R14;
-} ALIGN(JMPBUF_ALIGN) jmp_buf;
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf;
#endif /* GNU_EFI_ARM_SETJMP_H */
Index: src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h:1.2
--- src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h:1.1.1.1 Thu Aug 16 18:17:47 2018
+++ src/sys/external/bsd/gnu-efi/dist/inc/ia32/efisetjmp_arch.h Thu Aug 16 18:24:36 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efisetjmp_arch.h,v 1.1.1.1 2018/08/16 18:17:47 jmcneill Exp $ */
+/* $NetBSD: efisetjmp_arch.h,v 1.2 2018/08/16 18:24:36 jmcneill Exp $ */
#ifndef GNU_EFI_IA32_SETJMP_H
#define GNU_EFI_IA32_SETJMP_H
@@ -12,6 +12,6 @@ typedef struct {
UINT32 Ebp;
UINT32 Esp;
UINT32 Eip;
-} ALIGN(JMPBUF_ALIGN) jmp_buf;
+} EFI_ALIGN(JMPBUF_ALIGN) jmp_buf;
#endif /* GNU_EFI_IA32_SETJMP_H */
Index: src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h:1.1.1.1 src/sys/external/bsd/gnu-efi/dist/inc/ia64/efisetjmp_arch.h:1.2
---
CVS commit: src/sys/external/bsd/gnu-efi/dist
Module Name:src
Committed By: jmcneill
Date: Thu Aug 16 18:22:05 UTC 2018
Modified Files:
src/sys/external/bsd/gnu-efi/dist/inc: efiapi.h efidef.h efistdarg.h
src/sys/external/bsd/gnu-efi/dist/inc/ia32: efibind.h
src/sys/external/bsd/gnu-efi/dist/inc/ia64: efibind.h
src/sys/external/bsd/gnu-efi/dist/inc/x86_64: efibind.h
src/sys/external/bsd/gnu-efi/dist/lib: dpath.c event.c hand.c hw.c
Log Message:
Merge conflicts
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h \
src/sys/external/bsd/gnu-efi/dist/inc/efidef.h \
src/sys/external/bsd/gnu-efi/dist/inc/efistdarg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/gnu-efi/dist/inc/ia32/efibind.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/gnu-efi/dist/inc/ia64/efibind.h
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/gnu-efi/dist/inc/x86_64/efibind.h
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/gnu-efi/dist/lib/dpath.c \
src/sys/external/bsd/gnu-efi/dist/lib/event.c \
src/sys/external/bsd/gnu-efi/dist/lib/hw.c
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/gnu-efi/dist/lib/hand.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/external/bsd/gnu-efi/dist/inc/efiapi.h
diff -u src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h:1.2 src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h:1.3
--- src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h:1.2 Thu Aug 4 18:08:12 2016
+++ src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h Thu Aug 16 18:22:05 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efiapi.h,v 1.2 2016/08/04 18:08:12 scole Exp $ */
+/* $NetBSD: efiapi.h,v 1.3 2018/08/16 18:22:05 jmcneill Exp $ */
#ifndef _EFI_API_H
#define _EFI_API_H
@@ -109,8 +109,6 @@ EFI_STATUS
// EFI Events
//
-
-
#define EVT_TIMER 0x8000
#define EVT_RUNTIME 0x4000
#define EVT_RUNTIME_CONTEXT 0x2000
@@ -122,7 +120,18 @@ EFI_STATUS
#define EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE 0x6202
#define EVT_EFI_SIGNAL_MASK 0x00FF
-#define EVT_EFI_SIGNAL_MAX 2
+#define EVT_EFI_SIGNAL_MAX 4
+
+#define EFI_EVENT_TIMER EVT_TIMER
+#define EFI_EVENT_RUNTIME EVT_RUNTIME
+#define EFI_EVENT_RUNTIME_CONTEXT EVT_RUNTIME_CONTEXT
+#define EFI_EVENT_NOTIFY_WAIT EVT_NOTIFY_WAIT
+#define EFI_EVENT_NOTIFY_SIGNAL EVT_NOTIFY_SIGNAL
+#define EFI_EVENT_SIGNAL_EXIT_BOOT_SERVICES EVT_SIGNAL_EXIT_BOOT_SERVICES
+#define EFI_EVENT_SIGNAL_VIRTUAL_ADDRESS_CHANGE EVT_SIGNAL_VIRTUAL_ADDRESS_CHANGE
+#define EFI_EVENT_EFI_SIGNAL_MASK EVT_EFI_SIGNAL_MASK
+#define EFI_EVENT_EFI_SIGNAL_MAXEVT_EFI_SIGNAL_MAX
+
typedef
VOID
@@ -186,11 +195,14 @@ EFI_STATUS
// Task priority level
//
-#define TPL_APPLICATION4
-#define TPL_CALLBACK 8
-#define TPL_NOTIFY16
-#define TPL_HIGH_LEVEL31
-
+#define TPL_APPLICATION 4
+#define TPL_CALLBACK 8
+#define TPL_NOTIFY 16
+#define TPL_HIGH_LEVEL 31
+#define EFI_TPL_APPLICATION TPL_APPLICATION
+#define EFI_TPL_CALLBACK TPL_CALLBACK
+#define EFI_TPL_NOTIFY TPL_NOTIFY
+#define EFI_TPL_HIGH_LEVEL TPL_HIGH_LEVEL
typedef
EFI_TPL
(EFIAPI *EFI_RAISE_TPL) (
@@ -212,9 +224,13 @@ VOID
{ 0x8BE4DF61, 0x93CA, 0x11d2, {0xAA, 0x0D, 0x00, 0xE0, 0x98, 0x03, 0x2B, 0x8C} }
// Variable attributes
-#define EFI_VARIABLE_NON_VOLATILE 0x0001
-#define EFI_VARIABLE_BOOTSERVICE_ACCESS 0x0002
-#define EFI_VARIABLE_RUNTIME_ACCESS 0x0004
+#define EFI_VARIABLE_NON_VOLATILE 0x0001
+#define EFI_VARIABLE_BOOTSERVICE_ACCESS0x0002
+#define EFI_VARIABLE_RUNTIME_ACCESS0x0004
+#define EFI_VARIABLE_HARDWARE_ERROR_RECORD 0x0008
+#define EFI_VARIABLE_AUTHENTICATED_WRITE_ACCESS0x0010
+#define EFI_VARIABLE_TIME_BASED_AUTHENTICATED_WRITE_ACCESS 0x0020
+#define EFI_VARIABLE_APPEND_WRITE 0x0040
// Variable size limitation
#define EFI_MAXIMUM_VARIABLE_SIZE 1024
@@ -312,6 +328,22 @@ EFI_STATUS
#define EFI_IMAGE_MACHINE_IA64 0x0200
#endif
+#if !defined(EFI_IMAGE_MACHINE_EBC)
+#define EFI_IMAGE_MACHINE_EBC 0x0EBC
+#endif
+
+#if !defined(EFI_IMAGE_MACHINE_X64)
+#define EFI_IMAGE_MACHINE_X64 0x8664
+#endif
+
+#if !defined(EFI_IMAGE_MACHINE_ARMTHUMB_MIXED)
+#define EFI_IMAGE_MACHINE_ARMTHUMB_MIXED 0x01C2
+#endif
+
+#if !defined(EFI_IMAGE_MACHINE_AARCH64)
+#define EFI_IMAGE_MACHINE_AARCH64 0xAA64
+#endif
+
// Image Entry prototype
typedef
@@ -349,15 +381,9 @@ EFI_STATUS
IN CHAR16 *ExitData OPTIONAL
);
-typedef
-EFI_STATUS
-(EFIAPI *EFI_IMAGE_UNLOAD)
CVS import: src/sys/external/bsd/gnu-efi/dist
Module Name:src Committed By: jmcneill Date: Thu Aug 16 18:17:48 UTC 2018 Update of /cvsroot/src/sys/external/bsd/gnu-efi/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9157 Log Message: Import gnu-efi-3.0.8 Status: Vendor Tag: GNU_EFI Release Tags: gnu-efi-3_0_8 N src/sys/external/bsd/gnu-efi/dist/.gitignore U src/sys/external/bsd/gnu-efi/dist/ChangeLog U src/sys/external/bsd/gnu-efi/dist/Make.defaults U src/sys/external/bsd/gnu-efi/dist/Make.rules U src/sys/external/bsd/gnu-efi/dist/Makefile U src/sys/external/bsd/gnu-efi/dist/README.efilib U src/sys/external/bsd/gnu-efi/dist/README.elilo N src/sys/external/bsd/gnu-efi/dist/README.git U src/sys/external/bsd/gnu-efi/dist/README.gnuefi N src/sys/external/bsd/gnu-efi/dist/apps/AllocPages.c N src/sys/external/bsd/gnu-efi/dist/apps/bltgrid.c N src/sys/external/bsd/gnu-efi/dist/apps/debughook.c N src/sys/external/bsd/gnu-efi/dist/apps/drv0.c N src/sys/external/bsd/gnu-efi/dist/apps/drv0.h N src/sys/external/bsd/gnu-efi/dist/apps/drv0_use.c N src/sys/external/bsd/gnu-efi/dist/apps/exit.c N src/sys/external/bsd/gnu-efi/dist/apps/FreePages.c N src/sys/external/bsd/gnu-efi/dist/apps/lfbgrid.c U src/sys/external/bsd/gnu-efi/dist/apps/Makefile U src/sys/external/bsd/gnu-efi/dist/apps/modelist.c U src/sys/external/bsd/gnu-efi/dist/apps/printenv.c U src/sys/external/bsd/gnu-efi/dist/apps/route80h.c N src/sys/external/bsd/gnu-efi/dist/apps/setdbg.c N src/sys/external/bsd/gnu-efi/dist/apps/setjmp.c U src/sys/external/bsd/gnu-efi/dist/apps/t.c U src/sys/external/bsd/gnu-efi/dist/apps/t2.c U src/sys/external/bsd/gnu-efi/dist/apps/t3.c U src/sys/external/bsd/gnu-efi/dist/apps/t4.c U src/sys/external/bsd/gnu-efi/dist/apps/t5.c U src/sys/external/bsd/gnu-efi/dist/apps/t6.c U src/sys/external/bsd/gnu-efi/dist/apps/t7.c N src/sys/external/bsd/gnu-efi/dist/apps/t8.c U src/sys/external/bsd/gnu-efi/dist/apps/tcc.c U src/sys/external/bsd/gnu-efi/dist/apps/tpause.c U src/sys/external/bsd/gnu-efi/dist/apps/trivial.S N src/sys/external/bsd/gnu-efi/dist/apps/unsetdbg.c N src/sys/external/bsd/gnu-efi/dist/gnuefi/crt0-efi-aarch64.S N src/sys/external/bsd/gnu-efi/dist/gnuefi/crt0-efi-arm.S U src/sys/external/bsd/gnu-efi/dist/gnuefi/crt0-efi-ia32.S U src/sys/external/bsd/gnu-efi/dist/gnuefi/crt0-efi-ia64.S N src/sys/external/bsd/gnu-efi/dist/gnuefi/crt0-efi-mips64el.S U src/sys/external/bsd/gnu-efi/dist/gnuefi/crt0-efi-x86_64.S N src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_aarch64_efi.lds N src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_arm_efi.lds U src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_ia32_efi.lds U src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_ia32_fbsd_efi.lds U src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_ia64_efi.lds N src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_mips64el_efi.lds U src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_x86_64_efi.lds U src/sys/external/bsd/gnu-efi/dist/gnuefi/elf_x86_64_fbsd_efi.lds U src/sys/external/bsd/gnu-efi/dist/gnuefi/Makefile N src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_aarch64.c N src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_arm.c U src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_ia32.c U src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_ia64.S N src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_mips64el.c U src/sys/external/bsd/gnu-efi/dist/gnuefi/reloc_x86_64.c U src/sys/external/bsd/gnu-efi/dist/inc/efi.h U src/sys/external/bsd/gnu-efi/dist/inc/efi_nii.h U src/sys/external/bsd/gnu-efi/dist/inc/efi_pxe.h C src/sys/external/bsd/gnu-efi/dist/inc/efiapi.h N src/sys/external/bsd/gnu-efi/dist/inc/eficompiler.h U src/sys/external/bsd/gnu-efi/dist/inc/eficon.h U src/sys/external/bsd/gnu-efi/dist/inc/efidebug.h C src/sys/external/bsd/gnu-efi/dist/inc/efidef.h U src/sys/external/bsd/gnu-efi/dist/inc/efidevp.h U src/sys/external/bsd/gnu-efi/dist/inc/efierr.h U src/sys/external/bsd/gnu-efi/dist/inc/efifs.h U src/sys/external/bsd/gnu-efi/dist/inc/efigpt.h U src/sys/external/bsd/gnu-efi/dist/inc/efiip.h U src/sys/external/bsd/gnu-efi/dist/inc/efilib.h U src/sys/external/bsd/gnu-efi/dist/inc/efilink.h U src/sys/external/bsd/gnu-efi/dist/inc/efinet.h U src/sys/external/bsd/gnu-efi/dist/inc/efipart.h U src/sys/external/bsd/gnu-efi/dist/inc/efipciio.h N src/sys/external/bsd/gnu-efi/dist/inc/efipoint.h U src/sys/external/bsd/gnu-efi/dist/inc/efiprot.h U src/sys/external/bsd/gnu-efi/dist/inc/efipxebc.h U src/sys/external/bsd/gnu-efi/dist/inc/efirtlib.h U src/sys/external/bsd/gnu-efi/dist/inc/efiser.h N src/sys/external/bsd/gnu-efi/dist/inc/efisetjmp.h N src/sys/external/bsd/gnu-efi/dist/inc/efishellintf.h N src/sys/external/bsd/gnu-efi/dist/inc/efishellparm.h C src/sys/external/bsd/gnu-efi/dist/inc/efistdarg.h U src/sys/external/bsd/gnu-efi/dist/inc/efitcp.h U src/sys/external/bsd/gnu-efi/dist/inc/efiudp.h U src/sys/external/bsd/gnu-efi/dist/inc/efiui.h U src/sys/external/bsd/gnu-efi/dist/inc/inc.mak U src/sys/external/bsd/gnu-efi/dist/inc/libsmbios.h U src/sys/external/bsd/gnu-efi/dist/inc/make.inf U
CVS commit: src/external/mpl/bind
Module Name:src
Committed By: christos
Date: Thu Aug 16 16:34:33 UTC 2018
Modified Files:
src/external/mpl/bind: Makefile.inc
Log Message:
libisccfg uses libdns...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/mpl/bind/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/external/mpl/bind/Makefile.inc
diff -u src/external/mpl/bind/Makefile.inc:1.1 src/external/mpl/bind/Makefile.inc:1.2
--- src/external/mpl/bind/Makefile.inc:1.1 Sun Aug 12 09:02:24 2018
+++ src/external/mpl/bind/Makefile.inc Thu Aug 16 12:34:33 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.1 2018/08/12 13:02:24 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2018/08/16 16:34:33 christos Exp $
.if !defined(BIND9_MAKEFILE_INC)
BIND9_MAKEFILE_INC=yes
@@ -62,10 +62,10 @@ DBG=-g3 -gstabs
.if !defined(LIB) || empty(LIB)
# NOTE: the order of these libraries is important...
.if defined(NAMED_DEBUG)
-LDADD+= -lbind9_g -ldns_g -lirs_g -lisccfg_g -lisccc_g -lisc_g -lz_g
+LDADD+= -lbind9_g -lisccfg_g -ldns_g -lirs_g -lisccc_g -lisc_g -lz_g
.else
-LDADD+= -lbind9 -ldns -lirs -lisccfg
-DPADD+= ${LIBBIND9} ${LIBDNS} ${LIBIRS} ${LIBISCCFG}
+LDADD+= -lbind9 -lisccfg -ldns -lirs
+DPADD+= ${LIBBIND9} ${LIBISCCFG} ${LIBDNS} ${LIBIRS}
LDADD+= -lisccc -lisc -lz
DPADD+= ${LIBISCCC} ${LIBISC} ${LIBZ}
.endif
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Thu Aug 16 15:02:05 UTC 2018
Modified Files:
src/bin/sh: mknodenames.sh
Log Message:
NFC - a build structure code layout change only.
This generates nodenames.h which is a file that used to begin
#ifdef DEBUG
(line 1) and end with
#endif
(last line) with no intervening (matching) #else ... ie: for DEBUG use only.
That led to situations where non-debug code would like to make use
of the info provided, if DEBUG was enabled, needed to add #ifdef DEBUG
at the point of use.
Avoid that by providing new macros that are always defined (DEBUG or not,
so now we have a #else) which allow code to be written to make use of
the extra DEBUG info, if it is available, or not, if not.
While here, add double-include protection on the generated .h file
(just being cautious - nothing is ever going to cause it to get
included anywhere twice - or it shouldn't) and add the traditional
comments on the #else and #endif stuff (which is also really useless
as no-one is really expected to ever read the generated file). Never mind.
Nothing yet (elsewhere in the sh source) uses the new macros, so there's
even less chance of this changing anything than there would otherwise be.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/bin/sh/mknodenames.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/mknodenames.sh
diff -u src/bin/sh/mknodenames.sh:1.4 src/bin/sh/mknodenames.sh:1.5
--- src/bin/sh/mknodenames.sh:1.4 Mon Jun 19 11:55:07 2017
+++ src/bin/sh/mknodenames.sh Thu Aug 16 15:02:05 2018
@@ -1,5 +1,10 @@
#! /bin/sh
+# $NetBSD: mknodenames.sh,v 1.5 2018/08/16 15:02:05 kre Exp $
+
+# Use this script however you like, but it would be amazing if
+# it has any purpose other than as part of building the shell...
+
if [ -z "$1" ]; then
echo "Usage: $0 nodes.h" 1>&2
exit 1
@@ -9,13 +14,16 @@ NODES=$1
test -t 1 && test -z "$2" && exec > nodenames.h
-echo "#ifdef DEBUG"
-echo '
+echo "\
/*
- * Automatically generated by '"$0"'
- * DO NOT EDIT. Do Not "cvs add".
+ * Automatically generated by $0
+ * DO NOT EDIT. Do Not 'cvs add'.
*/
-'
+"
+echo "#ifndef NODENAMES_H_INCLUDED"
+echo "#define NODENAMES_H_INCLUDED"
+echo
+echo "#ifdef DEBUG"
MAX=$(awk < "$NODES" '
/#define/ {
@@ -48,4 +56,14 @@ echo
echo '#define NODETYPENAME(type) \'
echo ' ((unsigned)(type) <= '"${MAX}"' ? NodeNames[(type)] : "??OOR??")'
echo
-echo '#endif'
+echo '#define NODETYPE(type) (type), NODETYPENAME(type)'
+echo '#define PRIdsNT "%d(%s)"'
+echo
+echo '#else /* DEBUG */'
+echo
+echo '#define NODETYPE(type) (type)'
+echo '#define PRIdsNT "%d"'
+echo
+echo '#endif /* DEBUG */'
+echo
+echo '#endif /* !NODENAMES_H_INCLUDED */'
CVS commit: src/external/cddl/osnet/dev/dtrace/amd64
Module Name:src
Committed By: christos
Date: Thu Aug 16 14:14:52 UTC 2018
Modified Files:
src/external/cddl/osnet/dev/dtrace/amd64: dtrace_isa.c dtrace_subr.c
Log Message:
get rid of kernelbase
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c
cvs rdiff -u -r1.10 -r1.11 \
src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.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/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.9 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.10
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c:1.9 Sun Aug 12 12:07:27 2018
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_isa.c Thu Aug 16 10:14:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_isa.c,v 1.9 2018/08/12 16:07:27 christos Exp $ */
+/* $NetBSD: dtrace_isa.c,v 1.10 2018/08/16 14:14:51 christos Exp $ */
/*
* CDDL HEADER START
@@ -45,12 +45,6 @@ uint16_t dtrace_fuword16_nocheck(void *)
uint32_t dtrace_fuword32_nocheck(void *);
uint64_t dtrace_fuword64_nocheck(void *);
-#ifdef VM_MIN_KERNEL_ADDRESS_DEFAULT
-__strong_alias(kernelbase, vm_min_kernel_address)
-#else
-uintptr_t kernelbase = (uintptr_t)VM_MIN_KERNEL_ADDRESS;
-#endif
-
#define INKERNEL(va) ((intptr_t)(va) < 0) /* XXX horror */
struct amd64_frame {
Index: src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c
diff -u src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.10 src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.11
--- src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c:1.10 Tue Jun 5 08:04:19 2018
+++ src/external/cddl/osnet/dev/dtrace/amd64/dtrace_subr.c Thu Aug 16 10:14:51 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: dtrace_subr.c,v 1.10 2018/06/05 12:04:19 christos Exp $ */
+/* $NetBSD: dtrace_subr.c,v 1.11 2018/08/16 14:14:51 christos Exp $ */
/*
* CDDL HEADER START
@@ -48,8 +48,6 @@
#include
#include
-extern uintptr_t kernelbase;
-
int dtrace_invop(uintptr_t, struct trapframe *, uintptr_t);
typedef struct dtrace_invop_hdlr {
@@ -117,7 +115,7 @@ dtrace_invop_remove(int (*func)(uintptr_
void
dtrace_toxic_ranges(void (*func)(uintptr_t base, uintptr_t limit))
{
- (*func)(0, kernelbase);
+ (*func)(0, VM_MIN_KERNEL_ADDRESS);
}
static void
CVS commit: src/games/wtf
Module Name:src Committed By: maya Date: Thu Aug 16 13:31:04 UTC 2018 Modified Files: src/games/wtf: wtf Log Message: Try freebsd's pkg-info as well >From John Hein, via Nikolai Lifanov. PR misc/52684 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/games/wtf/wtf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/wtf/wtf diff -u src/games/wtf/wtf:1.24 src/games/wtf/wtf:1.25 --- src/games/wtf/wtf:1.24 Wed Mar 7 08:25:43 2018 +++ src/games/wtf/wtf Thu Aug 16 13:31:04 2018 @@ -1,6 +1,6 @@ #!/bin/sh # -# $NetBSD: wtf,v 1.24 2018/03/07 08:25:43 eadler Exp $ +# $NetBSD: wtf,v 1.25 2018/08/16 13:31:04 maya Exp $ # # Public domain # @@ -96,6 +96,13 @@ for i; do continue fi + # Try pkg-info(1) next + ans="$(pkg info -qI "$i" 2> /dev/null)" + if [ $? -eq 0 ]; then + echo "$i: $ans" + continue + fi + # If called from pkgsrc package directory, # try querying pkgsrc's help facility next if [ -f ../../mk/bsd.pkg.mk ]; then
CVS commit: src/tools/compat
Module Name:src Committed By: christos Date: Thu Aug 16 12:03:36 UTC 2018 Modified Files: src/tools/compat: Makefile configure configure.ac nbtool_config.h.in Log Message: add strncasecmp To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/tools/compat/Makefile cvs rdiff -u -r1.91 -r1.92 src/tools/compat/configure cvs rdiff -u -r1.92 -r1.93 src/tools/compat/configure.ac cvs rdiff -u -r1.45 -r1.46 src/tools/compat/nbtool_config.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/Makefile diff -u src/tools/compat/Makefile:1.84 src/tools/compat/Makefile:1.85 --- src/tools/compat/Makefile:1.84 Sat Aug 11 12:24:59 2018 +++ src/tools/compat/Makefile Thu Aug 16 08:03:36 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2018/08/11 16:24:59 christos Exp $ +# $NetBSD: Makefile,v 1.85 2018/08/16 12:03:36 christos Exp $ HOSTLIB= nbcompat @@ -19,7 +19,7 @@ SRCS= atoll.c basename.c cdbr.c cdbw.c setpassent.c setprogname.c sha1.c sha1hl.c sha2.c \ sha256hl.c sha384hl.c sha512hl.c snprintb.c snprintf.c \ stat_flags.c strlcat.c strlcpy.c strmode.c \ - strcasecmp.c strndup.c strnlen.c \ + strcasecmp.c strncasecmp.c strndup.c strnlen.c \ strsep.c strsuftoll.c strtoll.c \ strtoi.c strtou.c \ unvis.c vis.c err.c errx.c errc.c verr.c verrx.c verrc.c \ Index: src/tools/compat/configure diff -u src/tools/compat/configure:1.91 src/tools/compat/configure:1.92 --- src/tools/compat/configure:1.91 Sat Aug 11 12:24:59 2018 +++ src/tools/compat/configure Thu Aug 16 08:03:36 2018 @@ -5160,7 +5160,8 @@ for ac_func in atoll asprintf asnprintf pwrite raise_default_signal random reallocarr setenv \ setgroupent setprogname setpassent \ snprintb_m snprintf strlcat strlcpy strmode \ - strcasecmp strndup strnlen strsep strsuftoll strtoi strtoll strtou \ + strcasecmp strncasecmp strndup strnlen strsep strsuftoll strtoi \ + strtoll strtou \ user_from_uid uid_from_user vasprintf vasnprintf vsnprintf do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -5267,6 +5268,19 @@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_STRCASECMP $ac_have_decl _ACEOF +ac_fn_c_check_decl "$LINENO" "strncasecmp" "ac_cv_have_decl_strncasecmp" " +#include + +" +if test "x$ac_cv_have_decl_strncasecmp" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_STRNCASECMP $ac_have_decl +_ACEOF ac_fn_c_check_decl "$LINENO" "strlcpy" "ac_cv_have_decl_strlcpy" " #include Index: src/tools/compat/configure.ac diff -u src/tools/compat/configure.ac:1.92 src/tools/compat/configure.ac:1.93 --- src/tools/compat/configure.ac:1.92 Sat Aug 11 12:24:59 2018 +++ src/tools/compat/configure.ac Thu Aug 16 08:03:36 2018 @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.92 2018/08/11 16:24:59 christos Exp $ +# $NetBSD: configure.ac,v 1.93 2018/08/16 12:03:36 christos Exp $ # # Autoconf definition file for libnbcompat. # @@ -192,7 +192,8 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf pwrite raise_default_signal random reallocarr setenv \ setgroupent setprogname setpassent \ snprintb_m snprintf strlcat strlcpy strmode \ - strcasecmp strndup strnlen strsep strsuftoll strtoi strtoll strtou \ + strcasecmp strncasecmp strndup strnlen strsep strsuftoll strtoi \ + strtoll strtou \ user_from_uid uid_from_user vasprintf vasnprintf vsnprintf) AC_CHECK_DECLS([user_from_uid, uid_from_user, pwcache_userdb],,,[ @@ -201,7 +202,8 @@ AC_CHECK_DECLS([user_from_uid, uid_from_ AC_CHECK_DECLS([group_from_gid, gid_from_group, pwcache_groupdb],,,[ #include ]) -AC_CHECK_DECLS([strcasecmp, strlcpy, strlcat, strndup, strnlen, strsep],,,[ +AC_CHECK_DECLS([strcasecmp, strncasecmp, strlcpy, strlcat, strndup, + strnlen, strsep],,,[ #include ]) AC_CHECK_DECLS([strsuftoll, mi_vector_hash],,,[#include ]) @@ -210,7 +212,8 @@ AC_CHECK_DECLS([lchflags, lchmod, lchown #include ]) -AC_CHECK_DECLS([err, errc, errx, verrc, verrx, warn, warnc, warnx, vwarnc, vwarnx],,, [ +AC_CHECK_DECLS([err, errc, errx, verrc, verrx, warn, warnc, warnx, vwarnc, + vwarnx],,,[ #ifdef HAVE_ERR_H #include #endif Index: src/tools/compat/nbtool_config.h.in diff -u src/tools/compat/nbtool_config.h.in:1.45 src/tools/compat/nbtool_config.h.in:1.46 --- src/tools/compat/nbtool_config.h.in:1.45 Sat Aug 11 12:24:59 2018 +++ src/tools/compat/nbtool_config.h.in Thu Aug 16 08:03:36 2018 @@ -1,6 +1,6 @@ /* nbtool_config.h.in. Generated from configure.ac by autoheader. */ -/* $NetBSD: nbtool_config.h.in,v 1.45 2018/08/11 16:24:59 christos Exp $*/ +/* $NetBSD: nbtool_config.h.in,v 1.46 2018/08/16 12:03:36 christos Exp $*/ #ifndef __NETBSD_NBTOOL_CONFIG_H__ #define __NETBSD_NBTOOL_CONFIG_H__ @@ -326,6 +326,10 @@ don't. */ #undef HAVE_DECL_STRMODE +/* Define to 1 if you have the declaration of `strncasecmp', and to 0 if you + don't. */ +#undef
CVS commit: src/common/lib/libc/string
Module Name:src
Committed By: christos
Date: Thu Aug 16 12:03:10 UTC 2018
Modified Files:
src/common/lib/libc/string: strncasecmp.c
Log Message:
toolify.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/string/strncasecmp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/string/strncasecmp.c
diff -u src/common/lib/libc/string/strncasecmp.c:1.2 src/common/lib/libc/string/strncasecmp.c:1.3
--- src/common/lib/libc/string/strncasecmp.c:1.2 Mon Jun 4 14:19:27 2007
+++ src/common/lib/libc/string/strncasecmp.c Thu Aug 16 08:03:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: strncasecmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $ */
+/* $NetBSD: strncasecmp.c,v 1.3 2018/08/16 12:03:10 christos Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -29,12 +29,16 @@
* SUCH DAMAGE.
*/
+#if HAVE_NBTOOL_CONFIG_H
+#include "nbtool_config.h"
+#endif
+
#include
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
static char sccsid[] = "@(#)strcasecmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strncasecmp.c,v 1.2 2007/06/04 18:19:27 christos Exp $");
+__RCSID("$NetBSD: strncasecmp.c,v 1.3 2018/08/16 12:03:10 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
CVS commit: src/external/bsd/wpa/dist/src/rsn_supp
Module Name:src
Committed By: christos
Date: Thu Aug 16 11:34:41 UTC 2018
Modified Files:
src/external/bsd/wpa/dist/src/rsn_supp: wpa.c
Log Message:
>From FreeBSD:
When using WPA2, EAPOL-Key frames with the Encrypted flag and without the MIC
flag set, the data field was decrypted first without verifying the MIC. When
the dta field was encrypted using RC4, for example, when negotiating TKIP as
a pairwise cipher, the unauthenticated but decrypted data was subsequently
processed. This opened wpa_supplicant(8) to abuse by decryption and recovery
of sensitive information contained in EAPOL-Key messages.
See https://w1.fi/security/2018-1/unauthenticated-eapol-key-decryption.txt
for a detailed description of the bug.
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/wpa/dist/src/rsn_supp/wpa.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/wpa/dist/src/rsn_supp/wpa.c
diff -u src/external/bsd/wpa/dist/src/rsn_supp/wpa.c:1.2 src/external/bsd/wpa/dist/src/rsn_supp/wpa.c:1.3
--- src/external/bsd/wpa/dist/src/rsn_supp/wpa.c:1.2 Mon Oct 16 13:36:16 2017
+++ src/external/bsd/wpa/dist/src/rsn_supp/wpa.c Thu Aug 16 07:34:41 2018
@@ -2072,6 +2072,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, c
if ((sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN) &&
(key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) {
+ /*
+ * Only decrypt the Key Data field if the frame's authenticity
+ * was verified. When using AES-SIV (FILS), the MIC flag is not
+ * set, so this check should only be performed if mic_len != 0
+ * which is the case in this code branch.
+ */
+ if (!(key_info & WPA_KEY_INFO_MIC)) {
+ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING,
+"WPA: Ignore EAPOL-Key with encrypted but unauthenticated data");
+ goto out;
+ }
if (wpa_supplicant_decrypt_key_data(sm, key, ver, key_data,
_data_len))
goto out;
CVS commit: src/doc
Module Name:src Committed By: sevan Date: Thu Aug 16 11:04:10 UTC 2018 Modified Files: src/doc: 3RDPARTY Log Message: Remove extra slash in path Update MesaDemos path More version info for components in our tree To generate a diff of this commit: cvs rdiff -u -r1.1549 -r1.1550 src/doc/3RDPARTY 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.1549 src/doc/3RDPARTY:1.1550 --- src/doc/3RDPARTY:1.1549 Wed Aug 15 15:52:09 2018 +++ src/doc/3RDPARTY Thu Aug 16 11:04:10 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1549 2018/08/15 15:52:09 sevan Exp $ +# $NetBSD: 3RDPARTY,v 1.1550 2018/08/16 11:04:10 sevan Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -537,7 +537,7 @@ Responsible: simonb License: GPLv2+ (2.5.1a), GPLv3+ (2.5.3 and later) Location: external/gpl2/grep Notes: -Use external/gpl2/grep//grep2netbsd for preparing the source tree +Use external/gpl2/grep/grep2netbsd for preparing the source tree for the import. On 2 Jan 2004, a non-GNU grep (FreeGrep, https://github.com/howardjp/freegrep; see also http://www.monkey.org/openbsd/archive/tech/0306/msg00129.html) @@ -879,7 +879,7 @@ Home Page: http://www.mesa3d.org/ Mailing List: Responsible: riastradh, mrg License: ISC -Location: xsrc/external/mit/MesaDemos/dist +Location: xsrc/external/mit/mesa-demos/dist Notes: We use only glxinfo and glxgears. Delete all else on import. Vendor tag: xorg @@ -898,7 +898,7 @@ Location: sys/external/bsd/drm/dist Notes: Package: MesaLib -Version: 7.11.2 +Version: 10.3.5 Current Vers: 18.2.0 Maintainer: mesa-git@? Archive Site: ftp://ftp.freedesktop.org/pub/mesa/ @@ -1088,7 +1088,7 @@ Notes: to regen assembly files Package: pcc -Version: 1.1.0.DEVEL 20120325 +Version: 1.1.0.DEVEL 20160208 Current Vers: 1.1.0 20141210 Maintainer: Anders Magnusson Archive Site: ftp://pcc.ludd.ltu.se/pub/pcc/ @@ -1145,7 +1145,7 @@ definition (files.pf). userland code is reachover Makefiles are in src/usr.sbin/pf. Package: pkg_install -Version: 20170419 +Version: 20180325 Current Vers: 20180425 Maintainer: The pkgsrc developers Home Page: http://www.pkgsrc.org/ @@ -1224,7 +1224,7 @@ Notes: Old versions are available from Purdue (ftp.cs.purdue.edu:/pub/RCS). Package: root.cache -Version: 2016102001 (October 20, 2016) +Version: 2017102400 (October 24, 2017) Current Vers: 2018070901 (July 09, 2018) Maintainer: InterNIC Archive Site: ftp://ftp.internic.net/domain/named.root @@ -1634,8 +1634,8 @@ Notes: external, but this is just make-work. Package: timeout -Version: FreeBSD-2014-08-01 -Current Vers: FreeBSD-2016-05-01 +Version: FreeBSD-2014-07-16 r268763 +Current Vers: FreeBSD-2016-05-01 r331720 Maintainer: Baptiste Daroussin Archive Site: none Home Page: https://svnweb.freebsd.org/base/head/usr.bin/timeout/
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: maxv Date: Thu Aug 16 09:58:00 UTC 2018 Modified Files: src/usr.sbin/npf/npfctl: npf.conf.5 Log Message: Improve wording. To generate a diff of this commit: cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/npf/npfctl/npf.conf.5 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/npf/npfctl/npf.conf.5 diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.58 src/usr.sbin/npf/npfctl/npf.conf.5:1.59 --- src/usr.sbin/npf/npfctl/npf.conf.5:1.58 Thu Aug 16 09:50:37 2018 +++ src/usr.sbin/npf/npfctl/npf.conf.5 Thu Aug 16 09:58:00 2018 @@ -1,4 +1,4 @@ -.\"$NetBSD: npf.conf.5,v 1.58 2018/08/16 09:50:37 maxv Exp $ +.\"$NetBSD: npf.conf.5,v 1.59 2018/08/16 09:58:00 maxv Exp $ .\" .\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -225,7 +225,7 @@ the following syntax: .Pp Where .Ar match -is the set of TCP flags present in the +is the set of TCP flags we want to match out of the .Ar mask set, both sets being represented as a string combination of: S (SYN), A (ACK), F (FIN), R (RST). The flags that are not present in
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: maxv Date: Thu Aug 16 09:50:37 UTC 2018 Modified Files: src/usr.sbin/npf/npfctl: npf.conf.5 Log Message: Improve the "Map" section a little. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 src/usr.sbin/npf/npfctl/npf.conf.5 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/npf/npfctl/npf.conf.5 diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.57 src/usr.sbin/npf/npfctl/npf.conf.5:1.58 --- src/usr.sbin/npf/npfctl/npf.conf.5:1.57 Thu Aug 16 09:46:18 2018 +++ src/usr.sbin/npf/npfctl/npf.conf.5 Thu Aug 16 09:50:37 2018 @@ -1,4 +1,4 @@ -.\"$NetBSD: npf.conf.5,v 1.57 2018/08/16 09:46:18 maxv Exp $ +.\"$NetBSD: npf.conf.5,v 1.58 2018/08/16 09:50:37 maxv Exp $ .\" .\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -240,10 +240,14 @@ it can be overridden with the aforementi keyword. .Ss Map Network Address Translation (NAT) is expressed in a form of segment mapping. -The translation may be dynamic (stateful) or static (stateless). +The translation may be +.Cd dynamic +(stateful) or +.Cd static +(stateless). The following mapping types are available: .Pp -.Bl -tag -width <-> -compact +.Bl -tag -width <-> -offset indent .It Pa -> outbound NAT (translation of the source) .It Pa <- @@ -260,7 +264,7 @@ map $ext_if dynamic 10.1.1.0/24 -> $pub_ .Pp Translations are implicitly filtered by limiting the operation to the network segments specified, that is, translation would be performed only -on packets originating from 10.1.1.0/24 network. +on packets originating from the 10.1.1.0/24 network. Explicit filter criteria can be specified using "pass " as an additional option of the mapping. .Ss Procedures
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: maxv
Date: Thu Aug 16 09:46:18 UTC 2018
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5
Log Message:
Document the "flags" keyword.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/usr.sbin/npf/npfctl/npf.conf.5
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/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.56 src/usr.sbin/npf/npfctl/npf.conf.5:1.57
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.56 Thu Aug 16 09:21:00 2018
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Thu Aug 16 09:46:18 2018
@@ -1,4 +1,4 @@
-.\"$NetBSD: npf.conf.5,v 1.56 2018/08/16 09:21:00 maxv Exp $
+.\"$NetBSD: npf.conf.5,v 1.57 2018/08/16 09:46:18 maxv Exp $
.\"
.\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -201,7 +201,7 @@ block out final pcap-filter "tcp and dst
Fragments are not selectable since NPF always reassembles packets
before further processing.
.Ss Stateful
-Stateful packet inspection is enabled using
+Stateful packet inspection is enabled using the
.Cd stateful
or
.Cd stateful-ends
@@ -213,10 +213,29 @@ precaution.
In both cases, a full TCP state tracking is performed for TCP connections
and a limited tracking for message-based protocols (UDP and ICMP).
.Pp
+The
+.Cd flags
+keyword can be used in conjunction with the
+.Cd stateful
+keyword to match the packets against specific TCP flags, according to
+the following syntax:
+.Bl -tag -offset indent
+.It flags Ar match[/mask]
+.El
+.Pp
+Where
+.Ar match
+is the set of TCP flags present in the
+.Ar mask
+set, both sets being represented as a string combination of: S (SYN),
+A (ACK), F (FIN), R (RST). The flags that are not present in
+.Ar mask
+are ignored.
+.Pp
By default, a stateful rule implies SYN-only flag check ("flags S/SAFR")
for the TCP packets.
It is not advisable to change this behavior; however,
-it can be overridden with the
+it can be overridden with the aforementioned
.Cd flags
keyword.
.Ss Map
@@ -367,6 +386,8 @@ static-rule = ( "block" [ block-opts ] |
dynamic-ruleset = "ruleset" group-opts
rule = static-rule | dynamic-ruleset
+tcp-flag-mask = tcp-flags
+tcp-flags = ("S")("A")("F")("R")
proto = "proto" protocol [ proto-opts ]
block-opts = "return-rst" | "return-icmp" | "return"
family-opt = "inet4" | "inet6"
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: maxv Date: Thu Aug 16 09:21:00 UTC 2018 Modified Files: src/usr.sbin/npf/npfctl: npf.conf.5 Log Message: Improve the "Rules" section: better explain the "final" keyword (it is the same as PF's "quick", so use the same wording), and document the "return" options. While here simplify the man code, suggested by wiz. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/usr.sbin/npf/npfctl/npf.conf.5 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/npf/npfctl/npf.conf.5 diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.55 src/usr.sbin/npf/npfctl/npf.conf.5:1.56 --- src/usr.sbin/npf/npfctl/npf.conf.5:1.55 Thu Aug 16 08:51:53 2018 +++ src/usr.sbin/npf/npfctl/npf.conf.5 Thu Aug 16 09:21:00 2018 @@ -1,4 +1,4 @@ -.\"$NetBSD: npf.conf.5,v 1.55 2018/08/16 08:51:53 maxv Exp $ +.\"$NetBSD: npf.conf.5,v 1.56 2018/08/16 09:21:00 maxv Exp $ .\" .\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -147,13 +147,36 @@ With a rule statement NPF is instructed or .Cd block a packet depending on packet header information, transit direction and -the interface it arrived on, either immediately upon match (keyword -.Cd final ) -or using the last match. -The rule can also instruct NPF to create an entry in the state table +the interface it arrived on, either immediately upon match or using the +last match. +.Pp +If a packet matches a rule which has the +.Cd final +option set, this rule is considered the last matching rule, and +evaluation of subsequent rules is skipped. +Otherwise, the last matching rule is used. +.Pp +A rule can also instruct NPF to create an entry in the state table when passing the packet, to notify the sender when blocking it, and to apply a procedure to the packet (e.g. "log") in either case. .Pp +To notify the sender of a blocking decision, three +.Cd return +options can be used in conjunction with a +.Cd block +rule: +.Bl -tag -width Xreturn-icmpXX -offset indent +.It return +Behaves as return-rst or return-icmp, depending on whether the packet +being blocked is TCP or UDP. +.It return-rst +Return a TCP RST message, when the packet being blocked is a TCP packet. +Applies to IPv4 and IPv6. +.It return-icmp +Return an ICMP UNREACHABLE message, when the packet being blocked is a UDP packet. +Applies to IPv4 and IPv6. +.El +.Pp A "fully-featured" rule would for example be: .Bd -literal pass stateful in final family inet4 proto tcp flags S/SA \\ @@ -253,13 +276,9 @@ The available normalization options are: .Bl -tag -width XXmin-ttlXXvalueXX -offset indent .It Dq random-id Randomize the IPv4 ID parameter. -.It Dq min-ttl Xo -.Ar value -.Xc +.It Do min-ttl Dc Ar value Enforce a minimum value for the IPv4 Time To Live (TTL) parameter. -.It Dq max-mss Xo -.Ar value -.Xc +.It Do max-mss Dc Ar value Enforce a maximum value for the MSS on TCP packets. .It Dq no-df Remove the Don't Fragment (DF) flag from IPv4 packets.
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: maxv Date: Thu Aug 16 08:51:53 UTC 2018 Modified Files: src/usr.sbin/npf/npfctl: npf.conf.5 Log Message: Add quotes around the option names, to match the actual npf conf. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/usr.sbin/npf/npfctl/npf.conf.5 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/npf/npfctl/npf.conf.5 diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.54 src/usr.sbin/npf/npfctl/npf.conf.5:1.55 --- src/usr.sbin/npf/npfctl/npf.conf.5:1.54 Thu Aug 16 08:37:51 2018 +++ src/usr.sbin/npf/npfctl/npf.conf.5 Thu Aug 16 08:51:53 2018 @@ -1,4 +1,4 @@ -.\"$NetBSD: npf.conf.5,v 1.54 2018/08/16 08:37:51 maxv Exp $ +.\"$NetBSD: npf.conf.5,v 1.55 2018/08/16 08:51:53 maxv Exp $ .\" .\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -250,14 +250,18 @@ auto-loaded by NPF. .El .Pp The available normalization options are: -.Bl -tag -width Xmin-ttlXvalueXX -offset indent -.It random-id +.Bl -tag -width XXmin-ttlXXvalueXX -offset indent +.It Dq random-id Randomize the IPv4 ID parameter. -.It min-ttl Ar value +.It Dq min-ttl Xo +.Ar value +.Xc Enforce a minimum value for the IPv4 Time To Live (TTL) parameter. -.It max-mss Ar value +.It Dq max-mss Xo +.Ar value +.Xc Enforce a maximum value for the MSS on TCP packets. -.It no-df +.It Dq no-df Remove the Don't Fragment (DF) flag from IPv4 packets. .El .Pp
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: maxv
Date: Thu Aug 16 08:37:51 UTC 2018
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5
Log Message:
Enlighten the "Procedures" section. In particular document the "no-df"
option. Also replace "normalisation" -> "normalization", to match the
name of the rule.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/usr.sbin/npf/npfctl/npf.conf.5
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/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.53 src/usr.sbin/npf/npfctl/npf.conf.5:1.54
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.53 Mon Aug 13 06:06:13 2018
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Thu Aug 16 08:37:51 2018
@@ -1,4 +1,4 @@
-.\"$NetBSD: npf.conf.5,v 1.53 2018/08/13 06:06:13 wiz Exp $
+.\"$NetBSD: npf.conf.5,v 1.54 2018/08/16 08:37:51 maxv Exp $
.\"
.\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd August 7, 2018
+.Dd August 16, 2018
.Dt NPF.CONF 5
.Os
.Sh NAME
@@ -228,6 +228,39 @@ Every extension call has a name and a li
key-value pairs.
Depending on the call, the key might represent the argument and the value
might be optional.
+Available options:
+.Bl -tag -width Xlog:XinterfaceXX -offset indent
+.It log: Ar interface
+Log events.
+This requires the npf_ext_log kernel module, which would normally get
+auto-loaded by NPF.
+The specified npflog interface would also be auto-created once the
+configuration is loaded.
+The log packets can be written to a file using the
+.Xr npfd 8
+daemon.
+.It normalize: Xo
+.Ar option1
+.Op , Ar option2
+.Ar ...
+.Xc
+Modify packets according to the specified normalization options.
+This requires the npf_ext_normalize kernel module, which would normally get
+auto-loaded by NPF.
+.El
+.Pp
+The available normalization options are:
+.Bl -tag -width Xmin-ttlXvalueXX -offset indent
+.It random-id
+Randomize the IPv4 ID parameter.
+.It min-ttl Ar value
+Enforce a minimum value for the IPv4 Time To Live (TTL) parameter.
+.It max-mss Ar value
+Enforce a maximum value for the MSS on TCP packets.
+.It no-df
+Remove the Don't Fragment (DF) flag from IPv4 packets.
+.El
+.Pp
For example:
.Bd -literal
procedure "someproc" {
@@ -236,19 +269,7 @@ procedure "someproc" {
}
.Ed
.Pp
-In this case, the procedure calls the logging and normalisation modules.
-The logging facility requires the npf_ext_log kernel module which would
-normally get auto-loaded by NPF.
-The specified npflog interface would also be auto-created once the
-configuration is loaded.
-The log packets can be written to a file using the
-.Xr npfd 8
-daemon.
-.Pp
-Traffic normalisation has a set of different mechanisms.
-In the example above, the normalisation procedure has arguments which
-apply the following mechanisms: IPv4 ID randomisation, Don't Fragment (DF)
-flag cleansing, minimum TTL enforcement and TCP MSS "clamping".
+In this case, the procedure calls the logging and normalization modules.
.Ss Misc
Text after a hash
.Pq Sq #
CVS commit: src/external/bsd/mdocml/bin/mandoc
Module Name:src Committed By: kre Date: Thu Aug 16 06:24:40 UTC 2018 Modified Files: src/external/bsd/mdocml/bin/mandoc: Makefile Log Message: mandoc_xr.c is now in libmandoc (where it should be) it no longer needs to be here (why having it broke building I did not look to see, it should be possible to replace a file from a library). To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/bsd/mdocml/bin/mandoc/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/mdocml/bin/mandoc/Makefile diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.16 src/external/bsd/mdocml/bin/mandoc/Makefile:1.17 --- src/external/bsd/mdocml/bin/mandoc/Makefile:1.16 Thu Aug 16 05:03:17 2018 +++ src/external/bsd/mdocml/bin/mandoc/Makefile Thu Aug 16 06:24:40 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2018/08/16 05:03:17 kre Exp $ +# $NetBSD: Makefile,v 1.17 2018/08/16 06:24:40 kre Exp $ .include @@ -11,7 +11,6 @@ html.c \ main.c \ man_html.c \ man_term.c \ -mandoc_xr.c \ manpath.c \ mdoc_html.c \ mdoc_markdown.c \
