Module Name: src Committed By: snj Date: Sun Feb 25 21:16:07 UTC 2018
Modified Files: src/sys/arch/amiga/conf [netbsd-7]: DRACO GENERIC GENERIC.in src/sys/arch/i386/conf [netbsd-7]: GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/sparc/conf [netbsd-7]: GENERIC KRUPS MRCOFFEE TADPOLE3GX src/sys/arch/sparc64/conf [netbsd-7]: GENERIC NONPLUS64 src/sys/kern [netbsd-7]: kern_exec.c Log Message: Apply patch (requested by maxv in ticket #1499): - disable compat_svr4 and compat_svr4_32 everywhere - disable compat_ibcs2 everywhere but on Vax - remove svr4/svr4_32/ibcs2/freebsd from the module autoload list To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.175.2.1 src/sys/arch/amiga/conf/DRACO cvs rdiff -u -r1.307.2.2 -r1.307.2.3 src/sys/arch/amiga/conf/GENERIC cvs rdiff -u -r1.125.2.2 -r1.125.2.3 src/sys/arch/amiga/conf/GENERIC.in cvs rdiff -u -r1.1107.2.12 -r1.1107.2.13 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.85.2.9 -r1.85.2.10 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.59.2.5 -r1.59.2.6 src/sys/arch/i386/conf/XEN3_DOMU cvs rdiff -u -r1.243.4.3 -r1.243.4.4 src/sys/arch/sparc/conf/GENERIC cvs rdiff -u -r1.66 -r1.66.4.1 src/sys/arch/sparc/conf/KRUPS cvs rdiff -u -r1.45 -r1.45.4.1 src/sys/arch/sparc/conf/MRCOFFEE cvs rdiff -u -r1.61.4.2 -r1.61.4.3 src/sys/arch/sparc/conf/TADPOLE3GX cvs rdiff -u -r1.171.4.4 -r1.171.4.5 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.41.4.2 -r1.41.4.3 src/sys/arch/sparc64/conf/NONPLUS64 cvs rdiff -u -r1.408.2.4 -r1.408.2.5 src/sys/kern/kern_exec.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/amiga/conf/DRACO diff -u src/sys/arch/amiga/conf/DRACO:1.175 src/sys/arch/amiga/conf/DRACO:1.175.2.1 --- src/sys/arch/amiga/conf/DRACO:1.175 Sat Jul 5 10:00:42 2014 +++ src/sys/arch/amiga/conf/DRACO Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: DRACO,v 1.175 2014/07/05 10:00:42 tsutsui Exp $ +# $NetBSD: DRACO,v 1.175.2.1 2018/02/25 21:16:07 snj Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.175 $" +#ident "GENERIC-$Revision: 1.175.2.1 $" makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -140,7 +140,7 @@ options COMPAT_40 # NetBSD 4.0 compatib options COMPAT_50 # NetBSD 5.0 compatibility. options COMPAT_60 # NetBSD 6.0 compatibility. options COMPAT_SUNOS # Support to run Sun (m68k) executables -options COMPAT_SVR4 # Support to run SVR4 (m68k) executables +#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables options COMPAT_NOMID # allow nonvalid machine id executables #options COMPAT_LINUX # Support to run Linux/m68k executables Index: src/sys/arch/amiga/conf/GENERIC diff -u src/sys/arch/amiga/conf/GENERIC:1.307.2.2 src/sys/arch/amiga/conf/GENERIC:1.307.2.3 --- src/sys/arch/amiga/conf/GENERIC:1.307.2.2 Tue Nov 18 19:05:28 2014 +++ src/sys/arch/amiga/conf/GENERIC Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.307.2.2 2014/11/18 19:05:28 snj Exp $ +# $NetBSD: GENERIC,v 1.307.2.3 2018/02/25 21:16:07 snj Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.307.2.2 $" +#ident "GENERIC-$Revision: 1.307.2.3 $" makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk @@ -153,7 +153,7 @@ options COMPAT_40 # NetBSD 4.0 compatib options COMPAT_50 # NetBSD 5.0 compatibility. options COMPAT_60 # NetBSD 6.0 compatibility. options COMPAT_SUNOS # Support to run Sun (m68k) executables -options COMPAT_SVR4 # Support to run SVR4 (m68k) executables +#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables options COMPAT_NOMID # allow nonvalid machine id executables #options COMPAT_LINUX # Support to run Linux/m68k executables Index: src/sys/arch/amiga/conf/GENERIC.in diff -u src/sys/arch/amiga/conf/GENERIC.in:1.125.2.2 src/sys/arch/amiga/conf/GENERIC.in:1.125.2.3 --- src/sys/arch/amiga/conf/GENERIC.in:1.125.2.2 Tue Nov 18 19:05:28 2014 +++ src/sys/arch/amiga/conf/GENERIC.in Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.125.2.2 2014/11/18 19:05:28 snj Exp $ +# $NetBSD: GENERIC.in,v 1.125.2.3 2018/02/25 21:16:07 snj Exp $ # ## # GENERIC machine description file @@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.125.2.2 $" +#ident "GENERIC-$Revision: 1.125.2.3 $" m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS="-Os" @@ -195,7 +195,7 @@ options COMPAT_40 # NetBSD 4.0 compatib options COMPAT_50 # NetBSD 5.0 compatibility. options COMPAT_60 # NetBSD 6.0 compatibility. options COMPAT_SUNOS # Support to run Sun (m68k) executables -options COMPAT_SVR4 # Support to run SVR4 (m68k) executables +#options COMPAT_SVR4 # Support to run SVR4 (m68k) executables options COMPAT_NOMID # allow nonvalid machine id executables #options COMPAT_LINUX # Support to run Linux/m68k executables ')m4_dnl Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1107.2.12 src/sys/arch/i386/conf/GENERIC:1.1107.2.13 --- src/sys/arch/i386/conf/GENERIC:1.1107.2.12 Thu Aug 24 06:52:06 2017 +++ src/sys/arch/i386/conf/GENERIC Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1107.2.12 2017/08/24 06:52:06 snj Exp $ +# $NetBSD: GENERIC,v 1.1107.2.13 2018/02/25 21:16:07 snj Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.1107.2.12 $" +#ident "GENERIC-$Revision: 1.1107.2.13 $" maxusers 64 # estimated number of users @@ -144,8 +144,8 @@ options COMPAT_43 # 4.3BSD, 386BSD, and #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_SVR4 # binary compatibility with SVR4 -options COMPAT_IBCS2 # binary compatibility with SCO and ISC +#options COMPAT_SVR4 # binary compatibility with SVR4 +#options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD #options COMPAT_NDIS # NDIS network driver Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.9 src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.10 --- src/sys/arch/i386/conf/XEN3_DOM0:1.85.2.9 Sat Jul 8 17:04:21 2017 +++ src/sys/arch/i386/conf/XEN3_DOM0 Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.85.2.9 2017/07/08 17:04:21 snj Exp $ +# $NetBSD: XEN3_DOM0,v 1.85.2.10 2018/02/25 21:16:07 snj Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -96,8 +96,8 @@ options COMPAT_386BSD_MBRPART # recogni #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_SVR4 # binary compatibility with SVR4 -options COMPAT_IBCS2 # binary compatibility with SCO and ISC +#options COMPAT_SVR4 # binary compatibility with SVR4 +#options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. Index: src/sys/arch/i386/conf/XEN3_DOMU diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.5 src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.6 --- src/sys/arch/i386/conf/XEN3_DOMU:1.59.2.5 Wed Jul 22 16:53:34 2015 +++ src/sys/arch/i386/conf/XEN3_DOMU Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.59.2.5 2015/07/22 16:53:34 snj Exp $ +# $NetBSD: XEN3_DOMU,v 1.59.2.6 2018/02/25 21:16:07 snj Exp $ include "arch/xen/conf/std.xen" @@ -80,8 +80,8 @@ options COMPAT_386BSD_MBRPART # recogni #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_OSSAUDIO # OSS (Voxware) audio driver compatibility -options COMPAT_SVR4 # binary compatibility with SVR4 -options COMPAT_IBCS2 # binary compatibility with SCO and ISC +#options COMPAT_SVR4 # binary compatibility with SVR4 +#options COMPAT_IBCS2 # binary compatibility with SCO and ISC options COMPAT_LINUX # binary compatibility with Linux #options COMPAT_FREEBSD # binary compatibility with FreeBSD options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. Index: src/sys/arch/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.243.4.3 src/sys/arch/sparc/conf/GENERIC:1.243.4.4 --- src/sys/arch/sparc/conf/GENERIC:1.243.4.3 Fri May 15 03:44:19 2015 +++ src/sys/arch/sparc/conf/GENERIC Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.243.4.3 2015/05/15 03:44:19 snj Exp $ +# $NetBSD: GENERIC,v 1.243.4.4 2018/02/25 21:16:07 snj Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.243.4.3 $" +#ident "GENERIC-$Revision: 1.243.4.4 $" maxusers 32 @@ -184,7 +184,7 @@ options COMPAT_40 # NetBSD 4.0 binary c options COMPAT_50 # NetBSD 5.0 binary compatibility options COMPAT_60 # NetBSD 6.0 compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4 # SunOS 5.x binary compatibility options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. ## File systems. You probably need at least one of FFS or NFS. Index: src/sys/arch/sparc/conf/KRUPS diff -u src/sys/arch/sparc/conf/KRUPS:1.66 src/sys/arch/sparc/conf/KRUPS:1.66.4.1 --- src/sys/arch/sparc/conf/KRUPS:1.66 Mon Mar 24 14:15:38 2014 +++ src/sys/arch/sparc/conf/KRUPS Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: KRUPS,v 1.66 2014/03/24 14:15:38 szptvlfn Exp $ +# $NetBSD: KRUPS,v 1.66.4.1 2018/02/25 21:16:07 snj Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Krups (JavaStation-NC) machine description file @@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "KRUPS-$Revision: 1.66 $" +#ident "KRUPS-$Revision: 1.66.4.1 $" maxusers 32 @@ -181,7 +181,7 @@ options COMPAT_20 # NetBSD 2.0 binary c options COMPAT_30 # NetBSD 3.0 binary compatibility options COMPAT_40 # NetBSD 4.0 binary compatibility options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4 # SunOS 5.x binary compatibility options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. ## File systems. You probably need at least one of FFS or NFS. Index: src/sys/arch/sparc/conf/MRCOFFEE diff -u src/sys/arch/sparc/conf/MRCOFFEE:1.45 src/sys/arch/sparc/conf/MRCOFFEE:1.45.4.1 --- src/sys/arch/sparc/conf/MRCOFFEE:1.45 Mon Mar 24 14:15:38 2014 +++ src/sys/arch/sparc/conf/MRCOFFEE Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.45 2014/03/24 14:15:38 szptvlfn Exp $ +# $NetBSD: MRCOFFEE,v 1.45.4.1 2018/02/25 21:16:07 snj Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "MRCOFFEE-$Revision: 1.45 $" +#ident "MRCOFFEE-$Revision: 1.45.4.1 $" maxusers 32 @@ -164,7 +164,7 @@ options COMPAT_40 # NetBSD 4.0 binary c options COMPAT_50 # NetBSD 5.0 binary compatibility options COMPAT_60 # NetBSD 6.0 compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4 # SunOS 5.x binary compatibility options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. ## File systems. You probably need at least one of FFS or NFS. Index: src/sys/arch/sparc/conf/TADPOLE3GX diff -u src/sys/arch/sparc/conf/TADPOLE3GX:1.61.4.2 src/sys/arch/sparc/conf/TADPOLE3GX:1.61.4.3 --- src/sys/arch/sparc/conf/TADPOLE3GX:1.61.4.2 Tue Nov 18 19:05:31 2014 +++ src/sys/arch/sparc/conf/TADPOLE3GX Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: TADPOLE3GX,v 1.61.4.2 2014/11/18 19:05:31 snj Exp $ +# $NetBSD: TADPOLE3GX,v 1.61.4.3 2018/02/25 21:16:07 snj Exp $ include "arch/sparc/conf/std.sparc" @@ -145,7 +145,7 @@ options COMPAT_40 # NetBSD 4.0 binary c options COMPAT_50 # NetBSD 5.0 binary compatibility options COMPAT_60 # NetBSD 6.0 compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4 # SunOS 5.x binary compatibility #options TCP_COMPAT_42 # 4.2BSD TCP/IP bug compat. Not recommended. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. Index: src/sys/arch/sparc64/conf/GENERIC diff -u src/sys/arch/sparc64/conf/GENERIC:1.171.4.4 src/sys/arch/sparc64/conf/GENERIC:1.171.4.5 --- src/sys/arch/sparc64/conf/GENERIC:1.171.4.4 Fri May 15 03:44:19 2015 +++ src/sys/arch/sparc64/conf/GENERIC Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.171.4.4 2015/05/15 03:44:19 snj Exp $ +# $NetBSD: GENERIC,v 1.171.4.5 2018/02/25 21:16:07 snj Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.171.4.4 $" +#ident "GENERIC-$Revision: 1.171.4.5 $" maxusers 64 @@ -153,8 +153,8 @@ options COMPAT_40 # NetBSD 4.0 binary c options COMPAT_50 # NetBSD 5.0 compatibility. options COMPAT_60 # NetBSD 6.0 compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility -options COMPAT_SVR4_32 # SunOS 5.x 32-bit binary compatibility -- 64-bit only +#options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4_32 # SunOS 5.x 32-bit binary compatibility -- 64-bit only options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only options EXEC_AOUT # execve(2) support for a.out binaries options EXEC_ELF32 # Exec module for SunOS 5.x binaries. Index: src/sys/arch/sparc64/conf/NONPLUS64 diff -u src/sys/arch/sparc64/conf/NONPLUS64:1.41.4.2 src/sys/arch/sparc64/conf/NONPLUS64:1.41.4.3 --- src/sys/arch/sparc64/conf/NONPLUS64:1.41.4.2 Tue Nov 18 19:05:32 2014 +++ src/sys/arch/sparc64/conf/NONPLUS64 Sun Feb 25 21:16:07 2018 @@ -1,8 +1,8 @@ -# $NetBSD: NONPLUS64,v 1.41.4.2 2014/11/18 19:05:32 snj Exp $ +# $NetBSD: NONPLUS64,v 1.41.4.3 2018/02/25 21:16:07 snj Exp $ include "arch/sparc64/conf/std.sparc64" -#ident "NONPLUS64-$Revision: 1.41.4.2 $" +#ident "NONPLUS64-$Revision: 1.41.4.3 $" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary @@ -119,8 +119,8 @@ options COMPAT_20 # NetBSD 2.0 binary c options COMPAT_30 # NetBSD 3.0 compatibility. options COMPAT_40 # NetBSD 4.0 compatibility. options COMPAT_SUNOS # SunOS 4.x binary compatibility -options COMPAT_SVR4 # SunOS 5.x binary compatibility -options COMPAT_SVR4_32 # 32-bit SVR4 binaries +#options COMPAT_SVR4 # SunOS 5.x binary compatibility +#options COMPAT_SVR4_32 # 32-bit SVR4 binaries options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility options EXEC_ELF32 # Exec module for NetBSD/sparc 1.5 binaries. #options SYSCALL_DEBUG Index: src/sys/kern/kern_exec.c diff -u src/sys/kern/kern_exec.c:1.408.2.4 src/sys/kern/kern_exec.c:1.408.2.5 --- src/sys/kern/kern_exec.c:1.408.2.4 Thu Nov 5 09:04:55 2015 +++ src/sys/kern/kern_exec.c Sun Feb 25 21:16:07 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exec.c,v 1.408.2.4 2015/11/05 09:04:55 snj Exp $ */ +/* $NetBSD: kern_exec.c,v 1.408.2.5 2018/02/25 21:16:07 snj Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.408.2.4 2015/11/05 09:04:55 snj Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.408.2.5 2018/02/25 21:16:07 snj Exp $"); #include "opt_exec.h" #include "opt_execfmt.h" @@ -567,15 +567,11 @@ exec_autoload(void) "exec_coff", "exec_ecoff", "compat_aoutm68k", - "compat_freebsd", - "compat_ibcs2", "compat_linux", "compat_linux32", "compat_netbsd32", "compat_sunos", "compat_sunos32", - "compat_svr4", - "compat_svr4_32", "compat_ultrix", NULL };