[Pkg-privacy-commits] [flashproxy] 45/65: - fix shell style, specify lintian-override and update copyright

[Ximin Luo]

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

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

commit deaf6ec20ca33031ae6af0837f73911a5265a487
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Sun Aug 3 16:30:53 2014 +0100

    - fix shell style, specify lintian-override and update copyright
---
 debian/copyright                                |  6 +++---
 debian/flashproxy-facilitator.lintian-overrides |  4 ++--
 debian/flashproxy-facilitator.postinst          | 13 +++++++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index f65bcef..3f2ebda 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,12 +4,12 @@ Upstream-Contact: David Fifield <david at bamsoftware.com>
 Source: https://git.torproject.org/flashproxy.git
 
 Files: *
-Copyright: Copyright 2011-2013 David Fifield <david at bamsoftware.com>
-           Copyright 2011-2013 flashproxy authors
+Copyright: Copyright 2011-2014 David Fifield <david at bamsoftware.com>
+           Copyright 2011-2014 flashproxy authors
 License: Expat
 
 Files: debian/*
-Copyright: Copyright 2013 Ximin Luo <infinity0 at pwned.gg>
+Copyright: Copyright 2013-2014 Ximin Luo <infinity0 at pwned.gg>
 License: Expat
 
 License: Expat
diff --git a/debian/flashproxy-facilitator.lintian-overrides b/debian/flashproxy-facilitator.lintian-overrides
index 6976ab8..bd03990 100644
--- a/debian/flashproxy-facilitator.lintian-overrides
+++ b/debian/flashproxy-facilitator.lintian-overrides
@@ -1,2 +1,2 @@
-# reg-email.pass must be 600 root
-non-standard-file-perm
+# only give root read access to the email login credentials
+flashproxy-facilitator binary: non-standard-file-perm etc/flashproxy/reg-email.pass 0600 != 0644
diff --git a/debian/flashproxy-facilitator.postinst b/debian/flashproxy-facilitator.postinst
index a085ff2..21b0bf8 100644
--- a/debian/flashproxy-facilitator.postinst
+++ b/debian/flashproxy-facilitator.postinst
@@ -20,12 +20,13 @@ set -e
 fpfacilitatoruser=fp-facilitator
 pkgconfdir=/etc/flashproxy
 # workaround #689490 to stop piuparts complaining
-hadrnd=$(test -e /root/.rnd && echo true || echo false)
+if ! test -e /root/.rnd; then
+    export RANDFILE=/dev/urandom
+fi
 
 case "$1" in
     configure)
         # install user
-        id -u "${fpfacilitatoruser}" >/dev/null 2>&1 || \
         adduser --quiet \
           --system \
           --group \
@@ -35,11 +36,11 @@ case "$1" in
           --shell /bin/false \
           "${fpfacilitatoruser}"
         # install secrets
-        test -f "${pkgconfdir}/reg-daemon.key" || { \
-          install -m 600 /dev/null "${pkgconfdir}"/reg-daemon.key && \
+        if [ ! -f "${pkgconfdir}/reg-daemon.key" ]; then
+          install -m 600 /dev/null "${pkgconfdir}"/reg-daemon.key
           openssl genrsa 2048 | tee "${pkgconfdir}"/reg-daemon.key | \
-          openssl rsa -pubout > "${pkgconfdir}"/reg-daemon.pub; }
-		if ! "$hadrnd"; then rm /root/.rnd; fi
+          openssl rsa -pubout > "${pkgconfdir}"/reg-daemon.pub
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

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