Index: stable/8/Makefile =================================================================== --- stable/8/Makefile (revision 215813) +++ stable/8/Makefile (revision 215814) Property changes on: stable/8/Makefile ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/Makefile:r201217 Index: stable/8/Makefile.inc1 =================================================================== --- stable/8/Makefile.inc1 (revision 215813) +++ stable/8/Makefile.inc1 (revision 215814) Property changes on: stable/8/Makefile.inc1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/Makefile.inc1:r201217 Index: stable/8/ObsoleteFiles.inc =================================================================== --- stable/8/ObsoleteFiles.inc (revision 215813) +++ stable/8/ObsoleteFiles.inc (revision 215814) Property changes on: stable/8/ObsoleteFiles.inc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/ObsoleteFiles.inc:r201217 Index: stable/8/UPDATING =================================================================== --- stable/8/UPDATING (revision 215813) +++ stable/8/UPDATING (revision 215814) Property changes on: stable/8/UPDATING ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/UPDATING:r201217 Index: stable/8/bin/chio =================================================================== --- stable/8/bin/chio (revision 215813) +++ stable/8/bin/chio (revision 215814) Property changes on: stable/8/bin/chio ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/chio:r201217 Index: stable/8/bin/chmod =================================================================== --- stable/8/bin/chmod (revision 215813) +++ stable/8/bin/chmod (revision 215814) Property changes on: stable/8/bin/chmod ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/chmod:r201217 Index: stable/8/bin/cp =================================================================== --- stable/8/bin/cp (revision 215813) +++ stable/8/bin/cp (revision 215814) Property changes on: stable/8/bin/cp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/cp:r201217 Index: stable/8/bin/csh =================================================================== --- stable/8/bin/csh (revision 215813) +++ stable/8/bin/csh (revision 215814) Property changes on: stable/8/bin/csh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/csh:r201217 Index: stable/8/bin/date =================================================================== --- stable/8/bin/date (revision 215813) +++ stable/8/bin/date (revision 215814) Property changes on: stable/8/bin/date ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/date:r201217 Index: stable/8/bin/echo =================================================================== --- stable/8/bin/echo (revision 215813) +++ stable/8/bin/echo (revision 215814) Property changes on: stable/8/bin/echo ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/echo:r201217 Index: stable/8/bin/expr =================================================================== --- stable/8/bin/expr (revision 215813) +++ stable/8/bin/expr (revision 215814) Property changes on: stable/8/bin/expr ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/expr:r201217 Index: stable/8/bin/getfacl =================================================================== --- stable/8/bin/getfacl (revision 215813) +++ stable/8/bin/getfacl (revision 215814) Property changes on: stable/8/bin/getfacl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/getfacl:r201217 Index: stable/8/bin/kill =================================================================== --- stable/8/bin/kill (revision 215813) +++ stable/8/bin/kill (revision 215814) Property changes on: stable/8/bin/kill ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/kill:r201217 Index: stable/8/bin/ln =================================================================== --- stable/8/bin/ln (revision 215813) +++ stable/8/bin/ln (revision 215814) Property changes on: stable/8/bin/ln ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/ln:r201217 Index: stable/8/bin/ls =================================================================== --- stable/8/bin/ls (revision 215813) +++ stable/8/bin/ls (revision 215814) Property changes on: stable/8/bin/ls ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/ls:r201217 Index: stable/8/bin/mv =================================================================== --- stable/8/bin/mv (revision 215813) +++ stable/8/bin/mv (revision 215814) Property changes on: stable/8/bin/mv ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/mv:r201217 Index: stable/8/bin/pax =================================================================== --- stable/8/bin/pax (revision 215813) +++ stable/8/bin/pax (revision 215814) Property changes on: stable/8/bin/pax ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/pax:r201217 Index: stable/8/bin/pkill =================================================================== --- stable/8/bin/pkill (revision 215813) +++ stable/8/bin/pkill (revision 215814) Property changes on: stable/8/bin/pkill ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/pkill:r201217 Index: stable/8/bin/ps =================================================================== --- stable/8/bin/ps (revision 215813) +++ stable/8/bin/ps (revision 215814) Property changes on: stable/8/bin/ps ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/ps:r201217 Index: stable/8/bin/pwait =================================================================== --- stable/8/bin/pwait (revision 215813) +++ stable/8/bin/pwait (revision 215814) Property changes on: stable/8/bin/pwait ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/pwait:r201217 Index: stable/8/bin/setfacl =================================================================== --- stable/8/bin/setfacl (revision 215813) +++ stable/8/bin/setfacl (revision 215814) Property changes on: stable/8/bin/setfacl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/setfacl:r201217 Index: stable/8/bin/sh =================================================================== --- stable/8/bin/sh (revision 215813) +++ stable/8/bin/sh (revision 215814) Property changes on: stable/8/bin/sh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/sh:r201217 Index: stable/8/bin/sleep =================================================================== --- stable/8/bin/sleep (revision 215813) +++ stable/8/bin/sleep (revision 215814) Property changes on: stable/8/bin/sleep ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/sleep:r201217 Index: stable/8/bin/test =================================================================== --- stable/8/bin/test (revision 215813) +++ stable/8/bin/test (revision 215814) Property changes on: stable/8/bin/test ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin/test:r201217 Index: stable/8/bin =================================================================== --- stable/8/bin (revision 215813) +++ stable/8/bin (revision 215814) Property changes on: stable/8/bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/bin:r201217 Index: stable/8/cddl/compat/opensolaris =================================================================== --- stable/8/cddl/compat/opensolaris (revision 215813) +++ stable/8/cddl/compat/opensolaris (revision 215814) Property changes on: stable/8/cddl/compat/opensolaris ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/cddl/compat/opensolaris:r201217 Index: stable/8/cddl/contrib/opensolaris =================================================================== --- stable/8/cddl/contrib/opensolaris (revision 215813) +++ stable/8/cddl/contrib/opensolaris (revision 215814) Property changes on: stable/8/cddl/contrib/opensolaris ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/cddl/contrib/opensolaris:r201217 Index: stable/8/cddl/lib/libnvpair =================================================================== --- stable/8/cddl/lib/libnvpair (revision 215813) +++ stable/8/cddl/lib/libnvpair (revision 215814) Property changes on: stable/8/cddl/lib/libnvpair ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/cddl/lib/libnvpair:r201217 Index: stable/8/cddl/lib/libzpool =================================================================== --- stable/8/cddl/lib/libzpool (revision 215813) +++ stable/8/cddl/lib/libzpool (revision 215814) Property changes on: stable/8/cddl/lib/libzpool ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/cddl/lib/libzpool:r201217 Index: stable/8/cddl/lib =================================================================== --- stable/8/cddl/lib (revision 215813) +++ stable/8/cddl/lib (revision 215814) Property changes on: stable/8/cddl/lib ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/cddl/lib:r201217 Index: stable/8/cddl/usr.bin =================================================================== --- stable/8/cddl/usr.bin (revision 215813) +++ stable/8/cddl/usr.bin (revision 215814) Property changes on: stable/8/cddl/usr.bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/cddl/usr.bin:r201217 Index: stable/8/cddl/usr.sbin =================================================================== --- stable/8/cddl/usr.sbin (revision 215813) +++ stable/8/cddl/usr.sbin (revision 215814) Property changes on: stable/8/cddl/usr.sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/cddl/usr.sbin:r201217 Index: stable/8/contrib/bind9 =================================================================== --- stable/8/contrib/bind9 (revision 215813) +++ stable/8/contrib/bind9 (revision 215814) Property changes on: stable/8/contrib/bind9 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/bind9:r201217 Index: stable/8/contrib/binutils =================================================================== --- stable/8/contrib/binutils (revision 215813) +++ stable/8/contrib/binutils (revision 215814) Property changes on: stable/8/contrib/binutils ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/binutils:r201217 Index: stable/8/contrib/bsnmp/snmpd/bsnmpd.1 =================================================================== --- stable/8/contrib/bsnmp/snmpd/bsnmpd.1 (revision 215813) +++ stable/8/contrib/bsnmp/snmpd/bsnmpd.1 (revision 215814) Property changes on: stable/8/contrib/bsnmp/snmpd/bsnmpd.1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/bsnmp/snmpd/bsnmpd.1:r201217 Index: stable/8/contrib/bsnmp =================================================================== --- stable/8/contrib/bsnmp (revision 215813) +++ stable/8/contrib/bsnmp (revision 215814) Property changes on: stable/8/contrib/bsnmp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/bsnmp:r201217 Index: stable/8/contrib/bzip2 =================================================================== --- stable/8/contrib/bzip2 (revision 215813) +++ stable/8/contrib/bzip2 (revision 215814) Property changes on: stable/8/contrib/bzip2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/bzip2:r201217 Index: stable/8/contrib/com_err =================================================================== --- stable/8/contrib/com_err (revision 215813) +++ stable/8/contrib/com_err (revision 215814) Property changes on: stable/8/contrib/com_err ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/com_err:r201217 Index: stable/8/contrib/csup =================================================================== --- stable/8/contrib/csup (revision 215813) +++ stable/8/contrib/csup (revision 215814) Property changes on: stable/8/contrib/csup ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/csup:r201217 Index: stable/8/contrib/ee =================================================================== --- stable/8/contrib/ee (revision 215813) +++ stable/8/contrib/ee (revision 215814) Property changes on: stable/8/contrib/ee ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ee:r201217 Index: stable/8/contrib/expat =================================================================== --- stable/8/contrib/expat (revision 215813) +++ stable/8/contrib/expat (revision 215814) Property changes on: stable/8/contrib/expat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/expat:r201217 Index: stable/8/contrib/file =================================================================== --- stable/8/contrib/file (revision 215813) +++ stable/8/contrib/file (revision 215814) Property changes on: stable/8/contrib/file ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/file:r201217 Index: stable/8/contrib/gcc =================================================================== --- stable/8/contrib/gcc (revision 215813) +++ stable/8/contrib/gcc (revision 215814) Property changes on: stable/8/contrib/gcc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/gcc:r201217 Index: stable/8/contrib/gdb =================================================================== --- stable/8/contrib/gdb (revision 215813) +++ stable/8/contrib/gdb (revision 215814) Property changes on: stable/8/contrib/gdb ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/gdb:r201217 Index: stable/8/contrib/gdtoa =================================================================== --- stable/8/contrib/gdtoa (revision 215813) +++ stable/8/contrib/gdtoa (revision 215814) Property changes on: stable/8/contrib/gdtoa ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/gdtoa:r201217 Index: stable/8/contrib/ipfilter =================================================================== --- stable/8/contrib/ipfilter (revision 215813) +++ stable/8/contrib/ipfilter (revision 215814) Property changes on: stable/8/contrib/ipfilter ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ipfilter:r201217 Index: stable/8/contrib/libpcap =================================================================== --- stable/8/contrib/libpcap (revision 215813) +++ stable/8/contrib/libpcap (revision 215814) Property changes on: stable/8/contrib/libpcap ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/libpcap:r201217 Index: stable/8/contrib/ncurses =================================================================== --- stable/8/contrib/ncurses (revision 215813) +++ stable/8/contrib/ncurses (revision 215814) Property changes on: stable/8/contrib/ncurses ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ncurses:r201217 Index: stable/8/contrib/ntp =================================================================== --- stable/8/contrib/ntp (revision 215813) +++ stable/8/contrib/ntp (revision 215814) Property changes on: stable/8/contrib/ntp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/ntp:r201217 Index: stable/8/contrib/nvi =================================================================== --- stable/8/contrib/nvi (revision 215813) +++ stable/8/contrib/nvi (revision 215814) Property changes on: stable/8/contrib/nvi ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/nvi:r201217 Index: stable/8/contrib/openbsm =================================================================== --- stable/8/contrib/openbsm (revision 215813) +++ stable/8/contrib/openbsm (revision 215814) Property changes on: stable/8/contrib/openbsm ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/openbsm:r201217 Index: stable/8/contrib/openpam =================================================================== --- stable/8/contrib/openpam (revision 215813) +++ stable/8/contrib/openpam (revision 215814) Property changes on: stable/8/contrib/openpam ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/openpam:r201217 Index: stable/8/contrib/pf =================================================================== --- stable/8/contrib/pf (revision 215813) +++ stable/8/contrib/pf (revision 215814) Property changes on: stable/8/contrib/pf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/pf:r201217 Index: stable/8/contrib/sendmail =================================================================== --- stable/8/contrib/sendmail (revision 215813) +++ stable/8/contrib/sendmail (revision 215814) Property changes on: stable/8/contrib/sendmail ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/sendmail:r201217 Index: stable/8/contrib/tcp_wrappers =================================================================== --- stable/8/contrib/tcp_wrappers (revision 215813) +++ stable/8/contrib/tcp_wrappers (revision 215814) Property changes on: stable/8/contrib/tcp_wrappers ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/tcp_wrappers:r201217 Index: stable/8/contrib/tcpdump =================================================================== --- stable/8/contrib/tcpdump (revision 215813) +++ stable/8/contrib/tcpdump (revision 215814) Property changes on: stable/8/contrib/tcpdump ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/tcpdump:r201217 Index: stable/8/contrib/tcsh =================================================================== --- stable/8/contrib/tcsh (revision 215813) +++ stable/8/contrib/tcsh (revision 215814) Property changes on: stable/8/contrib/tcsh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/tcsh:r201217 Index: stable/8/contrib/telnet =================================================================== --- stable/8/contrib/telnet (revision 215813) +++ stable/8/contrib/telnet (revision 215814) Property changes on: stable/8/contrib/telnet ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/telnet:r201217 Index: stable/8/contrib/top/install-sh =================================================================== --- stable/8/contrib/top/install-sh (revision 215813) +++ stable/8/contrib/top/install-sh (revision 215814) Property changes on: stable/8/contrib/top/install-sh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/top/install-sh:r201217 Index: stable/8/contrib/top =================================================================== --- stable/8/contrib/top (revision 215813) +++ stable/8/contrib/top (revision 215814) Property changes on: stable/8/contrib/top ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/top:r201217 Index: stable/8/contrib/traceroute =================================================================== --- stable/8/contrib/traceroute (revision 215813) +++ stable/8/contrib/traceroute (revision 215814) Property changes on: stable/8/contrib/traceroute ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/traceroute:r201217 Index: stable/8/contrib/wpa =================================================================== --- stable/8/contrib/wpa (revision 215813) +++ stable/8/contrib/wpa (revision 215814) Property changes on: stable/8/contrib/wpa ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/wpa:r201217 Index: stable/8/contrib/xz/AUTHORS =================================================================== --- stable/8/contrib/xz/AUTHORS (revision 215813) +++ stable/8/contrib/xz/AUTHORS (revision 215814) Property changes on: stable/8/contrib/xz/AUTHORS ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/AUTHORS:r201217 Index: stable/8/contrib/xz/COPYING =================================================================== --- stable/8/contrib/xz/COPYING (revision 215813) +++ stable/8/contrib/xz/COPYING (revision 215814) Property changes on: stable/8/contrib/xz/COPYING ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/COPYING:r201217 Index: stable/8/contrib/xz/ChangeLog =================================================================== --- stable/8/contrib/xz/ChangeLog (revision 215813) +++ stable/8/contrib/xz/ChangeLog (revision 215814) Property changes on: stable/8/contrib/xz/ChangeLog ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/ChangeLog:r201217 Index: stable/8/contrib/xz/FREEBSD-Xlist =================================================================== --- stable/8/contrib/xz/FREEBSD-Xlist (revision 215813) +++ stable/8/contrib/xz/FREEBSD-Xlist (revision 215814) Property changes on: stable/8/contrib/xz/FREEBSD-Xlist ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/FREEBSD-Xlist:r201217 Index: stable/8/contrib/xz/FREEBSD-upgrade =================================================================== --- stable/8/contrib/xz/FREEBSD-upgrade (revision 215813) +++ stable/8/contrib/xz/FREEBSD-upgrade (revision 215814) Property changes on: stable/8/contrib/xz/FREEBSD-upgrade ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/FREEBSD-upgrade:r201217 Index: stable/8/contrib/xz/README =================================================================== --- stable/8/contrib/xz/README (revision 215813) +++ stable/8/contrib/xz/README (revision 215814) Property changes on: stable/8/contrib/xz/README ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/README:r201217 Index: stable/8/contrib/xz/THANKS =================================================================== --- stable/8/contrib/xz/THANKS (revision 215813) +++ stable/8/contrib/xz/THANKS (revision 215814) Property changes on: stable/8/contrib/xz/THANKS ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/THANKS:r201217 Index: stable/8/contrib/xz/TODO =================================================================== --- stable/8/contrib/xz/TODO (revision 215813) +++ stable/8/contrib/xz/TODO (revision 215814) Property changes on: stable/8/contrib/xz/TODO ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/TODO:r201217 Index: stable/8/contrib/xz/po =================================================================== --- stable/8/contrib/xz/po (revision 215813) +++ stable/8/contrib/xz/po (revision 215814) Property changes on: stable/8/contrib/xz/po ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/po:r201217 Index: stable/8/contrib/xz/src =================================================================== --- stable/8/contrib/xz/src (revision 215813) +++ stable/8/contrib/xz/src (revision 215814) Property changes on: stable/8/contrib/xz/src ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz/src:r201217 Index: stable/8/contrib/xz =================================================================== --- stable/8/contrib/xz (revision 215813) +++ stable/8/contrib/xz (revision 215814) Property changes on: stable/8/contrib/xz ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib/xz:r201217 Index: stable/8/contrib =================================================================== --- stable/8/contrib (revision 215813) +++ stable/8/contrib (revision 215814) Property changes on: stable/8/contrib ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/contrib:r201217 Index: stable/8/crypto/heimdal =================================================================== --- stable/8/crypto/heimdal (revision 215813) +++ stable/8/crypto/heimdal (revision 215814) Property changes on: stable/8/crypto/heimdal ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/crypto/heimdal:r201217 Index: stable/8/etc/periodic/daily/800.scrub-zfs =================================================================== --- stable/8/etc/periodic/daily/800.scrub-zfs (revision 215813) +++ stable/8/etc/periodic/daily/800.scrub-zfs (revision 215814) Property changes on: stable/8/etc/periodic/daily/800.scrub-zfs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/etc/periodic/daily/800.scrub-zfs:r201217 Index: stable/8/etc/periodic/daily =================================================================== --- stable/8/etc/periodic/daily (revision 215813) +++ stable/8/etc/periodic/daily (revision 215814) Property changes on: stable/8/etc/periodic/daily ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/etc/periodic/daily:r201217 Index: stable/8/etc/periodic/security =================================================================== --- stable/8/etc/periodic/security (revision 215813) +++ stable/8/etc/periodic/security (revision 215814) Property changes on: stable/8/etc/periodic/security ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/etc/periodic/security:r201217 Index: stable/8/etc =================================================================== --- stable/8/etc (revision 215813) +++ stable/8/etc (revision 215814) Property changes on: stable/8/etc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/etc:r201217 Index: stable/8/games/factor =================================================================== --- stable/8/games/factor (revision 215813) +++ stable/8/games/factor (revision 215814) Property changes on: stable/8/games/factor ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/games/factor:r201217 Index: stable/8/games/fortune =================================================================== --- stable/8/games/fortune (revision 215813) +++ stable/8/games/fortune (revision 215814) Property changes on: stable/8/games/fortune ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/games/fortune:r201217 Index: stable/8/games/grdc =================================================================== --- stable/8/games/grdc (revision 215813) +++ stable/8/games/grdc (revision 215814) Property changes on: stable/8/games/grdc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/games/grdc:r201217 Index: stable/8/games/pom =================================================================== --- stable/8/games/pom (revision 215813) +++ stable/8/games/pom (revision 215814) Property changes on: stable/8/games/pom ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/games/pom:r201217 Index: stable/8/gnu/lib/csu =================================================================== --- stable/8/gnu/lib/csu (revision 215813) +++ stable/8/gnu/lib/csu (revision 215814) Property changes on: stable/8/gnu/lib/csu ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/lib/csu:r201217 Index: stable/8/gnu/lib/libstdc++ =================================================================== --- stable/8/gnu/lib/libstdc++ (revision 215813) +++ stable/8/gnu/lib/libstdc++ (revision 215814) Property changes on: stable/8/gnu/lib/libstdc++ ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/lib/libstdc++:r201217 Index: stable/8/gnu/usr.bin/Makefile =================================================================== --- stable/8/gnu/usr.bin/Makefile (revision 215813) +++ stable/8/gnu/usr.bin/Makefile (revision 215814) Property changes on: stable/8/gnu/usr.bin/Makefile ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin/Makefile:r201217 Index: stable/8/gnu/usr.bin/dialog =================================================================== --- stable/8/gnu/usr.bin/dialog (revision 215813) +++ stable/8/gnu/usr.bin/dialog (revision 215814) Property changes on: stable/8/gnu/usr.bin/dialog ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin/dialog:r201217 Index: stable/8/gnu/usr.bin/gdb/kgdb =================================================================== --- stable/8/gnu/usr.bin/gdb/kgdb (revision 215813) +++ stable/8/gnu/usr.bin/gdb/kgdb (revision 215814) Property changes on: stable/8/gnu/usr.bin/gdb/kgdb ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin/gdb/kgdb:r201217 Index: stable/8/gnu/usr.bin/gdb =================================================================== --- stable/8/gnu/usr.bin/gdb (revision 215813) +++ stable/8/gnu/usr.bin/gdb (revision 215814) Property changes on: stable/8/gnu/usr.bin/gdb ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin/gdb:r201217 Index: stable/8/gnu/usr.bin/patch =================================================================== --- stable/8/gnu/usr.bin/patch (revision 215813) +++ stable/8/gnu/usr.bin/patch (revision 215814) Property changes on: stable/8/gnu/usr.bin/patch ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin/patch:r201217 Index: stable/8/gnu/usr.bin =================================================================== --- stable/8/gnu/usr.bin (revision 215813) +++ stable/8/gnu/usr.bin (revision 215814) Property changes on: stable/8/gnu/usr.bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/gnu/usr.bin:r201217 Index: stable/8/include =================================================================== --- stable/8/include (revision 215813) +++ stable/8/include (revision 215814) Property changes on: stable/8/include ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/include:r201217 Index: stable/8/kerberos5/lib/libgssapi_krb5 =================================================================== --- stable/8/kerberos5/lib/libgssapi_krb5 (revision 215813) +++ stable/8/kerberos5/lib/libgssapi_krb5 (revision 215814) Property changes on: stable/8/kerberos5/lib/libgssapi_krb5 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/kerberos5/lib/libgssapi_krb5:r201217 Index: stable/8/kerberos5/lib/libgssapi_spnego =================================================================== --- stable/8/kerberos5/lib/libgssapi_spnego (revision 215813) +++ stable/8/kerberos5/lib/libgssapi_spnego (revision 215814) Property changes on: stable/8/kerberos5/lib/libgssapi_spnego ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/kerberos5/lib/libgssapi_spnego:r201217 Index: stable/8/kerberos5/usr.bin/kdestroy =================================================================== --- stable/8/kerberos5/usr.bin/kdestroy (revision 215813) +++ stable/8/kerberos5/usr.bin/kdestroy (revision 215814) Property changes on: stable/8/kerberos5/usr.bin/kdestroy ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/kerberos5/usr.bin/kdestroy:r201217 Index: stable/8/kerberos5/usr.bin/kpasswd =================================================================== --- stable/8/kerberos5/usr.bin/kpasswd (revision 215813) +++ stable/8/kerberos5/usr.bin/kpasswd (revision 215814) Property changes on: stable/8/kerberos5/usr.bin/kpasswd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/kerberos5/usr.bin/kpasswd:r201217 Index: stable/8/lib/bind =================================================================== --- stable/8/lib/bind (revision 215813) +++ stable/8/lib/bind (revision 215814) Property changes on: stable/8/lib/bind ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/bind:r201217 Index: stable/8/lib/csu =================================================================== --- stable/8/lib/csu (revision 215813) +++ stable/8/lib/csu (revision 215814) Property changes on: stable/8/lib/csu ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/csu:r201217 Index: stable/8/lib/libarchive =================================================================== --- stable/8/lib/libarchive (revision 215813) +++ stable/8/lib/libarchive (revision 215814) Property changes on: stable/8/lib/libarchive ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libarchive:r201217 Index: stable/8/lib/libbluetooth =================================================================== --- stable/8/lib/libbluetooth (revision 215813) +++ stable/8/lib/libbluetooth (revision 215814) Property changes on: stable/8/lib/libbluetooth ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libbluetooth:r201217 Index: stable/8/lib/libc/locale =================================================================== --- stable/8/lib/libc/locale (revision 215813) +++ stable/8/lib/libc/locale (revision 215814) Property changes on: stable/8/lib/libc/locale ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libc/locale:r201217 Index: stable/8/lib/libc/stdtime =================================================================== --- stable/8/lib/libc/stdtime (revision 215813) +++ stable/8/lib/libc/stdtime (revision 215814) Property changes on: stable/8/lib/libc/stdtime ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libc/stdtime:r201217 Index: stable/8/lib/libc/sys =================================================================== --- stable/8/lib/libc/sys (revision 215813) +++ stable/8/lib/libc/sys (revision 215814) Property changes on: stable/8/lib/libc/sys ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libc/sys:r201217 Index: stable/8/lib/libc =================================================================== --- stable/8/lib/libc (revision 215813) +++ stable/8/lib/libc (revision 215814) Property changes on: stable/8/lib/libc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libc:r201217 Index: stable/8/lib/libc_r =================================================================== --- stable/8/lib/libc_r (revision 215813) +++ stable/8/lib/libc_r (revision 215814) Property changes on: stable/8/lib/libc_r ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libc_r:r201217 Index: stable/8/lib/libcam =================================================================== --- stable/8/lib/libcam (revision 215813) +++ stable/8/lib/libcam (revision 215814) Property changes on: stable/8/lib/libcam ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libcam:r201217 Index: stable/8/lib/libcompat =================================================================== --- stable/8/lib/libcompat (revision 215813) +++ stable/8/lib/libcompat (revision 215814) Property changes on: stable/8/lib/libcompat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libcompat:r201217 Index: stable/8/lib/libdevinfo =================================================================== --- stable/8/lib/libdevinfo (revision 215813) +++ stable/8/lib/libdevinfo (revision 215814) Property changes on: stable/8/lib/libdevinfo ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libdevinfo:r201217 Index: stable/8/lib/libdisk =================================================================== --- stable/8/lib/libdisk (revision 215813) +++ stable/8/lib/libdisk (revision 215814) Property changes on: stable/8/lib/libdisk ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libdisk:r201217 Index: stable/8/lib/libedit =================================================================== --- stable/8/lib/libedit (revision 215813) +++ stable/8/lib/libedit (revision 215814) Property changes on: stable/8/lib/libedit ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libedit:r201217 Index: stable/8/lib/libelf =================================================================== --- stable/8/lib/libelf (revision 215813) +++ stable/8/lib/libelf (revision 215814) Property changes on: stable/8/lib/libelf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libelf:r201217 Index: stable/8/lib/libexpat =================================================================== --- stable/8/lib/libexpat (revision 215813) +++ stable/8/lib/libexpat (revision 215814) Property changes on: stable/8/lib/libexpat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libexpat:r201217 Index: stable/8/lib/libgeom =================================================================== --- stable/8/lib/libgeom (revision 215813) +++ stable/8/lib/libgeom (revision 215814) Property changes on: stable/8/lib/libgeom ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libgeom:r201217 Index: stable/8/lib/libgpib =================================================================== --- stable/8/lib/libgpib (revision 215813) +++ stable/8/lib/libgpib (revision 215814) Property changes on: stable/8/lib/libgpib ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libgpib:r201217 Index: stable/8/lib/libgssapi =================================================================== --- stable/8/lib/libgssapi (revision 215813) +++ stable/8/lib/libgssapi (revision 215814) Property changes on: stable/8/lib/libgssapi ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libgssapi:r201217 Index: stable/8/lib/libjail =================================================================== --- stable/8/lib/libjail (revision 215813) +++ stable/8/lib/libjail (revision 215814) Property changes on: stable/8/lib/libjail ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libjail:r201217 Index: stable/8/lib/libkse =================================================================== --- stable/8/lib/libkse (revision 215813) +++ stable/8/lib/libkse (revision 215814) Property changes on: stable/8/lib/libkse ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libkse:r201217 Index: stable/8/lib/libkvm =================================================================== --- stable/8/lib/libkvm (revision 215813) +++ stable/8/lib/libkvm (revision 215814) Property changes on: stable/8/lib/libkvm ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libkvm:r201217 Index: stable/8/lib/liblzma =================================================================== --- stable/8/lib/liblzma (revision 215813) +++ stable/8/lib/liblzma (revision 215814) Property changes on: stable/8/lib/liblzma ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/liblzma:r201217 Index: stable/8/lib/libmagic =================================================================== --- stable/8/lib/libmagic (revision 215813) +++ stable/8/lib/libmagic (revision 215814) Property changes on: stable/8/lib/libmagic ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libmagic:r201217 Index: stable/8/lib/libmemstat =================================================================== --- stable/8/lib/libmemstat (revision 215813) +++ stable/8/lib/libmemstat (revision 215814) Property changes on: stable/8/lib/libmemstat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libmemstat:r201217 Index: stable/8/lib/libpam =================================================================== --- stable/8/lib/libpam (revision 215813) +++ stable/8/lib/libpam (revision 215814) Property changes on: stable/8/lib/libpam ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libpam:r201217 Index: stable/8/lib/libpmc =================================================================== --- stable/8/lib/libpmc (revision 215813) +++ stable/8/lib/libpmc (revision 215814) Property changes on: stable/8/lib/libpmc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libpmc:r201217 Index: stable/8/lib/libproc =================================================================== --- stable/8/lib/libproc (revision 215813) +++ stable/8/lib/libproc (revision 215814) Property changes on: stable/8/lib/libproc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libproc:r201217 Index: stable/8/lib/libradius =================================================================== --- stable/8/lib/libradius (revision 215813) +++ stable/8/lib/libradius (revision 215814) Property changes on: stable/8/lib/libradius ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libradius:r201217 Index: stable/8/lib/librpcsec_gss =================================================================== --- stable/8/lib/librpcsec_gss (revision 215813) +++ stable/8/lib/librpcsec_gss (revision 215814) Property changes on: stable/8/lib/librpcsec_gss ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/librpcsec_gss:r201217 Index: stable/8/lib/librtld_db =================================================================== --- stable/8/lib/librtld_db (revision 215813) +++ stable/8/lib/librtld_db (revision 215814) Property changes on: stable/8/lib/librtld_db ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/librtld_db:r201217 Index: stable/8/lib/libsm =================================================================== --- stable/8/lib/libsm (revision 215813) +++ stable/8/lib/libsm (revision 215814) Property changes on: stable/8/lib/libsm ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libsm:r201217 Index: stable/8/lib/libstand =================================================================== --- stable/8/lib/libstand (revision 215813) +++ stable/8/lib/libstand (revision 215814) Property changes on: stable/8/lib/libstand ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libstand:r201217 Index: stable/8/lib/libtacplus =================================================================== --- stable/8/lib/libtacplus (revision 215813) +++ stable/8/lib/libtacplus (revision 215814) Property changes on: stable/8/lib/libtacplus ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libtacplus:r201217 Index: stable/8/lib/libthr =================================================================== --- stable/8/lib/libthr (revision 215813) +++ stable/8/lib/libthr (revision 215814) Property changes on: stable/8/lib/libthr ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libthr:r201217 Index: stable/8/lib/libthread_db =================================================================== --- stable/8/lib/libthread_db (revision 215813) +++ stable/8/lib/libthread_db (revision 215814) Property changes on: stable/8/lib/libthread_db ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libthread_db:r201217 Index: stable/8/lib/libufs =================================================================== --- stable/8/lib/libufs (revision 215813) +++ stable/8/lib/libufs (revision 215814) Property changes on: stable/8/lib/libufs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libufs:r201217 Index: stable/8/lib/libugidfw =================================================================== --- stable/8/lib/libugidfw (revision 215813) +++ stable/8/lib/libugidfw (revision 215814) Property changes on: stable/8/lib/libugidfw ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libugidfw:r201217 Index: stable/8/lib/libusb/usb.h =================================================================== --- stable/8/lib/libusb/usb.h (revision 215813) +++ stable/8/lib/libusb/usb.h (revision 215814) Property changes on: stable/8/lib/libusb/usb.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libusb/usb.h:r201217 Index: stable/8/lib/libusb =================================================================== --- stable/8/lib/libusb (revision 215813) +++ stable/8/lib/libusb (revision 215814) Property changes on: stable/8/lib/libusb ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libusb:r201217 Index: stable/8/lib/libusbhid =================================================================== --- stable/8/lib/libusbhid (revision 215813) +++ stable/8/lib/libusbhid (revision 215814) Property changes on: stable/8/lib/libusbhid ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libusbhid:r201217 Index: stable/8/lib/libutil =================================================================== --- stable/8/lib/libutil (revision 215813) +++ stable/8/lib/libutil (revision 215814) Property changes on: stable/8/lib/libutil ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libutil:r201217 Index: stable/8/lib/libz/contrib =================================================================== --- stable/8/lib/libz/contrib (revision 215813) +++ stable/8/lib/libz/contrib (revision 215814) Property changes on: stable/8/lib/libz/contrib ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libz/contrib:r201217 Index: stable/8/lib/libz =================================================================== --- stable/8/lib/libz (revision 215813) +++ stable/8/lib/libz (revision 215814) Property changes on: stable/8/lib/libz ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/libz:r201217 Index: stable/8/lib/msun =================================================================== --- stable/8/lib/msun (revision 215813) +++ stable/8/lib/msun (revision 215814) Property changes on: stable/8/lib/msun ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib/msun:r201217 Index: stable/8/lib =================================================================== --- stable/8/lib (revision 215813) +++ stable/8/lib (revision 215814) Property changes on: stable/8/lib ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/lib:r201217 Index: stable/8/libexec/ftpd =================================================================== --- stable/8/libexec/ftpd (revision 215813) +++ stable/8/libexec/ftpd (revision 215814) Property changes on: stable/8/libexec/ftpd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/libexec/ftpd:r201217 Index: stable/8/libexec/rtld-aout/shlib.c =================================================================== --- stable/8/libexec/rtld-aout/shlib.c (revision 215813) +++ stable/8/libexec/rtld-aout/shlib.c (revision 215814) @@ -1,339 +1,325 @@ /* * Copyright (c) 1993 Paul Kranenburg * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Paul Kranenburg. * 4. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * $FreeBSD$ */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "shlib.h" #include "support.h" /* * Standard directories to search for files specified by -l. */ #ifndef STANDARD_SEARCH_DIRS #define STANDARD_SEARCH_DIRS "/usr/lib/aout" #endif /* * Actual vector of library search directories, * including `-L'ed and LD_LIBRARY_PATH spec'd ones. */ char **search_dirs; int n_search_dirs; const char *standard_search_dirs[] = { STANDARD_SEARCH_DIRS }; void add_search_dir(const char *name) { int n; for (n = 0; n < n_search_dirs; n++) if (strcmp(search_dirs[n], name) == 0) return; n_search_dirs++; search_dirs = (char **) xrealloc(search_dirs, n_search_dirs * sizeof search_dirs[0]); search_dirs[n_search_dirs - 1] = strdup(name); } void -add_search_path(path) -char *path; +add_search_path(char *path) { register char *cp, *dup; if (path == NULL) return; /* Add search directories from `path' */ path = dup = strdup(path); while ((cp = strsep(&path, ":")) != NULL) add_search_dir(cp); free(dup); } void -std_search_path() +std_search_path(void) { int i, n; /* Append standard search directories */ n = sizeof standard_search_dirs / sizeof standard_search_dirs[0]; for (i = 0; i < n; i++) add_search_dir(standard_search_dirs[i]); } /* * Return true if CP points to a valid dewey number. * Decode and leave the result in the array DEWEY. * Return the number of decoded entries in DEWEY. */ int -getdewey(dewey, cp) -int dewey[]; -char *cp; +getdewey(int dewey[], char *cp) { int i, n; for (n = 0, i = 0; i < MAXDEWEY; i++) { if (*cp == '\0') break; if (*cp == '.') cp++; if (!isdigit(*cp)) return 0; dewey[n++] = strtol(cp, &cp, 10); } return n; } /* * Compare two dewey arrays. * Return -1 if `d1' represents a smaller value than `d2'. * Return 1 if `d1' represents a greater value than `d2'. * Return 0 if equal. */ int -cmpndewey(d1, n1, d2, n2) -int d1[], d2[]; -int n1, n2; +cmpndewey(int d1[], int n1, int d2[], int n2) { register int i; for (i = 0; i < n1 && i < n2; i++) { if (d1[i] < d2[i]) return -1; if (d1[i] > d2[i]) return 1; } if (n1 == n2) return 0; if (i == n1) return -1; if (i == n2) return 1; errx(1, "cmpndewey: cant happen"); return 0; } /* * Search directories for a shared library matching the given * major and minor version numbers. See search_lib_dir() below for * the detailed matching rules. * * As soon as a directory with an acceptable match is found, the search * terminates. Subsequent directories are not searched for a better * match. This is in conformance with the SunOS searching rules. Also, * it avoids a lot of directory searches that are virtually guaranteed to * be fruitless. * * The return value is a full pathname to the matching library. The * string is dynamically allocated. If no matching library is found, the * function returns NULL. */ char * -findshlib(name, majorp, minorp, do_dot_a) -char *name; -int *majorp, *minorp; -int do_dot_a; +findshlib(char *name, int *majorp, int *minorp, int do_dot_a) { int i; for (i = 0; i < n_search_dirs; i++) { char *path; path = search_lib_dir(search_dirs[i], name, majorp, minorp, do_dot_a); if(path != NULL) return path; } return NULL; } /* * Search library directories for a file with the given name. The * return value is a full pathname to the matching file. The string * is dynamically allocated. If no matching file is found, the function * returns NULL. */ char * -find_lib_file(name) - const char *name; +find_lib_file(const char *name) { int i; for (i = 0; i < n_search_dirs; i++) { char *path = concat(search_dirs[i], "/", name); struct stat sb; if (lstat(path, &sb) != -1) /* We found it */ return path; free(path); } return NULL; } /* * Search a given directory for a library (preferably shared) satisfying * the given criteria. * * The matching rules are as follows: * * if(*majorp == -1) * find the library with the highest major version; * else * insist on a major version identical to *majorp; * * Always find the library with the highest minor version; * if(*minorp != -1) * insist on a minor version >= *minorp; * * It is invalid to specify a specific minor number while wildcarding * the major number. * * The actual major and minor numbers found are returned via the pointer * arguments. * * A suitable shared library is always preferred over a static (.a) library. * If do_dot_a is false, then a static library will not be accepted in * any case. * * The return value is a full pathname to the matching library. The * string is dynamically allocated. If no matching library is found, the * function returns NULL. */ char * -search_lib_dir(dir, name, majorp, minorp, do_dot_a) - char *dir; - char *name; - int *majorp; - int *minorp; - int do_dot_a; +search_lib_dir(char *dir, char *name, int *majorp, int *minorp, int do_dot_a) { size_t namelen; DIR *dd; struct dirent *dp; int best_dewey[MAXDEWEY]; int best_ndewey; char dot_a_name[MAXNAMLEN+1]; char dot_so_name[MAXNAMLEN+1]; if((dd = opendir(dir)) == NULL) return NULL; namelen = strlen(name); best_ndewey = 0; dot_a_name[0] = '\0'; dot_so_name[0] = '\0'; while((dp = readdir(dd)) != NULL) { char *extension; if(strlen(dp->d_name) < 3 + namelen + 2 || /* lib+xxx+.a */ strncmp(dp->d_name, "lib", 3) != 0 || strncmp(dp->d_name + 3, name, namelen) != 0 || dp->d_name[3+namelen] != '.') continue; extension = dp->d_name + 3 + namelen + 1; /* a or so.* */ if(strncmp(extension, "so.", 3) == 0) { int cur_dewey[MAXDEWEY]; int cur_ndewey; cur_ndewey = getdewey(cur_dewey, extension+3); if(cur_ndewey < 2) /* Too few version numbers */ continue; if(*majorp != -1) { /* Need exact match on major */ if(cur_dewey[0] != *majorp) continue; if(*minorp != -1) { /* Need minor >= minimum */ if(cur_dewey[1] < *minorp) continue; } } if(cmpndewey(cur_dewey, cur_ndewey, best_dewey, best_ndewey) <= 0) /* No better than prior match */ continue; /* We found a better match */ strcpy(dot_so_name, dp->d_name); bcopy(cur_dewey, best_dewey, cur_ndewey * sizeof best_dewey[0]); best_ndewey = cur_ndewey; } else if(do_dot_a && strcmp(extension, "a") == 0) strcpy(dot_a_name, dp->d_name); } closedir(dd); if(dot_so_name[0] != '\0') { *majorp = best_dewey[0]; *minorp = best_dewey[1]; return concat(dir, "/", dot_so_name); } if(dot_a_name[0] != '\0') return concat(dir, "/", dot_a_name); return NULL; } Index: stable/8/libexec/rtld-aout/support.c =================================================================== --- stable/8/libexec/rtld-aout/support.c (revision 215813) +++ stable/8/libexec/rtld-aout/support.c (revision 215814) @@ -1,86 +1,82 @@ /* * Generic "support" routines to replace those obtained from libiberty for ld. * * I've collected these from random bits of (published) code I've written * over the years, not that they are a big deal. peter@freebsd.org *- * Copyright (C) 1996 * Peter Wemm. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. *- * $FreeBSD$ */ #include #include #include #include #include "support.h" char * -concat(s1, s2, s3) - const char *s1, *s2, *s3; +concat(const char *s1, const char *s2, const char *s3) { int len = 1; char *s; if (s1) len += strlen(s1); if (s2) len += strlen(s2); if (s3) len += strlen(s3); s = xmalloc(len); s[0] = '\0'; if (s1) strcat(s, s1); if (s2) strcat(s, s2); if (s3) strcat(s, s3); return s; } void * -xmalloc(n) - size_t n; +xmalloc(size_t n) { char *p = malloc(n); if (p == NULL) errx(1, "Could not allocate memory"); return p; } void * -xrealloc(p, n) - void *p; - size_t n; +xrealloc(void *p, size_t n) { p = realloc(p, n); if (p == NULL) errx(1, "Could not allocate memory"); return p; } Index: stable/8/libexec/rtld-elf =================================================================== --- stable/8/libexec/rtld-elf (revision 215813) +++ stable/8/libexec/rtld-elf (revision 215814) Property changes on: stable/8/libexec/rtld-elf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/libexec/rtld-elf:r201217 Index: stable/8/libexec/tftpd =================================================================== --- stable/8/libexec/tftpd (revision 215813) +++ stable/8/libexec/tftpd (revision 215814) Property changes on: stable/8/libexec/tftpd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/libexec/tftpd:r201217 Index: stable/8/libexec =================================================================== --- stable/8/libexec (revision 215813) +++ stable/8/libexec (revision 215814) Property changes on: stable/8/libexec ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/libexec:r201217 Index: stable/8/release/doc/en_US.ISO8859-1/hardware =================================================================== --- stable/8/release/doc/en_US.ISO8859-1/hardware (revision 215813) +++ stable/8/release/doc/en_US.ISO8859-1/hardware (revision 215814) Property changes on: stable/8/release/doc/en_US.ISO8859-1/hardware ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/release/doc/en_US.ISO8859-1/hardware:r201217 Index: stable/8/release/picobsd/floppy.tree/sbin/dhclient-script =================================================================== --- stable/8/release/picobsd/floppy.tree/sbin/dhclient-script (revision 215813) +++ stable/8/release/picobsd/floppy.tree/sbin/dhclient-script (revision 215814) Property changes on: stable/8/release/picobsd/floppy.tree/sbin/dhclient-script ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/release/picobsd/floppy.tree/sbin/dhclient-script:r201217 Index: stable/8/release/picobsd/floppy.tree/sbin =================================================================== --- stable/8/release/picobsd/floppy.tree/sbin (revision 215813) +++ stable/8/release/picobsd/floppy.tree/sbin (revision 215814) Property changes on: stable/8/release/picobsd/floppy.tree/sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/release/picobsd/floppy.tree/sbin:r201217 Index: stable/8/release/picobsd/qemu =================================================================== --- stable/8/release/picobsd/qemu (revision 215813) +++ stable/8/release/picobsd/qemu (revision 215814) Property changes on: stable/8/release/picobsd/qemu ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/release/picobsd/qemu:r201217 Index: stable/8/release/picobsd/tinyware/login =================================================================== --- stable/8/release/picobsd/tinyware/login (revision 215813) +++ stable/8/release/picobsd/tinyware/login (revision 215814) Property changes on: stable/8/release/picobsd/tinyware/login ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/release/picobsd/tinyware/login:r201217 Index: stable/8/release/picobsd =================================================================== --- stable/8/release/picobsd (revision 215813) +++ stable/8/release/picobsd (revision 215814) Property changes on: stable/8/release/picobsd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/release/picobsd:r201217 Index: stable/8/release/powerpc =================================================================== --- stable/8/release/powerpc (revision 215813) +++ stable/8/release/powerpc (revision 215814) Property changes on: stable/8/release/powerpc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/release/powerpc:r201217 Index: stable/8/release =================================================================== --- stable/8/release (revision 215813) +++ stable/8/release (revision 215814) Property changes on: stable/8/release ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/release:r201217 Index: stable/8/sbin/atacontrol =================================================================== --- stable/8/sbin/atacontrol (revision 215813) +++ stable/8/sbin/atacontrol (revision 215814) Property changes on: stable/8/sbin/atacontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/atacontrol:r201217 Index: stable/8/sbin/bsdlabel =================================================================== --- stable/8/sbin/bsdlabel (revision 215813) +++ stable/8/sbin/bsdlabel (revision 215814) Property changes on: stable/8/sbin/bsdlabel ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/bsdlabel:r201217 Index: stable/8/sbin/camcontrol =================================================================== --- stable/8/sbin/camcontrol (revision 215813) +++ stable/8/sbin/camcontrol (revision 215814) Property changes on: stable/8/sbin/camcontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/camcontrol:r201217 Index: stable/8/sbin/ddb =================================================================== --- stable/8/sbin/ddb (revision 215813) +++ stable/8/sbin/ddb (revision 215814) Property changes on: stable/8/sbin/ddb ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/ddb:r201217 Index: stable/8/sbin/devd =================================================================== --- stable/8/sbin/devd (revision 215813) +++ stable/8/sbin/devd (revision 215814) Property changes on: stable/8/sbin/devd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/devd:r201217 Index: stable/8/sbin/devfs =================================================================== --- stable/8/sbin/devfs (revision 215813) +++ stable/8/sbin/devfs (revision 215814) Property changes on: stable/8/sbin/devfs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/devfs:r201217 Index: stable/8/sbin/dhclient =================================================================== --- stable/8/sbin/dhclient (revision 215813) +++ stable/8/sbin/dhclient (revision 215814) Property changes on: stable/8/sbin/dhclient ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/dhclient:r201217 Index: stable/8/sbin/dump =================================================================== --- stable/8/sbin/dump (revision 215813) +++ stable/8/sbin/dump (revision 215814) Property changes on: stable/8/sbin/dump ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/dump:r201217 Index: stable/8/sbin/dumpfs =================================================================== --- stable/8/sbin/dumpfs (revision 215813) +++ stable/8/sbin/dumpfs (revision 215814) Property changes on: stable/8/sbin/dumpfs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/dumpfs:r201217 Index: stable/8/sbin/fdisk =================================================================== --- stable/8/sbin/fdisk (revision 215813) +++ stable/8/sbin/fdisk (revision 215814) Property changes on: stable/8/sbin/fdisk ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/fdisk:r201217 Index: stable/8/sbin/fsck =================================================================== --- stable/8/sbin/fsck (revision 215813) +++ stable/8/sbin/fsck (revision 215814) Property changes on: stable/8/sbin/fsck ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/fsck:r201217 Index: stable/8/sbin/fsck_ffs =================================================================== --- stable/8/sbin/fsck_ffs (revision 215813) +++ stable/8/sbin/fsck_ffs (revision 215814) Property changes on: stable/8/sbin/fsck_ffs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/fsck_ffs:r201217 Index: stable/8/sbin/fsck_msdosfs =================================================================== --- stable/8/sbin/fsck_msdosfs (revision 215813) +++ stable/8/sbin/fsck_msdosfs (revision 215814) Property changes on: stable/8/sbin/fsck_msdosfs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/fsck_msdosfs:r201217 Index: stable/8/sbin/fsirand =================================================================== --- stable/8/sbin/fsirand (revision 215813) +++ stable/8/sbin/fsirand (revision 215814) Property changes on: stable/8/sbin/fsirand ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/fsirand:r201217 Index: stable/8/sbin/geom/class/part =================================================================== --- stable/8/sbin/geom/class/part (revision 215813) +++ stable/8/sbin/geom/class/part (revision 215814) Property changes on: stable/8/sbin/geom/class/part ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/geom/class/part:r201217 Index: stable/8/sbin/geom/class/sched/gsched.8 =================================================================== --- stable/8/sbin/geom/class/sched/gsched.8 (revision 215813) +++ stable/8/sbin/geom/class/sched/gsched.8 (revision 215814) Property changes on: stable/8/sbin/geom/class/sched/gsched.8 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/geom/class/sched/gsched.8:r201217 Index: stable/8/sbin/geom/class/stripe =================================================================== --- stable/8/sbin/geom/class/stripe (revision 215813) +++ stable/8/sbin/geom/class/stripe (revision 215814) Property changes on: stable/8/sbin/geom/class/stripe ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/geom/class/stripe:r201217 Index: stable/8/sbin/geom =================================================================== --- stable/8/sbin/geom (revision 215813) +++ stable/8/sbin/geom (revision 215814) Property changes on: stable/8/sbin/geom ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/geom:r201217 Index: stable/8/sbin/ggate =================================================================== --- stable/8/sbin/ggate (revision 215813) +++ stable/8/sbin/ggate (revision 215814) Property changes on: stable/8/sbin/ggate ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/ggate:r201217 Index: stable/8/sbin/growfs =================================================================== --- stable/8/sbin/growfs (revision 215813) +++ stable/8/sbin/growfs (revision 215814) Property changes on: stable/8/sbin/growfs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/growfs:r201217 Index: stable/8/sbin/hastctl =================================================================== --- stable/8/sbin/hastctl (revision 215813) +++ stable/8/sbin/hastctl (revision 215814) Property changes on: stable/8/sbin/hastctl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/hastctl:r201217 Index: stable/8/sbin/hastd =================================================================== --- stable/8/sbin/hastd (revision 215813) +++ stable/8/sbin/hastd (revision 215814) Property changes on: stable/8/sbin/hastd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/hastd:r201217 Index: stable/8/sbin/ifconfig =================================================================== --- stable/8/sbin/ifconfig (revision 215813) +++ stable/8/sbin/ifconfig (revision 215814) Property changes on: stable/8/sbin/ifconfig ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/ifconfig:r201217 Index: stable/8/sbin/iscontrol =================================================================== --- stable/8/sbin/iscontrol (revision 215813) +++ stable/8/sbin/iscontrol (revision 215814) Property changes on: stable/8/sbin/iscontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/iscontrol:r201217 Index: stable/8/sbin/kldload =================================================================== --- stable/8/sbin/kldload (revision 215813) +++ stable/8/sbin/kldload (revision 215814) Property changes on: stable/8/sbin/kldload ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/kldload:r201217 Index: stable/8/sbin/kldstat =================================================================== --- stable/8/sbin/kldstat (revision 215813) +++ stable/8/sbin/kldstat (revision 215814) Property changes on: stable/8/sbin/kldstat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/kldstat:r201217 Index: stable/8/sbin/ldconfig/ldconfig.c =================================================================== --- stable/8/sbin/ldconfig/ldconfig.c (revision 215813) +++ stable/8/sbin/ldconfig/ldconfig.c (revision 215814) @@ -1,639 +1,633 @@ /* * Copyright (c) 1993,1995 Paul Kranenburg * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by Paul Kranenburg. * 4. The name of the author may not be used to endorse or promote products * derived from this software without specific prior written permission * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "ldconfig.h" #include "shlib.h" #include "support.h" #if DEBUG /* test */ #undef _PATH_LD_HINTS #define _PATH_LD_HINTS "./ld.so.hints" #undef _PATH_ELF_HINTS #define _PATH_ELF_HINTS "./ld-elf.so.hints" #endif #define _PATH_LD32_HINTS "/var/run/ld32.so.hints" #define _PATH_ELF32_HINTS "/var/run/ld-elf32.so.hints" #undef major #undef minor static int verbose; static int nostd; static int justread; static int merge; static int rescan; static const char *hints_file; struct shlib_list { /* Internal list of shared libraries found */ char *name; char *path; int dewey[MAXDEWEY]; int ndewey; #define major dewey[0] #define minor dewey[1] struct shlib_list *next; }; static struct shlib_list *shlib_head = NULL, **shlib_tail = &shlib_head; static char *dir_list; static int buildhints(void); static int dodir(char *, int); int dofile(char *, int); static void enter(char *, char *, char *, int *, int); static void listhints(void); static int readhints(void); static void usage(void); int main(int argc, char **argv) { int i, c; int rval = 0; int is_aout = 0; int is_32 = 0; while (argc > 1) { if (strcmp(argv[1], "-aout") == 0) { is_aout = 1; argc--; argv++; } else if (strcmp(argv[1], "-elf") == 0) { is_aout = 0; argc--; argv++; } else if (strcmp(argv[1], "-32") == 0) { is_32 = 1; argc--; argv++; } else { break; } } if (is_32) hints_file = is_aout ? _PATH_LD32_HINTS : _PATH_ELF32_HINTS; else hints_file = is_aout ? _PATH_LD_HINTS : _PATH_ELF_HINTS; if (argc == 1) rescan = 1; else while((c = getopt(argc, argv, "Rf:imrsv")) != -1) { switch (c) { case 'R': rescan = 1; break; case 'f': hints_file = optarg; break; case 'i': insecure = 1; break; case 'm': merge = 1; break; case 'r': justread = 1; break; case 's': nostd = 1; break; case 'v': verbose = 1; break; default: usage(); break; } } if (!is_aout) { if (justread) list_elf_hints(hints_file); else update_elf_hints(hints_file, argc - optind, argv + optind, merge || rescan); return 0; } /* Here begins the aout libs processing */ dir_list = strdup(""); if (justread || merge || rescan) { if ((rval = readhints()) != 0) return rval; } if (!nostd && !merge && !rescan) std_search_path(); /* Add any directories/files from the command line */ if (!justread) { for (i = optind; i < argc; i++) { struct stat stbuf; if (stat(argv[i], &stbuf) == -1) { warn("%s", argv[i]); rval = -1; } else if (strcmp(argv[i], "/usr/lib") == 0) { warnx("WARNING! '%s' can not be used", argv[i]); rval = -1; } else { /* * See if this is a directory-containing * file instead of a directory */ if (S_ISREG(stbuf.st_mode)) rval |= dofile(argv[i], 0); else add_search_path(argv[i]); } } } for (i = 0; i < n_search_dirs; i++) { char *cp = concat(dir_list, *dir_list?":":"", search_dirs[i]); free(dir_list); dir_list = cp; } if (justread) { listhints(); return 0; } for (i = 0; i < n_search_dirs; i++) rval |= dodir(search_dirs[i], 1); rval |= buildhints(); return rval; } static void -usage() +usage(void) { fprintf(stderr, "usage: ldconfig [-32] [-aout | -elf] [-Rimrsv] [-f hints_file] [directory | file ...]\n"); exit(1); } int -dofile(fname, silent) -char *fname; -int silent; +dofile(char *fname, int silent) { FILE *hfp; char buf[MAXPATHLEN]; int rval = 0; char *cp, *sp; if ((hfp = fopen(fname, "r")) == NULL) { warn("%s", fname); return -1; } while (fgets(buf, sizeof(buf), hfp)) { cp = buf; while (isspace(*cp)) cp++; if (*cp == '#' || *cp == '\0') continue; sp = cp; while (!isspace(*cp) && *cp != '\0') cp++; if (*cp != '\n') { *cp = '\0'; warnx("%s: trailing characters ignored", sp); } *cp = '\0'; rval |= dodir(sp, silent); } (void)fclose(hfp); return rval; } int -dodir(dir, silent) -char *dir; -int silent; +dodir(char *dir, int silent) { DIR *dd; struct dirent *dp; char name[MAXPATHLEN]; int dewey[MAXDEWEY], ndewey; if ((dd = opendir(dir)) == NULL) { if (silent && errno == ENOENT) /* Ignore the error */ return 0; warn("%s", dir); return -1; } while ((dp = readdir(dd)) != NULL) { int n; char *cp; /* Check for `lib' prefix */ if (dp->d_name[0] != 'l' || dp->d_name[1] != 'i' || dp->d_name[2] != 'b') continue; /* Copy the entry minus prefix */ (void)strcpy(name, dp->d_name + 3); n = strlen(name); if (n < 4) continue; /* Find ".so." in name */ for (cp = name + n - 4; cp > name; --cp) { if (cp[0] == '.' && cp[1] == 's' && cp[2] == 'o' && cp[3] == '.') break; } if (cp <= name) continue; *cp = '\0'; if (!isdigit(*(cp+4))) continue; bzero((caddr_t)dewey, sizeof(dewey)); ndewey = getdewey(dewey, cp + 4); if (ndewey < 2) continue; enter(dir, dp->d_name, name, dewey, ndewey); } closedir(dd); return 0; } static void -enter(dir, file, name, dewey, ndewey) -char *dir, *file, *name; -int dewey[], ndewey; +enter(char *dir, char *file, char *name, int dewey[], int ndewey) { struct shlib_list *shp; for (shp = shlib_head; shp; shp = shp->next) { if (strcmp(name, shp->name) != 0 || major != shp->major) continue; /* Name matches existing entry */ if (cmpndewey(dewey, ndewey, shp->dewey, shp->ndewey) > 0) { /* Update this entry with higher versioned lib */ if (verbose) printf("Updating lib%s.%d.%d to %s/%s\n", shp->name, shp->major, shp->minor, dir, file); free(shp->name); shp->name = strdup(name); free(shp->path); shp->path = concat(dir, "/", file); bcopy(dewey, shp->dewey, sizeof(shp->dewey)); shp->ndewey = ndewey; } break; } if (shp) /* Name exists: older version or just updated */ return; /* Allocate new list element */ if (verbose) printf("Adding %s/%s\n", dir, file); shp = (struct shlib_list *)xmalloc(sizeof *shp); shp->name = strdup(name); shp->path = concat(dir, "/", file); bcopy(dewey, shp->dewey, sizeof(shp->dewey)); shp->ndewey = ndewey; shp->next = NULL; *shlib_tail = shp; shlib_tail = &shp->next; } static int hinthash(char *cp, int vmajor) { int k = 0; while (*cp) k = (((k << 1) + (k >> 14)) ^ (*cp++)) & 0x3fff; k = (((k << 1) + (k >> 14)) ^ (vmajor*257)) & 0x3fff; return k; } int -buildhints() +buildhints(void) { struct hints_header hdr; struct hints_bucket *blist; struct shlib_list *shp; char *strtab; int i, n, str_index = 0; int strtab_sz = 0; /* Total length of strings */ int nhints = 0; /* Total number of hints */ int fd; char *tmpfilename; for (shp = shlib_head; shp; shp = shp->next) { strtab_sz += 1 + strlen(shp->name); strtab_sz += 1 + strlen(shp->path); nhints++; } /* Fill hints file header */ hdr.hh_magic = HH_MAGIC; hdr.hh_version = LD_HINTS_VERSION_2; hdr.hh_nbucket = 1 * nhints; n = hdr.hh_nbucket * sizeof(struct hints_bucket); hdr.hh_hashtab = sizeof(struct hints_header); hdr.hh_strtab = hdr.hh_hashtab + n; hdr.hh_dirlist = strtab_sz; strtab_sz += 1 + strlen(dir_list); hdr.hh_strtab_sz = strtab_sz; hdr.hh_ehints = hdr.hh_strtab + hdr.hh_strtab_sz; if (verbose) printf("Totals: entries %d, buckets %ld, string size %d\n", nhints, (long)hdr.hh_nbucket, strtab_sz); /* Allocate buckets and string table */ blist = (struct hints_bucket *)xmalloc(n); bzero((char *)blist, n); for (i = 0; i < hdr.hh_nbucket; i++) /* Empty all buckets */ blist[i].hi_next = -1; strtab = (char *)xmalloc(strtab_sz); /* Enter all */ for (shp = shlib_head; shp; shp = shp->next) { struct hints_bucket *bp; bp = blist + (hinthash(shp->name, shp->major) % hdr.hh_nbucket); if (bp->hi_pathx) { int j; for (j = 0; j < hdr.hh_nbucket; j++) { if (blist[j].hi_pathx == 0) break; } if (j == hdr.hh_nbucket) { warnx("bummer!"); return -1; } while (bp->hi_next != -1) bp = &blist[bp->hi_next]; bp->hi_next = j; bp = blist + j; } /* Insert strings in string table */ bp->hi_namex = str_index; strcpy(strtab + str_index, shp->name); str_index += 1 + strlen(shp->name); bp->hi_pathx = str_index; strcpy(strtab + str_index, shp->path); str_index += 1 + strlen(shp->path); /* Copy versions */ bcopy(shp->dewey, bp->hi_dewey, sizeof(bp->hi_dewey)); bp->hi_ndewey = shp->ndewey; } /* Copy search directories */ strcpy(strtab + str_index, dir_list); str_index += 1 + strlen(dir_list); /* Sanity check */ if (str_index != strtab_sz) { errx(1, "str_index(%d) != strtab_sz(%d)", str_index, strtab_sz); } tmpfilename = concat(hints_file, ".XXXXXXXXXX", ""); umask(0); /* Create with exact permissions */ if ((fd = mkstemp(tmpfilename)) == -1) { warn("%s", tmpfilename); return -1; } fchmod(fd, 0444); if (write(fd, &hdr, sizeof(struct hints_header)) != sizeof(struct hints_header)) { warn("%s", hints_file); return -1; } if (write(fd, blist, hdr.hh_nbucket * sizeof(*blist)) != (ssize_t)(hdr.hh_nbucket * sizeof(*blist))) { warn("%s", hints_file); return -1; } if (write(fd, strtab, strtab_sz) != strtab_sz) { warn("%s", hints_file); return -1; } if (close(fd) != 0) { warn("%s", hints_file); return -1; } /* Install it */ if (unlink(hints_file) != 0 && errno != ENOENT) { warn("%s", hints_file); return -1; } if (rename(tmpfilename, hints_file) != 0) { warn("%s", hints_file); return -1; } return 0; } static int -readhints() +readhints(void) { int fd; void *addr; long fsize; long msize; struct hints_header *hdr; struct hints_bucket *blist; char *strtab; struct shlib_list *shp; int i; if ((fd = open(hints_file, O_RDONLY, 0)) == -1) { warn("%s", hints_file); return -1; } msize = PAGE_SIZE; addr = mmap(0, msize, PROT_READ, MAP_COPY, fd, 0); if (addr == MAP_FAILED) { warn("%s", hints_file); return -1; } hdr = (struct hints_header *)addr; if (HH_BADMAG(*hdr)) { warnx("%s: bad magic: %lo", hints_file, (unsigned long)hdr->hh_magic); return -1; } if (hdr->hh_version != LD_HINTS_VERSION_1 && hdr->hh_version != LD_HINTS_VERSION_2) { warnx("unsupported version: %ld", (long)hdr->hh_version); return -1; } if (hdr->hh_ehints > msize) { fsize = hdr->hh_ehints; munmap(addr, msize); addr = mmap(0, fsize, PROT_READ, MAP_COPY, fd, 0); if (addr == MAP_FAILED) { warn("%s", hints_file); return -1; } hdr = (struct hints_header *)addr; } close(fd); strtab = (char *)addr + hdr->hh_strtab; if (hdr->hh_version >= LD_HINTS_VERSION_2) add_search_path(strtab + hdr->hh_dirlist); else if (rescan) errx(1, "%s too old and does not contain the search path", hints_file); if (rescan) return 0; blist = malloc(sizeof(*blist) * hdr->hh_nbucket); if (blist == NULL) err(1, "readhints"); memcpy(blist, (char *)addr + hdr->hh_hashtab, sizeof(*blist) * hdr->hh_nbucket); for (i = 0; i < hdr->hh_nbucket; i++) { struct hints_bucket *bp = &blist[i]; /* Sanity check */ if (bp->hi_namex >= hdr->hh_strtab_sz) { warnx("bad name index: %#x", bp->hi_namex); free(blist); return -1; } if (bp->hi_pathx >= hdr->hh_strtab_sz) { warnx("bad path index: %#x", bp->hi_pathx); free(blist); return -1; } /* Allocate new list element */ shp = (struct shlib_list *)xmalloc(sizeof *shp); shp->name = strdup(strtab + bp->hi_namex); shp->path = strdup(strtab + bp->hi_pathx); bcopy(bp->hi_dewey, shp->dewey, sizeof(shp->dewey)); shp->ndewey = bp->hi_ndewey; shp->next = NULL; *shlib_tail = shp; shlib_tail = &shp->next; } free(blist); return 0; } static void -listhints() +listhints(void) { struct shlib_list *shp; int i; printf("%s:\n", hints_file); printf("\tsearch directories: %s\n", dir_list); for (i = 0, shp = shlib_head; shp; i++, shp = shp->next) printf("\t%d:-l%s.%d.%d => %s\n", i, shp->name, shp->major, shp->minor, shp->path); return; } Index: stable/8/sbin/mdconfig =================================================================== --- stable/8/sbin/mdconfig (revision 215813) +++ stable/8/sbin/mdconfig (revision 215814) Property changes on: stable/8/sbin/mdconfig ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/mdconfig:r201217 Index: stable/8/sbin/mksnap_ffs =================================================================== --- stable/8/sbin/mksnap_ffs (revision 215813) +++ stable/8/sbin/mksnap_ffs (revision 215814) Property changes on: stable/8/sbin/mksnap_ffs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/mksnap_ffs:r201217 Index: stable/8/sbin/mount =================================================================== --- stable/8/sbin/mount (revision 215813) +++ stable/8/sbin/mount (revision 215814) Property changes on: stable/8/sbin/mount ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/mount:r201217 Index: stable/8/sbin/mount_cd9660 =================================================================== --- stable/8/sbin/mount_cd9660 (revision 215813) +++ stable/8/sbin/mount_cd9660 (revision 215814) Property changes on: stable/8/sbin/mount_cd9660 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/mount_cd9660:r201217 Index: stable/8/sbin/mount_msdosfs =================================================================== --- stable/8/sbin/mount_msdosfs (revision 215813) +++ stable/8/sbin/mount_msdosfs (revision 215814) Property changes on: stable/8/sbin/mount_msdosfs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/mount_msdosfs:r201217 Index: stable/8/sbin/mount_nfs =================================================================== --- stable/8/sbin/mount_nfs (revision 215813) +++ stable/8/sbin/mount_nfs (revision 215814) Property changes on: stable/8/sbin/mount_nfs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/mount_nfs:r201217 Index: stable/8/sbin/natd =================================================================== --- stable/8/sbin/natd (revision 215813) +++ stable/8/sbin/natd (revision 215814) Property changes on: stable/8/sbin/natd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/natd:r201217 Index: stable/8/sbin/newfs =================================================================== --- stable/8/sbin/newfs (revision 215813) +++ stable/8/sbin/newfs (revision 215814) Property changes on: stable/8/sbin/newfs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/newfs:r201217 Index: stable/8/sbin/newfs_msdos =================================================================== --- stable/8/sbin/newfs_msdos (revision 215813) +++ stable/8/sbin/newfs_msdos (revision 215814) Property changes on: stable/8/sbin/newfs_msdos ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/newfs_msdos:r201217 Index: stable/8/sbin/ping6 =================================================================== --- stable/8/sbin/ping6 (revision 215813) +++ stable/8/sbin/ping6 (revision 215814) Property changes on: stable/8/sbin/ping6 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/ping6:r201217 Index: stable/8/sbin/reboot =================================================================== --- stable/8/sbin/reboot (revision 215813) +++ stable/8/sbin/reboot (revision 215814) Property changes on: stable/8/sbin/reboot ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/reboot:r201217 Index: stable/8/sbin/restore =================================================================== --- stable/8/sbin/restore (revision 215813) +++ stable/8/sbin/restore (revision 215814) Property changes on: stable/8/sbin/restore ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/restore:r201217 Index: stable/8/sbin/routed =================================================================== --- stable/8/sbin/routed (revision 215813) +++ stable/8/sbin/routed (revision 215814) Property changes on: stable/8/sbin/routed ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/routed:r201217 Index: stable/8/sbin/setkey =================================================================== --- stable/8/sbin/setkey (revision 215813) +++ stable/8/sbin/setkey (revision 215814) Property changes on: stable/8/sbin/setkey ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/setkey:r201217 Index: stable/8/sbin/spppcontrol =================================================================== --- stable/8/sbin/spppcontrol (revision 215813) +++ stable/8/sbin/spppcontrol (revision 215814) Property changes on: stable/8/sbin/spppcontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/spppcontrol:r201217 Index: stable/8/sbin/sysctl =================================================================== --- stable/8/sbin/sysctl (revision 215813) +++ stable/8/sbin/sysctl (revision 215814) Property changes on: stable/8/sbin/sysctl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/sysctl:r201217 Index: stable/8/sbin/tunefs =================================================================== --- stable/8/sbin/tunefs (revision 215813) +++ stable/8/sbin/tunefs (revision 215814) Property changes on: stable/8/sbin/tunefs ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/tunefs:r201217 Index: stable/8/sbin/umount =================================================================== --- stable/8/sbin/umount (revision 215813) +++ stable/8/sbin/umount (revision 215814) Property changes on: stable/8/sbin/umount ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin/umount:r201217 Index: stable/8/sbin =================================================================== --- stable/8/sbin (revision 215813) +++ stable/8/sbin (revision 215814) Property changes on: stable/8/sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sbin:r201217 Index: stable/8/secure/usr.bin/bdes =================================================================== --- stable/8/secure/usr.bin/bdes (revision 215813) +++ stable/8/secure/usr.bin/bdes (revision 215814) Property changes on: stable/8/secure/usr.bin/bdes ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/secure/usr.bin/bdes:r201217 Index: stable/8/secure =================================================================== --- stable/8/secure (revision 215813) +++ stable/8/secure (revision 215814) Property changes on: stable/8/secure ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/secure:r201217 Index: stable/8/share/dict =================================================================== --- stable/8/share/dict (revision 215813) +++ stable/8/share/dict (revision 215814) Property changes on: stable/8/share/dict ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/dict:r201217 Index: stable/8/share/doc/papers/jail =================================================================== --- stable/8/share/doc/papers/jail (revision 215813) +++ stable/8/share/doc/papers/jail (revision 215814) Property changes on: stable/8/share/doc/papers/jail ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/doc/papers/jail:r201217 Index: stable/8/share/doc/smm/01.setup =================================================================== --- stable/8/share/doc/smm/01.setup (revision 215813) +++ stable/8/share/doc/smm/01.setup (revision 215814) Property changes on: stable/8/share/doc/smm/01.setup ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/doc/smm/01.setup:r201217 Index: stable/8/share/examples/etc =================================================================== --- stable/8/share/examples/etc (revision 215813) +++ stable/8/share/examples/etc (revision 215814) Property changes on: stable/8/share/examples/etc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/examples/etc:r201217 Index: stable/8/share/examples/kld/syscall =================================================================== --- stable/8/share/examples/kld/syscall (revision 215813) +++ stable/8/share/examples/kld/syscall (revision 215814) Property changes on: stable/8/share/examples/kld/syscall ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/examples/kld/syscall:r201217 Index: stable/8/share/examples =================================================================== --- stable/8/share/examples (revision 215813) +++ stable/8/share/examples (revision 215814) Property changes on: stable/8/share/examples ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/examples:r201217 Index: stable/8/share/man/man1 =================================================================== --- stable/8/share/man/man1 (revision 215813) +++ stable/8/share/man/man1 (revision 215814) Property changes on: stable/8/share/man/man1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/man/man1:r201217 Index: stable/8/share/man/man3 =================================================================== --- stable/8/share/man/man3 (revision 215813) +++ stable/8/share/man/man3 (revision 215814) Property changes on: stable/8/share/man/man3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/man/man3:r201217 Index: stable/8/share/man/man4 =================================================================== --- stable/8/share/man/man4 (revision 215813) +++ stable/8/share/man/man4 (revision 215814) Property changes on: stable/8/share/man/man4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/man/man4:r201217 Index: stable/8/share/man/man5 =================================================================== --- stable/8/share/man/man5 (revision 215813) +++ stable/8/share/man/man5 (revision 215814) Property changes on: stable/8/share/man/man5 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/man/man5:r201217 Index: stable/8/share/man/man7 =================================================================== --- stable/8/share/man/man7 (revision 215813) +++ stable/8/share/man/man7 (revision 215814) Property changes on: stable/8/share/man/man7 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/man/man7:r201217 Index: stable/8/share/man/man8 =================================================================== --- stable/8/share/man/man8 (revision 215813) +++ stable/8/share/man/man8 (revision 215814) Property changes on: stable/8/share/man/man8 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/man/man8:r201217 Index: stable/8/share/man/man9 =================================================================== --- stable/8/share/man/man9 (revision 215813) +++ stable/8/share/man/man9 (revision 215814) Property changes on: stable/8/share/man/man9 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/man/man9:r201217 Index: stable/8/share/man =================================================================== --- stable/8/share/man (revision 215813) +++ stable/8/share/man (revision 215814) Property changes on: stable/8/share/man ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/man:r201217 Index: stable/8/share/misc =================================================================== --- stable/8/share/misc (revision 215813) +++ stable/8/share/misc (revision 215814) Property changes on: stable/8/share/misc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/misc:r201217 Index: stable/8/share/mk =================================================================== --- stable/8/share/mk (revision 215813) +++ stable/8/share/mk (revision 215814) Property changes on: stable/8/share/mk ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/mk:r201217 Index: stable/8/share/termcap =================================================================== --- stable/8/share/termcap (revision 215813) +++ stable/8/share/termcap (revision 215814) Property changes on: stable/8/share/termcap ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/termcap:r201217 Index: stable/8/share/timedef =================================================================== --- stable/8/share/timedef (revision 215813) +++ stable/8/share/timedef (revision 215814) Property changes on: stable/8/share/timedef ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/timedef:r201217 Index: stable/8/share/zoneinfo =================================================================== --- stable/8/share/zoneinfo (revision 215813) +++ stable/8/share/zoneinfo (revision 215814) Property changes on: stable/8/share/zoneinfo ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/share/zoneinfo:r201217 Index: stable/8/sys/amd64/include/xen =================================================================== --- stable/8/sys/amd64/include/xen (revision 215813) +++ stable/8/sys/amd64/include/xen (revision 215814) Property changes on: stable/8/sys/amd64/include/xen ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/amd64/include/xen:r201217 Index: stable/8/sys/cddl/contrib/opensolaris =================================================================== --- stable/8/sys/cddl/contrib/opensolaris (revision 215813) +++ stable/8/sys/cddl/contrib/opensolaris (revision 215814) Property changes on: stable/8/sys/cddl/contrib/opensolaris ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/cddl/contrib/opensolaris:r201217 Index: stable/8/sys/contrib/dev/acpica =================================================================== --- stable/8/sys/contrib/dev/acpica (revision 215813) +++ stable/8/sys/contrib/dev/acpica (revision 215814) Property changes on: stable/8/sys/contrib/dev/acpica ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/dev/acpica:r201217 Index: stable/8/sys/contrib/pf =================================================================== --- stable/8/sys/contrib/pf (revision 215813) +++ stable/8/sys/contrib/pf (revision 215814) Property changes on: stable/8/sys/contrib/pf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys/contrib/pf:r201217 Index: stable/8/sys =================================================================== --- stable/8/sys (revision 215813) +++ stable/8/sys (revision 215814) Property changes on: stable/8/sys ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/sys:r201217 Index: stable/8/tools/build/mk =================================================================== --- stable/8/tools/build/mk (revision 215813) +++ stable/8/tools/build/mk (revision 215814) Property changes on: stable/8/tools/build/mk ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/build/mk:r201217 Index: stable/8/tools/build/options =================================================================== --- stable/8/tools/build/options (revision 215813) +++ stable/8/tools/build/options (revision 215814) Property changes on: stable/8/tools/build/options ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/build/options:r201217 Index: stable/8/tools/debugscripts =================================================================== --- stable/8/tools/debugscripts (revision 215813) +++ stable/8/tools/debugscripts (revision 215814) Property changes on: stable/8/tools/debugscripts ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/debugscripts:r201217 Index: stable/8/tools/kerneldoc/subsys =================================================================== --- stable/8/tools/kerneldoc/subsys (revision 215813) +++ stable/8/tools/kerneldoc/subsys (revision 215814) Property changes on: stable/8/tools/kerneldoc/subsys ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/kerneldoc/subsys:r201217 Index: stable/8/tools/regression/acltools =================================================================== --- stable/8/tools/regression/acltools (revision 215813) +++ stable/8/tools/regression/acltools (revision 215814) Property changes on: stable/8/tools/regression/acltools ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/acltools:r201217 Index: stable/8/tools/regression/aio/aiotest =================================================================== --- stable/8/tools/regression/aio/aiotest (revision 215813) +++ stable/8/tools/regression/aio/aiotest (revision 215814) Property changes on: stable/8/tools/regression/aio/aiotest ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/aio/aiotest:r201217 Index: stable/8/tools/regression/bin/sh =================================================================== --- stable/8/tools/regression/bin/sh (revision 215813) +++ stable/8/tools/regression/bin/sh (revision 215814) Property changes on: stable/8/tools/regression/bin/sh ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/bin/sh:r201217 Index: stable/8/tools/regression/bin =================================================================== --- stable/8/tools/regression/bin (revision 215813) +++ stable/8/tools/regression/bin (revision 215814) Property changes on: stable/8/tools/regression/bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/bin:r201217 Index: stable/8/tools/regression/fifo =================================================================== --- stable/8/tools/regression/fifo (revision 215813) +++ stable/8/tools/regression/fifo (revision 215814) Property changes on: stable/8/tools/regression/fifo ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/fifo:r201217 Index: stable/8/tools/regression/geom =================================================================== --- stable/8/tools/regression/geom (revision 215813) +++ stable/8/tools/regression/geom (revision 215814) Property changes on: stable/8/tools/regression/geom ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/geom:r201217 Index: stable/8/tools/regression/lib/libc =================================================================== --- stable/8/tools/regression/lib/libc (revision 215813) +++ stable/8/tools/regression/lib/libc (revision 215814) Property changes on: stable/8/tools/regression/lib/libc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/lib/libc:r201217 Index: stable/8/tools/regression/lib/msun/test-conj.t =================================================================== --- stable/8/tools/regression/lib/msun/test-conj.t (revision 215813) +++ stable/8/tools/regression/lib/msun/test-conj.t (revision 215814) Property changes on: stable/8/tools/regression/lib/msun/test-conj.t ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/lib/msun/test-conj.t:r201217 Index: stable/8/tools/regression/mqueue/mqtest1 =================================================================== --- stable/8/tools/regression/mqueue/mqtest1 (revision 215813) +++ stable/8/tools/regression/mqueue/mqtest1 (revision 215814) Property changes on: stable/8/tools/regression/mqueue/mqtest1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/mqueue/mqtest1:r201217 Index: stable/8/tools/regression/mqueue/mqtest2 =================================================================== --- stable/8/tools/regression/mqueue/mqtest2 (revision 215813) +++ stable/8/tools/regression/mqueue/mqtest2 (revision 215814) Property changes on: stable/8/tools/regression/mqueue/mqtest2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/mqueue/mqtest2:r201217 Index: stable/8/tools/regression/mqueue/mqtest3 =================================================================== --- stable/8/tools/regression/mqueue/mqtest3 (revision 215813) +++ stable/8/tools/regression/mqueue/mqtest3 (revision 215814) Property changes on: stable/8/tools/regression/mqueue/mqtest3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/mqueue/mqtest3:r201217 Index: stable/8/tools/regression/mqueue/mqtest4 =================================================================== --- stable/8/tools/regression/mqueue/mqtest4 (revision 215813) +++ stable/8/tools/regression/mqueue/mqtest4 (revision 215814) Property changes on: stable/8/tools/regression/mqueue/mqtest4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/mqueue/mqtest4:r201217 Index: stable/8/tools/regression/mqueue/mqtest5 =================================================================== --- stable/8/tools/regression/mqueue/mqtest5 (revision 215813) +++ stable/8/tools/regression/mqueue/mqtest5 (revision 215814) Property changes on: stable/8/tools/regression/mqueue/mqtest5 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/mqueue/mqtest5:r201217 Index: stable/8/tools/regression/poll =================================================================== --- stable/8/tools/regression/poll (revision 215813) +++ stable/8/tools/regression/poll (revision 215814) Property changes on: stable/8/tools/regression/poll ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/poll:r201217 Index: stable/8/tools/regression/posixsem =================================================================== --- stable/8/tools/regression/posixsem (revision 215813) +++ stable/8/tools/regression/posixsem (revision 215814) Property changes on: stable/8/tools/regression/posixsem ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/posixsem:r201217 Index: stable/8/tools/regression/priv =================================================================== --- stable/8/tools/regression/priv (revision 215813) +++ stable/8/tools/regression/priv (revision 215814) Property changes on: stable/8/tools/regression/priv ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/priv:r201217 Index: stable/8/tools/regression/usr.bin/pkill/pgrep-_g.t =================================================================== --- stable/8/tools/regression/usr.bin/pkill/pgrep-_g.t (revision 215813) +++ stable/8/tools/regression/usr.bin/pkill/pgrep-_g.t (revision 215814) Property changes on: stable/8/tools/regression/usr.bin/pkill/pgrep-_g.t ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/usr.bin/pkill/pgrep-_g.t:r201217 Index: stable/8/tools/regression/usr.bin/pkill/pgrep-_s.t =================================================================== --- stable/8/tools/regression/usr.bin/pkill/pgrep-_s.t (revision 215813) +++ stable/8/tools/regression/usr.bin/pkill/pgrep-_s.t (revision 215814) Property changes on: stable/8/tools/regression/usr.bin/pkill/pgrep-_s.t ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/usr.bin/pkill/pgrep-_s.t:r201217 Index: stable/8/tools/regression/usr.bin/pkill/pkill-_g.t =================================================================== --- stable/8/tools/regression/usr.bin/pkill/pkill-_g.t (revision 215813) +++ stable/8/tools/regression/usr.bin/pkill/pkill-_g.t (revision 215814) Property changes on: stable/8/tools/regression/usr.bin/pkill/pkill-_g.t ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/usr.bin/pkill/pkill-_g.t:r201217 Index: stable/8/tools/regression/usr.bin/sed =================================================================== --- stable/8/tools/regression/usr.bin/sed (revision 215813) +++ stable/8/tools/regression/usr.bin/sed (revision 215814) Property changes on: stable/8/tools/regression/usr.bin/sed ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/usr.bin/sed:r201217 Index: stable/8/tools/regression/usr.bin/tr =================================================================== --- stable/8/tools/regression/usr.bin/tr (revision 215813) +++ stable/8/tools/regression/usr.bin/tr (revision 215814) Property changes on: stable/8/tools/regression/usr.bin/tr ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/usr.bin/tr:r201217 Index: stable/8/tools/regression/usr.bin =================================================================== --- stable/8/tools/regression/usr.bin (revision 215813) +++ stable/8/tools/regression/usr.bin (revision 215814) Property changes on: stable/8/tools/regression/usr.bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/regression/usr.bin:r201217 Index: stable/8/tools/test =================================================================== --- stable/8/tools/test (revision 215813) +++ stable/8/tools/test (revision 215814) Property changes on: stable/8/tools/test ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/test:r201217 Index: stable/8/tools/tools/ath/common/dumpregs.h =================================================================== --- stable/8/tools/tools/ath/common/dumpregs.h (revision 215813) +++ stable/8/tools/tools/ath/common/dumpregs.h (revision 215814) Property changes on: stable/8/tools/tools/ath/common/dumpregs.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/ath/common/dumpregs.h:r201217 Index: stable/8/tools/tools/ath/common/dumpregs_5210.c =================================================================== --- stable/8/tools/tools/ath/common/dumpregs_5210.c (revision 215813) +++ stable/8/tools/tools/ath/common/dumpregs_5210.c (revision 215814) Property changes on: stable/8/tools/tools/ath/common/dumpregs_5210.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/ath/common/dumpregs_5210.c:r201217 Index: stable/8/tools/tools/ath/common/dumpregs_5211.c =================================================================== --- stable/8/tools/tools/ath/common/dumpregs_5211.c (revision 215813) +++ stable/8/tools/tools/ath/common/dumpregs_5211.c (revision 215814) Property changes on: stable/8/tools/tools/ath/common/dumpregs_5211.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/ath/common/dumpregs_5211.c:r201217 Index: stable/8/tools/tools/ath/common/dumpregs_5212.c =================================================================== --- stable/8/tools/tools/ath/common/dumpregs_5212.c (revision 215813) +++ stable/8/tools/tools/ath/common/dumpregs_5212.c (revision 215814) Property changes on: stable/8/tools/tools/ath/common/dumpregs_5212.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/ath/common/dumpregs_5212.c:r201217 Index: stable/8/tools/tools/ath/common/dumpregs_5416.c =================================================================== --- stable/8/tools/tools/ath/common/dumpregs_5416.c (revision 215813) +++ stable/8/tools/tools/ath/common/dumpregs_5416.c (revision 215814) Property changes on: stable/8/tools/tools/ath/common/dumpregs_5416.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/ath/common/dumpregs_5416.c:r201217 Index: stable/8/tools/tools/ath =================================================================== --- stable/8/tools/tools/ath (revision 215813) +++ stable/8/tools/tools/ath (revision 215814) Property changes on: stable/8/tools/tools/ath ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/ath:r201217 Index: stable/8/tools/tools/nanobsd =================================================================== --- stable/8/tools/tools/nanobsd (revision 215813) +++ stable/8/tools/tools/nanobsd (revision 215814) Property changes on: stable/8/tools/tools/nanobsd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/nanobsd:r201217 Index: stable/8/tools/tools/netrate/tcpp =================================================================== --- stable/8/tools/tools/netrate/tcpp (revision 215813) +++ stable/8/tools/tools/netrate/tcpp (revision 215814) Property changes on: stable/8/tools/tools/netrate/tcpp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/netrate/tcpp:r201217 Index: stable/8/tools/tools/netrate =================================================================== --- stable/8/tools/tools/netrate (revision 215813) +++ stable/8/tools/tools/netrate (revision 215814) Property changes on: stable/8/tools/tools/netrate ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/netrate:r201217 Index: stable/8/tools/tools/termcap/termcap.pl =================================================================== --- stable/8/tools/tools/termcap/termcap.pl (revision 215813) +++ stable/8/tools/tools/termcap/termcap.pl (revision 215814) Property changes on: stable/8/tools/tools/termcap/termcap.pl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/termcap/termcap.pl:r201217 Index: stable/8/tools/tools/umastat =================================================================== --- stable/8/tools/tools/umastat (revision 215813) +++ stable/8/tools/tools/umastat (revision 215814) Property changes on: stable/8/tools/tools/umastat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/umastat:r201217 Index: stable/8/tools/tools/vimage =================================================================== --- stable/8/tools/tools/vimage (revision 215813) +++ stable/8/tools/tools/vimage (revision 215814) Property changes on: stable/8/tools/tools/vimage ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools/vimage:r201217 Index: stable/8/tools/tools =================================================================== --- stable/8/tools/tools (revision 215813) +++ stable/8/tools/tools (revision 215814) Property changes on: stable/8/tools/tools ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools/tools:r201217 Index: stable/8/tools =================================================================== --- stable/8/tools (revision 215813) +++ stable/8/tools (revision 215814) Property changes on: stable/8/tools ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/tools:r201217 Index: stable/8/usr.bin/apply =================================================================== --- stable/8/usr.bin/apply (revision 215813) +++ stable/8/usr.bin/apply (revision 215814) Property changes on: stable/8/usr.bin/apply ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/apply:r201217 Index: stable/8/usr.bin/ar =================================================================== --- stable/8/usr.bin/ar (revision 215813) +++ stable/8/usr.bin/ar (revision 215814) Property changes on: stable/8/usr.bin/ar ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/ar:r201217 Index: stable/8/usr.bin/biff =================================================================== --- stable/8/usr.bin/biff (revision 215813) +++ stable/8/usr.bin/biff (revision 215814) Property changes on: stable/8/usr.bin/biff ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/biff:r201217 Index: stable/8/usr.bin/c89 =================================================================== --- stable/8/usr.bin/c89 (revision 215813) +++ stable/8/usr.bin/c89 (revision 215814) Property changes on: stable/8/usr.bin/c89 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/c89:r201217 Index: stable/8/usr.bin/c99 =================================================================== --- stable/8/usr.bin/c99 (revision 215813) +++ stable/8/usr.bin/c99 (revision 215814) Property changes on: stable/8/usr.bin/c99 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/c99:r201217 Index: stable/8/usr.bin/catman =================================================================== --- stable/8/usr.bin/catman (revision 215813) +++ stable/8/usr.bin/catman (revision 215814) Property changes on: stable/8/usr.bin/catman ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/catman:r201217 Index: stable/8/usr.bin/column =================================================================== --- stable/8/usr.bin/column (revision 215813) +++ stable/8/usr.bin/column (revision 215814) Property changes on: stable/8/usr.bin/column ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/column:r201217 Index: stable/8/usr.bin/comm =================================================================== --- stable/8/usr.bin/comm (revision 215813) +++ stable/8/usr.bin/comm (revision 215814) Property changes on: stable/8/usr.bin/comm ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/comm:r201217 Index: stable/8/usr.bin/cpio =================================================================== --- stable/8/usr.bin/cpio (revision 215813) +++ stable/8/usr.bin/cpio (revision 215814) Property changes on: stable/8/usr.bin/cpio ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/cpio:r201217 Index: stable/8/usr.bin/csup =================================================================== --- stable/8/usr.bin/csup (revision 215813) +++ stable/8/usr.bin/csup (revision 215814) Property changes on: stable/8/usr.bin/csup ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/csup:r201217 Index: stable/8/usr.bin/du =================================================================== --- stable/8/usr.bin/du (revision 215813) +++ stable/8/usr.bin/du (revision 215814) Property changes on: stable/8/usr.bin/du ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/du:r201217 Index: stable/8/usr.bin/ee =================================================================== --- stable/8/usr.bin/ee (revision 215813) +++ stable/8/usr.bin/ee (revision 215814) Property changes on: stable/8/usr.bin/ee ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/ee:r201217 Index: stable/8/usr.bin/enigma =================================================================== --- stable/8/usr.bin/enigma (revision 215813) +++ stable/8/usr.bin/enigma (revision 215814) Property changes on: stable/8/usr.bin/enigma ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/enigma:r201217 Index: stable/8/usr.bin/fetch =================================================================== --- stable/8/usr.bin/fetch (revision 215813) +++ stable/8/usr.bin/fetch (revision 215814) Property changes on: stable/8/usr.bin/fetch ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/fetch:r201217 Index: stable/8/usr.bin/find =================================================================== --- stable/8/usr.bin/find (revision 215813) +++ stable/8/usr.bin/find (revision 215814) Property changes on: stable/8/usr.bin/find ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/find:r201217 Index: stable/8/usr.bin/finger =================================================================== --- stable/8/usr.bin/finger (revision 215813) +++ stable/8/usr.bin/finger (revision 215814) Property changes on: stable/8/usr.bin/finger ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/finger:r201217 Index: stable/8/usr.bin/fold =================================================================== --- stable/8/usr.bin/fold (revision 215813) +++ stable/8/usr.bin/fold (revision 215814) Property changes on: stable/8/usr.bin/fold ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/fold:r201217 Index: stable/8/usr.bin/fstat =================================================================== --- stable/8/usr.bin/fstat (revision 215813) +++ stable/8/usr.bin/fstat (revision 215814) Property changes on: stable/8/usr.bin/fstat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/fstat:r201217 Index: stable/8/usr.bin/gcore =================================================================== --- stable/8/usr.bin/gcore (revision 215813) +++ stable/8/usr.bin/gcore (revision 215814) Property changes on: stable/8/usr.bin/gcore ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/gcore:r201217 Index: stable/8/usr.bin/getopt =================================================================== --- stable/8/usr.bin/getopt (revision 215813) +++ stable/8/usr.bin/getopt (revision 215814) Property changes on: stable/8/usr.bin/getopt ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/getopt:r201217 Index: stable/8/usr.bin/hexdump =================================================================== --- stable/8/usr.bin/hexdump (revision 215813) +++ stable/8/usr.bin/hexdump (revision 215814) Property changes on: stable/8/usr.bin/hexdump ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/hexdump:r201217 Index: stable/8/usr.bin/indent =================================================================== --- stable/8/usr.bin/indent (revision 215813) +++ stable/8/usr.bin/indent (revision 215814) Property changes on: stable/8/usr.bin/indent ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/indent:r201217 Index: stable/8/usr.bin/jot =================================================================== --- stable/8/usr.bin/jot (revision 215813) +++ stable/8/usr.bin/jot (revision 215814) Property changes on: stable/8/usr.bin/jot ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/jot:r201217 Index: stable/8/usr.bin/kdump =================================================================== --- stable/8/usr.bin/kdump (revision 215813) +++ stable/8/usr.bin/kdump (revision 215814) Property changes on: stable/8/usr.bin/kdump ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/kdump:r201217 Index: stable/8/usr.bin/killall =================================================================== --- stable/8/usr.bin/killall (revision 215813) +++ stable/8/usr.bin/killall (revision 215814) Property changes on: stable/8/usr.bin/killall ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/killall:r201217 Index: stable/8/usr.bin/ktrace =================================================================== --- stable/8/usr.bin/ktrace (revision 215813) +++ stable/8/usr.bin/ktrace (revision 215814) Property changes on: stable/8/usr.bin/ktrace ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/ktrace:r201217 Index: stable/8/usr.bin/ldd =================================================================== --- stable/8/usr.bin/ldd (revision 215813) +++ stable/8/usr.bin/ldd (revision 215814) Property changes on: stable/8/usr.bin/ldd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/ldd:r201217 Index: stable/8/usr.bin/lex =================================================================== --- stable/8/usr.bin/lex (revision 215813) +++ stable/8/usr.bin/lex (revision 215814) Property changes on: stable/8/usr.bin/lex ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/lex:r201217 Index: stable/8/usr.bin/locale =================================================================== --- stable/8/usr.bin/locale (revision 215813) +++ stable/8/usr.bin/locale (revision 215814) Property changes on: stable/8/usr.bin/locale ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/locale:r201217 Index: stable/8/usr.bin/lockf =================================================================== --- stable/8/usr.bin/lockf (revision 215813) +++ stable/8/usr.bin/lockf (revision 215814) Property changes on: stable/8/usr.bin/lockf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/lockf:r201217 Index: stable/8/usr.bin/look =================================================================== --- stable/8/usr.bin/look (revision 215813) +++ stable/8/usr.bin/look (revision 215814) Property changes on: stable/8/usr.bin/look ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/look:r201217 Index: stable/8/usr.bin/mail =================================================================== --- stable/8/usr.bin/mail (revision 215813) +++ stable/8/usr.bin/mail (revision 215814) Property changes on: stable/8/usr.bin/mail ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/mail:r201217 Index: stable/8/usr.bin/make =================================================================== --- stable/8/usr.bin/make (revision 215813) +++ stable/8/usr.bin/make (revision 215814) Property changes on: stable/8/usr.bin/make ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/make:r201217 Index: stable/8/usr.bin/makewhatis =================================================================== --- stable/8/usr.bin/makewhatis (revision 215813) +++ stable/8/usr.bin/makewhatis (revision 215814) Property changes on: stable/8/usr.bin/makewhatis ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/makewhatis:r201217 Index: stable/8/usr.bin/minigzip =================================================================== --- stable/8/usr.bin/minigzip (revision 215813) +++ stable/8/usr.bin/minigzip (revision 215814) Property changes on: stable/8/usr.bin/minigzip ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/minigzip:r201217 Index: stable/8/usr.bin/ncal =================================================================== --- stable/8/usr.bin/ncal (revision 215813) +++ stable/8/usr.bin/ncal (revision 215814) Property changes on: stable/8/usr.bin/ncal ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/ncal:r201217 Index: stable/8/usr.bin/netstat =================================================================== --- stable/8/usr.bin/netstat (revision 215813) +++ stable/8/usr.bin/netstat (revision 215814) Property changes on: stable/8/usr.bin/netstat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/netstat:r201217 Index: stable/8/usr.bin/pathchk =================================================================== --- stable/8/usr.bin/pathchk (revision 215813) +++ stable/8/usr.bin/pathchk (revision 215814) Property changes on: stable/8/usr.bin/pathchk ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/pathchk:r201217 Index: stable/8/usr.bin/perror =================================================================== --- stable/8/usr.bin/perror (revision 215813) +++ stable/8/usr.bin/perror (revision 215814) Property changes on: stable/8/usr.bin/perror ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/perror:r201217 Index: stable/8/usr.bin/procstat =================================================================== --- stable/8/usr.bin/procstat (revision 215813) +++ stable/8/usr.bin/procstat (revision 215814) Property changes on: stable/8/usr.bin/procstat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/procstat:r201217 Index: stable/8/usr.bin/rpcgen =================================================================== --- stable/8/usr.bin/rpcgen (revision 215813) +++ stable/8/usr.bin/rpcgen (revision 215814) Property changes on: stable/8/usr.bin/rpcgen ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/rpcgen:r201217 Index: stable/8/usr.bin/ruptime =================================================================== --- stable/8/usr.bin/ruptime (revision 215813) +++ stable/8/usr.bin/ruptime (revision 215814) Property changes on: stable/8/usr.bin/ruptime ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/ruptime:r201217 Index: stable/8/usr.bin/script =================================================================== --- stable/8/usr.bin/script (revision 215813) +++ stable/8/usr.bin/script (revision 215814) Property changes on: stable/8/usr.bin/script ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/script:r201217 Index: stable/8/usr.bin/sed =================================================================== --- stable/8/usr.bin/sed (revision 215813) +++ stable/8/usr.bin/sed (revision 215814) Property changes on: stable/8/usr.bin/sed ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/sed:r201217 Index: stable/8/usr.bin/sockstat =================================================================== --- stable/8/usr.bin/sockstat (revision 215813) +++ stable/8/usr.bin/sockstat (revision 215814) Property changes on: stable/8/usr.bin/sockstat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/sockstat:r201217 Index: stable/8/usr.bin/split =================================================================== --- stable/8/usr.bin/split (revision 215813) +++ stable/8/usr.bin/split (revision 215814) Property changes on: stable/8/usr.bin/split ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/split:r201217 Index: stable/8/usr.bin/stat =================================================================== --- stable/8/usr.bin/stat (revision 215813) +++ stable/8/usr.bin/stat (revision 215814) Property changes on: stable/8/usr.bin/stat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/stat:r201217 Index: stable/8/usr.bin/systat =================================================================== --- stable/8/usr.bin/systat (revision 215813) +++ stable/8/usr.bin/systat (revision 215814) Property changes on: stable/8/usr.bin/systat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/systat:r201217 Index: stable/8/usr.bin/tar =================================================================== --- stable/8/usr.bin/tar (revision 215813) +++ stable/8/usr.bin/tar (revision 215814) Property changes on: stable/8/usr.bin/tar ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/tar:r201217 Index: stable/8/usr.bin/tftp =================================================================== --- stable/8/usr.bin/tftp (revision 215813) +++ stable/8/usr.bin/tftp (revision 215814) Property changes on: stable/8/usr.bin/tftp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/tftp:r201217 Index: stable/8/usr.bin/top =================================================================== --- stable/8/usr.bin/top (revision 215813) +++ stable/8/usr.bin/top (revision 215814) Property changes on: stable/8/usr.bin/top ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/top:r201217 Index: stable/8/usr.bin/touch =================================================================== --- stable/8/usr.bin/touch (revision 215813) +++ stable/8/usr.bin/touch (revision 215814) Property changes on: stable/8/usr.bin/touch ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/touch:r201217 Index: stable/8/usr.bin/tr =================================================================== --- stable/8/usr.bin/tr (revision 215813) +++ stable/8/usr.bin/tr (revision 215814) Property changes on: stable/8/usr.bin/tr ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/tr:r201217 Index: stable/8/usr.bin/truss =================================================================== --- stable/8/usr.bin/truss (revision 215813) +++ stable/8/usr.bin/truss (revision 215814) Property changes on: stable/8/usr.bin/truss ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/truss:r201217 Index: stable/8/usr.bin/uname =================================================================== --- stable/8/usr.bin/uname (revision 215813) +++ stable/8/usr.bin/uname (revision 215814) Property changes on: stable/8/usr.bin/uname ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/uname:r201217 Index: stable/8/usr.bin/unifdef =================================================================== --- stable/8/usr.bin/unifdef (revision 215813) +++ stable/8/usr.bin/unifdef (revision 215814) Property changes on: stable/8/usr.bin/unifdef ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/unifdef:r201217 Index: stable/8/usr.bin/uniq =================================================================== --- stable/8/usr.bin/uniq (revision 215813) +++ stable/8/usr.bin/uniq (revision 215814) Property changes on: stable/8/usr.bin/uniq ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/uniq:r201217 Index: stable/8/usr.bin/uudecode =================================================================== --- stable/8/usr.bin/uudecode (revision 215813) +++ stable/8/usr.bin/uudecode (revision 215814) Property changes on: stable/8/usr.bin/uudecode ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/uudecode:r201217 Index: stable/8/usr.bin/vmstat =================================================================== --- stable/8/usr.bin/vmstat (revision 215813) +++ stable/8/usr.bin/vmstat (revision 215814) Property changes on: stable/8/usr.bin/vmstat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/vmstat:r201217 Index: stable/8/usr.bin/w =================================================================== --- stable/8/usr.bin/w (revision 215813) +++ stable/8/usr.bin/w (revision 215814) Property changes on: stable/8/usr.bin/w ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/w:r201217 Index: stable/8/usr.bin/whois =================================================================== --- stable/8/usr.bin/whois (revision 215813) +++ stable/8/usr.bin/whois (revision 215814) Property changes on: stable/8/usr.bin/whois ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/whois:r201217 Index: stable/8/usr.bin/xinstall =================================================================== --- stable/8/usr.bin/xinstall (revision 215813) +++ stable/8/usr.bin/xinstall (revision 215814) Property changes on: stable/8/usr.bin/xinstall ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/xinstall:r201217 Index: stable/8/usr.bin/xlint =================================================================== --- stable/8/usr.bin/xlint (revision 215813) +++ stable/8/usr.bin/xlint (revision 215814) Property changes on: stable/8/usr.bin/xlint ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/xlint:r201217 Index: stable/8/usr.bin/xz =================================================================== --- stable/8/usr.bin/xz (revision 215813) +++ stable/8/usr.bin/xz (revision 215814) Property changes on: stable/8/usr.bin/xz ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/xz:r201217 Index: stable/8/usr.bin/yacc =================================================================== --- stable/8/usr.bin/yacc (revision 215813) +++ stable/8/usr.bin/yacc (revision 215814) Property changes on: stable/8/usr.bin/yacc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin/yacc:r201217 Index: stable/8/usr.bin =================================================================== --- stable/8/usr.bin (revision 215813) +++ stable/8/usr.bin (revision 215814) Property changes on: stable/8/usr.bin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.bin:r201217 Index: stable/8/usr.sbin/Makefile =================================================================== --- stable/8/usr.sbin/Makefile (revision 215813) +++ stable/8/usr.sbin/Makefile (revision 215814) Property changes on: stable/8/usr.sbin/Makefile ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/Makefile:r201217 Index: stable/8/usr.sbin/acpi =================================================================== --- stable/8/usr.sbin/acpi (revision 215813) +++ stable/8/usr.sbin/acpi (revision 215814) Property changes on: stable/8/usr.sbin/acpi ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/acpi:r201217 Index: stable/8/usr.sbin/arp =================================================================== --- stable/8/usr.sbin/arp (revision 215813) +++ stable/8/usr.sbin/arp (revision 215814) Property changes on: stable/8/usr.sbin/arp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/arp:r201217 Index: stable/8/usr.sbin/asf =================================================================== --- stable/8/usr.sbin/asf (revision 215813) +++ stable/8/usr.sbin/asf (revision 215814) Property changes on: stable/8/usr.sbin/asf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/asf:r201217 Index: stable/8/usr.sbin/bluetooth/bthidcontrol =================================================================== --- stable/8/usr.sbin/bluetooth/bthidcontrol (revision 215813) +++ stable/8/usr.sbin/bluetooth/bthidcontrol (revision 215814) Property changes on: stable/8/usr.sbin/bluetooth/bthidcontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bluetooth/bthidcontrol:r201217 Index: stable/8/usr.sbin/bluetooth/bthidd =================================================================== --- stable/8/usr.sbin/bluetooth/bthidd (revision 215813) +++ stable/8/usr.sbin/bluetooth/bthidd (revision 215814) Property changes on: stable/8/usr.sbin/bluetooth/bthidd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bluetooth/bthidd:r201217 Index: stable/8/usr.sbin/bluetooth =================================================================== --- stable/8/usr.sbin/bluetooth (revision 215813) +++ stable/8/usr.sbin/bluetooth (revision 215814) Property changes on: stable/8/usr.sbin/bluetooth ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bluetooth:r201217 Index: stable/8/usr.sbin/boot0cfg =================================================================== --- stable/8/usr.sbin/boot0cfg (revision 215813) +++ stable/8/usr.sbin/boot0cfg (revision 215814) Property changes on: stable/8/usr.sbin/boot0cfg ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/boot0cfg:r201217 Index: stable/8/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c =================================================================== --- stable/8/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c (revision 215813) +++ stable/8/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c (revision 215814) Property changes on: stable/8/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_processor_tbl.c:r201217 Index: stable/8/usr.sbin/bsnmpd =================================================================== --- stable/8/usr.sbin/bsnmpd (revision 215813) +++ stable/8/usr.sbin/bsnmpd (revision 215814) Property changes on: stable/8/usr.sbin/bsnmpd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/bsnmpd:r201217 Index: stable/8/usr.sbin/burncd =================================================================== --- stable/8/usr.sbin/burncd (revision 215813) +++ stable/8/usr.sbin/burncd (revision 215814) Property changes on: stable/8/usr.sbin/burncd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/burncd:r201217 Index: stable/8/usr.sbin/cdcontrol =================================================================== --- stable/8/usr.sbin/cdcontrol (revision 215813) +++ stable/8/usr.sbin/cdcontrol (revision 215814) Property changes on: stable/8/usr.sbin/cdcontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/cdcontrol:r201217 Index: stable/8/usr.sbin/chown =================================================================== --- stable/8/usr.sbin/chown (revision 215813) +++ stable/8/usr.sbin/chown (revision 215814) Property changes on: stable/8/usr.sbin/chown ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/chown:r201217 Index: stable/8/usr.sbin/config/SMM.doc =================================================================== --- stable/8/usr.sbin/config/SMM.doc (revision 215813) +++ stable/8/usr.sbin/config/SMM.doc (revision 215814) Property changes on: stable/8/usr.sbin/config/SMM.doc ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/config/SMM.doc:r201217 Index: stable/8/usr.sbin/config =================================================================== --- stable/8/usr.sbin/config (revision 215813) +++ stable/8/usr.sbin/config (revision 215814) Property changes on: stable/8/usr.sbin/config ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/config:r201217 Index: stable/8/usr.sbin/cpucontrol =================================================================== --- stable/8/usr.sbin/cpucontrol (revision 215813) +++ stable/8/usr.sbin/cpucontrol (revision 215814) Property changes on: stable/8/usr.sbin/cpucontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/cpucontrol:r201217 Index: stable/8/usr.sbin/crashinfo =================================================================== --- stable/8/usr.sbin/crashinfo (revision 215813) +++ stable/8/usr.sbin/crashinfo (revision 215814) Property changes on: stable/8/usr.sbin/crashinfo ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/crashinfo:r201217 Index: stable/8/usr.sbin/cron =================================================================== --- stable/8/usr.sbin/cron (revision 215813) +++ stable/8/usr.sbin/cron (revision 215814) Property changes on: stable/8/usr.sbin/cron ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/cron:r201217 Index: stable/8/usr.sbin/crunch/examples =================================================================== --- stable/8/usr.sbin/crunch/examples (revision 215813) +++ stable/8/usr.sbin/crunch/examples (revision 215814) Property changes on: stable/8/usr.sbin/crunch/examples ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/crunch/examples:r201217 Index: stable/8/usr.sbin/ctm =================================================================== --- stable/8/usr.sbin/ctm (revision 215813) +++ stable/8/usr.sbin/ctm (revision 215814) Property changes on: stable/8/usr.sbin/ctm ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/ctm:r201217 Index: stable/8/usr.sbin/cxgbtool =================================================================== --- stable/8/usr.sbin/cxgbtool (revision 215813) +++ stable/8/usr.sbin/cxgbtool (revision 215814) Property changes on: stable/8/usr.sbin/cxgbtool ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/cxgbtool:r201217 Index: stable/8/usr.sbin/devinfo =================================================================== --- stable/8/usr.sbin/devinfo (revision 215813) +++ stable/8/usr.sbin/devinfo (revision 215814) Property changes on: stable/8/usr.sbin/devinfo ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/devinfo:r201217 Index: stable/8/usr.sbin/diskinfo =================================================================== --- stable/8/usr.sbin/diskinfo (revision 215813) +++ stable/8/usr.sbin/diskinfo (revision 215814) Property changes on: stable/8/usr.sbin/diskinfo ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/diskinfo:r201217 Index: stable/8/usr.sbin/dumpcis/cardinfo.h =================================================================== --- stable/8/usr.sbin/dumpcis/cardinfo.h (revision 215813) +++ stable/8/usr.sbin/dumpcis/cardinfo.h (revision 215814) Property changes on: stable/8/usr.sbin/dumpcis/cardinfo.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/dumpcis/cardinfo.h:r201217 Index: stable/8/usr.sbin/dumpcis/cis.h =================================================================== --- stable/8/usr.sbin/dumpcis/cis.h (revision 215813) +++ stable/8/usr.sbin/dumpcis/cis.h (revision 215814) Property changes on: stable/8/usr.sbin/dumpcis/cis.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/dumpcis/cis.h:r201217 Index: stable/8/usr.sbin/faithd =================================================================== --- stable/8/usr.sbin/faithd (revision 215813) +++ stable/8/usr.sbin/faithd (revision 215814) Property changes on: stable/8/usr.sbin/faithd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/faithd:r201217 Index: stable/8/usr.sbin/fdcontrol =================================================================== --- stable/8/usr.sbin/fdcontrol (revision 215813) +++ stable/8/usr.sbin/fdcontrol (revision 215814) Property changes on: stable/8/usr.sbin/fdcontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/fdcontrol:r201217 Index: stable/8/usr.sbin/fdformat =================================================================== --- stable/8/usr.sbin/fdformat (revision 215813) +++ stable/8/usr.sbin/fdformat (revision 215814) Property changes on: stable/8/usr.sbin/fdformat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/fdformat:r201217 Index: stable/8/usr.sbin/fdread =================================================================== --- stable/8/usr.sbin/fdread (revision 215813) +++ stable/8/usr.sbin/fdread (revision 215814) Property changes on: stable/8/usr.sbin/fdread ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/fdread:r201217 Index: stable/8/usr.sbin/fdwrite =================================================================== --- stable/8/usr.sbin/fdwrite (revision 215813) +++ stable/8/usr.sbin/fdwrite (revision 215814) Property changes on: stable/8/usr.sbin/fdwrite ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/fdwrite:r201217 Index: stable/8/usr.sbin/fifolog =================================================================== --- stable/8/usr.sbin/fifolog (revision 215813) +++ stable/8/usr.sbin/fifolog (revision 215814) Property changes on: stable/8/usr.sbin/fifolog ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/fifolog:r201217 Index: stable/8/usr.sbin/flowctl =================================================================== --- stable/8/usr.sbin/flowctl (revision 215813) +++ stable/8/usr.sbin/flowctl (revision 215814) Property changes on: stable/8/usr.sbin/flowctl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/flowctl:r201217 Index: stable/8/usr.sbin/freebsd-update =================================================================== --- stable/8/usr.sbin/freebsd-update (revision 215813) +++ stable/8/usr.sbin/freebsd-update (revision 215814) Property changes on: stable/8/usr.sbin/freebsd-update ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/freebsd-update:r201217 Index: stable/8/usr.sbin/i2c =================================================================== --- stable/8/usr.sbin/i2c (revision 215813) +++ stable/8/usr.sbin/i2c (revision 215814) Property changes on: stable/8/usr.sbin/i2c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/i2c:r201217 Index: stable/8/usr.sbin/inetd =================================================================== --- stable/8/usr.sbin/inetd (revision 215813) +++ stable/8/usr.sbin/inetd (revision 215814) Property changes on: stable/8/usr.sbin/inetd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/inetd:r201217 Index: stable/8/usr.sbin/iostat =================================================================== --- stable/8/usr.sbin/iostat (revision 215813) +++ stable/8/usr.sbin/iostat (revision 215814) Property changes on: stable/8/usr.sbin/iostat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/iostat:r201217 Index: stable/8/usr.sbin/jail =================================================================== --- stable/8/usr.sbin/jail (revision 215813) +++ stable/8/usr.sbin/jail (revision 215814) Property changes on: stable/8/usr.sbin/jail ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/jail:r201217 Index: stable/8/usr.sbin/jls =================================================================== --- stable/8/usr.sbin/jls (revision 215813) +++ stable/8/usr.sbin/jls (revision 215814) Property changes on: stable/8/usr.sbin/jls ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/jls:r201217 Index: stable/8/usr.sbin/lpr =================================================================== --- stable/8/usr.sbin/lpr (revision 215813) +++ stable/8/usr.sbin/lpr (revision 215814) Property changes on: stable/8/usr.sbin/lpr ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/lpr:r201217 Index: stable/8/usr.sbin/makefs/ffs/ffs_bswap.c =================================================================== --- stable/8/usr.sbin/makefs/ffs/ffs_bswap.c (revision 215813) +++ stable/8/usr.sbin/makefs/ffs/ffs_bswap.c (revision 215814) Property changes on: stable/8/usr.sbin/makefs/ffs/ffs_bswap.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/makefs/ffs/ffs_bswap.c:r201217 Index: stable/8/usr.sbin/makefs/ffs/ffs_subr.c =================================================================== --- stable/8/usr.sbin/makefs/ffs/ffs_subr.c (revision 215813) +++ stable/8/usr.sbin/makefs/ffs/ffs_subr.c (revision 215814) Property changes on: stable/8/usr.sbin/makefs/ffs/ffs_subr.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/makefs/ffs/ffs_subr.c:r201217 Index: stable/8/usr.sbin/makefs/ffs/ufs_bswap.h =================================================================== --- stable/8/usr.sbin/makefs/ffs/ufs_bswap.h (revision 215813) +++ stable/8/usr.sbin/makefs/ffs/ufs_bswap.h (revision 215814) Property changes on: stable/8/usr.sbin/makefs/ffs/ufs_bswap.h ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/makefs/ffs/ufs_bswap.h:r201217 Index: stable/8/usr.sbin/makefs/getid.c =================================================================== --- stable/8/usr.sbin/makefs/getid.c (revision 215813) +++ stable/8/usr.sbin/makefs/getid.c (revision 215814) Property changes on: stable/8/usr.sbin/makefs/getid.c ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/makefs/getid.c:r201217 Index: stable/8/usr.sbin/mergemaster =================================================================== --- stable/8/usr.sbin/mergemaster (revision 215813) +++ stable/8/usr.sbin/mergemaster (revision 215814) Property changes on: stable/8/usr.sbin/mergemaster ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/mergemaster:r201217 Index: stable/8/usr.sbin/mfiutil =================================================================== --- stable/8/usr.sbin/mfiutil (revision 215813) +++ stable/8/usr.sbin/mfiutil (revision 215814) Property changes on: stable/8/usr.sbin/mfiutil ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/mfiutil:r201217 Index: stable/8/usr.sbin/mountd =================================================================== --- stable/8/usr.sbin/mountd (revision 215813) +++ stable/8/usr.sbin/mountd (revision 215814) Property changes on: stable/8/usr.sbin/mountd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/mountd:r201217 Index: stable/8/usr.sbin/moused =================================================================== --- stable/8/usr.sbin/moused (revision 215813) +++ stable/8/usr.sbin/moused (revision 215814) Property changes on: stable/8/usr.sbin/moused ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/moused:r201217 Index: stable/8/usr.sbin/mptutil =================================================================== --- stable/8/usr.sbin/mptutil (revision 215813) +++ stable/8/usr.sbin/mptutil (revision 215814) Property changes on: stable/8/usr.sbin/mptutil ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/mptutil:r201217 Index: stable/8/usr.sbin/mtest =================================================================== --- stable/8/usr.sbin/mtest (revision 215813) +++ stable/8/usr.sbin/mtest (revision 215814) Property changes on: stable/8/usr.sbin/mtest ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/mtest:r201217 Index: stable/8/usr.sbin/mtree =================================================================== --- stable/8/usr.sbin/mtree (revision 215813) +++ stable/8/usr.sbin/mtree (revision 215814) Property changes on: stable/8/usr.sbin/mtree ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/mtree:r201217 Index: stable/8/usr.sbin/named =================================================================== --- stable/8/usr.sbin/named (revision 215813) +++ stable/8/usr.sbin/named (revision 215814) Property changes on: stable/8/usr.sbin/named ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/named:r201217 Index: stable/8/usr.sbin/ndp =================================================================== --- stable/8/usr.sbin/ndp (revision 215813) +++ stable/8/usr.sbin/ndp (revision 215814) Property changes on: stable/8/usr.sbin/ndp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/ndp:r201217 Index: stable/8/usr.sbin/newsyslog =================================================================== --- stable/8/usr.sbin/newsyslog (revision 215813) +++ stable/8/usr.sbin/newsyslog (revision 215814) Property changes on: stable/8/usr.sbin/newsyslog ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/newsyslog:r201217 Index: stable/8/usr.sbin/nfsdumpstate =================================================================== --- stable/8/usr.sbin/nfsdumpstate (revision 215813) +++ stable/8/usr.sbin/nfsdumpstate (revision 215814) Property changes on: stable/8/usr.sbin/nfsdumpstate ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/nfsdumpstate:r201217 Index: stable/8/usr.sbin/ntp =================================================================== --- stable/8/usr.sbin/ntp (revision 215813) +++ stable/8/usr.sbin/ntp (revision 215814) Property changes on: stable/8/usr.sbin/ntp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/ntp:r201217 Index: stable/8/usr.sbin/pciconf =================================================================== --- stable/8/usr.sbin/pciconf (revision 215813) +++ stable/8/usr.sbin/pciconf (revision 215814) Property changes on: stable/8/usr.sbin/pciconf ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/pciconf:r201217 Index: stable/8/usr.sbin/periodic =================================================================== --- stable/8/usr.sbin/periodic (revision 215813) +++ stable/8/usr.sbin/periodic (revision 215814) Property changes on: stable/8/usr.sbin/periodic ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/periodic:r201217 Index: stable/8/usr.sbin/pkg_install =================================================================== --- stable/8/usr.sbin/pkg_install (revision 215813) +++ stable/8/usr.sbin/pkg_install (revision 215814) Property changes on: stable/8/usr.sbin/pkg_install ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/pkg_install:r201217 Index: stable/8/usr.sbin/pmcannotate =================================================================== --- stable/8/usr.sbin/pmcannotate (revision 215813) +++ stable/8/usr.sbin/pmcannotate (revision 215814) Property changes on: stable/8/usr.sbin/pmcannotate ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/pmcannotate:r201217 Index: stable/8/usr.sbin/pmccontrol =================================================================== --- stable/8/usr.sbin/pmccontrol (revision 215813) +++ stable/8/usr.sbin/pmccontrol (revision 215814) Property changes on: stable/8/usr.sbin/pmccontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/pmccontrol:r201217 Index: stable/8/usr.sbin/pmcstat =================================================================== --- stable/8/usr.sbin/pmcstat (revision 215813) +++ stable/8/usr.sbin/pmcstat (revision 215814) Property changes on: stable/8/usr.sbin/pmcstat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/pmcstat:r201217 Index: stable/8/usr.sbin/powerd =================================================================== --- stable/8/usr.sbin/powerd (revision 215813) +++ stable/8/usr.sbin/powerd (revision 215814) Property changes on: stable/8/usr.sbin/powerd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/powerd:r201217 Index: stable/8/usr.sbin/ppp =================================================================== --- stable/8/usr.sbin/ppp (revision 215813) +++ stable/8/usr.sbin/ppp (revision 215814) Property changes on: stable/8/usr.sbin/ppp ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/ppp:r201217 Index: stable/8/usr.sbin/pppctl =================================================================== --- stable/8/usr.sbin/pppctl (revision 215813) +++ stable/8/usr.sbin/pppctl (revision 215814) Property changes on: stable/8/usr.sbin/pppctl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/pppctl:r201217 Index: stable/8/usr.sbin/pstat =================================================================== --- stable/8/usr.sbin/pstat (revision 215813) +++ stable/8/usr.sbin/pstat (revision 215814) Property changes on: stable/8/usr.sbin/pstat ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/pstat:r201217 Index: stable/8/usr.sbin/rpc.lockd =================================================================== --- stable/8/usr.sbin/rpc.lockd (revision 215813) +++ stable/8/usr.sbin/rpc.lockd (revision 215814) Property changes on: stable/8/usr.sbin/rpc.lockd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/rpc.lockd:r201217 Index: stable/8/usr.sbin/rpc.umntall =================================================================== --- stable/8/usr.sbin/rpc.umntall (revision 215813) +++ stable/8/usr.sbin/rpc.umntall (revision 215814) Property changes on: stable/8/usr.sbin/rpc.umntall ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/rpc.umntall:r201217 Index: stable/8/usr.sbin/rtadvd =================================================================== --- stable/8/usr.sbin/rtadvd (revision 215813) +++ stable/8/usr.sbin/rtadvd (revision 215814) Property changes on: stable/8/usr.sbin/rtadvd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/rtadvd:r201217 Index: stable/8/usr.sbin/rtsold =================================================================== --- stable/8/usr.sbin/rtsold (revision 215813) +++ stable/8/usr.sbin/rtsold (revision 215814) Property changes on: stable/8/usr.sbin/rtsold ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/rtsold:r201217 Index: stable/8/usr.sbin/sade =================================================================== --- stable/8/usr.sbin/sade (revision 215813) +++ stable/8/usr.sbin/sade (revision 215814) Property changes on: stable/8/usr.sbin/sade ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/sade:r201217 Index: stable/8/usr.sbin/service =================================================================== --- stable/8/usr.sbin/service (revision 215813) +++ stable/8/usr.sbin/service (revision 215814) Property changes on: stable/8/usr.sbin/service ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/service:r201217 Index: stable/8/usr.sbin/services_mkdb =================================================================== --- stable/8/usr.sbin/services_mkdb (revision 215813) +++ stable/8/usr.sbin/services_mkdb (revision 215814) Property changes on: stable/8/usr.sbin/services_mkdb ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/services_mkdb:r201217 Index: stable/8/usr.sbin/setfmac =================================================================== --- stable/8/usr.sbin/setfmac (revision 215813) +++ stable/8/usr.sbin/setfmac (revision 215814) Property changes on: stable/8/usr.sbin/setfmac ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/setfmac:r201217 Index: stable/8/usr.sbin/setpmac =================================================================== --- stable/8/usr.sbin/setpmac (revision 215813) +++ stable/8/usr.sbin/setpmac (revision 215814) Property changes on: stable/8/usr.sbin/setpmac ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/setpmac:r201217 Index: stable/8/usr.sbin/smbmsg =================================================================== --- stable/8/usr.sbin/smbmsg (revision 215813) +++ stable/8/usr.sbin/smbmsg (revision 215814) Property changes on: stable/8/usr.sbin/smbmsg ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/smbmsg:r201217 Index: stable/8/usr.sbin/sysinstall =================================================================== --- stable/8/usr.sbin/sysinstall (revision 215813) +++ stable/8/usr.sbin/sysinstall (revision 215814) Property changes on: stable/8/usr.sbin/sysinstall ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/sysinstall:r201217 Index: stable/8/usr.sbin/syslogd =================================================================== --- stable/8/usr.sbin/syslogd (revision 215813) +++ stable/8/usr.sbin/syslogd (revision 215814) Property changes on: stable/8/usr.sbin/syslogd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/syslogd:r201217 Index: stable/8/usr.sbin/traceroute =================================================================== --- stable/8/usr.sbin/traceroute (revision 215813) +++ stable/8/usr.sbin/traceroute (revision 215814) Property changes on: stable/8/usr.sbin/traceroute ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/traceroute:r201217 Index: stable/8/usr.sbin/traceroute6 =================================================================== --- stable/8/usr.sbin/traceroute6 (revision 215813) +++ stable/8/usr.sbin/traceroute6 (revision 215814) Property changes on: stable/8/usr.sbin/traceroute6 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/traceroute6:r201217 Index: stable/8/usr.sbin/uathload =================================================================== --- stable/8/usr.sbin/uathload (revision 215813) +++ stable/8/usr.sbin/uathload (revision 215814) Property changes on: stable/8/usr.sbin/uathload ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/uathload:r201217 Index: stable/8/usr.sbin/ugidfw =================================================================== --- stable/8/usr.sbin/ugidfw (revision 215813) +++ stable/8/usr.sbin/ugidfw (revision 215814) Property changes on: stable/8/usr.sbin/ugidfw ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/ugidfw:r201217 Index: stable/8/usr.sbin/uhsoctl =================================================================== --- stable/8/usr.sbin/uhsoctl (revision 215813) +++ stable/8/usr.sbin/uhsoctl (revision 215814) Property changes on: stable/8/usr.sbin/uhsoctl ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/uhsoctl:r201217 Index: stable/8/usr.sbin/usbconfig =================================================================== --- stable/8/usr.sbin/usbconfig (revision 215813) +++ stable/8/usr.sbin/usbconfig (revision 215814) Property changes on: stable/8/usr.sbin/usbconfig ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/usbconfig:r201217 Index: stable/8/usr.sbin/vidcontrol =================================================================== --- stable/8/usr.sbin/vidcontrol (revision 215813) +++ stable/8/usr.sbin/vidcontrol (revision 215814) Property changes on: stable/8/usr.sbin/vidcontrol ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/vidcontrol:r201217 Index: stable/8/usr.sbin/watchdogd =================================================================== --- stable/8/usr.sbin/watchdogd (revision 215813) +++ stable/8/usr.sbin/watchdogd (revision 215814) Property changes on: stable/8/usr.sbin/watchdogd ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/watchdogd:r201217 Index: stable/8/usr.sbin/wpa =================================================================== --- stable/8/usr.sbin/wpa (revision 215813) +++ stable/8/usr.sbin/wpa (revision 215814) Property changes on: stable/8/usr.sbin/wpa ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/wpa:r201217 Index: stable/8/usr.sbin/ypserv =================================================================== --- stable/8/usr.sbin/ypserv (revision 215813) +++ stable/8/usr.sbin/ypserv (revision 215814) Property changes on: stable/8/usr.sbin/ypserv ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/ypserv:r201217 Index: stable/8/usr.sbin/zic =================================================================== --- stable/8/usr.sbin/zic (revision 215813) +++ stable/8/usr.sbin/zic (revision 215814) Property changes on: stable/8/usr.sbin/zic ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin/zic:r201217 Index: stable/8/usr.sbin =================================================================== --- stable/8/usr.sbin (revision 215813) +++ stable/8/usr.sbin (revision 215814) Property changes on: stable/8/usr.sbin ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head/usr.sbin:r201217 Index: stable/8 =================================================================== --- stable/8 (revision 215813) +++ stable/8 (revision 215814) Property changes on: stable/8 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r201217