Mailinglist Archive: opensuse-commit (1248 mails)

< Previous Next >
commit fetchmail for openSUSE:Factory
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Fri, 16 Apr 2010 00:12:56 +0200
  • Message-id: <20100415221256.B1EB52025B@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package fetchmail for openSUSE:Factory
checked in at Fri Apr 16 00:12:56 CEST 2010.



--------
--- fetchmail/fetchmail.changes 2010-04-07 13:40:31.000000000 +0200
+++ /mounts/work_src_done/STABLE/fetchmail/fetchmail.changes 2010-04-14
18:04:50.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Apr 14 16:00:29 UTC 2010 - puzel@xxxxxxxxxx
+
+- make it possible change default fetchmailrc location using new
+ sysconfig option
+- do not change owner of fetchmailrc in post
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fetchmail.spec ++++++
--- /var/tmp/diff_new_pack.rVocwG/_old 2010-04-16 00:11:22.000000000 +0200
+++ /var/tmp/diff_new_pack.rVocwG/_new 2010-04-16 00:11:22.000000000 +0200
@@ -30,7 +30,7 @@
Group: Productivity/Networking/Email/Utilities
AutoReqProv: on
Version: 6.3.16
-Release: 1
+Release: 2
Source: %{name}-%{version}.tar.bz2
Source1: %{name}.init
Source2: %{name}.logrotate
@@ -139,9 +139,6 @@
# 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

++++++ fetchmail.init ++++++
--- /var/tmp/diff_new_pack.rVocwG/_old 2010-04-16 00:11:22.000000000 +0200
+++ /var/tmp/diff_new_pack.rVocwG/_new 2010-04-16 00:11:22.000000000 +0200
@@ -30,13 +30,9 @@

# 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_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 @@
# 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 @@
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 @@
## 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]"

++++++ sysconfig.fetchmail ++++++
--- /var/tmp/diff_new_pack.rVocwG/_old 2010-04-16 00:11:22.000000000 +0200
+++ /var/tmp/diff_new_pack.rVocwG/_new 2010-04-16 00:11:22.000000000 +0200
@@ -45,3 +45,10 @@
# more.
#
FETCHMAIL_EXPERT_OPTIONS=""
+
+## Type: string
+## Default: "/etc/fetchmailrc"
+#
+# Use to override default location of fetchmailrc.
+#
+FETCHMAIL_RC_PATH="/etc/fetchmailrc"


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread