OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael Schloh
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 18-Sep-2003 13:52:13
Branch: HEAD Handle: 2003091812521102
Modified files:
openpkg-src/sendmail etc.sendmail.tar rc.sendmail sendmail.spec
openpkg-web news.txt
Log:
Implemented features in ticket #202, though this means that sendmail
no longer listens on all IPs by default (and thus must be configured
before operation)
Summary:
Revision Changes Path
1.13 +20 -20 openpkg-src/sendmail/etc.sendmail.tar
1.21 +6 -3 openpkg-src/sendmail/rc.sendmail
1.96 +19 -2 openpkg-src/sendmail/sendmail.spec
1.6612 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/etc.sendmail.tar
============================================================================
$ cvs diff -u -r1.12 -r1.13 etc.sendmail.tar
Binary files /tmp/cvsbmfUTg and /tmp/cvsBlJ2GJ differ
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/rc.sendmail
============================================================================
$ cvs diff -u -r1.20 -r1.21 rc.sendmail
--- openpkg-src/sendmail/rc.sendmail 23 Jul 2003 09:24:20 -0000 1.20
+++ openpkg-src/sendmail/rc.sendmail 18 Sep 2003 11:52:13 -0000 1.21
@@ -71,21 +71,25 @@
%start -u @l_susr@
rcService sendmail enable yes || exit 0
+ rcService sendmail active yes && exit 0
sendmail_start
%stop -u @l_susr@
rcService sendmail enable yes || exit 0
+ rcService sendmail active no && exit 0
sendmail_signal TERM
sendmail_wait
%restart -u @l_susr@
rcService sendmail enable yes || exit 0
+ rcService sendmail active no && exit 0
sendmail_signal TERM
sendmail_wait
sendmail_start
%reload -u @l_susr@
rcService sendmail enable yes || exit 0
+ rcService sendmail active no && exit 0
sendmail_signal TERM
sendmail_wait
sendmail_start
@@ -93,9 +97,8 @@
%daily -u @l_susr@
rcService sendmail enable yes || exit 0
shtool rotate -f \
- -n ${sendmail_log_numfiles} -s ${sendmail_log_minsize} \
- -d -z ${sendmail_log_complevel} \
- -o @l_musr@ -g @l_mgrp@ -m 644 \
+ -n ${sendmail_log_numfiles} -s ${sendmail_log_minsize} -d \
+ -z ${sendmail_log_complevel} -o @l_susr@ -g @l_mgrp@ -m 644 \
-P "$sendmail_log_prologue" \
-E "$sendmail_log_epilogue && rc sendmail reload" \
@l_prefix@/var/sendmail/sendmail.log
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sendmail/sendmail.spec
============================================================================
$ cvs diff -u -r1.95 -r1.96 sendmail.spec
--- openpkg-src/sendmail/sendmail.spec 17 Sep 2003 17:41:06 -0000 1.95
+++ openpkg-src/sendmail/sendmail.spec 18 Sep 2003 11:52:13 -0000 1.96
@@ -33,7 +33,7 @@
Group: Mail
License: BSD
Version: 8.12.10
-Release: 20030917
+Release: 20030918
# package options
%option with_fsl yes
@@ -341,6 +341,14 @@
%clean
rm -rf $RPM_BUILD_ROOT
+%pre
+ # before upgrade, save status and stop service
+ if [ $1 -eq 2 ]; then
+ eval `%{l_rc} sendmail status 2>/dev/null | tee %{l_tmpfile}`
+ %{l_rc} sendmail stop 2>/dev/null
+ fi
+ exit 0
+
%post
if [ $1 -eq 1 ]; then
( cd $RPM_INSTALL_PREFIX/etc/sendmail; %{l_make} all >/dev/null 2>&1 ||
true ) || true
@@ -348,10 +356,18 @@
( cd $RPM_INSTALL_PREFIX/etc/sendmail; %{l_make} clean all >/dev/null 2>&1
|| true ) || true
$RPM_INSTALL_PREFIX/etc/rc sendmail reload >/dev/null 2>&1 || true
fi
+ if [ $1 -eq 2 ]; then
+ # after upgrade, restore status
+ eval `cat %{l_tmpfile}`; rm -f %{l_tmpfile}
+ [ ".$sendmail_active" = .yes ] && %{l_rc} sendmail start
+ fi
+ exit 0
%preun
if [ $1 -eq 0 ]; then
- $RPM_INSTALL_PREFIX/etc/rc sendmail stop >/dev/null 2>&1 || true
+ # before erase, stop service and remove residual files
+ %{l_rc} sendmail stop 2>/dev/null
+ rm -f $RPM_INSTALL_PREFIX/var/sendmail/*.log* >/dev/null 2>&1 || true
( cd $RPM_INSTALL_PREFIX/etc/sendmail/;
%{l_make} distclean >/dev/null 2>&1 || true
) || true
@@ -364,4 +380,5 @@
rm -rf $d
fi
fi
+ exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.6611 -r1.6612 news.txt
--- openpkg-web/news.txt 18 Sep 2003 11:45:04 -0000 1.6611
+++ openpkg-web/news.txt 18 Sep 2003 11:52:11 -0000 1.6612
@@ -1,3 +1,4 @@
+18-Sep-2003: Upgraded package: P<sendmail-8.12.10-20030918>
18-Sep-2003: Upgraded package: P<openpkg-20030918-20030918>
18-Sep-2003: Upgraded package: P<cvsd-0.9.20-20030918>
17-Sep-2003: Upgraded package: P<spread-3.17.1-20030917>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
