diff options
| -rw-r--r-- | etc/Makefile | 10 | ||||
| -rw-r--r-- | etc/mtree/BSD.x11.dist | 4 | ||||
| -rw-r--r-- | share/man/man7/hier.7 | 8 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.8 | 12 | ||||
| -rw-r--r-- | usr.sbin/sysmerge/sysmerge.sh | 10 |
5 files changed, 23 insertions, 21 deletions
diff --git a/etc/Makefile b/etc/Makefile index 9ea8f7b4467..8ab4f96a7fc 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.374 2014/07/15 09:11:18 deraadt Exp $ +# $OpenBSD: Makefile,v 1.375 2014/07/15 09:27:04 ajacoutot Exp $ TZDIR= /usr/share/zoneinfo LOCALTIME= Canada/Mountain @@ -254,17 +254,17 @@ distribution-etc-root-var: distrib-dirs distribution: exec ${SUDO} ${MAKE} distribution-etc-root-var cd .. && exec ${SUDO} ${MAKE} install - touch ${DESTDIR}/var/db/sysmerge/etcsum - touch ${DESTDIR}/var/db/sysmerge/examplessum + touch ${DESTDIR}/usr/share/sysmerge/etcsum + touch ${DESTDIR}/usr/share/sysmerge/examplessum ETCLIST=`mktemp /tmp/_etclist.XXXXXXXXXX` || exit 1; \ sort ../distrib/sets/lists/etc/{mi,md.${MACHINE}} > $${ETCLIST}; \ cd ${DESTDIR} && \ - xargs sha256 -h ${DESTDIR}/var/db/sysmerge/etcsum < $${ETCLIST} || true; \ + xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/etcsum < $${ETCLIST} || true; \ rm -f $${ETCLIST} EGLIST=`mktemp /tmp/_eglist.XXXXXXXXXX` || exit 1; \ grep -h '/etc/examples/' ../distrib/sets/lists/base/{mi,md.${MACHINE}} | sort > $${EGLIST}; \ cd ${DESTDIR} && \ - xargs sha256 -h ${DESTDIR}/var/db/sysmerge/examplessum < $${EGLIST} || true; \ + xargs sha256 -h ${DESTDIR}/usr/share/sysmerge/examplessum < $${EGLIST} || true; \ rm -f $${EGLIST} distrib-dirs: diff --git a/etc/mtree/BSD.x11.dist b/etc/mtree/BSD.x11.dist index 884f185938c..f4c4bcd338e 100644 --- a/etc/mtree/BSD.x11.dist +++ b/etc/mtree/BSD.x11.dist @@ -1,4 +1,4 @@ -# $OpenBSD: BSD.x11.dist,v 1.33 2014/07/10 07:12:28 espie Exp $ +# $OpenBSD: BSD.x11.dist,v 1.34 2014/07/15 09:27:04 ajacoutot Exp $ /set type=dir uname=root gname=wheel mode=0755 . @@ -422,8 +422,6 @@ .. .. db - sysmerge - .. xkb .. .. diff --git a/share/man/man7/hier.7 b/share/man/man7/hier.7 index 68dc7bbaf41..fdde83c3520 100644 --- a/share/man/man7/hier.7 +++ b/share/man/man7/hier.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: hier.7,v 1.124 2014/07/14 09:12:43 ajacoutot Exp $ +.\" $OpenBSD: hier.7,v 1.125 2014/07/15 09:27:04 ajacoutot Exp $ .\" $NetBSD: hier.7,v 1.7 1994/11/30 19:07:10 jtc Exp $ .\" .\" Copyright (c) 1990, 1993 @@ -30,7 +30,7 @@ .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 .\" -.Dd $Mdocdate: July 14 2014 $ +.Dd $Mdocdate: July 15 2014 $ .Dt HIER 7 .Os .Sh NAME @@ -467,6 +467,10 @@ Data files for Management Information Base (MIB) definitions. .El .Pp +.It sysmerge/ +.Xr sysmerge 8 +checksum files. +.Pp .It tabset/ Tab description files for a variety of terminals; used in the termcap file (see diff --git a/usr.sbin/sysmerge/sysmerge.8 b/usr.sbin/sysmerge/sysmerge.8 index f5830524a10..3bcbc255c0f 100644 --- a/usr.sbin/sysmerge/sysmerge.8 +++ b/usr.sbin/sysmerge/sysmerge.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sysmerge.8,v 1.49 2014/07/13 07:12:41 ajacoutot Exp $ +.\" $OpenBSD: sysmerge.8,v 1.50 2014/07/15 09:27:04 ajacoutot Exp $ .\" .\" Copyright (c) 2008 Antoine Jacoutot <ajacoutot@openbsd.org> .\" @@ -14,7 +14,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 13 2014 $ +.Dd $Mdocdate: July 15 2014 $ .Dt SYSMERGE 8 .Os .Sh NAME @@ -175,9 +175,9 @@ The following files will always be skipped from comparison: .Pa /etc/motd , .Pa /etc/myname , .Pa /var/db/locate.database , -.Pa /var/db/sysmerge/etcsum , -.Pa /var/db/sysmerge/examplessum , -.Pa /var/db/sysmerge/xetcsum , +.Pa /usr/share/sysmerge/etcsum , +.Pa /usr/share/sysmerge/examplessum , +.Pa /usr/share/sysmerge/xetcsum , .Pa /var/mail/root . .Pp The @@ -195,7 +195,7 @@ and they are offered for comparison only if they really differ. .It Ev DBDIR Directory in which checksum files are stored. If unset, this defaults to -.Pa /var/db/sysmerge . +.Pa /usr/share/sysmerge . .It Ev DESTDIR Directory in which to merge and install files. If unset, this defaults to diff --git a/usr.sbin/sysmerge/sysmerge.sh b/usr.sbin/sysmerge/sysmerge.sh index f997c740439..83c99ddfdaf 100644 --- a/usr.sbin/sysmerge/sysmerge.sh +++ b/usr.sbin/sysmerge/sysmerge.sh @@ -1,6 +1,6 @@ #!/bin/ksh - # -# $OpenBSD: sysmerge.sh,v 1.139 2014/07/13 07:12:41 ajacoutot Exp $ +# $OpenBSD: sysmerge.sh,v 1.140 2014/07/15 09:27:04 ajacoutot Exp $ # # Copyright (c) 2008-2014 Antoine Jacoutot <ajacoutot@openbsd.org> # Copyright (c) 1998-2003 Douglas Barton <DougB@FreeBSD.org> @@ -36,7 +36,7 @@ fi # sysmerge specific variables (overridable) MERGE_CMD="${MERGE_CMD:=sdiff -as -w ${SWIDTH} -o}" REPORT="${REPORT:=${WRKDIR}/sysmerge.log}" -DBDIR="${DBDIR:=/var/db/sysmerge}" +DBDIR="${DBDIR:=/usr/share/sysmerge}" # system-wide variables (overridable) PAGER="${PAGER:=/usr/bin/more}" @@ -110,8 +110,8 @@ extract_sets() { [[ ${_set} == etc ]] && _tgz=${WRKDIR}/${TGZ##*/} [[ ${_set} == xetc ]] && _tgz=${WRKDIR}/${XTGZ##*/} - tar -tzf "${_tgz}" ./var/db/sysmerge/${_set}sum >/dev/null || - error_rm_wrkdir "${_tgz##*/}: badly formed \"${_set}\" set, lacks ./var/db/sysmerge/${_set}sum" + tar -tzf "${_tgz}" .${DBDIR}/sysmerge/${_set}sum >/dev/null || + error_rm_wrkdir "${_tgz##*/}: badly formed \"${_set}\" set, lacks .${DBDIR}/sysmerge/${_set}sum" (cd ${TEMPROOT} && tar -xzphf "${_tgz}" && \ find . -type f -and ! -type l | xargs sha256 -h ${WRKDIR}/${_set}sum) || \ @@ -217,8 +217,8 @@ sm_populate() { /etc/passwd /etc/motd /etc/myname + /usr/share/sysmerge/{etc,examples,xetc}sum /var/db/locate.database - /var/db/sysmerge/{etc,examples,xetc}sum /var/mail/root" CF_FILES="/etc/mail/localhost.cf /etc/mail/sendmail.cf /etc/mail/submit.cf" for cf in ${CF_FILES}; do |