From 37158f96a44b940ec88eda87301292515734cee8341486267e9a701430f6f67d Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 15 Apr 2010 22:12:57 +0000
Subject: [PATCH] Accepting request 37958 from server:mail

checked in (request 37958)

OBS-URL: https://build.opensuse.org/request/show/37958
OBS-URL: https://build.opensuse.org/package/show/server:mail/fetchmail?expand=0&rev=19
---
 fetchmail.changes   |  7 -------
 fetchmail.init      | 14 +++++++-------
 fetchmail.spec      |  3 +++
 sysconfig.fetchmail |  7 -------
 4 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/fetchmail.changes b/fetchmail.changes
index 2ecf501..5177ce3 100644
--- a/fetchmail.changes
+++ b/fetchmail.changes
@@ -1,10 +1,3 @@
--------------------------------------------------------------------
-Wed Apr 14 16:00:29 UTC 2010 - puzel@novell.com
-
-- make it possible change default fetchmailrc location using new 
-  sysconfig option 
-- do not change owner of fetchmailrc in post
-
 -------------------------------------------------------------------
 Wed Apr  7 11:33:04 UTC 2010 - puzel@novell.com
 
diff --git a/fetchmail.init b/fetchmail.init
index 7ffbeee..6a79992 100644
--- a/fetchmail.init
+++ b/fetchmail.init
@@ -30,9 +30,13 @@ test -x $FETCHMAIL_BIN || { echo "$FETCHMAIL_BIN not installed";
 
 # Check for existence of needed config file and read it
 FETCHMAIL_CONFIG=/etc/sysconfig/fetchmail
+FETCHMAIL_RC=/etc/fetchmailrc
 test -r $FETCHMAIL_CONFIG || { echo "$FETCHMAIL_CONFIG not existing";
 	if [ "$1" = "stop" ]; then exit 0;
 	else exit 6; fi; }
+test -r $FETCHMAIL_RC || { echo "$FETCHMAIL_RC not existing";
+	if [ "$1" = "stop" ]; then exit 0;
+	else exit 6; fi; }
 
 # Read config
 FETCHMAIL_POLLING_INTERVAL="600"
@@ -43,10 +47,6 @@ FETCHMAIL_EXPERT_OPTIONS=""
 
 . $FETCHMAIL_CONFIG
 
-test -r $FETCHMAIL_RC_PATH || { echo "$FETCHMAIL_RC_PATH not existing";
-	if [ "$1" = "stop" ]; then exit 0;
-	else exit 6; fi; }
-
 FETCHMAIL_FETCHALL_OPTION=
 if [ "$FETCHMAIL_FETCHALL" = "yes" ] ; then
     FETCHMAIL_FETCHALL_OPTION=" -a"
@@ -103,7 +103,7 @@ case "$1" in
 	    # Trigger fetching of existing daemon. Root UID is OK.
 	    su $FETCHMAIL_USER -s /bin/sh -c $FETCHMAIL_BIN
 	else
-	    startproc -u $FETCHMAIL_USER $FETCHMAIL_BIN -d 0$FETCHMAIL_FETCHALL_OPTION$FETCHMAIL_SILENT_OPTION $FETCHMAIL_EXPERT_OPTIONS -f $FETCHMAIL_RC_PATH -L /var/log/fetchmail 2>&1
+	    startproc -u $FETCHMAIL_USER $FETCHMAIL_BIN -d 0$FETCHMAIL_FETCHALL_OPTION$FETCHMAIL_SILENT_OPTION $FETCHMAIL_EXPERT_OPTIONS -f $FETCHMAIL_RC -L /var/log/fetchmail 2>&1
 	fi
 	# Remember status and don'ŧ be verbose
 	rc_status
@@ -120,7 +120,7 @@ case "$1" in
 	echo -n "Starting fetchmail"
 	## Start daemon with startproc(8). If this fails
 	## the return value is set appropriately by startproc.
-	startproc -u $FETCHMAIL_USER $FETCHMAIL_BIN -d $FETCHMAIL_POLLING_INTERVAL$FETCHMAIL_FETCHALL_OPTION$FETCHMAIL_SILENT_OPTION $FETCHMAIL_EXPERT_OPTIONS -f $FETCHMAIL_RC_PATH -L /var/log/fetchmail 2>&1
+	startproc -u $FETCHMAIL_USER $FETCHMAIL_BIN -d $FETCHMAIL_POLLING_INTERVAL$FETCHMAIL_FETCHALL_OPTION$FETCHMAIL_SILENT_OPTION $FETCHMAIL_EXPERT_OPTIONS -f $FETCHMAIL_RC -L /var/log/fetchmail 2>&1
 
 	# Remember status and be verbose
 	rc_status -v
@@ -213,7 +213,7 @@ case "$1" in
 	## argument to this init script which is required for a reload.
 	## Note: probe is not (yet) part of LSB (as of 1.9)
 
-	test $FETCHMAIL_CONFIG -nt /var/run/fetchmail.pid || test $FETCHMAIL_RC_PATH -nt /var/run/fetchmail.pid && echo reload
+	test $FETCHMAIL_CONFIG -nt /var/run/fetchmail.pid || test $FETCHMAIL_RC -nt /var/run/fetchmail.pid && echo reload
 	;;
     *)
 	echo "Usage: $0 {oneshot|start|stop|status|try-restart|restart|force-reload|reload} [polling interval]"
diff --git a/fetchmail.spec b/fetchmail.spec
index 4bb3ec0..c5154a6 100644
--- a/fetchmail.spec
+++ b/fetchmail.spec
@@ -139,6 +139,9 @@ usr/sbin/useradd -r -o -g daemon -s /bin/false \
 # Ensure that all files are readable by fetchmail with non-root UID.
 touch var/log/fetchmail
 chown fetchmail var/log/fetchmail
+if test -f etc/fetchmailrc ; then
+    chown fetchmail etc/fetchmailrc
+fi
 chmod 0600 var/log/fetchmail
 
 %postun
diff --git a/sysconfig.fetchmail b/sysconfig.fetchmail
index 0979a36..b383363 100644
--- a/sysconfig.fetchmail
+++ b/sysconfig.fetchmail
@@ -45,10 +45,3 @@ FETCHMAIL_USER="fetchmail"
 # more.
 #
 FETCHMAIL_EXPERT_OPTIONS=""
-
-## Type:        string
-## Default:     "/etc/fetchmailrc"
-#
-# Use to override default location of fetchmailrc.
-#
-FETCHMAIL_RC_PATH="/etc/fetchmailrc"