commit 056d462c5b79cc9c865596096be767668a8f0d9e Author: Tim Biermann <tbier@posteo.de> Date: Sun Feb 27 22:15:09 2022 +0100 distcc: don't fail pre-install when user/group already exists diff --git a/distcc/.signature b/distcc/.signature index 8e894c756..cf7addad8 100644 --- a/distcc/.signature +++ b/distcc/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37fFbaBNTFHRvz7S8pF7e+KPnnWHQJNKI+8GQI6DjjpflvB9f1eT2dAbdq+VcvDhiTVA7sry4zlJa9eczBqizgE= +RWSagIOpLGJF3wzAzZLb5ailHUSxw91u/FpHQLO7xAJM/Lc6XKIlBFHbTn/hICV792fE9ycXlyJ5HL+S0C+mpfMPcuE0O689dQk= SHA256 (Pkgfile) = ab600827f472d9f4e5b902da4368d778fedc80dac8c03fcebf69ffd0bd459186 SHA256 (.footprint) = ab8ff5425a11ce58468e95602eef1c51624de2cf04722471cf4694096bb22fea -SHA256 (distcc-3.4.tar.gz) = 37a34c9555498a1168fea026b292ab07e7bb394715d87d8403e0c33b16d2d008 +SHA256 (distcc-3.4.tar.gz) = 2b99edda9dad9dbf283933a02eace6de7423fe5650daa4a728c950e5cd37bd7d SHA256 (distccd) = 5ff8d45e3e572cf0d4fb4e2e827bd77a618556c275f98d2770aff5621c4d1371 SHA256 (distccd.conf) = afd1ba97aaf23061ba4b4d1a1613eee3a709c91311260de494ce063556b463e3 diff --git a/distcc/pre-install b/distcc/pre-install index b3bd0f2bf..26604df04 100755 --- a/distcc/pre-install +++ b/distcc/pre-install @@ -1,2 +1,4 @@ -/usr/sbin/groupadd --system distcc -/usr/sbin/useradd --system --gid distcc --home-dir /var/empty --shell /bin/false distcc && passwd --lock distcc +#!/bin/sh -e + +/usr/bin/getent group distcc > /dev/null 2>&1 || /usr/sbin/groupadd --system distcc +/usr/bin/getent passwd distcc > /dev/null 2>&1 || /usr/sbin/useradd --system --gid distcc --home-dir /var/empty --shell /bin/false distcc && passwd --lock distcc