[Pkg-privacy-commits] [flashproxy] 18/65: install reg-email.pass directly with 600 permissions, and place examples back into /usr/share/doc

[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 60e8088e7ce080343a6d5e1b7ea9df4a443c4973
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Sun May 18 14:30:54 2014 +0100

    install reg-email.pass directly with 600 permissions, and place examples back into /usr/share/doc
---
 debian/flashproxy-facilitator.install           |  1 +
 debian/flashproxy-facilitator.links             |  3 ---
 debian/flashproxy-facilitator.lintian-overrides |  2 ++
 debian/flashproxy-facilitator.postinst          |  3 ---
 debian/patches/move-initconfig-out-of-doc.patch | 18 ------------------
 debian/patches/series                           |  1 -
 debian/rules                                    |  4 ++++
 7 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/debian/flashproxy-facilitator.install b/debian/flashproxy-facilitator.install
index 9710595..60c7e63 100644
--- a/debian/flashproxy-facilitator.install
+++ b/debian/flashproxy-facilitator.install
@@ -6,4 +6,5 @@ usr/bin/facilitator*
 usr/lib/cgi-bin/facilitator*
 usr/share/flashproxy-facilitator/*
 usr/share/doc/flashproxy-facilitator/*
+usr/share/doc/flashproxy-facilitator/examples/reg-email.pass etc/flashproxy
 usr/share/man/man1/facilitator*.1
diff --git a/debian/flashproxy-facilitator.links b/debian/flashproxy-facilitator.links
deleted file mode 100644
index 2c3abd6..0000000
--- a/debian/flashproxy-facilitator.links
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/flashproxy-facilitator/examples              usr/share/doc/flashproxy-facilitator/examples
-usr/share/flashproxy-facilitator/appengine/fp-reg.go   etc/flashproxy/reg-appspot/fp-reg.go
-usr/share/flashproxy-facilitator/appengine/app.yaml    etc/flashproxy/reg-appspot/app.yaml
diff --git a/debian/flashproxy-facilitator.lintian-overrides b/debian/flashproxy-facilitator.lintian-overrides
new file mode 100644
index 0000000..6976ab8
--- /dev/null
+++ b/debian/flashproxy-facilitator.lintian-overrides
@@ -0,0 +1,2 @@
+# reg-email.pass must be 600 root
+non-standard-file-perm
diff --git a/debian/flashproxy-facilitator.postinst b/debian/flashproxy-facilitator.postinst
index 7060f7c..1c745be 100644
--- a/debian/flashproxy-facilitator.postinst
+++ b/debian/flashproxy-facilitator.postinst
@@ -19,7 +19,6 @@ set -e
 
 fpfacilitatoruser=fp-facilitator
 pkgconfdir=/etc/flashproxy
-exampledir=/usr/share/flashproxy-facilitator/examples
 # workaround #689490 to stop piuparts complaining
 hadrnd=$(test -e /root/.rnd && echo true || echo false)
 
@@ -47,8 +46,6 @@ case "$1" in
           install -m 600 /dev/null ${pkgconfdir}/reg-daemon.key && \
           openssl genrsa 2048 | tee ${pkgconfdir}/reg-daemon.key | \
           openssl rsa -pubout > ${pkgconfdir}/reg-daemon.pub; }
-        test -f ${pkgconfdir}/reg-email.pass || { \
-          install -m 600 ${exampledir}/reg-email.pass ${pkgconfdir}/reg-email.pass; }
 		if ! $hadrnd; then rm /root/.rnd; fi
     ;;
 
diff --git a/debian/patches/move-initconfig-out-of-doc.patch b/debian/patches/move-initconfig-out-of-doc.patch
deleted file mode 100644
index 0c83dd1..0000000
--- a/debian/patches/move-initconfig-out-of-doc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Move init config out of /usr/share/doc
- Policy 12.3: "Packages must not require the existence of any files in
- /usr/share/doc/ in order to function."
-Author: Ximin Luo <infinity0 at pwned.gg>
-Applied-Upstream: commit:2af442f799785cf0baa4c18aa85cfdd507986633
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/facilitator/Makefile.am
-+++ b/facilitator/Makefile.am
-@@ -7,7 +7,7 @@
- # unfortunately sysvinit does not support having initscripts in /usr/local/etc
- # yet, so we have to hard code a path here. :(
- initscriptdir = /etc/init.d
--exampledir = $(docdir)/examples
-+exampledir = $(pkgdatadir)/examples
- appenginedir = $(pkgdatadir)/appengine
- pkgconfdir = $(sysconfdir)/flashproxy
- appengineconfdir = $(pkgconfdir)/reg-appspot
diff --git a/debian/patches/series b/debian/patches/series
index 85ba7e0..bbb25eb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-move-initconfig-out-of-doc.patch
 fix-copyright-years.patch
 fix-test-verbose.patch
 run-test-using-nodejs.patch
diff --git a/debian/rules b/debian/rules
index 456ac0f..9a2f06d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,6 +19,10 @@ DH_proxy = -S makefile -D proxy/modules/nodejs --
 override_dh_install:
 	dh_install -XChangeLog -XLICENSE -XMakefile
 
+override_dh_fixperms:
+	dh_fixperms
+	chmod 600 debian/flashproxy-facilitator/etc/flashproxy/reg-email.pass
+
 override_dh_auto_configure:
 	ln -sf setup-common.py setup.py
 	dh_auto_configure $(DH_facilitator) --enable-initscripts cgibindir=/usr/lib/cgi-bin

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