Sat Mar 23 00:06:20 PDT 2013

5 files changed, 9 insertions, 57 deletions

diff --git a/extra/fetchmail/PKGBUILD b/extra/fetchmail/PKGBUILD
index 2373b5e23..83ebe7b7f 100644
--- a/extra/fetchmail/PKGBUILD
+++ b/extra/fetchmail/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 173827 2012-12-24 15:21:34Z pierre $
+# $Id: PKGBUILD 180506 2013-03-22 07:41:24Z pierre $
 
 pkgname=fetchmail
-pkgver=6.3.24
+pkgver=6.3.25
 pkgrel=1
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64')
@@ -16,13 +16,11 @@ options=('!makeflags')
 install='fetchmail.install'
 source=("http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz"
         "http://download.berlios.de/$pkgname/${pkgname}-${pkgver}.tar.xz.asc"
-        'fetchmail.rc' 'fetchmail.conf' 'fetchmail.tmpfiles' 'fetchmail.service')
-sha1sums=('8cb2aa3a85dd307ccd1899ddbb4463e011048535'
-          'dff091c04ab64c25f7b6af758f93a75b969117e0'
-          'fc25180f1add26df0a3bdaac03fd9d2e3473ff88'
-          '30401729386d6f774c6c36ab8530842166de54a8'
+        'fetchmail.tmpfiles' 'fetchmail.service')
+sha1sums=('a246a6a3caf90e1106448c9dde4463e87d816031'
+          '9a7f76c9fd9f85fc4b421e34fa8c15d2838d61fc'
           '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6'
-          '11ff81fc8363a54099880da18634b0d1ecf9fa82')
+          '69caf3fd4d4446db3bf53144e4fa8edbdbbfcd10')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -34,8 +32,6 @@ build() {
 package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-  install -Dm755 "${srcdir}/fetchmail.rc" "${pkgdir}/etc/rc.d/fetchmail"
-  install -Dm644 "${srcdir}/fetchmail.conf" "${pkgdir}/etc/conf.d/fetchmail"
   install -d -o 90 -g nobody "${pkgdir}/var/lib/fetchmail"
   install -D -m644 ${srcdir}/fetchmail.tmpfiles ${pkgdir}/usr/lib/tmpfiles.d/fetchmail.conf
   install -D -m644 ${srcdir}/fetchmail.service ${pkgdir}/usr/lib/systemd/system/fetchmail.service
diff --git a/extra/fetchmail/fetchmail.conf b/extra/fetchmail/fetchmail.conf
deleted file mode 100644
index dcac2a067..000000000
--- a/extra/fetchmail/fetchmail.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# Daemon polling interval
-INTERVAL=60
-
-# Config location
-CONFIG=/etc/fetchmailrc
diff --git a/extra/fetchmail/fetchmail.install b/extra/fetchmail/fetchmail.install
index 81b374c57..5f6dc4911 100644
--- a/extra/fetchmail/fetchmail.install
+++ b/extra/fetchmail/fetchmail.install
@@ -5,7 +5,7 @@ post_install() {
   getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
       -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
   if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+    usr/bin/systemd-tmpfiles --create fetchmail.conf
   fi
 }
 
@@ -17,7 +17,7 @@ post_upgrade() {
     usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail
   fi
   if [[ ! -d run/fetchmail ]]; then
-    usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/fetchmail.conf
+    usr/bin/systemd-tmpfiles --create fetchmail.conf
   fi
 }
 
diff --git a/extra/fetchmail/fetchmail.rc b/extra/fetchmail/fetchmail.rc
deleted file mode 100644
index 4d8b98d40..000000000
--- a/extra/fetchmail/fetchmail.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/fetchmail
-
-PID=`pidof -o %PPID /usr/bin/fetchmail`
-case "$1" in
-  start)
-    stat_busy "Starting fetchmail"
-    [ -z "$PID" ] &&
-      su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon fetchmail
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping fetchmail"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon fetchmail
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/extra/fetchmail/fetchmail.service b/extra/fetchmail/fetchmail.service
index 3e7da7545..4653cc587 100644
--- a/extra/fetchmail/fetchmail.service
+++ b/extra/fetchmail/fetchmail.service
@@ -4,8 +4,7 @@ After=network.target
 
 [Service]
 User=fetchmail
-EnvironmentFile=/etc/conf.d/fetchmail
-ExecStart=/usr/bin/fetchmail -d ${INTERVAL} -f ${CONFIG}
+ExecStart=/usr/bin/fetchmail -d 900 -f /etc/fetchmailrc
 RestartSec=1
 
 [Install]