Page MenuHomeFreeBSD
Files F147305297

D16694.id46596.diff
No OneTemporary
Actions

D16694.id46596.diff
View Options

Index: etc/Makefile
===================================================================
--- etc/Makefile
+++ etc/Makefile
@@ -31,7 +31,6 @@
motd \
netconfig \
networks \
- newsyslog.conf \
nsswitch.conf \
phones \
profile \
@@ -170,7 +169,6 @@
${_+_}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
Index: etc/newsyslog.conf
===================================================================
--- etc/newsyslog.conf
+++ etc/newsyslog.conf
@@ -1,35 +0,0 @@
-# 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 10 1000 * JC
-/var/log/utx.log 644 3 * @01T05 B
-/var/log/weekly.log 640 5 * $W6D0 JN
-
-<include> /etc/newsyslog.conf.d/*
-<include> /usr/local/etc/newsyslog.conf.d/*
Index: etc/newsyslog.conf.d/Makefile
===================================================================
--- etc/newsyslog.conf.d/Makefile
+++ etc/newsyslog.conf.d/Makefile
@@ -1,37 +0,0 @@
-# $FreeBSD$
-
-.include <src.opts.mk>
-
-BINDIR= /etc/newsyslog.conf.d
-
-FILES=
-
-.if ${MK_AMD} != "no"
-FILES+= amd.conf
-.endif
-
-.if ${MK_FTP} != "no"
-FILES+= ftp.conf
-.endif
-
-.if ${MK_LPR} != "no"
-FILES+= lpr.conf
-.endif
-
-.if ${MK_OFED} != "no"
-FILES+= opensm.conf
-.endif
-
-.if ${MK_PF} != "no"
-FILES+= pf.conf
-.endif
-
-.if ${MK_PPP} != "no"
-FILES+= ppp.conf
-.endif
-
-.if ${MK_SENDMAIL} != "no"
-FILES+= sendmail.conf
-.endif
-
-.include <bsd.prog.mk>
Index: etc/newsyslog.conf.d/Makefile.depend
===================================================================
--- etc/newsyslog.conf.d/Makefile.depend
+++ etc/newsyslog.conf.d/Makefile.depend
@@ -1,11 +0,0 @@
-# $FreeBSD$
-# Autogenerated - do NOT edit!
-
-DIRDEPS = \
-
-
-.include <dirdeps.mk>
-
-.if ${DEP_RELDIR} == ${_DEP_RELDIR}
-# local dependencies - needed for -jN in clean tree
-.endif
Index: etc/newsyslog.conf.d/amd.conf
===================================================================
--- etc/newsyslog.conf.d/amd.conf
+++ etc/newsyslog.conf.d/amd.conf
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/amd.log 644 7 1000 * J
Index: etc/newsyslog.conf.d/ftp.conf
===================================================================
--- etc/newsyslog.conf.d/ftp.conf
+++ etc/newsyslog.conf.d/ftp.conf
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/xferlog 600 7 1000 * JC
Index: etc/newsyslog.conf.d/lpr.conf
===================================================================
--- etc/newsyslog.conf.d/lpr.conf
+++ etc/newsyslog.conf.d/lpr.conf
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/lpd-errs 644 7 1000 * JC
Index: etc/newsyslog.conf.d/opensm.conf
===================================================================
--- etc/newsyslog.conf.d/opensm.conf
+++ etc/newsyslog.conf.d/opensm.conf
@@ -1,3 +0,0 @@
-# $FreeBSD$
-
-/var/log/opensm.log 600 7 * * Z /var/run/opensm.pid 30
Index: etc/newsyslog.conf.d/pf.conf
===================================================================
--- etc/newsyslog.conf.d/pf.conf
+++ etc/newsyslog.conf.d/pf.conf
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/pflog 600 3 1000 * JB /var/run/pflogd.pid
Index: etc/newsyslog.conf.d/ppp.conf
===================================================================
--- etc/newsyslog.conf.d/ppp.conf
+++ etc/newsyslog.conf.d/ppp.conf
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/ppp.log root:network 640 3 1000 * JC
Index: etc/newsyslog.conf.d/sendmail.conf
===================================================================
--- etc/newsyslog.conf.d/sendmail.conf
+++ etc/newsyslog.conf.d/sendmail.conf
@@ -1,2 +0,0 @@
-# $FreeBSD$
-/var/log/sendmail.st 640 10 * 168 BN
Index: usr.sbin/newsyslog/Makefile
===================================================================
--- usr.sbin/newsyslog/Makefile
+++ usr.sbin/newsyslog/Makefile
@@ -2,6 +2,7 @@
.include <src.opts.mk>
+CONFS= newsyslog.conf
PROG= newsyslog
MAN= newsyslog.8 newsyslog.conf.5
SRCS= newsyslog.c ptimes.c
@@ -9,5 +10,6 @@
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
+SUBDIR+= newsyslog.conf.d
.include <bsd.prog.mk>
Index: usr.sbin/newsyslog/newsyslog.conf.d/Makefile
===================================================================
--- usr.sbin/newsyslog/newsyslog.conf.d/Makefile
+++ usr.sbin/newsyslog/newsyslog.conf.d/Makefile
@@ -2,36 +2,36 @@
.include <src.opts.mk>
-BINDIR= /etc/newsyslog.conf.d
+CONFSDIR= /etc/newsyslog.conf.d
-FILES=
+CONFS=
.if ${MK_AMD} != "no"
-FILES+= amd.conf
+CONFS+= amd.conf
.endif
.if ${MK_FTP} != "no"
-FILES+= ftp.conf
+CONFS+= ftp.conf
.endif
.if ${MK_LPR} != "no"
-FILES+= lpr.conf
+CONFS+= lpr.conf
.endif
.if ${MK_OFED} != "no"
-FILES+= opensm.conf
+CONFS+= opensm.conf
.endif
.if ${MK_PF} != "no"
-FILES+= pf.conf
+CONFS+= pf.conf
.endif
.if ${MK_PPP} != "no"
-FILES+= ppp.conf
+CONFS+= ppp.conf
.endif
.if ${MK_SENDMAIL} != "no"
-FILES+= sendmail.conf
+CONFS+= sendmail.conf
.endif
.include <bsd.prog.mk>

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 10, 8:02 PM (7 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29509736
Default Alt Text
D16694.id46596.diff (6 KB)

Event Timeline