Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/pgoyette-compat]: src Resolve conflicts between branch and HEAD
details: https://anonhg.NetBSD.org/src/rev/3741884a2dd4
branches: pgoyette-compat
changeset: 830539:3741884a2dd4
user: pgoyette <pgoyette%NetBSD.org@localhost>
date: Fri Mar 30 06:20:05 2018 +0000
description:
Resolve conflicts between branch and HEAD
diffstat:
distrib/amd64/uefi-installimage/Makefile | 4 +-
distrib/sets/lists/base/mi | 10 +-
distrib/sets/lists/comp/md.sparc | 4 +-
distrib/sets/lists/comp/md.sparc64 | 4 +-
distrib/sets/lists/tests/mi | 5 +-
distrib/sets/lists/xetc/md.x68k | 3 +-
distrib/sets/lists/xetc/mi | 40 +-
distrib/sparc/miniroot/Makefile.inc | 4 +-
doc/3RDPARTY | 10 +-
doc/CHANGES | 4 +-
etc/mtree/NetBSD.dist.base | 6 +-
external/bsd/dhcpcd/dist/configure | 21 +
external/bsd/dhcpcd/dist/hooks/dhcpcd-run-hooks.8.in | 15 +-
external/bsd/dhcpcd/dist/src/arp.c | 32 +-
external/bsd/dhcpcd/dist/src/common.h | 2 +-
external/bsd/dhcpcd/dist/src/defs.h | 2 +-
external/bsd/dhcpcd/dist/src/dhcp.c | 8 +-
external/bsd/dhcpcd/dist/src/dhcp.h | 2 +-
external/bsd/dhcpcd/dist/src/dhcp6.c | 79 +-
external/bsd/dhcpcd/dist/src/dhcp6.h | 2 +-
external/bsd/dhcpcd/dist/src/dhcpcd.c | 112 +-
external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in | 6 +-
external/bsd/dhcpcd/dist/src/dhcpcd.h | 1 +
external/bsd/dhcpcd/dist/src/if-bsd.c | 217 +-
external/bsd/dhcpcd/dist/src/if-linux.c | 52 +-
external/bsd/dhcpcd/dist/src/if-sun.c | 10 +-
external/bsd/dhcpcd/dist/src/if.c | 34 +-
external/bsd/dhcpcd/dist/src/if.h | 4 +-
external/bsd/dhcpcd/dist/src/ipv4.c | 71 +-
external/bsd/dhcpcd/dist/src/ipv4.h | 7 +-
external/bsd/dhcpcd/dist/src/ipv6.c | 62 +-
external/bsd/dhcpcd/dist/src/ipv6.h | 8 +-
external/bsd/dhcpcd/dist/src/ipv6nd.c | 72 +-
external/bsd/dhcpcd/dist/src/ipv6nd.h | 2 +-
external/bsd/dhcpcd/include/config.h | 1 +
external/bsd/pkg_install/dist/Makefile.in | 24 -
external/bsd/pkg_install/dist/README | 21 -
external/bsd/pkg_install/dist/add/Makefile.in | 65 -
external/bsd/pkg_install/dist/add/perform.c | 6 +-
external/bsd/pkg_install/dist/add/pkg_add.1 | 18 +-
external/bsd/pkg_install/dist/add/pkg_add.cat | 265 -
external/bsd/pkg_install/dist/admin/Makefile.in | 86 -
external/bsd/pkg_install/dist/admin/audit-packages.cat | 22 -
external/bsd/pkg_install/dist/admin/audit.c | 13 +-
external/bsd/pkg_install/dist/admin/download-vulnerability-list.cat | 20 -
external/bsd/pkg_install/dist/admin/main.c | 10 +-
external/bsd/pkg_install/dist/admin/pkg_admin.1 | 19 +-
external/bsd/pkg_install/dist/admin/pkg_admin.cat | 207 -
external/bsd/pkg_install/dist/config.guess | 1502 --
external/bsd/pkg_install/dist/config.sub | 1708 --
external/bsd/pkg_install/dist/configure | 6571 ----------
external/bsd/pkg_install/dist/configure.ac | 178 -
external/bsd/pkg_install/dist/create/Makefile.in | 63 -
external/bsd/pkg_install/dist/create/pkg_create.cat | 282 -
external/bsd/pkg_install/dist/delete/Makefile.in | 58 -
external/bsd/pkg_install/dist/delete/pkg_delete.c | 4 +-
external/bsd/pkg_install/dist/delete/pkg_delete.cat | 163 -
external/bsd/pkg_install/dist/info/Makefile.in | 63 -
external/bsd/pkg_install/dist/info/pkg_info.cat | 204 -
external/bsd/pkg_install/dist/install-sh | 238 -
external/bsd/pkg_install/dist/lib/Makefile.in | 77 -
external/bsd/pkg_install/dist/lib/lib.h | 4 +-
external/bsd/pkg_install/dist/lib/license.c | 3 +-
external/bsd/pkg_install/dist/lib/pkg_install.conf.cat.in | 178 -
external/bsd/pkg_install/dist/lib/pkg_summary.cat | 117 -
external/bsd/pkg_install/dist/lib/pkgsrc.cat | 19 -
external/bsd/pkg_install/dist/lib/version.h | 4 +-
external/bsd/pkg_install/dist/lib/vulnerabilities-file.c | 19 +-
external/bsd/pkg_install/dist/tkpkg | 152 -
external/gpl3/binutils/dist/bfd/elflink.c | 7 +-
external/gpl3/gcc.old/dist/gcc/config/i386/constraints.md | 6 +-
external/gpl3/gcc.old/dist/gcc/config/i386/i386-opts.h | 13 +
external/gpl3/gcc.old/dist/gcc/config/i386/i386-protos.h | 2 +
external/gpl3/gcc.old/dist/gcc/config/i386/i386.c | 873 +-
external/gpl3/gcc.old/dist/gcc/config/i386/i386.h | 68 +-
external/gpl3/gcc.old/dist/gcc/config/i386/i386.md | 69 +-
external/gpl3/gcc.old/dist/gcc/config/i386/i386.opt | 28 +
external/gpl3/gcc.old/dist/gcc/config/i386/predicates.md | 9 +-
external/gpl3/gcc.old/dist/gcc/doc/extend.texi | 19 +
external/gpl3/gcc.old/dist/gcc/doc/invoke.texi | 36 +
external/gpl3/gcc/dist/gcc/config/i386/constraints.md | 6 +-
external/gpl3/gcc/dist/gcc/config/i386/i386-opts.h | 13 +
external/gpl3/gcc/dist/gcc/config/i386/i386-protos.h | 2 +
external/gpl3/gcc/dist/gcc/config/i386/i386.c | 912 +-
external/gpl3/gcc/dist/gcc/config/i386/i386.h | 63 +-
external/gpl3/gcc/dist/gcc/config/i386/i386.md | 69 +-
external/gpl3/gcc/dist/gcc/config/i386/i386.opt | 28 +
external/gpl3/gcc/dist/gcc/config/i386/predicates.md | 21 +-
external/gpl3/gcc/dist/gcc/doc/extend.texi | 19 +
external/gpl3/gcc/dist/gcc/doc/invoke.texi | 36 +
external/mit/xorg/bin/rstart/Makefile | 41 -
external/mit/xorg/bin/rstart/Makefile.rstart | 21 -
external/mit/xorg/bin/rstart/commands/Makefile | 18 -
external/mit/xorg/bin/rstart/commands/x11r6/Makefile | 12 -
external/mit/xorg/bin/rstart/contexts/Makefile | 14 -
external/public-domain/tz/dist/CONTRIBUTING | 12 +-
external/public-domain/tz/dist/Makefile | 123 +-
external/public-domain/tz/dist/NEWS | 145 +-
external/public-domain/tz/dist/TZDATA_VERSION | 2 +-
external/public-domain/tz/dist/africa | 57 +-
external/public-domain/tz/dist/antarctica | 3 +-
external/public-domain/tz/dist/asia | 177 +-
external/public-domain/tz/dist/australasia | 114 +-
external/public-domain/tz/dist/backzone | 48 +-
external/public-domain/tz/dist/checktab.awk | 9 +
external/public-domain/tz/dist/europe | 84 +-
external/public-domain/tz/dist/northamerica | 27 +-
external/public-domain/tz/dist/southamerica | 430 +-
external/public-domain/tz/dist/theory.html | 1753 +-
external/public-domain/tz/dist/version | 2 +-
external/public-domain/tz/dist/ziguard.awk | 62 +
external/public-domain/tz/dist/zishrink.awk | 4 +-
external/public-domain/tz/dist/zone.tab | 2 +-
external/public-domain/tz/dist/zone1970.tab | 4 +-
external/public-domain/tz/tzdata2netbsd | 354 +-
lib/csu/common/crt0-common.c | 31 +-
lib/libm/src/s_scalbn.c | 3 +-
libexec/ld.elf_so/arch/sparc/mdreloc.c | 38 +-
libexec/ld.elf_so/arch/sparc64/mdreloc.c | 212 +-
sbin/raidctl/raidctl.c | 12 +-
sbin/route/route.c | 19 +-
share/man/man4/man4.sparc64/ffb.4 | 10 +-
sys/arch/amd64/amd64/amd64_trap.S | 6 +-
sys/arch/amd64/amd64/locore.S | 43 +-
sys/arch/amd64/conf/ALL | 5 +-
sys/arch/amd64/conf/GENERIC | 6 +-
sys/arch/amd64/include/frameasm.h | 25 +-
sys/arch/i386/conf/ALL | 5 +-
sys/arch/i386/stand/efiboot/Makefile.efiboot | 4 +-
sys/arch/i386/stand/efiboot/boot.c | 118 +-
sys/arch/i386/stand/efiboot/bootia32/efibootia32.c | 8 +-
sys/arch/i386/stand/efiboot/bootx64/efibootx64.c | 8 +-
sys/arch/i386/stand/efiboot/efiboot.c | 12 +-
sys/arch/i386/stand/efiboot/efiboot.h | 8 +-
sys/arch/i386/stand/efiboot/efichar.c | 195 +
sys/arch/i386/stand/efiboot/eficons.c | 467 +-
sys/arch/i386/stand/efiboot/efidelay.c | 18 +-
sys/arch/i386/stand/efiboot/efidisk.c | 8 +-
sys/arch/i386/stand/efiboot/efimemory.c | 18 +-
sys/arch/macppc/conf/POWERMAC_G5 | 10 +-
sys/arch/macppc/dev/obio.c | 6 +-
sys/arch/macppc/dev/pmu.c | 7 +-
sys/arch/macppc/dev/snapper.c | 92 +-
sys/arch/macppc/macppc/cpu.c | 6 +-
sys/arch/macppc/macppc/interrupts.c | 7 +-
sys/arch/macppc/pci/uninorth.c | 13 +-
sys/arch/mips/mips/locore.S | 14 +-
sys/arch/powerpc/include/cpu.h | 6 +-
sys/arch/powerpc/include/oea/cpufeat.h | 6 +-
sys/arch/powerpc/include/spr.h | 14 +-
sys/arch/powerpc/oea/cpu_subr.c | 93 +-
sys/arch/powerpc/pic/pic_openpic.c | 6 +-
sys/arch/sgimips/mace/if_mec.c | 5 +-
sys/arch/sparc/include/Makefile | 4 +-
sys/arch/sparc/include/elf_support.h | 64 +
sys/arch/sparc64/dev/ffb.c | 6 +-
sys/arch/sparc64/include/Makefile | 4 +-
sys/arch/sparc64/include/elf_support.h | 186 +
sys/arch/vax/boot/Makefile.inc | 4 +-
sys/arch/vax/conf/majors.vax | 4 +-
sys/arch/vax/vax/ka780.c | 8 +-
sys/arch/x86/conf/files.x86 | 3 +-
sys/arch/x86/x86/cpu.c | 179 +-
sys/arch/x86/x86/cpu_ucode.c | 4 +-
sys/arch/x86/x86/intr.c | 17 +-
sys/arch/x86/x86/spectre.c | 392 +
sys/arch/x86/x86/svs.c | 14 +-
sys/dev/ic/ninjascsi32.c | 20 +-
sys/dev/isa/lpt_isa.c | 8 +-
sys/dev/pci/auich.c | 8 +-
sys/dev/pci/ixgbe/ix_txrx.c | 6 +-
sys/dev/pci/ixgbe/ixgbe.c | 107 +-
sys/dev/pci/ixgbe/ixgbe.h | 23 +-
sys/dev/pci/ixgbe/ixgbe_api.h | 4 +-
sys/dev/pci/ixgbe/ixgbe_common.c | 24 +-
sys/dev/pci/ixgbe/ixv.c | 16 +-
sys/dev/pci/pcidevs | 4 +-
sys/dev/pci/pcidevs.h | 6 +-
sys/dev/pci/pcidevs_data.h | 602 +-
sys/dev/sbus/mgx.c | 7 +-
sys/dev/scsipi/st.c | 316 +-
sys/dev/scsipi/stvar.h | 5 +-
sys/dev/usb/uts.c | 6 +-
sys/net/npf/npf_alg_icmp.c | 125 +-
sys/net/npf/npf_inet.c | 45 +-
sys/net/route.c | 18 +-
sys/netinet/tcp_congctl.c | 7 +-
sys/netinet/tcp_debug.c | 7 +-
sys/netinet/tcp_input.c | 665 +-
sys/netinet/tcp_output.c | 57 +-
sys/netinet/tcp_sack.c | 7 +-
sys/netinet/tcp_subr.c | 192 +-
sys/netinet/tcp_timer.c | 19 +-
sys/netinet/tcp_usrreq.c | 58 +-
sys/netinet/tcp_var.h | 5 +-
sys/uvm/uvm_bio.c | 8 +-
tests/net/icmp/t_ping.c | 32 +-
tests/net/if_tap/t_tap.sh | 23 +-
tests/net/ndp/t_ndp.sh | 4 +-
tests/usr.bin/c++/Makefile | 5 +-
tests/usr.bin/c++/t_call_once.sh | 377 +
tests/usr.bin/c++/t_call_once2.sh | 553 +
tests/usr.bin/c++/t_cxxruntime.sh | 171 +-
tests/usr.bin/c++/t_hello.sh | 152 +-
tests/usr.bin/c++/t_pthread_once.sh | 366 +
tests/usr.bin/c++/t_static_destructor.sh | 228 +-
tools/gcc/gcc-version.mk | 6 +-
usr.sbin/makefs/cd9660/cd9660_eltorito.c | 10 +-
208 files changed, 9651 insertions(+), 16220 deletions(-)
diffs (truncated from 34816 to 300 lines):
diff -r 10968db44d8a -r 3741884a2dd4 distrib/amd64/uefi-installimage/Makefile
--- a/distrib/amd64/uefi-installimage/Makefile Fri Mar 30 05:38:26 2018 +0000
+++ b/distrib/amd64/uefi-installimage/Makefile Fri Mar 30 06:20:05 2018 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2018/01/05 01:33:11 pgoyette Exp $
+# $NetBSD: Makefile,v 1.4.2.1 2018/03/30 06:20:05 pgoyette Exp $
.include <bsd.own.mk>
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-uefi-install # gives ${IMGBASE}.img
BOOTDISK= dk1 # unused (use GUID)
-INSTIMAGEMB?= 1500 # for all installation binaries
+INSTIMAGEMB?= 1550 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
diff -r 10968db44d8a -r 3741884a2dd4 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Fri Mar 30 05:38:26 2018 +0000
+++ b/distrib/sets/lists/base/mi Fri Mar 30 06:20:05 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1172 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: mi,v 1.1172.2.1 2018/03/30 06:20:05 pgoyette Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -81,10 +81,10 @@
./etc/X11/fs base-x11-root
./etc/X11/lbxproxy base-x11-root
./etc/X11/proxymngr base-x11-root
-./etc/X11/rstart base-x11-root
-./etc/X11/rstart/commands base-x11-root
-./etc/X11/rstart/commands/x11r6 base-x11-root
-./etc/X11/rstart/contexts base-x11-root
+./etc/X11/rstart base-x11-root obsolete
+./etc/X11/rstart/commands base-x11-root obsolete
+./etc/X11/rstart/commands/x11r6 base-x11-root obsolete
+./etc/X11/rstart/contexts base-x11-root obsolete
./etc/X11/twm base-x11-root
./etc/X11/xdm base-x11-root
./etc/X11/xinit base-x11-root
diff -r 10968db44d8a -r 3741884a2dd4 distrib/sets/lists/comp/md.sparc
--- a/distrib/sets/lists/comp/md.sparc Fri Mar 30 05:38:26 2018 +0000
+++ b/distrib/sets/lists/comp/md.sparc Fri Mar 30 06:20:05 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.92 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: md.sparc,v 1.92.2.1 2018/03/30 06:20:05 pgoyette Exp $
./usr/include/gcc-4.5/tgmath.h comp-obsolete obsolete
./usr/include/gcc-4.8/tgmath.h comp-c-include obsolete
./usr/include/gcc-4.8/visintrin.h comp-c-include obsolete
@@ -24,6 +24,7 @@
./usr/include/sparc/disklabel.h comp-c-include
./usr/include/sparc/eeprom.h comp-c-include
./usr/include/sparc/elf_machdep.h comp-c-include
+./usr/include/sparc/elf_support.h comp-c-include
./usr/include/sparc/endian.h comp-c-include
./usr/include/sparc/endian_machdep.h comp-c-include
./usr/include/sparc/fbio.h comp-obsolete obsolete
@@ -92,6 +93,7 @@
./usr/include/sparc64/disklabel.h comp-c-include
./usr/include/sparc64/eeprom.h comp-c-include
./usr/include/sparc64/elf_machdep.h comp-c-include
+./usr/include/sparc64/elf_support.h comp-c-include
./usr/include/sparc64/endian.h comp-c-include
./usr/include/sparc64/endian_machdep.h comp-c-include
./usr/include/sparc64/fbio.h comp-obsolete obsolete
diff -r 10968db44d8a -r 3741884a2dd4 distrib/sets/lists/comp/md.sparc64
--- a/distrib/sets/lists/comp/md.sparc64 Fri Mar 30 05:38:26 2018 +0000
+++ b/distrib/sets/lists/comp/md.sparc64 Fri Mar 30 06:20:05 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.199 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: md.sparc64,v 1.199.2.1 2018/03/30 06:20:05 pgoyette Exp $
./usr/include/g++/bits/sparc comp-c-include compat
./usr/include/g++/bits/sparc/c++config.h comp-c-include gcc,compat
./usr/include/g++/bits/sparc64 comp-c-include compat
@@ -28,6 +28,7 @@
./usr/include/sparc/disklabel.h comp-c-include
./usr/include/sparc/eeprom.h comp-c-include
./usr/include/sparc/elf_machdep.h comp-c-include
+./usr/include/sparc/elf_support.h comp-c-include
./usr/include/sparc/endian.h comp-c-include
./usr/include/sparc/endian_machdep.h comp-c-include
./usr/include/sparc/fbio.h comp-obsolete obsolete
@@ -95,6 +96,7 @@
./usr/include/sparc64/disklabel.h comp-c-include
./usr/include/sparc64/eeprom.h comp-c-include
./usr/include/sparc64/elf_machdep.h comp-c-include
+./usr/include/sparc64/elf_support.h comp-c-include
./usr/include/sparc64/endian.h comp-c-include
./usr/include/sparc64/endian_machdep.h comp-c-include
./usr/include/sparc64/fbio.h comp-obsolete obsolete
diff -r 10968db44d8a -r 3741884a2dd4 distrib/sets/lists/tests/mi
--- a/distrib/sets/lists/tests/mi Fri Mar 30 05:38:26 2018 +0000
+++ b/distrib/sets/lists/tests/mi Fri Mar 30 06:20:05 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.775.2.1 2018/03/15 09:11:54 pgoyette Exp $
+# $NetBSD: mi,v 1.775.2.2 2018/03/30 06:20:06 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3638,6 +3638,9 @@
./usr/tests/usr.bin/c++/t_cxxruntime tests-usr.bin-tests compattestfile,atf,cxx
./usr/tests/usr.bin/c++/t_hello tests-usr.bin-tests compattestfile,atf,cxx
./usr/tests/usr.bin/c++/t_static_destructor tests-usr.bin-tests compattestfile,atf,cxx
+./usr/tests/usr.bin/c++/t_call_once tests-usr.bin-tests compattestfile,atf,cxx
+./usr/tests/usr.bin/c++/t_call_once2 tests-usr.bin-tests compattestfile,atf,cxx
+./usr/tests/usr.bin/c++/t_pthread_once tests-usr.bin-tests compattestfile,atf,cxx
./usr/tests/usr.bin/cc tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/cc/Atffile tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/cc/Kyuafile tests-usr.bin-tests compattestfile,atf,kyua
diff -r 10968db44d8a -r 3741884a2dd4 distrib/sets/lists/xetc/md.x68k
--- a/distrib/sets/lists/xetc/md.x68k Fri Mar 30 05:38:26 2018 +0000
+++ b/distrib/sets/lists/xetc/md.x68k Fri Mar 30 06:20:05 2018 +0000
@@ -1,3 +1,2 @@
-# $NetBSD: md.x68k,v 1.4 2014/03/01 19:46:43 tsutsui Exp $
-./etc/X11/X68kConfig -unknown- x11
+# $NetBSD: md.x68k,v 1.4.24.1 2018/03/30 06:20:06 pgoyette Exp $
./etc/X11/X68kConfig -unknown- xorg
diff -r 10968db44d8a -r 3741884a2dd4 distrib/sets/lists/xetc/mi
--- a/distrib/sets/lists/xetc/mi Fri Mar 30 05:38:26 2018 +0000
+++ b/distrib/sets/lists/xetc/mi Fri Mar 30 06:20:05 2018 +0000
@@ -1,60 +1,28 @@
-# $NetBSD: mi,v 1.29 2017/08/29 15:50:57 maya Exp $
+# $NetBSD: mi,v 1.29.2.1 2018/03/30 06:20:06 pgoyette Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
./etc/X11/ctwm/system.ctwmrc -unknown- xorg
-./etc/X11/fs/config -unknown- x11
./etc/X11/fs/config -unknown- xorg
./etc/X11/lbxproxy/AtomControl -obsolete- obsolete,xorg
-./etc/X11/lbxproxy/AtomControl -unknown- x11
-./etc/X11/proxymngr/pmconfig -unknown- x11
./etc/X11/proxymngr/pmconfig -unknown- xorg
-./etc/X11/rstart/commands/@List -unknown- x11
-./etc/X11/rstart/commands/ListContexts -unknown- x11
-./etc/X11/rstart/commands/ListGenericCommands -unknown- x11
-./etc/X11/rstart/commands/x -unknown- x11
-./etc/X11/rstart/commands/x11 -unknown- x11
-./etc/X11/rstart/commands/x11r6/@List -unknown- x11
-./etc/X11/rstart/commands/x11r6/LoadMonitor -unknown- x11
-./etc/X11/rstart/commands/x11r6/Terminal -unknown- x11
-./etc/X11/rstart/config -unknown- x11
-./etc/X11/rstart/contexts/@List -unknown- x11
-./etc/X11/rstart/contexts/default -unknown- x11
-./etc/X11/rstart/contexts/x -unknown- x11
-./etc/X11/rstart/contexts/x11 -unknown- x11
-./etc/X11/rstart/contexts/x11r6 -unknown- x11
-./etc/X11/twm/system.twmrc -unknown- x11
./etc/X11/twm/system.twmrc -unknown- xorg
-./etc/X11/xdm/GiveConsole -unknown- x11
./etc/X11/xdm/GiveConsole -unknown- xorg
-./etc/X11/xdm/TakeConsole -unknown- x11
./etc/X11/xdm/TakeConsole -unknown- xorg
-./etc/X11/xdm/Xaccess -unknown- x11
./etc/X11/xdm/Xaccess -unknown- xorg
./etc/X11/xdm/Xreset -unknown- xorg
-./etc/X11/xdm/Xresources -unknown- x11
./etc/X11/xdm/Xresources -unknown- xorg
-./etc/X11/xdm/Xservers -unknown- x11
./etc/X11/xdm/Xservers -unknown- xorg
-./etc/X11/xdm/Xservers.fs -unknown- x11
./etc/X11/xdm/Xservers.fs -unknown- xorg
-./etc/X11/xdm/Xservers.ws -unknown- x11
./etc/X11/xdm/Xservers.ws -unknown- xorg
-./etc/X11/xdm/Xsession -unknown- x11
./etc/X11/xdm/Xsession -unknown- xorg
-./etc/X11/xdm/Xsetup_0 -unknown- x11
./etc/X11/xdm/Xsetup_0 -unknown- xorg
./etc/X11/xdm/Xstartup -unknown- xorg
-./etc/X11/xdm/Xwilling -unknown- x11
./etc/X11/xdm/Xwilling -unknown- xorg
-./etc/X11/xdm/xdm-config -unknown- x11
./etc/X11/xdm/xdm-config -unknown- xorg
./etc/X11/xdm/xorg-bw.xpm xetc-obsolete obsolete
./etc/X11/xdm/xorg.xpm xetc-obsolete obsolete
-./etc/X11/xinit/xinitrc -unknown- x11
./etc/X11/xinit/xinitrc -unknown- xorg
-./etc/X11/xserver/SecurityPolicy -unknown- x11
-./etc/X11/xsm/system.xsm -unknown- x11
./etc/X11/xsm/system.xsm -unknown- xorg
./etc/drirc -unknown- xorg
./etc/fonts/conf.avail/10-autohint.conf -unknown- xorg
@@ -109,16 +77,10 @@
./etc/fonts/conf.d/70-no-bitmaps.conf -unknown- xorg
./etc/fonts/conf.d/80-delicious.conf -unknown- xorg
./etc/fonts/conf.d/90-synthetic.conf -unknown- xorg
-./etc/fonts/fonts.conf -unknown- x11
./etc/fonts/fonts.conf -unknown- xorg
-./etc/fonts/fonts.dtd -unknown- x11
./etc/fonts/fonts.dtd -unknown- xorg
-./etc/mtree/set.xetc xetc-sys-root x11
./etc/mtree/set.xetc xetc-sys-root xorg
-./etc/rc.d/fccache etc-x11-rc x11
./etc/rc.d/fccache etc-x11-rc xorg
-./etc/rc.d/xdm etc-x11-rc x11
./etc/rc.d/xdm etc-x11-rc xorg
-./etc/rc.d/xfs etc-x11-rc x11
./etc/rc.d/xfs etc-x11-rc xorg
./var/db/obsolete/xetc xbase-sys-root xorg
diff -r 10968db44d8a -r 3741884a2dd4 distrib/sparc/miniroot/Makefile.inc
--- a/distrib/sparc/miniroot/Makefile.inc Fri Mar 30 05:38:26 2018 +0000
+++ b/distrib/sparc/miniroot/Makefile.inc Fri Mar 30 06:20:05 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.28 2017/07/23 19:00:22 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.28.2.1 2018/03/30 06:20:06 pgoyette Exp $
-IMAGESIZE= 9700k
+IMAGESIZE= 9800k
DBG= ${${ACTIVE_CC} == "clang":? -Oz -fomit-frame-pointer : -Os } -fno-unwind-tables
MAKEFS_FLAGS+= -o density=4k
diff -r 10968db44d8a -r 3741884a2dd4 doc/3RDPARTY
--- a/doc/3RDPARTY Fri Mar 30 05:38:26 2018 +0000
+++ b/doc/3RDPARTY Fri Mar 30 06:20:05 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1504.2.1 2018/03/22 01:44:40 pgoyette Exp $
+# $NetBSD: 3RDPARTY,v 1.1504.2.2 2018/03/30 06:20:06 pgoyette Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -334,8 +334,8 @@
Use the dhcp2netbsd script.
Package: dhcpcd
-Version: 7.0.1
-Current Vers: 7.0.1
+Version: 7.0.2
+Current Vers: 7.0.2
Maintainer: roy
Archive Site: ftp://roy.marples.name/pub/dhcpcd/
Home Page: http://roy.marples.name/projects/dhcpcd/
@@ -1411,8 +1411,8 @@
Added changes from a5 -> a12 manually.
Package: tz
-Version: tzcode2018c / tzdata2018c
-Current Vers: tzcode2018c / tzdata2018c
+Version: tzcode2018c / tzdata2018d
+Current Vers: tzcode2018d / tzdata2018d
Maintainer: Paul Eggert <eggert%cs.ucla.edu@localhost>
Archive Site: ftp://ftp.iana.org/tz/releases/
Archive Site: ftp://munnari.oz.au/pub/oldtz/
diff -r 10968db44d8a -r 3741884a2dd4 doc/CHANGES
--- a/doc/CHANGES Fri Mar 30 05:38:26 2018 +0000
+++ b/doc/CHANGES Fri Mar 30 06:20:05 2018 +0000
@@ -1,4 +1,4 @@
-# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2363.2.2 $>
+# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2363.2.3 $>
#
#
# [Note: This file does not mention every change made to the NetBSD source tree.
@@ -129,3 +129,5 @@
lm(4): Add NCT6796D support. [msaitoh 20180308]
macppc: Enable Bluetooth support by default in GENERIC kernel.
[sevan 20180316]
+ tzdata updated to 2017d [kre 20180324]
+ dhcpcd: Import 7.0.2. [roy 20180327]
diff -r 10968db44d8a -r 3741884a2dd4 etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base Fri Mar 30 05:38:26 2018 +0000
+++ b/etc/mtree/NetBSD.dist.base Fri Mar 30 06:20:05 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.169 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: NetBSD.dist.base,v 1.169.2.1 2018/03/30 06:20:06 pgoyette Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -18,10 +18,6 @@
./etc/X11/fs
./etc/X11/lbxproxy
./etc/X11/proxymngr
-./etc/X11/rstart
-./etc/X11/rstart/commands
-./etc/X11/rstart/commands/x11r6
-./etc/X11/rstart/contexts
./etc/X11/twm
./etc/X11/ctwm
./etc/X11/xdm
diff -r 10968db44d8a -r 3741884a2dd4 external/bsd/dhcpcd/dist/configure
--- a/external/bsd/dhcpcd/dist/configure Fri Mar 30 05:38:26 2018 +0000
+++ b/external/bsd/dhcpcd/dist/configure Fri Mar 30 06:20:05 2018 +0000
@@ -799,6 +799,27 @@
fi
fi
+if [ -z "$SETPROCTITLE" ]; then
+ printf "Testing for setproctitle ... "
+ cat << EOF >_setproctitle.c
+#include <stdlib.h>
+int main(void) {
+ setproctitle("foo");
+ return 0;
+}
+EOF
+ if $XCC _setproctitle.c -o _setproctitle 2>&3; then
+ SETPROCTITLE=yes
+ else
+ SETPROCTITLE=no
+ fi
+ echo "$SETPROCTITLE"
Home |
Main Index |
Thread Index |
Old Index