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

[Jonathan Steel]

    Date: Tuesday, February 10, 2015 @ 15:35:16
  Author: jsteel
Revision: 127465

upgpkg: nrpe 2.15-4

Todo List: User/Group management

Modified:
  nrpe/trunk/PKGBUILD
  nrpe/trunk/nrpe.install

--------------+
 PKGBUILD     |   10 +++++-----
 nrpe.install |    7 +------
 2 files changed, 6 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-02-10 14:29:41 UTC (rev 127464)
+++ PKGBUILD	2015-02-10 14:35:16 UTC (rev 127465)
@@ -4,7 +4,7 @@
 
 pkgname=nrpe
 pkgver=2.15
-pkgrel=3
+pkgrel=4
 pkgdesc="Nagios Remote Plugin Executor"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -25,7 +25,7 @@
          'e68e6460f5a2999635254dac64056679')
 
 prepare() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   # fix directory permissions
   sed -i 's/775/755/' Makefile.in src/Makefile.in
@@ -42,7 +42,7 @@
 }
 
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
   ./configure \
     --prefix=/usr \
@@ -56,9 +56,9 @@
 }
 
 package() {
-  cd "$srcdir"/$pkgname-$pkgver
+  cd $pkgname-$pkgver
 
-  make DESTDIR="$pkgdir"/ install
+  make DESTDIR="$pkgdir" install
   make DESTDIR="$pkgdir"/ install-daemon-config
 
   install -Dm644 sample-config/nrpe.xinetd "$pkgdir"/etc/xinetd.d/nrpe

Modified: nrpe.install
===================================================================
--- nrpe.install	2015-02-10 14:29:41 UTC (rev 127464)
+++ nrpe.install	2015-02-10 14:35:16 UTC (rev 127465)
@@ -3,7 +3,7 @@
     groupadd -g 31 nrpe
   fi
   if [ -z "$(getent passwd nrpe)" ]; then
-    useradd -u 31 -g nrpe -c "Nagios NRPE" -d /dev/null -s /usr/bin/nologin nrpe
+    useradd -u 31 -g nrpe -c "NRPE" -d /dev/null -s /usr/bin/nologin nrpe
   fi
 
   grep -Pq '^nrpe\s+' /etc/services || \
@@ -17,11 +17,6 @@
 }
 
 post_remove() {
-  userdel nrpe
-  groupdel nrpe
-}
-
-post_remove() {
   # remove the line added to /etc/services
   sed -e '/nrpe             5666\/tcp/d' \
       -i /etc/services || true