[CVS] OpenPKG: openpkg-src/sendmail/ rc.sendmail sendmail.spec openpkg...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Jun-2003 17:03:58
Branch: HEAD Handle: 2003062816035701
Modified files:
openpkg-src/sendmailrc.sendmail sendmail.spec
openpkg-web news.txt
Log:
resurrect old way of rotation which includes a daemon restart
Summary:
RevisionChanges Path
1.9 +25 -10 openpkg-src/sendmail/rc.sendmail
1.73+1 -1 openpkg-src/sendmail/sendmail.spec
1.5060 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/sendmail/rc.sendmail
$ cvs diff -u -r1.8 -r1.9 rc.sendmail
--- openpkg-src/sendmail/rc.sendmail 24 Jun 2003 13:28:44 - 1.8
+++ openpkg-src/sendmail/rc.sendmail 28 Jun 2003 15:03:58 - 1.9
@@ -91,14 +91,29 @@
sendmail_start
%daily -u @l_susr@
-opServiceEnabled sendmail || exit 0
+if opServiceEnabled sendmail; then
+opTmpDirGen sendmail
+opTmpDirFile sendmail hint hintfile
+prolog=true
+if [ .$sendmail_log_prolog != . ]; then
+prolog=$prolog; $sendmail_log_prolog
+fi
+epilog=echo 'epilog' $hintfile
+if [ .$sendmail_log_epilog != . ]; then
+epilog=$epilog; $sendmail_log_epilog
+fi
+shtool rotate -f \
+-n${sendmail_log_numfiles} -s${sendmail_log_minsize} \
+-d -z${sendmail_log_complevel} \
+[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+-P $prolog \
+-E $epilog \
+@l_prefix@/var/sendmail/sendmail.log
+if [ .`cat $hintfile` = .epilog ]; then
+sendmail_signal TERM KILL
+sleep 2
+sendmail_start
+fi
+opTmpDirDel sendmail
+fi
-# rotate logfile
-prolog=$sendmail_log_prolog
-epilog=$sendmail_log_epilog @l_prefix@/etc/rc sendmail restart || true
-shtool rotate -f \
--n${sendmail_log_numfiles} -s${sendmail_log_minsize} -d \
--z${sendmail_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
--P ${prolog} \
--E ${epilog} \
-@l_prefix@/var/sendmail/sendmail.log
@@ .
patch -p0 '@@ .'
Index: openpkg-src/sendmail/sendmail.spec
$ cvs diff -u -r1.72 -r1.73 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec24 Jun 2003 13:28:44 - 1.72
+++ openpkg-src/sendmail/sendmail.spec28 Jun 2003 15:03:58 - 1.73
@@ -33,7 +33,7 @@
Group:Mail
License: BSD
Version: 8.12.9
-Release: 20030624
+Release: 20030628
# package options
%option with_fsl yes
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.5059 -r1.5060 news.txt
--- openpkg-web/news.txt 28 Jun 2003 15:00:26 - 1.5059
+++ openpkg-web/news.txt 28 Jun 2003 15:03:57 - 1.5060
@@ -1,3 +1,4 @@
+28-Jun-2003: Upgraded package: Psendmail-8.12.9-20030628
28-Jun-2003: Upgraded package: Psasl-2.1.13-20030628
28-Jun-2003: Upgraded package: Pqpopper-4.0.5-20030628
28-Jun-2003: Upgraded package: Pinn-2.4.0-20030628
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
Re: [CVS] OpenPKG: openpkg-src/sendmail/ rc.sendmail sendmail.spec openpkg...
On Tue, Jun 24, 2003, Thomas Lotterer wrote:
[...]
add/unify log file trimming
[...]
%daily -u @l_susr@
-if opServiceEnabled sendmail; then
-opTmpDirGen sendmail
-opTmpDirFile sendmail hint hintfile
-prolog=true
-if [ .$sendmail_rotate_prolog != . ]; then
-prolog=$prolog; $sendmail_rotate_prolog
-fi
-epilog=echo 'epilog' $hintfile
-if [ .$sendmail_rotate_epilog != . ]; then
-epilog=$epilog; $sendmail_rotate_epilog
-fi
-shtool rotate -f \
--n${sendmail_rotate_numfiles} -s${sendmail_rotate_minsize} \
--d -z${sendmail_rotate_complevel} \
-[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
--P $prolog \
--E $epilog \
-@l_prefix@/var/sendmail/sendmail.log
-if [ .`cat $hintfile` = .epilog ]; then
-sendmail_signal TERM KILL
-sleep 2
-sendmail_start
-fi
-opTmpDirDel sendmail
-fi
+opServiceEnabled sendmail || exit 0
+# rotate logfile
+prolog=$sendmail_log_prolog
+epilog=$sendmail_log_epilog @l_prefix@/etc/rc sendmail restart || true
+shtool rotate -f \
+-n${sendmail_log_numfiles} -s${sendmail_log_minsize} -d \
+-z${sendmail_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+-P ${prolog} \
+-E ${epilog} \
+@l_prefix@/var/sendmail/sendmail.log
Err... again: you removed the additional restarting of the daemon,
Thomas. Please be more careful on those changes in order to not
accidently remove functionality.
Ralf S. Engelschall
[EMAIL PROTECTED]
www.engelschall.com
__
The OpenPKG Projectwww.openpkg.org
Developer Communication List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sendmail/ rc.sendmail sendmail.spec openpkg...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 24-Jun-2003 15:28:45
Branch: HEAD Handle: 2003062414284301
Modified files:
openpkg-src/sendmailrc.sendmail sendmail.spec
openpkg-web news.txt
Log:
add/unify log file trimming
Summary:
RevisionChanges Path
1.8 +15 -30 openpkg-src/sendmail/rc.sendmail
1.72+1 -1 openpkg-src/sendmail/sendmail.spec
1.4997 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/sendmail/rc.sendmail
$ cvs diff -u -r1.7 -r1.8 rc.sendmail
--- openpkg-src/sendmail/rc.sendmail 24 Jun 2003 12:08:08 - 1.7
+++ openpkg-src/sendmail/rc.sendmail 24 Jun 2003 13:28:44 - 1.8
@@ -35,11 +35,11 @@
sendmail_pidfile_in=@l_prefix@/var/sendmail/sendmail.in.pid
sendmail_pidfile_out=@l_prefix@/var/sendmail/sendmail.out.pid
sendmail_pidfile_msp=@l_prefix@/var/sendmail/clientmqueue/sendmail.msp.pid
-sendmail_rotate_prolog=
-sendmail_rotate_epilog=
-sendmail_rotate_numfiles=10
-sendmail_rotate_minsize=1M
-sendmail_rotate_complevel=9
+sendmail_log_prolog=true
+sendmail_log_epilog=true
+sendmail_log_numfiles=10
+sendmail_log_minsize=1M
+sendmail_log_complevel=9
%common
sendmail_start () {
@@ -91,29 +91,14 @@
sendmail_start
%daily -u @l_susr@
-if opServiceEnabled sendmail; then
-opTmpDirGen sendmail
-opTmpDirFile sendmail hint hintfile
-prolog=true
-if [ .$sendmail_rotate_prolog != . ]; then
-prolog=$prolog; $sendmail_rotate_prolog
-fi
-epilog=echo 'epilog' $hintfile
-if [ .$sendmail_rotate_epilog != . ]; then
-epilog=$epilog; $sendmail_rotate_epilog
-fi
-shtool rotate -f \
--n${sendmail_rotate_numfiles} -s${sendmail_rotate_minsize} \
--d -z${sendmail_rotate_complevel} \
-[EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
--P $prolog \
--E $epilog \
-@l_prefix@/var/sendmail/sendmail.log
-if [ .`cat $hintfile` = .epilog ]; then
-sendmail_signal TERM KILL
-sleep 2
-sendmail_start
-fi
-opTmpDirDel sendmail
-fi
+opServiceEnabled sendmail || exit 0
+# rotate logfile
+prolog=$sendmail_log_prolog
+epilog=$sendmail_log_epilog @l_prefix@/etc/rc sendmail restart || true
+shtool rotate -f \
+-n${sendmail_log_numfiles} -s${sendmail_log_minsize} -d \
+-z${sendmail_log_complevel} [EMAIL PROTECTED]@ [EMAIL PROTECTED]@ -m644 \
+-P ${prolog} \
+-E ${epilog} \
+@l_prefix@/var/sendmail/sendmail.log
@@ .
patch -p0 '@@ .'
Index: openpkg-src/sendmail/sendmail.spec
$ cvs diff -u -r1.71 -r1.72 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec23 Jun 2003 21:01:40 - 1.71
+++ openpkg-src/sendmail/sendmail.spec24 Jun 2003 13:28:44 - 1.72
@@ -33,7 +33,7 @@
Group:Mail
License: BSD
Version: 8.12.9
-Release: 20030623
+Release: 20030624
# package options
%option with_fsl yes
@@ .
patch -p0 '@@ .'
Index: openpkg-web/news.txt
$ cvs diff -u -r1.4996 -r1.4997 news.txt
--- openpkg-web/news.txt 24 Jun 2003 13:28:34 - 1.4996
+++ openpkg-web/news.txt 24 Jun 2003 13:28:43 - 1.4997
@@ -1,3 +1,4 @@
+24-Jun-2003: Upgraded package: Psendmail-8.12.9-20030624
24-Jun-2003: Upgraded package: Psasl-2.1.13-20030624
24-Jun-2003: Upgraded package: Pqpopper-4.0.5-20030624
24-Jun-2003: Upgraded package: Ppowerdns-2.9.8-20030624
@@ .
__
The OpenPKG Projectwww.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
[CVS] OpenPKG: openpkg-src/sendmail/ rc.sendmail sendmail.spec openpkg...
OpenPKG CVS Repository
http://cvs.openpkg.org/
Server: cvs.openpkg.org Name: Christoph Schug
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 28-Mar-2003 13:24:46
Branch: HEAD Handle: 2003032812244402
Modified files:
openpkg-src/sendmailrc.sendmail sendmail.spec
openpkg-web news.txt
Log:
rc script and spec file clean up
Summary:
RevisionChanges Path
1.5 +5 -5 openpkg-src/sendmail/rc.sendmail
1.58+20 -19 openpkg-src/sendmail/sendmail.spec
1.3861 +1 -0 openpkg-web/news.txt
patch -p0 '@@ .'
Index: openpkg-src/sendmail/rc.sendmail
$ cvs diff -u -r1.4 -r1.5 rc.sendmail
--- openpkg-src/sendmail/rc.sendmail 7 Feb 2002 14:21:11 - 1.4
+++ openpkg-src/sendmail/rc.sendmail 28 Mar 2003 12:24:46 - 1.5
@@ -59,25 +59,25 @@
fi
}
-%start -p 200 -u root
+%start -p 200 -u @l_susr@
sendmail_start
-%stop -p 200 -u root
+%stop -p 200 -u @l_susr@
sendmail_signal TERM KILL
-%restart -u root
+%restart -u @l_susr@
sendmail_signal TERM KILL
sleep 2
sendmail_start
-%reload -u root
+%reload -u @l_susr@
# sendmail does not like SIGHUP on queue-only processes,
# so we have to perform actually a restart...
sendmail_signal TERM KILL
sleep 2
sendmail_start
-%daily -u root
+%daily -u @l_susr@
if opServiceEnabled sendmail; then
opTmpDirGen sendmail
opTmpDirFile sendmail hint hintfile
@@ .
patch -p0 '@@ .'
Index: openpkg-src/sendmail/sendmail.spec
$ cvs diff -u -r1.57 -r1.58 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec27 Mar 2003 16:27:48 - 1.57
+++ openpkg-src/sendmail/sendmail.spec28 Mar 2003 12:24:46 - 1.58
@@ -33,7 +33,7 @@
Group:Mail
License: BSD
Version: 8.12.8
-Release: 20030327
+Release: 20030328
# package options
%option with_tls no
@@ -258,6 +258,7 @@
%{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 \
-e 's;@l_prefix@;%{l_prefix};g' \
+-e 's;@l_susr@;%{l_susr};g' \
-e 's;@l_musr@;%{l_musr};g' \
-e 's;@l_mgrp@;%{l_mgrp};g' \
%{SOURCE rc.sendmail} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
@@ -283,26 +284,26 @@
# determine file list
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
-'%attr(2755,root,%{l_rgrp})%{l_prefix}/sbin/sendmail' \
-'%attr(4755,root,%{l_mgrp})%{l_prefix}/bin/hoststat' \
-'%attr(4755,root,%{l_mgrp})%{l_prefix}/bin/mailq' \
-'%attr(4755,root,%{l_mgrp})%{l_prefix}/bin/newaliases' \
-'%attr(4755,root,%{l_mgrp})%{l_prefix}/bin/purgestat' \
-'%attr(4755,root,%{l_mgrp})%{l_prefix}/bin/vacation' \
-'%attr(4755,root,%{l_mgrp})%{l_prefix}/libexec/sendmail/smrsh' \
-'%attr(755,root,%{l_mgrp}) %{l_prefix}/etc/sendmail' \
-'%config %{l_prefix}/etc/sendmail/*' \
-'%config %attr(644,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/ca.crt' \
-'%config %attr(644,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/sendmail.crt' \
-'%config %attr(600,root,%{l_mgrp}) %{l_prefix}/etc/sendmail/sendmail.key' \
+'%attr(2755,%{l_susr},%{l_rgrp})%{l_prefix}/sbin/sendmail' \
+'%attr(4755,%{l_susr},%{l_mgrp})%{l_prefix}/bin/hoststat' \
+'%attr(4755,%{l_susr},%{l_mgrp})%{l_prefix}/bin/mailq' \
+'%attr(4755,%{l_susr},%{l_mgrp})%{l_prefix}/bin/newaliases' \
+'%attr(4755,%{l_susr},%{l_mgrp})%{l_prefix}/bin/purgestat' \
+'%attr(4755,%{l_susr},%{l_mgrp})%{l_prefix}/bin/vacation' \
+'%attr(4755,%{l_susr},%{l_mgrp})%{l_prefix}/libexec/sendmail/smrsh'
\
+'%attr(755,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/sendmail' \
+'%config%{l_prefix}/etc/sendmail/*' \
+'%config %attr(644,%{l_susr},%{l_mgrp}) %{l_prefix}/etc/sendmail/ca.crt' \
+'%config %attr(644,%{l_susr},%{l_mgrp})
%{l_prefix}/etc/sendmail/sendmail.crt' \
+'%config %attr(600,%{l_susr},%{l_mgrp})
%{l_prefix}/etc/sendmail/sendmail.key' \
'%config %{l_prefix}/etc/fsl/fsl.sendmail' \
