Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
905fa31223
NetBSD/usr.sbin
History
christos 905fa31223 From Brooks Davis: 
When comparing a directory to an mtree file NetBSD mtree has output like
this:

xxx:	size (4, 5)
	md5digest (0x6de9439834c9147569741d3c9c9fc010, 0xa5d119ab8edcda0ef7f381da8=
f52f92f)
=2E/yyy missing

FreeBSD's historical behavior is this:

xxx changed
	size expected 4 found 5
	md5digest expected 6de9439834c9147569741d3c9c9fc010 found a5d119ab8edcda0e=
f7f381da8f52f92f
=2E/yyy missing

FreeBSD's mergemaster -U command depends on the latter behavior so
the following patch alters the freebsd9 mode of mtree to output
that format.  I don't think programs should rely on this output one way
or another since it's clearly meant for humans, but this seems like the
easiest short term fix.
2013-11-21 18:39:50 +00:00
..
ac cgd and sjg relicensed this under 2-clause-BSD. 2012-08-31 19:55:23 +00:00
accton Use __dead. 2011-08-29 20:38:53 +00:00
acpitools fix unused variable warnings. 2013-10-19 17:16:37 +00:00
altq fix unused variable warnings. 2013-10-19 17:16:37 +00:00
apm This change arm, armeb, earm, earmeb, earmhf, earmhfeb so all builds that 2013-05-02 03:56:38 +00:00
apmd This change arm, armeb, earm, earmeb, earmhf, earmhfeb so all builds that 2013-05-02 03:56:38 +00:00
arp Use .Cm markup for the keywords "temp", "pub", and "proxy" (suggested 2013-07-08 04:31:12 +00:00
bad144 sprinkle vax 2013-11-03 00:48:52 +00:00
bootp fix unused variable warnings. 2013-10-19 17:16:37 +00:00
btattach Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
btconfig Use Lk macro when dealing with URLs. While here update or remove some 2012-03-15 22:35:02 +00:00
btdevctl Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
bthcid Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
btpand no trailing comma on enum 2012-10-14 08:35:45 +00:00
catman Only try to recreate symlinks in the cat directory if they are local. 2013-07-31 22:37:55 +00:00
chroot - don't use an uninitialized grouplist (from Patrick Welche) 2011-09-20 14:28:52 +00:00
cnwctl avoid pointer gymnastics 2013-10-19 17:05:58 +00:00
cpuctl Modify some macros and add some new macros for CPU family and model 2013-11-15 08:47:55 +00:00
crash add MAP_PRIVATE 2013-03-10 19:32:29 +00:00
dev_mkdb Remove many HAVE_GCC || HAVE_PCC conditionals as the options also apply 2012-08-10 12:10:27 +00:00
diskpart ANSIfy + static + dead. 2011-08-30 10:12:06 +00:00
dumpfs Print FS_TRIM too. 2013-09-03 04:02:13 +00:00
dumplfs Turn off -fno-strict-aliasing for HAVE_GCC; it makes no difference to 2013-08-11 03:49:24 +00:00
edquota Grr. The ATF quota tests demand failing silently in certain circumstances. 2012-08-14 04:53:43 +00:00
eeprom Finish ANSIfication. Drop extra spaces from __P removal. Add more 2013-07-02 11:59:46 +00:00
envstat Since we're no longer making a copy of the option args, we shouldn't 2012-12-14 05:29:28 +00:00
eshconfig ANSIfy + static + __dead 2011-08-30 18:28:59 +00:00
etcupdate Remove the ability to specify multiple colon-separated file names with 2012-08-15 16:26:41 +00:00
extattrctl Use __dead 2011-08-31 13:32:36 +00:00
faithd use new scopeid functions 2013-10-19 17:16:25 +00:00
flashctl Properly use format strings 2011-05-24 13:01:53 +00:00
fssconfig Describe the differences between file system internal and external snapshots. 2013-11-15 09:13:57 +00:00
fusermount Enable WARNS=4 by default, except for: 2009-04-22 15:23:01 +00:00
fwctl move all the code that is unused inside #if 0 2013-10-19 17:06:57 +00:00
gpioctl Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
grfconfig Fix fd leaks in error cases. Found by cppcheck. 2011-01-04 09:32:31 +00:00
gspa Use __dead and __printflike 2011-08-30 18:53:41 +00:00
hdaudioctl Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
i2cscan i2cscan: support scans using only 1 byte reads 2013-07-10 15:18:54 +00:00
ifmcstat use new scopeid functions 2013-10-19 17:16:25 +00:00
ifwatchd static + __dead 2011-08-30 18:57:38 +00:00
inetd PR/47318: Henning Petersen: Replace (r)index with str(r)chr in inetd.c 2012-12-13 19:38:40 +00:00
installboot XXX: gcc initialize a variable 2013-10-21 15:37:46 +00:00
iopctl static + __dead 2011-08-30 18:57:38 +00:00
iostat static + __dead 2011-08-30 19:06:06 +00:00
ipwctl Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
irdaattach static + __dead 2011-08-30 19:06:06 +00:00
isdn using sizeof(char *) to compute the size of a buffer is not going to work 2013-10-19 17:09:38 +00:00
isibootd Change Ethertype 0x80df symbolic name. According to the real 2012-04-02 09:01:30 +00:00
iteconfig don't discard const qualifiers 2009-04-26 19:56:20 +00:00
iwictl Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
kgmon Add option arguments to descriptions. From YOMURA Masanori. 2011-04-25 22:46:35 +00:00
kvm_mkdb Fix fd leaks in error cases. Found by cppcheck. 2011-01-04 09:32:31 +00:00
lastlogin __dead + ANSIfy 2011-08-31 13:31:29 +00:00
ldpd CVE 1129617: negative arg 2013-11-19 16:42:16 +00:00
link ANSIfy + __dead 2011-08-30 19:18:17 +00:00
lmcconfig vax specific gcc 4.8.1 hacks 2013-11-09 21:39:27 +00:00
lockstat move all the necessay code inside ifdef 2013-10-19 17:10:17 +00:00
lpr CID 1125882: Don't use unitialized variable; move code inside conditional 2013-11-13 21:19:17 +00:00
lptctl Enable WARNS=4 by default, except for: 2009-04-22 15:23:01 +00:00
mailwrapper Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
makefs Now that tools/compat/compat_defs.h defones __USE, there's no 2013-10-24 14:01:01 +00:00
makemandb Skip files of size 0 from indexing. 2013-11-13 18:46:33 +00:00
map-mbone
mdconfig Drop 3rd and 4th clauses. Approved by gwr@ (copyright holder). 2009-10-21 23:12:09 +00:00
mdsetimage Sort options in SYNOPSIS. 2010-11-07 11:49:21 +00:00
memswitch Whitespace. 2011-01-14 13:31:47 +00:00
mld6query static + __dead 2011-08-30 21:18:11 +00:00
mlxctl avoid type punned warnings 2011-08-14 17:57:44 +00:00
mmcformat fix unused variable warnings. 2013-10-19 17:16:37 +00:00
mopd fix unused variable warnings. 2013-10-19 17:16:37 +00:00
mountd fix unused variable warnings. 2013-10-19 17:16:37 +00:00
moused fix unused variable warnings. 2013-10-19 17:16:37 +00:00
mrinfo Use __dead 2011-08-31 13:32:36 +00:00
mrouted NULL does not need a cast 2011-08-31 16:24:54 +00:00
mscdlabel Remove many HAVE_GCC || HAVE_PCC conditionals as the options also apply 2012-08-10 12:10:27 +00:00
mtrace vax specific gcc 4.8.1 hacks 2013-11-09 21:39:27 +00:00
mtree From Brooks Davis: 2013-11-21 18:39:50 +00:00
ndbootd Default to -Wno-sign-compare -Wno-pointer-sign for clang. 2011-05-26 12:56:24 +00:00
ndiscvt remove unused variable 2013-11-08 01:10:23 +00:00
ndp use new scopeid functions 2013-10-19 17:16:25 +00:00
netgroup_mkdb Remove 3rd and 4th clauses in christos' license. OK christos. 2009-10-21 01:07:44 +00:00
nfsd Fix memset usage. 2012-08-15 00:16:06 +00:00
npf CID 1129614: dereference after null 2013-11-19 17:01:45 +00:00
ofctl This change arm, armeb, earm, earmeb, earmhf, earmhfeb so all builds that 2013-05-02 03:56:38 +00:00
paxctl Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
pcictl static + __dead 2011-08-30 20:08:38 +00:00
perfused Disable default build of debugging info. 2012-09-06 16:39:07 +00:00
pf fix unused variable warnings. 2013-10-19 17:16:37 +00:00
postinstall Add pkgpath.conf to /etc/defaults check. 2013-09-09 15:04:12 +00:00
powerd CID/980002: missing va_end() 2013-02-09 01:16:39 +00:00
pppd fix unused variable warnings. 2013-10-19 17:16:37 +00:00
psrset Use __dead 2011-08-31 13:32:36 +00:00
pstat fix unused variable warnings. 2013-10-19 17:16:37 +00:00
puffs After mount_lfs_parseargs, reset getopt for lfs_cleaner_main. 2013-01-10 08:35:26 +00:00
pvcsif static + __dead 2011-08-30 21:27:00 +00:00
pvctxctl Localize variables. Use __dead 2011-08-30 21:28:27 +00:00
pwd_mkdb Attempt 2 at fixing DragonFly util.h conflicts: include util.h only for 2012-11-26 20:13:54 +00:00
quot fix unused variable warnings. 2013-10-19 17:16:37 +00:00
quotacheck Stick ffs_, ext2_, chfs_, filecore_, cd9660_, or mfs_ in front of 2013-06-23 07:28:36 +00:00
quotaon use getfsspecname() 2012-04-07 04:52:20 +00:00
quotarestore Don't use const foo const as type, one const is enough. 2012-09-13 21:44:49 +00:00
racoon more sh3 hacks. 2013-11-09 00:33:48 +00:00
racoonctl Ignore warnings when building with clang for now. 2011-05-30 14:41:26 +00:00
rarpd Remove many HAVE_GCC || HAVE_PCC conditionals as the options also apply 2012-08-10 12:10:27 +00:00
rbootd Remove many HAVE_GCC || HAVE_PCC conditionals as the options also apply 2012-08-10 12:10:27 +00:00
rdate Remove 3rd and 4th clauses in christos' license. OK christos. 2009-10-21 01:07:44 +00:00
repquota Bump date for previous. 2012-05-12 21:42:38 +00:00
rip6query ANSIfy + static + __dead 2011-08-30 21:17:06 +00:00
rmt Fix -Wshadow issue 2009-04-18 09:25:50 +00:00
route6d reenable routing functionality by using RT_ROUNDUP for ROUNDUP when available 2013-04-15 07:58:35 +00:00
rpc.bootparamd ANSIFy + static + __dead 2011-08-30 20:29:41 +00:00
rpc.lockd Fix typo in syslog message. 2012-09-13 11:09:41 +00:00
rpc.pcnfsd include the headers that you need. 2012-11-04 22:26:04 +00:00
rpc.statd Fix -Wshadow and -Wcast-qual issues 2009-04-18 13:02:36 +00:00
rpc.yppasswdd Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
rpcbind fix unused variable warnings. 2013-10-19 17:16:37 +00:00
rtadvd Add _rtadvd user and group. 2013-07-09 09:34:58 +00:00
rtsold fix unused variable warnings. 2013-10-19 17:16:37 +00:00
rwhod include <pwd.h> 2012-11-04 22:32:01 +00:00
sa On LP64 platforms, uid_t is not the same size as u_long, so the key 2010-08-30 02:49:17 +00:00
schedctl Use __dead 2011-08-31 13:32:36 +00:00
screenblank static + __dead 2011-08-30 20:33:30 +00:00
sdpd Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
services_mkdb Use __dead 2011-08-31 13:32:36 +00:00
sesd Sync usage with man page. 2013-04-07 18:49:35 +00:00
sliplogin fix unused variable warnings. 2013-10-19 17:16:37 +00:00
spray static + ANSIfy + __dead 2011-08-30 20:45:31 +00:00
srtconfig Fix -Wextra issue 2009-04-18 14:02:42 +00:00
sti Improve DESCRIPTION, fix up English usage. 2012-08-14 08:08:29 +00:00
sunlabel fix unused variable warnings. 2013-10-19 17:16:37 +00:00
sup document the anon account for anonymous access 2013-05-28 20:13:16 +00:00
syslogd CID 1128379: Fix TOCTOU, always open the file first with non-blocking I/O, 2013-11-11 16:39:21 +00:00
tadpolectl System utilities, boot programs and kernel modules are machine 2009-12-13 05:01:32 +00:00
tcpdchk Use a little const for quotes strings. 2012-03-21 10:11:34 +00:00
tcpdmatch Enable WARNS=4 by default, except for: 2009-04-22 15:23:01 +00:00
tcpdrop Enable WARNS=4 by default, except for: 2009-04-22 15:23:01 +00:00
timed include utmpx.h if needed 2012-11-04 22:36:58 +00:00
tpctl This change arm, armeb, earm, earmeb, earmhf, earmhfeb so all builds that 2013-05-02 03:56:38 +00:00
tprof Use __dead 2012-01-10 23:39:11 +00:00
traceroute Pretty print multipath routes. From FreeBSD. 2012-08-16 00:40:28 +00:00
traceroute6 PR/47304: Kouki Ooyatsu: -s (source IPv6 address to be used) option does not 2012-12-10 18:11:33 +00:00
trpt static + __dead 2011-08-30 20:49:29 +00:00
unlink ANSIfy + __dead 2011-08-30 20:50:24 +00:00
usbdevs Try to dump device at address 0. Allows dumping of xhci(4) root hub. 2013-09-14 14:07:56 +00:00
user Fix error message when trying to add a group using -g =uid that 2012-11-28 11:31:27 +00:00
veriexecgen security(7), not (8). 2011-04-28 11:23:57 +00:00
videomode Fix fd leaks. Found by cppcheck. 2011-01-04 10:32:34 +00:00
vipw Remove unnecessary Bk/Ek pairs from SYNOPSIS. 2012-04-08 22:00:37 +00:00
vnconfig Fix LINKS spec. 2013-06-09 22:00:50 +00:00
wakeonlan Even though the kernel will fill the source address in, it looks weird in 2012-12-15 04:40:33 +00:00
wiconfig Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
wlanctl Use Mt for email addresses. 2013-07-20 21:39:55 +00:00
wsconscfg Enable WARNS=4 by default, except for: 2009-04-22 15:23:01 +00:00
wsfontload remove extraneous malloc.h 2013-04-05 03:18:26 +00:00
wsmoused Use more markup. New sentence, new line. Sort sections. 2012-01-02 18:04:34 +00:00
wsmuxctl static + __dead 2011-08-30 21:03:31 +00:00
ypbind Apply casts to cases where xdrproc_t is expected but is not 2011-08-30 17:06:20 +00:00
yppoll Apply casts to cases where xdrproc_t is expected but is not 2011-08-30 17:06:20 +00:00
ypserv fix unused variable warnings. 2013-10-19 17:16:37 +00:00
ypset ANSIfy 2011-08-27 22:41:35 +00:00
zdump include Makefile.in from zic 2013-03-02 21:39:14 +00:00
zic the code specifies package info now. 2013-09-20 19:07:29 +00:00
Makefile unhook old dhcp 2013-03-24 22:23:33 +00:00
Makefile.inc Enable WARNS=4 by default, except for: 2009-04-22 15:23:01 +00:00