Date: Sunday, January 20, 2013 @ 04:32:36 Author: pierre Revision: 175721
Drop initscripts support Modified: fetchmail/trunk/PKGBUILD fetchmail/trunk/fetchmail.service Deleted: fetchmail/trunk/fetchmail.conf fetchmail/trunk/fetchmail.rc -------------------+ PKGBUILD | 6 +----- fetchmail.conf | 5 ----- fetchmail.rc | 38 -------------------------------------- fetchmail.service | 3 +-- 4 files changed, 2 insertions(+), 50 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-01-20 08:40:44 UTC (rev 175720) +++ PKGBUILD 2013-01-20 09:32:36 UTC (rev 175721) @@ -16,11 +16,9 @@ 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') + 'fetchmail.tmpfiles' 'fetchmail.service') sha1sums=('8cb2aa3a85dd307ccd1899ddbb4463e011048535' 'dff091c04ab64c25f7b6af758f93a75b969117e0' - 'fc25180f1add26df0a3bdaac03fd9d2e3473ff88' - '30401729386d6f774c6c36ab8530842166de54a8' '199ba749c829f22286c34aabcf8b7dd5bbd7c0e6' '11ff81fc8363a54099880da18634b0d1ecf9fa82') @@ -34,8 +32,6 @@ 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 Deleted: fetchmail.conf =================================================================== --- fetchmail.conf 2013-01-20 08:40:44 UTC (rev 175720) +++ fetchmail.conf 2013-01-20 09:32:36 UTC (rev 175721) @@ -1,5 +0,0 @@ -# Daemon polling interval -INTERVAL=60 - -# Config location -CONFIG=/etc/fetchmailrc Deleted: fetchmail.rc =================================================================== --- fetchmail.rc 2013-01-20 08:40:44 UTC (rev 175720) +++ fetchmail.rc 2013-01-20 09:32:36 UTC (rev 175721) @@ -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 Modified: fetchmail.service =================================================================== --- fetchmail.service 2013-01-20 08:40:44 UTC (rev 175720) +++ fetchmail.service 2013-01-20 09:32:36 UTC (rev 175721) @@ -4,8 +4,7 @@ [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]