rpm/fetchmail
SHA256
1
0
Fork 0
forked from pool/fetchmail
Code Pull Requests Activity

Updating link to change in openSUSE:Factory/fetchmail revision 33.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/server:mail/fetchmail?expand=0&rev=2afa2ca9e136f70000e4b644afe65d8a
This commit is contained in:
OBS User buildservice-autocommit 2010-04-15 22:12:58 +00:00 committed by Git OBS Bridge
parent 37158f96a4
commit 785fec28c3
4 changed files with 22 additions and 11 deletions
Show Stats 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 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 # Check for existence of needed config file and read it
FETCHMAIL_CONFIG=/etc/sysconfig/fetchmail FETCHMAIL_CONFIG=/etc/sysconfig/fetchmail
FETCHMAIL_RC=/etc/fetchmailrc
test -r $FETCHMAIL_CONFIG || { echo "$FETCHMAIL_CONFIG not existing"; test -r $FETCHMAIL_CONFIG || { echo "$FETCHMAIL_CONFIG not existing";
if [ "$1" = "stop" ]; then exit 0; if [ "$1" = "stop" ]; then exit 0;
else exit 6; fi; } 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 # Read config
FETCHMAIL_POLLING_INTERVAL="600" FETCHMAIL_POLLING_INTERVAL="600"
@ -47,6 +43,10 @@ FETCHMAIL_EXPERT_OPTIONS=""
. $FETCHMAIL_CONFIG . $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= FETCHMAIL_FETCHALL_OPTION=
if [ "$FETCHMAIL_FETCHALL" = "yes" ] ; then if [ "$FETCHMAIL_FETCHALL" = "yes" ] ; then
FETCHMAIL_FETCHALL_OPTION=" -a" FETCHMAIL_FETCHALL_OPTION=" -a"
@ -103,7 +103,7 @@ case "$1" in
# Trigger fetching of existing daemon. Root UID is OK. # Trigger fetching of existing daemon. Root UID is OK.
su $FETCHMAIL_USER -s /bin/sh -c $FETCHMAIL_BIN su $FETCHMAIL_USER -s /bin/sh -c $FETCHMAIL_BIN
else 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 fi
# Remember status and don'ŧ be verbose # Remember status and don'ŧ be verbose
rc_status rc_status
@ -120,7 +120,7 @@ case "$1" in
echo -n "Starting fetchmail" echo -n "Starting fetchmail"
## Start daemon with startproc(8). If this fails ## Start daemon with startproc(8). If this fails
## the return value is set appropriately by startproc. ## 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 # Remember status and be verbose
rc_status -v rc_status -v
@ -213,7 +213,7 @@ case "$1" in
## argument to this init script which is required for a reload. ## argument to this init script which is required for a reload.
## Note: probe is not (yet) part of LSB (as of 1.9) ## 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]" echo "Usage: $0 {oneshot|start|stop|status|try-restart|restart|force-reload|reload} [polling interval]"

5
fetchmail.spec
View File

@ -30,7 +30,7 @@ License: GPLv2+ ; Other uncritical OpenSource License ; Public Domain, Fr
Group: Productivity/Networking/Email/Utilities Group: Productivity/Networking/Email/Utilities
AutoReqProv: on AutoReqProv: on
Version: 6.3.16 Version: 6.3.16
Release: 1 Release: 2
Source: %{name}-%{version}.tar.bz2 Source: %{name}-%{version}.tar.bz2
Source1: %{name}.init Source1: %{name}.init
Source2: %{name}.logrotate Source2: %{name}.logrotate
@ -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. # Ensure that all files are readable by fetchmail with non-root UID.
touch var/log/fetchmail touch var/log/fetchmail
chown fetchmail var/log/fetchmail chown fetchmail var/log/fetchmail
if test -f etc/fetchmailrc ; then
chown fetchmail etc/fetchmailrc
fi
chmod 0600 var/log/fetchmail chmod 0600 var/log/fetchmail
%postun %postun

7
sysconfig.fetchmail
View File

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