[Pkg-privacy-commits] [flashproxy] 29/65: add patch that puts examples back into docdir

[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 5e0c39c55e81e24859db7bc16e303e2411d5c213
Author: Ximin Luo <infinity0 at pwned.gg>
Date:   Mon May 19 14:49:59 2014 +0100

    add patch that puts examples back into docdir
---
 debian/patches/install-secret-file-directly.patch | 46 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 2 files changed, 47 insertions(+)

diff --git a/debian/patches/install-secret-file-directly.patch b/debian/patches/install-secret-file-directly.patch
new file mode 100644
index 0000000..75fcdb2
--- /dev/null
+++ b/debian/patches/install-secret-file-directly.patch
@@ -0,0 +1,46 @@
+Description: install secret file directly with the right perms, and move examples back to docdir
+Author: Ximin Luo <infinity0 at torproject.org>
+Applied-Upstream: commit:6c505e856dfdd5c0398b1012cd6a309b38b94ccc
+
+---
+ facilitator/Makefile.am | 13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+--- 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 = $(pkgdatadir)/examples
++exampledir = $(docdir)/examples
+ appenginedir = $(pkgdatadir)/appengine
+ pkgconfdir = $(sysconfdir)/flashproxy
+ appengineconfdir = $(pkgconfdir)/reg-appspot
+@@ -57,6 +57,12 @@
+ pylint: $(dist_bin_SCRIPTS)
+ 	pylint -E $^
+ 
++install-data-local:
++	$(INSTALL_DATA) -m 600 -t $(DESTDIR)$(pkgconfdir) $(srcdir)/examples/reg-email.pass
++
++uninstall-local:
++	rm $(DESTDIR)$(pkgconfdir)/reg-email.pass
++
+ # The {pre,post}-{install,remove} targets are just given as reference, and
+ # ought to be separate scripts as part of your distro's installation process.
+ # They are intentionally not linked to the install target since they require
+@@ -107,12 +113,9 @@
+ 	  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 /dev/null ${pkgconfdir}/reg-email.pass && \
+-	  cat ${exampledir}/reg-email.pass > ${pkgconfdir}/reg-email.pass; }
+ 
+ remove-secrets:
+-	for i in reg-daemon.key reg-daemon.pub reg-email.pass; do \
++	for i in reg-daemon.key reg-daemon.pub; do \
+ 	  rm -f ${pkgconfdir}/$$i; \
+ 	done
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 030d0b3..ac5c47f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ bump-facilitator-version.patch
 nodejs-shebang.patch
 add-logging-timestamp.patch
 remove-failed-connections.patch
+install-secret-file-directly.patch

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