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

[Eric Bélanger]

    Date: Saturday, June 4, 2011 @ 01:34:18
  Author: eric
Revision: 126284

upgpkg: fetchmail 6.3.19-3
Changed fetchmail user's home directory to /var/lib/fetchmail (close FS#24500)

Modified:
  fetchmail/trunk/PKGBUILD
  fetchmail/trunk/fetchmail.install

-------------------+
 PKGBUILD          |    3 ++-
 fetchmail.install |    8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-04 04:22:44 UTC (rev 126283)
+++ PKGBUILD	2011-06-04 05:34:18 UTC (rev 126284)
@@ -3,7 +3,7 @@
 
 pkgname=fetchmail
 pkgver=6.3.19
-pkgrel=2
+pkgrel=3
 pkgdesc="A remote-mail retrieval utility"
 arch=('i686' 'x86_64')
 url="http://fetchmail.berlios.de/"
@@ -34,4 +34,5 @@
   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 "${pkgdir}/var/lib/fetchmail"
 }

Modified: fetchmail.install
===================================================================
--- fetchmail.install	2011-06-04 04:22:44 UTC (rev 126283)
+++ fetchmail.install	2011-06-04 05:34:18 UTC (rev 126284)
@@ -3,15 +3,15 @@
   echo "If you run fetchmail as a daemon and not a cron job"
   echo "then 'chown fetchmail /etc/fetchmailrc'"
   getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/run/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
+      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
 }
 
 post_upgrade() {
   getent passwd fetchmail >/dev/null || usr/sbin/useradd -u 90 -g nobody \
-      -d '/var/run/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
+      -d '/var/lib/fetchmail' -c 'Fetchmail daemon' -s /bin/false fetchmail
 
-  if [ "$(vercmp $2 6.3.19)" -lt 0 ] ; then
-    chsh -s /bin/false fetchmail
+  if [ "$(vercmp $2 6.3.19-3)" -lt 0 ] ; then
+    usermod -d '/var/lib/fetchmail' -s /bin/false fetchmail
   fi
 }