X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=PKGBUILD;h=4ade4bdd085b0ed9cc7e79cff96d18517194f371;hb=746bfc7e2fd0c246b880b529d02af264a1744e1d;hp=01f7a64cf945f7710c3eeb3efb47c2936e5bdaf5;hpb=403b591f0104d36ebd13eaddf6da2263941b8eae;p=perso%2FImmae%2FConfig%2FAUR.git

diff --git a/PKGBUILD b/PKGBUILD
index 01f7a64..4ade4bd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,39 @@
 # Maintainer: Jonathan Steel <jsteel at archlinux.org>
 
-pkgbase=naemon
-pkgname=('naemon-core' 'naemon-livestatus' 'naemon-thruk')
-pkgver=1.0.3
-pkgrel=1
+pkgname=naemon
+pkgver=1.0.6
+pkgrel=4
+pkgdesc="System and network monitoring application"
 arch=('i686' 'x86_64')
 url="http://naemon.org"
 license=('GPL2')
-makedepends=('gperf' 'rsync' 'gd' 'mariadb-clients')
-source=(http://labs.consol.de/naemon/release/v$pkgver/src/$pkgbase-$pkgver.tar.gz
-        $pkgbase.service)
-md5sums=('0d6873669bd44375978c97174529e258'
-         'd6a77534e612e8f65ff3360336faec77')
+depends=('icu' 'glib2')
+optdepends=('logrotate'
+            'thruk: Web interface for Naemon'
+            'monitoring-plugins')
+makedepends=('gperf' 'help2man')
+provides=('naemon-core' 'naemon-livestatus')
+conflicts=('naemon-core' 'naemon-livestatus')
+replaces=('naemon-core' 'naemon-livestatus')
+source=(http://labs.consol.de/naemon/release/v$pkgver/src/$pkgname-$pkgver.tar.gz
+        gcc7.patch
+        $pkgname.service)
+md5sums=('6c9b95a737a8f232e114f4cff200ff92'
+         '4a6d8f9b39335dfe3348a1a20df10dfd'
+         '29f1d11c1a7f4f1515b7993c540dabe8')
+backup=('etc/logrotate.d/naemon'
+        'etc/naemon/naemon.cfg'
+        'etc/naemon/resource.cfg')
+install=$pkgname.install
 
 prepare() {
-  cd $pkgbase-$pkgver
+  cd $pkgname-$pkgver/naemon-core
 
-  # Break up the install process so we can package the separate components
-  sed -i '60iinstall-livestatus:' Makefile
-  sed -i '62iinstall-thruk:' Makefile
+  patch -Np1 -i "$srcdir"/gcc7.patch
 }
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $pkgname-$pkgver
 
   ./configure --prefix=/usr \
               --bindir=/usr/bin \
@@ -41,7 +52,7 @@ build() {
               --with-logrotatedir="/etc/logrotate.d" \
               --with-naemon-user="naemon" \
               --with-naemon-group="naemon" \
-              --with-lockfile="/run/naemon.pid" \
+              --with-lockfile="/run/naemon/naemon.pid" \
               --with-thruk-user="http" \
               --with-thruk-group="naemon" \
               --with-thruk-libs="/usr/lib/naemon/perl5" \
@@ -54,67 +65,33 @@ build() {
 }
 
 check() {
-  cd $pkgbase-$pkgver/naemon-core
+  cd $pkgname-$pkgver/naemon-core
 
   make check
 }
 
-package_naemon-core() {
-pkgdesc="System and network monitoring application"
-depends=('bash')
-optdepends=('logrotate'
-            'monitoring-plugins')
-backup=('etc/logrotate.d/naemon' 'etc/naemon/conf.d/commands.cfg'
-  'etc/naemon/conf.d/contacts.cfg' 'etc/naemon/conf.d/localhost.cfg'
-  'etc/naemon/conf.d/printer.cfg' 'etc/naemon/conf.d/switch.cfg'
-  'etc/naemon/conf.d/templates/contacts.cfg'
-  'etc/naemon/conf.d/templates/hosts.cfg'
-  'etc/naemon/conf.d/templates/services.cfg'
-  'etc/naemon/conf.d/timeperiods.cfg' 'etc/naemon/conf.d/windows.cfg'
-  'etc/naemon/naemon.cfg' 'etc/naemon/resource.cfg')
-install=$pkgbase.install
-
-  cd $pkgbase-$pkgver
+package() {
+  cd $pkgname-$pkgver
 
   make DESTDIR="$pkgdir" install
 
-  chown -R 44:44 "$pkgdir"/var/{cache,log}/$pkgbase
-  chmod -R 770 "$pkgdir"/var/{cache,log}/$pkgbase
-
-  install -Dm644 "$srcdir"/$pkgbase.service \
-    "$pkgdir"/usr/lib/systemd/system/$pkgbase.service
-
-  # Remove init script
-  rm -rf "$pkgdir"/etc/init.d
-}
-
-package_naemon-livestatus() {
-pkgdesc="Standard API for Naemon"
-depends=('icu')
-
-  cd $pkgbase-$pkgver
-
-  make DESTDIR="$pkgdir" install-livestatus
-}
-
-package_naemon-thruk() {
-pkgdesc="Monitoring Webinterface for Naemon"
-depends=('gd' 'mariadb-clients' 'apache' 'mod_fcgid')
-backup=('etc/naemon/cgi.cfg' 'etc/naemon/htpasswd'
-  'etc/naemon/log4perl.conf' 'etc/naemon/menu_local.conf'
-  'etc/naemon/naglint.conf' 'etc/httpd/conf/extra/thruk.conf'
-  'etc/httpd/conf/extra/thruk_cookie_auth_vhost.conf'
-  'etc/naemon/thruk_local.conf' 'etc/naemon/thruk.conf'
-  'etc/naemon/conf.d/thruk_bp_generated.cfg'
-  'etc/naemon/conf.d/thruk_templates.cfg' 'etc/logrotate.d/thruk')
+  install -d "$pkgdir"/etc/naemon/module-conf.d
+  install -d "$pkgdir"/var/lib/naemon/spool/checkresults
 
-  cd $pkgbase-$pkgver
+  chown -R 44:44 "$pkgdir"/var/{cache,lib,log}/$pkgname
+  chown -R 44:44 "$pkgdir"/etc/naemon
+  chmod -R 750 "$pkgdir"/var/{cache,lib,log}/$pkgname
 
-  make DESTDIR="$pkgdir" install-thruk
+  install -Dm644 "$srcdir"/$pkgname.service \
+    "$pkgdir"/usr/lib/systemd/system/$pkgname.service
+  install -Dm644 naemon-core/naemon.tmpfiles.conf \
+    "$pkgdir"/usr/lib/tmpfiles.d/naemon.conf
 
-  chown -R 44:44 "$pkgdir"/var/{cache,lib,log}/$pkgbase
-  chmod -R 770 "$pkgdir"/var/{cache,lib,log}/$pkgbase
+  # Move sample config files
+  mv "$pkgdir"/etc/naemon/conf.d "$pkgdir"/etc/naemon/examples
+  install -d "$pkgdir"/etc/naemon/conf.d/templates
 
-  # Remove init script
+  # Remove non-Arch directories
   rm -rf "$pkgdir"/etc/init.d
+  rm -rf "$pkgdir"/etc/apache2
 }