[Pkg-privacy-commits] [torsocks] 01/03: This will fix Tails#12091 where torsocks prints to stderr on SquashFS in live systems. This is fixed upstream, but we won't ask for a freeze exception for this change. So changing it only in this branch.

[Ulrike Uhlig]

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

ulrike pushed a commit to branch tails/master
in repository torsocks.

commit 92a17de631f69a66bf2b1fe965677d1d90893011
Author: Ulrike Uhlig <u at 451f.org>
Date:   Fri Mar 17 13:10:59 2017 +0100

    This will fix Tails#12091 where torsocks prints to stderr on SquashFS in live systems. This is fixed upstream, but we won't ask for a freeze exception for this change. So changing it only in this branch.
---
 debian/patches/getcap.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/debian/patches/getcap.patch b/debian/patches/getcap.patch
new file mode 100644
index 0000000..0beaebf
--- /dev/null
+++ b/debian/patches/getcap.patch
@@ -0,0 +1,22 @@
+Description: Ignore stderr for getcap command.
+On a filesystem not supporting capabilities, an error is thrown out on
+stderr which is undesirable and confusing for the user.
+This commit throws stderr to /dev/null. The point of this getcap is to
+actually see if any capabilities are enabled or none. In the context of
+an error, there are none.
+Applied-Upstream: commit 6228eabd72eda576403bf6f199881a6d39c1148e
+Author: David Goulet <dgoulet at ev0ke.net>
+Date:   Fri Feb 24 10:47:33 2017 -0500
+Forwarded: not-needed
+
+--- a/src/bin/torsocks.in
++++ b/src/bin/torsocks.in
+@@ -144,7 +144,7 @@
+ 	# This must be before torifying because getcap uses cap_get_file(3)
+ 	# via syscall(2) which breaks torsocks.
+ 	if [ -n "$getcap" ]; then
+-		caps=`$getcap $app_path`
++		caps="`$getcap $app_path 2>/dev/null`"
+ 	fi
+
+ 	# Check if Apple's System Integrity Protection is enabled if the user is

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