ganglia upgrade (using aur pkgbuild)

1 files changed, 53 insertions, 64 deletions

diff --git a/pcr/ganglia/PKGBUILD b/pcr/ganglia/PKGBUILD
index 3a2e54dd8..f5a900b88 100644
--- a/pcr/ganglia/PKGBUILD
+++ b/pcr/ganglia/PKGBUILD
@@ -2,80 +2,69 @@
 
 pkgname=ganglia
 pkgver=3.6.0
-pkgrel=1
-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
-)
-options=(!libtool)
-optdepends="$pkgname-web: Web frontend"
-backup=(
-  etc/gmond.conf
-  etc/gmetad.conf
-)
-source=http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-sha512sums=2a05d37787f1440c0c4aa91cdf0f4f4cb39c840b3b0fdcd6fe58cfb5892a75f81d36f6191c83c17558c37154298268df74fa255d2c940a8b84a7bf3ddb102394
+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')
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver
-  #sed -i 's|sapi/embed/php_embed.h|php/sapi/embed/php_embed.h|' configure
-  touch gm{on,eta}d/gm{on,eta}d.service.in
+  cd "$srcdir/$pkgname-$pkgver"
 
-  echo '[Unit]'                                        >  gmetad/gmetad.service.in
-  echo 'Description=Ganglia Meta Daemon'               >> gmetad/gmetad.service.in
-  echo 'After=network.target'                          >> gmetad/gmetad.service.in
-  echo ''                                              >> gmetad/gmetad.service.in
-  echo '[Service]'                                     >> gmetad/gmetad.service.in
-  echo 'Type=forking'                                  >> gmetad/gmetad.service.in
-  echo 'PIDFile=/run/gmetad.pid'                       >> gmetad/gmetad.service.in
-  echo 'ExecStart=/usr/sbin/gmetad -p /run/gmetad.pid' >> gmetad/gmetad.service.in
-  echo ''                                              >> gmetad/gmetad.service.in
-  echo '[Install]'                                     >> gmetad/gmetad.service.in
-  echo 'WantedBy=multi-user.target'                    >> gmetad/gmetad.service.in
+  for patch in $srcdir/*.patch; do
+    msg2 "Applying $(basename $patch)"
+    patch -Np1 -i $patch
+  done
 
-  echo '[Unit]'                                         >  gmond/gmond.service.in
-  echo 'Description=Ganglia Monitor Daemon'             >> gmond/gmond.service.in
-  echo 'After=network.target'                           >> gmond/gmond.service.in
-  echo ''                                               >> gmond/gmond.service.in
-  echo '[Service]'                                      >> gmond/gmond.service.in
-  echo 'ExecStart=/usr/sbin/gmond -f -p /run/gmond.pid' >> gmond/gmond.service.in
-  echo ''                                               >> gmond/gmond.service.in
-  echo '[Install]'                                      >> gmond/gmond.service.in
-  echo 'WantedBy=multi-user.target'                     >> gmond/gmond.service.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"
 }
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH ./configure --prefix=/usr\
-    --enable-gexec\
-    --enable-perl\
-    --enable-status\
-    --disable-static\
-    --libdir=/usr/lib\
-    --with-gmetad\
-    --with-python=/usr/bin/python2\
-    --sysconfdir=/etc
-#    --enable-php\
-  setarch $CARCH make
+  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
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+
+  # Move sbin to bin
+  mv "$pkgdir/usr/sbin"/* "$pkgdir/usr/bin/"
+  rmdir "$pkgdir/usr/sbin"
 
-  mkdir $pkgdir/usr/lib/$pkgname/python_modules
+  mkdir -p "$pkgdir/usr/lib/ganglia/python_modules"
 
-  msg2 'Generating default gmond.conf'
-  ./gmond/gmond --default_config > $pkgdir/etc/gmond.conf
+  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"
 }