svn commit: r356115 - head/sys/dev/gpio
Author: brd Date: Fri Dec 27 04:11:14 2019 New Revision: 356115 URL: https://svnweb.freebsd.org/changeset/base/356115 Log: [gpioths] Fix GPIOTHS_DEBUG Chase the removal of dev from gpioths_dht_readbytes() in r355540. Reviewed by: ian Approved by: will (mentor) Differential Revision:https://reviews.freebsd.org/D22926 Modified: head/sys/dev/gpio/gpioths.c Modified: head/sys/dev/gpio/gpioths.c == --- head/sys/dev/gpio/gpioths.c Fri Dec 27 04:07:51 2019(r356114) +++ head/sys/dev/gpio/gpioths.c Fri Dec 27 04:11:14 2019(r356115) @@ -220,10 +220,10 @@ gpioths_dht_readbytes(struct gpioths_softc *sc) #ifdef GPIOTHS_DEBUG /* Debug bits */ for (i = 0; i < GPIOTHS_DHT_CYCLES; i++) - device_printf(dev, "%d: %d %d\n", i, calibrations[i], + device_printf(sc->dev, "%d: %d %d\n", i, calibrations[i], intervals[i]); - device_printf(dev, "len=%d, data=%x, crc=%x/%x\n", avglen, value, crc, + device_printf(sc->dev, "len=%d, data=%x, crc=%x/%x\n", avglen, value, crc, calc); #endif /* GPIOTHS_DEBUG */ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r351934 - in head/sys: netinet netinet/tcp_stacks sys
On Fri, Sep 6, 2019, at 8:25 AM, Randall Stewart wrote: > Author: rrs > Date: Fri Sep 6 14:25:41 2019 > New Revision: 351934 > URL: https://svnweb.freebsd.org/changeset/base/351934 > > Log: > This adds the final tweaks to LRO that will now allow me > to add BBR. These changes make it so you can get an > array of timestamps instead of a compressed ack/data segment. > BBR uses this to aid with its delivery estimates. We also > now (via Drew's suggestions) will not go to the expense of > the tcb lookup if no stack registers to want this feature. If > HPTS is not present the feature is not present either and you > just get the compressed behavior. Hi Randall, This (+ the fixes in r351950, r351951, r351952) break TCP over a VLAN interface for me. 15:57:27.437022 IP (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto TCP (6), length 64) 192.168.1.247.51621 > 192.168.1.31.22: Flags [S], cksum 0x829c (correct), seq 954393965, win 65535, options [mss 1460,nop,wscale 6,nop,nop,TS val 1140851693 ecr 0,sackOK,eol], length 0 15:57:27.437055 IP (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto TCP (6), length 60, bad cksum 0 (->b655)!) 192.168.1.31.22 > 192.168.1.247.51621: Flags [S.], cksum 0x8495 (incorrect -> 0x7d08), seq 532354280, ack 954393966, win 65535, options [mss 1460,nop,wscale 6,sackOK,TS val 1641644043 ecr 1140851693], length 0 15:57:27.449358 IP (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto TCP (6), length 90, bad cksum 0 (->b637)!) 192.168.1.31.22 > 192.168.1.247.51621: Flags [P.], cksum 0x84b3 (incorrect -> 0xe69e), seq 1:39, ack 1, win 1026, options [nop,nop,TS val 1641644055 ecr 1140851693], length 38 15:58:00.363155 IP (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 0 (->b65d)!) 192.168.1.31.22 > 192.168.1.247.51619: Flags [.], cksum 0x848d (incorrect -> 0x98dd), seq 733444611, ack 2137820470, win 1026, options [nop,nop,TS val 3639423932 ecr 1140820150], length 0 15:58:30.078521 IP (tos 0x0, ttl 64, id 0, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 0 (->b65d)!) 192.168.1.31.22 > 192.168.1.247.51621: Flags [.], cksum 0x848d (incorrect -> 0xb2f9), seq 39, ack 1, win 1026, options [nop,nop,TS val 1641706684 ecr 1140851693], length 0 Disabling LRO fixes it. Let me know if I can provide any more information. Thanks, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347961 - head
Author: brd Date: Sat May 18 19:36:23 2019 New Revision: 347961 URL: https://svnweb.freebsd.org/changeset/base/347961 Log: Add note to UPDATING for users of mergemaster after the move of master.passwd and group in r347638. Approved by: allanjude (mentor) Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Sat May 18 19:32:38 2019(r347960) +++ head/UPDATING Sat May 18 19:36:23 2019(r347961) @@ -31,6 +31,12 @@ 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 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347958 - head/tools/build
Author: brd
Date: Sat May 18 17:13:08 2019
New Revision: 347958
URL: https://svnweb.freebsd.org/changeset/base/347958
Log:
Update beinstall to use the mergemaster/etcupdate from the source tree instead
of the installed one.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D20291
Modified:
head/tools/build/beinstall.sh
Modified: head/tools/build/beinstall.sh
==
--- head/tools/build/beinstall.sh Sat May 18 16:19:31 2019
(r347957)
+++ head/tools/build/beinstall.sh Sat May 18 17:13:08 2019
(r347958)
@@ -54,10 +54,6 @@ MERGEMASTER_FLAGS="${MERGEMASTER_FLAGS:-"-iFU"}"
-## Constants
-ETCUPDATE_CMD="etcupdate"
-MERGEMASTER_CMD="mergemaster"
-
## Functions
cleanup() {
[ -z "${cleanup_commands}" ] && return
@@ -126,23 +122,22 @@ create_be_dirs() {
}
update_mergemaster_pre() {
- mergemaster -p -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT}
${MERGEMASTER_FLAGS}
+ ${MERGEMASTER_CMD} -p -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT}
${MERGEMASTER_FLAGS}
}
update_mergemaster() {
- chroot ${BE_MNTPT} \
- mergemaster -m ${srcdir} -t ${BE_MM_ROOT} ${MERGEMASTER_FLAGS}
+ ${MERGEMASTER_CMD} -m ${srcdir} -D ${BE_MNTPT} -t ${BE_MM_ROOT}
${MERGEMASTER_FLAGS}
}
update_etcupdate_pre() {
- etcupdate -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} || return $?
- etcupdate resolve -D ${BE_MNTPT} || return $?
+ ${ETCUPDATE_CMD} -p -s ${srcdir} -D ${BE_MNTPT} ${ETCUPDATE_FLAGS} ||
return $?
+ ${ETCUPDATE_CMD} resolve -D ${BE_MNTPT} || return $?
}
update_etcupdate() {
chroot ${BE_MNTPT} \
- etcupdate -s ${srcdir} ${ETCUPDATE_FLAGS} || return $?
- chroot ${BE_MNTPT} etcupdate resolve
+ ${ETCUPDATE_CMD} -s ${srcdir} ${ETCUPDATE_FLAGS} || return $?
+ chroot ${BE_MNTPT} ${ETCUPDATE_CMD} resolve
}
@@ -174,6 +169,10 @@ trap 'errx "Interrupt caught"' HUP INT TERM
srcdir=$(pwd)
objdir=$(make -V .OBJDIR 2>/dev/null)
[ ! -d "${objdir}" ] && errx "Must have built FreeBSD from source tree"
+
+## Constants
+ETCUPDATE_CMD="${srcdir}/usr.sbin/etcupdate/etcupdate.sh"
+MERGEMASTER_CMD="${srcdir}/usr.sbin/mergemaster/mergemaster.sh"
# May be a worktree, in which case .git is a file, not a directory.
if [ -e .git ] ; then
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347893 - in head/usr.sbin: etcupdate mergemaster
Author: brd
Date: Thu May 16 21:50:12 2019
New Revision: 347893
URL: https://svnweb.freebsd.org/changeset/base/347893
Log:
Fix mergemaster after r347638 and the master.passwd / group move.
Check the legacy directory and use it instead if present.
Install these first if using beinstall.
UPDATING entry to follow.
Approved by: allanjude (mentor, in person)
MFC after:1 week
Differential Revision:https://reviews.freebsd.org/D20279
Modified:
head/usr.sbin/etcupdate/etcupdate.sh
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/etcupdate/etcupdate.sh
==
--- head/usr.sbin/etcupdate/etcupdate.shThu May 16 21:17:18 2019
(r347892)
+++ head/usr.sbin/etcupdate/etcupdate.shThu May 16 21:50:12 2019
(r347893)
@@ -1737,7 +1737,9 @@ WARNINGS=$WORKDIR/warnings
EDITOR=${EDITOR:-/usr/bin/vi}
# Files that need to be updated before installworld.
-PREWORLD_FILES="etc/master.passwd etc/group"
+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"
# 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.shThu May 16 21:17:18 2019
(r347892)
+++ head/usr.sbin/mergemaster/mergemaster.shThu May 16 21:50:12 2019
(r347893)
@@ -669,9 +669,12 @@ case "${RERUN}" in
;;
*)
# Only set up files that are crucial to {build|install}world
-{ 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;} ||
+{ 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;} ||
{ echo '';
echo ' *** FATAL ERROR: Cannot copy files to the temproot environment';
echo '';
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r347638 - in head: . etc lib/libc/gen
Author: brd
Date: Thu May 16 01:09:13 2019
New Revision: 347638
URL: https://svnweb.freebsd.org/changeset/base/347638
Log:
Move master.passwd and group to lib/libc/gen/
libc was picked as the destination location for these because of the syscalls
that use these files as the lowest level place they are referenced.
Approved by: will (mentor), rgrimes, manu
Differential Revision:https://reviews.freebsd.org/D16728
Added:
head/lib/libc/gen/group
- copied unchanged from r347637, head/etc/group
head/lib/libc/gen/master.passwd
- copied unchanged from r347637, head/etc/master.passwd
Deleted:
head/etc/group
head/etc/master.passwd
Modified:
head/Makefile.inc1
head/etc/Makefile
head/lib/libc/gen/Makefile.inc
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Thu May 16 00:53:54 2019(r347637)
+++ head/Makefile.inc1 Thu May 16 01:09:13 2019(r347638)
@@ -871,8 +871,8 @@ DB_FROM_SRC=yes
.endif
.if defined(DB_FROM_SRC)
-INSTALLFLAGS+= -N ${.CURDIR}/etc
-MTREEFLAGS+= -N ${.CURDIR}/etc
+INSTALLFLAGS+= -N ${.CURDIR}/lib/libc/gen
+MTREEFLAGS+= -N ${.CURDIR}/lib/libc/gen
.endif
_INSTALL_DDIR= ${DESTDIR}/${DISTDIR}
INSTALL_DDIR= ${_INSTALL_DDIR:S://:/:g:C:/$::}
Modified: head/etc/Makefile
==
--- head/etc/Makefile Thu May 16 00:53:54 2019(r347637)
+++ head/etc/Makefile Thu May 16 01:09:13 2019(r347638)
@@ -15,7 +15,6 @@ SUBDIR+=sendmail
.endif
BIN1= \
- group \
login.access \
rc.bsdextended \
rc.firewall \
@@ -65,21 +64,7 @@ distribution:
.endif
cd ${.CURDIR}; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${BIN1} ${DESTDIR}/etc; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
- master.passwd ${DESTDIR}/etc;
-
-.if ${MK_TCSH} == "no"
- sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
-.endif
- pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
-.if defined(NO_ROOT)
- ( \
- echo "./etc/passwd type=file mode=0644 uname=root gname=wheel";
\
- echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel";
\
- echo "./etc/spwd.db type=file mode=0600 uname=root
gname=wheel"; \
- ) | ${METALOG.add}
-.endif
+ ${BIN1} ${DESTDIR}/etc
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
Modified: head/lib/libc/gen/Makefile.inc
==
--- head/lib/libc/gen/Makefile.inc Thu May 16 00:53:54 2019
(r347637)
+++ head/lib/libc/gen/Makefile.inc Thu May 16 01:09:13 2019
(r347638)
@@ -4,7 +4,8 @@
# machine-independent gen sources
.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen
-CONFS= shells
+CONFS+=group master.passwd shells
+CONFSMODE_master.passwd= 600
SRCS+= __getosreldate.c \
__pthread_mutex_init_calloc_cb_stub.c \
@@ -543,3 +544,16 @@ MLINKS+=vis.3 nvis.3 \
vis.3 svis.3
MLINKS+=wordexp.3 wordfree.3
+
+afterinstallconfig:
+.if ${MK_TCSH} == "no"
+ sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
+.endif
+ pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
+.if defined(NO_ROOT) && defined(METALOG)
+ ( \
+ echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel";
\
+ echo "./etc/spwd.db type=file mode=0600 uname=root
gname=wheel"; \
+ echo "./etc/passwd type=file mode=0644 uname=root gname=wheel";
\
+ ) | cat -l >> ${METALOG}
+.endif
Copied: head/lib/libc/gen/group (from r347637, head/etc/group)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/gen/group Thu May 16 01:09:13 2019(r347638, copy
of r347637, head/etc/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/lib/libc/gen/master.passwd (from r347637, head/etc/master.passwd)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/gen/master.passwd Thu May 16 01:09:13 2019
(r347638,
svn commit: r338887 - in head: etc lib/libwrap
Author: brd
Date: Sat Sep 22 13:17:30 2018
New Revision: 338887
URL: https://svnweb.freebsd.org/changeset/base/338887
Log:
Move hosts.allow to lib/libwrap/
This leverages CONFS to handle the install.
Approved by: re (blanket, pkgbase), bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D17240
Added:
head/lib/libwrap/hosts.allow
- copied unchanged from r338886, head/etc/hosts.allow
Deleted:
head/etc/hosts.allow
Modified:
head/etc/Makefile
head/lib/libwrap/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Sep 22 13:14:44 2018(r338886)
+++ head/etc/Makefile Sat Sep 22 13:17:30 2018(r338887)
@@ -14,7 +14,6 @@ SUBDIR+=sendmail
BIN1= \
group \
- hosts.allow \
login.access \
rc.bsdextended \
rc.firewall \
Modified: head/lib/libwrap/Makefile
==
--- head/lib/libwrap/Makefile Sat Sep 22 13:14:44 2018(r338886)
+++ head/lib/libwrap/Makefile Sat Sep 22 13:17:30 2018(r338887)
@@ -4,6 +4,7 @@
.include
+CONFS= hosts.allow
PACKAGE=lib${LIB}
LIB= wrap
SHLIB_MAJOR= 6
Copied: head/lib/libwrap/hosts.allow (from r338886, head/etc/hosts.allow)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libwrap/hosts.allowSat Sep 22 13:17:30 2018
(r338887, copy of r338886, head/etc/hosts.allow)
@@ -0,0 +1,92 @@
+#
+# hosts.allow access control file for "tcp wrapped" applications.
+# $FreeBSD$
+#
+# NOTE: The hosts.deny file is deprecated.
+# Place both 'allow' and 'deny' rules in the hosts.allow file.
+# See hosts_options(5) for the format of this file.
+# hosts_access(5) no longer fully applies.
+#
+# _ _ _
+# | | __ __ __ _ _ __ ____ __ | | ___ | |
+# | _| \ \/ / / _` | | '_ ` _ \ | '_ \ | | / _ \ | |
+# | |___ > < | (_| | | | | | | | | |_) | | | | __/ |_|
+# |_| /_/\_\ \__,_| |_| |_| |_| | .__/ |_| \___| (_)
+# |_|
+# !!! This is an example! You will need to modify it for your specific
+# !!! requirements!
+
+
+# Start by allowing everything (this prevents the rest of the file
+# from working, so remove it when you need protection).
+# The rules here work on a "First match wins" basis.
+ALL : ALL : allow
+
+# Wrapping sshd(8) is not normally a good idea, but if you
+# need to do it, here's how
+#sshd : .evil.cracker.example.com : deny
+
+# Protect against simple DNS spoofing attacks by checking that the
+# forward and reverse records for the remote host match. If a mismatch
+# occurs, access is denied, and any positive ident response within
+# 20 seconds is logged. No protection is afforded against DNS poisoning,
+# IP spoofing or more complicated attacks. Hosts with no reverse DNS
+# pass this rule.
+ALL : PARANOID : RFC931 20 : deny
+
+# Allow anything from localhost. Note that an IP address (not a host
+# name) *MUST* be specified for rpcbind(8).
+ALL : localhost 127.0.0.1 : allow
+# Comment out next line if you build libwrap without IPv6 support.
+ALL : [::1] : allow
+#ALL : my.machine.example.com 192.0.2.35 : allow
+
+# To use IPv6 addresses you must enclose them in []'s
+#ALL : [fe80::%fxp0]/10 : allow
+#ALL : [fe80::]/10 : deny
+#ALL : [2001:db8:2:1:2:3:4:3fe1] : deny
+#ALL : [2001:db8:2:1::]/64 : allow
+
+# Sendmail can help protect you against spammers and relay-rapers
+sendmail : localhost : allow
+#sendmail : .nice.guy.example.com : allow
+#sendmail : .evil.cracker.example.com : deny
+sendmail : ALL : allow
+
+# Exim is an alternative to sendmail, available in the ports tree
+exim : localhost : allow
+#exim : .nice.guy.example.com : allow
+#exim : .evil.cracker.example.com : deny
+exim : ALL : allow
+
+# Rpcbind is used for all RPC services; protect your NFS!
+# Rpcbind should be running with -W option to support this.
+# (IP addresses rather than hostnames *MUST* be used here)
+#rpcbind : 192.0.2.32/255.255.255.224 : allow
+#rpcbind : 192.0.2.96/255.255.255.224 : allow
+rpcbind : ALL : deny
+
+# NIS master server. Only local nets should have access
+# (Since this is an RPC service, rpcbind needs to be considered)
+ypserv : localhost : allow
+#ypserv : .unsafe.my.net.example.com : deny
+#ypserv : .my.net.example.com : allow
+ypserv : ALL : deny
+
+# Provide a small amount of protection for ftpd
+ftpd : localhost : allow
+#ftpd : .nice.guy.example.com : allow
+#ftpd : .evil.cracker.example.com : deny
+ftpd : ALL : allow
+
+# You need to be clever with finger; do _not_ backfinger!! You can easily
+# start a "finger war".
+fingerd : ALL \
+ : spawn (echo Finger. | \
+/usr/bin/mail -s "tcpd\: %u@%h[%a] fingered me!" root) & \
+ :
svn commit: r338825 - in head: etc secure/usr.bin/openssl
Author: brd
Date: Thu Sep 20 09:34:55 2018
New Revision: 338825
URL: https://svnweb.freebsd.org/changeset/base/338825
Log:
Move the openssl.cnf install to secure/usr.bin/openssl/
This leverages CONFS to do the install
Approved by: re (pkgbase, blanket), bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D17245
Modified:
head/etc/Makefile
head/secure/usr.bin/openssl/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Thu Sep 20 09:31:27 2018(r338824)
+++ head/etc/Makefile Thu Sep 20 09:34:55 2018(r338825)
@@ -22,10 +22,6 @@ BIN1=\
# NB: keep these sorted by MK_* knobs
-.if ${MK_OPENSSL} != "no"
-SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
-.endif
-
.if ${MK_SENDMAIL} != "no"
BIN1+= rc.sendmail
.endif
@@ -94,10 +90,6 @@ distribution:
.endif
.if ${MK_SENDMAIL} != "no"
${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
-.endif
-.if ${MK_OPENSSL} != "no"
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${SSL} ${DESTDIR}/etc/ssl
.endif
.if ${MK_KERBEROS} != "no"
cd ${.CURDIR}/root; \
Modified: head/secure/usr.bin/openssl/Makefile
==
--- head/secure/usr.bin/openssl/MakefileThu Sep 20 09:31:27 2018
(r338824)
+++ head/secure/usr.bin/openssl/MakefileThu Sep 20 09:34:55 2018
(r338825)
@@ -1,5 +1,7 @@
# $FreeBSD$
+CONFS= openssl.cnf
+CONFSDIR= /etc/ssl
PROG= openssl
LIBADD=ssl crypto
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338824 - in head: etc lib/libsmb
Author: brd
Date: Thu Sep 20 09:31:27 2018
New Revision: 338824
URL: https://svnweb.freebsd.org/changeset/base/338824
Log:
Move nsmb.conf to lib/libsmb/
This leverages CONFS to do the install
Approved by: re (pkgbase, blanket), bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D17243
Added:
head/lib/libsmb/nsmb.conf
- copied unchanged from r338823, head/etc/nsmb.conf
Deleted:
head/etc/nsmb.conf
Modified:
head/etc/Makefile
head/lib/libsmb/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Thu Sep 20 09:26:10 2018(r338823)
+++ head/etc/Makefile Thu Sep 20 09:31:27 2018(r338824)
@@ -70,7 +70,7 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
- master.passwd nsmb.conf ${DESTDIR}/etc;
+ master.passwd ${DESTDIR}/etc;
.if ${MK_TCSH} == "no"
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
@@ -206,7 +206,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
etc-examples: ${META_DEPS}
cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${BIN1} ${BIN2} nsmb.conf \
+ ${BIN1} ${BIN2} \
${DESTDIR}${SHAREDIR}/examples/etc
.include
Modified: head/lib/libsmb/Makefile
==
--- head/lib/libsmb/MakefileThu Sep 20 09:26:10 2018(r338823)
+++ head/lib/libsmb/MakefileThu Sep 20 09:31:27 2018(r338824)
@@ -2,6 +2,8 @@
.include
+CONFS= nsmb.conf
+CONFSMODE= 600
PACKAGE=lib${LIB}
CONTRIBDIR=${SRCTOP}/contrib/smbfs
.PATH: ${CONTRIBDIR}/lib/smb
Copied: head/lib/libsmb/nsmb.conf (from r338823, head/etc/nsmb.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libsmb/nsmb.conf Thu Sep 20 09:31:27 2018(r338824, copy
of r338823, head/etc/nsmb.conf)
@@ -0,0 +1,56 @@
+# $FreeBSD$
+#
+# smbfs lookups configuration files in next order:
+# 1. ~/.nsmbrc
+# 2. /etc/nsmb.conf - if this file found it will
+# override values with same keys from user files.
+#
+#
+# This file consist from a set of sections. Each section started by section
name
+# surrounded with square brackets:
+# [section_name]
+#
+# End of the section marked either by new section or by the end of file.
+# Each section can contain zero or more parameters:
+# [section_name]
+# key=value
+#
+# where 'key' represents parameter name and 'value' a value assigned
+# to this parameter.
+#
+# SMB library uses next forms of section names (please note that the section
+# name should be in upper case when it refers to server, user or share):
+# A) [default]
+# B) [SERVER]
+# C) [SERVER:USER]
+# D) [SERVER:USER:SHARE]
+#
+# Here is the map of possible keywords:
+#
+# keyword/section A B C D Comment
+#
+# addr - + - - IP address of SMB server
+# charsets + + + + local:remote charset pair
+# nbns + + - - address of NetBIOS name server (WINS)
+# nbscope + + - - NetBIOS scope
+# nbtimeout+ + - - timeout for NetBIOS name servers
+# password - - + + a plain text password used to access to
the given share
+# retry_count + + - - number of retries before connection
marked as broken
+# timeout + + - - SMB request timeout
+# workgroup+ + + + name of workgroup
+#
+
+# A simple configuration example:
+
+# First, define a workgroup.
+#[default]
+#workgroup=SALES
+
+# The 'FSERVER' is an NT server.
+#[FSERVER]
+#charsets=koi8-r:cp866
+#addr=fserv.coolcorp.com
+
+#[FSERVER:JOE]
+# use persistent password cache for user 'joe'
+#password=$$1767877DF
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338823 - in head: etc lib/libopie
Author: brd
Date: Thu Sep 20 09:26:10 2018
New Revision: 338823
URL: https://svnweb.freebsd.org/changeset/base/338823
Log:
Move opieaccess to lib/libopie/
This leverages CONFS to do the install
Approved by: re (blanket, pkgbase), bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D17241
Added:
head/lib/libopie/opieaccess
- copied unchanged from r338822, head/etc/opieaccess
Deleted:
head/etc/opieaccess
Modified:
head/etc/Makefile
head/lib/libopie/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Thu Sep 20 09:21:05 2018(r338822)
+++ head/etc/Makefile Thu Sep 20 09:26:10 2018(r338823)
@@ -70,7 +70,7 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
- master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
+ master.passwd nsmb.conf ${DESTDIR}/etc;
.if ${MK_TCSH} == "no"
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
@@ -206,7 +206,7 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
etc-examples: ${META_DEPS}
cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
- ${BIN1} ${BIN2} nsmb.conf opieaccess \
+ ${BIN1} ${BIN2} nsmb.conf \
${DESTDIR}${SHAREDIR}/examples/etc
.include
Modified: head/lib/libopie/Makefile
==
--- head/lib/libopie/Makefile Thu Sep 20 09:21:05 2018(r338822)
+++ head/lib/libopie/Makefile Thu Sep 20 09:26:10 2018(r338823)
@@ -2,6 +2,9 @@
#
# $FreeBSD$
#
+
+CONFS= opieaccess
+CONFSMODE= 600
PACKAGE=lib${LIB}
OPIE_DIST?=${SRCTOP}/contrib/opie
DIST_DIR= ${OPIE_DIST}/${.CURDIR:T}
Copied: head/lib/libopie/opieaccess (from r338822, head/etc/opieaccess)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libopie/opieaccess Thu Sep 20 09:26:10 2018(r338823, copy
of r338822, head/etc/opieaccess)
@@ -0,0 +1,13 @@
+# $FreeBSD$
+#
+# This file controls whether UNIX passwords are to be permitted. Rules
+# are matched in order, and the search terminates when the first matching
+# rule has been found. Default action is "deny". See opieaccess(5) for
+# more information.
+#
+# Each rule has the form:
+#
+# permit address netmask
+# deny address netmask
+#
+#permit 127.0.0.1 255.255.255.255
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338822 - in head: etc usr.sbin/lpr/lpd
Author: brd
Date: Thu Sep 20 09:21:05 2018
New Revision: 338822
URL: https://svnweb.freebsd.org/changeset/base/338822
Log:
Move hosts.lpd and printcap to usr.sbin/lpr/lpd/
This leverages CONFS to handle the install
Approved by: re (blanket, pkgbase), bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D17238
Added:
head/usr.sbin/lpr/lpd/hosts.lpd
- copied unchanged from r338821, head/etc/hosts.lpd
head/usr.sbin/lpr/lpd/printcap
- copied unchanged from r338821, head/etc/printcap
Deleted:
head/etc/hosts.lpd
head/etc/printcap
Modified:
head/etc/Makefile
head/usr.sbin/lpr/lpd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Thu Sep 20 08:03:21 2018(r338821)
+++ head/etc/Makefile Thu Sep 20 09:21:05 2018(r338822)
@@ -22,10 +22,6 @@ BIN1=\
# NB: keep these sorted by MK_* knobs
-.if ${MK_LPR} != "no"
-BIN1+= hosts.lpd printcap
-.endif
-
.if ${MK_OPENSSL} != "no"
SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
Modified: head/usr.sbin/lpr/lpd/Makefile
==
--- head/usr.sbin/lpr/lpd/Makefile Thu Sep 20 08:03:21 2018
(r338821)
+++ head/usr.sbin/lpr/lpd/Makefile Thu Sep 20 09:21:05 2018
(r338822)
@@ -1,6 +1,7 @@
# From: @(#)Makefile 8.1 (Berkeley) 6/6/93
# $FreeBSD$
+CONFS= hosts.lpd printcap
PROG= lpd
MAN= lpd.8
SRCS= lpd.c printjob.c recvjob.c lpdchar.c modes.c
Copied: head/usr.sbin/lpr/lpd/hosts.lpd (from r338821, head/etc/hosts.lpd)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/lpr/lpd/hosts.lpd Thu Sep 20 09:21:05 2018
(r338822, copy of r338821, head/etc/hosts.lpd)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+#
+# See lpd(8)
+#machine.domain
Copied: head/usr.sbin/lpr/lpd/printcap (from r338821, head/etc/printcap)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/lpr/lpd/printcap Thu Sep 20 09:21:05 2018
(r338822, copy of r338821, head/etc/printcap)
@@ -0,0 +1,54 @@
+# @(#)printcap5.3 (Berkeley) 6/30/90
+# $FreeBSD$
+
+#
+# This enables a simple local "raw" printer, hooked up to the first
+# parallel port. No kind of filtering is done, so everything you pass
+# to the "lpr" command will be printed unmodified.
+#
+# Remember, for further print queues you're going to add, you have
+# to choose different spool directories (the "sd" capability below),
+# otherwise you will greatly confuse lpd.
+#
+# For some advanced printing, have a look at the "apsfilter" package.
+# It plugs into the lpd system, allowing you to print a variety of
+# different file types by converting everything to PostScript(tm)
+# format. For more information about apsfilter visit
+#
+# http://www.apsfilter.org/
+#
+# If you don't have a PostScript(tm) printer, don't panic, but do
+# also install the latest "ghostscript" package for best printer support.
+#
+# Do also refer to the "printing" section of the handbook.
+#
+# https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/printing.html
+#
+# A local copy can be found under
+#
+# /usr/share/doc/handbook/handbook.{html,latin1}.
+#
+# Banner pages are now suppressed by default. Remove the :sh: capability
+# to turn them back on.
+#
+#lp|local line printer:\
+# :sh:\
+# :lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
+#
+# Sample remote printer. The physical printer is on machine "lphost".
+# You can perform any kind of local filtering directly. If you need
+# local filters (e.g. LF -> CR-LF conversion for HP printers), create
+# a filter script that sends the proper escape sequence to the printer
+# and then concatenates stdin to stdout.
+#
+#remote|sample remote printer:\
+# :sh:\
+# :rm=lphost:sd=/var/spool/output/lphost:lf=/var/log/lpd-errs:\
+# :if=/usr/local/libexec/if-script:
+#
+# Simple Russian printer with hardware CP866 character set, output filter
+# used for KOI8-R -> CP866 conversion
+#
+#lp|Russian local line printer:\
+# :sh:of=/usr/libexec/lpr/ru/koi2alt:\
+# :lp=/dev/lpt0:sd=/var/spool/output/lpd:lf=/var/log/lpd-errs:
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338800 - in head: etc usr.bin/tip/tip
Author: brd
Date: Wed Sep 19 14:56:53 2018
New Revision: 338800
URL: https://svnweb.freebsd.org/changeset/base/338800
Log:
Move remote & phones to usr.bin/tip/tip/
Approved by: re (blanket, pkgbase), will (mentor)
Differential Revision:https://reviews.freebsd.org/D17219
Added:
head/usr.bin/tip/tip/phones
- copied unchanged from r338799, head/etc/phones
head/usr.bin/tip/tip/remote
- copied unchanged from r338799, head/etc/remote
Deleted:
head/etc/phones
head/etc/remote
Modified:
head/etc/Makefile
head/usr.bin/tip/tip/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Wed Sep 19 14:38:01 2018(r338799)
+++ head/etc/Makefile Wed Sep 19 14:56:53 2018(r338800)
@@ -16,10 +16,8 @@ BIN1=\
group \
hosts.allow \
login.access \
- phones \
rc.bsdextended \
rc.firewall \
- remote \
termcap.small
# NB: keep these sorted by MK_* knobs
Modified: head/usr.bin/tip/tip/Makefile
==
--- head/usr.bin/tip/tip/Makefile Wed Sep 19 14:38:01 2018
(r338799)
+++ head/usr.bin/tip/tip/Makefile Wed Sep 19 14:56:53 2018
(r338800)
@@ -31,6 +31,7 @@
# explicitly to remcap.c if not 1024
# CONNECT enable ~C command (connect pgm to remote)
+CONFS= phones remote
PROG= tip
LINKS= ${BINDIR}/tip ${BINDIR}/cu
MAN= tip.1 cu.1
@@ -46,6 +47,9 @@ SRCS= acu.c acutab.c cmds.c cmdtab.c cu.c hunt.c log.c
# -- remote.o depends on the Makefile because of DEFBR and DEFFS
# -- log.o depends on the Makefile because of ACULOG
acutab.o log.o remote.o: Makefile
+
+# Don't rebuild based on remote.c
+remote: .MADE
.include
Copied: head/usr.bin/tip/tip/phones (from r338799, head/etc/phones)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/tip/tip/phones Wed Sep 19 14:56:53 2018(r338800, copy
of r338799, head/etc/phones)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+# From: @(#)phones5.2 (Berkeley) 6/30/90
+#
+# phones -- remote host phone number data base
+# see tip(1), phones(5)
+# examples:
+#system1 9=2225551212
+#system2 9995551212
Copied: head/usr.bin/tip/tip/remote (from r338799, head/etc/remote)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/tip/tip/remote Wed Sep 19 14:56:53 2018(r338800, copy
of r338799, head/etc/remote)
@@ -0,0 +1,76 @@
+# $FreeBSD$
+#
+# @(#)remote 5.2 (Berkeley) 6/30/90
+#
+# remote -- remote host description file
+# see tip(1), remote(5)
+#
+# at ACU type
+# br bit rate (defaults to 9600)
+# cu call unit (default is dv)
+# du make a call flag (dial up)
+# dv device to use for the tty
+# el EOL marks (default is NULL)
+# fs frame size (default is BUFSIZ) -- used in buffering writes on
+# receive operations
+# ie input EOF marks (default is NULL)
+# oe output EOF string (default is NULL)
+# pa The parity type to use: even, odd, none, zero, one (default even)
+# pn phone numbers (@ =>'s search phones file; possibly taken from
+# PHONES environment variable)
+# tc to continue a capability
+
+# Example systems
+unixshell|Unix Access:\
+ :pn=\@:tc=unix57600:
+dosbbs|DOS-based BBS:\
+ :pn=\@:tc=dos57600:
+
+# UNIX system definitions
+unix57600|57600 Baud dial-out to a UNIX system:\
+ :el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:tc=dial57600:
+unix33600|33600 Baud dial-out to a UNIX system:\
+ :el=^U^C^R^O^D^S^Q:ie=%$:oe=^D:tc=dial33600:
+
+# DOS system definitions
+dos57600|57600 Baud dial-out to a DOS system:\
+ :el=^U^C^R^O^D^S^Q:ie=%$:oe=^Z:pa=none:tc=dial57600:
+
+# 33.6k and 56k modems run the com port at 115200 bps to allow for the
+# compression performed in the modem. Note that some serial hardware
+# does not support speeds above 38400 bps and that speeds above that have
+# never been formally standardized. Modern architectures with 16550 or
+# better UARTs typically have no issues with the higher speeds.
+dial57600|57600 Baud Hayes attributes:\
+ br#115200:tc=dial:
+dial33600|33600 Baud Hayes attributes:\
+ br#115200:tc=dial:
+# 14.4k and 28.8k modems ran the port at 4x. Some rare 19.2 baud modems
+# did too, but those aren't included in this example.
+dial28800|28800 Baud Hayes attributes:\
+ br#115200:tc=dial:
+dial14400|14400 Baud Hayes attributes:\
+ br#57600:tc=dial:
+dial|Generic dialing parameters:\
+ :dv=/dev/cuau0:cu=/dev/cuau0:at=hayes:du:pa=none:
+
+# Hardwired line
+cuau0c|cua0c:dv=/dev/cuau0:br#9600:pa=none:
+
+# Finger friendly shortcuts
+uart0|com1:dv=/dev/cuau0:br#9600:pa=none:
svn commit: r338794 - in head: etc lib/lib80211
Author: brd
Date: Wed Sep 19 09:29:06 2018
New Revision: 338794
URL: https://svnweb.freebsd.org/changeset/base/338794
Log:
Move regdomain.xml to lib/lib80211/
This leverages CONFS to handle the install. lib80211 was picked because it is
where this file is actually used from.
Approved by: re (blanket, pkgbase), will (mentor)
Differential Revision:https://reviews.freebsd.org/D17229
Added:
head/lib/lib80211/regdomain.xml
- copied unchanged from r338793, head/etc/regdomain.xml
Deleted:
head/etc/regdomain.xml
Modified:
head/etc/Makefile
head/lib/lib80211/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Wed Sep 19 08:13:58 2018(r338793)
+++ head/etc/Makefile Wed Sep 19 09:29:06 2018(r338794)
@@ -36,10 +36,6 @@ SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
BIN1+= rc.sendmail
.endif
-.if ${MK_WIRELESS} != "no"
-BIN1+= regdomain.xml
-.endif
-
.if ${MK_SENDMAIL} == "no"
ETCMAIL=mailer.conf aliases
.else
Modified: head/lib/lib80211/Makefile
==
--- head/lib/lib80211/Makefile Wed Sep 19 08:13:58 2018(r338793)
+++ head/lib/lib80211/Makefile Wed Sep 19 09:29:06 2018(r338794)
@@ -1,5 +1,6 @@
# $FreeBSD$
+CONFS= regdomain.xml
PACKAGE=lib${LIB}
LIB= 80211
SHLIBDIR?= /lib
Copied: head/lib/lib80211/regdomain.xml (from r338793, head/etc/regdomain.xml)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/lib80211/regdomain.xml Wed Sep 19 09:29:06 2018
(r338794, copy of r338793, head/etc/regdomain.xml)
@@ -0,0 +1,1943 @@
+
+
+
+
+
+
+
+
+
+
+ DEBUG
+ 0x1ff
+
+
+
+ FCC
+ 0x10
+
+
+
+
+ 30
+ IEEE80211_CHAN_B
+
+
+
+
+
+ 30
+ IEEE80211_CHAN_G
+
+
+
+
+
+ 17
+
+
+
+ 23
+
+
+
+ 23
+ IEEE80211_CHAN_PASSIVE
+
+
+
+
+
+ 30
+ IEEE80211_CHAN_G
+ IEEE80211_CHAN_HT20
+
+
+
+ 30
+ IEEE80211_CHAN_G
+ IEEE80211_CHAN_HT40
+
+
+
+
+
+ 17
+ IEEE80211_CHAN_HT20
+
+
+
+ 17
+ IEEE80211_CHAN_HT40
+
+
+
+ 23
+ IEEE80211_CHAN_HT20
+
+
+
+ 23
+ IEEE80211_CHAN_HT40
+
+
+
+
+
+
+
+ FCC3
+ 0x3a
+
+
+
+ 30
+ IEEE80211_CHAN_B
+
+
+
+
+
+ 30
+ IEEE80211_CHAN_G
+
+
+
+
+
+ 17
+
+
+
+ 23
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+
+
+ 30
+ IEEE80211_CHAN_G
+ IEEE80211_CHAN_HT20
+
+
+
+ 30
+ IEEE80211_CHAN_G
+ IEEE80211_CHAN_HT40
+
+
+
+
+
+ 17
+ IEEE80211_CHAN_HT20
+
+
+
+ 17
+ IEEE80211_CHAN_HT40
+
+
+
+ 23
+ IEEE80211_CHAN_HT20
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_HT40
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_HT20
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_HT40
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_HT20
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_HT40
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+ 23
+ IEEE80211_CHAN_HT20
+
+
+
+ 23
+ IEEE80211_CHAN_HT40
+ IEEE80211_CHAN_PASSIVE
+ IEEE80211_CHAN_DFS
+
+
+
+
+
+
+
+ FCC4
+ 0x12
+
+
+
+ 30
+ IEEE80211_CHAN_B
+
+
+
+
+
+ 30
+ IEEE80211_CHAN_G
+
+
+
+
+
+ 23
+
+
+
+ 27
+
+
+
+ 30
+
+
+
+
+
+ 30
+ IEEE80211_CHAN_G
+ IEEE80211_CHAN_HT20
+
+
+
+ 30
+ IEEE80211_CHAN_G
+ IEEE80211_CHAN_HT40
+
+
+
+
+
+ JAPAN
+ 0x40
+
+
+
+
+ 23
+ IEEE80211_CHAN_B
+
+
+
+ 23
+ IEEE80211_CHAN_B
+
+
+
+
+
+ 23
+ IEEE80211_CHAN_G
+
+
+
+
+
+ 23
+
+
+
+ 23
+
+
+
+ 23
+
svn commit: r338760 - in head: etc lib/libalias/libalias
Author: brd
Date: Tue Sep 18 20:54:37 2018
New Revision: 338760
URL: https://svnweb.freebsd.org/changeset/base/338760
Log:
Move libalias.conf to lib/libalias/libalias/
This leveages CONFS to handle the install.
Approved by: re (blanket, pkgbase), bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D17218
Added:
head/lib/libalias/libalias/libalias.conf
- copied unchanged from r338759, head/etc/libalias.conf
Deleted:
head/etc/libalias.conf
Modified:
head/etc/Makefile
head/lib/libalias/libalias/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Sep 18 20:52:24 2018(r338759)
+++ head/etc/Makefile Tue Sep 18 20:54:37 2018(r338760)
@@ -15,7 +15,6 @@ SUBDIR+=sendmail
BIN1= \
group \
hosts.allow \
- libalias.conf \
login.access \
phones \
rc.bsdextended \
Modified: head/lib/libalias/libalias/Makefile
==
--- head/lib/libalias/libalias/Makefile Tue Sep 18 20:52:24 2018
(r338759)
+++ head/lib/libalias/libalias/Makefile Tue Sep 18 20:54:37 2018
(r338760)
@@ -2,6 +2,7 @@
.PATH: ${SRCTOP}/sys/netinet/libalias
+CONFS= libalias.conf
PACKAGE=lib${LIB}
LIB= alias
SHLIBDIR?= /lib
Copied: head/lib/libalias/libalias/libalias.conf (from r338759,
head/etc/libalias.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libalias/libalias/libalias.confTue Sep 18 20:54:37 2018
(r338760, copy of r338759, head/etc/libalias.conf)
@@ -0,0 +1,8 @@
+# $FreeBSD$
+/lib/libalias_cuseeme.so
+/lib/libalias_ftp.so
+/lib/libalias_irc.so
+/lib/libalias_nbt.so
+/lib/libalias_pptp.so
+/lib/libalias_skinny.so
+/lib/libalias_smedia.so
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338759 - in head: etc sbin/bsdlabel
Author: brd
Date: Tue Sep 18 20:52:24 2018
New Revision: 338759
URL: https://svnweb.freebsd.org/changeset/base/338759
Log:
Move disktab to sbin/bsdlabel/
This leverages CONFS to handle the install.
Approved by: re (blanket, pkgbase), will (mentor)
Differential Revision:https://reviews.freebsd.org/D17217
Added:
head/sbin/bsdlabel/disktab
- copied unchanged from r338758, head/etc/disktab
Deleted:
head/etc/disktab
Modified:
head/etc/Makefile
head/sbin/bsdlabel/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Sep 18 20:50:07 2018(r338758)
+++ head/etc/Makefile Tue Sep 18 20:52:24 2018(r338759)
@@ -13,7 +13,6 @@ SUBDIR+=sendmail
.endif
BIN1= \
- disktab \
group \
hosts.allow \
libalias.conf \
Modified: head/sbin/bsdlabel/Makefile
==
--- head/sbin/bsdlabel/Makefile Tue Sep 18 20:50:07 2018(r338758)
+++ head/sbin/bsdlabel/Makefile Tue Sep 18 20:52:24 2018(r338759)
@@ -3,6 +3,7 @@
.PATH: ${SRCTOP}/sys/geom
+CONFS= disktab
PACKAGE=runtime
PROG= bsdlabel
SRCS= bsdlabel.c geom_bsd_enc.c
Copied: head/sbin/bsdlabel/disktab (from r338758, head/etc/disktab)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/bsdlabel/disktab Tue Sep 18 20:52:24 2018(r338759, copy
of r338758, head/etc/disktab)
@@ -0,0 +1,204 @@
+# $FreeBSD$
+#
+# Disk geometry and partition layout tables.
+# See disktab(5) for format of this file.
+#
+
+#
+# Floppy formats:
+#
+# To make a filesystem on a floppy:
+# fdformat [-f ] fd[.]
+# disklabel -B -r -w fd[.] fd
+# newfs fd[.]
+#
+# with :
+# -t 2- two heads
+# -u 9|15|18 - sectors per track
+# (using the default value of 1/4096 is not much useful for floppies)
+# -l 1- interleave 1 (for most floppies)
+# -i 65536 - bytes of data per i-node
+# (the default -i value will render you with a floppy wasting way
+# too much space in i-node areas)
+#
+
+fd360:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#9:nc#40:\
+ :pa#720:oa#0:ba#4096:fa#512:\
+ :pc#720:oc#0:bc#4096:fc#512:
+
+fd720:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#9:nc#80:\
+ :pa#1440:oa#0:ba#4096:fa#512:\
+ :pc#1440:oc#0:bc#4096:fc#512:
+
+fd1200|floppy5|5in|5.25in High Density Floppy:\
+ :ty=floppy:se#512:nt#2:rm#360:ns#15:nc#80:\
+ :pa#2400:oa#0:ba#4096:fa#512:\
+ :pc#2400:oc#0:bc#4096:fc#512:
+
+fd1440|floppy|floppy3|3in|3.5in High Density Floppy:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :pa#2880:oa#0:ba#4096:fa#512:\
+ :pc#2880:oc#0:bc#4096:fc#512:
+
+fd2880|2.88MB 3.5in Extra High Density Floppy:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
+ :pa#5760:oa#0:ba#4096:fa#512:\
+ :pb#5760:ob#0:bb#4096:fa#512:\
+ :pc#5760:oc#0:bb#4096:fa#512:
+
+#
+# Stressed floppy-formats. No guarantees given.
+#
+
+fd800:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#10:nc#80:\
+ :pa#1600:oa#0:ba#4096:fa#512:\
+ :pc#1600:oc#0:bc#4096:fc#512:
+
+fd820:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#10:nc#82:\
+ :pa#1640:oa#0:ba#4096:fa#512:\
+ :pc#1640:oc#0:bc#4096:fc#512:
+
+fd1480:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#82:\
+ :pa#2952:oa#0:ba#4096:fa#512:\
+ :pc#2952:oc#0:bc#4096:fc#512:
+
+fd1720:\
+ :ty=floppy:se#512:nt#2:rm#300:ns#21:nc#82:\
+ :pa#3444:oa#0:ba#4096:fa#512:\
+ :pc#3444:oc#0:bc#4096:fc#512:
+
+#
+# LS-120 floppy-format.
+#
+fd120m|floppy120|floppy120m|3.5in LS-120 Floppy:\
+ :ty=floppy:se#512:nt#8:rm#300:ns#32:nc#963:\
+ :pa#246528:oa#0:ba#4096:fa#512:\
+ :pc#246528:oc#0:bc#4096:fc#512:
+
+#
+# Harddisk formats
+#
+qp120at|Quantum Peripherals 120MB IDE:\
+ :dt=ESDI:ty=winchester:se#512:nt#9:ns#32:nc#813:sf: \
+ :pa#13824:oa#0:ta=4.2BSD:ba#4096:fa#512: \
+ :pb#13824:ob#13824:tb=swap: \
+ :pc#234144:oc#0: \
+ :ph#206496:oh#27648:th=4.2BSD:bh#4096:fh#512:
+
+pan60|Panasonic Laptop's 60MB IDE:\
+ :dt=ST506:ty=winchester:se#512:nt#13:ns#17:nc#565:\
+ :pa#13260:oa#0:ta=4.2BSD:ba#4096:fa#512:\
+ :pb#13260:ob#13260:tb=swap: \
+ :pc#124865:oc#0: \
+ :ph#97682:oh#26520:th=4.2BSD:bh#4096:fh#512:
+
+mk156|toshiba156|Toshiba MK156 156Mb:\
+ :dt=SCSI:ty=winchester:se#512:nt#10:ns#35:nc#825:\
+ :pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\
+ :pb#15748:ob#15748:tb=swap:\
+ :pc#288750:oc#0:\
+ :ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD:
+
+cp3100|Connor Peripherals 100MB IDE:\
+ :dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
+ :pa#12144:oa#0:ta=4.2BSD:ba#4096:fa#512: \
+ :pb#12144:ob#12144:tb=swap: \
+
svn commit: r338758 - in head: etc usr.bin/locate/locate
Author: brd
Date: Tue Sep 18 20:50:07 2018
New Revision: 338758
URL: https://svnweb.freebsd.org/changeset/base/338758
Log:
Move install of locate.rc to usr.bin/locate/locate/
This leverages CONFS to handle the install and purges an old comment.
Approved by: re (blanket, pkgbase), bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D17215
Modified:
head/etc/Makefile
head/usr.bin/locate/locate/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Sep 18 20:47:06 2018(r338757)
+++ head/etc/Makefile Tue Sep 18 20:50:07 2018(r338758)
@@ -26,10 +26,6 @@ BIN1=\
# NB: keep these sorted by MK_* knobs
-.if ${MK_LOCATE} != "no"
-BIN1+= ${SRCTOP}/usr.bin/locate/locate/locate.rc
-.endif
-
.if ${MK_LPR} != "no"
BIN1+= hosts.lpd printcap
.endif
Modified: head/usr.bin/locate/locate/Makefile
==
--- head/usr.bin/locate/locate/Makefile Tue Sep 18 20:47:06 2018
(r338757)
+++ head/usr.bin/locate/locate/Makefile Tue Sep 18 20:50:07 2018
(r338758)
@@ -1,6 +1,7 @@
# @(#)Makefile8.1 (Berkeley) 6/6/93
# $FreeBSD$
+CONFS= locate.rc
PROG= locate
SRCS= util.c locate.c
CFLAGS+= -I${.CURDIR} -DMMAP # -DDEBUG (print time) -O2 (10% faster)
@@ -14,10 +15,6 @@ SCRIPTSDIR= ${LIBEXECDIR}
SCRIPTSNAME_${script}= locate.${script:R}
.endfor
MLINKS+= locate.updatedb.8 updatedb.8
-
-# only /usr/src/etc/Makefile install files in /etc
-# ${INSTALL} -o root -g wheel -m 644 \
-# ${.CURDIR}/locate.rc ${DESTDIR}/etc
.include "../../Makefile.inc"
.include
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338757 - in head: etc usr.bin/mail
Author: brd
Date: Tue Sep 18 20:47:06 2018
New Revision: 338757
URL: https://svnweb.freebsd.org/changeset/base/338757
Log:
Move mail.rc install to usr.bin/mail.
This leverages CONFS to do the install
Approved by: re (blanket, pkgbase), bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D17216
Modified:
head/etc/Makefile
head/usr.bin/mail/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Sep 18 20:46:55 2018(r338756)
+++ head/etc/Makefile Tue Sep 18 20:47:06 2018(r338757)
@@ -34,10 +34,6 @@ BIN1+= ${SRCTOP}/usr.bin/locate/locate/locate.rc
BIN1+= hosts.lpd printcap
.endif
-.if ${MK_MAIL} != "no"
-BIN1+= ${SRCTOP}/usr.bin/mail/misc/mail.rc
-.endif
-
.if ${MK_OPENSSL} != "no"
SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
Modified: head/usr.bin/mail/Makefile
==
--- head/usr.bin/mail/Makefile Tue Sep 18 20:46:55 2018(r338756)
+++ head/usr.bin/mail/Makefile Tue Sep 18 20:47:06 2018(r338757)
@@ -1,6 +1,7 @@
# @(#)Makefile8.2 (Berkeley) 1/25/94
# $FreeBSD$
+CONFS= misc/mail.rc
PROG= mail
SRCS= version.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c edit.c fio.c \
getname.c head.c v7.local.c lex.c list.c main.c names.c popen.c \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338745 - in head: etc lib/libc/posix1e
Author: brd
Date: Tue Sep 18 01:40:37 2018
New Revision: 338745
URL: https://svnweb.freebsd.org/changeset/base/338745
Log:
Move mac.conf to lib/libc/posix1e/
This leverages CONFS to handle the install of the config file.
Approved by: re (blanket, pkgbase), will (mentor)
Differential Revision:https://reviews.freebsd.org/D17162
Added:
head/lib/libc/posix1e/mac.conf
- copied unchanged from r338744, head/etc/mac.conf
Deleted:
head/etc/mac.conf
Modified:
head/etc/Makefile
head/lib/libc/posix1e/Makefile.inc
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Sep 18 01:38:44 2018(r338744)
+++ head/etc/Makefile Tue Sep 18 01:40:37 2018(r338745)
@@ -18,7 +18,6 @@ BIN1= \
hosts.allow \
libalias.conf \
login.access \
- mac.conf \
phones \
rc.bsdextended \
rc.firewall \
Modified: head/lib/libc/posix1e/Makefile.inc
==
--- head/lib/libc/posix1e/Makefile.inc Tue Sep 18 01:38:44 2018
(r338744)
+++ head/lib/libc/posix1e/Makefile.inc Tue Sep 18 01:40:37 2018
(r338745)
@@ -8,6 +8,7 @@ CFLAGS+=-D_ACL_PRIVATE
subr_acl_nfs4.c: ${SRCTOP}/sys/kern/subr_acl_nfs4.c
cat ${.ALLSRC} > ${.TARGET}
+CONFS+=posix1e/mac.conf
SRCS+= acl_branding.c \
acl_calc_mask.c \
acl_copy.c \
Copied: head/lib/libc/posix1e/mac.conf (from r338744, head/etc/mac.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/posix1e/mac.conf Tue Sep 18 01:40:37 2018
(r338745, copy of r338744, head/etc/mac.conf)
@@ -0,0 +1,18 @@
+#
+# $FreeBSD$
+#
+# TrustedBSD MAC userland policy configuration file. Kernel modules
+# export label information, and mac.conf indicates to userland
+# applications what defaults they should use in the absence of any
+# other user-provided information.
+#
+
+#
+# Default label set to be used by simple MAC applications
+#
+
+default_labels file ?biba,?lomac,?mls,?sebsd
+default_labels ifnet ?biba,?lomac,?mls,?sebsd
+default_labels process ?biba,?lomac,?mls,?partition,?sebsd
+default_labels socket ?biba,?lomac,?mls
+
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338744 - head/lib/libc/rpc
Author: brd
Date: Tue Sep 18 01:38:44 2018
New Revision: 338744
URL: https://svnweb.freebsd.org/changeset/base/338744
Log:
Fix CONFS to append the value in this case.
Approved by: re (blanket, pkgbase), will (mentor)
Modified:
head/lib/libc/rpc/Makefile.inc
Modified: head/lib/libc/rpc/Makefile.inc
==
--- head/lib/libc/rpc/Makefile.inc Tue Sep 18 01:24:30 2018
(r338743)
+++ head/lib/libc/rpc/Makefile.inc Tue Sep 18 01:38:44 2018
(r338744)
@@ -2,7 +2,7 @@
# $FreeBSD$
.PATH: ${LIBC_SRCTOP}/rpc ${LIBC_SRCTOP}/.
-CONFS= rpc/netconfig rpc/rpc
+CONFS+=rpc/netconfig rpc/rpc
SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338742 - in head: etc usr.sbin/amd/amd
Author: brd
Date: Tue Sep 18 00:32:10 2018
New Revision: 338742
URL: https://svnweb.freebsd.org/changeset/base/338742
Log:
Move amd.map to usr.sbin/amd/amd/
This leverages CONFS to handle the install of the config file.
Approved by: re (gjb), will (mentor)
Differential Revision:https://reviews.freebsd.org/D17159
Added:
head/usr.sbin/amd/amd/amd.map
- copied unchanged from r338741, head/etc/amd.map
Deleted:
head/etc/amd.map
Modified:
head/etc/Makefile
head/usr.sbin/amd/amd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Sep 18 00:25:00 2018(r338741)
+++ head/etc/Makefile Tue Sep 18 00:32:10 2018(r338742)
@@ -27,10 +27,6 @@ BIN1=\
# NB: keep these sorted by MK_* knobs
-.if ${MK_AMD} != "no"
-BIN1+= amd.map
-.endif
-
.if ${MK_LOCATE} != "no"
BIN1+= ${SRCTOP}/usr.bin/locate/locate/locate.rc
.endif
Modified: head/usr.sbin/amd/amd/Makefile
==
--- head/usr.sbin/amd/amd/Makefile Tue Sep 18 00:25:00 2018
(r338741)
+++ head/usr.sbin/amd/amd/Makefile Tue Sep 18 00:32:10 2018
(r338742)
@@ -10,6 +10,7 @@
.PATH: ${SRCTOP}/contrib/amd/amd
+CONFS= amd.map
PROG= amd
MAN= amd.8
SRCS= am_ops.c amd.c amfs_auto.c amfs_direct.c amfs_error.c amfs_generic.c
Copied: head/usr.sbin/amd/amd/amd.map (from r338741, head/etc/amd.map)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/amd/amd/amd.map Tue Sep 18 00:32:10 2018
(r338742, copy of r338741, head/etc/amd.map)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+#
+/defaults type:=host;fs:=${autodir}/${rhost}/host;rhost:=${key}
+* opts:=rw,grpid,resvport,vers=3,proto=tcp,nosuid,nodev
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338741 - in head: etc libexec/rtld-elf
Author: brd
Date: Tue Sep 18 00:25:00 2018
New Revision: 338741
URL: https://svnweb.freebsd.org/changeset/base/338741
Log:
Move libmap.conf to libexec/rtld-elf/
This leverages CONFS to handle the config file install.
Approved by: re (gjb), will (mentor)
Differential Revision:https://reviews.freebsd.org/D17161
Added:
head/libexec/rtld-elf/libmap.conf
- copied unchanged from r338740, head/etc/libmap.conf
Deleted:
head/etc/libmap.conf
Modified:
head/etc/Makefile
head/libexec/rtld-elf/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Sep 18 00:11:45 2018(r338740)
+++ head/etc/Makefile Tue Sep 18 00:25:00 2018(r338741)
@@ -17,7 +17,6 @@ BIN1= \
group \
hosts.allow \
libalias.conf \
- libmap.conf \
login.access \
mac.conf \
phones \
Modified: head/libexec/rtld-elf/Makefile
==
--- head/libexec/rtld-elf/Makefile Tue Sep 18 00:11:45 2018
(r338740)
+++ head/libexec/rtld-elf/Makefile Tue Sep 18 00:25:00 2018
(r338741)
@@ -8,6 +8,7 @@
PACKAGE= clibs
MK_SSP=no
+CONFS= libmap.conf
PROG?= ld-elf.so.1
.if (${PROG:M*ld-elf32*} != "")
TAGS+= lib32
Copied: head/libexec/rtld-elf/libmap.conf (from r338740, head/etc/libmap.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/rtld-elf/libmap.conf Tue Sep 18 00:25:00 2018
(r338741, copy of r338740, head/etc/libmap.conf)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+includedir /usr/local/etc/libmap.d
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338740 - in head: etc sbin/dhclient
Author: brd Date: Tue Sep 18 00:11:45 2018 New Revision: 338740 URL: https://svnweb.freebsd.org/changeset/base/338740 Log: Move dhclient.conf to sbin/dhclient/. This also leverages CONFS for handling config files. Approved by: re (gjb), will (mentor) Differential Revision:https://reviews.freebsd.org/D17160 Added: head/sbin/dhclient/dhclient.conf - copied unchanged from r338739, head/etc/dhclient.conf Deleted: head/etc/dhclient.conf Modified: head/etc/Makefile head/sbin/dhclient/Makefile Modified: head/etc/Makefile == --- head/etc/Makefile Tue Sep 18 00:10:29 2018(r338739) +++ head/etc/Makefile Tue Sep 18 00:11:45 2018(r338740) @@ -13,7 +13,6 @@ SUBDIR+=sendmail .endif BIN1= \ - dhclient.conf \ disktab \ group \ hosts.allow \ Modified: head/sbin/dhclient/Makefile == --- head/sbin/dhclient/Makefile Tue Sep 18 00:10:29 2018(r338739) +++ head/sbin/dhclient/Makefile Tue Sep 18 00:11:45 2018(r338740) @@ -33,6 +33,7 @@ .include +CONFS= dhclient.conf PACKAGE=runtime SRCS= dhclient.c clparse.c alloc.c dispatch.c hash.c bpf.c options.c \ tree.c conflex.c errwarn.c inet.c packet.c convert.c tables.c \ Copied: head/sbin/dhclient/dhclient.conf (from r338739, head/etc/dhclient.conf) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/dhclient/dhclient.confTue Sep 18 00:11:45 2018 (r338740, copy of r338739, head/etc/dhclient.conf) @@ -0,0 +1,8 @@ +# $FreeBSD$ +# +# This file is required by the ISC DHCP client. +# See ``man 5 dhclient.conf'' for details. +# +# In most cases an empty file is sufficient for most people as the +# defaults are usually fine. +# ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338739 - head/sbin/dhclient
Author: brd Date: Tue Sep 18 00:10:29 2018 New Revision: 338739 URL: https://svnweb.freebsd.org/changeset/base/338739 Log: Remove dhclient.conf from here in prep for the move of it from etc/. This is being done a separate step to ease importing into other VCSes. Approved by: re (gjb), will (mentor) Differential Revision:https://reviews.freebsd.org/D17160 Deleted: head/sbin/dhclient/dhclient.conf ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338732 - in head: etc lib/libc/rpc
Author: brd
Date: Mon Sep 17 19:20:50 2018
New Revision: 338732
URL: https://svnweb.freebsd.org/changeset/base/338732
Log:
Move rpc and netconfig to lib/libc/rpc/
This uses relative paths to make it more specific to avoid any potential
future problems with .PATH and leverages CONFS.
libc was picked as the destination location for these because of the syscalls
that use these files as the lowest level place they are referenced.
Approved by: re (gjb), will (mentor)
Differential Revision:https://reviews.freebsd.org/D17163
Added:
head/lib/libc/rpc/netconfig
- copied unchanged from r338731, head/etc/netconfig
head/lib/libc/rpc/rpc
- copied unchanged from r338731, head/etc/rpc
Deleted:
head/etc/netconfig
head/etc/rpc
Modified:
head/etc/Makefile
head/lib/libc/rpc/Makefile.inc
Modified: head/etc/Makefile
==
--- head/etc/Makefile Mon Sep 17 19:05:32 2018(r338731)
+++ head/etc/Makefile Mon Sep 17 19:20:50 2018(r338732)
@@ -21,12 +21,10 @@ BIN1= \
libmap.conf \
login.access \
mac.conf \
- netconfig \
phones \
rc.bsdextended \
rc.firewall \
remote \
- rpc \
termcap.small
# NB: keep these sorted by MK_* knobs
Modified: head/lib/libc/rpc/Makefile.inc
==
--- head/lib/libc/rpc/Makefile.inc Mon Sep 17 19:05:32 2018
(r338731)
+++ head/lib/libc/rpc/Makefile.inc Mon Sep 17 19:20:50 2018
(r338732)
@@ -2,6 +2,7 @@
# $FreeBSD$
.PATH: ${LIBC_SRCTOP}/rpc ${LIBC_SRCTOP}/.
+CONFS= rpc/netconfig rpc/rpc
SRCS+= auth_none.c auth_unix.c authunix_prot.c bindresvport.c clnt_bcast.c \
clnt_dg.c clnt_generic.c clnt_perror.c clnt_raw.c clnt_simple.c \
clnt_vc.c rpc_dtablesize.c getnetconfig.c getnetpath.c getrpcent.c \
Copied: head/lib/libc/rpc/netconfig (from r338731, head/etc/netconfig)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/rpc/netconfig Mon Sep 17 19:20:50 2018(r338732, copy
of r338731, head/etc/netconfig)
@@ -0,0 +1,19 @@
+# $FreeBSD$
+#
+# The network configuration file. This file is currently only used in
+# conjunction with the (TI-) RPC code in the C library, unlike its
+# use in SVR4.
+#
+# Entries consist of:
+#
+#\
+#
+#
+# The and fields are always empty in FreeBSD.
+#
+udp6 tpi_clts v inet6udp - -
+tcp6 tpi_cots_ord v inet6tcp - -
+udptpi_clts v inet udp - -
+tcptpi_cots_ord v inet tcp - -
+rawip tpi_raw - inet - - -
+local tpi_cots_ord - loopback - - -
Copied: head/lib/libc/rpc/rpc (from r338731, head/etc/rpc)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/rpc/rpc Mon Sep 17 19:20:50 2018(r338732, copy
of r338731, head/etc/rpc)
@@ -0,0 +1,68 @@
+#
+# $FreeBSD$
+# rpc 88/08/01 4.0 RPCSRC; from 1.12 99/07/25 SMI
+#
+rpcbind10 portmap sunrpc rpcbind
+rstatd 11 rstat rstat_svc rup perfmeter
+rusersd12 rusers
+nfs13 nfsprog
+ypserv 14 ypprog
+mountd 15 mount showmount
+ypbind 17
+walld 18 rwall shutdown
+yppasswdd 19 yppasswd
+etherstatd 100010 etherstat
+rquotad100011 rquotaprog quota rquota
+sprayd 100012 spray
+3270_mapper100013
+rje_mapper 100014
+selection_svc 100015 selnsvc
+database_svc 100016
+rexd 100017 rex
+alis 100018
+sched 100019
+llockmgr 100020
+nlockmgr 100021
+x25.inr100022
+statmon100023
+status 100024
+bootparamd 100026 bootparam
+ypupdated 100028 ypupdate
+keyserv100029 keyserver
+sunlink_mapper 100033
+tfsd 100037
+nsed 100038
+nsemntd100039
+showfhd100043 showfh
+ioadmd 100055 rpc.ioadmd
+NETlicense 100062
+sunisamd 100065
+debug_svc 100066 dbsrv
+cmsd 100068
+bugtraqd 100071
+kerbd 100078
+ttdbserver 100083 tooltalk
+event 100101 na.event# SunNet Manager
+logger 100102 na.logger # SunNet Manager
+sync 100104 na.sync
+hostperf 100107 na.hostperf
+activity 100109 na.activity # SunNet Manager
+hostmem100112 na.hostmem
+sample 100113 na.sample
+x25100114 na.x25
+ping 100115 na.ping
+rpcnfs
svn commit: r338729 - in head: etc lib/libc/net
Author: brd
Date: Mon Sep 17 18:56:47 2018
New Revision: 338729
URL: https://svnweb.freebsd.org/changeset/base/338729
Log:
Move hosts, hosts.equiv, networks, nsswitch.conf, protocols to lib/libc/net/
This uses relative paths to make it more specific to avoid any potential
future problems with .PATH and leverages CONFS.
libc was picked as the destination location for these because of the syscalls
that use these files as the lowest level place they are referenced.
Approved by: re (gjb), will (mentor)
Differential Revision:https://reviews.freebsd.org/D17164
Added:
head/lib/libc/net/hosts
- copied unchanged from r338728, head/etc/hosts
head/lib/libc/net/hosts.equiv
- copied unchanged from r338728, head/etc/hosts.equiv
head/lib/libc/net/networks
- copied unchanged from r338728, head/etc/networks
head/lib/libc/net/nsswitch.conf
- copied unchanged from r338728, head/etc/nsswitch.conf
head/lib/libc/net/protocols
- copied unchanged from r338728, head/etc/protocols
Deleted:
head/etc/hosts
head/etc/hosts.equiv
head/etc/networks
head/etc/nsswitch.conf
head/etc/protocols
Modified:
head/etc/Makefile
head/lib/libc/net/Makefile.inc
Modified: head/etc/Makefile
==
--- head/etc/Makefile Mon Sep 17 18:46:30 2018(r338728)
+++ head/etc/Makefile Mon Sep 17 18:56:47 2018(r338729)
@@ -16,18 +16,13 @@ BIN1= \
dhclient.conf \
disktab \
group \
- hosts \
hosts.allow \
- hosts.equiv \
libalias.conf \
libmap.conf \
login.access \
mac.conf \
netconfig \
- networks \
- nsswitch.conf \
phones \
- protocols \
rc.bsdextended \
rc.firewall \
remote \
@@ -159,10 +154,6 @@ distribution:
${SRCTOP}/sys/${MACHINE}/conf/GENERIC.hints \
${DESTDIR}/boot/device.hints
.endif
-.endif
-.if ${MK_NIS} == "no"
- sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
- ${DESTDIR}/etc/nsswitch.conf
.endif
MTREE_CMD?=mtree
Modified: head/lib/libc/net/Makefile.inc
==
--- head/lib/libc/net/Makefile.inc Mon Sep 17 18:46:30 2018
(r338728)
+++ head/lib/libc/net/Makefile.inc Mon Sep 17 18:56:47 2018
(r338729)
@@ -4,6 +4,7 @@
# machine-independent net sources
.PATH: ${LIBC_SRCTOP}/net
+CONFS+=net/hosts net/hosts.equiv net/networks net/nsswitch.conf
net/protocols
SRCS+= base64.c ether_addr.c eui64.c \
gai_strerror.c getaddrinfo.c \
gethostbydns.c gethostbyht.c gethostbynis.c gethostnamadr.c \
@@ -123,3 +124,8 @@ SRCS+= hesiod.c
MAN+= hesiod.3
.endif
+.if ${MK_NIS} == "no"
+afterinstallconfig:
+ sed -i "" -e 's/.*_compat:/# &/' -e 's/compat$$/files/' \
+ ${DESTDIR}/etc/nsswitch.conf
+.endif
Copied: head/lib/libc/net/hosts (from r338728, head/etc/hosts)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/net/hosts Mon Sep 17 18:56:47 2018(r338729, copy
of r338728, head/etc/hosts)
@@ -0,0 +1,31 @@
+# $FreeBSD$
+#
+# Host Database
+#
+# This file should contain the addresses and aliases for local hosts that
+# share this file. Replace 'my.domain' below with the domainname of your
+# machine.
+#
+# In the presence of the domain name service or NIS, this file may
+# not be consulted at all; see /etc/nsswitch.conf for the resolution order.
+#
+#
+::1localhost localhost.my.domain
+127.0.0.1 localhost localhost.my.domain
+#
+# Imaginary network.
+#10.0.0.2 myname.my.domain myname
+#10.0.0.3 myfriend.my.domain myfriend
+#
+# According to RFC 1918, you can use the following IP networks for
+# private nets which will never be connected to the Internet:
+#
+# 10.0.0.0- 10.255.255.255
+# 172.16.0.0 - 172.31.255.255
+# 192.168.0.0 - 192.168.255.255
+#
+# In case you want to be able to connect to the Internet, you need
+# real official assigned numbers. Do not try to invent your own network
+# numbers but instead get one from your network provider (if any) or
+# from your regional registry (ARIN, APNIC, LACNIC, RIPE NCC, or AfriNIC.)
+#
Copied: head/lib/libc/net/hosts.equiv (from r338728, head/etc/hosts.equiv)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/net/hosts.equiv Mon Sep 17 18:56:47 2018
(r338729, copy of r338728, head/etc/hosts.equiv)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+#
+#localhost
+#my_very_good_friend.domain
Copied: head/lib/libc/net/networks (from r338728, head/etc/networks)
Re: svn commit: r338633 - head/lib/libpam/pam.d
On Thu, Sep 13, 2018, at 10:09 AM, Jean-Sébastien Pédron wrote:
>
> On 9/13/18 6:08 PM, Brad Davis wrote:
> >>> + ${INSTALL_LINK} ${TAG_ARGS} ${CONFDIR}/ftpd ${CONFDIR}/ftp
> >>
> >> I think this line should probably be ${DESTDIR}/${CONFDIR} for both
> >> source and dest.
> >
> > Yep.. Too late at night and missed that and it didn't show up in my
> > packages build, but does in dumbbells..
> >
> > I have a diff over to re@
>
> Thank you!
Fixed in r338651.
Regards,
Brad Davis
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338651 - head/lib/libpam/pam.d
Author: brd
Date: Thu Sep 13 16:14:33 2018
New Revision: 338651
URL: https://svnweb.freebsd.org/changeset/base/338651
Log:
Really fix pam install. Don't commit late at night or you make simple
mistakes.
Reported by: dumbbell
Approved by: re (gjb), will (mentor)
Modified:
head/lib/libpam/pam.d/Makefile
Modified: head/lib/libpam/pam.d/Makefile
==
--- head/lib/libpam/pam.d/Makefile Thu Sep 13 15:58:03 2018
(r338650)
+++ head/lib/libpam/pam.d/Makefile Thu Sep 13 16:14:33 2018
(r338651)
@@ -29,7 +29,7 @@ FTP+= ftpd
FTPPACKAGE+= ftp
afterinstallconfig:
- ${INSTALL_LINK} ${TAG_ARGS} ${CONFDIR}/ftpd ${CONFDIR}/ftp
+ ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}${CONFDIR}/ftpd
${DESTDIR}${CONFDIR}/ftp
.endif
.if ${MK_TELNET} != "no"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r338633 - head/lib/libpam/pam.d
On Thu, Sep 13, 2018, at 10:07 AM, Ian Lepore wrote:
> On Thu, 2018-09-13 at 07:48 +0000, Brad Davis wrote:
> > Author: brd
> > Date: Thu Sep 13 07:48:49 2018
> > New Revision: 338633
> > URL: https://svnweb.freebsd.org/changeset/base/338633
> >
> > Log:
> > Fix build after r338621 by avoiding LINKS and installing the link
> > manually.
> >
> > Approved by: re (rgrimes), will (mentor)
> >
> > Modified:
> > head/lib/libpam/pam.d/Makefile
> >
> > Modified: head/lib/libpam/pam.d/Makefile
> > =
> > =
> > --- head/lib/libpam/pam.d/Makefile Thu Sep 13 07:15:02 2018
> > (r338632)
> > +++ head/lib/libpam/pam.d/Makefile Thu Sep 13 07:48:49 2018
> > (r338633)
> > @@ -27,7 +27,9 @@ ATPACKAGE+= at
> > CONFGROUPS+= FTP
> > FTP+= ftpd
> > FTPPACKAGE+= ftp
> > -LINKS= ${FILESDIR}/ftpd ${FILESDIR}/ftp
> > +
> > +afterinstallconfig:
> > + ${INSTALL_LINK} ${TAG_ARGS} ${CONFDIR}/ftpd ${CONFDIR}/ftp
>
> I think this line should probably be ${DESTDIR}/${CONFDIR} for both
> source and dest.
Yep.. Too late at night and missed that and it didn't show up in my packages
build, but does in dumbbells..
I have a diff over to re@
Regards,
Brad Davis
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338633 - head/lib/libpam/pam.d
Author: brd
Date: Thu Sep 13 07:48:49 2018
New Revision: 338633
URL: https://svnweb.freebsd.org/changeset/base/338633
Log:
Fix build after r338621 by avoiding LINKS and installing the link manually.
Approved by: re (rgrimes), will (mentor)
Modified:
head/lib/libpam/pam.d/Makefile
Modified: head/lib/libpam/pam.d/Makefile
==
--- head/lib/libpam/pam.d/Makefile Thu Sep 13 07:15:02 2018
(r338632)
+++ head/lib/libpam/pam.d/Makefile Thu Sep 13 07:48:49 2018
(r338633)
@@ -27,7 +27,9 @@ ATPACKAGE+= at
CONFGROUPS+= FTP
FTP+= ftpd
FTPPACKAGE+= ftp
-LINKS= ${FILESDIR}/ftpd ${FILESDIR}/ftp
+
+afterinstallconfig:
+ ${INSTALL_LINK} ${TAG_ARGS} ${CONFDIR}/ftpd ${CONFDIR}/ftp
.endif
.if ${MK_TELNET} != "no"
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r338621 - in head: etc etc/pam.d lib/libpam lib/libpam/pam.d
On Wed, Sep 12, 2018, at 10:08 PM, Brad Davis wrote:
> Author: brd
> Date: Thu Sep 13 04:08:48 2018
> New Revision: 338621
> URL: https://svnweb.freebsd.org/changeset/base/338621
>
> Log:
> Move all pam related config to lib/libpam/
>
> Approved by:re (rgrimes), will (mentor), des
> Differential Revision: https://reviews.freebsd.org/D17122
>
> Added:
> head/lib/libpam/pam.d/
> - copied from r338620, head/etc/pam.d/
> Deleted:
> head/etc/pam.d/
> Modified:
> head/etc/Makefile
> head/lib/libpam/Makefile
> head/lib/libpam/pam.d/Makefile
>
> Modified: head/etc/Makefile
> ==
> --- head/etc/Makefile Wed Sep 12 19:41:16 2018(r338620)
> +++ head/etc/Makefile Thu Sep 13 04:08:48 2018(r338621)
> @@ -121,7 +121,6 @@ distribution:
> ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
> ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
> ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
> - ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
> .if ${MK_UNBOUND} != "no"
> if [ ! -e ${DESTDIR}/etc/unbound ]; then \
> ${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
>
> Modified: head/lib/libpam/Makefile
> ==
> --- head/lib/libpam/Makefile Wed Sep 12 19:41:16 2018(r338620)
> +++ head/lib/libpam/Makefile Thu Sep 13 04:08:48 2018(r338621)
> @@ -25,7 +25,7 @@
> # $FreeBSD$
>
> # The modules link in libpam. They build the static modules as well.
> -SUBDIR+= libpam modules
> +SUBDIR+= libpam modules pam.d
> SUBDIR_DEPEND_modules= libpam
> SUBDIR+= static_libpam
> SUBDIR_DEPEND_static_libpam= modules
>
> Modified: head/lib/libpam/pam.d/Makefile
> ==
> --- head/etc/pam.d/Makefile Wed Sep 12 19:41:16 2018(r338620)
> +++ head/lib/libpam/pam.d/MakefileThu Sep 13 04:08:48 2018
> (r338621)
> @@ -4,9 +4,8 @@
>
> NO_OBJ=
>
> -FILESGROUPS= FILES
> -
> -FILES= README \
> +CONFGROUPS= CONFS
> +CONFS= README \
> cron \
> imap \
> login \
> @@ -15,34 +14,26 @@ FILES=README \
> sshd su system \
> xdm
>
> -FILESDIR=/etc/pam.d
> -FILESMODE= 644
> +CONFDIR= /etc/pam.d
> +CONFSMODE_README=444
>
> .if ${MK_AT} != "no"
> -FILESGROUPS+=AT
> +CONFGROUPS+= AT
> AT+= atrun
> ATPACKAGE+= at
> -ATDIR= ${FILESDIR}
> -ATMODE= ${FILESMODE}
> .endif
>
> .if ${MK_FTP} != "no"
> -FILESGROUPS+=FTP
> +CONFGROUPS+= FTP
> FTP+=ftpd
> FTPPACKAGE+= ftp
> -FTPDIR= ${FILESDIR}
> -FTPMODE= ${FILESMODE}
> LINKS= ${FILESDIR}/ftpd ${FILESDIR}/ftp
^^^ this is broken durning install, I have a patch out to re@. Sorry for the
breakage.
Regards,
Brad Davis
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338621 - in head: etc etc/pam.d lib/libpam lib/libpam/pam.d
Author: brd
Date: Thu Sep 13 04:08:48 2018
New Revision: 338621
URL: https://svnweb.freebsd.org/changeset/base/338621
Log:
Move all pam related config to lib/libpam/
Approved by: re (rgrimes), will (mentor), des
Differential Revision:https://reviews.freebsd.org/D17122
Added:
head/lib/libpam/pam.d/
- copied from r338620, head/etc/pam.d/
Deleted:
head/etc/pam.d/
Modified:
head/etc/Makefile
head/lib/libpam/Makefile
head/lib/libpam/pam.d/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Wed Sep 12 19:41:16 2018(r338620)
+++ head/etc/Makefile Thu Sep 13 04:08:48 2018(r338621)
@@ -121,7 +121,6 @@ distribution:
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
- ${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
.if ${MK_UNBOUND} != "no"
if [ ! -e ${DESTDIR}/etc/unbound ]; then \
${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
Modified: head/lib/libpam/Makefile
==
--- head/lib/libpam/MakefileWed Sep 12 19:41:16 2018(r338620)
+++ head/lib/libpam/MakefileThu Sep 13 04:08:48 2018(r338621)
@@ -25,7 +25,7 @@
# $FreeBSD$
# The modules link in libpam. They build the static modules as well.
-SUBDIR+= libpam modules
+SUBDIR+= libpam modules pam.d
SUBDIR_DEPEND_modules= libpam
SUBDIR+= static_libpam
SUBDIR_DEPEND_static_libpam= modules
Modified: head/lib/libpam/pam.d/Makefile
==
--- head/etc/pam.d/Makefile Wed Sep 12 19:41:16 2018(r338620)
+++ head/lib/libpam/pam.d/Makefile Thu Sep 13 04:08:48 2018
(r338621)
@@ -4,9 +4,8 @@
NO_OBJ=
-FILESGROUPS= FILES
-
-FILES= README \
+CONFGROUPS=CONFS
+CONFS= README \
cron \
imap \
login \
@@ -15,34 +14,26 @@ FILES= README \
sshd su system \
xdm
-FILESDIR= /etc/pam.d
-FILESMODE= 644
+CONFDIR= /etc/pam.d
+CONFSMODE_README= 444
.if ${MK_AT} != "no"
-FILESGROUPS+= AT
+CONFGROUPS+= AT
AT+= atrun
ATPACKAGE+=at
-ATDIR= ${FILESDIR}
-ATMODE=${FILESMODE}
.endif
.if ${MK_FTP} != "no"
-FILESGROUPS+= FTP
+CONFGROUPS+= FTP
FTP+= ftpd
FTPPACKAGE+= ftp
-FTPDIR=${FILESDIR}
-FTPMODE= ${FILESMODE}
LINKS= ${FILESDIR}/ftpd ${FILESDIR}/ftp
.endif
.if ${MK_TELNET} != "no"
-FILESGROUPS+= TELNET
+CONFGROUPS+= TELNET
TELNET+= telnetd
TELNETPACKAGE+=telnet
-TELNETDIR= ${FILESDIR}
-TELNETMODE=${FILESMODE}
.endif
-
-FILESMODE_README= 444
.include
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338497 - in head: etc usr.sbin/cron/cron
Author: brd Date: Thu Sep 6 14:55:54 2018 New Revision: 338497 URL: https://svnweb.freebsd.org/changeset/base/338497 Log: Move etc/crontab to usr.sbin/cron/cron/ Approved by: re (gjb), will (mentor) Differential Revision:https://reviews.freebsd.org/D16786 Added: head/usr.sbin/cron/cron/crontab - copied unchanged from r338496, head/etc/crontab Deleted: head/etc/crontab Modified: head/etc/Makefile head/usr.sbin/cron/cron/Makefile Modified: head/etc/Makefile == --- head/etc/Makefile Thu Sep 6 14:15:03 2018(r338496) +++ head/etc/Makefile Thu Sep 6 14:55:54 2018(r338497) @@ -12,7 +12,7 @@ UPDATE_DEPENDFILE=no SUBDIR+=sendmail .endif -BIN1= crontab \ +BIN1= \ dhclient.conf \ disktab \ group \ Modified: head/usr.sbin/cron/cron/Makefile == --- head/usr.sbin/cron/cron/MakefileThu Sep 6 14:15:03 2018 (r338496) +++ head/usr.sbin/cron/cron/MakefileThu Sep 6 14:55:54 2018 (r338497) @@ -1,5 +1,6 @@ # $FreeBSD$ +CONFS= crontab PROG= cron MAN= cron.8 SRCS= cron.c database.c do_command.c job.c user.c popen.c Copied: head/usr.sbin/cron/cron/crontab (from r338496, head/etc/crontab) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/cron/cron/crontab Thu Sep 6 14:55:54 2018 (r338497, copy of r338496, head/etc/crontab) @@ -0,0 +1,23 @@ +# /etc/crontab - root's crontab for FreeBSD +# +# $FreeBSD$ +# +SHELL=/bin/sh +PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin +# +#minutehourmdaymonth wdaywho command +# +# Save some entropy so that /dev/random can re-seed on boot. +*/11 * * * * operator /usr/libexec/save-entropy +# +# Rotate log files every hour, if necessary. +0 * * * * rootnewsyslog +# +# Perform daily/weekly/monthly maintenance. +1 3 * * * rootperiodic daily +15 4 * * 6 rootperiodic weekly +30 5 1 * * rootperiodic monthly +# +# Adjust the time zone if the CMOS clock keeps local time, as opposed to +# UTC time. See adjkerntz(8) for details. +1,31 0-5 * * * rootadjkerntz -a ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338471 - in head: etc libexec/getty
Author: brd Date: Wed Sep 5 15:25:23 2018 New Revision: 338471 URL: https://svnweb.freebsd.org/changeset/base/338471 Log: Move gettytab to libexec/getty/ Approved by: re (gjb), will (mentor) Differential Revision:https://reviews.freebsd.org/D16953 Added: head/libexec/getty/gettytab - copied unchanged from r338470, head/etc/gettytab Deleted: head/etc/gettytab Modified: head/etc/Makefile head/libexec/getty/Makefile Modified: head/etc/Makefile == --- head/etc/Makefile Wed Sep 5 15:04:11 2018(r338470) +++ head/etc/Makefile Wed Sep 5 15:25:23 2018(r338471) @@ -15,7 +15,6 @@ SUBDIR+=sendmail BIN1= crontab \ dhclient.conf \ disktab \ - gettytab \ group \ hosts \ hosts.allow \ Modified: head/libexec/getty/Makefile == --- head/libexec/getty/Makefile Wed Sep 5 15:04:11 2018(r338470) +++ head/libexec/getty/Makefile Wed Sep 5 15:25:23 2018(r338471) @@ -1,6 +1,7 @@ # from: @(#)Makefile 8.1 (Berkeley) 6/4/93 # $FreeBSD$ +CONFS= gettytab PROG= getty SRCS= main.c init.c subr.c chat.c LIBADD=util Copied: head/libexec/getty/gettytab (from r338470, head/etc/gettytab) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/libexec/getty/gettytab Wed Sep 5 15:25:23 2018(r338471, copy of r338470, head/etc/gettytab) @@ -0,0 +1,239 @@ +# $FreeBSD$ +# from: @(#)gettytab 5.14 (Berkeley) 3/27/91 +# +# Most of the table entries here are just copies of the old getty table, +# it is by no means certain, or even likely, that any of them are optimal +# for any purpose whatever. Nor is it likely that more than a couple are +# even correct. +# +# The default gettytab entry, used to set defaults for all other +# entries, and in cases where getty is called with no table name. +# +# cb, ce and ck are desirable on most crt's. The non-crt entries need to +# be changed to turn them off (:cb@:ce@:ck@:). +# +# lc should always be on; it's a remainder of some stone age when there +# have been terminals around not being able of handling lower-case +# characters. Those terminals aren't supported any longer, but getty is +# `smart' about them by default. +# +# Parity defaults to even, but the Pc entry and all the `std' entries +# specify no parity. The different parities are: +# (none): same as ep for getty. login will use terminal as is. +# ep: getty will use raw mode (cs8 -parenb) (unless rw is set) and +# fake parity. login will use even parity (cs7 parenb -parodd). +# op: same as ep except odd parity (cs7 parenb parodd) for login. +# getty will fake odd parity as well. +# ap: same as ep except -inpck instead of inpck for login. +# ap overrides op and ep. +# np: 1. don't fake parity in getty. The fake parity garbles +#characters on non-terminals (like pccons) that don't +#support parity. It would probably better for getty not to +#try to fake parity. It could just use cbreak mode so as +#not to force cs8 and let the hardware handle the parity. +#login has to be rely on the hardware anyway. +# 2. set cs8 -parenb -istrip -inpck. +# ep:op: same as ap. +# +default:\ + :cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\ + :if=/etc/issue: + +# +# Fixed speed entries +# +# The "std.NNN" names are known to the special case +# portselector code in getty, however they can +# be assigned to any table desired. +# The "NNN-baud" names are known to the special case +# autobaud code in getty, and likewise can +# be assigned to any table desired (hopefully the same speed). +# +std:\ + :np:sp#0: +a|std.110|110-baud:\ + :np:nd#1:cd#1:uc:sp#110: +b|std.134|134.5-baud:\ + :np:nd#1:cd#2:ff#1:td#1:sp#134:ht:nl: +1|std.150|150-baud:\ + :np:nd#1:cd#2:td#1:fd#1:sp#150:ht:nl:lm=\E\72\6\6\17login\72 : +c|std.300|300-baud:\ + :np:nd#1:cd#1:sp#300: +d|std.600|600-baud:\ + :np:nd#1:cd#1:sp#600: +f|std.1200|1200-baud:\ + :np:fd#1:sp#1200: +6|std.2400|2400-baud:\ + :np:sp#2400: +7|std.4800|4800-baud:\ + :np:sp#4800: +2|std.9600|9600-baud:\ + :np:sp#9600: +g|std.19200|19200-baud:\ + :np:sp#19200: +std.38400|38400-baud:\ + :np:sp#38400: +std.57600|57600-baud:\ + :np:sp#57600: +std.115200|115200-baud:\ + :np:sp#115200: +std.230400|230400-baud:\ + :np:sp#230400: + +# +# Entry specifying explicit device settings. See termios(4) and +# /usr/include/termios.h, too. The entry forces the tty into +# CLOCAL mode (so no DCD is required), and uses Xon/Xoff
svn commit: r338454 - in head: etc etc/etc.aarch64 etc/etc.amd64 etc/etc.arm etc/etc.i386 etc/etc.mips etc/etc.powerpc etc/etc.riscv etc/etc.sparc64 sbin/init
Author: brd
Date: Tue Sep 4 15:48:13 2018
New Revision: 338454
URL: https://svnweb.freebsd.org/changeset/base/338454
Log:
Move etc/ttys to sbin/init/.
And simplify this a little by flattening the directory structure.
Approved by: re (gjb), will (mentor)
Differential Revision:https://reviews.freebsd.org/D16955
Added:
head/sbin/init/ttys.aarch64
- copied unchanged from r338453, head/etc/etc.aarch64/ttys
head/sbin/init/ttys.amd64
- copied unchanged from r338453, head/etc/etc.amd64/ttys
head/sbin/init/ttys.arm
- copied unchanged from r338453, head/etc/etc.arm/ttys
head/sbin/init/ttys.i386
- copied unchanged from r338453, head/etc/etc.i386/ttys
head/sbin/init/ttys.mips
- copied unchanged from r338453, head/etc/etc.mips/ttys
head/sbin/init/ttys.powerpc
- copied unchanged from r338453, head/etc/etc.powerpc/ttys
head/sbin/init/ttys.riscv
- copied unchanged from r338453, head/etc/etc.riscv/ttys
head/sbin/init/ttys.sparc64
- copied unchanged from r338453, head/etc/etc.sparc64/ttys
Deleted:
head/etc/etc.aarch64/
head/etc/etc.amd64/
head/etc/etc.arm/
head/etc/etc.i386/
head/etc/etc.mips/
head/etc/etc.powerpc/
head/etc/etc.riscv/
head/etc/etc.sparc64/
Modified:
head/etc/Makefile
head/sbin/init/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Sep 4 10:51:41 2018(r338453)
+++ head/etc/Makefile Tue Sep 4 15:48:13 2018(r338454)
@@ -35,16 +35,6 @@ BIN1=crontab \
rpc \
termcap.small
-.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
-BIN1+= etc.${MACHINE}/ttys
-.elif exists(${.CURDIR}/etc.${MACHINE_ARCH}/ttys)
-BIN1+= etc.${MACHINE_ARCH}/ttys
-.elif exists(${.CURDIR}/etc.${MACHINE_CPUARCH}/ttys)
-BIN1+= etc.${MACHINE_CPUARCH}/ttys
-.else
-.error etc.MACHINE/ttys missing
-.endif
-
# NB: keep these sorted by MK_* knobs
.if ${MK_AMD} != "no"
Modified: head/sbin/init/Makefile
==
--- head/sbin/init/Makefile Tue Sep 4 10:51:41 2018(r338453)
+++ head/sbin/init/Makefile Tue Sep 4 15:48:13 2018(r338454)
@@ -1,7 +1,7 @@
# @(#)Makefile8.1 (Berkeley) 7/19/93
# $FreeBSD$
-CONFGROUPS=CONFETC CONFETCEXEC CONFETCDEFAULTS
+CONFGROUPS=CONFETC CONFETCEXEC CONFETCDEFAULTS CONFTTYS
CONFETCDIR=/etc
CONFETC= network.subr rc rc.initdiskless rc.subr rc.shutdown
CONFETCMODE= 644
@@ -18,6 +18,17 @@ PRECIOUSPROG=
INSTALLFLAGS=-b -B.bak
CFLAGS+=-DDEBUGSHELL -DSECURE -DLOGIN_CAP -DCOMPAT_SYSV_INIT
LIBADD=util crypt
+
+CONFTTYSNAME= ttys
+.if exists(${.CURDIR}/ttys.${MACHINE})
+CONFTTYS+= ttys.${MACHINE}
+.elif exists(${.CURDIR}/ttys.${MACHINE_ARCH})
+CONFTTYS+= ttys.${MACHINE_ARCH}
+.elif exists(${.CURDIR}/ttys.${MACHINE_CPUARCH})
+CONFTTYS+= ttys.${MACHINE_CPUARCH}
+.else
+.error MACHINE.ttys missing
+.endif
# Needed for getmntopts.c
MOUNT= ${SRCTOP}/sbin/mount
Copied: head/sbin/init/ttys.aarch64 (from r338453, head/etc/etc.aarch64/ttys)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/init/ttys.aarch64 Tue Sep 4 15:48:13 2018(r338454, copy
of r338453, head/etc/etc.aarch64/ttys)
@@ -0,0 +1,49 @@
+#
+# $FreeBSD$
+# @(#)ttys5.1 (Berkeley) 4/17/89
+#
+# This file specifies various information about terminals on the system.
+# It is used by several different programs. Common entries for the
+# various columns include:
+#
+# name The name of the terminal device.
+#
+# getty The program to start running on the terminal. Typically a
+# getty program, as the name implies. Other common entries
+# include none, when no getty is needed, and xdm, to start the
+# X Window System.
+#
+# type The initial terminal type for this port. For hardwired
+# terminal lines, this will contain the type of terminal used.
+# For virtual consoles, the correct type is typically xterm.
+# Other common values include dialup for incoming modem ports, and
+# unknown when the terminal type cannot be predetermined.
+#
+# status Must be on or off. If on, init will run the getty program on
+#the specified port. If the word "secure" appears, this tty
+#allows root login.
+#
+# name getty typestatus comments
+#
+# If console is marked "insecure", then init will ask for the root password
+# when going to single-user mode.
+consolenoneunknown off secure
+#
+ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure
+# Virtual terminals
+ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure
+ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure
+ttyv3 "/usr/libexec/getty Pc" xterm
svn commit: r338429 - head/usr.sbin/periodic
Author: brd Date: Sun Sep 2 15:53:56 2018 New Revision: 338429 URL: https://svnweb.freebsd.org/changeset/base/338429 Log: Move defaults/periodic.conf back to a config file. Ths prevents etcupdate and mergemaster from deleting it for now. Approved by: re (rgrimes), will (mentor) Differential Revision:https://reviews.freebsd.org/D16975 Modified: head/usr.sbin/periodic/Makefile Modified: head/usr.sbin/periodic/Makefile == --- head/usr.sbin/periodic/Makefile Sun Sep 2 15:42:37 2018 (r338428) +++ head/usr.sbin/periodic/Makefile Sun Sep 2 15:53:56 2018 (r338429) @@ -1,7 +1,7 @@ # $FreeBSD$ -FILES= periodic.conf -FILESDIR= /etc/defaults +CONFS= periodic.conf +CONFSDIR= /etc/defaults SCRIPTS=periodic.sh MAN= periodic.8 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338399 - in head: etc usr.bin/login
Author: brd
Date: Thu Aug 30 15:52:03 2018
New Revision: 338399
URL: https://svnweb.freebsd.org/changeset/base/338399
Log:
Move fbtab, login.conf, and motd to usr.bin/login/
Approved by: Approved by: re (gjb), bapt (mentor), will (mentor)
Differential Revision:https://reviews.freebsd.org/D16947
Added:
head/usr.bin/login/fbtab
- copied unchanged from r338398, head/etc/fbtab
head/usr.bin/login/login.conf
- copied unchanged from r338398, head/etc/login.conf
head/usr.bin/login/motd
- copied unchanged from r338398, head/etc/motd
Deleted:
head/etc/fbtab
head/etc/login.conf
head/etc/motd
Modified:
head/etc/Makefile
head/usr.bin/login/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Thu Aug 30 14:32:47 2018(r338398)
+++ head/etc/Makefile Thu Aug 30 15:52:03 2018(r338399)
@@ -15,7 +15,6 @@ SUBDIR+=sendmail
BIN1= crontab \
dhclient.conf \
disktab \
- fbtab \
gettytab \
group \
hosts \
@@ -24,9 +23,7 @@ BIN1= crontab \
libalias.conf \
libmap.conf \
login.access \
- login.conf \
mac.conf \
- motd \
netconfig \
networks \
nsswitch.conf \
@@ -117,7 +114,6 @@ distribution:
cd ${.CURDIR}; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \
- cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
@@ -127,7 +123,6 @@ distribution:
pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
.if defined(NO_ROOT)
( \
- echo "./etc/login.conf.db type=file mode=0644 uname=root
gname=wheel"; \
echo "./etc/passwd type=file mode=0644 uname=root gname=wheel";
\
echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel";
\
echo "./etc/spwd.db type=file mode=0600 uname=root
gname=wheel"; \
Modified: head/usr.bin/login/Makefile
==
--- head/usr.bin/login/Makefile Thu Aug 30 14:32:47 2018(r338398)
+++ head/usr.bin/login/Makefile Thu Aug 30 15:52:03 2018(r338399)
@@ -3,6 +3,7 @@
.include
+CONFS= fbtab login.conf motd
PROG= login
SRCS= login.c login_fbtab.c
CFLAGS+=-DLOGALL
@@ -20,6 +21,14 @@ LIBADD+= bsm
BINOWN=root
BINMODE=4555
PRECIOUSPROG=
+.endif
+
+.include
+afterinstallconfig:
+ cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf
+.if defined(NO_ROOT) && defined(METALOG)
+ echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel" |
\
+ cat -l >> ${METALOG}
.endif
.include
Copied: head/usr.bin/login/fbtab (from r338398, head/etc/fbtab)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/login/fbtabThu Aug 30 15:52:03 2018(r338399, copy
of r338398, head/etc/fbtab)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+#
+#/dev/ttyv00600/dev/console
+#/dev/ttyv00600/dev/pcaudio:/dev/pcaudioctl
Copied: head/usr.bin/login/login.conf (from r338398, head/etc/login.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/login/login.conf Thu Aug 30 15:52:03 2018
(r338399, copy of r338398, head/etc/login.conf)
@@ -0,0 +1,322 @@
+# login.conf - login class capabilities database.
+#
+# Remember to rebuild the database after each change to this file:
+#
+# cap_mkdb /etc/login.conf
+#
+# This file controls resource limits, accounting limits and
+# default user environment settings.
+#
+# $FreeBSD$
+#
+
+# Default settings effectively disable resource limits, see the
+# examples below for a starting point to enable them.
+
+# defaults
+# These settings are used by login(1) by default for classless users
+# Note that entries like "cputime" set both "cputime-cur" and "cputime-max"
+#
+# Note that since a colon ':' is used to separate capability entries,
+# a \c escape sequence must be used to embed a literal colon in the
+# value or name of a capability (see the ``CGETNUM AND CGETSTR SYNTAX
+# AND SEMANTICS'' section of getcap(3) for more escape sequences).
+
+default:\
+ :passwd_format=sha512:\
+ :copyright=/etc/COPYRIGHT:\
+ :welcome=/etc/motd:\
+ :setenv=MAIL=/var/mail/$,BLOCKSIZE=K:\
+ :path=/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin
~/bin:\
+ :nologin=/var/run/nologin:\
+ :cputime=unlimited:\
+ :datasize=unlimited:\
+ :stacksize=unlimited:\
+ :memorylocked=64K:\
+ :memoryuse=unlimited:\
+
Re: svn commit: r338374 - in head: bin/csh bin/sh etc etc/root
On Thu, Aug 30, 2018, at 5:39 AM, O. Hartmann wrote:
> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA512
>
> Am Wed, 29 Aug 2018 16:59:19 +0000 (UTC)
> Brad Davis schrieb:
>
> > Author: brd
> > Date: Wed Aug 29 16:59:19 2018
> > New Revision: 338374
> > URL: https://svnweb.freebsd.org/changeset/base/338374
> >
> > Log:
> > Finish moving dot.cshrc and dot.profile to bin/csh/ and bin/sh/.
> >
> > Approved by: re (gjb), will (mentor)
> > Differential Revision:https://reviews.freebsd.org/D16770
> >
> > Added:
> > head/bin/csh/dot.cshrc
> > - copied unchanged from r338373, head/etc/root/dot.cshrc
> > head/bin/sh/dot.profile
> > - copied unchanged from r338373, head/etc/root/dot.profile
> > Deleted:
> > head/etc/root/dot.cshrc
> > head/etc/root/dot.profile
> > Modified:
> > head/bin/csh/Makefile
> > head/bin/sh/Makefile
> > head/etc/Makefile
> >
> > Modified: head/bin/csh/Makefile
> > ==
> > --- head/bin/csh/Makefile Wed Aug 29 16:21:34 2018(r338373)
> > +++ head/bin/csh/Makefile Wed Aug 29 16:59:19 2018(r338374)
> > @@ -10,8 +10,9 @@
> >
> > CONFGROUPS=ETC ROOT
> > ETC= csh.cshrc csh.login csh.logout
> > -ROOT= dot.login
> > +ROOT= dot.cshrc dot.login
> > ROOTDIR= /root
> > +ROOTNAME_dot.cshrc=.cshrc
> > ROOTNAME_dot.login=.login
> > PACKAGE=runtime
> > TCSHDIR= ${SRCTOP}/contrib/tcsh
> > @@ -152,5 +153,11 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h s
> > sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
> > sort >> ${.TARGET}
> > @echo '#endif /* _h_tc_const */' >> ${.TARGET}
> > +
> > +beforeinstallconfig:
> > + rm -f ${DESTDIR}/.cshrc
> > +
> > +afterinstallconfig:
> > + ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
> >
> > .include
> >
> > Copied: head/bin/csh/dot.cshrc (from r338373, head/etc/root/dot.cshrc)
> > ==
> > --- /dev/null 00:00:00 1970 (empty, because file is newly added)
> > +++ head/bin/csh/dot.cshrc Wed Aug 29 16:59:19 2018(r338374, copy
> > of
> > r338373, head/etc/root/dot.cshrc) @@ -0,0 +1,43 @@
> > +# $FreeBSD$
> > +#
> > +# .cshrc - csh resource script, read at beginning of execution by each
> > shell
> > +#
> > +# see also csh(1), environ(7).
> > +# more examples available at /usr/share/examples/csh/
> > +#
> > +
> > +alias hhistory 25
> > +alias jjobs -l
> > +alias la ls -aF
> > +alias lf ls -FA
> > +alias ll ls -lAF
> > +
> > +# A righteous umask
> > +umask 22
> > +
> > +set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin
> > $HOME/bin)
> > +
> > +setenv EDITOR vi
> > +setenv PAGER less
> > +setenv BLOCKSIZE K
> > +
> > +if ($?prompt) then
> > + # An interactive shell -- set some stuff up
> > + set prompt = "%N@%m:%~ %# "
> > + set promptchars = "%#"
> > +
> > + set filec
> > + set history = 1000
> > + set savehist = (1000 merge)
> > + set autolist = ambiguous
> > + # Use history to aid expansion
> > + set autoexpand
> > + set autorehash
> > + set mail = (/var/mail/$USER)
> > + if ( $?tcsh ) then
> > + bindkey "^W" backward-delete-word
> > + bindkey -k up history-search-backward
> > + bindkey -k down history-search-forward
> > + endif
> > +
> > +endif
> >
> > Modified: head/bin/sh/Makefile
> > ==
> > --- head/bin/sh/MakefileWed Aug 29 16:21:34 2018(r338373)
> > +++ head/bin/sh/MakefileWed Aug 29 16:59:19 2018(r338374)
> > @@ -3,7 +3,9 @@
> >
> > .include
> >
> > -CONFS= profile
> > +CONFS= dot.profile profile
> > +CONFSDIR_dot.profile= /root
> > +CONFSNAME_dot.profile= .profile
> > PACKAGE=runtime
> > PROG= sh
> > INSTALLFLAGS= -S
> > @@ -60,5 +62,11 @@ token.h: mktokens
> >
> > HAS_TESTS=
> > SUBDIR.${MK_TESTS}+= tests
> > +
> > +beforeinstallconfig:
> > +
svn commit: r338374 - in head: bin/csh bin/sh etc etc/root
Author: brd
Date: Wed Aug 29 16:59:19 2018
New Revision: 338374
URL: https://svnweb.freebsd.org/changeset/base/338374
Log:
Finish moving dot.cshrc and dot.profile to bin/csh/ and bin/sh/.
Approved by: re (gjb), will (mentor)
Differential Revision:https://reviews.freebsd.org/D16770
Added:
head/bin/csh/dot.cshrc
- copied unchanged from r338373, head/etc/root/dot.cshrc
head/bin/sh/dot.profile
- copied unchanged from r338373, head/etc/root/dot.profile
Deleted:
head/etc/root/dot.cshrc
head/etc/root/dot.profile
Modified:
head/bin/csh/Makefile
head/bin/sh/Makefile
head/etc/Makefile
Modified: head/bin/csh/Makefile
==
--- head/bin/csh/Makefile Wed Aug 29 16:21:34 2018(r338373)
+++ head/bin/csh/Makefile Wed Aug 29 16:59:19 2018(r338374)
@@ -10,8 +10,9 @@
CONFGROUPS=ETC ROOT
ETC= csh.cshrc csh.login csh.logout
-ROOT= dot.login
+ROOT= dot.cshrc dot.login
ROOTDIR= /root
+ROOTNAME_dot.cshrc=.cshrc
ROOTNAME_dot.login=.login
PACKAGE=runtime
TCSHDIR= ${SRCTOP}/contrib/tcsh
@@ -152,5 +153,11 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h s
sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
sort >> ${.TARGET}
@echo '#endif /* _h_tc_const */' >> ${.TARGET}
+
+beforeinstallconfig:
+ rm -f ${DESTDIR}/.cshrc
+
+afterinstallconfig:
+ ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
.include
Copied: head/bin/csh/dot.cshrc (from r338373, head/etc/root/dot.cshrc)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/bin/csh/dot.cshrc Wed Aug 29 16:59:19 2018(r338374, copy
of r338373, head/etc/root/dot.cshrc)
@@ -0,0 +1,43 @@
+# $FreeBSD$
+#
+# .cshrc - csh resource script, read at beginning of execution by each shell
+#
+# see also csh(1), environ(7).
+# more examples available at /usr/share/examples/csh/
+#
+
+alias hhistory 25
+alias jjobs -l
+alias la ls -aF
+alias lf ls -FA
+alias ll ls -lAF
+
+# A righteous umask
+umask 22
+
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin
$HOME/bin)
+
+setenv EDITOR vi
+setenv PAGER less
+setenv BLOCKSIZE K
+
+if ($?prompt) then
+ # An interactive shell -- set some stuff up
+ set prompt = "%N@%m:%~ %# "
+ set promptchars = "%#"
+
+ set filec
+ set history = 1000
+ set savehist = (1000 merge)
+ set autolist = ambiguous
+ # Use history to aid expansion
+ set autoexpand
+ set autorehash
+ set mail = (/var/mail/$USER)
+ if ( $?tcsh ) then
+ bindkey "^W" backward-delete-word
+ bindkey -k up history-search-backward
+ bindkey -k down history-search-forward
+ endif
+
+endif
Modified: head/bin/sh/Makefile
==
--- head/bin/sh/MakefileWed Aug 29 16:21:34 2018(r338373)
+++ head/bin/sh/MakefileWed Aug 29 16:59:19 2018(r338374)
@@ -3,7 +3,9 @@
.include
-CONFS= profile
+CONFS= dot.profile profile
+CONFSDIR_dot.profile= /root
+CONFSNAME_dot.profile= .profile
PACKAGE=runtime
PROG= sh
INSTALLFLAGS= -S
@@ -60,5 +62,11 @@ token.h: mktokens
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
+
+beforeinstallconfig:
+ rm -f ${DESTDIR}/.profile
+
+afterinstallconfig:
+ ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
.include
Copied: head/bin/sh/dot.profile (from r338373, head/etc/root/dot.profile)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/bin/sh/dot.profile Wed Aug 29 16:59:19 2018(r338374, copy
of r338373, head/etc/root/dot.profile)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
+export PATH
+HOME=/root
+export HOME
+TERM=${TERM:-xterm}
+export TERM
+PAGER=less
+export PAGER
+
+# Query terminal size; useful for serial lines.
+if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
+
+# Uncomment to display a random cookie on each login.
+# if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune -s ; fi
Modified: head/etc/Makefile
==
--- head/etc/Makefile Wed Aug 29 16:21:34 2018(r338373)
+++ head/etc/Makefile Wed Aug 29 16:59:19 2018(r338374)
@@ -155,18 +155,6 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.k5login ${DESTDIR}/root/.k5login;
.endif
- cd ${.CURDIR}/root; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
-
svn commit: r338362 - head/bin/csh
Author: brd
Date: Tue Aug 28 22:51:45 2018
New Revision: 338362
URL: https://svnweb.freebsd.org/changeset/base/338362
Log:
Fix the install of /root/.login missed as part of r337849.
Approved by: re (rgrimes)
Modified:
head/bin/csh/Makefile
Modified: head/bin/csh/Makefile
==
--- head/bin/csh/Makefile Tue Aug 28 22:22:06 2018(r338361)
+++ head/bin/csh/Makefile Tue Aug 28 22:51:45 2018(r338362)
@@ -8,8 +8,11 @@
.include
-CONFGROUPS=ETC
+CONFGROUPS=ETC ROOT
ETC= csh.cshrc csh.login csh.logout
+ROOT= dot.login
+ROOTDIR= /root
+ROOTNAME_dot.login=.login
PACKAGE=runtime
TCSHDIR= ${SRCTOP}/contrib/tcsh
.PATH: ${TCSHDIR}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338361 - head/share/mk
Author: brd
Date: Tue Aug 28 22:22:06 2018
New Revision: 338361
URL: https://svnweb.freebsd.org/changeset/base/338361
Log:
Add beforeinstallconfig to bsd.confs.mk to enable running commands prior to
the installconfig target.
Approved by: re (rgrimes), bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D16874
Modified:
head/share/mk/bsd.confs.mk
Modified: head/share/mk/bsd.confs.mk
==
--- head/share/mk/bsd.confs.mk Tue Aug 28 21:09:19 2018(r338360)
+++ head/share/mk/bsd.confs.mk Tue Aug 28 22:22:06 2018(r338361)
@@ -29,8 +29,11 @@ all: buildconfig
. if !target(afterinstallconfig)
afterinstallconfig:
. endif
-installconfig: realinstallconfig afterinstallconfig
-.ORDER:realinstallconfig afterinstallconfig
+. if !target(beforeinstallconfig)
+beforeinstallconfig:
+. endif
+installconfig: beforeinstallconfig realinstallconfig afterinstallconfig
+.ORDER:beforeinstallconfig realinstallconfig afterinstallconfig
${group}OWN?= ${SHAREOWN}
${group}GRP?= ${SHAREGRP}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338320 - head/usr.sbin/bluetooth/hcsecd
Author: brd Date: Sun Aug 26 02:09:20 2018 New Revision: 338320 URL: https://svnweb.freebsd.org/changeset/base/338320 Log: Fix the install location of hcsecd.conf Submitted by: vangyzen Approved by: re (marius) Modified: head/usr.sbin/bluetooth/hcsecd/Makefile Modified: head/usr.sbin/bluetooth/hcsecd/Makefile == --- head/usr.sbin/bluetooth/hcsecd/Makefile Sat Aug 25 20:19:16 2018 (r338319) +++ head/usr.sbin/bluetooth/hcsecd/Makefile Sun Aug 26 02:09:20 2018 (r338320) @@ -2,6 +2,7 @@ # $FreeBSD$ CONFS= hcsecd.conf +CONFSDIR= /etc/bluetooth CONFSMODE_hcsecd.conf= 600 PROG= hcsecd MAN= hcsecd.8 hcsecd.conf.5 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338319 - head/usr.sbin/syslogd
Author: brd
Date: Sat Aug 25 20:19:16 2018
New Revision: 338319
URL: https://svnweb.freebsd.org/changeset/base/338319
Log:
Remove trailing slash in pathname so that valid METALOG is created in the
NO_ROOT case of make packages.
Submitted by: Dan McGregor
Approved by: re (rgrimes)
Modified:
head/usr.sbin/syslogd/Makefile
Modified: head/usr.sbin/syslogd/Makefile
==
--- head/usr.sbin/syslogd/Makefile Sat Aug 25 19:38:08 2018
(r338318)
+++ head/usr.sbin/syslogd/Makefile Sat Aug 25 20:19:16 2018
(r338319)
@@ -21,7 +21,7 @@ CFLAGS+= -DINET6
.endif
SYSLOGD_D=
-SYSLOGD_DDIR= /etc/syslog.d/
+SYSLOGD_DDIR= /etc/syslog.d
.if ${MK_FTP} != "no"
SYSLOGD_D+=ftp.conf
.endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r338212 - in head: etc usr.sbin/services_mkdb
On Wed, Aug 22, 2018, at 4:15 PM, Yuri Pankov wrote: > Brad Davis wrote: > > Author: brd > > Date: Wed Aug 22 21:22:40 2018 > > New Revision: 338212 > > URL: https://svnweb.freebsd.org/changeset/base/338212 > > > > Log: > >Move services to usr.sbin/services_mkdb/ > > > >This is pkgbase related as it switches to CONFS to properly tag > >this as a> >config file. > > > >Approved by: will (mentor) > >Differential Revision: https://reviews.freebsd.org/D16848 > > > > Added: > >head/usr.sbin/services_mkdb/services > > - copied unchanged from r338211, head/etc/services > > Deleted: > >head/etc/services > > Modified: > >head/etc/Makefile > >head/usr.sbin/services_mkdb/Makefile > > This one is interesting. Strictly speaking, /etc/services > existence did> not rely on SERVICESDB option, and only database in > /var/db/services.db> did -- are there really no consumers for /etc/services > as is? > It still does not rely on the SERVICESDB option. Only services.db does. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338212 - in head: etc usr.sbin/services_mkdb
Author: brd
Date: Wed Aug 22 21:22:40 2018
New Revision: 338212
URL: https://svnweb.freebsd.org/changeset/base/338212
Log:
Move services to usr.sbin/services_mkdb/
This is pkgbase related as it switches to CONFS to properly tag this as a
config file.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16848
Added:
head/usr.sbin/services_mkdb/services
- copied unchanged from r338211, head/etc/services
Deleted:
head/etc/services
Modified:
head/etc/Makefile
head/usr.sbin/services_mkdb/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Wed Aug 22 20:44:30 2018(r338211)
+++ head/etc/Makefile Wed Aug 22 21:22:40 2018(r338212)
@@ -36,7 +36,6 @@ BIN1= crontab \
rc.firewall \
remote \
rpc \
- services \
termcap.small
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
@@ -122,12 +121,6 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
-.if ${MK_SERVICESDB} != "no"
- cd ${.CURDIR}; \
- services_mkdb ${CAP_MKDB_ENDIAN} -q -o
${DESTDIR}/var/db/services.db \
- ${DESTDIR}/etc/services;
-.endif
-
.if ${MK_TCSH} == "no"
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
.endif
@@ -138,7 +131,6 @@ distribution:
echo "./etc/passwd type=file mode=0644 uname=root gname=wheel";
\
echo "./etc/pwd.db type=file mode=0644 uname=root gname=wheel";
\
echo "./etc/spwd.db type=file mode=0600 uname=root
gname=wheel"; \
- echo "./var/db/services.db type=file mode=0644 uname=root
gname=wheel"; \
) | ${METALOG.add}
.endif
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
Modified: head/usr.sbin/services_mkdb/Makefile
==
--- head/usr.sbin/services_mkdb/MakefileWed Aug 22 20:44:30 2018
(r338211)
+++ head/usr.sbin/services_mkdb/MakefileWed Aug 22 21:22:40 2018
(r338212)
@@ -1,7 +1,20 @@
# $FreeBSD$
+CONFS= services
PROG= services_mkdb
MAN= services_mkdb.8
SRCS= services_mkdb.c uniq.c extern.h
+
+.include
+.include
+.if ${MK_SERVICESDB} != "no"
+afterinstallconfig:
+ services_mkdb ${CAP_MKDB_ENDIAN} -q -o ${DESTDIR}/var/db/services.db \
+ ${DESTDIR}/etc/services
+.if defined(NO_ROOT) && defined(METALOG)
+ echo "./var/db/services.db type=file mode=0644 uname=root gname=wheel"
| \
+ cat -l >> ${METALOG}
+.endif
+.endif
.include
Copied: head/usr.sbin/services_mkdb/services (from r338211, head/etc/services)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/services_mkdb/servicesWed Aug 22 21:22:40 2018
(r338212, copy of r338211, head/etc/services)
@@ -0,0 +1,2498 @@
+#
+# Network services, Internet style
+#
+# Note that it is presently the policy of IANA to assign a single well-known
+# port number for both TCP and UDP; hence, most entries here have two entries
+# even if the protocol doesn't support UDP operations.
+#
+# The latest IANA port assignments can be gotten from
+#
+# http://www.iana.org/assignments/port-numbers
+#
+# The Well Known Ports are those from 0 through 1023.
+# The Registered Ports are those from 1024 through 49151
+# The Dynamic and/or Private Ports are those from 49152 through 65535
+#
+# Kerberos services are for Kerberos v4, and are unofficial. Sites running
+# v5 should uncomment v5 entries and comment v4 entries.
+#
+# $FreeBSD$
+# From: @(#)services 5.8 (Berkeley) 5/9/91
+#
+# WELL KNOWN PORT NUMBERS
+#
+rtmp 1/ddp#Routing Table Maintenance Protocol
+tcpmux 1/tcp#TCP Port Service Multiplexer
+tcpmux 1/udp#TCP Port Service Multiplexer
+nbp 2/ddp#Name Binding Protocol
+compressnet 2/tcp#Management Utility
+compressnet 2/udp#Management Utility
+compressnet 3/tcp#Compression Process
+compressnet 3/udp#Compression Process
+echo 4/ddp#AppleTalk Echo Protocol
+rje 5/tcp#Remote Job Entry
+rje 5/udp#Remote Job Entry
+zip 6/ddp#Zone Information Protocol
+echo 7/sctp
+echo 7/tcp
+echo 7/udp
+discard 9/sctp sink null
+discard 9/tcpsink null
+discard 9/udpsink null
+systat 11/tcpusers#Active Users
+systat 11/udpusers#Active Users
+daytime 13/sctp
+daytime 13/tcp
+daytime 13/udp
+qotd17/tcpquote#Quote of the Day
+qotd
svn commit: r338204 - in head: etc etc/defaults sbin/devfs
Author: brd
Date: Wed Aug 22 15:55:23 2018
New Revision: 338204
URL: https://svnweb.freebsd.org/changeset/base/338204
Log:
Move all devfs related files to sbin/devfs/
This is related to pkgbase as it uses CONFS to properly tag these as config
files.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16785
Added:
head/sbin/devfs/devfs.conf
- copied unchanged from r338203, head/etc/devfs.conf
head/sbin/devfs/devfs.rules
- copied unchanged from r338203, head/etc/defaults/devfs.rules
Deleted:
head/etc/defaults/
head/etc/devfs.conf
Modified:
head/etc/Makefile
head/sbin/devfs/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Wed Aug 22 15:29:54 2018(r338203)
+++ head/etc/Makefile Wed Aug 22 15:55:23 2018(r338204)
@@ -13,7 +13,6 @@ SUBDIR+=sendmail
.endif
BIN1= crontab \
- devfs.conf \
dhclient.conf \
disktab \
fbtab \
@@ -142,7 +141,6 @@ distribution:
echo "./var/db/services.db type=file mode=0644 uname=root
gname=wheel"; \
) | ${METALOG.add}
.endif
- ${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
@@ -281,15 +279,10 @@ distrib-dirs: ${MTREES:N/*} distrib-cleanup .PHONY
done
.endif
-etc-examples-install: ${META_DEPS}
+etc-examples: ${META_DEPS}
cd ${.CURDIR}; ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m 444 \
${BIN1} ${BIN2} nsmb.conf opieaccess \
${DESTDIR}${SHAREDIR}/examples/etc
-
-etc-examples: etc-examples-install
- ${_+_}cd ${.CURDIR}/defaults; \
- ${MAKE} ${${MK_STAGING} == "yes":?all:install} \
- DESTDIR=${DESTDIR}${SHAREDIR}/examples
.include
Modified: head/sbin/devfs/Makefile
==
--- head/sbin/devfs/MakefileWed Aug 22 15:29:54 2018(r338203)
+++ head/sbin/devfs/MakefileWed Aug 22 15:55:23 2018(r338204)
@@ -1,5 +1,8 @@
# $FreeBSD$
+CONFS= devfs.conf devfs.rules
+CONFSDIR_devfs.rules= /etc/defaults
+CONFSMODE_devfs.rules= 600
PACKAGE=runtime
PROG= devfs
SRCS= devfs.c rule.c
Copied: head/sbin/devfs/devfs.conf (from r338203, head/etc/devfs.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/devfs/devfs.conf Wed Aug 22 15:55:23 2018(r338204, copy
of r338203, head/etc/devfs.conf)
@@ -0,0 +1,43 @@
+# Copyright (c) 2003 The FreeBSD Project
+# 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$
+
+# These are examples of how to configure devices using /etc/rc.d/devfs.
+# The first parameter is always the action to take, the second is always the
+# existing device created by devfs, and the last is what you want to change.
+# The name of the action is only significant to the first unique character.
+#
+# Examples:
+
+# Commonly used by many ports
+#link cd0 cdrom
+#link cd0 dvd
+
+# Allow a user in the wheel group to query the smb0 device
+#perm smb00660
+
+# Allow members of group operator to cat things to the speaker
+#own speaker root:operator
+#perm speaker 0660
Copied: head/sbin/devfs/devfs.rules (from r338203,
head/etc/defaults/devfs.rules)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++
svn commit: r338155 - in head: etc etc/bluetooth etc/defaults lib/libbluetooth usr.sbin/bluetooth/hccontrol usr.sbin/bluetooth/hcsecd
Author: brd
Date: Tue Aug 21 19:28:53 2018
New Revision: 338155
URL: https://svnweb.freebsd.org/changeset/base/338155
Log:
Move all bluetooth related config files out of etc
This helps with pkgbase by switching to CONFS so they are properly tagged as
config files.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16833
Added:
head/lib/libbluetooth/hosts
- copied unchanged from r338154, head/etc/bluetooth/hosts
head/lib/libbluetooth/protocols
- copied unchanged from r338154, head/etc/bluetooth/protocols
head/usr.sbin/bluetooth/hccontrol/bluetooth.device.conf
- copied unchanged from r338154, head/etc/defaults/bluetooth.device.conf
Replaced:
head/usr.sbin/bluetooth/hcsecd/hcsecd.conf
- copied unchanged from r338154, head/etc/bluetooth/hcsecd.conf
Deleted:
head/etc/bluetooth/
head/etc/defaults/bluetooth.device.conf
Modified:
head/etc/Makefile
head/etc/defaults/Makefile
head/lib/libbluetooth/Makefile
head/usr.sbin/bluetooth/hccontrol/Makefile
head/usr.sbin/bluetooth/hcsecd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Aug 21 19:17:35 2018(r338154)
+++ head/etc/Makefile Tue Aug 21 19:28:53 2018(r338155)
@@ -142,9 +142,6 @@ distribution:
echo "./var/db/services.db type=file mode=0644 uname=root
gname=wheel"; \
) | ${METALOG.add}
.endif
-.if ${MK_BLUETOOTH} != "no"
- ${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
-.endif
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
Modified: head/etc/defaults/Makefile
==
--- head/etc/defaults/Makefile Tue Aug 21 19:17:35 2018(r338154)
+++ head/etc/defaults/Makefile Tue Aug 21 19:28:53 2018(r338155)
@@ -5,8 +5,4 @@
FILES= devfs.rules
FILESDIR= /etc/defaults
-.if ${MK_BLUETOOTH} != "no"
-FILES+=bluetooth.device.conf
-.endif
-
.include
Modified: head/lib/libbluetooth/Makefile
==
--- head/lib/libbluetooth/Makefile Tue Aug 21 19:17:35 2018
(r338154)
+++ head/lib/libbluetooth/Makefile Tue Aug 21 19:28:53 2018
(r338155)
@@ -2,6 +2,9 @@
# $FreeBSD$
PACKAGE= lib${LIB}
+CONFS= hosts protocols
+CONFSDIR= /etc/bluetooth
+CONFSMODE_protocols= 444
LIB= bluetooth
MAN= bluetooth.3
Copied: head/lib/libbluetooth/hosts (from r338154, head/etc/bluetooth/hosts)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libbluetooth/hosts Tue Aug 21 19:28:53 2018(r338155, copy
of r338154, head/etc/bluetooth/hosts)
@@ -0,0 +1,10 @@
+# $Id: hosts,v 1.1 2003/05/21 17:48:40 max Exp $
+# $FreeBSD$
+#
+# Bluetooth Host Database
+#
+# This file should contain the Bluetooth addresses and aliases for hosts.
+#
+# BD_ADDR Name [ alias0 alias1 ... ]
+
+# 00:11:22:33:44:55phone
Copied: head/lib/libbluetooth/protocols (from r338154,
head/etc/bluetooth/protocols)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libbluetooth/protocols Tue Aug 21 19:28:53 2018
(r338155, copy of r338154, head/etc/bluetooth/protocols)
@@ -0,0 +1,22 @@
+# $Id: protocols,v 1.2 2003/05/21 22:17:14 max Exp $
+# $FreeBSD$
+#
+# Bluetooth Protocol/Service Multiplexor (PSM) names and numbers
+#
+# See also
+# https://www.bluetooth.org/foundry/assignnumb/document/assigned_numbers
+#
+# Protocol PSM Alias Reference
+
+sdp 1 SDP # Service Discovery Protocol
+rfcomm 3 RFCOMM# RFCOMM with TS 07.10
+tcs-bin 5 TCS-BIN # Telephony Control Specification
+tcs-bin-cordless 7 TCS-BIN-CORDLESS # Telephony Control Specification
+bnep 15 BNEP # Bluetooth Network Encapsulation Protocol
+hid-control 17 HID-Control # Human Interface Device (control)
+hid-interrupt19 HID-Interrupt # Human Interface Device (interrupt)
+upnp 21 UPnP # See ESDP, Bluetooth SIG
+avctp23 AVCTP # Audio/Video Control Transport Protocol
+avdtp25 AVDTP # Audio/Video Distribution Transport
Protocol
+udi-c-plane 29 UDI-C-Plane # Unrestricted Digital Information Profile
+
Modified: head/usr.sbin/bluetooth/hccontrol/Makefile
==
--- head/usr.sbin/bluetooth/hccontrol/Makefile Tue Aug 21 19:17:35 2018
(r338154)
+++ head/usr.sbin/bluetooth/hccontrol/Makefile Tue Aug 21
svn commit: r338147 - in head: etc libexec/ftpd
Author: brd
Date: Tue Aug 21 17:07:52 2018
New Revision: 338147
URL: https://svnweb.freebsd.org/changeset/base/338147
Log:
Move ftpusers to libexec/ftpd/
Thsi helps with pkgbase by switching to CONFS so that ftpusers will be
properly tagged as a config file.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16787
Added:
head/libexec/ftpd/ftpusers
- copied unchanged from r338146, head/etc/ftpusers
Deleted:
head/etc/ftpusers
Modified:
head/etc/Makefile
head/libexec/ftpd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Aug 21 17:01:47 2018(r338146)
+++ head/etc/Makefile Tue Aug 21 17:07:52 2018(r338147)
@@ -56,10 +56,6 @@ BIN1+= etc.${MACHINE_CPUARCH}/ttys
BIN1+= amd.map
.endif
-.if ${MK_FTP} != "no"
-BIN1+= ftpusers
-.endif
-
.if ${MK_LOCATE} != "no"
BIN1+= ${SRCTOP}/usr.bin/locate/locate/locate.rc
.endif
Modified: head/libexec/ftpd/Makefile
==
--- head/libexec/ftpd/Makefile Tue Aug 21 17:01:47 2018(r338146)
+++ head/libexec/ftpd/Makefile Tue Aug 21 17:07:52 2018(r338147)
@@ -3,6 +3,7 @@
.include
+CONFS= ftpusers
PROG= ftpd
MAN= ftpd.8 ftpchroot.5
SRCS= ftpd.c ftpcmd.y logwtmp.c popen.c
Copied: head/libexec/ftpd/ftpusers (from r338146, head/etc/ftpusers)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/libexec/ftpd/ftpusers Tue Aug 21 17:07:52 2018(r338147, copy
of r338146, head/etc/ftpusers)
@@ -0,0 +1,29 @@
+# $FreeBSD$
+#
+# list of users disallowed any ftp access.
+# read by ftpd(8).
+root
+toor
+daemon
+operator
+bin
+tty
+kmem
+games
+news
+ntpd
+man
+sshd
+smmsp
+mailnull
+bind
+unbound
+proxy
+_pflogd
+_dhcp
+uucp
+pop
+auditdistd
+www
+hast
+nobody
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r338146 - in head: etc etc/syslog.d usr.sbin/syslogd
Author: brd
Date: Tue Aug 21 17:01:47 2018
New Revision: 338146
URL: https://svnweb.freebsd.org/changeset/base/338146
Log:
Move all syslogd related configs to usr.sbin/syslogd/
This helps with pkgbase as it switches these to use CONFS which properly tags
them as config files.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16783
Added:
head/usr.sbin/syslogd/ftp.conf
- copied unchanged from r338145, head/etc/syslog.d/ftp.conf
head/usr.sbin/syslogd/lpr.conf
- copied unchanged from r338145, head/etc/syslog.d/lpr.conf
head/usr.sbin/syslogd/ppp.conf
- copied unchanged from r338145, head/etc/syslog.d/ppp.conf
head/usr.sbin/syslogd/syslog.conf
- copied unchanged from r338145, head/etc/syslog.conf
Deleted:
head/etc/syslog.conf
head/etc/syslog.d/
Modified:
head/etc/Makefile
head/usr.sbin/syslogd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Aug 21 16:52:14 2018(r338145)
+++ head/etc/Makefile Tue Aug 21 17:01:47 2018(r338146)
@@ -38,7 +38,6 @@ BIN1= crontab \
remote \
rpc \
services \
- syslog.conf \
termcap.small
.if exists(${.CURDIR}/etc.${MACHINE}/ttys)
@@ -154,7 +153,6 @@ distribution:
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
- ${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
.if ${MK_UNBOUND} != "no"
Modified: head/usr.sbin/syslogd/Makefile
==
--- head/usr.sbin/syslogd/Makefile Tue Aug 21 16:52:14 2018
(r338145)
+++ head/usr.sbin/syslogd/Makefile Tue Aug 21 17:01:47 2018
(r338146)
@@ -5,6 +5,8 @@
.PATH: ${SRCTOP}/usr.bin/wall
+CONFGROUPS=CONFS SYSLOGD_D
+CONFS= syslog.conf
PROG= syslogd
MAN= syslog.conf.5 syslogd.8
SRCS= syslogd.c ttymsg.c
@@ -16,6 +18,20 @@ CFLAGS+= -DINET
.endif
.if ${MK_INET6_SUPPORT} != "no"
CFLAGS+= -DINET6
+.endif
+
+SYSLOGD_D=
+SYSLOGD_DDIR= /etc/syslog.d/
+.if ${MK_FTP} != "no"
+SYSLOGD_D+=ftp.conf
+.endif
+
+.if ${MK_LPR} != "no"
+SYSLOGD_D+=lpr.conf
+.endif
+
+.if ${MK_PPP} != "no"
+SYSLOGD_D+=ppp.conf
.endif
CFLAGS+= -I${SRCTOP}/usr.bin/wall
Copied: head/usr.sbin/syslogd/ftp.conf (from r338145,
head/etc/syslog.d/ftp.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/syslogd/ftp.conf Tue Aug 21 17:01:47 2018
(r338146, copy of r338145, head/etc/syslog.d/ftp.conf)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+ftp.info /var/log/xferlog
Copied: head/usr.sbin/syslogd/lpr.conf (from r338145,
head/etc/syslog.d/lpr.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/syslogd/lpr.conf Tue Aug 21 17:01:47 2018
(r338146, copy of r338145, head/etc/syslog.d/lpr.conf)
@@ -0,0 +1,2 @@
+# $FreeBSD$
+lpr.info /var/log/lpd-errs
Copied: head/usr.sbin/syslogd/ppp.conf (from r338145,
head/etc/syslog.d/ppp.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/syslogd/ppp.conf Tue Aug 21 17:01:47 2018
(r338146, copy of r338145, head/etc/syslog.d/ppp.conf)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+!ppp
+*.*/var/log/ppp.log
Copied: head/usr.sbin/syslogd/syslog.conf (from r338145, head/etc/syslog.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/syslogd/syslog.conf Tue Aug 21 17:01:47 2018
(r338146, copy of r338145, head/etc/syslog.conf)
@@ -0,0 +1,34 @@
+# $FreeBSD$
+#
+# Spaces ARE valid field separators in this file. However,
+# other *nix-like systems still insist on using tabs as field
+# separators. If you are sharing this file between systems, you
+# may want to use only tabs as field separators here.
+# Consult the syslog.conf(5) manpage.
+*.err;kern.warning;auth.notice;mail.crit /dev/console
+*.notice;authpriv.none;kern.debug;lpr.info;mail.crit;news.err
/var/log/messages
+security.* /var/log/security
+auth.info;authpriv.info/var/log/auth.log
+mail.info /var/log/maillog
+cron.* /var/log/cron
svn commit: r338144 - in head: etc etc/devd sbin/devd
Author: brd
Date: Tue Aug 21 16:51:45 2018
New Revision: 338144
URL: https://svnweb.freebsd.org/changeset/base/338144
Log:
Move all devd related configs to sbin/devd/
This helps with pkgbase as it switches these to using CONFS so they are
properly tagged as config files.
Approved by: will (mentor), imp
Differential Revision:https://reviews.freebsd.org/D16781
Added:
head/sbin/devd/apple.conf
- copied unchanged from r338143, head/etc/devd/apple.conf
head/sbin/devd/asus.conf
- copied unchanged from r338143, head/etc/devd/asus.conf
head/sbin/devd/devd.conf
- copied unchanged from r338143, head/etc/devd.conf
head/sbin/devd/devmatch.conf
- copied unchanged from r338143, head/etc/devd/devmatch.conf
head/sbin/devd/hyperv.conf
- copied unchanged from r338143, head/etc/devd/hyperv.conf
head/sbin/devd/uath.conf
- copied unchanged from r338143, head/etc/devd/uath.conf
head/sbin/devd/ulpt.conf
- copied unchanged from r338143, head/etc/devd/ulpt.conf
head/sbin/devd/zfs.conf
- copied unchanged from r338143, head/etc/devd/zfs.conf
Deleted:
head/etc/devd/
head/etc/devd.conf
Modified:
head/etc/Makefile
head/sbin/devd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Aug 21 16:43:46 2018(r338143)
+++ head/etc/Makefile Tue Aug 21 16:51:45 2018(r338144)
@@ -13,7 +13,6 @@ SUBDIR+=sendmail
.endif
BIN1= crontab \
- devd.conf \
devfs.conf \
dhclient.conf \
disktab \
@@ -152,7 +151,6 @@ distribution:
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
- ${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
Modified: head/sbin/devd/Makefile
==
--- head/sbin/devd/Makefile Tue Aug 21 16:43:46 2018(r338143)
+++ head/sbin/devd/Makefile Tue Aug 21 16:51:45 2018(r338144)
@@ -4,6 +4,30 @@
WARNS?= 3
PACKAGE=runtime
+CONFGROUPS=CONFS DEVD
+CONFS= devd.conf
+DEVD= devmatch.conf
+DEVDDIR= /etc/devd
+.if ${MK_ACPI} != "no"
+DEVD+= asus.conf
+.endif
+
+.if ${MK_HYPERV} != "no"
+DEVD+= hyperv.conf
+.endif
+
+.if ${MK_USB} != "no"
+DEVD+= uath.conf ulpt.conf
+.endif
+
+.if ${MACHINE_ARCH} == "powerpc"
+DEVD+= apple.conf
+.endif
+
+.if ${MK_ZFS} != "no"
+DEVD+= zfs.conf
+.endif
+
PROG_CXX=devd
SRCS= devd.cc token.l parse.y y.tab.h
MAN= devd.8 devd.conf.5
Copied: head/sbin/devd/apple.conf (from r338143, head/etc/devd/apple.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/devd/apple.conf Tue Aug 21 16:51:45 2018(r338144, copy
of r338143, head/etc/devd/apple.conf)
@@ -0,0 +1,80 @@
+# $FreeBSD$
+#
+# PowerPC Apple specific devd events
+
+# Keyboard power key
+notify 0 {
+ match "system" "PMU";
+ match "subsystem" "Button";
+ action "shutdown -p now";
+};
+
+
+# PowerBook and iBook lid close.
+notify 0 {
+ match "system" "PMU";
+ match "subsystem" "lid";
+ match "type""close";
+ action "shutdown -p now";
+};
+
+
+# The next blocks enable brightness hotkeys that can be found on Apple laptops
+notify 0 {
+ match "system" "PMU";
+ match "subsystem" "keys";
+ match "type""brightness";
+ match "notify" "down";
+ action "sysctl dev.backlight.0.level=\
+ $(expr `sysctl -n dev.backlight.0.level` - 10)";
+};
+
+notify 0 {
+ match "system" "PMU";
+ match "subsystem" "keys";
+ match "type""brightness";
+ match "notify" "up";
+ action "sysctl dev.backlight.0.level=\
+ $(expr `sysctl -n dev.backlight.0.level` + 10)";
+};
+
+
+# The next blocks enable volume hotkeys that can be found on Apple laptops
+notify 0 {
+ match "system" "PMU";
+ match "subsystem" "keys";
+ match "type""mute";
+ action "mixer 0";
+};
+
+notify 0 {
+ match "system" "PMU";
+ match "subsystem" "keys";
+ match "type""volume";
+ match "notify" "down";
+ action "mixer vol -10";
+};
+
+notify 0 {
+ match "system" "PMU";
+ match "subsystem" "keys";
+ match "type""volume";
+ match "notify" "up";
+ action "mixer vol +10";
+};
+
+# Eject key
+notify 0 {
+ match
Re: svn commit: r337857 - in head: bin/csh bin/sh etc
On Wed, Aug 15, 2018, at 11:34 AM, Rodney W. Grimes wrote:
> > > > Author: brd
> > > > Date: Wed Aug 15 16:22:12 2018
> > > > New Revision: 337857
> > > > URL: https://svnweb.freebsd.org/changeset/base/337857
> > > >
> > > > Log:
> > > > Fix build after r337849
> > > >
> > > > This moves the symlink creation to after where the files are
> > > > installed.
> > > >
> > > > This also inverts the shell change so that it only happens if MK_TCSH
> > > > is on.
> > > >
> > > > Approved by: will (mentor)
> > > > Differential Revision:https://reviews.freebsd.org/D16725
> > > >
> > > > Modified:
> > > > head/bin/csh/Makefile
> > > > head/bin/sh/Makefile
> > > > head/etc/master.passwd
> > > >
> > > > Modified: head/bin/csh/Makefile
> > > > ==
> > > > --- head/bin/csh/Makefile Wed Aug 15 16:16:59 2018
> > > > (r337856)
> > > > +++ head/bin/csh/Makefile Wed Aug 15 16:22:12 2018
> > > > (r337857)
> > > > @@ -49,8 +49,7 @@ MLINKS= csh.1 tcsh.1
> > > >
> > > > LIBADD=termcapw crypt
> > > >
> > > > -LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
> > > > - /root/.cshrc /.cshrc
> > > > +LINKS= ${BINDIR}/csh ${BINDIR}/tcsh
> > > >
> > > > CLEANFILES= ${GENHDRS} gethost csh.1
> > > >
> > > > @@ -158,7 +157,7 @@ beforeinstall:
> > > > rm -f ${DESTDIR}/.cshrc
> > > >
> > > > afterinstallconfig:
> > > > - sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
> > > > + sed -i "" -e 's;/bin/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
> > > > pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
> > > >
> > > > .include
> > > >
> > > > Modified: head/bin/sh/Makefile
> > > > ==
> > > > --- head/bin/sh/MakefileWed Aug 15 16:16:59 2018
> > > > (r337856)
> > > > +++ head/bin/sh/MakefileWed Aug 15 16:22:12 2018
> > > > (r337857)
> > > > @@ -37,7 +37,6 @@ WFORMAT=0
> > > >
> > > > CLEANFILES+= mknodes mksyntax
> > > > CLEANFILES+= ${GENSRCS} ${GENHDRS}
> > > > -LINKS= /root/.profile /.profile
> > > >
> > > > build-tools: mknodes mksyntax
> > > >
> > > > @@ -66,5 +65,8 @@ SUBDIR.${MK_TESTS}+= tests
> > > >
> > > > beforeinstall:
> > > > rm -f ${DESTDIR}/.profile
> > >
> > > Still unconditionally removing /.profile, but only replacing it
> > > when installconfig: is run.
> >
> > Yes, working on a separate review for this..
> >
> > > > +
> > > > +afterinstallconfig:
> > > > + ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile
> > > > ${DESTDIR}/.profile
> > > >
> > > > .include
> > > >
> > > > Modified: head/etc/master.passwd
> > > > ==
> > > > --- head/etc/master.passwd Wed Aug 15 16:16:59 2018
> > > > (r337856)
> > > > +++ head/etc/master.passwd Wed Aug 15 16:22:12 2018
> > > > (r337857)
> > > > @@ -1,6 +1,6 @@
> > > > # $FreeBSD$
> > > > #
> > > > -root::0:0::0:0:Charlie &:/root:/bin/csh
> > > > +root::0:0::0:0:Charlie &:/root:/bin/sh
> > >
> > > I strongly object to this change to master.passwd, and feel it should
> > > be worked around if in anyway possible. I have pointed out in the
> > > review ways to not have to make this change.
> >
> > I opened up the following which addresses some of your feedback:
> > https://reviews.freebsd.org/D16728
>
> Bleh, can we revert all of this, and take a second look with many more
> eyes on this. master.passwd coming from libc makes my head hurt!
>
> Also this is now a patch on a patch on a patch, time to end the dive
> down the rabbit hole!
Yes, I did a partial revert of the problematic spots in r337882.
I will redo with a better approach tomorrow.
Sorry for the trouble and your .cshrc getting clobbered.
Regards,
Brad Davis
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337882 - in head: bin/csh bin/sh etc etc/root
Author: brd
Date: Wed Aug 15 23:18:34 2018
New Revision: 337882
URL: https://svnweb.freebsd.org/changeset/base/337882
Log:
Revert parts of r337849 and r337857
This fixes the build and I will redo these changes as part of a future review
that organizes them differently. The way I tried to do it here could be done
better. Sorry for the noise.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16737
Added:
head/etc/root/dot.cshrc
- copied unchanged from r337881, head/bin/csh/dot.cshrc
head/etc/root/dot.profile
- copied unchanged from r337881, head/bin/sh/dot.profile
Deleted:
head/bin/csh/dot.cshrc
head/bin/sh/dot.profile
Modified:
head/bin/csh/Makefile
head/bin/sh/Makefile
head/etc/Makefile
head/etc/master.passwd
Modified: head/bin/csh/Makefile
==
--- head/bin/csh/Makefile Wed Aug 15 22:40:09 2018(r337881)
+++ head/bin/csh/Makefile Wed Aug 15 23:18:34 2018(r337882)
@@ -8,11 +8,8 @@
.include
-CONFGROUPS=ETC ROOT
+CONFGROUPS=ETC
ETC= csh.cshrc csh.login csh.logout
-ROOT= dot.cshrc
-ROOTDIR= /root
-ROOTNAME= .cshrc
PACKAGE=runtime
TCSHDIR= ${SRCTOP}/contrib/tcsh
.PATH: ${TCSHDIR}
@@ -152,12 +149,5 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h s
sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
sort >> ${.TARGET}
@echo '#endif /* _h_tc_const */' >> ${.TARGET}
-
-beforeinstall:
- rm -f ${DESTDIR}/.cshrc
-
-afterinstallconfig:
- sed -i "" -e 's;/bin/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
- pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
.include
Modified: head/bin/sh/Makefile
==
--- head/bin/sh/MakefileWed Aug 15 22:40:09 2018(r337881)
+++ head/bin/sh/MakefileWed Aug 15 23:18:34 2018(r337882)
@@ -3,9 +3,7 @@
.include
-CONFS= dot.profile profile
-CONFSDIR_dot.profile= /root
-CONFSNAME_dot.profile= .profile
+CONFS= profile
PACKAGE=runtime
PROG= sh
INSTALLFLAGS= -S
@@ -62,11 +60,5 @@ token.h: mktokens
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
-
-beforeinstall:
- rm -f ${DESTDIR}/.profile
-
-afterinstallconfig:
- ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
.include
Modified: head/etc/Makefile
==
--- head/etc/Makefile Wed Aug 15 22:40:09 2018(r337881)
+++ head/etc/Makefile Wed Aug 15 23:18:34 2018(r337882)
@@ -135,6 +135,10 @@ distribution:
${DESTDIR}/etc/services;
.endif
+.if ${MK_TCSH} == "no"
+ sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
+.endif
+ pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
.if defined(NO_ROOT)
( \
echo "./etc/login.conf.db type=file mode=0644 uname=root
gname=wheel"; \
@@ -171,6 +175,18 @@ distribution:
cd ${.CURDIR}/root; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.k5login ${DESTDIR}/root/.k5login;
+.endif
+ cd ${.CURDIR}/root; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ dot.profile ${DESTDIR}/root/.profile; \
+ rm -f ${DESTDIR}/.profile; \
+ ${INSTALL_LINK} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+.if ${MK_TCSH} != "no"
+ cd ${.CURDIR}/root; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ dot.cshrc ${DESTDIR}/root/.cshrc; \
+ rm -f ${DESTDIR}/.cshrc; \
+ ${INSTALL_LINK} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
.endif
.if ${MK_MAIL} != "no"
Modified: head/etc/master.passwd
==
--- head/etc/master.passwd Wed Aug 15 22:40:09 2018(r337881)
+++ head/etc/master.passwd Wed Aug 15 23:18:34 2018(r337882)
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-root::0:0::0:0:Charlie &:/root:/bin/sh
+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
Copied: head/etc/root/dot.cshrc (from r337881, head/bin/csh/dot.cshrc)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/etc/root/dot.cshrc Wed Aug 15 23:18:34 2018(r337882, copy
of r337881, head/bin/csh/dot.cshrc)
@@ -0,0 +1,43 @@
+# $FreeBSD$
+#
+# .cshrc - csh resource script, read at beginning of execution by each shell
+#
+# see also csh(1), environ(7).
+# more examples available at /usr/share/examples/csh/
+#
+
+alias hhistory 25
+alias jjobs -l
Re: svn commit: r337857 - in head: bin/csh bin/sh etc
On Wed, Aug 15, 2018, at 11:31 AM, Rodney W. Grimes wrote:
> [ Charset UTF-8 unsupported, converting... ]
> >
> >
> > On Wed, Aug 15, 2018, at 10:35 AM, Rodney W. Grimes wrote:
> > > > Author: brd
> > > > Date: Wed Aug 15 16:22:12 2018
> > > > New Revision: 337857
> > > > URL: https://svnweb.freebsd.org/changeset/base/337857
> > > >
> > > > Log:
> > > > Fix build after r337849
> > > >
> > > > This moves the symlink creation to after where the files are
> > > > installed.
> > > >
> > > > This also inverts the shell change so that it only happens if MK_TCSH
> > > > is on.
> > > >
> > > > Approved by: will (mentor)
> > > > Differential Revision:https://reviews.freebsd.org/D16725
> > > >
> > > > Modified:
> > > > head/bin/csh/Makefile
> > > > head/bin/sh/Makefile
> > > > head/etc/master.passwd
> > > >
> > > > Modified: head/bin/csh/Makefile
> > > > ==
> > > > --- head/bin/csh/Makefile Wed Aug 15 16:16:59 2018
> > > > (r337856)
> > > > +++ head/bin/csh/Makefile Wed Aug 15 16:22:12 2018
> > > > (r337857)
> > > > @@ -49,8 +49,7 @@ MLINKS= csh.1 tcsh.1
> > > >
> > > > LIBADD=termcapw crypt
> > > >
> > > > -LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
> > > > - /root/.cshrc /.cshrc
> > > > +LINKS= ${BINDIR}/csh ${BINDIR}/tcsh
> > > >
> > > > CLEANFILES= ${GENHDRS} gethost csh.1
> > > >
> > > > @@ -158,7 +157,7 @@ beforeinstall:
> > > > rm -f ${DESTDIR}/.cshrc
> > > >
> > > > afterinstallconfig:
> > > > - sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
> > > > + sed -i "" -e 's;/bin/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
> > > > pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
> > > >
> > > > .include
> > > >
> > > > Modified: head/bin/sh/Makefile
> > > > ==
> > > > --- head/bin/sh/MakefileWed Aug 15 16:16:59 2018
> > > > (r337856)
> > > > +++ head/bin/sh/MakefileWed Aug 15 16:22:12 2018
> > > > (r337857)
> > > > @@ -37,7 +37,6 @@ WFORMAT=0
> > > >
> > > > CLEANFILES+= mknodes mksyntax
> > > > CLEANFILES+= ${GENSRCS} ${GENHDRS}
> > > > -LINKS= /root/.profile /.profile
> > > >
> > > > build-tools: mknodes mksyntax
> > > >
> > > > @@ -66,5 +65,8 @@ SUBDIR.${MK_TESTS}+= tests
> > > >
> > > > beforeinstall:
> > > > rm -f ${DESTDIR}/.profile
> > >
> > > Still unconditionally removing /.profile, but only replacing it
> > > when installconfig: is run.
> >
> > Yes, working on a separate review for this..
> >
> > > > +
> > > > +afterinstallconfig:
> > > > + ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile
> > > > ${DESTDIR}/.profile
> > > >
> > > > .include
> > > >
> > > > Modified: head/etc/master.passwd
> > > > ==
> > > > --- head/etc/master.passwd Wed Aug 15 16:16:59 2018
> > > > (r337856)
> > > > +++ head/etc/master.passwd Wed Aug 15 16:22:12 2018
> > > > (r337857)
> > > > @@ -1,6 +1,6 @@
> > > > # $FreeBSD$
> > > > #
> > > > -root::0:0::0:0:Charlie &:/root:/bin/csh
> > > > +root::0:0::0:0:Charlie &:/root:/bin/sh
> > >
> > > I strongly object to this change to master.passwd, and feel it should
> > > be worked around if in anyway possible. I have pointed out in the
> > > review ways to not have to make this change.
> >
> > I opened up the following which addresses some of your feedback:
> > https://reviews.freebsd.org/D16728
>
> Actually why not back out this whole set of changes, and come up with
> an agreeable solution, this is a bit of a mess right now.
And here is: https://reviews.freebsd.org/D16729
You where the one asking about repo churn..
Regards,
Brad Davis
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r337857 - in head: bin/csh bin/sh etc
On Wed, Aug 15, 2018, at 10:35 AM, Rodney W. Grimes wrote:
> > Author: brd
> > Date: Wed Aug 15 16:22:12 2018
> > New Revision: 337857
> > URL: https://svnweb.freebsd.org/changeset/base/337857
> >
> > Log:
> > Fix build after r337849
> >
> > This moves the symlink creation to after where the files are installed.
> >
> > This also inverts the shell change so that it only happens if MK_TCSH is
> > on.
> >
> > Approved by: will (mentor)
> > Differential Revision:https://reviews.freebsd.org/D16725
> >
> > Modified:
> > head/bin/csh/Makefile
> > head/bin/sh/Makefile
> > head/etc/master.passwd
> >
> > Modified: head/bin/csh/Makefile
> > ==
> > --- head/bin/csh/Makefile Wed Aug 15 16:16:59 2018(r337856)
> > +++ head/bin/csh/Makefile Wed Aug 15 16:22:12 2018(r337857)
> > @@ -49,8 +49,7 @@ MLINKS= csh.1 tcsh.1
> >
> > LIBADD=termcapw crypt
> >
> > -LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
> > - /root/.cshrc /.cshrc
> > +LINKS= ${BINDIR}/csh ${BINDIR}/tcsh
> >
> > CLEANFILES= ${GENHDRS} gethost csh.1
> >
> > @@ -158,7 +157,7 @@ beforeinstall:
> > rm -f ${DESTDIR}/.cshrc
> >
> > afterinstallconfig:
> > - sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
> > + sed -i "" -e 's;/bin/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
> > pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
> >
> > .include
> >
> > Modified: head/bin/sh/Makefile
> > ==
> > --- head/bin/sh/MakefileWed Aug 15 16:16:59 2018(r337856)
> > +++ head/bin/sh/MakefileWed Aug 15 16:22:12 2018(r337857)
> > @@ -37,7 +37,6 @@ WFORMAT=0
> >
> > CLEANFILES+= mknodes mksyntax
> > CLEANFILES+= ${GENSRCS} ${GENHDRS}
> > -LINKS= /root/.profile /.profile
> >
> > build-tools: mknodes mksyntax
> >
> > @@ -66,5 +65,8 @@ SUBDIR.${MK_TESTS}+= tests
> >
> > beforeinstall:
> > rm -f ${DESTDIR}/.profile
>
> Still unconditionally removing /.profile, but only replacing it
> when installconfig: is run.
Yes, working on a separate review for this..
> > +
> > +afterinstallconfig:
> > + ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
> >
> > .include
> >
> > Modified: head/etc/master.passwd
> > ==
> > --- head/etc/master.passwd Wed Aug 15 16:16:59 2018(r337856)
> > +++ head/etc/master.passwd Wed Aug 15 16:22:12 2018(r337857)
> > @@ -1,6 +1,6 @@
> > # $FreeBSD$
> > #
> > -root::0:0::0:0:Charlie &:/root:/bin/csh
> > +root::0:0::0:0:Charlie &:/root:/bin/sh
>
> I strongly object to this change to master.passwd, and feel it should
> be worked around if in anyway possible. I have pointed out in the
> review ways to not have to make this change.
I opened up the following which addresses some of your feedback:
https://reviews.freebsd.org/D16728
> > 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
>
> --
> Rod Grimes rgri...@freebsd.org
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r337857 - in head: bin/csh bin/sh etc
On Wed, Aug 15, 2018, at 11:17 AM, Ravi Pokala wrote: > Brad, > > -Original Message- > From: on behalf of Brad Davis > > Date: 2018-08-15, Wednesday at 09:22 > To: , , h...@freebsd.org> > Subject: svn commit: r337857 - in head: bin/csh bin/sh etc > > > Author: brd > > Date: Wed Aug 15 16:22:12 2018 > > New Revision: 337857 > > URL: https://svnweb.freebsd.org/changeset/base/337857 > > > > Log: > > Fix build after r337849 > > > > This moves the symlink creation to after where the files are installed. > > > > This also inverts the shell change so that it only happens if MK_TCSH is > > on. > ... > > Modified: head/etc/master.passwd > > == > > --- head/etc/master.passwd Wed Aug 15 16:16:59 2018(r337856) > > +++ head/etc/master.passwd Wed Aug 15 16:22:12 2018(r337857) > > @@ -1,6 +1,6 @@ > > # $FreeBSD$ > > # > > -root::0:0::0:0:Charlie &:/root:/bin/csh > > +root::0:0::0:0:Charlie &:/root:/bin/sh > > 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 > > Woah! Changing the root shell wasn't mentioned in the change > description, has nothing to do with fixing r337849, and is a *HUGE* POLA > violation. At the very least, a change of this magnitude needs public > discussion, and even if the community agreed, it would also require an > UPDATING message and relnote. > > Please revert this change to master.passwd immediately. Hi Ravi, Please, look closer. It doesn't change what is actually installed in either case, it just inverts the logic. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337857 - in head: bin/csh bin/sh etc
Author: brd
Date: Wed Aug 15 16:22:12 2018
New Revision: 337857
URL: https://svnweb.freebsd.org/changeset/base/337857
Log:
Fix build after r337849
This moves the symlink creation to after where the files are installed.
This also inverts the shell change so that it only happens if MK_TCSH is on.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16725
Modified:
head/bin/csh/Makefile
head/bin/sh/Makefile
head/etc/master.passwd
Modified: head/bin/csh/Makefile
==
--- head/bin/csh/Makefile Wed Aug 15 16:16:59 2018(r337856)
+++ head/bin/csh/Makefile Wed Aug 15 16:22:12 2018(r337857)
@@ -49,8 +49,7 @@ MLINKS= csh.1 tcsh.1
LIBADD=termcapw crypt
-LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
- /root/.cshrc /.cshrc
+LINKS= ${BINDIR}/csh ${BINDIR}/tcsh
CLEANFILES= ${GENHDRS} gethost csh.1
@@ -158,7 +157,7 @@ beforeinstall:
rm -f ${DESTDIR}/.cshrc
afterinstallconfig:
- sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
+ sed -i "" -e 's;/bin/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
.include
Modified: head/bin/sh/Makefile
==
--- head/bin/sh/MakefileWed Aug 15 16:16:59 2018(r337856)
+++ head/bin/sh/MakefileWed Aug 15 16:22:12 2018(r337857)
@@ -37,7 +37,6 @@ WFORMAT=0
CLEANFILES+= mknodes mksyntax
CLEANFILES+= ${GENSRCS} ${GENHDRS}
-LINKS= /root/.profile /.profile
build-tools: mknodes mksyntax
@@ -66,5 +65,8 @@ SUBDIR.${MK_TESTS}+= tests
beforeinstall:
rm -f ${DESTDIR}/.profile
+
+afterinstallconfig:
+ ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
.include
Modified: head/etc/master.passwd
==
--- head/etc/master.passwd Wed Aug 15 16:16:59 2018(r337856)
+++ head/etc/master.passwd Wed Aug 15 16:22:12 2018(r337857)
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-root::0:0::0:0:Charlie &:/root:/bin/csh
+root::0:0::0:0:Charlie &:/root:/bin/sh
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
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r337849 - in head: bin/csh bin/sh etc etc/root
On Wed, Aug 15, 2018, at 9:27 AM, Oliver Pinter wrote:
>
>
> On Wednesday, August 15, 2018, Brad Davis wrote:
>> Author: brd
>> Date: Wed Aug 15 14:41:24 2018
>> New Revision: 337849
>> URL: https://svnweb.freebsd.org/changeset/base/337849
>>
>> Log:
>> Move all sh and csh files into bin/sh/ or bin/csh/
>>
>> This simplifies pkgbase by migrating these to CONFS so they are properly
>> tagged as config files.
>>
>> Approved by: will (mentor)
>> Differential Revision: https://reviews.freebsd.org/D16708
>>
>> Added:
>> head/bin/csh/csh.cshrc
>> - copied unchanged from r337848, head/etc/csh.cshrc
>> head/bin/csh/csh.login
>> - copied unchanged from r337848, head/etc/csh.login
>> head/bin/csh/csh.logout
>> - copied unchanged from r337848, head/etc/csh.logout
>> head/bin/csh/dot.cshrc
>> - copied unchanged from r337848, head/etc/root/dot.cshrc
>> head/bin/csh/dot.login
>> - copied unchanged from r337848, head/etc/root/dot.login
>> head/bin/sh/dot.profile
>> - copied unchanged from r337848, head/etc/root/dot.profile
>> head/bin/sh/profile
>> - copied unchanged from r337848, head/etc/profile
>> Deleted:
>> head/etc/csh.cshrc
>> head/etc/csh.login
>> head/etc/csh.logout
>> head/etc/profile
>> head/etc/root/dot.cshrc
>> head/etc/root/dot.login
>> head/etc/root/dot.profile
>> Modified:
>> head/bin/csh/Makefile
>> head/bin/sh/Makefile
>> head/etc/Makefile
>>
>> Modified: head/bin/csh/Makefile
>>
>> ==
>> --- head/bin/csh/Makefile Wed Aug 15 14:29:04 2018 (r337848)
>> +++ head/bin/csh/Makefile Wed Aug 15 14:41:24 2018 (r337849)
>> @@ -8,6 +8,11 @@
>>
>> .include
>>
>> +CONFGROUPS= ETC ROOT
>> +ETC= csh.cshrc csh.login csh.logout
>> +ROOT= dot.cshrc
>> +ROOTDIR= /root
>> +ROOTNAME= .cshrc
>> PACKAGE=runtime
>> TCSHDIR= ${SRCTOP}/contrib/tcsh
>> .PATH: ${TCSHDIR}
>> @@ -44,7 +49,8 @@ MLINKS= csh.1 tcsh.1
>>
>> LIBADD= termcapw crypt
>>
>> -LINKS= ${BINDIR}/csh ${BINDIR}/tcsh
>> +LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
>> + /root/.cshrc /.cshrc
>>
>> CLEANFILES= ${GENHDRS} gethost csh.1
>>
>> @@ -147,5 +153,12 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h s
>> sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
>> sort >> ${.TARGET}
>> @echo '#endif /* _h_tc_const */' >> ${.TARGET}
>> +
>> +beforeinstall:
>> + rm -f ${DESTDIR}/.cshrc
>> +
>> +afterinstallconfig:
>> + sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
>
> Why? If afterinstallconfig called unconditionally after install, then why
> changing all of the csh entries to sh?
>
> The old behavior was almost the same, but only when WITHOUT_CSH was
> specified.
>
> Fixme if I'm wrong.
You are correct, I have opened: https://reviews.freebsd.org/D16725
Regards,
Brad Davis
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337852 - in head: etc secure/usr.bin/ssh secure/usr.sbin/sshd
Author: brd
Date: Wed Aug 15 14:53:42 2018
New Revision: 337852
URL: https://svnweb.freebsd.org/changeset/base/337852
Log:
Move ssh config file handling into the ssh Makefiles.
This helps with pkgbase by using CONFS and tagging these as config files.
Approved by: allanjude (mentor), des
Differential Revision:https://reviews.freebsd.org/D16678
Modified:
head/etc/Makefile
head/secure/usr.bin/ssh/Makefile
head/secure/usr.sbin/sshd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Wed Aug 15 14:52:56 2018(r337851)
+++ head/etc/Makefile Wed Aug 15 14:53:42 2018(r337852)
@@ -74,11 +74,6 @@ BIN1+= hosts.lpd printcap
BIN1+= ${SRCTOP}/usr.bin/mail/misc/mail.rc
.endif
-.if ${MK_OPENSSH} != "no"
-SSH= ${SRCTOP}/crypto/openssh/ssh_config \
- ${SRCTOP}/crypto/openssh/sshd_config \
- ${SRCTOP}/crypto/openssh/moduli
-.endif
.if ${MK_OPENSSL} != "no"
SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
@@ -167,10 +162,6 @@ distribution:
.endif
.if ${MK_SENDMAIL} != "no"
${_+_}cd ${.CURDIR}/sendmail; ${MAKE} distribution
-.endif
-.if ${MK_OPENSSH} != "no"
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${SSH} ${DESTDIR}/etc/ssh
.endif
.if ${MK_OPENSSL} != "no"
cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
Modified: head/secure/usr.bin/ssh/Makefile
==
--- head/secure/usr.bin/ssh/MakefileWed Aug 15 14:52:56 2018
(r337851)
+++ head/secure/usr.bin/ssh/MakefileWed Aug 15 14:53:42 2018
(r337852)
@@ -2,6 +2,8 @@
.include
+CONFS= ssh_config
+CONFSDIR= /etc/ssh
PROG= ssh
LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
MAN= ssh.1 ssh_config.5
Modified: head/secure/usr.sbin/sshd/Makefile
==
--- head/secure/usr.sbin/sshd/Makefile Wed Aug 15 14:52:56 2018
(r337851)
+++ head/secure/usr.sbin/sshd/Makefile Wed Aug 15 14:53:42 2018
(r337852)
@@ -2,6 +2,8 @@
.include
+CONFS= moduli sshd_config
+CONFSDIR= /etc/ssh
PROG= sshd
SRCS= sshd.c auth-rhosts.c auth-passwd.c \
audit.c audit-bsm.c audit-linux.c platform.c \
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337849 - in head: bin/csh bin/sh etc etc/root
Author: brd
Date: Wed Aug 15 14:41:24 2018
New Revision: 337849
URL: https://svnweb.freebsd.org/changeset/base/337849
Log:
Move all sh and csh files into bin/sh/ or bin/csh/
This simplifies pkgbase by migrating these to CONFS so they are properly
tagged as config files.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16708
Added:
head/bin/csh/csh.cshrc
- copied unchanged from r337848, head/etc/csh.cshrc
head/bin/csh/csh.login
- copied unchanged from r337848, head/etc/csh.login
head/bin/csh/csh.logout
- copied unchanged from r337848, head/etc/csh.logout
head/bin/csh/dot.cshrc
- copied unchanged from r337848, head/etc/root/dot.cshrc
head/bin/csh/dot.login
- copied unchanged from r337848, head/etc/root/dot.login
head/bin/sh/dot.profile
- copied unchanged from r337848, head/etc/root/dot.profile
head/bin/sh/profile
- copied unchanged from r337848, head/etc/profile
Deleted:
head/etc/csh.cshrc
head/etc/csh.login
head/etc/csh.logout
head/etc/profile
head/etc/root/dot.cshrc
head/etc/root/dot.login
head/etc/root/dot.profile
Modified:
head/bin/csh/Makefile
head/bin/sh/Makefile
head/etc/Makefile
Modified: head/bin/csh/Makefile
==
--- head/bin/csh/Makefile Wed Aug 15 14:29:04 2018(r337848)
+++ head/bin/csh/Makefile Wed Aug 15 14:41:24 2018(r337849)
@@ -8,6 +8,11 @@
.include
+CONFGROUPS=ETC ROOT
+ETC= csh.cshrc csh.login csh.logout
+ROOT= dot.cshrc
+ROOTDIR= /root
+ROOTNAME= .cshrc
PACKAGE=runtime
TCSHDIR= ${SRCTOP}/contrib/tcsh
.PATH: ${TCSHDIR}
@@ -44,7 +49,8 @@ MLINKS= csh.1 tcsh.1
LIBADD=termcapw crypt
-LINKS= ${BINDIR}/csh ${BINDIR}/tcsh
+LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
+ /root/.cshrc /.cshrc
CLEANFILES= ${GENHDRS} gethost csh.1
@@ -147,5 +153,12 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h s
sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
sort >> ${.TARGET}
@echo '#endif /* _h_tc_const */' >> ${.TARGET}
+
+beforeinstall:
+ rm -f ${DESTDIR}/.cshrc
+
+afterinstallconfig:
+ sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
+ pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
.include
Copied: head/bin/csh/csh.cshrc (from r337848, head/etc/csh.cshrc)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/bin/csh/csh.cshrc Wed Aug 15 14:41:24 2018(r337849, copy
of r337848, head/etc/csh.cshrc)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+#
+# System-wide .cshrc file for csh(1).
Copied: head/bin/csh/csh.login (from r337848, head/etc/csh.login)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/bin/csh/csh.login Wed Aug 15 14:41:24 2018(r337849, copy
of r337848, head/etc/csh.login)
@@ -0,0 +1,15 @@
+# $FreeBSD$
+#
+# System-wide .login file for csh(1).
+# Uncomment this to give you the default 4.2 behavior, where disk
+# information is shown in K-Blocks
+# setenv BLOCKSIZE K
+#
+# For the setting of languages and character sets please see
+# login.conf(5) and in particular the charset and lang options.
+# For full locales list check /usr/share/locale/*
+#
+# Check system messages
+# msgs -q
+# Allow terminal messages
+# mesg y
Copied: head/bin/csh/csh.logout (from r337848, head/etc/csh.logout)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/bin/csh/csh.logout Wed Aug 15 14:41:24 2018(r337849, copy
of r337848, head/etc/csh.logout)
@@ -0,0 +1,3 @@
+# $FreeBSD$
+#
+# System-wide .logout file for csh(1).
Copied: head/bin/csh/dot.cshrc (from r337848, head/etc/root/dot.cshrc)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/bin/csh/dot.cshrc Wed Aug 15 14:41:24 2018(r337849, copy
of r337848, head/etc/root/dot.cshrc)
@@ -0,0 +1,43 @@
+# $FreeBSD$
+#
+# .cshrc - csh resource script, read at beginning of execution by each shell
+#
+# see also csh(1), environ(7).
+# more examples available at /usr/share/examples/csh/
+#
+
+alias hhistory 25
+alias jjobs -l
+alias la ls -aF
+alias lf ls -FA
+alias ll ls -lAF
+
+# A righteous umask
+umask 22
+
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin
$HOME/bin)
+
+setenv EDITOR vi
+setenv PAGER less
+setenv BLOCKSIZE K
+
+if ($?prompt) then
+ # An interactive shell -- set some stuff up
+ set prompt = "%N@%m:%~ %# "
+ set promptchars = "%#"
+
svn commit: r337687 - in head: etc usr.sbin/inetd
Author: brd
Date: Sun Aug 12 13:29:40 2018
New Revision: 337687
URL: https://svnweb.freebsd.org/changeset/base/337687
Log:
Move inetd.conf to usr.sbin/inetd/
This is pkgbase related as it uses CONFS to tag the file as a config file
Approved by: AllanJude (mentor)
Sponsored by: Essen Hackathon
Differential Revision:https://reviews.freebsd.org/D16693
Added:
head/usr.sbin/inetd/inetd.conf
- copied unchanged from r337686, head/etc/inetd.conf
Deleted:
head/etc/inetd.conf
Modified:
head/etc/Makefile
head/usr.sbin/inetd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sun Aug 12 13:24:53 2018(r337686)
+++ head/etc/Makefile Sun Aug 12 13:29:40 2018(r337687)
@@ -63,10 +63,6 @@ BIN1+= amd.map
BIN1+= ftpusers
.endif
-.if ${MK_INETD} != "no"
-BIN1+= inetd.conf
-.endif
-
.if ${MK_LOCATE} != "no"
BIN1+= ${SRCTOP}/usr.bin/locate/locate/locate.rc
.endif
Modified: head/usr.sbin/inetd/Makefile
==
--- head/usr.sbin/inetd/MakefileSun Aug 12 13:24:53 2018
(r337686)
+++ head/usr.sbin/inetd/MakefileSun Aug 12 13:29:40 2018
(r337687)
@@ -3,6 +3,7 @@
.include
+CONFS= inetd.conf
PROG= inetd
MAN= inetd.8
MLINKS=inetd.8 inetd.conf.5
Copied: head/usr.sbin/inetd/inetd.conf (from r337686, head/etc/inetd.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/inetd/inetd.conf Sun Aug 12 13:29:40 2018
(r337687, copy of r337686, head/etc/inetd.conf)
@@ -0,0 +1,123 @@
+# $FreeBSD$
+#
+# Internet server configuration database
+#
+# Define *both* IPv4 and IPv6 entries for dual-stack support.
+# To disable a service, comment it out by prefixing the line with '#'.
+# To enable a service, remove the '#' at the beginning of the line.
+#
+#ftp stream tcp nowait root/usr/libexec/ftpd ftpd -l
+#ftp stream tcp6nowait root/usr/libexec/ftpd ftpd -l
+#ssh stream tcp nowait root/usr/sbin/sshd sshd -i -4
+#ssh stream tcp6nowait root/usr/sbin/sshd sshd -i -6
+#telnetstream tcp nowait root/usr/libexec/telnetdtelnetd
+#telnetstream tcp6nowait root/usr/libexec/telnetdtelnetd
+#shell stream tcp nowait root/usr/local/sbin/rshdrshd
+#shell stream tcp6nowait root/usr/local/sbin/rshdrshd
+#login stream tcp nowait root/usr/local/sbin/rlogind rlogind
+#login stream tcp6nowait root/usr/local/sbin/rlogind rlogind
+#fingerstream tcp nowait/3/10 nobody /usr/libexec/fingerd fingerd
-k -s
+#fingerstream tcp6nowait/3/10 nobody /usr/libexec/fingerd fingerd
-k -s
+#
+# run comsat as root to be able to print partial mailbox contents w/ biff,
+# or use the safer tty:tty to just print that new mail has been received.
+#comsatdgram udp waittty:tty /usr/libexec/comsat comsat
+#
+# ntalk is required for the 'talk' utility to work correctly
+#ntalk dgram udp waittty:tty /usr/libexec/ntalkd ntalkd
+#tftp dgram udp waitroot/usr/libexec/tftpd tftpd -l -s
/tftpboot
+#tftp dgram udp6waitroot/usr/libexec/tftpd tftpd -l -s
/tftpboot
+#bootpsdgram udp waitroot/usr/libexec/bootpd bootpd
+#
+# "Small servers" -- used to be standard on, but we're more conservative
+# about things due to Internet security concerns. Only turn on what you
+# need.
+#
+#daytime streamtcp nowait rootinternal
+#daytime streamtcp6nowait rootinternal
+#daytime dgram udp waitrootinternal
+#daytime dgram udp6waitrootinternal
+#time stream tcp nowait rootinternal
+#time stream tcp6nowait rootinternal
+#time dgram udp waitrootinternal
+#time dgram udp6waitrootinternal
+#echo stream tcp nowait rootinternal
+#echo stream tcp6nowait rootinternal
+#echo dgram udp waitrootinternal
+#echo dgram udp6waitrootinternal
+#discard streamtcp nowait rootinternal
+#discard streamtcp6nowait rootinternal
+#discard dgram udp waitrootinternal
+#discard dgram udp6waitrootinternal
+#chargen streamtcp nowait rootinternal
+#chargen streamtcp6nowait rootinternal
+#chargen dgram udp waitrootinternal
+#chargen dgram udp6waitrootinternal
+#
+# CVS servers - for master CVS repositories only! You must set the
+# --allow-root path correctly or you open a trivial to exploit but
+# deadly security hole.
+#
+#cvspserverstream tcp nowait root/usr/local/bin/cvs
svn commit: r337686 - in head: etc etc/newsyslog.conf.d usr.sbin/newsyslog usr.sbin/newsyslog/newsyslog.conf.d
Author: brd
Date: Sun Aug 12 13:24:53 2018
New Revision: 337686
URL: https://svnweb.freebsd.org/changeset/base/337686
Log:
Move all the newsyslog related configs to usr.sbin/newsyslog/
This is related to pkgbase and changes these to use CONFS so that these are
tagged as config files.
Approved by: AllanJude (mentor)
Sponsored by: Essen Hackathon
Differential Revision:https://reviews.freebsd.org/D16694
Added:
head/usr.sbin/newsyslog/newsyslog.conf
- copied unchanged from r337685, head/etc/newsyslog.conf
head/usr.sbin/newsyslog/newsyslog.conf.d/
- copied from r337685, head/etc/newsyslog.conf.d/
Deleted:
head/etc/newsyslog.conf
head/etc/newsyslog.conf.d/
Modified:
head/etc/Makefile
head/usr.sbin/newsyslog/Makefile
head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sun Aug 12 12:58:05 2018(r337685)
+++ head/etc/Makefile Sun Aug 12 13:24:53 2018(r337686)
@@ -31,7 +31,6 @@ BIN1= crontab \
motd \
netconfig \
networks \
- newsyslog.conf \
nsswitch.conf \
phones \
profile \
@@ -170,7 +169,6 @@ distribution:
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
- ${_+_}cd ${.CURDIR}/newsyslog.conf.d; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
Modified: head/usr.sbin/newsyslog/Makefile
==
--- head/usr.sbin/newsyslog/MakefileSun Aug 12 12:58:05 2018
(r337685)
+++ head/usr.sbin/newsyslog/MakefileSun Aug 12 13:24:53 2018
(r337686)
@@ -2,6 +2,7 @@
.include
+CONFS= newsyslog.conf
PROG= newsyslog
MAN= newsyslog.8 newsyslog.conf.5
SRCS= newsyslog.c ptimes.c
@@ -9,5 +10,6 @@ LIBADD=sbuf
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
+SUBDIR+= newsyslog.conf.d
.include
Copied: head/usr.sbin/newsyslog/newsyslog.conf (from r337685,
head/etc/newsyslog.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/newsyslog/newsyslog.conf Sun Aug 12 13:24:53 2018
(r337686, copy of r337685, head/etc/newsyslog.conf)
@@ -0,0 +1,35 @@
+# configuration file for newsyslog
+# $FreeBSD$
+#
+# Entries which do not specify the '/pid_file' field will cause the
+# syslogd process to be signalled when that log file is rotated. This
+# action is only appropriate for log files which are written to by the
+# syslogd process (ie, files listed in /etc/syslog.conf). If there
+# is no process which needs to be signalled when a given log file is
+# rotated, then the entry for that file should include the 'N' flag.
+#
+# Note: some sites will want to select more restrictive protections than the
+# defaults. In particular, it may be desirable to switch many of the 644
+# entries to 640 or 600. For example, some sites will consider the
+# contents of maillog, messages, and lpd-errs to be confidential. In the
+# future, these defaults may change to more conservative ones.
+#
+# logfilename [owner:group]mode count size when flags
[/pid_file] [sig_num]
+/var/log/all.log 600 7 *@T00 J
+/var/log/auth.log 600 7 1000 @0101T JC
+/var/log/console.log 600 5 1000 * J
+/var/log/cron 600 3 1000 * JC
+/var/log/daily.log 640 7 *@T00 JN
+/var/log/debug.log 600 7 1000 * JC
+/var/log/init.log 644 3 1000 * J
+/var/log/kerberos.log 600 7 1000 * J
+/var/log/maillog 640 7 *@T00 JC
+/var/log/messages 644 5 1000 @0101T JC
+/var/log/monthly.log 640 12*$M1D0 JN
+/var/log/devd.log 644 3 1000 * JC
+/var/log/security 600 101000 * JC
+/var/log/utx.log 644 3 *@01T05 B
+/var/log/weekly.log640 5 *$W6D0 JN
+
+ /etc/newsyslog.conf.d/*
+ /usr/local/etc/newsyslog.conf.d/*
Modified: head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile
==
--- head/etc/newsyslog.conf.d/Makefile Sun Aug 12 12:58:05 2018
(r337685)
+++ head/usr.sbin/newsyslog/newsyslog.conf.d/Makefile Sun Aug 12 13:24:53
2018(r337686)
@@ -2,36 +2,36 @@
.include
-BINDIR=/etc/newsyslog.conf.d
+CONFSDIR=
svn commit: r337649 - in head: etc etc/ntp usr.sbin/ntp/ntpd
Author: brd
Date: Sat Aug 11 17:42:42 2018
New Revision: 337649
URL: https://svnweb.freebsd.org/changeset/base/337649
Log:
Move all NTP related files to usr.sbin/ntp/ntpd.
This helps with pkgbase by using CONFS to tag these as config files.
Approved by: allanjude (mentor), ian, cy
Sponsored by: Essen Hackathon
Differential Revision:https://reviews.freebsd.org/D16661
Added:
head/usr.sbin/ntp/ntpd/leap-seconds
- copied unchanged from r337648, head/etc/ntp/leap-seconds
head/usr.sbin/ntp/ntpd/ntp.conf
- copied unchanged from r337648, head/etc/ntp.conf
Deleted:
head/etc/ntp/
head/etc/ntp.conf
Modified:
head/etc/Makefile
head/usr.sbin/ntp/ntpd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 11 17:11:08 2018(r337648)
+++ head/etc/Makefile Sat Aug 11 17:42:42 2018(r337649)
@@ -80,10 +80,6 @@ BIN1+= hosts.lpd printcap
BIN1+= ${SRCTOP}/usr.bin/mail/misc/mail.rc
.endif
-.if ${MK_NTP} != "no"
-BIN1+= ntp.conf
-.endif
-
.if ${MK_OPENSSH} != "no"
SSH= ${SRCTOP}/crypto/openssh/ssh_config \
${SRCTOP}/crypto/openssh/sshd_config \
@@ -175,9 +171,6 @@ distribution:
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${.CURDIR}/newsyslog.conf.d; ${MAKE} install
-.if ${MK_NTP} != "no"
- ${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
-.endif
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
Modified: head/usr.sbin/ntp/ntpd/Makefile
==
--- head/usr.sbin/ntp/ntpd/Makefile Sat Aug 11 17:11:08 2018
(r337648)
+++ head/usr.sbin/ntp/ntpd/Makefile Sat Aug 11 17:42:42 2018
(r337649)
@@ -7,6 +7,10 @@ MAN=
.PATH: ${SRCTOP}/contrib/ntp/ntpd \
${.OBJDIR}
+CONFS= ntp.conf
+FILES= leap-seconds
+FILESDIR= /etc/ntp
+FILESMODE= 644
PROG= ntpd
SRCS= cmd_args.c ntp_config.c ntp_control.c ntp_crypto.c ntp_filegen.c \
Copied: head/usr.sbin/ntp/ntpd/leap-seconds (from r337648,
head/etc/ntp/leap-seconds)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/ntp/ntpd/leap-seconds Sat Aug 11 17:42:42 2018
(r337649, copy of r337648, head/etc/ntp/leap-seconds)
@@ -0,0 +1,250 @@
+#
+# In the following text, the symbol '#' introduces
+# a comment, which continues from that symbol until
+# the end of the line. A plain comment line has a
+# whitespace character following the comment indicator.
+# There are also special comment lines defined below.
+# A special comment will always have a non-whitespace
+# character in column 2.
+#
+# A blank line should be ignored.
+#
+# The following table shows the corrections that must
+# be applied to compute International Atomic Time (TAI)
+# from the Coordinated Universal Time (UTC) values that
+# are transmitted by almost all time services.
+#
+# The first column shows an epoch as a number of seconds
+# since 1 January 1900, 00:00:00 (1900.0 is also used to
+# indicate the same epoch.) Both of these time stamp formats
+# ignore the complexities of the time scales that were
+# used before the current definition of UTC at the start
+# of 1972. (See note 3 below.)
+# The second column shows the number of seconds that
+# must be added to UTC to compute TAI for any timestamp
+# at or after that epoch. The value on each line is
+# valid from the indicated initial instant until the
+# epoch given on the next one or indefinitely into the
+# future if there is no next line.
+# (The comment on each line shows the representation of
+# the corresponding initial epoch in the usual
+# day-month-year format. The epoch always begins at
+# 00:00:00 UTC on the indicated day. See Note 5 below.)
+#
+# Important notes:
+#
+# 1. Coordinated Universal Time (UTC) is often referred to
+# as Greenwich Mean Time (GMT). The GMT time scale is no
+# longer used, and the use of GMT to designate UTC is
+# discouraged.
+#
+# 2. The UTC time scale is realized by many national
+# laboratories and timing centers. Each laboratory
+# identifies its realization with its name: Thus
+# UTC(NIST), UTC(USNO), etc. The differences among
+# these different realizations are typically on the
+# order of a few nanoseconds (i.e., 0.000 000 00x s)
+# and can be ignored for many purposes. These differences
+# are tabulated in Circular T, which is published monthly
+# by the International Bureau of Weights and Measures
+# (BIPM). See
svn commit: r337648 - in head: etc etc/defaults etc/periodic usr.sbin/periodic usr.sbin/periodic/etc usr.sbin/periodic/etc/daily usr.sbin/periodic/etc/monthly usr.sbin/periodic/etc/security usr.sbi...
Author: brd
Date: Sat Aug 11 17:11:08 2018
New Revision: 337648
URL: https://svnweb.freebsd.org/changeset/base/337648
Log:
Move all periodic related config and scripts to usr.sbin/periodic/
This makes pkgbase easier by tagging these as CONFS so they are properly
tagged as config files.
Approved by: will (mentor)
Sponsored by: Essen Hackathon
Differential Revision:https://reviews.freebsd.org/D16553
Added:
head/usr.sbin/periodic/etc/
- copied from r337647, head/etc/periodic/
head/usr.sbin/periodic/periodic.conf
- copied unchanged from r337647, head/etc/defaults/periodic.conf
Deleted:
head/etc/defaults/periodic.conf
head/etc/periodic/
Modified:
head/etc/Makefile
head/etc/defaults/Makefile
head/usr.sbin/periodic/Makefile
head/usr.sbin/periodic/etc/Makefile.inc
head/usr.sbin/periodic/etc/daily/Makefile
head/usr.sbin/periodic/etc/monthly/Makefile
head/usr.sbin/periodic/etc/security/Makefile
head/usr.sbin/periodic/etc/weekly/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 11 16:41:08 2018(r337647)
+++ head/etc/Makefile Sat Aug 11 17:11:08 2018(r337648)
@@ -178,7 +178,6 @@ distribution:
.if ${MK_NTP} != "no"
${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
.endif
- ${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
Modified: head/etc/defaults/Makefile
==
--- head/etc/defaults/Makefile Sat Aug 11 16:41:08 2018(r337647)
+++ head/etc/defaults/Makefile Sat Aug 11 17:11:08 2018(r337648)
@@ -2,7 +2,7 @@
.include
-FILES= devfs.rules periodic.conf
+FILES= devfs.rules
FILESDIR= /etc/defaults
.if ${MK_BLUETOOTH} != "no"
Modified: head/usr.sbin/periodic/Makefile
==
--- head/usr.sbin/periodic/Makefile Sat Aug 11 16:41:08 2018
(r337647)
+++ head/usr.sbin/periodic/Makefile Sat Aug 11 17:11:08 2018
(r337648)
@@ -1,6 +1,10 @@
# $FreeBSD$
+FILES= periodic.conf
+FILESDIR= /etc/defaults
SCRIPTS=periodic.sh
MAN= periodic.8
+
+SUBDIR=etc
.include
Modified: head/usr.sbin/periodic/etc/Makefile.inc
==
--- head/etc/periodic/Makefile.inc Sat Aug 11 16:41:08 2018
(r337647)
+++ head/usr.sbin/periodic/etc/Makefile.inc Sat Aug 11 17:11:08 2018
(r337648)
@@ -1,5 +1,6 @@
# $FreeBSD$
-BINDIR=/etc/periodic/${.CURDIR:T}
+CONFMODE= 755
+CONFDIR= ETC_PERIODIC_${.CURDIR:T:U}
+ETC_PERIODIC_${.CURDIR:T:U}= /etc/periodic/${.CURDIR:T}
NO_OBJ=
-FILESMODE= 755
Modified: head/usr.sbin/periodic/etc/daily/Makefile
==
--- head/etc/periodic/daily/MakefileSat Aug 11 16:41:08 2018
(r337647)
+++ head/usr.sbin/periodic/etc/daily/Makefile Sat Aug 11 17:11:08 2018
(r337648)
@@ -2,9 +2,9 @@
.include
-FILESGROUPS=FILES
+CONFGROUPS=CONFS
-FILES= 100.clean-disks \
+CONFS= 100.clean-disks \
110.clean-tmps \
120.clean-preserve \
140.clean-rwho \
@@ -27,35 +27,34 @@ FILES= 100.clean-disks \
# NB: keep these sorted by MK_* knobs
.if ${MK_ACCT} != "no"
-FILESGROUPS+= ACCT
+CONFGROUPS+= ACCT
ACCT+= 310.accounting
-.endif
-ACCTDIR= /etc/periodic/daily
ACCTMODE= ${BINMODE}
ACCTPACKAGE= acct
+.endif
.if ${MK_CALENDAR} != "no"
-FILES+=300.calendar
+CONFS+=300.calendar
.endif
.if ${MK_MAIL} != "no"
-FILES+=130.clean-msgs
+CONFS+=130.clean-msgs
.endif
.if ${MK_NTP} != "no"
-FILES+=480.status-ntpd \
+CONFS+=480.status-ntpd \
480.leapfile-ntpd
.endif
.if ${MK_SENDMAIL} != "no"
-FILES+=150.clean-hoststat \
+CONFS+=150.clean-hoststat \
440.status-mailq \
460.status-mail-rejects \
500.queuerun
.endif
.if ${MK_ZFS} != "no"
-FILES+=404.status-zfs \
+CONFS+=404.status-zfs \
800.scrub-zfs
.endif
Modified: head/usr.sbin/periodic/etc/monthly/Makefile
==
--- head/etc/periodic/monthly/Makefile Sat Aug 11 16:41:08 2018
(r337647)
+++ head/usr.sbin/periodic/etc/monthly/Makefile Sat Aug 11 17:11:08 2018
(r337648)
@@ -2,19 +2,19 @@
.include
-FILESGROUPS=FILES
+CONFGROUPS=CONFS
-FILES= 450.status-security \
+CONFS= 450.status-security \
999.local
# NB: keep these sorted by MK_* knobs
.if ${MK_UTMPX} != "no"
-FILESGROUPS+= ACCT
+CONFGROUPS+= ACCT
ACCT+=
Re: svn commit: r337611 - head/cddl/usr.sbin/dwatch/libexec
On Sat, Aug 11, 2018, at 7:06 AM, Kristof Provost wrote:
> Hi Devin,
> On 11 Aug 2018, at 8:32, Devin Teske wrote:
>> Author: dteske
>> Date: Sat Aug 11 06:32:31 2018
>> New Revision: 337611
>> URL: https://svnweb.freebsd.org/changeset/base/337611
>>
>> Log:
>> dwatch(1): Add systop profile
>>
>> Provides a top-like view of syscall consumers.
>>
>> MFC after: 3 days
>> X-MFC-to: stable/11
>> Sponsored by: Smule, Inc.
>>
>> Added:
>> head/cddl/usr.sbin/dwatch/libexec/systop (contents, props changed)
>> Modified:
>> head/cddl/usr.sbin/dwatch/libexec/Makefile
>>
>> Modified: head/cddl/usr.sbin/dwatch/libexec/Makefile
>>
>> ==
>> --- head/cddl/usr.sbin/dwatch/libexec/Makefile Sat Aug 11 06:13:11
>> 2018(r337610)
>> +++ head/cddl/usr.sbin/dwatch/libexec/Makefile Sat Aug 11 06:32:31
>> 2018(r337611)
>> @@ -62,6 +62,7 @@ LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dw
>> LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/send
>> LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendmsg
>> LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendto
>> +LINKS+=${LIBEXECDIR}/dwatch/systop ${LIBEXECDIR}/dwatch/systop
> This breaks install world:
> install: link
> /usr/obj/usr/src/amd64.amd64/release/dist/base/usr/libexec/dwatch/systop ->
> /usr/obj/usr/src/amd64.amd64/release/dist/base/usr/libexec/dwatch/systop: No
> such file or directory
Hi Devin,
I committed a fix in r337629 to just install systop, since that seems to be
what you meant.. If not, please let me know and I would be happy to help
correct that.
Regards,
Brad Davis
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337629 - head/cddl/usr.sbin/dwatch/libexec
Author: brd
Date: Sat Aug 11 16:06:32 2018
New Revision: 337629
URL: https://svnweb.freebsd.org/changeset/base/337629
Log:
Fix the build by just installing systop since testing shows it works with:
dwatch -X systop
Reviewed by: kp
Approved by: allanjude (mentor)
Modified:
head/cddl/usr.sbin/dwatch/libexec/Makefile
Modified: head/cddl/usr.sbin/dwatch/libexec/Makefile
==
--- head/cddl/usr.sbin/dwatch/libexec/Makefile Sat Aug 11 14:45:33 2018
(r337628)
+++ head/cddl/usr.sbin/dwatch/libexec/Makefile Sat Aug 11 16:06:32 2018
(r337629)
@@ -12,6 +12,7 @@ FILES=chmod \
rw \
sched \
sendrecv \
+ systop \
tcp \
udp \
udplite \
@@ -62,7 +63,6 @@ LINKS+= ${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dw
LINKS+=${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/send
LINKS+=${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendmsg
LINKS+=${LIBEXECDIR}/dwatch/sendrecv ${LIBEXECDIR}/dwatch/sendto
-LINKS+=${LIBEXECDIR}/dwatch/systop ${LIBEXECDIR}/dwatch/systop
LINKS+=${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept
LINKS+=${LIBEXECDIR}/dwatch/tcp
${LIBEXECDIR}/dwatch/tcp-accept-established
LINKS+=${LIBEXECDIR}/dwatch/tcp ${LIBEXECDIR}/dwatch/tcp-accept-refused
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337627 - in head: etc sbin/pfctl
Author: brd
Date: Sat Aug 11 13:58:26 2018
New Revision: 337627
URL: https://svnweb.freebsd.org/changeset/base/337627
Log:
Move pf.os to sbin/pfctl/
Approved by: will (mentor)
Glanced at by:kp
Sponsored by: Essen Hackathon
Differential Revision:https://reviews.freebsd.org/D16557
Added:
head/sbin/pfctl/pf.os
- copied unchanged from r337626, head/etc/pf.os
Deleted:
head/etc/pf.os
Modified:
head/etc/Makefile
head/sbin/pfctl/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 11 13:52:23 2018(r337626)
+++ head/etc/Makefile Sat Aug 11 13:58:26 2018(r337627)
@@ -93,10 +93,6 @@ SSH= ${SRCTOP}/crypto/openssh/ssh_config \
SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
-.if ${MK_PF} != "no"
-BIN1+= pf.os
-.endif
-
.if ${MK_SENDMAIL} != "no"
BIN1+= rc.sendmail
.endif
Modified: head/sbin/pfctl/Makefile
==
--- head/sbin/pfctl/MakefileSat Aug 11 13:52:23 2018(r337626)
+++ head/sbin/pfctl/MakefileSat Aug 11 13:58:26 2018(r337627)
@@ -6,6 +6,7 @@
.PATH: ${SRCTOP}/sys/netpfil/pf
PACKAGE=pf
+CONFS= pf.os
PROG= pfctl
MAN= pfctl.8
Copied: head/sbin/pfctl/pf.os (from r337626, head/etc/pf.os)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/pfctl/pf.os Sat Aug 11 13:58:26 2018(r337627, copy
of r337626, head/etc/pf.os)
@@ -0,0 +1,709 @@
+# $FreeBSD$
+# $OpenBSD: pf.os,v 1.27 2016/09/03 17:08:57 sthen Exp $
+# passive OS fingerprinting
+# -
+#
+# SYN signatures. Those signatures work for SYN packets only (duh!).
+#
+# (C) Copyright 2000-2003 by Michal Zalewski
+# (C) Copyright 2003 by Mike Frantzen
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+#
+# This fingerprint database is adapted from Michal Zalewski's p0f passive
+# operating system package. The last database sync was from a Nov 3 2003
+# p0f.fp.
+#
+#
+# Each line in this file specifies a single fingerprint. Please read the
+# information below carefully before attempting to append any signatures
+# reported as UNKNOWN to this file to avoid mistakes.
+#
+# We use the following set metrics for fingerprinting:
+#
+# - Window size (WSS) - a highly OS dependent setting used for TCP/IP
+# performance control (max. amount of data to be sent without ACK).
+# Some systems use a fixed value for initial packets. On other
+# systems, it is a multiple of MSS or MTU (MSS+40). In some rare
+# cases, the value is just arbitrary.
+#
+# NEW SIGNATURE: if p0f reported a special value of 'Snn', the number
+# appears to be a multiple of MSS (MSS*nn); a special value of 'Tnn'
+# means it is a multiple of MTU ((MSS+40)*nn). Unless you notice the
+# value of nn is not fixed (unlikely), just copy the Snn or Tnn token
+# literally. If you know this device has a simple stack and a fixed
+# MTU, you can however multiply S value by MSS, or T value by MSS+40,
+# and put it instead of Snn or Tnn.
+#
+# If WSS otherwise looks like a fixed value (for example a multiple
+# of two), or if you can confirm the value is fixed, please quote
+# it literally. If there's no apparent pattern in WSS chosen, you
+# should consider wildcarding this value.
+#
+# - Overall packet size - a function of all IP and TCP options and bugs.
+#
+# NEW SIGNATURE: Copy this value literally.
+#
+# - Initial TTL - We check the actual TTL of a received packet. It can't
+# be higher than the initial TTL, and also shouldn't be dramatically
+# lower (maximum distance is defined as 40 hops).
+#
+# NEW SIGNATURE: *Never* copy TTL from a p0f-reported signature literally.
+# You need to determine the initial TTL. The best way to do it is to
+# check the documentation for a remote system, or check its settings.
+# A fairly good method is to simply round the observed TTL up to
+# 32, 64, 128, or 255, but it should be noted that some obscure devices
+# might not use round TTLs (in particular, some shoddy appliances use
+# "original" initial TTL settings). If not sure, you
svn commit: r337626 - in head: etc etc/cron.d usr.bin/at
Author: brd
Date: Sat Aug 11 13:52:23 2018
New Revision: 337626
URL: https://svnweb.freebsd.org/changeset/base/337626
Log:
Move cron.d/at to usr.bin/at/
This helps with pkgbase as it tags this as a config file so it is handled as
such
Approved by: allanjude (mentor)
Sponsored by: Essen Hackathon
Differential Revision:https://reviews.freebsd.org/D16673
Added:
head/usr.bin/at/atrun
- copied unchanged from r337625, head/etc/cron.d/at
Deleted:
head/etc/cron.d/
Modified:
head/etc/Makefile
head/usr.bin/at/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 11 13:47:28 2018(r337625)
+++ head/etc/Makefile Sat Aug 11 13:52:23 2018(r337626)
@@ -174,7 +174,6 @@ distribution:
.if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
- ${_+_}cd ${.CURDIR}/cron.d; ${MAKE} install
${_+_}cd ${.CURDIR}/defaults; ${MAKE} install
${_+_}cd ${.CURDIR}/devd; ${MAKE} install
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
Modified: head/usr.bin/at/Makefile
==
--- head/usr.bin/at/MakefileSat Aug 11 13:47:28 2018(r337625)
+++ head/usr.bin/at/MakefileSat Aug 11 13:52:23 2018(r337626)
@@ -2,6 +2,9 @@
.include "${.CURDIR}/Makefile.inc"
+CONFS= atrun
+CONFSDIR= /etc/cron.d
+CONFSNAME= at
PROG= at
SRCS= at.c panic.c parsetime.c perm.c
LINKS= ${BINDIR}/at ${BINDIR}/atq \
Copied: head/usr.bin/at/atrun (from r337625, head/etc/cron.d/at)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.bin/at/atrun Sat Aug 11 13:52:23 2018(r337626, copy
of r337625, head/etc/cron.d/at)
@@ -0,0 +1,7 @@
+# $FreeBSD$
+#
+SHELL=/bin/sh
+PATH=/etc:/bin:/sbin:/usr/bin:/usr/sbin
+
+# See crontab(5) for field format.
+*/5* * * * root/usr/libexec/atrun
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337625 - in head: etc usr.sbin/bsnmpd/bsnmpd
Author: brd
Date: Sat Aug 11 13:47:28 2018
New Revision: 337625
URL: https://svnweb.freebsd.org/changeset/base/337625
Log:
Move snmpd.config to usr.sbin/bsnmpd/bsnmpd/
This helps with pkgbase as this config file will now be tagged as a config
file
Approved by: allanjude (mentor)
Sponsored by: Essen Hackathon
Differential Revision:https://reviews.freebsd.org/D16674
Added:
head/usr.sbin/bsnmpd/bsnmpd/snmpd.config
- copied unchanged from r337624, head/etc/snmpd.config
Deleted:
head/etc/snmpd.config
Modified:
head/etc/Makefile
head/usr.sbin/bsnmpd/bsnmpd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 11 13:28:03 2018(r337624)
+++ head/etc/Makefile Sat Aug 11 13:47:28 2018(r337625)
@@ -158,11 +158,6 @@ distribution:
${DESTDIR}/etc/services;
.endif
-.if ${MK_BSNMP} != "no"
- cd ${.CURDIR}; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
- snmpd.config ${DESTDIR}/etc;
-.endif
.if ${MK_TCSH} == "no"
sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
.endif
Modified: head/usr.sbin/bsnmpd/bsnmpd/Makefile
==
--- head/usr.sbin/bsnmpd/bsnmpd/MakefileSat Aug 11 13:28:03 2018
(r337624)
+++ head/usr.sbin/bsnmpd/bsnmpd/MakefileSat Aug 11 13:47:28 2018
(r337625)
@@ -7,6 +7,8 @@
CONTRIB=${SRCTOP}/contrib/bsnmp
.PATH: ${CONTRIB}/snmpd
+CONFS= snmpd.config
+CONFSMODE= 600
PROG= bsnmpd
SRCS= main.c action.c config.c export.c trap.c trans_udp.c trans_lsock.c
SRCS+= oid.h tree.c tree.h
Copied: head/usr.sbin/bsnmpd/bsnmpd/snmpd.config (from r337624,
head/etc/snmpd.config)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/bsnmpd/bsnmpd/snmpd.configSat Aug 11 13:47:28 2018
(r337625, copy of r337624, head/etc/snmpd.config)
@@ -0,0 +1,322 @@
+# $FreeBSD$
+#
+# Example configuration file for bsnmpd(1).
+#
+
+#
+# Set some common variables
+#
+location := "Room 200"
+contact := "sysmeis...@example.com"
+system := 1# FreeBSD
+traphost := localhost
+trapport := 162
+
+#
+# Set the SNMP engine ID.
+#
+# The snmpEngineID object required from the SNMPv3 Framework. If not
explicitly set via
+# this configuration file, an ID is assigned based on the value of the
+# kern.hostid variable
+# engine := 0x80:0x10:0x08:0x10:0x80:0x25
+# snmpEngineID = $(engine)
+
+# Change this!
+read := "public"
+# Uncomment begemotSnmpdCommunityString.0.2 below that sets the community
+# string to enable write access.
+write := "geheim"
+trap := "mytrap"
+
+#
+# Declarations for SNMP-USER-BASED-SM-MIB authentication and privacy options
+#
+
+NoAuthProtocol := 1.3.6.1.6.3.10.1.1.1
+HMACMD5AuthProtocol:= 1.3.6.1.6.3.10.1.1.2
+HMACSHAAuthProtocol:= 1.3.6.1.6.3.10.1.1.3
+NoPrivProtocol := 1.3.6.1.6.3.10.1.2.1
+DESPrivProtocol:= 1.3.6.1.6.3.10.1.2.2
+AesCfb128Protocol := 1.3.6.1.6.3.10.1.2.4
+
+#
+# Enumerations from SNMP-FRAMEWORK-MIB
+#
+
+# Security models
+securityModelAny := 0
+securityModelSNMPv1:= 1
+securityModelSNMPv2c := 2
+securityModelUSM := 3
+
+# Message Processing models
+MPmodelSNMPv1 := 0
+MPmodelSNMPv2c := 1
+MPmodelSNMPv3 := 3
+
+# Security levels
+noAuthNoPriv := 1
+authNoPriv := 2
+authPriv := 3
+
+
+# SNMPv3 USM User definition
+#
+# The localized hex password for a user may be obtained by setting SNMPUSER,
SNMPPASSWD,
+# SNMPAUTH and SNMPPRIV environment variables to the desired parameters and
invoking
+# 'bsnmpget -v 3 -D -K -o verbose' against the running bsnmpd(1). For other
+# usages refer to the bsnmpget(1) manual page. The following lines define a
user "bsnmp"
+# with a private password "bsnmptest", localized for the above engine ID.
+#
+#user1 := "bsnmp"
+#user1passwd :=
0x22:0x98:0x1a:0x6e:0x39:0x93:0x16:0x5e:0x6a:0x21:0x1b:0xd8:0xa9:0x81:0x31:0x05:0x16:0x33:0x38:0x60
+
+#
+# Configuration
+#
+%snmpd
+begemotSnmpdDebugDumpPdus = 2
+begemotSnmpdDebugSyslogPri = 7
+
+#
+# Set the read and write communities.
+#
+# The default value of the community strings is NULL (note, that this is
+# different from the empty string). This disables both read and write access.
+# To enable read access only the read community string must be set. Setting
+# the write community string enables both read and write access with that
+# string.
+#
+# Be sure to understand the security implications of SNMPv2 - the community
+# strings are readable on the wire!
+#
+begemotSnmpdCommunityString.0.1= $(read)
+# begemotSnmpdCommunityString.0.2 = $(write)
+begemotSnmpdCommunityDisable = 1
+
+# open standard SNMP ports
+begemotSnmpdPortStatus.0.0.0.0.161 = 1
+
+# open a
svn commit: r337624 - in head: etc sbin/sysctl
Author: brd Date: Sat Aug 11 13:28:03 2018 New Revision: 337624 URL: https://svnweb.freebsd.org/changeset/base/337624 Log: Move sysctl.conf to sbin/sysctl/ and switch to CONFS. This helps with pkgbase to tag this config file as a config file. Approved by: allanjude (mentor), will (mentor) Differential Revision:https://reviews.freebsd.org/D16559 Added: head/sbin/sysctl/sysctl.conf - copied unchanged from r337623, head/etc/sysctl.conf Deleted: head/etc/sysctl.conf Modified: head/etc/Makefile head/sbin/sysctl/Makefile Modified: head/etc/Makefile == --- head/etc/Makefile Sat Aug 11 13:25:39 2018(r337623) +++ head/etc/Makefile Sat Aug 11 13:28:03 2018(r337624) @@ -41,7 +41,6 @@ BIN1= crontab \ remote \ rpc \ services \ - sysctl.conf \ syslog.conf \ termcap.small Modified: head/sbin/sysctl/Makefile == --- head/sbin/sysctl/Makefile Sat Aug 11 13:25:39 2018(r337623) +++ head/sbin/sysctl/Makefile Sat Aug 11 13:28:03 2018(r337624) @@ -2,6 +2,7 @@ # $FreeBSD$ PACKAGE=runtime +CONFS= sysctl.conf PROG= sysctl WARNS?=3 MAN= sysctl.8 Copied: head/sbin/sysctl/sysctl.conf (from r337623, head/etc/sysctl.conf) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/sysctl/sysctl.confSat Aug 11 13:28:03 2018 (r337624, copy of r337623, head/etc/sysctl.conf) @@ -0,0 +1,9 @@ +# $FreeBSD$ +# +# This file is read when going to multi-user and its contents piped thru +# ``sysctl'' to adjust kernel values. ``man 5 sysctl.conf'' for details. +# + +# Uncomment this to prevent users from seeing information about processes that +# are being run under another UID. +#security.bsd.see_other_uids=0 ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337623 - in head: etc sbin/ddb
Author: brd Date: Sat Aug 11 13:25:39 2018 New Revision: 337623 URL: https://svnweb.freebsd.org/changeset/base/337623 Log: Move ddb.conf to sbin/ddb/ and switch to CONFS. This helps pkgbase as this config file will now be tagged as a config file. Approved by: allanjude (mentor) Differential Revision:https://reviews.freebsd.org/D16675 Added: head/sbin/ddb/ddb.conf - copied unchanged from r337622, head/etc/ddb.conf Deleted: head/etc/ddb.conf Modified: head/etc/Makefile head/sbin/ddb/Makefile Modified: head/etc/Makefile == --- head/etc/Makefile Sat Aug 11 13:23:09 2018(r337622) +++ head/etc/Makefile Sat Aug 11 13:25:39 2018(r337623) @@ -15,7 +15,6 @@ SUBDIR+=sendmail BIN1= crontab \ devd.conf \ devfs.conf \ - ddb.conf \ dhclient.conf \ disktab \ fbtab \ Modified: head/sbin/ddb/Makefile == --- head/sbin/ddb/Makefile Sat Aug 11 13:23:09 2018(r337622) +++ head/sbin/ddb/Makefile Sat Aug 11 13:25:39 2018(r337623) @@ -1,5 +1,6 @@ # $FreeBSD$ +CONFS= ddb.conf PACKAGE=runtime PROG= ddb SRCS= ddb.c ddb_capture.c ddb_script.c Copied: head/sbin/ddb/ddb.conf (from r337622, head/etc/ddb.conf) == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sbin/ddb/ddb.conf Sat Aug 11 13:25:39 2018(r337623, copy of r337622, head/etc/ddb.conf) @@ -0,0 +1,15 @@ +# $FreeBSD$ +# +# This file is read when going to multi-user and its contents piped thru +# ``ddb'' to define debugging scripts. +# +# see ``man 4 ddb'' and ``man 8 ddb'' for details. +# + +script lockinfo=show locks; show alllocks; show lockedvnods + +# kdb.enter.panic panic(9) was called. +script kdb.enter.panic=textdump set; capture on; run lockinfo; show pcpu; bt; ps; alltrace; capture off; call doadump; reset + +# kdb.enter.witnesswitness(4) detected a locking error. +script kdb.enter.witness=run lockinfo ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337622 - in head: etc usr.sbin/auditd
Author: brd
Date: Sat Aug 11 13:23:09 2018
New Revision: 337622
URL: https://svnweb.freebsd.org/changeset/base/337622
Log:
Move OpenBSM to CONFS
This helps with pkgbase as these config files will be properly tagged as
config files.
Approved by: allanjude (mentor), oshogbo
Differential Revision:https://reviews.freebsd.org/D16679
Modified:
head/etc/Makefile
head/usr.sbin/auditd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 11 13:18:19 2018(r337621)
+++ head/etc/Makefile Sat Aug 11 13:23:09 2018(r337622)
@@ -56,14 +56,6 @@ BIN1+= etc.${MACHINE_CPUARCH}/ttys
.error etc.MACHINE/ttys missing
.endif
-OPENBSMDIR=${SRCTOP}/contrib/openbsm
-BSM_ETC_OPEN_FILES=${OPENBSMDIR}/etc/audit_class \
- ${OPENBSMDIR}/etc/audit_event
-BSM_ETC_RESTRICTED_FILES= ${OPENBSMDIR}/etc/audit_control \
- ${OPENBSMDIR}/etc/audit_user
-BSM_ETC_EXEC_FILES=${OPENBSMDIR}/etc/audit_warn
-BSM_ETC_DIR= ${DESTDIR}/etc/security
-
# NB: keep these sorted by MK_* knobs
.if ${MK_AMD} != "no"
@@ -203,12 +195,6 @@ distribution:
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
${_+_}cd ${.CURDIR}/pam.d; ${MAKE} install
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0444 \
- ${BSM_ETC_OPEN_FILES} ${BSM_ETC_DIR}
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0600 \
- ${BSM_ETC_RESTRICTED_FILES} ${BSM_ETC_DIR}
- cd ${.CURDIR}; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 0500 \
- ${BSM_ETC_EXEC_FILES} ${BSM_ETC_DIR}
.if ${MK_UNBOUND} != "no"
if [ ! -e ${DESTDIR}/etc/unbound ]; then \
${INSTALL_SYMLINK} ../var/unbound ${DESTDIR}/etc/unbound; \
Modified: head/usr.sbin/auditd/Makefile
==
--- head/usr.sbin/auditd/Makefile Sat Aug 11 13:18:19 2018
(r337621)
+++ head/usr.sbin/auditd/Makefile Sat Aug 11 13:23:09 2018
(r337622)
@@ -7,6 +7,18 @@ OPENBSMDIR=${SRCTOP}/contrib/openbsm
CFLAGS+= -I${OPENBSMDIR}
+OPENBSMETCDIR= ${OPENBSMDIR}/etc
+CONFS= ${OPENBSMETCDIR}/audit_class
+CONFSMODE_${OPENBSMETCDIR}/audit_class= 444
+CONFS+= ${OPENBSMETCDIR}/audit_control
+CONFSMODE_${OPENBSMETCDIR}/audit_control= 600
+CONFS+= ${OPENBSMETCDIR}/audit_event
+CONFSMODE_${OPENBSMETCDIR}/audit_event= 444
+CONFS+= ${OPENBSMETCDIR}/audit_user
+CONFSMODE_${OPENBSMETCDIR}/audit_user= 600
+CONFS+= ${OPENBSMETCDIR}/audit_warn
+CONFSMODE_${OPENBSMETCDIR}/audit_warn= 500
+CONFSDIR= /etc/security
PROG= auditd
SRCS= auditd.c audit_warn.c auditd_fbsd.c
MAN= auditd.8
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337342 - head/etc
Author: brd
Date: Sun Aug 5 04:20:52 2018
New Revision: 337342
URL: https://svnweb.freebsd.org/changeset/base/337342
Log:
Fix build after r337340.
Approved by: will (mentor)
Modified:
head/etc/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sun Aug 5 04:16:00 2018(r337341)
+++ head/etc/Makefile Sun Aug 5 04:20:52 2018(r337342)
@@ -70,10 +70,6 @@ BSM_ETC_DIR= ${DESTDIR}/etc/security
BIN1+= amd.map
.endif
-.if ${MK_AUTOFS} != "no"
-BIN1+= auto_master
-.endif
-
.if ${MK_FTP} != "no"
BIN1+= ftpusers
.endif
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337340 - in head: etc etc/autofs usr.sbin/autofs usr.sbin/autofs/autofs
Author: brd
Date: Sat Aug 4 22:41:17 2018
New Revision: 337340
URL: https://svnweb.freebsd.org/changeset/base/337340
Log:
Move autofs related configs to usr.sbin/autofs/
This is prep for pkgbase to have config files tagged as such.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16492
Added:
head/usr.sbin/autofs/auto_master
- copied unchanged from r337339, head/etc/auto_master
head/usr.sbin/autofs/autofs/
- copied from r337339, head/etc/autofs/
Deleted:
head/etc/auto_master
head/etc/autofs/
Modified:
head/etc/Makefile
head/usr.sbin/autofs/Makefile
head/usr.sbin/autofs/autofs/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 4 22:31:29 2018(r337339)
+++ head/etc/Makefile Sat Aug 4 22:41:17 2018(r337340)
@@ -190,9 +190,6 @@ distribution:
echo "./var/db/services.db type=file mode=0644 uname=root
gname=wheel"; \
) | ${METALOG.add}
.endif
-.if ${MK_AUTOFS} != "no"
- ${_+_}cd ${.CURDIR}/autofs; ${MAKE} install
-.endif
.if ${MK_BLUETOOTH} != "no"
${_+_}cd ${.CURDIR}/bluetooth; ${MAKE} install
.endif
Modified: head/usr.sbin/autofs/Makefile
==
--- head/usr.sbin/autofs/Makefile Sat Aug 4 22:31:29 2018
(r337339)
+++ head/usr.sbin/autofs/Makefile Sat Aug 4 22:41:17 2018
(r337340)
@@ -1,5 +1,6 @@
# $FreeBSD$
+CONFS= auto_master
PACKAGE=autofs
PROG= automountd
SRCS= automount.c
@@ -29,5 +30,7 @@ LINKS=${BINDIR}/automountd ${BINDIR}/automount
LINKS+=${BINDIR}/automountd ${BINDIR}/autounmountd
.PATH: ${MOUNT}
+
+SUBDIR=autofs
.include
Copied: head/usr.sbin/autofs/auto_master (from r337339, head/etc/auto_master)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/autofs/auto_masterSat Aug 4 22:41:17 2018
(r337340, copy of r337339, head/etc/auto_master)
@@ -0,0 +1,9 @@
+# $FreeBSD$
+#
+# Automounter master map, see auto_master(5) for details.
+#
+/net -hosts -nobrowse,nosuid,intr
+# When using the -media special map, make sure to edit devd.conf(5)
+# to move the call to "automount -c" out of the comments section.
+#/media-media -nosuid,noatime
+#/--noauto
Modified: head/usr.sbin/autofs/autofs/Makefile
==
--- head/etc/autofs/MakefileSat Aug 4 22:31:29 2018(r337339)
+++ head/usr.sbin/autofs/autofs/MakefileSat Aug 4 22:41:17 2018
(r337340)
@@ -1,6 +1,6 @@
# $FreeBSD$
-FILES= include_ldap \
+CONFS= include_ldap \
include_nis \
include_nis_nullfs \
special_hosts \
@@ -9,7 +9,7 @@ FILES= include_ldap \
special_null
NO_OBJ=
-FILESDIR= /etc/autofs
-FILESMODE= 755
+CONFDIR= /etc/autofs
+CONFMODE= 755
.include
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337339 - in head: etc usr.sbin/portsnap/portsnap
Author: brd
Date: Sat Aug 4 22:31:29 2018
New Revision: 337339
URL: https://svnweb.freebsd.org/changeset/base/337339
Log:
Move portsnap.conf to head/usr.sbin/portsnap/portsnap/
This is prep for pkgbase to have config files tagged as such.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16554
Added:
head/usr.sbin/portsnap/portsnap/portsnap.conf
- copied unchanged from r337338, head/etc/portsnap.conf
Deleted:
head/etc/portsnap.conf
Modified:
head/etc/Makefile
head/usr.sbin/portsnap/portsnap/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 4 22:25:41 2018(r337338)
+++ head/etc/Makefile Sat Aug 4 22:31:29 2018(r337339)
@@ -107,10 +107,6 @@ SSH= ${SRCTOP}/crypto/openssh/ssh_config \
SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
-.if ${MK_PORTSNAP} != "no"
-BIN1+= portsnap.conf
-.endif
-
.if ${MK_PF} != "no"
BIN1+= pf.os
.endif
Modified: head/usr.sbin/portsnap/portsnap/Makefile
==
--- head/usr.sbin/portsnap/portsnap/MakefileSat Aug 4 22:25:41 2018
(r337338)
+++ head/usr.sbin/portsnap/portsnap/MakefileSat Aug 4 22:31:29 2018
(r337339)
@@ -1,5 +1,6 @@
# $FreeBSD$
+CONFS= portsnap.conf
SCRIPTS=portsnap.sh
MAN= portsnap.8
Copied: head/usr.sbin/portsnap/portsnap/portsnap.conf (from r337338,
head/etc/portsnap.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/portsnap/portsnap/portsnap.conf Sat Aug 4 22:31:29
2018(r337339, copy of r337338, head/etc/portsnap.conf)
@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+# Default directory where compressed snapshots are stored.
+# WORKDIR=/var/db/portsnap
+
+# Default location of the ports tree (target for "update" and "extract").
+# PORTSDIR=/usr/ports
+
+# Server or server pool from which to fetch updates. You can change
+# this to point at a specific server if you want, but in most cases
+# using a "nearby" server won't provide a measurable improvement in
+# performance.
+SERVERNAME=portsnap.FreeBSD.org
+
+# Trusted keyprint. Changing this is a Bad Idea unless you've received
+# a PGP-signed email from telling you to
+# change it and explaining why.
+KEYPRINT=9b5feee6d69f170e3dd0a2c8e469ddbd64f13f978f2f3aede40c98633216c330
+
+# Example of ignoring parts of the ports tree. If you know that you
+# absolutely will not need certain parts of the tree, this will save
+# some bandwidth and disk space. See the manual page for more details.
+#
+# WARNING: Working with an incomplete ports tree is not supported and
+# can cause problems due to missing dependencies. If you have REFUSE
+# directives and experience problems, remove them and update your tree
+# before asking for help on the mailing lists.
+#
+# REFUSE arabic chinese french german hebrew hungarian japanese
+# REFUSE korean polish portuguese russian ukrainian vietnamese
+
+# List of INDEX files to build and the DESCRIBE file to use for each
+#INDEX INDEX-10 DESCRIBE.10
+#INDEX INDEX-11 DESCRIBE.11
+INDEX INDEX-12 DESCRIBE.12
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337338 - in head: etc usr.sbin/freebsd-update
Author: brd
Date: Sat Aug 4 22:25:41 2018
New Revision: 337338
URL: https://svnweb.freebsd.org/changeset/base/337338
Log:
Move freebsd-update.conf to usr.sbin/freebsd-update.
This is prep for pkgbase so that config files are tagged as such.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16556
Added:
head/usr.sbin/freebsd-update/freebsd-update.conf
- copied unchanged from r337337, head/etc/freebsd-update.conf
Deleted:
head/etc/freebsd-update.conf
Modified:
head/etc/Makefile
head/usr.sbin/freebsd-update/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 4 22:15:59 2018(r337337)
+++ head/etc/Makefile Sat Aug 4 22:25:41 2018(r337338)
@@ -74,10 +74,6 @@ BIN1+= amd.map
BIN1+= auto_master
.endif
-.if ${MK_FREEBSD_UPDATE} != "no"
-BIN1+= freebsd-update.conf
-.endif
-
.if ${MK_FTP} != "no"
BIN1+= ftpusers
.endif
Modified: head/usr.sbin/freebsd-update/Makefile
==
--- head/usr.sbin/freebsd-update/Makefile Sat Aug 4 22:15:59 2018
(r337337)
+++ head/usr.sbin/freebsd-update/Makefile Sat Aug 4 22:25:41 2018
(r337338)
@@ -1,5 +1,6 @@
# $FreeBSD$
+CONFS= freebsd-update.conf
SCRIPTS=freebsd-update.sh
MAN= freebsd-update.8
Copied: head/usr.sbin/freebsd-update/freebsd-update.conf (from r337337,
head/etc/freebsd-update.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/freebsd-update/freebsd-update.confSat Aug 4 22:25:41
2018(r337338, copy of r337337, head/etc/freebsd-update.conf)
@@ -0,0 +1,76 @@
+# $FreeBSD$
+
+# Trusted keyprint. Changing this is a Bad Idea unless you've received
+# a PGP-signed email from telling you to
+# change it and explaining why.
+KeyPrint 800651ef4b4c71c27e60786d7b487188970f4b4169cc055784e21eb71d410cc5
+
+# Server or server pool from which to fetch updates. You can change
+# this to point at a specific server if you want, but in most cases
+# using a "nearby" server won't provide a measurable improvement in
+# performance.
+ServerName update.FreeBSD.org
+
+# Components of the base system which should be kept updated.
+Components src world kernel
+
+# Example for updating the userland and the kernel source code only:
+# Components src/base src/sys world
+
+# Paths which start with anything matching an entry in an IgnorePaths
+# statement will be ignored.
+IgnorePaths
+
+# Paths which start with anything matching an entry in an IDSIgnorePaths
+# statement will be ignored by "freebsd-update IDS".
+IDSIgnorePaths /usr/share/man/cat
+IDSIgnorePaths /usr/share/man/whatis
+IDSIgnorePaths /var/db/locate.database
+IDSIgnorePaths /var/log
+
+# Paths which start with anything matching an entry in an UpdateIfUnmodified
+# statement will only be updated if the contents of the file have not been
+# modified by the user (unless changes are merged; see below).
+UpdateIfUnmodified /etc/ /var/ /root/ /.cshrc /.profile
+
+# When upgrading to a new FreeBSD release, files which match MergeChanges
+# will have any local changes merged into the version from the new release.
+MergeChanges /etc/ /boot/device.hints
+
+### Default configuration options:
+
+# Directory in which to store downloaded updates and temporary
+# files used by FreeBSD Update.
+# WorkDir /var/db/freebsd-update
+
+# Destination to send output of "freebsd-update cron" if an error
+# occurs or updates have been downloaded.
+# MailTo root
+
+# Is FreeBSD Update allowed to create new files?
+# AllowAdd yes
+
+# Is FreeBSD Update allowed to delete files?
+# AllowDelete yes
+
+# If the user has modified file ownership, permissions, or flags, should
+# FreeBSD Update retain this modified metadata when installing a new version
+# of that file?
+# KeepModifiedMetadata yes
+
+# When upgrading between releases, should the list of Components be
+# read strictly (StrictComponents yes) or merely as a list of components
+# which *might* be installed of which FreeBSD Update should figure out
+# which actually are installed and upgrade those (StrictComponents no)?
+# StrictComponents no
+
+# When installing a new kernel perform a backup of the old one first
+# so it is possible to boot the old kernel in case of problems.
+# BackupKernel yes
+
+# If BackupKernel is enabled, the backup kernel is saved to this
+# directory.
+# BackupKernelDir /boot/kernel.old
+
+# When backing up a kernel also back up debug symbol files?
+# BackupKernelSymbolFiles no
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r337337 - in head: etc sbin/savecore
Author: brd
Date: Sat Aug 4 22:15:59 2018
New Revision: 337337
URL: https://svnweb.freebsd.org/changeset/base/337337
Log:
Move etc/minfree to sbin/savecore/.
This is prep for pkgbase to have config files tagged as such.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16558
Added:
head/sbin/savecore/minfree
- copied unchanged from r337336, head/etc/minfree
Deleted:
head/etc/minfree
Modified:
head/etc/Makefile
head/sbin/savecore/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Aug 4 22:15:05 2018(r337336)
+++ head/etc/Makefile Sat Aug 4 22:15:59 2018(r337337)
@@ -271,8 +271,6 @@ distribution:
${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/db/locate.database
.endif
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/minfree \
- ${DESTDIR}/var/crash
cd ${.CURDIR}/..; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
${FREEBSD} ${DESTDIR}/
.if ${MK_BOOT} != "no"
Modified: head/sbin/savecore/Makefile
==
--- head/sbin/savecore/Makefile Sat Aug 4 22:15:05 2018(r337336)
+++ head/sbin/savecore/Makefile Sat Aug 4 22:15:59 2018(r337337)
@@ -1,6 +1,8 @@
# $FreeBSD$
PACKAGE=runtime
+CONFS= minfree
+CONFSDIR= /var/crash
PROG= savecore
LIBADD=z xo
MAN= savecore.8
Copied: head/sbin/savecore/minfree (from r337336, head/etc/minfree)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/savecore/minfree Sat Aug 4 22:15:59 2018(r337337, copy
of r337336, head/etc/minfree)
@@ -0,0 +1 @@
+2048
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336978 - in head: etc etc/pkg usr.sbin/pkg
Author: brd
Date: Tue Jul 31 16:42:03 2018
New Revision: 336978
URL: https://svnweb.freebsd.org/changeset/base/336978
Log:
Move pkg/FreeBSD.conf to usr.sbin/pkg/
Approved by: bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D16491
Added:
head/usr.sbin/pkg/FreeBSD.conf
- copied unchanged from r336977, head/etc/pkg/FreeBSD.conf
Deleted:
head/etc/pkg/
Modified:
head/etc/Makefile
head/usr.sbin/pkg/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Jul 31 16:39:38 2018(r336977)
+++ head/etc/Makefile Tue Jul 31 16:42:03 2018(r336978)
@@ -214,9 +214,6 @@ distribution:
${_+_}cd ${.CURDIR}/ntp; ${MAKE} install
.endif
${_+_}cd ${.CURDIR}/periodic; ${MAKE} install
-.if ${MK_PKGBOOTSTRAP} != "no"
- ${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
-.endif
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
Copied: head/usr.sbin/pkg/FreeBSD.conf (from r336977, head/etc/pkg/FreeBSD.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/pkg/FreeBSD.conf Tue Jul 31 16:42:03 2018
(r336978, copy of r336977, head/etc/pkg/FreeBSD.conf)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+# To disable this repository, instead of modifying or removing this file,
+# create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
+#
+# mkdir -p /usr/local/etc/pkg/repos
+# echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
+#
+
+FreeBSD: {
+ url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest;,
+ mirror_type: "srv",
+ signature_type: "fingerprints",
+ fingerprints: "/usr/share/keys/pkg",
+ enabled: yes
+}
Modified: head/usr.sbin/pkg/Makefile
==
--- head/usr.sbin/pkg/Makefile Tue Jul 31 16:39:38 2018(r336977)
+++ head/usr.sbin/pkg/Makefile Tue Jul 31 16:42:03 2018(r336978)
@@ -1,5 +1,8 @@
# $FreeBSD$
+CONFS= FreeBSD.conf
+CONFSDIR= /etc/pkg
+CONFSMODE= 644
PROG= pkg
SRCS= pkg.c dns_utils.c config.c
MAN= pkg.7
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336977 - in head: etc usr.sbin/blacklistd
Author: brd
Date: Tue Jul 31 16:39:38 2018
New Revision: 336977
URL: https://svnweb.freebsd.org/changeset/base/336977
Log:
Move blacklistd.conf to usr.sbin/blacklistd/
This is prep for pkging base and helps tag and install config files with the
correct packages.
Approved by: bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D16493
Added:
head/usr.sbin/blacklistd/blacklistd.conf
- copied unchanged from r336976, head/etc/blacklistd.conf
Deleted:
head/etc/blacklistd.conf
Modified:
head/etc/Makefile
head/usr.sbin/blacklistd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Tue Jul 31 16:08:38 2018(r336976)
+++ head/etc/Makefile Tue Jul 31 16:39:38 2018(r336977)
@@ -74,10 +74,6 @@ BIN1+= amd.map
BIN1+= auto_master
.endif
-.if ${MK_BLACKLIST} != "no"
-BIN1+= blacklistd.conf
-.endif
-
.if ${MK_FREEBSD_UPDATE} != "no"
BIN1+= freebsd-update.conf
.endif
Modified: head/usr.sbin/blacklistd/Makefile
==
--- head/usr.sbin/blacklistd/Makefile Tue Jul 31 16:08:38 2018
(r336976)
+++ head/usr.sbin/blacklistd/Makefile Tue Jul 31 16:39:38 2018
(r336977)
@@ -3,6 +3,7 @@
BLACKLIST_DIR=${SRCTOP}/contrib/blacklist
.PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port
+CONFS= blacklistd.conf
PROG= blacklistd
SRCS= blacklistd.c conf.c run.c state.c support.c internal.c \
sockaddr_snprintf.c pidfile.c strtoi.c popenve.c
Copied: head/usr.sbin/blacklistd/blacklistd.conf (from r336976,
head/etc/blacklistd.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/blacklistd/blacklistd.confTue Jul 31 16:39:38 2018
(r336977, copy of r336976, head/etc/blacklistd.conf)
@@ -0,0 +1,17 @@
+# $FreeBSD$
+#
+# Blacklist rule
+# adr/mask:porttypeproto owner namenfail disable
+[local]
+sshstream * * * 3 24h
+ftpstream * * * 3 24h
+smtp stream * * * 3 24h
+submission stream * * * 3 24h
+#6161 stream tcp6christos* 2 10m
+* * * * * 3 60
+
+# adr/mask:porttypeproto owner namenfail disable
+[remote]
+#129.168.0.0/16* * * = * *
+#6161 = = = =/24= =
+#* stream tcp * = = =
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
On Sun, Jul 29, 2018, at 12:33 PM, Konstantin Belousov wrote: > On Sun, Jul 29, 2018 at 11:51:32AM -0600, Brad Davis wrote: > > On Sun, Jul 29, 2018, at 11:44 AM, Konstantin Belousov wrote: > > > On Sun, Jul 29, 2018 at 11:01:27AM -0600, Brad Davis wrote: > > > > On Sun, Jul 29, 2018, at 9:42 AM, Konstantin Belousov wrote: > > > > > On Sat, Jul 28, 2018 at 08:36:23PM +, Brad Davis wrote: > > > > > > Author: brd > > > > > > Date: Sat Jul 28 20:36:23 2018 > > > > > > New Revision: 336845 > > > > > > URL: https://svnweb.freebsd.org/changeset/base/336845 > > > > > > > > > > > > Log: > > > > > > Move rc startup scripts from etc/ to sbin/init/ > > > > > Why all these moves are useful ? > > > > > > > > > > No commit message explained what is the goal of the moves, and why > > > > > it is better that way comparing the existing src/etc collection. > > > > > > > > For pkg base we need to distill things out of etc/ and into places > > > > where they fit better. This enables them to be pkged up with the > > > > parts of the system them belong with and the CONFS= tags them as > > > > config files so that pkg will know about them and be able to 3-way > > > > merge them. This keeps the flexibility we have today with the many > > > > WITH_*/WITHOUT_* knobs. Though it is not without trade offs, keeping > > > > all of one part of the system together is simpler and makes some > > > > maintenance easier. > > > I do not see why do we need this for the pkgbase. There is nothing > > > wrong with installation of the whole clean dist-supplied /etc on > > > the fresh system. More, as you noted yourself, the ability to have > > > all the config files installed is simpler and allows to overview and > > > prepare configuration without requiring to have the corresponding > > > packages installed. > > > > On a fresh system sure, but on upgrades that is a problem. > > > > I was not advocating for having all the etc files installed, even when you > > do not have that pkg installed. I am saying it matches what happens today > > if you have, for example, WITHOUT_ACPI=y set. > > > All of this should have been written, perhaps even with more details, > in the commit message. You are right, I will working on improving my commit messages. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
On Sun, Jul 29, 2018, at 11:44 AM, Konstantin Belousov wrote: > On Sun, Jul 29, 2018 at 11:01:27AM -0600, Brad Davis wrote: > > On Sun, Jul 29, 2018, at 9:42 AM, Konstantin Belousov wrote: > > > On Sat, Jul 28, 2018 at 08:36:23PM +, Brad Davis wrote: > > > > Author: brd > > > > Date: Sat Jul 28 20:36:23 2018 > > > > New Revision: 336845 > > > > URL: https://svnweb.freebsd.org/changeset/base/336845 > > > > > > > > Log: > > > > Move rc startup scripts from etc/ to sbin/init/ > > > Why all these moves are useful ? > > > > > > No commit message explained what is the goal of the moves, and why > > > it is better that way comparing the existing src/etc collection. > > > > For pkg base we need to distill things out of etc/ and into places > > where they fit better. This enables them to be pkged up with the > > parts of the system them belong with and the CONFS= tags them as > > config files so that pkg will know about them and be able to 3-way > > merge them. This keeps the flexibility we have today with the many > > WITH_*/WITHOUT_* knobs. Though it is not without trade offs, keeping > > all of one part of the system together is simpler and makes some > > maintenance easier. > I do not see why do we need this for the pkgbase. There is nothing > wrong with installation of the whole clean dist-supplied /etc on > the fresh system. More, as you noted yourself, the ability to have > all the config files installed is simpler and allows to overview and > prepare configuration without requiring to have the corresponding > packages installed. On a fresh system sure, but on upgrades that is a problem. I was not advocating for having all the etc files installed, even when you do not have that pkg installed. I am saying it matches what happens today if you have, for example, WITHOUT_ACPI=y set. > > > Moving startup scripts to sbin/init is at least dubious, IMO. > > > Startup scripts has nothing to do with init(8), but this is the > > > second-order question. > > > > Do you have a better idea of a place for them? This is the most > > logical place I could think of. > rc scripts are definitely not configuration files. They are executables. > > I proposed this several times, the /etc/rc.d and /etc/rc.* are very much > wrong place to contain the scripts. For instance, /libexec/rc/ could be > more logical and much more operationally correct: e.g. the scripts can > be updated by make installworld (or some sub-target) and removed by the > ObsoleteFiles. I agree with that, but was shot down as too big of a POLA violation on this list back during BSDCan. I think it is something we can tackle, but I do not want it to hold up pkgbase so I am not willing to merge the two projects. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336859 - head/sbin/init/rc.d
On Sun, Jul 29, 2018, at 11:35 AM, Ian Lepore wrote:
> On Sun, 2018-07-29 at 09:59 -0700, Don Lewis wrote:
> > On 29 Jul, Ian Lepore wrote:
> > > On Sun, 2018-07-29 at 05:42 +, Don Lewis wrote:
> > >> Author: truckman
> > >> Date: Sun Jul 29 05:42:07 2018
> > >> New Revision: 336859
> > >> URL: https://svnweb.freebsd.org/changeset/base/336859
> > >>
> > >> Log:
> > >> Fix a variable name typo in r336845 that prevented the rc.d scripts
> > >> from being installed in the correct directory.
> > >>
> > >> Resurrect a few rc.d scripts that were prematurely deleted from the
> > >> Makefile by r336845.
> > >>
> > >> Reviewed by: brd
> > >>
> > >> Modified:
> > >> head/sbin/init/rc.d/Makefile
> > >>
> > >> Modified: head/sbin/init/rc.d/Makefile
> > >> =
> > >> =
> > >> --- head/sbin/init/rc.d/Makefile Sun Jul 29 05:14:26 2018
> > >> (r336858)
> > >> +++ head/sbin/init/rc.d/Makefile Sun Jul 29 05:42:07 2018
> > >> (r336859)
> > >> @@ -2,7 +2,7 @@
> > >>
> > >> .include
> > >>
> > >> -CONFSDIR= /etc/rc.d
> > >> +CONFDIR=/etc/rc.d
> > >> CONFGROUPS= CONFS
> > >>
> > >
> > > I'm pretty sure CONFSDIR was right here. You are now trapped in a maze
> > > of small twisty variable names, all alike.
> >
> > Without this change, the rc.d scripts get installed directly under
> > /var/tmp/temproot/etc/ and mergemaster wants to delete the scripts under
> > /etc/rc.d. Answering yes to that mergemaster question results in an
> > unbootable system.
> >
> > I see the following in /usr/share/mk/bsd.confs.mk:
> > ${group}DIR?= ${CONFDIR}
> > but I don't see ${CONFSDIR} anywhere.
> >
>
> You don't see CONFSDIR because it appears as ${group}DIR and with
> CONFGROUPS?= CONFS that turns into CONFSDIR. So now the question is why
> doesn't setting CONFSDIR work in this makefile, but it works in others?
>
> -- Ian
>
> > After this commit, mergemaster works properly again.
> >
> > > CONFGROUPS=CONFS is the default set by bsd.conf.mk, and it's the only
> > > one that needs CONF to be singular. Perhaps if we establish the idiom
> > > of not re-specifying the default value in all the individual makefiles,
> > > that'll leave everything as CONFS* and it'll be a bit less confusing?
I spoke with Ian on IRC about this, but for everyone else following along here..
This works because CONFDIR is the default for all CONFGROUPS, where as CONFSDIR
only applied to the CONFS group.
Regards,
Brad Davis
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
On Sun, Jul 29, 2018, at 9:42 AM, Konstantin Belousov wrote: > On Sat, Jul 28, 2018 at 08:36:23PM +0000, Brad Davis wrote: > > Author: brd > > Date: Sat Jul 28 20:36:23 2018 > > New Revision: 336845 > > URL: https://svnweb.freebsd.org/changeset/base/336845 > > > > Log: > > Move rc startup scripts from etc/ to sbin/init/ > Why all these moves are useful ? > > No commit message explained what is the goal of the moves, and why > it is better that way comparing the existing src/etc collection. For pkg base we need to distill things out of etc/ and into places where they fit better. This enables them to be pkged up with the parts of the system them belong with and the CONFS= tags them as config files so that pkg will know about them and be able to 3-way merge them. This keeps the flexibility we have today with the many WITH_*/WITHOUT_* knobs. Though it is not without trade offs, keeping all of one part of the system together is simpler and makes some maintenance easier. > Moving startup scripts to sbin/init is at least dubious, IMO. > Startup scripts has nothing to do with init(8), but this is the > second-order question. Do you have a better idea of a place for them? This is the most logical place I could think of. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336857 - head/sbin/init/rc.d
Author: brd
Date: Sun Jul 29 03:20:05 2018
New Revision: 336857
URL: https://svnweb.freebsd.org/changeset/base/336857
Log:
Fix a typo that prevented some rc scripts from being installed.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16495
Modified:
head/sbin/init/rc.d/Makefile
Modified: head/sbin/init/rc.d/Makefile
==
--- head/sbin/init/rc.d/MakefileSun Jul 29 01:44:26 2018
(r336856)
+++ head/sbin/init/rc.d/MakefileSun Jul 29 03:20:05 2018
(r336857)
@@ -3,7 +3,7 @@
.include
CONFSDIR= /etc/rc.d
-CONFSGROUPS= CONFS
+CONFGROUPS=CONFS
CONFS= DAEMON \
FILESYSTEMS \
@@ -130,13 +130,13 @@ CONFS+= ypbind \
.endif
.if ${MK_ACCT} != "no"
-CONFSGROUPS+= ACCT
+CONFGROUPS+= ACCT
ACCT+= accounting
ACCTPACKAGE= acct
.endif
.if ${MK_ACPI} != "no"
-CONFSGROUPS+= ACPI
+CONFGROUPS+= ACPI
ACPI= power_profile
ACPIPACKAGE= acpi
.endif
@@ -146,13 +146,13 @@ CONFS+= powerd
.endif
.if ${MK_AMD} != "no"
-CONFSGROUPS+= AMD
+CONFGROUPS+= AMD
AMD+= amd
AMDPACKAGE=amd
.endif
.if ${MK_APM} != "no"
-CONFSGROUPS+= APM
+CONFGROUPS+= APM
APM+= apm
.if ${MACHINE} == "i386"
APM+= apmd
@@ -184,7 +184,7 @@ CONFS+= bootparams
.endif
.if ${MK_BSNMP} != "no"
-CONFSGROUPS+= BSNMP
+CONFGROUPS+= BSNMP
BSNMP+=bsnmpd
BSNMPPACKAGE= bsnmp
.endif
@@ -198,7 +198,7 @@ CONFS+= ftpd
.endif
.if ${MK_HAST} != "no"
-CONFSGROUPS+= HAST
+CONFGROUPS+= HAST
HAST= hastd
HASTPACKAGE= hast
.endif
@@ -220,7 +220,7 @@ CONFS+= iscsid
.endif
.if ${MK_JAIL} != "no"
-CONFSGROUPS+= JAIL
+CONFGROUPS+= JAIL
JAIL+= jail
JAILPACKAGE= jail
.endif
@@ -268,7 +268,7 @@ CONFS+= keyserv
.endif
.if ${MK_OPENSSH} != "no"
-CONFSGROUPS+= SSH
+CONFGROUPS+= SSH
SSH= sshd
SSHPACKAGE=ssh
.endif
@@ -282,7 +282,7 @@ CONFS+= routed
.endif
.if ${MK_SENDMAIL} != "no"
-CONFSGROUPS+= SMRCD
+CONFGROUPS+= SMRCD
SMRCD= sendmail
SMRCDPACKAGE= sendmail
.endif
@@ -292,7 +292,7 @@ CONFS+= timed
.endif
.if ${MK_UNBOUND} != "no"
-CONFSGROUPS+= UNBOUND
+CONFGROUPS+= UNBOUND
UNBOUND+= local_unbound
UNBOUNDPACKAGE=unbound
.endif
@@ -302,7 +302,7 @@ _utx= utx
.endif
.if ${MK_VI} != "no"
-CONFSGROUPS+= VI
+CONFGROUPS+= VI
VI+= virecover
VIPACKAGE= vi
.endif
@@ -313,7 +313,7 @@ CONFS+= wpa_supplicant
.endif
.if ${MK_ZFS} != "no"
-CONFSGROUPS+= ZFS
+CONFGROUPS+= ZFS
ZFS+= zfs
ZFS+= zfsbe
ZFS+= zfsd
@@ -324,7 +324,7 @@ ETC_ZFS=/etc/zfs
ETC_ZFSPACKAGE=zfs
.endif
-.for fg in ${CONFSGROUPS}
+.for fg in ${CONFGROUPS}
${fg}MODE?=${BINMODE}
.endfor
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336850 - in head: etc usr.sbin/nscd
Author: brd
Date: Sat Jul 28 23:29:36 2018
New Revision: 336850
URL: https://svnweb.freebsd.org/changeset/base/336850
Log:
Move nscd.conf from etc/ to usr.sbin/nscd/
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16490
Added:
head/usr.sbin/nscd/nscd.conf
- copied unchanged from r336849, head/etc/nscd.conf
Deleted:
head/etc/nscd.conf
Modified:
head/etc/Makefile
head/usr.sbin/nscd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Jul 28 23:02:10 2018(r336849)
+++ head/etc/Makefile Sat Jul 28 23:29:36 2018(r336850)
@@ -115,10 +115,6 @@ SSH= ${SRCTOP}/crypto/openssh/ssh_config \
SSL= ${SRCTOP}/crypto/openssl/apps/openssl.cnf
.endif
-.if ${MK_NS_CACHING} != "no"
-BIN1+= nscd.conf
-.endif
-
.if ${MK_PORTSNAP} != "no"
BIN1+= portsnap.conf
.endif
Modified: head/usr.sbin/nscd/Makefile
==
--- head/usr.sbin/nscd/Makefile Sat Jul 28 23:02:10 2018(r336849)
+++ head/usr.sbin/nscd/Makefile Sat Jul 28 23:29:36 2018(r336850)
@@ -1,5 +1,6 @@
# $FreeBSD$
+CONFS= nscd.conf
PROG= nscd
MAN= nscd.conf.5 nscd.8
Copied: head/usr.sbin/nscd/nscd.conf (from r336849, head/etc/nscd.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/nscd/nscd.confSat Jul 28 23:29:36 2018
(r336850, copy of r336849, head/etc/nscd.conf)
@@ -0,0 +1,12 @@
+#
+# Default caching daemon configuration file
+# $FreeBSD$
+#
+
+enable-cache passwd yes
+enable-cache group yes
+enable-cache hosts yes
+enable-cache services yes
+enable-cache protocols yes
+enable-cache rpc yes
+enable-cache networks yes
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336849 - head/sbin/init
Author: brd Date: Sat Jul 28 23:02:10 2018 New Revision: 336849 URL: https://svnweb.freebsd.org/changeset/base/336849 Log: Switch these to CONFS as well so they work with etcupdate/mergemaster. Approved by: will (mentor) Modified: head/sbin/init/Makefile Modified: head/sbin/init/Makefile == --- head/sbin/init/Makefile Sat Jul 28 20:45:36 2018(r336848) +++ head/sbin/init/Makefile Sat Jul 28 23:02:10 2018(r336849) @@ -1,15 +1,15 @@ # @(#)Makefile8.1 (Berkeley) 7/19/93 # $FreeBSD$ -FILESGROUPS= FILESETC FILESETCEXEC FILESETCDEFAULTS -FILESETCDIR= /etc -FILESETC= network.subr rc rc.initdiskless rc.subr rc.shutdown -FILESETCMODE= 644 -FILESETCEXEC= netstart pccard_ether rc.resume rc.suspend -FILESETCEXECDIR= /etc -FILESETCEXECMODE= 755 -FILESETCDEFAULTSDIR= /etc/defaults -FILESETCDEFAULTS= rc.conf +CONFGROUPS=CONFETC CONFETCEXEC CONFETCDEFAULTS +CONFETCDIR=/etc +CONFETC= network.subr rc rc.initdiskless rc.subr rc.shutdown +CONFETCMODE= 644 +CONFETCEXEC= netstart pccard_ether rc.resume rc.suspend +CONFETCEXECDIR=/etc +CONFETCEXECMODE= 755 +CONFETCDEFAULTSDIR=/etc/defaults +CONFETCDEFAULTS= rc.conf PACKAGE=runtime PROG= init SRCS= init.c getmntopts.c ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336847 - in head: etc etc/defaults sbin/init
Author: brd
Date: Sat Jul 28 20:41:33 2018
New Revision: 336847
URL: https://svnweb.freebsd.org/changeset/base/336847
Log:
Opps, I missed moving a couple of files in r336845.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16466
Added:
head/sbin/init/netstart
- copied unchanged from r336846, head/etc/netstart
head/sbin/init/network.subr
- copied unchanged from r336846, head/etc/network.subr
head/sbin/init/pccard_ether
- copied unchanged from r336846, head/etc/pccard_ether
head/sbin/init/rc
- copied unchanged from r336846, head/etc/rc
head/sbin/init/rc.conf
- copied unchanged from r336846, head/etc/defaults/rc.conf
head/sbin/init/rc.initdiskless
- copied unchanged from r336846, head/etc/rc.initdiskless
head/sbin/init/rc.resume
- copied unchanged from r336846, head/etc/rc.resume
head/sbin/init/rc.shutdown
- copied unchanged from r336846, head/etc/rc.shutdown
head/sbin/init/rc.subr
- copied unchanged from r336846, head/etc/rc.subr
head/sbin/init/rc.suspend
- copied unchanged from r336846, head/etc/rc.suspend
Deleted:
head/etc/defaults/rc.conf
head/etc/netstart
head/etc/network.subr
head/etc/pccard_ether
head/etc/rc
head/etc/rc.initdiskless
head/etc/rc.resume
head/etc/rc.shutdown
head/etc/rc.subr
head/etc/rc.suspend
Copied: head/sbin/init/netstart (from r336846, head/etc/netstart)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/init/netstart Sat Jul 28 20:41:33 2018(r336847, copy
of r336846, head/etc/netstart)
@@ -0,0 +1,57 @@
+#!/bin/sh -
+#
+# Copyright (c) 1993 The FreeBSD Project
+# 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$
+# From: @(#)netstart 5.9 (Berkeley) 3/30/91
+#
+
+# This file is NOT called by any of the other scripts - it has been
+# obsoleted by /etc/rc.d/* and is provided here only for user
+# convenience (if you're sitting in single user mode and wish to start
+# the network by hand, this script will do it for you).
+#
+
+_start=quietstart
+
+/etc/rc.d/devd ${_start}
+/etc/rc.d/hostid ${_start}
+/etc/rc.d/hostname ${_start}
+/etc/rc.d/ipmon ${_start}
+/etc/rc.d/ipfilter ${_start}
+/etc/rc.d/ipnat ${_start}
+/etc/rc.d/ipfs ${_start}
+/etc/rc.d/sppp ${_start}
+/etc/rc.d/netif ${_start}
+/etc/rc.d/ipsec ${_start}
+/etc/rc.d/ppp ${_start}
+/etc/rc.d/ipfw ${_start}
+/etc/rc.d/routing ${_start}
+/etc/rc.d/route6d ${_start}
+/etc/rc.d/routed ${_start}
+/etc/rc.d/rtsold ${_start}
+/etc/rc.d/nisdomain ${_start}
+
+exit 0
Copied: head/sbin/init/network.subr (from r336846, head/etc/network.subr)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sbin/init/network.subr Sat Jul 28 20:41:33 2018(r336847, copy
of r336846, head/etc/network.subr)
@@ -0,0 +1,1793 @@
+#
+# Copyright (c) 2003 The FreeBSD Project. 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 PROJECT AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
svn commit: r336845 - in head: etc etc/defaults etc/rc.d sbin/init sbin/init/rc.d
Author: brd
Date: Sat Jul 28 20:36:23 2018
New Revision: 336845
URL: https://svnweb.freebsd.org/changeset/base/336845
Log:
Move rc startup scripts from etc/ to sbin/init/
This keeps most startup scripts as CONFS per discussion on src-committers from
back during BSDCan.
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16466
Added:
head/sbin/init/rc.d/
- copied from r336844, head/etc/rc.d/
Deleted:
head/etc/rc.d/
Modified:
head/etc/Makefile
head/etc/defaults/Makefile
head/sbin/init/Makefile
head/sbin/init/rc.d/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Jul 28 20:33:08 2018(r336844)
+++ head/etc/Makefile Sat Jul 28 20:36:23 2018(r336845)
@@ -31,19 +31,14 @@ BIN1= crontab \
mac.conf \
motd \
netconfig \
- network.subr \
networks \
newsyslog.conf \
nsswitch.conf \
phones \
profile \
protocols \
- rc \
rc.bsdextended \
rc.firewall \
- rc.initdiskless \
- rc.shutdown \
- rc.subr \
remote \
rpc \
services \
@@ -144,9 +139,6 @@ BIN1+= csh.cshrc csh.login csh.logout
BIN1+= regdomain.xml
.endif
-# -rwxr-xr-x root:wheel, for the new cron root:wheel
-BIN2= netstart pccard_ether rc.suspend rc.resume
-
.if ${MK_SENDMAIL} == "no"
ETCMAIL=mailer.conf aliases
.else
@@ -187,8 +179,6 @@ distribution:
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
${BIN1} ${DESTDIR}/etc; \
cap_mkdb ${CAP_MKDB_ENDIAN} ${DESTDIR}/etc/login.conf; \
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 755 \
- ${BIN2} ${DESTDIR}/etc; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 600 \
master.passwd nsmb.conf opieaccess ${DESTDIR}/etc;
@@ -235,7 +225,6 @@ distribution:
.if ${MK_PKGBOOTSTRAP} != "no"
${_+_}cd ${.CURDIR}/pkg; ${MAKE} install
.endif
- ${_+_}cd ${.CURDIR}/rc.d; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${.CURDIR}/syslog.d; ${MAKE} install
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
Modified: head/etc/defaults/Makefile
==
--- head/etc/defaults/Makefile Sat Jul 28 20:33:08 2018(r336844)
+++ head/etc/defaults/Makefile Sat Jul 28 20:36:23 2018(r336845)
@@ -2,7 +2,7 @@
.include
-FILES= devfs.rules periodic.conf rc.conf
+FILES= devfs.rules periodic.conf
FILESDIR= /etc/defaults
.if ${MK_BLUETOOTH} != "no"
Modified: head/sbin/init/Makefile
==
--- head/sbin/init/Makefile Sat Jul 28 20:33:08 2018(r336844)
+++ head/sbin/init/Makefile Sat Jul 28 20:36:23 2018(r336845)
@@ -1,6 +1,15 @@
# @(#)Makefile8.1 (Berkeley) 7/19/93
# $FreeBSD$
+FILESGROUPS= FILESETC FILESETCEXEC FILESETCDEFAULTS
+FILESETCDIR= /etc
+FILESETC= network.subr rc rc.initdiskless rc.subr rc.shutdown
+FILESETCMODE= 644
+FILESETCEXEC= netstart pccard_ether rc.resume rc.suspend
+FILESETCEXECDIR= /etc
+FILESETCEXECMODE= 755
+FILESETCDEFAULTSDIR= /etc/defaults
+FILESETCDEFAULTS= rc.conf
PACKAGE=runtime
PROG= init
SRCS= init.c getmntopts.c
@@ -16,5 +25,7 @@ CFLAGS+=-I${MOUNT}
.PATH: ${MOUNT}
NO_SHARED?=YES
+
+SUBDIR+= rc.d
.include
Modified: head/sbin/init/rc.d/Makefile
==
--- head/etc/rc.d/Makefile Sat Jul 28 20:33:08 2018(r336844)
+++ head/sbin/init/rc.d/MakefileSat Jul 28 20:36:23 2018
(r336845)
@@ -2,10 +2,10 @@
.include
-BINDIR=/etc/rc.d
-FILESGROUPS= FILES
+CONFSDIR= /etc/rc.d
+CONFSGROUPS= CONFS
-FILES= DAEMON \
+CONFS= DAEMON \
FILESYSTEMS \
LOGIN \
NETWORKING \
@@ -75,7 +75,6 @@ FILES=DAEMON \
netif \
netoptions \
netwait \
- newsyslog \
nfsclient \
nfscbd \
nfsd \
@@ -113,8 +112,6 @@ FILES= DAEMON \
stf \
swap \
swaplate \
- sysctl \
- syslogd \
tmp \
${_ubthidhci} \
ugidfw \
@@ -123,7 +120,7 @@ FILES= DAEMON \
watchdogd
.if ${MK_NIS} != "no"
-FILES+=ypbind \
+CONFS+=ypbind \
ypldap \
yppasswdd \
ypserv \
@@ -133,29 +130,29 @@ FILES+= ypbind \
.endif
.if ${MK_ACCT} != "no"
-FILESGROUPS+= ACCT
+CONFSGROUPS+= ACCT
ACCT+= accounting
ACCTPACKAGE= acct
.endif
.if ${MK_ACPI} != "no"
-FILESGROUPS+= ACPI
+CONFSGROUPS+= ACPI
ACPI= power_profile
ACPIPACKAGE= acpi
.endif
.if ${MK_ACPI} != "no" || ${MK_APM} != "no"
-FILES+=
svn commit: r336843 - head/share/mk
Author: brd
Date: Sat Jul 28 20:31:03 2018
New Revision: 336843
URL: https://svnweb.freebsd.org/changeset/base/336843
Log:
Whitespace only change, no functional change intended.
The padding makes it much easier to read, but occasionally means that commits
like this one have to be done to follow up. I intentionally kept this
separate from r336841 to try and make things easier to follow later on.
Approved by: bapt (mentor)
Modified:
head/share/mk/bsd.confs.mk
Modified: head/share/mk/bsd.confs.mk
==
--- head/share/mk/bsd.confs.mk Sat Jul 28 20:29:05 2018(r336842)
+++ head/share/mk/bsd.confs.mk Sat Jul 28 20:31:03 2018(r336843)
@@ -23,12 +23,12 @@ buildconfig: ${${group}}
all: buildconfig
. endif
-.for group in ${CONFGROUPS}
-. if defined(${group}) && !empty(${group})
+. for group in ${CONFGROUPS}
+.if defined(${group}) && !empty(${group})
-.if !target(afterinstallconfig)
+. if !target(afterinstallconfig)
afterinstallconfig:
-.endif
+. endif
installconfig: realinstallconfig afterinstallconfig
.ORDER:realinstallconfig afterinstallconfig
@@ -39,79 +39,79 @@ ${group}DIR?= ${CONFDIR}
STAGE_SETS+= ${group:C,[/*],_,g}
STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
-.if defined(NO_ROOT)
-. if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
-.if defined(${${group}PACKAGE})
+. if defined(NO_ROOT)
+.if !defined(${group}TAGS) || ! ${${group}TAGS:Mpackage=*}
+. if defined(${${group}PACKAGE})
${group}TAGS+= package=${${group}PACKAGE:Uruntime}
-.else
+. else
${group}TAGS+= package=${PACKAGE:Uruntime}
-.endif
. endif
+.endif
${group}TAGS+= config
${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g}
-.endif
+. endif
-.if ${${group}DIR:S/^\///} == ${${group}DIR}
+. if ${${group}DIR:S/^\///} == ${${group}DIR}
# ${group}DIR specifies a variable that specifies a path
DIRS+= ${${group}DIR}
_${group}DIR= ${${group}DIR}
-.else
+. else
# ${group}DIR specifies a path
DIRS+= ${group}DIR
_${group}DIR= ${group}DIR
-.endif
+. endif
-.for cnf in ${${group}}
+. for cnf in ${${group}}
${group}OWN_${cnf}?= ${${group}OWN}
${group}GRP_${cnf}?= ${${group}GRP}
${group}MODE_${cnf}?= ${${group}MODE}
${group}DIR_${cnf}?= ${${group}DIR}
-. if defined(${group}NAME)
+.if defined(${group}NAME)
${group}NAME_${cnf}?= ${${group}NAME}
-. else
+.else
${group}NAME_${cnf}?= ${cnf:T}
-. endif
+.endif
# Determine the directory for the current file. Default to the parent group
# DIR, then check to see how to pass that variable on below.
${group}DIR_${cnf}?= ${${group}DIR}
-. if ${${group}DIR_${cnf}:S/^\///} == ${${group}DIR_${cnf}}
+.if ${${group}DIR_${cnf}:S/^\///} == ${${group}DIR_${cnf}}
# DIR specifies a variable that specifies a path
_${group}DIR_${cnf}= ${${group}DIR_${cnf}}
-. else
+.else
# DIR directly specifies a path
_${group}DIR_${cnf}= ${group}DIR_${cnf}
-. endif
+.endif
${group}PREFIX_${cnf}= ${DESTDIR}${${_${group}DIR_${cnf}}}
# Append DIR to DIRS if not already in place -- DIRS is already filtered, so
# this is primarily to ease inspection.
-. for d in ${DIRS}
+.for d in ${DIRS}
_DIRS+=${${d}}
-. endfor
-. if ${DIRS:M${_${group}DIR_${cnf}}} == ""
-.if ${_DIRS:M${${_${group}DIR_${cnf == ""
+.endfor
+.if ${DIRS:M${_${group}DIR_${cnf}}} == ""
+. if ${_DIRS:M${${_${group}DIR_${cnf == ""
DIRS+= ${_${group}DIR_${cnf}}
-.else
+. else
_${group}DIR_${cnf}= ${group}DIR
-.endif
. endif
+.endif
-. if defined(${group}NAME)
+.if defined(${group}NAME)
${group}NAME_${cnf}?= ${${group}NAME}
-. else
+.else
${group}NAME_${cnf}?= ${cnf:T}
-. endif # defined(${group}NAME)
+.endif # defined(${group}NAME)
# Work around a bug with install(1) -C and /dev/null
-. if ${cnf} == "/dev/null"
+.if ${cnf} == "/dev/null"
INSTALL_COPY=
-. else
+.else
INSTALL_COPY= -C
-. endif
+.endif
STAGE_AS_SETS+= ${cnf:T}
STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
@@ -124,8 +124,7 @@ _${group}INS_${cnf:T}: ${cnf}
${INSTALL} ${${group}TAG_ARGS} ${INSTALL_COPY} -o ${${group}OWN_${cnf}}
\
-g ${${group}GRP_${cnf}} -m ${${group}MODE_${cnf}} \
${.ALLSRC} ${${group}PREFIX_${cnf}}/${${group}NAME_${cnf}}
-.endfor # for cnf in ${${group}}
-
+. endfor # for cnf in ${${group}}
.endif # defined(${group}) && !empty(${group})
. endfor
svn commit: r336841 - head/share/mk
Author: brd
Date: Sat Jul 28 20:26:25 2018
New Revision: 336841
URL: https://svnweb.freebsd.org/changeset/base/336841
Log:
Fix `make distribute' installing some configs which means CONFS was broken
with etcupdate and mergemaster.
Approved by: bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D16478
Modified:
head/share/mk/bsd.confs.mk
Modified: head/share/mk/bsd.confs.mk
==
--- head/share/mk/bsd.confs.mk Sat Jul 28 20:21:23 2018(r336840)
+++ head/share/mk/bsd.confs.mk Sat Jul 28 20:26:25 2018(r336841)
@@ -23,7 +23,6 @@ buildconfig: ${${group}}
all: buildconfig
. endif
-. if !target(installconfig)
.for group in ${CONFGROUPS}
. if defined(${group}) && !empty(${group})
@@ -130,8 +129,6 @@ _${group}INS_${cnf:T}: ${cnf}
.endif # defined(${group}) && !empty(${group})
. endfor
-
-.endif # !target(installconfig)
.if ${MK_STAGING} != "no"
. if !empty(STAGE_SETS)
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336840 - in head: etc lib/libc/gen
Author: brd
Date: Sat Jul 28 20:21:23 2018
New Revision: 336840
URL: https://svnweb.freebsd.org/changeset/base/336840
Log:
Move etc/shells to lib/libc/gen with getusershell(3).
Approved by: will (mentor)
Differential Revision:https://reviews.freebsd.org/D16467
Added:
head/lib/libc/gen/shells
- copied unchanged from r336839, head/etc/shells
Deleted:
head/etc/shells
Modified:
head/etc/Makefile
head/lib/libc/gen/Makefile.inc
Modified: head/etc/Makefile
==
--- head/etc/Makefile Sat Jul 28 20:21:04 2018(r336839)
+++ head/etc/Makefile Sat Jul 28 20:21:23 2018(r336840)
@@ -47,7 +47,6 @@ BIN1= crontab \
remote \
rpc \
services \
- shells \
sysctl.conf \
syslog.conf \
termcap.small
Modified: head/lib/libc/gen/Makefile.inc
==
--- head/lib/libc/gen/Makefile.inc Sat Jul 28 20:21:04 2018
(r336839)
+++ head/lib/libc/gen/Makefile.inc Sat Jul 28 20:21:23 2018
(r336840)
@@ -4,6 +4,8 @@
# machine-independent gen sources
.PATH: ${LIBC_SRCTOP}/${LIBC_ARCH}/gen ${LIBC_SRCTOP}/gen
+CONFS= shells
+
SRCS+= __getosreldate.c \
__pthread_mutex_init_calloc_cb_stub.c \
__xuname.c \
Copied: head/lib/libc/gen/shells (from r336839, head/etc/shells)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/lib/libc/gen/shellsSat Jul 28 20:21:23 2018(r336840, copy
of r336839, head/etc/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
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336742 - in head: etc sbin/dump
On Fri, Jul 27, 2018, at 4:07 PM, Brad Davis wrote: > On Fri, Jul 27, 2018, at 3:30 PM, Brad Davis wrote: > > On Fri, Jul 27, 2018, at 3:26 PM, Antoine Brodin wrote: > > > On Thu, Jul 26, 2018 at 6:45 PM, Brad Davis wrote: > > > > Author: brd > > > > Date: Thu Jul 26 16:45:25 2018 > > > > New Revision: 336742 > > > > URL: https://svnweb.freebsd.org/changeset/base/336742 > > > > > > > > Log: > > > > Move dumpdates creation to CONFS= > > > > > > > > Approved by: bapt (mentor) > > > > Differential Revision:https://reviews.freebsd.org/D16435 > > > > > > Hi, > > > > > > This commit seems to prevent successful installation of FreeBSD. > > > > It only seems to prevent upgrades, so my build a release VM test is not > > enough.. I am working on it right now. > > I found the issue and I opened up the following review for one of my > mentors to approve and have prodded them: > > https://reviews.freebsd.org/D16476 > > install(1) should be fixed, but this gets around the issue quickly so > people can move on. Committed in r336794. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336794 - head/share/mk
Author: brd
Date: Fri Jul 27 22:46:42 2018
New Revision: 336794
URL: https://svnweb.freebsd.org/changeset/base/336794
Log:
Avoid a install(1) crash by not using -C when the source is /dev/null
Approved by: allanjude (mentor)
Differential Revision:https://reviews.freebsd.org/D16476
Modified:
head/share/mk/bsd.confs.mk
Modified: head/share/mk/bsd.confs.mk
==
--- head/share/mk/bsd.confs.mk Fri Jul 27 22:35:07 2018(r336793)
+++ head/share/mk/bsd.confs.mk Fri Jul 27 22:46:42 2018(r336794)
@@ -107,6 +107,12 @@ ${group}NAME_${cnf}?= ${${group}NAME}
${group}NAME_${cnf}?= ${cnf:T}
. endif # defined(${group}NAME)
+# Work around a bug with install(1) -C and /dev/null
+. if ${cnf} == "/dev/null"
+INSTALL_COPY=
+. else
+INSTALL_COPY= -C
+. endif
STAGE_AS_SETS+= ${cnf:T}
STAGE_AS_${cnf:T}= ${${group}NAME_${cnf:T}}
@@ -116,7 +122,7 @@ stage_as.${cnf:T}: ${cnf}
realinstallconfig: installdirs-${_${group}DIR_${cnf}} _${group}INS_${cnf:T}
_${group}INS_${cnf:T}: ${cnf}
- ${INSTALL} ${${group}TAG_ARGS} -C -o ${${group}OWN_${cnf}} \
+ ${INSTALL} ${${group}TAG_ARGS} ${INSTALL_COPY} -o ${${group}OWN_${cnf}}
\
-g ${${group}GRP_${cnf}} -m ${${group}MODE_${cnf}} \
${.ALLSRC} ${${group}PREFIX_${cnf}}/${${group}NAME_${cnf}}
.endfor # for cnf in ${${group}}
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336742 - in head: etc sbin/dump
On Fri, Jul 27, 2018, at 3:30 PM, Brad Davis wrote: > On Fri, Jul 27, 2018, at 3:26 PM, Antoine Brodin wrote: > > On Thu, Jul 26, 2018 at 6:45 PM, Brad Davis wrote: > > > Author: brd > > > Date: Thu Jul 26 16:45:25 2018 > > > New Revision: 336742 > > > URL: https://svnweb.freebsd.org/changeset/base/336742 > > > > > > Log: > > > Move dumpdates creation to CONFS= > > > > > > Approved by: bapt (mentor) > > > Differential Revision:https://reviews.freebsd.org/D16435 > > > > Hi, > > > > This commit seems to prevent successful installation of FreeBSD. > > It only seems to prevent upgrades, so my build a release VM test is not > enough.. I am working on it right now. I found the issue and I opened up the following review for one of my mentors to approve and have prodded them: https://reviews.freebsd.org/D16476 install(1) should be fixed, but this gets around the issue quickly so people can move on. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336742 - in head: etc sbin/dump
On Fri, Jul 27, 2018, at 3:26 PM, Antoine Brodin wrote: > On Thu, Jul 26, 2018 at 6:45 PM, Brad Davis wrote: > > Author: brd > > Date: Thu Jul 26 16:45:25 2018 > > New Revision: 336742 > > URL: https://svnweb.freebsd.org/changeset/base/336742 > > > > Log: > > Move dumpdates creation to CONFS= > > > > Approved by: bapt (mentor) > > Differential Revision:https://reviews.freebsd.org/D16435 > > Hi, > > This commit seems to prevent successful installation of FreeBSD. It only seems to prevent upgrades, so my build a release VM test is not enough.. I am working on it right now. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336744 - in head: sbin/pfctl/tests/files share/mk
On Thu, Jul 26, 2018, at 11:09 AM, Shawn Webb wrote:
> On Thu, Jul 26, 2018 at 05:05:34PM +0000, Brad Davis wrote:
> > Author: brd
> > Date: Thu Jul 26 17:05:33 2018
> > New Revision: 336744
> > URL: https://svnweb.freebsd.org/changeset/base/336744
> >
> > Log:
> > Convert bsd.files.mk to support DIRS and simplify by only having one
> > install
> > target.
> >
> > Also update the pfctl tests Makefile to work with this change.
> >
> > Approved by: bapt (mentor)
> > Differential Revision:https://reviews.freebsd.org/D16430
> >
> > Modified:
> > head/sbin/pfctl/tests/files/Makefile
> > head/share/mk/bsd.files.mk
> >
> > Modified: head/sbin/pfctl/tests/files/Makefile
> > ==
> > --- head/sbin/pfctl/tests/files/MakefileThu Jul 26 16:51:23 2018
> > (r336743)
> > +++ head/sbin/pfctl/tests/files/MakefileThu Jul 26 17:05:33 2018
> > (r336744)
> > @@ -4,9 +4,7 @@ TESTSDIR= ${TESTSBASE}/sbin/pfctl/files
> > BINDIR=${TESTSDIR}
> >
> > # We use ${.CURDIR} as workaround so that the glob patterns work.
> > -FILES= ${.CURDIR}/pf.in
> > -FILES+=${.CURDIR}/pf.include
> > -FILES+=${.CURDIR}/pf.ok
> > +FILES!=echo ${.CURDIR}/pf.in ${.CURDIR}/pf.include
> > ${.CURDIR}/pf.ok
>
> Should this use ${ECHO} instead of echo?
No, that wouldn't work at all with the !=.
Regards,
Brad Davis
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336744 - in head: sbin/pfctl/tests/files share/mk
Author: brd
Date: Thu Jul 26 17:05:33 2018
New Revision: 336744
URL: https://svnweb.freebsd.org/changeset/base/336744
Log:
Convert bsd.files.mk to support DIRS and simplify by only having one install
target.
Also update the pfctl tests Makefile to work with this change.
Approved by: bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D16430
Modified:
head/sbin/pfctl/tests/files/Makefile
head/share/mk/bsd.files.mk
Modified: head/sbin/pfctl/tests/files/Makefile
==
--- head/sbin/pfctl/tests/files/MakefileThu Jul 26 16:51:23 2018
(r336743)
+++ head/sbin/pfctl/tests/files/MakefileThu Jul 26 17:05:33 2018
(r336744)
@@ -4,9 +4,7 @@ TESTSDIR= ${TESTSBASE}/sbin/pfctl/files
BINDIR=${TESTSDIR}
# We use ${.CURDIR} as workaround so that the glob patterns work.
-FILES= ${.CURDIR}/pf.in
-FILES+=${.CURDIR}/pf.include
-FILES+=${.CURDIR}/pf.ok
+FILES!=echo ${.CURDIR}/pf.in ${.CURDIR}/pf.include
${.CURDIR}/pf.ok
FILES+=${.CURDIR}/pfctl_test_descr.sh
.include
Modified: head/share/mk/bsd.files.mk
==
--- head/share/mk/bsd.files.mk Thu Jul 26 16:51:23 2018(r336743)
+++ head/share/mk/bsd.files.mk Thu Jul 26 17:05:33 2018(r336744)
@@ -5,6 +5,10 @@
.endif
.if !target()
+.if target()
+.error bsd.dirs.mk must be included after bsd.files.mk.
+.endif
+
:
FILESGROUPS?= FILES
@@ -31,7 +35,7 @@ ${group}OWN= ${SHAREOWN}
${group}GRP= ${SHAREGRP}
.endif
${group}MODE?= ${SHAREMODE}
-${group}DIR?= ${BINDIR}
+${group}DIR?= BINDIR
STAGE_SETS+= ${group:C,[/*],_,g}
STAGE_DIR.${group:C,[/*],_,g}= ${STAGE_OBJTOP}${${group}DIR}
@@ -43,71 +47,72 @@ ${group}TAG_ARGS= -T ${${group}TAGS:[*]:S/ /,/g}
.endif
-_${group}FILES=
-.for file in ${${group}}
-.if defined(${group}OWN_${file:T}) || defined(${group}GRP_${file:T}) || \
-defined(${group}MODE_${file:T}) || defined(${group}DIR_${file:T}) || \
-defined(${group}NAME_${file:T}) || defined(${group}NAME)
-${group}OWN_${file:T}?=${${group}OWN}
-${group}GRP_${file:T}?=${${group}GRP}
-.if ${MK_INSTALL_AS_USER} == "yes"
-${group}OWN_${file:T}= ${SHAREOWN}
-${group}GRP_${file:T}= ${SHAREGRP}
-.endif
-${group}MODE_${file:T}?= ${${group}MODE}
-${group}DIR_${file:T}?=${${group}DIR}
-.if defined(${group}NAME)
-${group}NAME_${file:T}?= ${${group}NAME}
+.if ${${group}DIR:S/^\///} == ${${group}DIR}
+# ${group}DIR specifies a variable that specifies a path
+DIRS+= ${${group}DIR}
+_${group}DIR= ${${group}DIR}
.else
-${group}NAME_${file:T}?= ${file:T}
+# ${group}DIR specifies a path
+DIRS+= ${group}DIR
+_${group}DIR= ${group}DIR
.endif
-STAGE_AS_SETS+=${file:T}
-STAGE_AS_${file:T}= ${${group}NAME_${file:T}}
-# XXX {group}OWN,GRP,MODE
-STAGE_DIR.${file:T}= ${STAGE_OBJTOP}${${group}DIR_${file:T}}
-stage_as.${file:T}: ${file}
-installfiles-${group}: installdirs-${group} _${group}INS_${file:T}
-_${group}INS_${file:T}: ${file}
- ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN_${.ALLSRC:T}} \
- -g ${${group}GRP_${.ALLSRC:T}} -m ${${group}MODE_${.ALLSRC:T}} \
- ${.ALLSRC} \
- ${DESTDIR}${${group}DIR_${.ALLSRC:T}}/${${group}NAME_${.ALLSRC:T}}
-.else
-_${group}FILES+= ${file}
-.endif
-.endfor
+.for file in ${${group}}
+${group}OWN_${file}?= ${${group}OWN}
+${group}GRP_${file}?= ${${group}GRP}
+.if ${MK_INSTALL_AS_USER} == "yes"
+${group}OWN_${file}= ${SHAREOWN}
+${group}GRP_${file}= ${SHAREGRP}
+.endif # ${MK_INSTALL_AS_USER} == "yes"
+${group}MODE_${file}?= ${${group}MODE}
-installdirs-${group}:
- @${ECHO} installing dirs ${group}DIR ${${group}DIR}
-.for dir in ${${group}DIR}
-.if defined(NO_ROOT)
- ${INSTALL} ${${group}TAG_ARGS} -d ${DESTDIR}${dir}
+# Determine the directory for the current file. Default to the parent group
+# DIR, then check to see how to pass that variable on below.
+${group}DIR_${file}?= ${${group}DIR}
+.if ${${group}DIR_${file}:S/^\///} == ${${group}DIR_${file}}
+# DIR specifies a variable that specifies a path
+_${group}DIR_${file}= ${${group}DIR_${file}}
.else
- ${INSTALL} ${${group}TAG_ARGS} -d -o ${DIROWN} -g ${DIRGRP} \
- -m ${DIRMODE} ${DESTDIR}${dir}
+# DIR directly specifies a path
+_${group}DIR_${file}= ${group}DIR_${file}
.endif
-.endfor
+${group}PREFIX_${file}=${DESTDIR}${${_${group}DIR_${file}}}
-
-.if !empty(_${group}FILES)
-stage_files.${group}: ${_${group}FILES}
-
-installfiles-${group}: installdirs-${group} _${group}INS
-_${group}INS: ${_${group}FILES}
-.if defined(${group}NAME)
- ${INSTALL} ${${group}TAG_ARGS} -o ${${group}OWN} -g ${${group}GRP} \
- -m ${${group}MODE} ${.ALLSRC} \
-
svn commit: r336743 - in head: etc usr.sbin/apmd
Author: brd
Date: Thu Jul 26 16:51:23 2018
New Revision: 336743
URL: https://svnweb.freebsd.org/changeset/base/336743
Log:
Move apmd.conf to CONFS in usr.sbin/apmd which simplifies this nicely.
Approved by: bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D16431
Added:
head/usr.sbin/apmd/apmd.conf
- copied unchanged from r336742, head/etc/apmd.conf
Deleted:
head/etc/apmd.conf
Modified:
head/etc/Makefile
head/usr.sbin/apmd/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Thu Jul 26 16:45:25 2018(r336742)
+++ head/etc/Makefile Thu Jul 26 16:51:23 2018(r336743)
@@ -76,12 +76,6 @@ BSM_ETC_DIR= ${DESTDIR}/etc/security
BIN1+= amd.map
.endif
-.if ${MACHINE} == "i386"
-.if ${MK_APM} != "no"
-BIN1+= apmd.conf
-.endif
-.endif
-
.if ${MK_AUTOFS} != "no"
BIN1+= auto_master
.endif
Modified: head/usr.sbin/apmd/Makefile
==
--- head/usr.sbin/apmd/Makefile Thu Jul 26 16:45:25 2018(r336742)
+++ head/usr.sbin/apmd/Makefile Thu Jul 26 16:51:23 2018(r336743)
@@ -1,5 +1,6 @@
# $FreeBSD$
+CONFS= apmd.conf
PROG= apmd
MAN= apmd.8
MANSUBDIR= /i386
Copied: head/usr.sbin/apmd/apmd.conf (from r336742, head/etc/apmd.conf)
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/usr.sbin/apmd/apmd.confThu Jul 26 16:51:23 2018
(r336743, copy of r336742, head/etc/apmd.conf)
@@ -0,0 +1,55 @@
+# apmd Configuration File
+#
+# $FreeBSD$
+#
+
+apm_event SUSPENDREQ {
+ exec "/etc/rc.suspend apm suspend";
+}
+
+apm_event USERSUSPENDREQ {
+ exec "sync && sync && sync";
+ exec "sleep 1";
+ exec "apm -z";
+}
+
+apm_event NORMRESUME {
+ exec "/etc/rc.resume apm suspend";
+}
+
+apm_event STANDBYRESUME {
+ exec "/etc/rc.resume apm standby";
+}
+
+# resume event configuration for serial mouse users by
+# reinitializing a moused(8) connected to a serial port.
+#
+#apm_event NORMRESUME {
+# exec "kill -HUP `cat /var/run/moused.pid`";
+#}
+
+# suspend request event configuration for ATA HDD users:
+# execute standby instead of suspend.
+#
+#apm_event SUSPENDREQ {
+# reject;
+# exec "sync && sync && sync";
+# exec "sleep 1";
+# exec "apm -Z";
+#}
+
+# Sample entries for battery state monitoring
+#apm_battery 5% discharging {
+# exec "logger -p user.emerg battery status critical!";
+# exec "echo T250L8CE-GE-C >/dev/speaker";
+#}
+#apm_battery 1% discharging {
+# exec "logger -p user.emerg battery low - emergency suspend";
+# exec "echo T250L16B+BA+AG+GF+FED+DC+CC >/dev/speaker";
+# exec "apm -z";
+#}
+#apm_battery 99% charging {
+# exec "logger -p user.notice battery fully charged";
+#}
+
+# apmd Configuration ends here
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336742 - in head: etc sbin/dump
Author: brd
Date: Thu Jul 26 16:45:25 2018
New Revision: 336742
URL: https://svnweb.freebsd.org/changeset/base/336742
Log:
Move dumpdates creation to CONFS=
Approved by: bapt (mentor)
Differential Revision:https://reviews.freebsd.org/D16435
Modified:
head/etc/Makefile
head/sbin/dump/Makefile
Modified: head/etc/Makefile
==
--- head/etc/Makefile Thu Jul 26 16:08:34 2018(r336741)
+++ head/etc/Makefile Thu Jul 26 16:45:25 2018(r336742)
@@ -296,8 +296,6 @@ distribution:
${INSTALL_SYMLINK} mail/aliases ${DESTDIR}/etc/aliases; \
fi
.endif
- ${INSTALL} -o ${BINOWN} -g operator -m 664 /dev/null \
- ${DESTDIR}/etc/dumpdates
.if ${MK_LOCATE} != "no"
${INSTALL} -o nobody -g ${BINGRP} -m 644 /dev/null \
${DESTDIR}/var/db/locate.database
Modified: head/sbin/dump/Makefile
==
--- head/sbin/dump/Makefile Thu Jul 26 16:08:34 2018(r336741)
+++ head/sbin/dump/Makefile Thu Jul 26 16:45:25 2018(r336742)
@@ -15,6 +15,10 @@
PACKAGE=runtime
PROG= dump
+CONFS= /dev/null
+CONFSGRP= operator
+CONFSMODE= 664
+CONFSNAME_/dev/null= dumpdates
LINKS= ${BINDIR}/dump ${BINDIR}/rdump
CFLAGS+=-DRDUMP
SRCS= itime.c main.c optr.c dumprmt.c tape.c traverse.c unctime.c cache.c
___
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336675 - head/share/mk
On Tue, Jul 24, 2018, at 4:06 PM, Brad Davis wrote: > On Tue, Jul 24, 2018, at 3:55 PM, Brad Davis wrote: > > On Tue, Jul 24, 2018, at 3:32 PM, Antoine Brodin wrote: > > > On Tue, Jul 24, 2018 at 6:34 PM, Brad Davis wrote: > > > > Author: brd > > > > Date: Tue Jul 24 16:34:58 2018 > > > > New Revision: 336675 > > > > URL: https://svnweb.freebsd.org/changeset/base/336675 > > > > > > > > Log: > > > > Convert bsd.confs.mk to support DIRS. > > > > > > > > This paves the way for moving config files out of head/etc and into > > > > the > > > > directories with the src. > > > > > > > > Approved by: bapt (mentor) > > > > Differential Revision:https://reviews.freebsd.org/D16406 > > > > > > > > Modified: > > > > head/share/mk/bsd.confs.mk > > > > head/share/mk/bsd.files.mk > > > > head/share/mk/bsd.lib.mk > > > > > > This seems broken, with lots of ports I have this error: > > > > > > make[1]: "/usr/share/mk/bsd.files.mk" line 124: Could not find bsd.dirs.mk > > > make[1]: Fatal errors encountered -- cannot continue > > > > Do you have /usr/share/mk/bsd.dirs.mk from r336640? > > I opened: https://reviews.freebsd.org/D16434 Committed as r336693. Thanks for letting me know and sorry for the trouble. Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r336693 - head/share/mk
Author: brd Date: Wed Jul 25 00:33:09 2018 New Revision: 336693 URL: https://svnweb.freebsd.org/changeset/base/336693 Log: Actually install bsd.dirs.mk Approved by: allanjude (mentor) Differential Revision:https://reviews.freebsd.org/D16434 Modified: head/share/mk/Makefile Modified: head/share/mk/Makefile == --- head/share/mk/Makefile Wed Jul 25 00:18:21 2018(r336692) +++ head/share/mk/Makefile Wed Jul 25 00:33:09 2018(r336693) @@ -23,6 +23,7 @@ FILES=\ bsd.cpu.mk \ bsd.crunchgen.mk \ bsd.dep.mk \ + bsd.dirs.mk \ bsd.doc.mk \ bsd.dtb.mk \ bsd.endian.mk \ ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r336675 - head/share/mk
On Tue, Jul 24, 2018, at 3:55 PM, Brad Davis wrote: > On Tue, Jul 24, 2018, at 3:32 PM, Antoine Brodin wrote: > > On Tue, Jul 24, 2018 at 6:34 PM, Brad Davis wrote: > > > Author: brd > > > Date: Tue Jul 24 16:34:58 2018 > > > New Revision: 336675 > > > URL: https://svnweb.freebsd.org/changeset/base/336675 > > > > > > Log: > > > Convert bsd.confs.mk to support DIRS. > > > > > > This paves the way for moving config files out of head/etc and into the > > > directories with the src. > > > > > > Approved by: bapt (mentor) > > > Differential Revision:https://reviews.freebsd.org/D16406 > > > > > > Modified: > > > head/share/mk/bsd.confs.mk > > > head/share/mk/bsd.files.mk > > > head/share/mk/bsd.lib.mk > > > > This seems broken, with lots of ports I have this error: > > > > make[1]: "/usr/share/mk/bsd.files.mk" line 124: Could not find bsd.dirs.mk > > make[1]: Fatal errors encountered -- cannot continue > > Do you have /usr/share/mk/bsd.dirs.mk from r336640? I opened: https://reviews.freebsd.org/D16434 Regards, Brad Davis ___ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
