diff --git a/fsl/fsl.fsl b/fsl/fsl.fsl index 5008424475..941b000179 100644 --- a/fsl/fsl.fsl +++ b/fsl/fsl.fsl @@ -16,15 +16,14 @@ map debug debug; # default logging specification default (.+)/.+ q{ - debug: prefix( - prefix="%b %d %H:%M:%S <%L> $1[%P]: ", - timezone=local - ) -> - file( - path="@l_prefix@/var/fsl/fsl.log", - append=1, - perm=0644 + prefix="%b %d %H:%M:%S %N <%L> $1[%P]: " ) + -> { + debug: file( + path="@l_prefix@/var/fsl/fsl.log", + perm=0644 + ) + } }; diff --git a/fsl/fsl.spec b/fsl/fsl.spec index 9e89ced593..6f424a964c 100644 --- a/fsl/fsl.spec +++ b/fsl/fsl.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [CORE] Group: System License: MIT-style Version: 1.2.0 -Release: 20030714 +Release: 20030715 # package options %option with_fsl_debuglogcode no diff --git a/honeyd/fsl.honeyd b/honeyd/fsl.honeyd index d7dc74befc..3093934d82 100644 --- a/honeyd/fsl.honeyd +++ b/honeyd/fsl.honeyd @@ -2,7 +2,7 @@ ## fsl.honeyd -- OSSP fsl configuration ## -ident honeyd q{ +ident (honeyd)/.+ q{ prefix( prefix="%b %d %H:%M:%S %N <%L> $1[%P]: " ) diff --git a/honeyd/honeyd.spec b/honeyd/honeyd.spec index f0f4ea3cea..420fcfeaa4 100644 --- a/honeyd/honeyd.spec +++ b/honeyd/honeyd.spec @@ -35,7 +35,7 @@ Distribution: OpenPKG [JUNK] Group: Language License: BSD License Version: 0.6 -Release: 20030714 +Release: 20030715 # package options %option with_fsl yes diff --git a/inn/fsl.inn b/inn/fsl.inn index a16f5aaffd..12b85041af 100644 --- a/inn/fsl.inn +++ b/inn/fsl.inn @@ -9,8 +9,7 @@ # news.notice @l_prefix@/var/inn/log/news.notice ident (.+)/news q{ prefix( - prefix="%b %d %H:%M:%S %N $1: ", - timezone=local + prefix="%b %d %H:%M:%S %N $1: " ) -> { critical: file(path="@l_prefix@/var/inn/log/news.crit", perm=0644); diff --git a/inn/inn.spec b/inn/inn.spec index 9f74bfac5d..d7c8c38cfb 100644 --- a/inn/inn.spec +++ b/inn/inn.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE] Group: News License: ISC Version: 2.4.0 -Release: 20030714 +Release: 20030715 # package options %option with_fsl yes diff --git a/openssh/fsl.openssh b/openssh/fsl.openssh index 2244d97c4b..2f2b1ccf6b 100644 --- a/openssh/fsl.openssh +++ b/openssh/fsl.openssh @@ -8,7 +8,7 @@ ident (ssh(d|-.+)?|scp|sftp(-server)?)/.+ q{ ) -> { debug: file( - path="@l_prefix@/var/openssh/sshd.log", + path="@l_prefix@/var/openssh/openssh.log", perm=0644 ) } diff --git a/openssh/openssh.spec b/openssh/openssh.spec index 74e906c3be..4fc3fb90cf 100644 --- a/openssh/openssh.spec +++ b/openssh/openssh.spec @@ -38,7 +38,7 @@ Distribution: OpenPKG [CORE] Group: Security License: BSD Version: %{V_base}%{V_portable} -Release: 20030714 +Release: 20030715 # package options %option with_fsl yes diff --git a/openssh/rc.openssh b/openssh/rc.openssh index ae5c342b45..f70554a747 100644 --- a/openssh/rc.openssh +++ b/openssh/rc.openssh @@ -49,7 +49,7 @@ -z${openssh_log_complevel} -o@l_susr@ -g@l_sgrp@ -m644 \ -P "${openssh_log_prolog}" \ -E "${openssh_log_epilog}" \ - @l_prefix@/var/openssh/sshd.log + @l_prefix@/var/openssh/openssh.log if [ ".`cat $hintfile`" = ".epilog" ]; then openssh_signal TERM sleep 2 diff --git a/pks/fsl.pks b/pks/fsl.pks index 1f25810a0b..1a013327d6 100644 --- a/pks/fsl.pks +++ b/pks/fsl.pks @@ -8,7 +8,7 @@ ident (pksd)/.+ q{ ) -> { debug: file( - path="@l_prefix@/var/pks/pksd.log", + path="@l_prefix@/var/pks/pks.log", perm=0644 ) } diff --git a/pks/pks.spec b/pks/pks.spec index 3fa9ae643e..0ed8b34473 100644 --- a/pks/pks.spec +++ b/pks/pks.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS] Group: Cryptography License: GPL Version: 0.9.6 -Release: 20030714 +Release: 20030715 # package options %option with_fsl yes diff --git a/pks/rc.pks b/pks/rc.pks index bc5b39a85c..043610dba5 100644 --- a/pks/rc.pks +++ b/pks/rc.pks @@ -37,5 +37,5 @@ -z${pks_log_complevel} -o@l_rusr@ -g@l_rgrp@ -m644 \ -P "${pks_log_prolog}" \ -E "${pks_log_epilog}" \ - @l_prefix@/var/pks/pksd.log + @l_prefix@/var/pks/pks.log diff --git a/portfwd/fsl.portfwd b/portfwd/fsl.portfwd index 6790fbe30e..3258756f6b 100644 --- a/portfwd/fsl.portfwd +++ b/portfwd/fsl.portfwd @@ -2,9 +2,9 @@ ## fsl.portfwd -- OSSP fsl configuration ## -ident portfwd/.+ q{ +ident (portfwd)/.+ q{ prefix( - prefix="%b %d %H:%M:%S %N <%L> portfwd[%P]: " + prefix="%b %d %H:%M:%S %N <%L> $1[%P]: " ) -> { debug: file( diff --git a/portfwd/portfwd.spec b/portfwd/portfwd.spec index 89725039dc..3af3b81e3e 100644 --- a/portfwd/portfwd.spec +++ b/portfwd/portfwd.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS] Group: Network License: GPL Version: 0.26rc6 -Release: 20030714 +Release: 20030715 # package options %option with_fsl yes diff --git a/sasl/fsl.sasl b/sasl/fsl.sasl index c1816d554d..5c09ef52a5 100644 --- a/sasl/fsl.sasl +++ b/sasl/fsl.sasl @@ -4,14 +4,13 @@ ident (saslauthd)/.+ q{ prefix( - prefix="%b %d %H:%M:%S %N <%L> $1[%P]: ", - timezone=local + prefix="%b %d %H:%M:%S %N <%L> $1[%P]: " ) -> { debug: file( path="@l_prefix@/var/sasl/log/saslauthd.log", perm=0600 - ); + ) } }; diff --git a/sasl/sasl.spec b/sasl/sasl.spec index 04e7e37613..aee9aa5569 100644 --- a/sasl/sasl.spec +++ b/sasl/sasl.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS] Group: Cryptography License: BSD Version: 2.1.14 -Release: 20030714 +Release: 20030715 # package options %option with_fsl yes diff --git a/sendmail/fsl.sendmail b/sendmail/fsl.sendmail index 884d29804c..ae34eb867d 100644 --- a/sendmail/fsl.sendmail +++ b/sendmail/fsl.sendmail @@ -3,14 +3,14 @@ ## ident (.+)/mail q{ - notice: prefix( - prefix="%b %d %H:%M:%S %N $1[%P]: ", - timezone=local - ) - -> file( - path="@l_prefix@/var/sendmail/sendmail.log", - append=1, - perm=0644 + prefix( + prefix="%b %d %H:%M:%S %N $1[%P]: " ) + -> { + debug: file( + path="@l_prefix@/var/sendmail/sendmail.log", + perm=0644 + ) + } }; diff --git a/sendmail/sendmail.spec b/sendmail/sendmail.spec index e21edf2b56..8bb0e28a25 100644 --- a/sendmail/sendmail.spec +++ b/sendmail/sendmail.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS] Group: Mail License: BSD Version: 8.12.9 -Release: 20030714 +Release: 20030715 # package options %option with_fsl yes diff --git a/whoson/fsl.whoson b/whoson/fsl.whoson index 1bd7af9cef..a7a3111eaf 100644 --- a/whoson/fsl.whoson +++ b/whoson/fsl.whoson @@ -4,14 +4,13 @@ ident (whosond)/.+ q{ prefix( - prefix="%b %d %H:%M:%S %N <%L> $1[%P]: ", - timezone=local + prefix="%b %d %H:%M:%S %N <%L> $1[%P]: " ) -> { debug: file( path="@l_prefix@/var/whoson/log/whosond.log", perm=0600 - ); + ) } }; diff --git a/whoson/whoson.spec b/whoson/whoson.spec index b2ef5548aa..c920ad79fe 100644 --- a/whoson/whoson.spec +++ b/whoson/whoson.spec @@ -33,7 +33,7 @@ Distribution: OpenPKG [EVAL] Group: Mail License: GPL Version: 2.02a -Release: 20030714 +Release: 20030715 # package options %option with_fsl yes