ganglia: fixing package

7 files changed, 67 insertions, 218 deletions

diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD
index f5a900b88..9a2cfae84 100644
--- a/pcr/ganglia/PKGBUILD
+++ b/pcr/ganglia/PKGBUILD
@@ -2,69 +2,77 @@
 
 pkgname=ganglia
 pkgver=3.6.0
-pkgrel=2
-pkgdesc="A scalable distributed monitoring system for high-performance computing systems such as clusters and Grids."
-arch=('i686' 'x86_64')
-url="http://ganglia.sourceforge.net/"
-license=('BSD')
-depends=('apr' 'confuse' 'expat' 'pcre' 'python2' 'rrdtool')
-options=('!libtool')
-optdepends=('ganglia-web: Web frontend')
-install='ganglia.install'
-backup=('etc/ganglia/gmond.conf'
-        'etc/ganglia/gmetad.conf')
-source=("http://downloads.sourceforge.net/ganglia/$pkgname-$pkgver.tar.gz" 
-        'gmond.rc'
-        'gmetad.rc'
-        'gmond.service'
-        'gmetad.service'
-        'ganglia.install'
-        'uid.patch')
-md5sums=('05926bb18c22af508a3718a90b2e9a2c'
-         '12b2f85361754eaf6fc5129cccec7034'
-         '292b74a5a09a0bd9a4a658823adc034b'
-         '25ebc6cf829089a9f330ad177befdd45'
-         'd795bca44fb73cdf8a2b550e27c50b6f'
-         'acad2273520f13f4d0638ca9109ca2d8'
-         'a0d469dd2b9ec40dbe20377c51ca904c')
+pkgrel=3
+pkgdesc='Scalable distributed monitoring system for high-performance computing systems such as clusters and Grids.'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=http://$pkgname.sourceforge.net/
+license=BSD
+depends=(
+  apr
+  confuse
+  #php-embed
+  python2
+  rrdtool
+)
+install=$pkgname.install
+options=(!libtool)
+optdepends="$pkgname-web: Web frontend"
+backup=(
+  etc/ganglia/gmond.conf
+  etc/ganglia/gmetad.conf
+)
+source=(
+  http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
+  gmetad.service.in
+  gmond.service.in
+)
+sha512sums=(
+  2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394
+  a42b7dcb7dd81961cc9fef114f8c4c352375ed931dc2ae77b1139c6fde7cbd6544fcb5fe286ff6066ef37696821dc9f6fcab7c6b14d3ebaa59e895219cd89836
+  c362a383cbbaf5540b5d698f664534bd0da73bcc5ee4336c468844ed17706e05450f35e4f6cf969f1d2495c462883873b30e4575b9ee8ded74ab475afda608bb
+)
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
 
