[arch-commits] Commit in fam/trunk (PKGBUILD fam)

[Eric Bélanger]

    Date: Sunday, August 21, 2011 @ 10:24:53
  Author: eric
Revision: 136012

upgpkg: fam 2.7.0-16

	Do not start rpcbind daemon (close FS#24846)

Modified:
  fam/trunk/PKGBUILD
  fam/trunk/fam

----------+
 PKGBUILD |    6 +++---
 fam      |    7 ++-----
 2 files changed, 5 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-08-21 12:39:53 UTC (rev 136011)
+++ PKGBUILD	2011-08-21 14:24:53 UTC (rev 136012)
@@ -5,14 +5,14 @@
 
 pkgname=fam
 pkgver=2.7.0
-pkgrel=15
+pkgrel=16
 pkgdesc="File Alteration Monitor"
 arch=('i686' 'x86_64')
 license=('LGPL' 'GPL')
 depends=('rpcbind' 'gcc-libs' 'bash')
 url="http://oss.sgi.com/projects/fam/"
 backup=('etc/fam/fam.conf')
-options=('!makeflags') # Don't !libtool
+options=('!makeflags' 'libtool')
 source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz
 	fam-2.7.0-dnotify.patch
 	fam-2.7.0-largefiles.patch
@@ -24,7 +24,7 @@
          '47b41e0b0498793af004696a096d7da1'
          '2638b8ffacb9f03b6e438e08ea7b290a'
          'fc0cabc0ac4f819680401eb3090c29c9'
-         '92a37f9eb6ad0e60ded9c70e9ad93a88')
+         'ec50139679bc31508a843cafa47cd298')
 
 build() {
   cd "${srcdir}"/${pkgname}-${pkgver}

Modified: fam
===================================================================
--- fam	2011-08-21 12:39:53 UTC (rev 136011)
+++ fam	2011-08-21 14:24:53 UTC (rev 136012)
@@ -6,13 +6,10 @@
 PID=`pidof -o %PPID /usr/sbin/famd`
 case "$1" in
   start)
-    #Check for running portmap, start when not running
-    ck_daemon rpcbind && /etc/rc.d/rpcbind start
     stat_busy "Starting File Alteration Monitor"
     if ck_daemon rpcbind; then
-      stat_fail
-      echo "ERROR: rpcbind is not running"
-      exit 1
+      echo "ERROR: Refusing to start fam without rpcbind running!" >&2
+      stat_die
     fi
     if [ -z "$PID" ]; then
        /usr/sbin/famd -T 0 -c /etc/fam/fam.conf