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

[Eli Schwartz]

    Date: Sunday, January 14, 2018 @ 20:33:39
  Author: eschwartz
Revision: 282270

upgpkg: nrpe 3.2.1-2

migrate to systemd-sysusers

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

---------------+
 PKGBUILD      |   11 +++++++----
 nrpe.install  |    7 -------
 nrpe.sysusers |    1 +
 3 files changed, 8 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-01-14 19:58:10 UTC (rev 282269)
+++ PKGBUILD	2018-01-14 20:33:39 UTC (rev 282270)
@@ -4,7 +4,7 @@
 
 pkgname=nrpe
 pkgver=3.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Nagios Remote Plugin Executor"
 arch=('x86_64')
 license=('GPL')
@@ -14,8 +14,10 @@
 install=$pkgname.install
 backup=('etc/nrpe/nrpe.cfg' 'etc/xinetd.d/nrpe')
 url="https://github.com/NagiosEnterprises/nrpe"
-source=(https://github.com/NagiosEnterprises/nrpe/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('8997e195fea93cdceb8c7ed8ac1d43bc')
+source=(https://github.com/NagiosEnterprises/nrpe/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
+        nrpe.sysusers)
+md5sums=('8997e195fea93cdceb8c7ed8ac1d43bc'
+         '079d1f8c06598303be95151a8985927b')
 
 build() {
   cd $pkgname-$pkgver
@@ -46,6 +48,7 @@
   install -Dm644 startup/default-socket "$pkgdir"/usr/lib/systemd/system/nrpe.socket
   install -Dm644 startup/default-xinetd "$pkgdir"/etc/xinetd.d/nrpe
   install -Dm644 startup/tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/nrpe.conf
+  install -Dm644 "$srcdir"/nrpe.sysusers "$pkgdir"/usr/lib/sysusers.d/nrpe.conf
 
   install -Dm644 README.md "$pkgdir"/usr/share/doc/$pkgname/README.md
   install -Dm644 README.SSL.md "$pkgdir"/usr/share/doc/$pkgname/README.SSL.md
@@ -53,7 +56,7 @@
   install -Dm644 LEGAL "$pkgdir"/usr/share/licenses/$pkgname/LEGAL
 
   # FS#52873
-  sed -i 's/=31$/=nrpe/g' "$pkgdir"/etc/nrpe/nrpe.cfg
+  sed -i 's/=31$/=nrpe/g' "$pkgdir"/etc/nrpe/nrpe.cfg "$pkgdir"/usr/lib/systemd/system/nrpe.service
 
   # Tidy up
   chmod 755 "$pkgdir"/usr/lib/monitoring-plugins

Modified: nrpe.install
===================================================================
--- nrpe.install	2018-01-14 19:58:10 UTC (rev 282269)
+++ nrpe.install	2018-01-14 20:33:39 UTC (rev 282270)
@@ -1,11 +1,4 @@
 post_install() {
-  if [ -z "$(getent group nrpe)" ]; then
-    groupadd -g 31 nrpe
-  fi
-  if [ -z "$(getent passwd nrpe)" ]; then
-    useradd -u 31 -g nrpe -c "NRPE" -d /dev/null -s /usr/bin/nologin nrpe
-  fi
-
   grep -Pq '^nrpe\s+' /etc/services || \
     echo "nrpe             5666/tcp" >> /etc/services
 }

Added: nrpe.sysusers
===================================================================
--- nrpe.sysusers	                        (rev 0)
+++ nrpe.sysusers	2018-01-14 20:33:39 UTC (rev 282270)
@@ -0,0 +1 @@
+u nrpe 31 "NRPE" -