Hello community, here is the log from the commit of package sysconfig checked in at Wed Nov 28 23:51:53 CET 2007. -------- --- sysconfig/sysconfig.changes 2007-09-18 11:56:13.000000000 +0200 +++ /mounts/work_src_done/STABLE/sysconfig/sysconfig.changes 2007-11-28 12:25:12.196399000 +0100 @@ -1,0 +2,6 @@ +Wed Nov 28 12:23:24 CET 2007 - werner@suse.de + +- Some small changes on pool.tcpip to reduce conflicts with already + running fetchmail deamon or MTA (bug #231042). + +------------------------------------------------------------------- New: ---- sysconfig-0.70.2.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.U24436/_old 2007-11-28 23:51:08.000000000 +0100 +++ /var/tmp/diff_new_pack.U24436/_new 2007-11-28 23:51:08.000000000 +0100 @@ -13,7 +13,7 @@ Name: sysconfig BuildRequires: sysfsutils Version: 0.70.2 -Release: 1 +Release: 12 Summary: The sysconfig scheme Group: System/Base License: GPL v2 or later @@ -22,6 +22,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk /usr/bin/sed /usr/bin/grep Source: %name-%version.tar.bz2 +Patch: %name-%version.dif %description This package provides the SuSE system configuration scheme. @@ -41,6 +42,7 @@ %prep %setup -n sysconfig-%{version} +%patch %build autoreconf --force --install @@ -214,6 +216,9 @@ %{insserv_cleanup} %changelog +* Wed Nov 28 2007 - werner@suse.de +- Some small changes on pool.tcpip to reduce conflicts with already + running fetchmail deamon or MTA (bug #231042). * Mon Sep 17 2007 - zoz@suse.de - new version 0.70.2 - When converting interface configuration files at update look first ++++++ sysconfig-0.70.2.dif ++++++ --- scripts/poll.tcpip +++ scripts/poll.tcpip 2007-11-28 12:22:53.190789430 +0100 @@ -32,6 +32,11 @@ logger -t poll.tcpip -p mail.notice " St # # Check resources and settings # +PATH=/sbin:/bin:/usr/sbin:/usr/bin +set -- $(runlevel) +PREVLEVEL=$1 +RUNLEVEL=$2 +export PATH PREVLEVEL RUNLEVEL # # Time to get a stable connenction @@ -86,6 +91,7 @@ done while true ; do test -x /usr/bin/fetchmail || break test -r /etc/fetchmailrc || break + checkproc /usr/bin/fetchmail && break /usr/bin/fetchmail -f /etc/fetchmailrc break done @@ -97,20 +103,51 @@ while true ; do test -x /usr/sbin/fetchnews || break test -s /etc/leafnode/config || break test -e /var/lock/news/fetchnews.lck && break + checkproc /usr/sbin/fetchnews && break /usr/sbin/fetchnews break done # # Let's throw our mails out here. This is done as the last -# point to avoid mail loops. +# point to avoid mail loops which could be caused if the +# fetchmail call is done after /usr/sbin/sendmail. Also +# remember that /usr/sbin/sendmail should be provided by +# any other MTA like postfix or exim. # if test -s /etc/sendmail.cf -a -s /etc/mail/submit.cf ; then - /usr/sbin/sendmail -L sendmail-client -Ac -q - sleep 3 - /usr/sbin/sendmail -L sendmail -Am -q + send=no + for rc in /etc/init.d/rc${RUNLEVEL}.d/S*sendmail + do + if test -x $rc; then + $rc status &> /dev/null && send=yes + else + send=yes + fi + break + done + if test "$send" = "yes" ; then + /usr/sbin/sendmail -L sendmail-client -Ac -q + sleep 3 + /usr/sbin/sendmail -L sendmail -Am -q + fi + unset send else - /usr/sbin/sendmail -q + send=no + for rc in /etc/init.d/rc${RUNLEVEL}.d/S*postfix \ + /etc/init.d/rc${RUNLEVEL}.d/S*exim + do + if test -x $rc; then + $rc status &> /dev/null && send=yes + else + send=yes + fi + break + done + if test "$send" = "yes" ; then + /usr/sbin/sendmail -q + fi + unset send fi # Tell system what we're done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de