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

[Sven-Hendrik Haase]

    Date: Saturday, December 30, 2017 @ 06:46:28
  Author: svenstaro
Revision: 276944

upgpkg: zeroc-ice 3.7.0-3

Use sysusers

Added:
  zeroc-ice/trunk/zeroc-ice.sysusers
Modified:
  zeroc-ice/trunk/PKGBUILD
Deleted:
  zeroc-ice/trunk/ice.install

--------------------+
 PKGBUILD           |   12 +++++++++---
 ice.install        |   22 ----------------------
 zeroc-ice.sysusers |    1 +
 3 files changed, 10 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-12-30 06:46:24 UTC (rev 276943)
+++ PKGBUILD	2017-12-30 06:46:28 UTC (rev 276944)
@@ -6,7 +6,7 @@
 pkgname=(zeroc-ice zeroc-ice-java)
 pkgbase=(zeroc-ice)
 pkgver=3.7.0
-pkgrel=2
+pkgrel=3
 pkgdesc="An object-oriented middleware that provides RPC functionality"
 arch=(x86_64)
 url="https://zeroc.com"
@@ -13,13 +13,14 @@
 license=(GPL custom:ice)
 makedepends=(bzip2 gradle 'java-environment=8')
 depends=(mcpp lmdb)
-install=ice.install
 source=(
     "ice-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice/archive/v${pkgver}.tar.gz"
     "ice-packaging-${pkgver}.tar.gz::https://github.com/zeroc-ice/ice-packaging/archive/v${pkgver}.tar.gz"
+    zeroc-ice.sysusers
 )
 sha256sums=('809fff14a88a7de1364c846cec771d0d12c72572914e6cc4fb0b2c1861c4a1ee'
-            '096bcfb74b9a281ad9bccf3eaa360b912cb96e88735d5b18b96198f657b323cb')
+            '096bcfb74b9a281ad9bccf3eaa360b912cb96e88735d5b18b96198f657b323cb'
+            '5fdbb1ed753e84e6b49c529e171af848e74a8890fe485dfe1d2bbec3c198dd90')
 
 _make_args=(
     "OPTIMIZE=yes"
@@ -63,6 +64,11 @@
                  ${pkgdir}/usr/lib/systemd/system/icegridnode.service
   install -Dm644 ${srcdir}/ice-packaging-${pkgver}/ice/rpm/icegridregistry.service \
                  ${pkgdir}/usr/lib/systemd/system/icegridregistry.service
+
+  mkdir -p ${pkgdir}/var/lib/ice/icegrid/{node1,registry}
+  chown -R 101:101 ${pkgdir}/var/lib/ice
+
+  install -Dm644 ${srcdir}/zeroc-ice.sysusers ${pkgdir}/usr/lib/sysusers.d/$pkgname.conf
 }
 
 package_zeroc-ice-java() {

Deleted: ice.install
===================================================================
--- ice.install	2017-12-30 06:46:24 UTC (rev 276943)
+++ ice.install	2017-12-30 06:46:28 UTC (rev 276944)
@@ -1,22 +0,0 @@
-post_install() {
-  getent group ice >/dev/null || groupadd --system -g 101 ice &>/dev/null
-  getent passwd ice >/dev/null || useradd --system -g 101 -u 101 -d /var/lib/ice -s /bin/false ice &>/dev/null
-
-  #if type -P systemd-tmpfiles &> /dev/null; then
-  #  systemd-tmpfiles --create ice.conf
-  #fi
-
-  #if [ -d /var/lib/ice ]; then
-    #echo "Ice directory '/var/lib/ice' already exists. If you want to recreate default database then delete the directory and run 'rethinkdb create -d /var/lib/rethinkdb/default'."
-  #fi
-
-  if [ ! -d /var/lib/ice ]; then
-    mkdir -p /var/lib/ice/icegrid/node1
-    mkdir -p /var/lib/ice/icegrid/registry
-  fi
-  chown -R ice:ice /var/lib/ice
-}
-
-post_remove() {
-  echo "Ice data directory '/var/lib/ice' is left untouched. Remove it if you really sure you won't need your data in the future."
-}

Added: zeroc-ice.sysusers
===================================================================
--- zeroc-ice.sysusers	                        (rev 0)
+++ zeroc-ice.sysusers	2017-12-30 06:46:28 UTC (rev 276944)
@@ -0,0 +1 @@
+u ice 101 "Ice User" /var/lib/ice