[Pkg-privacy-commits] [flashproxy] 40/65: update to 1.7
Ximin Luo
infinity0 at moszumanska.debian.org
Fri Aug 21 13:49:44 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 1e84ff9fca4cdab275492be40ac112fc3c0aff64
Author: Ximin Luo <infinity0 at pwned.gg>
Date: Sun Jul 6 22:18:27 2014 +0100
update to 1.7
---
debian/changelog | 2 +-
debian/flashproxy-end-to-end-test.sh | 6 +--
debian/flashproxy-facilitator.install | 6 +--
debian/flashproxy-facilitator.postrm | 2 +-
debian/patches/add-logging-timestamp.patch | 25 ---------
debian/patches/bump-facilitator-version.patch | 13 -----
debian/patches/install-secret-file-directly.patch | 46 ----------------
debian/patches/remove-failed-connections.patch | 66 -----------------------
debian/patches/series | 4 --
debian/rules | 2 +-
10 files changed, 9 insertions(+), 163 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e8b8b85..f6737a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-flashproxy (1.6-1) UNRELEASED; urgency=low
+flashproxy (1.7-1) UNRELEASED; urgency=low
* Initial release. (Closes: #721845)
diff --git a/debian/flashproxy-end-to-end-test.sh b/debian/flashproxy-end-to-end-test.sh
index ad4e3ff..541aa5d 100755
--- a/debian/flashproxy-end-to-end-test.sh
+++ b/debian/flashproxy-end-to-end-test.sh
@@ -71,11 +71,11 @@ sudo ln -sf $PWD/server.crt /usr/local/share/ca-certificates/flashproxy-e2e-test
sudo update-ca-certificates
# configure facilitator
-sudo sed -i -e 's/RUN_DAEMON="no"/RUN_DAEMON="yes"/g' /etc/default/facilitator{,-reg-daemon}
+sudo sed -i -e 's/RUN_DAEMON="no"/RUN_DAEMON="yes"/g' /etc/default/fp-{facilitator,reg-decryptd}
sudo sed -i -e 's/^#\(.*\)websocket\(.*\)/\1websocket\2/g' /etc/flashproxy/facilitator-relays
-sudo service facilitator start
-sudo service facilitator-reg-daemon start
+sudo service fp-facilitator start
+sudo service fp-reg-decryptd start
sudo cp /usr/share/doc/flashproxy-facilitator/examples/fp-facilitator.conf /etc/apache2/sites-available/
sudo sed -i -e 's/ServerName .*/ServerName localhost/g' /etc/apache2/sites-available/fp-facilitator.conf
diff --git a/debian/flashproxy-facilitator.install b/debian/flashproxy-facilitator.install
index 60c7e63..ac24d4e 100644
--- a/debian/flashproxy-facilitator.install
+++ b/debian/flashproxy-facilitator.install
@@ -2,9 +2,9 @@ etc/flashproxy/reg-*
etc/flashproxy/facilitator*
etc/default/*
etc/init.d/*
-usr/bin/facilitator*
-usr/lib/cgi-bin/facilitator*
+usr/bin/fp-*
+usr/lib/cgi-bin/fp-*
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
+usr/share/man/man1/fp-*.1
diff --git a/debian/flashproxy-facilitator.postrm b/debian/flashproxy-facilitator.postrm
index d246368..beb80a1 100644
--- a/debian/flashproxy-facilitator.postrm
+++ b/debian/flashproxy-facilitator.postrm
@@ -28,7 +28,7 @@ case "$1" in
rm -f "${pkgconfdir}/$i"; \
done
# remove daemon data e.g. logs
- for name in facilitator facilitator-reg-daemon facilitator-email-poller; do
+ for name in fp-facilitator fp-reg-decryptd fp-registrar-email; do
rm -f "/var/log/${name}".log*
rm -f "/var/run/${name}".pid
done
diff --git a/debian/patches/add-logging-timestamp.patch b/debian/patches/add-logging-timestamp.patch
deleted file mode 100644
index 541021f..0000000
--- a/debian/patches/add-logging-timestamp.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: add a logging timestamp, and per-connection info
-Author: Ximin Luo <infinity0 at torproject.org>
-Applied-Upstream: commit:9dea0c6c90dedc868dfaa84add2bfa19a2039281
----
---- a/proxy/flashproxy.js
-+++ b/proxy/flashproxy.js
-@@ -103,6 +103,8 @@
-
- function puts(s) {
- if (DEBUG) {
-+ s = new Date().toISOString() + " | " + s;
-+
- /* This shows up in the Web Console in Firefox and F12 developer tools
- in Internet Explorer. */
- (console.debug || console.log).call(console, s);
-@@ -711,6 +713,9 @@
- var MAX_BUFFER = 10 * 1024 * 1024;
-
- function log(s) {
-+ if (!SAFE_LOGGING) {
-+ s = format_addr(client_addr) + '|' + format_addr(relay_addr) + ' : ' + s
-+ }
- puts(s)
- }
-
diff --git a/debian/patches/bump-facilitator-version.patch b/debian/patches/bump-facilitator-version.patch
deleted file mode 100644
index e2b7b16..0000000
--- a/debian/patches/bump-facilitator-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: bump facilitator version
-Author: Ximin Luo <infinity0 at torproject.org>
-Applied-Upstream: commit:7735064af5a60d99f041d168d04fbda44a495760
----
---- a/facilitator/configure.ac
-+++ b/facilitator/configure.ac
-@@ -1,5 +1,5 @@
- AC_PREREQ([2.68])
--AC_INIT([flashproxy-facilitator], [1.5])
-+AC_INIT([flashproxy-facilitator], [1.6])
- AM_INIT_AUTOMAKE([-Wall foreign])
-
- AC_ARG_VAR(fpfacilitatoruser, [the user/group for the facilitator to run as])
diff --git a/debian/patches/install-secret-file-directly.patch b/debian/patches/install-secret-file-directly.patch
deleted file mode 100644
index 75fcdb2..0000000
--- a/debian/patches/install-secret-file-directly.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-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/remove-failed-connections.patch b/debian/patches/remove-failed-connections.patch
deleted file mode 100644
index f890471..0000000
--- a/debian/patches/remove-failed-connections.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: remove failed connections from proxy_pairs as well
- this is a pretty major fix, as the previous behaviour effectively disabled a
- proxy after 5 failed connections (= max_num_proxy_pairs / 2)
-Author: Ximin Luo <infinity0 at torproject.org>
-Applied-Upstream: commit:05b9c101ba9afe4653d1eff6f5414f90f22ef042
----
---- a/proxy/flashproxy.js
-+++ b/proxy/flashproxy.js
-@@ -670,8 +670,7 @@
-
- proxy_pair = new ProxyPair(client_addr, relay_addr, this.rate_limit);
- this.proxy_pairs.push(proxy_pair);
-- proxy_pair.complete_callback = function(event) {
-- puts("Complete.");
-+ proxy_pair.cleanup_callback = function(event) {
- /* Delete from the list of active proxy pairs. */
- this.proxy_pairs.splice(this.proxy_pairs.indexOf(proxy_pair), 1);
- if (this.badge)
-@@ -730,7 +729,7 @@
- this.flush_timeout_id = null;
-
- /* This callback function can be overridden by external callers. */
-- this.complete_callback = function() {
-+ this.cleanup_callback = function() {
- };
-
- this.connect = function() {
-@@ -766,15 +765,23 @@
- log(ws.label + ": connected.");
- }.bind(this);
-
-+ this.maybe_cleanup = function() {
-+ if (this.running && is_closed(this.client_s) && is_closed(this.relay_s)) {
-+ this.running = false;
-+ this.cleanup_callback();
-+ return true;
-+ }
-+ return false;
-+ }
-+
- this.onclose_callback = function(event) {
- var ws = event.target;
-
- log(ws.label + ": closed.");
- this.flush();
-
-- if (this.running && is_closed(this.client_s) && is_closed(this.relay_s)) {
-- this.running = false;
-- this.complete_callback();
-+ if (this.maybe_cleanup()) {
-+ puts("Complete.");
- }
- }.bind(this);
-
-@@ -783,6 +790,11 @@
-
- log(ws.label + ": error.");
- this.close();
-+
-+ // we can't rely on onclose_callback to cleanup, since one common error
-+ // case is when the client fails to connect and the relay never starts.
-+ // in that case close() is a NOP and onclose_callback is never called.
-+ this.maybe_cleanup();
- }.bind(this);
-
- this.onmessage_client_to_relay = function(event) {
diff --git a/debian/patches/series b/debian/patches/series
index 9cbf956..f84b774 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
rm-prebuilt-manpages.patch
-bump-facilitator-version.patch
nodejs-shebang.patch
-add-logging-timestamp.patch
-remove-failed-connections.patch
-install-secret-file-directly.patch
disable-flaky-test.patch
diff --git a/debian/rules b/debian/rules
index 41dc485..19aba20 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ override_dh_auto_install:
dh_auto_install $(DH_common)
dh_auto_install $(DH_client)
dh_auto_install $(DH_facilitator)
- for name in facilitator facilitator-reg-daemon facilitator-email-poller; do \
+ for name in fp-facilitator fp-reg-decryptd fp-registrar-email; do \
dh_installinit -p flashproxy-facilitator -o --name=$${name}; \
done
--
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