pool/fetchmail
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 37957 from home:puzel:branches:server:mail

Browse Source 
Copy from home:puzel:branches:server:mail/fetchmail via accept of submit request 37957 revision 2.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/37957
OBS-URL: https://build.opensuse.org/package/show/server:mail/fetchmail?expand=0&rev=18
This commit is contained in:
Petr Uzel
2010-04-14 16:05:48 +00:00
committed by Git OBS Bridge
parent b36d3ac12b
commit 8582cfb29d
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fetchmail.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
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

14
fetchmail.init
View File

@@ -30,13 +30,9 @@ 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"
@@ -47,6 +43,10 @@ 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 -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_PATH -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 -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_PATH -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 -nt /var/run/fetchmail.pid && echo reload
test $FETCHMAIL_CONFIG -nt /var/run/fetchmail.pid || test $FETCHMAIL_RC_PATH -nt /var/run/fetchmail.pid && echo reload
;;
*)
echo "Usage: $0 {oneshot|start|stop|status|try-restart|restart|force-reload|reload} [polling interval]"

3
fetchmail.spec
View File

@@ -139,9 +139,6 @@ 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

7
sysconfig.fetchmail
View File

@@ -45,3 +45,10 @@ FETCHMAIL_USER="fetchmail"
# more.
#
FETCHMAIL_EXPERT_OPTIONS=""
## Type: string
## Default: "/etc/fetchmailrc"
#
# Use to override default location of fetchmailrc.
#
FETCHMAIL_RC_PATH="/etc/fetchmailrc"