[Pkg-privacy-commits] [flashproxy] 28/65: add adduser to facilitator Depends since postinst uses it

Ximin Luo infinity0 at moszumanska.debian.org
Fri Aug 21 13:49:42 UTC 2015


This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch _volatile-rc
in repository flashproxy.

commit 8b83092a18fdf9859b91a273033e1f93858a0c77
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Mon May 19 14:19:03 2014 +0100

    add adduser to facilitator Depends since postinst uses it
---
 debian/control                         |  2 +-
 debian/flashproxy-facilitator.postinst | 19 +++++++++----------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index 64ee65c..be994a2 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Description: Pluggable transport for ephemeral IP addresses - client transport p
 
 Package: flashproxy-facilitator
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, flashproxy-common (= ${binary:Version}), openssl
+Depends: ${misc:Depends}, ${python:Depends}, flashproxy-common (= ${binary:Version}), openssl, adduser
 Recommends: httpd-cgi | apache2
 Suggests: flashproxy-proxy
 Description: Pluggable transport for ephemeral IP addresses - facilitator
diff --git a/debian/flashproxy-facilitator.postinst b/debian/flashproxy-facilitator.postinst
index 0bc9d2a..a085ff2 100644
--- a/debian/flashproxy-facilitator.postinst
+++ b/debian/flashproxy-facilitator.postinst
@@ -25,16 +25,15 @@ hadrnd=$(test -e /root/.rnd && echo true || echo false)
 case "$1" in
     configure)
         # install user
-        id -u "${fpfacilitatoruser}" >/dev/null 2>&1 || { \
-        which adduser >/dev/null 2>&1 && \
-          adduser --quiet \
-            --system \
-            --group \
-            --disabled-password \
-            --home "${pkgconfdir}" \
-            --no-create-home \
-            --shell /bin/false \
-            "${fpfacilitatoruser}" ; }
+        id -u "${fpfacilitatoruser}" >/dev/null 2>&1 || \
+        adduser --quiet \
+          --system \
+          --group \
+          --disabled-password \
+          --home "${pkgconfdir}" \
+          --no-create-home \
+          --shell /bin/false \
+          "${fpfacilitatoruser}"
         # install secrets
         test -f "${pkgconfdir}/reg-daemon.key" || { \
           install -m 600 /dev/null "${pkgconfdir}"/reg-daemon.key && \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/flashproxy.git



More information about the Pkg-privacy-commits mailing list