Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package flashproxy flashproxy 1.7-1 in testing is affected by RC bug #765156 which makes it FTBFS on slow machines due to a too-low wait in some of the tests. This is fixed in version 1.7-2. I was not aware of the freeze unblock process, so it also contains a few other minor changes, as can be seen in the attached debdiff. None of these source changes result in any change to the binary packages. So hopefully they are not such a big deal to approve. + * Fix build for slower machines. (Closes: #765156) + * Update to latest Standards-Version. No changes required. + * Run overlooked proxy tests in debian/rules. (The "proxy tests" are not time-based, so are not affected by the RC bug.) unblock flashproxy/1.7-1 -- System Information: Debian Release: jessie/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16-3-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diff -Nru flashproxy-1.7/debian/changelog flashproxy-1.7/debian/changelog --- flashproxy-1.7/debian/changelog 2014-08-06 01:36:36.000000000 +0100 +++ flashproxy-1.7/debian/changelog 2014-11-05 17:19:59.000000000 +0000 @@ -1,3 +1,11 @@ +flashproxy (1.7-2) unstable; urgency=medium + + * Fix build for slower machines. (Closes: #765156) + * Update to latest Standards-Version. No changes required. + * Run overlooked proxy tests in debian/rules. + + -- Ximin Luo <infini...@pwned.gg> Wed, 05 Nov 2014 17:19:56 +0000 + flashproxy (1.7-1) unstable; urgency=low * Initial release. (Closes: #721845) diff -Nru flashproxy-1.7/debian/control flashproxy-1.7/debian/control --- flashproxy-1.7/debian/control 2014-08-06 01:20:04.000000000 +0100 +++ flashproxy-1.7/debian/control 2014-11-05 17:13:07.000000000 +0000 @@ -15,7 +15,7 @@ python-m2crypto, python-setuptools, xsltproc, -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 X-Python-Version: >= 2.7 Homepage: https://crypto.stanford.edu/flashproxy/ Vcs-Git: git://git.torproject.org/debian/flashproxy.git diff -Nru flashproxy-1.7/debian/patches/more-flexible-wait.patch flashproxy-1.7/debian/patches/more-flexible-wait.patch --- flashproxy-1.7/debian/patches/more-flexible-wait.patch 1970-01-01 01:00:00.000000000 +0100 +++ flashproxy-1.7/debian/patches/more-flexible-wait.patch 2014-11-05 17:13:07.000000000 +0000 @@ -0,0 +1,31 @@ +Description: Fix build for slower machines + Use a more flexible wait behaviour in the facilitator test. +Author: Ximin Luo <infini...@torproject.org> +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765156 +Applied-Upstream: commit:c89d0c04a6e454c54a58cd17c0b2e7c7267f15fc +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/facilitator/fp-facilitator-test.py ++++ b/facilitator/fp-facilitator-test.py +@@ -209,7 +209,20 @@ + self.relay_file.seek(0) + fn = os.path.join(os.path.dirname(__file__), "./fp-facilitator") + self.process = subprocess.Popen(["python", fn, "-d", "-p", str(FACILITATOR_PORT), "-r", self.relay_file.name, "-l", "/dev/null"]) +- time.sleep(0.1) ++ self.waitForChild() ++ ++ def waitForChild(self): ++ """Wait until the child process is responsive. This takes different ++ times on different machines so be flexible in how long to wait. e.g. ++ see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=765156"""; ++ for i in xrange(0, 20): ++ try: ++ s = fac.fac_socket(FACILITATOR_ADDR) ++ s.close() ++ return ++ except socket.error as e: ++ time.sleep(0.05) ++ raise e + + def tearDown(self): + ret = self.process.poll() diff -Nru flashproxy-1.7/debian/patches/series flashproxy-1.7/debian/patches/series --- flashproxy-1.7/debian/patches/series 2014-08-06 01:24:24.000000000 +0100 +++ flashproxy-1.7/debian/patches/series 2014-11-05 17:13:07.000000000 +0000 @@ -3,3 +3,4 @@ disable-flaky-test.patch generate-key-in-initscript.patch disable-xsltproc-net.patch +more-flexible-wait.patch diff -Nru flashproxy-1.7/debian/rules flashproxy-1.7/debian/rules --- flashproxy-1.7/debian/rules 2014-07-22 19:35:48.000000000 +0100 +++ flashproxy-1.7/debian/rules 2014-11-05 17:13:07.000000000 +0000 @@ -11,7 +11,8 @@ DH_common = -S python_distutils DH_client = -S makefile -- -f Makefile.client prefix=/usr sysconfdir=/etc DH_facilitator = -S autoconf -D facilitator -- -DH_proxy = -S makefile -D proxy/modules/nodejs -- +DH_proxy = -S makefile -D proxy -- +DH_nodeproxy = -S makefile -D proxy/modules/nodejs -- # TODO(infinity0): handle setup-common.py better; currently we symlink it as a # hack. Ideally, we would fix dh_python to support custom setup.py filenames. @@ -31,12 +32,13 @@ dh_auto_build $(DH_common) dh_auto_build $(DH_client) dh_auto_build $(DH_facilitator) PYTHONPATH=.. - dh_auto_build $(DH_proxy) + dh_auto_build $(DH_nodeproxy) override_dh_auto_test: dh_auto_test $(DH_common) dh_auto_test $(DH_client) - dh_auto_test $(DH_facilitator) PYTHONPATH=.. + dh_auto_test $(DH_facilitator) PYTHONPATH=.. VERBOSE=1 + dh_auto_test $(DH_proxy) override_dh_auto_install: dh_auto_install $(DH_common) @@ -52,7 +54,7 @@ rm -rf flashproxy_common.egg-info dh_auto_clean $(DH_client) dh_auto_clean $(DH_facilitator) - dh_auto_clean $(DH_proxy) + dh_auto_clean $(DH_nodeproxy) rm -f setup.py e2e-check:
