[arch-commits] Commit in fetchmail/trunk (PKGBUILD fetchmail.rc)

[Eric Bélanger]

    Date: Monday, May 23, 2011 @ 01:55:07
  Author: eric
Revision: 124586

upgpkg: fetchmail 6.3.19-2
Removed /var/run/fetchmail directory (FS#18157), Added backup array, Improved optdepends description

Modified:
  fetchmail/trunk/PKGBUILD
  fetchmail/trunk/fetchmail.rc

--------------+
 PKGBUILD     |   22 +++++++++++-----------
 fetchmail.rc |    3 +--
 2 files changed, 12 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-23 04:59:15 UTC (rev 124585)
+++ PKGBUILD	2011-05-23 05:55:07 UTC (rev 124586)
@@ -3,24 +3,28 @@
 
 pkgname=fetchmail
 pkgver=6.3.19
-pkgrel=1
+pkgrel=2
 pkgdesc="A remote-mail retrieval utility"
+arch=('i686' 'x86_64')
 url="http://fetchmail.berlios.de/"
-arch=('i686' 'x86_64')
+license=('GPL')
 depends=('glibc' 'openssl' 'python2')
-optdepends=('tk: fetchmailconf')
+optdepends=('tk: for using fetchmailconf')
+backup=('etc/conf.d/fetchmail')
 options=('!makeflags')
-license=('GPL')
 install=fetchmail.install
 source=(http://download2.berlios.de/fetchmail/${pkgname}-${pkgver}.tar.bz2
         fetchmail.rc fetchmail.conf)
-md5sums=('64519711c8533f5a34d20c9ff620d880' '6742e99d65a827bc2b9d6bc8efe269e6'\
+md5sums=('64519711c8533f5a34d20c9ff620d880'
+         '89fdde15bf81b3a5c065949322b5d138'
          '8fcd6a22dfbc247755fdd050c5c5c4d3')
-sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7' '13c7e3c538211c79c5b403f2bfa6712a2ad0ac30'\
-         '30401729386d6f774c6c36ab8530842166de54a8')
+sha1sums=('fcc9b9299fe147d8f522cff93f8f619e5e1372b7'
+          '910ec21ad0a619db67e4665189dc46d2a0634ea5'
+          '30401729386d6f774c6c36ab8530842166de54a8')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's|/usr/bin/env python|/usr/bin/env python2|' fetchmailconf.py
   ./configure --prefix=/usr --with-ssl=/usr
   make
 }
@@ -28,10 +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"
-
-  # "home" directory for pid file.
-  install -d -o 90 -g nobody -m700 "${pkgdir}/var/run/fetchmail"
 }

Modified: fetchmail.rc
===================================================================
--- fetchmail.rc	2011-05-23 04:59:15 UTC (rev 124585)
+++ fetchmail.rc	2011-05-23 05:55:07 UTC (rev 124586)
@@ -8,13 +8,12 @@
 case "$1" in
   start)
     stat_busy "Starting fetchmail"
+    [ ! -d /var/run/fetchmail ] && install -d -o fetchmail -g nobody -m700 /var/run/fetchmail
     [ -z "$PID" ] &&
 		su -c "/usr/bin/fetchmail -d $INTERVAL -f $CONFIG" -s /bin/sh fetchmail
     if [ $? -gt 0 ]; then
       stat_fail
     else
-      #Fetchmail does this for us:
-      #echo $PID > /var/run/fetchmail.pid
       add_daemon fetchmail
       stat_done
     fi