-  for patch in $srcdir/*.patch; do
-    msg2 "Applying $(basename $patch)"
-    patch -Np1 -i $patch
-  done
+  #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure
+
+  sed -i 's|nobody|ganglia|' gmetad/gmetad.conf.in
 
   # FIXME: Hopefully this will soon no longer be required?
-  msg2 "Copying systemd units into source as workaround for bug"
-  cp "$srcdir/gmond.service" "$srcdir/$pkgname-$pkgver/gmond/gmond.service.in"
-  cp "$srcdir/gmetad.service" "$srcdir/$pkgname-$pkgver/gmetad/gmetad.service.in"
+  msg2 'Copying systemd units into source as workaround for bug'
+  cp $srcdir/gmetad.service.in gmetad/gmetad.service.in
+  cp $srcdir/gmond.service.in  gmond/gmond.service.in
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc/ganglia \
-              --with-gmetad --enable-gexec --enable-status \
-              --with-python=/usr/bin/python2
-  make
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH ./configure --prefix=/usr\
+    --enable-gexec\
+    --enable-perl\
+    --enable-setuid=ganglia\
+    --enable-status\
+    --disable-static\
+    --libdir=/usr/lib\
+    --with-gmetad\
+    --with-python=/usr/bin/python2\
+    --sbindir=/usr/bin\
+    --sysconfdir=/etc/ganglia
+#    --enable-php\
+#    --enable-setgid=ganglia\
+  setarch $CARCH make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  # Move sbin to bin
-  mv "$pkgdir/usr/sbin"/* "$pkgdir/usr/bin/"
-  rmdir "$pkgdir/usr/sbin"
+  cd $srcdir/$pkgname-$pkgver
+  setarch $CARCH make DESTDIR=$pkgdir install
 
-  mkdir -p "$pkgdir/usr/lib/ganglia/python_modules"
+  mkdir $pkgdir/usr/lib/$pkgname/python_modules
 
-  msg2 "Generating default gmond.conf"
-  ./gmond/gmond --default_config > "$pkgdir/etc/ganglia/gmond.conf"
-  
-  # Uncomment these lines to install the rc files
-  #install -m 755 -D "$srcdir/gmond.rc" "$pkgdir/etc/rc.d/gmond"
-  #install -m 755 -D "$srcdir/gmetad.rc" "$pkgdir/etc/rc.d/gmetad"
+  msg2 'Generating default gmond.conf'
+  ./gmond/gmond --default_config > $pkgdir/etc/ganglia/gmond.conf
 }
diff --git a/pcr/ganglia/ganglia.install b/pcr/ganglia/ganglia.install
index 60b7f102d..814a993bc 100644
--- a/pcr/ganglia/ganglia.install
+++ b/pcr/ganglia/ganglia.install
@@ -7,26 +7,24 @@ post_install() {
 # arg 2:  the old package version
 post_upgrade() {
   if [ "`vercmp $2 3.4.0`" -lt 0 ]; then
-    echo "WARNING: The ganglia package has been split. If you use the" \
-         "web frontend, you'll need to install the ganglia-web package as well."
+    echo 'WARNING: The ganglia package has been split. If you use the' \
+         'web frontend, you'll need to install the ganglia-web package as well.'
   fi
   id ganglia  >& /dev/null
   if [ $? -ne 0 ]; then
-     echo "Adding ganglia system group and user..."
-     groupadd -r ganglia
-     useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
+     echo 'Adding ganglia system group and user...'
+     groupadd -r ganglia && useradd -r -d /var/lib/ganglia -g ganglia -s /bin/false ganglia
      # Lock the account to prevent logging in
      passwd -l ganglia &> /dev/null
   fi
-  install -d -o ganglia -g ganglia /var/lib/ganglia
-  install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
+  install -d -o ganglia -g ganglia /var/lib/ganglia && install -d -o ganglia -g ganglia /var/lib/ganglia/rrds
 }
 
 # arg 1:  the old package version
 post_remove() {
-  echo "Removing ganglia system group and user..."
+  echo 'Removing ganglia system group and user...'
   userdel ganglia
-  echo "NOTE: Please remove /var/lib/ganglia manually if it is no longer required."
+  echo 'NOTE: Please remove /var/lib/ganglia manually if it is no longer required.'
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/pcr/ganglia/gmetad.rc b/pcr/ganglia/gmetad.rc
deleted file mode 100644
index 823062fac..000000000
--- a/pcr/ganglia/gmetad.rc
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-  PID=`pidof -o %PPID /usr/sbin/gmetad`
-}
-get_pid
-
-case "$1" in
-  start)
-    stat_busy "Starting Ganglia gmetad"
-    [ -z "$PID" ] && /usr/sbin/gmetad
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      sleep 1
-      get_pid
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $PID > /var/run/gmetad.pid
-        add_daemon gmetad
-        stat_done
-      fi
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Ganglia gmetad"
-    [ ! -z "$PID" ]  && kill $PID > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      sleep 1
-      get_pid
-      if [ $? -gt 0 ]; then
-        rm /var/run/gmetad.pid
-        rm_daemon gmetad
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"
-    exit 1
-
-esac
diff --git a/pcr/ganglia/gmetad.service b/pcr/ganglia/gmetad.service.in
index a721c2b4c..a721c2b4c 100644
--- a/pcr/ganglia/gmetad.service
+++ b/pcr/ganglia/gmetad.service.in
diff --git a/pcr/ganglia/gmond.rc b/pcr/ganglia/gmond.rc
deleted file mode 100644
index c465c4dbf..000000000
--- a/pcr/ganglia/gmond.rc
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-get_pid() {
-  PID=`pidof -o %PPID /usr/sbin/gmond`
-}
-get_pid
-
-case "$1" in
-  start)
-    stat_busy "Starting Ganglia gmond"
-    [ -z "$PID" ] && /usr/sbin/gmond
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      sleep 1
-      get_pid
-      if [ $? -gt 0 ]; then
-        stat_fail
-        exit 1
-      else
-        echo $PID > /var/run/gmond.pid
-        add_daemon gmond
-        stat_done
-      fi
-    fi
-    ;;
-
-  stop)
-    stat_busy "Stopping Ganglia gmond"
-    [ ! -z "$PID" ]  && kill $PID > /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-      exit 1
-    else
-      sleep 1
-      get_pid
-      if [ $? -gt 0 ]; then
-        rm /var/run/gmond.pid
-        rm_daemon gmond
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    fi
-    ;;
-
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-
-  *)
-    echo "usage: $0 {start|stop|restart}"
-    exit 1
-
-esac
diff --git a/pcr/ganglia/gmond.service b/pcr/ganglia/gmond.service.in
index 5cbd31629..5cbd31629 100644
--- a/pcr/ganglia/gmond.service
+++ b/pcr/ganglia/gmond.service.in
diff --git a/pcr/ganglia/uid.patch b/pcr/ganglia/uid.patch
deleted file mode 100644
index 165549033..000000000
--- a/pcr/ganglia/uid.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -1588,7 +1588,7 @@ Optional Features:
- 
-   --enable-debug          turn on debugging output and compile options
-   --enable-gexec          turn on gexec support (platform-specific)
--  --enable-setuid=USER    turn on setuid support (default setuid=nobody)
-+  --enable-setuid=USER    turn on setuid support (default setuid=ganglia)
-   --enable-setgid=GROUP   turn on setgid support (default setgid=no)
-   --enable-pedantic       turn on pedantic mode during compile
-   --enable-memcheck       turn on memory checking during compile
-@@ -11152,7 +11152,7 @@ $as_echo "#define SUPPORT_GEXEC 0" >>confdefs.h
- fi
- 
- 
--setuid_user=nobody
-+setuid_user=ganglia
- # Check whether --enable-setuid was given.
- if test "${enable_setuid+set}" = set; then :
-   enableval=$enable_setuid; if test x"$enableval" != xno; then no_setuid=0; setuid_user=$enableval ; fi
---- a/gmetad/gmetad.conf.in
-+++ b/gmetad/gmetad.conf.in
-@@ -99,8 +99,8 @@ data_source "my cluster" localhost
- #-------------------------------------------------------------------------------
- # User gmetad will setuid to (defaults to "nobody")
- # default: "nobody"
--# setuid_username "nobody"
--#
-+setuid_username "ganglia"
-+
- #-------------------------------------------------------------------------------
- # Umask to apply to created rrd files and grid directory structure
- # default: 0 (files are public)