Date: Fri, 13 Feb 2015 20:58:11 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r278708 - in projects/release-install-debug: . bin/pkill/tests contrib/binutils/ld/scripttempl contrib/elftoolchain/libdwarf contrib/netbsd-tests/games etc etc/mtree etc/rc.d etc/root g... Message-ID: <201502132058.t1DKwB7q088701@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Fri Feb 13 20:58:10 2015 New Revision: 278708 URL: https://svnweb.freebsd.org/changeset/base/278708 Log: MFH: r278585-r278707 Sponsored by: The FreeBSD Foundation Modified: projects/release-install-debug/Makefile.inc1 projects/release-install-debug/ObsoleteFiles.inc projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh projects/release-install-debug/contrib/binutils/ld/scripttempl/elf.sc projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c projects/release-install-debug/contrib/netbsd-tests/games/t_factor.sh projects/release-install-debug/etc/login.conf projects/release-install-debug/etc/master.passwd projects/release-install-debug/etc/mtree/BSD.debug.dist projects/release-install-debug/etc/mtree/BSD.usr.dist projects/release-install-debug/etc/rc.d/LOGIN projects/release-install-debug/etc/rc.d/NETWORKING projects/release-install-debug/etc/rc.d/local_unbound projects/release-install-debug/etc/rc.d/utx projects/release-install-debug/etc/root/dot.cshrc projects/release-install-debug/etc/root/dot.login projects/release-install-debug/etc/root/dot.profile projects/release-install-debug/games/Makefile.inc projects/release-install-debug/games/caesar/rot13.sh projects/release-install-debug/games/fortune/datfiles/Makefile projects/release-install-debug/include/stdio.h projects/release-install-debug/lib/libproc/proc_sym.c projects/release-install-debug/lib/libthr/libthr.3 projects/release-install-debug/release/scripts/make-manifest.sh projects/release-install-debug/sbin/sysctl/sysctl.8 projects/release-install-debug/sbin/sysctl/sysctl.c projects/release-install-debug/share/man/man4/led.4 projects/release-install-debug/share/man/man6/intro.6 projects/release-install-debug/share/man/man7/hier.7 projects/release-install-debug/share/mk/bsd.lib.mk projects/release-install-debug/share/mk/bsd.prog.mk projects/release-install-debug/share/skel/dot.cshrc projects/release-install-debug/share/skel/dot.login projects/release-install-debug/share/skel/dot.profile projects/release-install-debug/sys/amd64/amd64/db_disasm.c projects/release-install-debug/sys/cam/ctl/ctl.c projects/release-install-debug/sys/cam/ctl/ctl_backend_block.c projects/release-install-debug/sys/cam/ctl/ctl_backend_ramdisk.c projects/release-install-debug/sys/cam/ctl/ctl_tpc.c projects/release-install-debug/sys/cam/ctl/ctl_tpc.h projects/release-install-debug/sys/cam/ctl/ctl_tpc_local.c projects/release-install-debug/sys/cddl/dev/fbt/arm/fbt_isa.c projects/release-install-debug/sys/contrib/vchiq/interface/compat/vchi_bsd.h projects/release-install-debug/sys/contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c projects/release-install-debug/sys/dev/dwc/if_dwc.c projects/release-install-debug/sys/dev/oce/oce_mbox.c projects/release-install-debug/sys/dev/smc/if_smc.c projects/release-install-debug/sys/dev/vt/font/vt_mouse_cursor.c projects/release-install-debug/sys/i386/i386/db_disasm.c projects/release-install-debug/sys/kern/kern_sig.c projects/release-install-debug/sys/kern/kern_timeout.c projects/release-install-debug/sys/kern/sysv_shm.c projects/release-install-debug/sys/netgraph/ng_base.c projects/release-install-debug/sys/ofed/include/linux/gfp.h projects/release-install-debug/sys/ofed/include/linux/kernel.h projects/release-install-debug/sys/ofed/include/linux/kref.h projects/release-install-debug/sys/ofed/include/linux/pci.h projects/release-install-debug/sys/sys/disk.h projects/release-install-debug/sys/x86/iommu/intel_drv.c projects/release-install-debug/sys/x86/iommu/intel_reg.h projects/release-install-debug/sys/x86/iommu/intel_utils.c projects/release-install-debug/tools/build/mk/OptionalObsoleteFiles.inc projects/release-install-debug/tools/tools/nanobsd/gateworks/Files/root/.profile projects/release-install-debug/tools/tools/nanobsd/pcengines/Files/root/.cshrc projects/release-install-debug/tools/tools/nanobsd/pcengines/Files/root/.login projects/release-install-debug/tools/tools/nanobsd/rescue/Files/root/.cshrc projects/release-install-debug/tools/tools/netmap/pkt-gen.c projects/release-install-debug/usr.bin/svn/svn/Makefile projects/release-install-debug/usr.bin/wc/wc.c projects/release-install-debug/usr.bin/whereis/pathnames.h projects/release-install-debug/usr.bin/whereis/whereis.1 projects/release-install-debug/usr.bin/whereis/whereis.c projects/release-install-debug/usr.sbin/bsdconfig/include/messages.subr projects/release-install-debug/usr.sbin/ctladm/ctladm.8 projects/release-install-debug/usr.sbin/ctld/ctl.conf.5 projects/release-install-debug/usr.sbin/ctld/ctld.c projects/release-install-debug/usr.sbin/ctld/ctld.h projects/release-install-debug/usr.sbin/ctld/keys.c projects/release-install-debug/usr.sbin/flowctl/flowctl.c projects/release-install-debug/usr.sbin/gssd/Makefile projects/release-install-debug/usr.sbin/gssd/gssd.c projects/release-install-debug/usr.sbin/iscsid/iscsid.h projects/release-install-debug/usr.sbin/iscsid/keys.c projects/release-install-debug/usr.sbin/pc-sysinstall/backend/functions-extractimage.sh Directory Properties: projects/release-install-debug/ (props changed) projects/release-install-debug/contrib/binutils/ (props changed) projects/release-install-debug/contrib/elftoolchain/ (props changed) projects/release-install-debug/etc/ (props changed) projects/release-install-debug/include/ (props changed) projects/release-install-debug/sbin/ (props changed) projects/release-install-debug/share/ (props changed) projects/release-install-debug/share/man/man4/ (props changed) projects/release-install-debug/sys/ (props changed) Modified: projects/release-install-debug/Makefile.inc1 ============================================================================== --- projects/release-install-debug/Makefile.inc1 Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/Makefile.inc1 Fri Feb 13 20:58:10 2015 (r278708) @@ -189,9 +189,8 @@ OBJTREE= ${MAKEOBJDIRPREFIX} OBJTREE= ${MAKEOBJDIRPREFIX}/${TARGET}.${TARGET_ARCH} .endif WORLDTMP= ${OBJTREE}${.CURDIR}/tmp -# /usr/games added for fortune which depend on strfile -BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/usr/games:${WORLDTMP}/legacy/bin -XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin:${WORLDTMP}/usr/games +BPATH= ${WORLDTMP}/legacy/usr/sbin:${WORLDTMP}/legacy/usr/bin:${WORLDTMP}/legacy/bin +XPATH= ${WORLDTMP}/usr/sbin:${WORLDTMP}/usr/bin STRICTTMPPATH= ${BPATH}:${XPATH} TMPPATH= ${STRICTTMPPATH}:${PATH} @@ -807,9 +806,6 @@ ITOOLS+=makewhatis # Non-base distributions produced by the base system EXTRA_DISTRIBUTIONS= doc -.if ${MK_GAMES} != "no" -EXTRA_DISTRIBUTIONS+= games -.endif .if defined(LIB32TMP) && ${MK_LIB32} != "no" EXTRA_DISTRIBUTIONS+= lib32 .endif Modified: projects/release-install-debug/ObsoleteFiles.inc ============================================================================== --- projects/release-install-debug/ObsoleteFiles.inc Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/ObsoleteFiles.inc Fri Feb 13 20:58:10 2015 (r278708) @@ -38,6 +38,22 @@ # xargs -n1 | sort | uniq -d; # done +# 20150212: /usr/games moving into /usr/bin +OLD_FILES+=usr/games/bcd +OLD_FILES+=usr/games/caesar +OLD_FILES+=usr/games/factor +OLD_FILES+=usr/games/fortune +OLD_FILES+=usr/games/grdc +OLD_FILES+=usr/games/morse +OLD_FILES+=usr/games/number +OLD_FILES+=usr/games/pom +OLD_FILES+=usr/games/ppt +OLD_FILES+=usr/games/primes +OLD_FILES+=usr/games/random +OLD_FILES+=usr/games/rot13 +OLD_FILES+=usr/games/strfile +OLD_FILES+=usr/games/unstr +OLD_DIRS+=usr/games # 20150209: liblzma header OLD_FILES+=usr/include/lzma/lzma.h # 20150124: spl.9 and friends Modified: projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh ============================================================================== --- projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/bin/pkill/tests/pgrep-j_test.sh Fri Feb 13 20:58:10 2015 (r278708) @@ -19,79 +19,73 @@ jail_name_to_jid() base=pgrep_j_test +if [ `id -u` -ne 0 ]; then + echo "1..0 # skip Test needs uid 0." + exit 0 +fi + echo "1..3" +sleep=$(pwd)/sleep.txt +ln -sf /bin/sleep $sleep + name="pgrep -j <jid>" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_1.pid $sleep 5 & - - jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_1_2.pid $sleep 5 & - - jid1=$(jail_name_to_jid ${base}_1_1) - jid2=$(jail_name_to_jid ${base}_1_2) - jid="${jid1},${jid2}" - pid1="$(pgrep -f -x -j $jid "$sleep 5" | sort)" - pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ - $(cat ${PWD}/${base}_1_2.pid) | sort) - if [ "$pid1" = "$pid2" ]; then - echo "ok 1 - $name" - else - echo "not ok 1 - $name" - fi - [ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) - [ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) - rm -f $sleep +sleep_amount=5 +jail -c path=/ name=${base}_1_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_1_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_1_2.pid $sleep $sleep_amount & + +jid1=$(jail_name_to_jid ${base}_1_1) +jid2=$(jail_name_to_jid ${base}_1_2) +jid="${jid1},${jid2}" +pid1="$(pgrep -f -x -j $jid "$sleep $sleep_amount" | sort)" +pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_1_1.pid)" \ + $(cat ${PWD}/${base}_1_2.pid) | sort) +if [ "$pid1" = "$pid2" ]; then + echo "ok 1 - $name" else - echo "ok 1 - $name # skip Test needs uid 0." + echo "not ok 1 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_1_1.pid ] && kill $(cat ${PWD}/${base}_1_1.pid) +[ -f ${PWD}/${base}_1_2.pid ] && kill $(cat ${PWD}/${base}_1_2.pid) +wait name="pgrep -j any" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_1.pid $sleep 5 & - - jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_2_2.pid $sleep 5 & - - sleep 2 - pid1="$(pgrep -f -x -j any "$sleep 5" | sort)" - pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ - $(cat ${PWD}/${base}_2_2.pid) | sort) - if [ "$pid1" = "$pid2" ]; then - echo "ok 2 - $name" - else - echo "not ok 2 - $name" - fi - [ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) - [ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) - rm -f $sleep +sleep_amount=6 +jail -c path=/ name=${base}_2_1 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_1.pid $sleep $sleep_amount & + +jail -c path=/ name=${base}_2_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_2_2.pid $sleep $sleep_amount & + +sleep 2 +pid1="$(pgrep -f -x -j any "$sleep $sleep_amount" | sort)" +pid2=$(printf "%s\n%s" "$(cat ${PWD}/${base}_2_1.pid)" \ + $(cat ${PWD}/${base}_2_2.pid) | sort) +if [ "$pid1" = "$pid2" ]; then + echo "ok 2 - $name" else - echo "ok 2 - $name # skip Test needs uid 0." + echo "not ok 2 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_2_1.pid ] && kill $(cat ${PWD}/${base}_2_1.pid) +[ -f ${PWD}/${base}_2_2.pid ] && kill $(cat ${PWD}/${base}_2_2.pid) +wait name="pgrep -j none" -if [ `id -u` -eq 0 ]; then - sleep=$(pwd)/sleep.txt - ln -sf /bin/sleep $sleep - daemon -p ${PWD}/${base}_3_1.pid $sleep 5 & - jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ - command=daemon -p ${PWD}/${base}_3_2.pid $sleep 5 & - sleep 2 - pid="$(pgrep -f -x -j none "$sleep 5")" - if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then - echo "ok 3 - $name" - else - echo "not ok 3 - $name" - fi - rm -f $sleep - [ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) - [ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) +sleep_amount=7 +daemon -p ${PWD}/${base}_3_1.pid $sleep $sleep_amount & +jail -c path=/ name=${base}_3_2 ip4.addr=127.0.0.1 \ + command=daemon -p ${PWD}/${base}_3_2.pid $sleep $sleep_amount & +sleep 2 +pid="$(pgrep -f -x -j none "$sleep $sleep_amount")" +if [ "$pid" = "$(cat ${PWD}/${base}_3_1.pid)" ]; then + echo "ok 3 - $name" else - echo "ok 3 - $name # skip Test needs uid 0." + echo "not ok 3 - $name # pgrep output: '$(echo $pid1)', pidfile output: '$(echo $pid2)'" fi +[ -f ${PWD}/${base}_3_1.pid ] && kill $(cat $PWD/${base}_3_1.pid) +[ -f ${PWD}/${base}_3_2.pid ] && kill $(cat $PWD/${base}_3_2.pid) + +rm -f $sleep Modified: projects/release-install-debug/contrib/binutils/ld/scripttempl/elf.sc ============================================================================== --- projects/release-install-debug/contrib/binutils/ld/scripttempl/elf.sc Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/contrib/binutils/ld/scripttempl/elf.sc Fri Feb 13 20:58:10 2015 (r278708) @@ -402,8 +402,8 @@ cat <<EOF .fini_array ${RELOCATING-0} : { ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_start = .);}} - KEEP (*(.fini_array)) KEEP (*(SORT(.fini_array.*))) + KEEP (*(.fini_array)) ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN (${USER_LABEL_PREFIX}__fini_array_end = .);}} } ${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}} Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h ============================================================================== --- projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/contrib/elftoolchain/libdwarf/_libdwarf.h Fri Feb 13 20:58:10 2015 (r278708) @@ -49,7 +49,7 @@ struct _libdwarf_globals { Dwarf_Handler errhand; Dwarf_Ptr errarg; - int applyrela; + int applyreloc; }; extern struct _libdwarf_globals _libdwarf; Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c ============================================================================== --- projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_reloc.c Fri Feb 13 20:58:10 2015 (r278708) @@ -33,8 +33,8 @@ dwarf_set_reloc_application(int apply) { int oldapply; - oldapply = _libdwarf.applyrela; - _libdwarf.applyrela = apply; + oldapply = _libdwarf.applyreloc; + _libdwarf.applyreloc = apply; return (oldapply); } Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 ============================================================================== --- projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/contrib/elftoolchain/libdwarf/dwarf_set_reloc_application.3 Fri Feb 13 20:58:10 2015 (r278708) @@ -24,7 +24,7 @@ .\" .\" $Id: dwarf_set_reloc_application.3 2075 2011-10-27 03:47:28Z jkoshy $ .\" -.Dd June 26, 2011 +.Dd February 11, 2015 .Os .Dt DWARF_SET_RELOC_APPLICATION 3 .Sh NAME @@ -47,6 +47,8 @@ handled by the DWARF(3) library. If the argument .Ar apply holds a non-zero value, the library will process all the relevant +.Dq ".rel" +and .Dq ".rela" relocation sections and will apply the relocation records found to their corresponding DWARF sections. Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c ============================================================================== --- projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf.c Fri Feb 13 20:58:10 2015 (r278708) @@ -31,5 +31,5 @@ ELFTC_VCSID("$Id: libdwarf.c 2070 2011-1 struct _libdwarf_globals _libdwarf = { .errhand = NULL, .errarg = NULL, - .applyrela = 1 + .applyreloc = 1 }; Modified: projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c ============================================================================== --- projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/contrib/elftoolchain/libdwarf/libdwarf_elf_init.c Fri Feb 13 20:58:10 2015 (r278708) @@ -50,32 +50,46 @@ static const char *debug_name[] = { }; static void -_dwarf_elf_apply_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data, - Elf_Data *symtab_data, int endian) +_dwarf_elf_write_reloc(Dwarf_Debug dbg, Elf_Data *symtab_data, int endian, + void *buf, uint64_t offset, GElf_Xword r_info, GElf_Sxword r_addend) { - Dwarf_Unsigned type; - GElf_Rela rela; GElf_Sym sym; - size_t symndx; - uint64_t offset; - int size, j; + int size; - j = 0; - while (gelf_getrela(rel_data, j++, &rela) != NULL) { - symndx = GELF_R_SYM(rela.r_info); - type = GELF_R_TYPE(rela.r_info); + if (gelf_getsym(symtab_data, GELF_R_SYM(r_info), &sym) == NULL) + return; + if ((size = _dwarf_get_reloc_size(dbg, GELF_R_TYPE(r_info))) == 0) + return; /* Unknown or non-absolute relocation. */ + if (endian == ELFDATA2MSB) + _dwarf_write_msb(buf, &offset, sym.st_value + r_addend, size); + else + _dwarf_write_lsb(buf, &offset, sym.st_value + r_addend, size); +} - if (gelf_getsym(symtab_data, symndx, &sym) == NULL) - continue; +static void +_dwarf_elf_apply_rel_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data, + Elf_Data *symtab_data, int endian) +{ + GElf_Rel rel; + int j; - offset = rela.r_offset; - size = _dwarf_get_reloc_size(dbg, type); + j = 0; + while (gelf_getrel(rel_data, j++, &rel) != NULL) + _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf, + rel.r_offset, rel.r_info, 0); +} - if (endian == ELFDATA2MSB) - _dwarf_write_msb(buf, &offset, rela.r_addend, size); - else - _dwarf_write_lsb(buf, &offset, rela.r_addend, size); - } +static void +_dwarf_elf_apply_rela_reloc(Dwarf_Debug dbg, void *buf, Elf_Data *rel_data, + Elf_Data *symtab_data, int endian) +{ + GElf_Rela rela; + int j; + + j = 0; + while (gelf_getrela(rel_data, j++, &rela) != NULL) + _dwarf_elf_write_reloc(dbg, symtab_data, endian, buf, + rela.r_offset, rela.r_info, rela.r_addend); } static int @@ -104,7 +118,8 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf return (DW_DLE_ELF); } - if (sh.sh_type != SHT_RELA || sh.sh_size == 0) + if ((sh.sh_type != SHT_REL && sh.sh_type != SHT_RELA) || + sh.sh_size == 0) continue; if (sh.sh_info == shndx && sh.sh_link == symtab) { @@ -125,8 +140,12 @@ _dwarf_elf_relocate(Dwarf_Debug dbg, Elf } memcpy(ed->ed_alloc, ed->ed_data->d_buf, ed->ed_data->d_size); - _dwarf_elf_apply_reloc(dbg, ed->ed_alloc, rel, - symtab_data, eh.e_ident[EI_DATA]); + if (sh.sh_type == SHT_REL) + _dwarf_elf_apply_rel_reloc(dbg, ed->ed_alloc, + rel, symtab_data, eh.e_ident[EI_DATA]); + else + _dwarf_elf_apply_rela_reloc(dbg, ed->ed_alloc, + rel, symtab_data, eh.e_ident[EI_DATA]); return (DW_DLE_NONE); } @@ -282,7 +301,7 @@ _dwarf_elf_init(Dwarf_Debug dbg, Elf *el } } - if (_libdwarf.applyrela) { + if (_libdwarf.applyreloc) { if (_dwarf_elf_relocate(dbg, elf, &e->eo_data[j], elf_ndxscn(scn), symtab_ndx, symtab_data, error) != DW_DLE_NONE) Modified: projects/release-install-debug/contrib/netbsd-tests/games/t_factor.sh ============================================================================== --- projects/release-install-debug/contrib/netbsd-tests/games/t_factor.sh Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/contrib/netbsd-tests/games/t_factor.sh Fri Feb 13 20:58:10 2015 (r278708) @@ -27,13 +27,13 @@ expect() { echo "${2}" >expout - atf_check -s eq:0 -o file:expout -e empty /usr/games/factor ${1} + atf_check -s eq:0 -o file:expout -e empty /usr/bin/factor ${1} } atf_test_case overflow overflow_head() { atf_set "descr" "Tests for overflow conditions" - atf_set "require.progs" "/usr/games/factor" + atf_set "require.progs" "/usr/bin/factor" } overflow_body() { expect '8675309' '8675309: 8675309' @@ -44,7 +44,7 @@ atf_test_case loop loop_head() { atf_set "descr" "Tests some cases that once locked the program" \ "in an infinite loop" - atf_set "require.progs" "/usr/games/factor" + atf_set "require.progs" "/usr/bin/factor" } loop_body() { expect '99999999999991' '99999999999991: 7 13 769231 1428571' Modified: projects/release-install-debug/etc/login.conf ============================================================================== --- projects/release-install-debug/etc/login.conf Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/login.conf Fri Feb 13 20:58:10 2015 (r278708) @@ -27,7 +27,7 @@ default:\ :copyright=/etc/COPYRIGHT:\ :welcome=/etc/motd:\ :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\ - :path=/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin ~/bin:\ + :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin ~/bin:\ :nologin=/var/run/nologin:\ :cputime=unlimited:\ :datasize=unlimited:\ Modified: projects/release-install-debug/etc/master.passwd ============================================================================== --- projects/release-install-debug/etc/master.passwd Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/master.passwd Fri Feb 13 20:58:10 2015 (r278708) @@ -7,7 +7,7 @@ operator:*:2:5::0:0:System &:/:/usr/sbin bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin -games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin +games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin Modified: projects/release-install-debug/etc/mtree/BSD.debug.dist ============================================================================== --- projects/release-install-debug/etc/mtree/BSD.debug.dist Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/mtree/BSD.debug.dist Fri Feb 13 20:58:10 2015 (r278708) @@ -21,8 +21,6 @@ usr bin .. - games - .. lib clang 3.5.1 Modified: projects/release-install-debug/etc/mtree/BSD.usr.dist ============================================================================== --- projects/release-install-debug/etc/mtree/BSD.usr.dist Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/mtree/BSD.usr.dist Fri Feb 13 20:58:10 2015 (r278708) @@ -7,8 +7,6 @@ . bin .. - games - .. include .. lib Modified: projects/release-install-debug/etc/rc.d/LOGIN ============================================================================== --- projects/release-install-debug/etc/rc.d/LOGIN Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/rc.d/LOGIN Fri Feb 13 20:58:10 2015 (r278708) @@ -4,7 +4,7 @@ # # PROVIDE: LOGIN -# REQUIRE: DAEMON utx +# REQUIRE: DAEMON # This is a dummy dependency to ensure user services such as xdm, # inetd, cron and kerberos are started after everything else, in case Modified: projects/release-install-debug/etc/rc.d/NETWORKING ============================================================================== --- projects/release-install-debug/etc/rc.d/NETWORKING Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/rc.d/NETWORKING Fri Feb 13 20:58:10 2015 (r278708) @@ -6,7 +6,7 @@ # PROVIDE: NETWORKING NETWORK # REQUIRE: netif netoptions routing ppp ipfw stf # REQUIRE: defaultroute routed route6d mroute6d resolv bridge -# REQUIRE: static_arp static_ndp local_unbound +# REQUIRE: static_arp static_ndp # This is a dummy dependency, for services which require networking # to be operational before starting. Modified: projects/release-install-debug/etc/rc.d/local_unbound ============================================================================== --- projects/release-install-debug/etc/rc.d/local_unbound Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/rc.d/local_unbound Fri Feb 13 20:58:10 2015 (r278708) @@ -5,6 +5,7 @@ # PROVIDE: local_unbound # REQUIRE: FILESYSTEMS netif resolv +# BEFORE: NETWORKING # KEYWORD: shutdown . /etc/rc.subr Modified: projects/release-install-debug/etc/rc.d/utx ============================================================================== --- projects/release-install-debug/etc/rc.d/utx Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/rc.d/utx Fri Feb 13 20:58:10 2015 (r278708) @@ -5,6 +5,7 @@ # PROVIDE: utx # REQUIRE: DAEMON FILESYSTEMS +# BEFORE: LOGIN # KEYWORD: shutdown . /etc/rc.subr Modified: projects/release-install-debug/etc/root/dot.cshrc ============================================================================== --- projects/release-install-debug/etc/root/dot.cshrc Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/root/dot.cshrc Fri Feb 13 20:58:10 2015 (r278708) @@ -15,7 +15,7 @@ alias ll ls -lAF # A righteous umask umask 22 -set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) +set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin) setenv EDITOR vi setenv PAGER more Modified: projects/release-install-debug/etc/root/dot.login ============================================================================== --- projects/release-install-debug/etc/root/dot.login Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/root/dot.login Fri Feb 13 20:58:10 2015 (r278708) @@ -6,4 +6,4 @@ # # Uncomment to display a random cookie each login: -# if ( -x /usr/games/fortune ) /usr/games/fortune -s +# if ( -x /usr/bin/fortune ) /usr/bin/fortune -s Modified: projects/release-install-debug/etc/root/dot.profile ============================================================================== --- projects/release-install-debug/etc/root/dot.profile Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/etc/root/dot.profile Fri Feb 13 20:58:10 2015 (r278708) @@ -1,6 +1,6 @@ # $FreeBSD$ # -PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:~/bin +PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin export PATH HOME=/root export HOME Modified: projects/release-install-debug/games/Makefile.inc ============================================================================== --- projects/release-install-debug/games/Makefile.inc Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/games/Makefile.inc Fri Feb 13 20:58:10 2015 (r278708) @@ -1,7 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 # $FreeBSD$ -BINDIR?= /usr/games +BINDIR?= /usr/bin FILESDIR?= ${SHAREDIR}/games WARNS?= 6 -DISTRIBUTION?= games Modified: projects/release-install-debug/games/caesar/rot13.sh ============================================================================== --- projects/release-install-debug/games/caesar/rot13.sh Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/games/caesar/rot13.sh Fri Feb 13 20:58:10 2015 (r278708) @@ -30,4 +30,4 @@ # @(#)rot13.sh 8.1 (Berkeley) 5/31/93 # $FreeBSD$ -exec /usr/games/caesar 13 "$@" +exec /usr/bin/caesar 13 "$@" Modified: projects/release-install-debug/games/fortune/datfiles/Makefile ============================================================================== --- projects/release-install-debug/games/fortune/datfiles/Makefile Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/games/fortune/datfiles/Makefile Fri Feb 13 20:58:10 2015 (r278708) @@ -15,7 +15,7 @@ FILESDIR= ${SHAREDIR}/games/fortune .for f in ${DB} $f.dat: $f - PATH=$$PATH:/usr/games:${.OBJDIR}/../strfile \ + PATH=$$PATH:/usr/bin:${.OBJDIR}/../strfile \ strfile -Cs ${.ALLSRC} ${.TARGET} .endfor Modified: projects/release-install-debug/include/stdio.h ============================================================================== --- projects/release-install-debug/include/stdio.h Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/include/stdio.h Fri Feb 13 20:58:10 2015 (r278708) @@ -166,7 +166,7 @@ __END_DECLS #define __SRW 0x0010 /* open for reading & writing */ #define __SEOF 0x0020 /* found EOF */ #define __SERR 0x0040 /* found error */ -#define __SMBF 0x0080 /* _buf is from malloc */ +#define __SMBF 0x0080 /* _bf._base is from malloc */ #define __SAPP 0x0100 /* fdopen()ed in append mode */ #define __SSTR 0x0200 /* this is an sprintf/snprintf string */ #define __SOPT 0x0400 /* do fseek() optimization */ Modified: projects/release-install-debug/lib/libproc/proc_sym.c ============================================================================== --- projects/release-install-debug/lib/libproc/proc_sym.c Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/lib/libproc/proc_sym.c Fri Feb 13 20:58:10 2015 (r278708) @@ -82,6 +82,21 @@ fail: strlcpy(buf, symbol, len); } +static int +find_dbg_obj(const char *path) +{ + int fd; + char dbg_path[PATH_MAX]; + + snprintf(dbg_path, sizeof(dbg_path), + "/usr/lib/debug/%s.debug", path); + fd = open(dbg_path, O_RDONLY); + if (fd > 0) + return (fd); + else + return (open(path, O_RDONLY)); +} + static void proc_rdl2prmap(rd_loadobj_t *rdl, prmap_t *map) { @@ -295,7 +310,7 @@ proc_addr2sym(struct proc_handle *p, uin if ((map = proc_addr2map(p, addr)) == NULL) return (-1); - if ((fd = open(map->pr_mapname, O_RDONLY, 0)) < 0) { + if ((fd = find_dbg_obj(map->pr_mapname)) < 0) { DPRINTF("ERROR: open %s failed", map->pr_mapname); goto err0; } @@ -443,7 +458,7 @@ proc_name2sym(struct proc_handle *p, con DPRINTFX("ERROR: couldn't find object %s", object); goto err0; } - if ((fd = open(map->pr_mapname, O_RDONLY, 0)) < 0) { + if ((fd = find_dbg_obj(map->pr_mapname)) < 0) { DPRINTF("ERROR: open %s failed", map->pr_mapname); goto err0; } @@ -539,7 +554,7 @@ proc_iter_symbyaddr(struct proc_handle * if ((map = proc_name2map(p, object)) == NULL) return (-1); - if ((fd = open(map->pr_mapname, O_RDONLY)) < 0) { + if ((fd = find_dbg_obj(map->pr_mapname)) < 0) { DPRINTF("ERROR: open %s failed", map->pr_mapname); goto err0; } Modified: projects/release-install-debug/lib/libthr/libthr.3 ============================================================================== --- projects/release-install-debug/lib/libthr/libthr.3 Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/lib/libthr/libthr.3 Fri Feb 13 20:58:10 2015 (r278708) @@ -1,5 +1,5 @@ .\" Copyright (c) 2005 Robert N. M. Watson -.\" Copyright (c) 2014 The FreeBSD Foundation, Inc. +.\" Copyright (c) 2014,2015 The FreeBSD Foundation, Inc. .\" All rights reserved. .\" .\" Part of this documentation was written by @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 26, 2014 +.Dd February 12, 2015 .Dt LIBTHR 3 .Os .Sh NAME @@ -200,45 +200,25 @@ Bigger values reduce the frequency of th The value must be between 0 and 255. .El .Sh INTERACTION WITH RUN-TIME LINKER -The +On load, .Nm -library must appear before -.Li libc -in the global order of depended objects. -.Pp -Loading -.Nm -with the -.Xr dlopen 3 -call in the process after the program binary is activated -is not supported, and causes miscellaneous and hard-to-diagnose misbehaviour. -This is due to -.Nm -interposing several important -.Li libc -symbols to provide thread-safe services. -In particular, -.Dv errno -and the locking stubs from -.Li libc -are affected. -This requirement is currently not enforced. -.Pp -If the program loads any modules at run-time, and those modules may require -threading services, the main program binary must be linked with -.Li libpthread , -even if it does not require any services from the library. +installs interposing handlers into the hooks exported by +.Li libc . +The interposers provide real locking implementation instead of the +stubs for single-threaded processes in +.Li , +cancellation support and some modifications to the signal operations. .Pp .Nm cannot be unloaded; the .Xr dlclose 3 function does not perform any action when called with a handle for .Nm . -One of the reasons is that the interposing of +One of the reasons is that the internal interposing of .Li libc functions cannot be undone. .Sh SIGNALS -The implementation also interposes the user-installed +The implementation interposes the user-installed .Xr signal 3 handlers. This interposing is done to postpone signal delivery to threads which Modified: projects/release-install-debug/release/scripts/make-manifest.sh ============================================================================== --- projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/release/scripts/make-manifest.sh Fri Feb 13 20:58:10 2015 (r278708) @@ -11,7 +11,6 @@ base="Base system" doc="Additional Documentation" -games="Games (fortune, etc.)" kernel="Kernel" ports="Ports tree" src="System source tree" @@ -21,8 +20,6 @@ tests="Test suite" desc_base="${base} (MANDATORY)" desc_base_dbg="${base} (Debugging)" desc_doc="${doc}" -desc_games="${games}" -desc_games_dbg="${games} (Debugging)" desc_kernel="${kernel} (MANDATORY)" desc_kernel_dbg="${kernel} (Debugging)" desc_kernel_alt="Alternate ${kernel}" @@ -37,7 +34,6 @@ default_doc=off default_src=off default_tests=off default_base_dbg=off -default_games_dbg=off default_lib32_dbg=off default_kernel_alt=off default_kernel_dbg=on Modified: projects/release-install-debug/sbin/sysctl/sysctl.8 ============================================================================== --- projects/release-install-debug/sbin/sysctl/sysctl.8 Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/sbin/sysctl/sysctl.8 Fri Feb 13 20:58:10 2015 (r278708) @@ -28,7 +28,7 @@ .\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd December 13, 2012 +.Dd February 12, 2015 .Dt SYSCTL 8 .Os .Sh NAME @@ -37,11 +37,13 @@ .Sh SYNOPSIS .Nm .Op Fl bdehiNnoRTqx +.Op Fl B Ar bufsize .Op Fl f Ar filename .Ar name Ns Op = Ns Ar value .Ar ... .Nm .Op Fl bdehNnoRTqx +.Op Fl B Ar bufsize .Fl a .Sh DESCRIPTION The @@ -68,6 +70,15 @@ the command line. Force the value of the variable(s) to be output in raw, binary format. No names are printed and no terminating newlines are output. This is mostly useful with a single variable. +.It Fl B Ar bufsize +Set the buffer size to read from the +.Nm +to +.Ar bufsize . +This is necessary for a +.Nm +that has variable length, and the probe value of 0 is a valid length, such as +.Va kern.arandom . .It Fl d Print the description of the variable instead of its value. .It Fl e @@ -128,7 +139,7 @@ Suppress some warnings generated by .Nm to standard error. .It Fl T -Display only variables that are setable via loader (CTLFLAG_TUN). +Display only variables that are settable via loader (CTLFLAG_TUN). .It Fl W Display only writable variables that are not statistical. Useful for determining the set of runtime tunable sysctls. Modified: projects/release-install-debug/sbin/sysctl/sysctl.c ============================================================================== --- projects/release-install-debug/sbin/sysctl/sysctl.c Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/sbin/sysctl/sysctl.c Fri Feb 13 20:58:10 2015 (r278708) @@ -71,7 +71,7 @@ static const char rcsid[] = static const char *conffile; -static int aflag, bflag, dflag, eflag, hflag, iflag; +static int aflag, bflag, Bflag, dflag, eflag, hflag, iflag; static int Nflag, nflag, oflag, qflag, Tflag, Wflag, xflag; static int oidfmt(int *, int, char *, u_int *); @@ -112,8 +112,8 @@ usage(void) { (void)fprintf(stderr, "%s\n%s\n", - "usage: sysctl [-bdehiNnoqTWx] [-f filename] name[=value] ...", - " sysctl [-bdehNnoqTWx] -a"); + "usage: sysctl [-bdehiNnoqTWx] [ -B <bufsize> ] [-f filename] name[=value] ...", + " sysctl [-bdehNnoqTWx] [ -B <bufsize> ] -a"); exit(1); } @@ -127,7 +127,7 @@ main(int argc, char **argv) setbuf(stdout,0); setbuf(stderr,0); - while ((ch = getopt(argc, argv, "Aabdef:hiNnoqTwWxX")) != -1) { + while ((ch = getopt(argc, argv, "AabB:def:hiNnoqTwWxX")) != -1) { switch (ch) { case 'A': /* compatibility */ @@ -139,6 +139,9 @@ main(int argc, char **argv) case 'b': bflag = 1; break; + case 'B': + Bflag = strtol(optarg, NULL, 0); + break; case 'd': dflag = 1; break; @@ -222,7 +225,7 @@ parse(const char *string, int lineno) unsigned int uintval; long longval; unsigned long ulongval; - size_t newsize = 0; + size_t newsize = Bflag; int64_t i64val; uint64_t u64val; int mib[CTL_MAXNAME]; @@ -815,9 +818,13 @@ show_var(int *oid, int nlen) return (0); } /* find an estimate of how much we need for this var */ - j = 0; - i = sysctl(oid, nlen, 0, &j, 0, 0); - j += j; /* we want to be sure :-) */ + if (Bflag) + j = Bflag; + else { + j = 0; + i = sysctl(oid, nlen, 0, &j, 0, 0); + j += j; /* we want to be sure :-) */ + } val = oval = malloc(j + 1); if (val == NULL) { Modified: projects/release-install-debug/share/man/man4/led.4 ============================================================================== --- projects/release-install-debug/share/man/man4/led.4 Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/share/man/man4/led.4 Fri Feb 13 20:58:10 2015 (r278708) @@ -170,7 +170,7 @@ flashes .Pp .Dl *_*__**_ .Bd -literal -/usr/games/morse -l "Soekris rocks" > /dev/led/error +/usr/bin/morse -l "Soekris rocks" > /dev/led/error .Ed .Sh SEE ALSO .Xr morse 6 Modified: projects/release-install-debug/share/man/man6/intro.6 ============================================================================== --- projects/release-install-debug/share/man/man6/intro.6 Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/share/man/man6/intro.6 Fri Feb 13 20:58:10 2015 (r278708) @@ -37,7 +37,7 @@ This section contains information about games. The games are located in -.Pa /usr/games +.Pa /usr/bin if installed. You can get a short overview about all the games with the command: @@ -45,13 +45,18 @@ command: $ apropos '\\(6\\)' .Ed .Sh FILES -.Bl -tag -width /usr/games -compact -.It Pa /usr/games +.Bl -tag -width /usr/bin -compact +.It Pa /usr/bin location of games .El .Sh SEE ALSO .Xr intro 1 .Sh HISTORY +In earlier versions of +.Fx , +games were located in +.Pa /usr/games . +.Pp The .Nm section manual page appeared in Modified: projects/release-install-debug/share/man/man7/hier.7 ============================================================================== --- projects/release-install-debug/share/man/man7/hier.7 Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/share/man/man7/hier.7 Fri Feb 13 20:58:10 2015 (r278708) @@ -187,8 +187,6 @@ common utilities, programming tools, and .It Pa compat/ files needed to support binary compatibility with other operating systems, such as Linux -.It Pa games/ -useful and semi-frivolous programs .It Pa include/ standard C include files .Pp Modified: projects/release-install-debug/share/mk/bsd.lib.mk ============================================================================== --- projects/release-install-debug/share/mk/bsd.lib.mk Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/share/mk/bsd.lib.mk Fri Feb 13 20:58:10 2015 (r278708) @@ -286,7 +286,7 @@ _EXTRADEPEND: mv $$TMP ${DEPENDFILE} .if !defined(NO_EXTRADEPEND) && defined(SHLIB_NAME) .if defined(DPADD) && !empty(DPADD) - echo ${SHLIB_NAME}: ${DPADD} >> ${DEPENDFILE} + echo ${SHLIB_NAME_FULL}: ${DPADD} >> ${DEPENDFILE} .endif .endif Modified: projects/release-install-debug/share/mk/bsd.prog.mk ============================================================================== --- projects/release-install-debug/share/mk/bsd.prog.mk Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/share/mk/bsd.prog.mk Fri Feb 13 20:58:10 2015 (r278708) @@ -62,7 +62,7 @@ PROG_FULL=${PROG}.full ${BINDIR} == "/bin" ||\ ${BINDIR} == "/libexec" ||\ ${BINDIR} == "/sbin" ||\ - ${BINDIR:C%/usr/(bin|bsdinstall|games|libexec|lpr|sendmail|sm.bin|sbin)(/.*)?%/usr/bin%} == "/usr/bin"\ + ${BINDIR:C%/usr/(bin|bsdinstall|libexec|lpr|sendmail|sm.bin|sbin)(/.*)?%/usr/bin%} == "/usr/bin"\ ) DEBUGFILEDIR= ${DEBUGDIR}${BINDIR} .else @@ -168,15 +168,15 @@ CLEANFILES+= ${OBJS} _EXTRADEPEND: .if defined(LDFLAGS) && !empty(LDFLAGS:M-nostdlib) .if defined(DPADD) && !empty(DPADD) - echo ${PROG}: ${DPADD} >> ${DEPENDFILE} + echo ${PROG_FULL}: ${DPADD} >> ${DEPENDFILE} .endif .else - echo ${PROG}: ${LIBC} ${DPADD} >> ${DEPENDFILE} + echo ${PROG_FULL}: ${LIBC} ${DPADD} >> ${DEPENDFILE} .if defined(PROG_CXX) .if ${COMPILER_TYPE} == "clang" && empty(CXXFLAGS:M-stdlib=libstdc++) - echo ${PROG}: ${LIBCPLUSPLUS} >> ${DEPENDFILE} + echo ${PROG_FULL}: ${LIBCPLUSPLUS} >> ${DEPENDFILE} .else - echo ${PROG}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE} + echo ${PROG_FULL}: ${LIBSTDCPLUSPLUS} >> ${DEPENDFILE} .endif .endif .endif Modified: projects/release-install-debug/share/skel/dot.cshrc ============================================================================== --- projects/release-install-debug/share/skel/dot.cshrc Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/share/skel/dot.cshrc Fri Feb 13 20:58:10 2015 (r278708) @@ -14,7 +14,7 @@ alias ll ls -lAF # These are normally set through /etc/login.conf. You may override them here # if wanted. -# set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin $HOME/bin) +# set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin) # setenv BLOCKSIZE K # A righteous umask # umask 22 Modified: projects/release-install-debug/share/skel/dot.login ============================================================================== --- projects/release-install-debug/share/skel/dot.login Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/share/skel/dot.login Fri Feb 13 20:58:10 2015 (r278708) @@ -5,4 +5,4 @@ # see also csh(1), environ(7). # -if ( -x /usr/games/fortune ) /usr/games/fortune freebsd-tips +if ( -x /usr/bin/fortune ) /usr/bin/fortune freebsd-tips Modified: projects/release-install-debug/share/skel/dot.profile ============================================================================== --- projects/release-install-debug/share/skel/dot.profile Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/share/skel/dot.profile Fri Feb 13 20:58:10 2015 (r278708) @@ -7,7 +7,7 @@ # These are normally set through /etc/login.conf. You may override them here # if wanted. -# PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH +# PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:$HOME/bin; export PATH # BLOCKSIZE=K; export BLOCKSIZE # Setting TERM is normally done through /etc/ttys. Do only override @@ -21,4 +21,4 @@ PAGER=more; export PAGER # set ENV to a file invoked each time sh is started for interactive use. ENV=$HOME/.shrc; export ENV -if [ -x /usr/games/fortune ] ; then /usr/games/fortune freebsd-tips ; fi +if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune freebsd-tips ; fi Modified: projects/release-install-debug/sys/amd64/amd64/db_disasm.c ============================================================================== --- projects/release-install-debug/sys/amd64/amd64/db_disasm.c Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/sys/amd64/amd64/db_disasm.c Fri Feb 13 20:58:10 2015 (r278708) @@ -250,6 +250,26 @@ static const struct inst db_inst_0f0x[] /*0f*/ { "", FALSE, NONE, 0, 0 }, }; +static const struct inst db_inst_0f1x[] = { +/*10*/ { "", FALSE, NONE, 0, 0 }, +/*11*/ { "", FALSE, NONE, 0, 0 }, +/*12*/ { "", FALSE, NONE, 0, 0 }, +/*13*/ { "", FALSE, NONE, 0, 0 }, +/*14*/ { "", FALSE, NONE, 0, 0 }, +/*15*/ { "", FALSE, NONE, 0, 0 }, +/*16*/ { "", FALSE, NONE, 0, 0 }, +/*17*/ { "", FALSE, NONE, 0, 0 }, + +/*18*/ { "", FALSE, NONE, 0, 0 }, +/*19*/ { "", FALSE, NONE, 0, 0 }, +/*1a*/ { "", FALSE, NONE, 0, 0 }, +/*1b*/ { "", FALSE, NONE, 0, 0 }, +/*1c*/ { "", FALSE, NONE, 0, 0 }, +/*1d*/ { "", FALSE, NONE, 0, 0 }, +/*1e*/ { "", FALSE, NONE, 0, 0 }, +/*1f*/ { "nopl", TRUE, SDEP, 0, "nopw" }, +}; + static const struct inst db_inst_0f2x[] = { /*20*/ { "mov", TRUE, LONG, op2(CR,El), 0 }, /*21*/ { "mov", TRUE, LONG, op2(DR,El), 0 }, @@ -431,7 +451,7 @@ static const struct inst db_inst_0fcx[] static const struct inst * const db_inst_0f[] = { db_inst_0f0x, - 0, + db_inst_0f1x, db_inst_0f2x, db_inst_0f3x, db_inst_0f4x, Modified: projects/release-install-debug/sys/cam/ctl/ctl.c ============================================================================== --- projects/release-install-debug/sys/cam/ctl/ctl.c Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/sys/cam/ctl/ctl.c Fri Feb 13 20:58:10 2015 (r278708) @@ -11646,7 +11646,8 @@ ctl_clear_ua(struct ctl_softc *ctl_softc STAILQ_FOREACH(lun, &ctl_softc->lun_list, links) { mtx_lock(&lun->lun_lock); pu = lun->pending_ua[initidx / CTL_MAX_INIT_PER_PORT]; - pu[initidx % CTL_MAX_INIT_PER_PORT] &= ~ua_type; + if (pu != NULL) + pu[initidx % CTL_MAX_INIT_PER_PORT] &= ~ua_type; mtx_unlock(&lun->lun_lock); } } Modified: projects/release-install-debug/sys/cam/ctl/ctl_backend_block.c ============================================================================== --- projects/release-install-debug/sys/cam/ctl/ctl_backend_block.c Fri Feb 13 20:53:20 2015 (r278707) +++ projects/release-install-debug/sys/cam/ctl/ctl_backend_block.c Fri Feb 13 20:58:10 2015 (r278708) @@ -1188,6 +1188,7 @@ ctl_be_block_cw_dispatch_ws(struct ctl_b struct ctl_be_block_softc *softc; struct ctl_lba_len_flags *lbalen; uint64_t len_left, lba; + uint32_t pb, pbo, adj; int i, seglen; uint8_t *buf, *end; @@ -1241,6 +1242,11 @@ ctl_be_block_cw_dispatch_ws(struct ctl_b *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502132058.t1DKwB7q088701>