Date: Thu, 23 May 2019 18:37:05 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r348185 - in head: . etc lib/libc/gen usr.sbin/etcupdate usr.sbin/mergemaster Message-ID: <201905231837.x4NIb5Jj069036@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu May 23 18:37:05 2019 New Revision: 348185 URL: https://svnweb.freebsd.org/changeset/base/348185 Log: Move back group, master.passwd and shells to etc directory Use the .PATH mechanism instead so keep installing them from lib/libc/gen While here revert 347961 and 347893 which are no longer needed Discussed with: manu Tested by: manu ok manu@ Added: head/etc/group - copied unchanged from r348184, head/lib/libc/gen/group head/etc/master.passwd - copied unchanged from r348184, head/lib/libc/gen/master.passwd head/etc/shells - copied unchanged from r348184, head/lib/libc/gen/shells Deleted: head/lib/libc/gen/group head/lib/libc/gen/master.passwd head/lib/libc/gen/shells Modified: head/UPDATING head/lib/libc/gen/Makefile.inc head/usr.sbin/etcupdate/etcupdate.sh head/usr.sbin/mergemaster/mergemaster.sh Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu May 23 18:24:27 2019 (r348184) +++ head/UPDATING Thu May 23 18:37:05 2019 (r348185) @@ -31,12 +31,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 13.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) -20190517: - For users of mergemaster, after recent changes to locations of - master.passwd and group in the source tree mergemaster needs to be - updated. Before running `mergemaster -p', cd to usr.sbin/mergemaster - and run `make install'. - 20190513: User-wired pages now have their own counter, vm.stats.vm.v_user_wire_count. The vm.max_wired sysctl was renamed Copied: head/etc/group (from r348184, head/lib/libc/gen/group) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/group Thu May 23 18:37:05 2019 (r348185, copy of r348184, head/lib/libc/gen/group) @@ -0,0 +1,36 @@ +# $FreeBSD$ +# +wheel:*:0:root +daemon:*:1: +kmem:*:2: +sys:*:3: +tty:*:4: +operator:*:5:root +mail:*:6: +bin:*:7: +news:*:8: +man:*:9: +games:*:13: +ftp:*:14: +staff:*:20: +sshd:*:22: +smmsp:*:25: +mailnull:*:26: +guest:*:31: +video:*:44: +bind:*:53: +unbound:*:59: +proxy:*:62: +authpf:*:63: +_pflogd:*:64: +_dhcp:*:65: +uucp:*:66: +dialer:*:68: +network:*:69: +audit:*:77: +www:*:80: +ntpd:*:123: +_ypldap:*:160: +hast:*:845: +nogroup:*:65533: +nobody:*:65534: Copied: head/etc/master.passwd (from r348184, head/lib/libc/gen/master.passwd) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/master.passwd Thu May 23 18:37:05 2019 (r348185, copy of r348184, head/lib/libc/gen/master.passwd) @@ -0,0 +1,28 @@ +# $FreeBSD$ +# +root::0:0::0:0:Charlie &:/root:/bin/csh +toor:*:0:0::0:0:Bourne-again Superuser:/root: +daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin +operator:*:2:5::0:0:System &:/:/usr/sbin/nologin +bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin +tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin +kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin +games:*:7:13::0:0:Games pseudo-user:/:/usr/sbin/nologin +news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin +man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin +sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin +smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin +mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin +bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin +unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin +proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin +_pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin +_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin +uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico +pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin +auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin +www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin +ntpd:*:123:123::0:0:NTP Daemon:/var/db/ntp:/usr/sbin/nologin +_ypldap:*:160:160::0:0:YP LDAP unprivileged user:/var/empty:/usr/sbin/nologin +hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin +nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin Copied: head/etc/shells (from r348184, head/lib/libc/gen/shells) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/etc/shells Thu May 23 18:37:05 2019 (r348185, copy of r348184, head/lib/libc/gen/shells) @@ -0,0 +1,9 @@ +# $FreeBSD$ +# +# List of acceptable shells for chpass(1). +# Ftpd will not allow users to connect who are not using +# one of these shells. + +/bin/sh +/bin/csh +/bin/tcsh Modified: head/lib/libc/gen/Makefile.inc ============================================================================== --- head/lib/libc/gen/Makefile.inc Thu May 23 18:24:27 2019 (r348184) +++ head/lib/libc/gen/Makefile.inc Thu May 23 18:37:05 2019 (r348185) @@ -2,7 +2,7 @@ # $FreeBSD$ # machine-independent gen sources -.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen +.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen ${SRCTOP}/etc CONFS+= group master.passwd shells CONFSMODE_master.passwd= 600 Modified: head/usr.sbin/etcupdate/etcupdate.sh ============================================================================== --- head/usr.sbin/etcupdate/etcupdate.sh Thu May 23 18:24:27 2019 (r348184) +++ head/usr.sbin/etcupdate/etcupdate.sh Thu May 23 18:37:05 2019 (r348185) @@ -1737,9 +1737,7 @@ WARNINGS=$WORKDIR/warnings EDITOR=${EDITOR:-/usr/bin/vi} # Files that need to be updated before installworld. -PREWORLD_FILES="lib/libc/gen/master.passwd lib/libc/gen/group" -# If on an older tree, use it instead. Delete after 13.0. -[ -f ${SRCDIR}/etc/master.passwd ] && PREWORLD_FILES="etc/master.passwd etc/group" +PREWORLD_FILES="etc/master.passwd etc/group" # Handle command-specific argument processing such as complaining # about unsupported options. Since the configuration file is always Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.sh Thu May 23 18:24:27 2019 (r348184) +++ head/usr.sbin/mergemaster/mergemaster.sh Thu May 23 18:37:05 2019 (r348185) @@ -669,12 +669,9 @@ case "${RERUN}" in ;; *) # Only set up files that are crucial to {build|install}world - { MM_PASSDIR="${SOURCEDIR}/lib/libc/gen" - # If on an older tree, use it instead. Delete after 13.0. - [ -f ${SOURCEDIR}/etc/master.passwd ] && MM_PASSDIR="${SOURCEDIR}/etc" - mkdir -p ${TEMPROOT}/etc && - cp -p ${MM_PASSDIR}/master.passwd ${TEMPROOT}/etc && - install -p -o root -g wheel -m 0644 ${MM_PASSDIR}/group ${TEMPROOT}/etc;} || + { mkdir -p ${TEMPROOT}/etc && + cp -p ${SOURCEDIR}/etc/master.passwd ${TEMPROOT}/etc && + install -p -o root -g wheel -m 0644 ${SOURCEDIR}/etc/group ${TEMPROOT}/etc;} || { echo ''; echo ' *** FATAL ERROR: Cannot copy files to the temproot environment'; echo '';
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905231837.x4NIb5Jj069036>