From 5dc1e301a165709c60c435f00ec9bb6d7d5f21f3 Mon Sep 17 00:00:00 2001
From: Ralph Little <littlesincanada@yahoo.co.uk>
Date: Tue, 27 Aug 2019 21:40:02 -0700
Subject: [PATCH] Apply debian upstream patch 0160-fix_tighten_default_umask

Original patch commentary:

Description: Change default XSane umask from 0007 to 0077
 A default umask of 0007 can be mildly insecure in a multiuser environment,
 so tighten things up a bit and go with 0077 instead.
Author: Adrien Thebo
Bug-Debian: http://bugs.debian.org/592972
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xsane/+bug/611950

----
As above.
---
 src/xsane.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/xsane.h b/src/xsane.h
index 67f06d4..fa04418 100644
--- a/src/xsane.h
+++ b/src/xsane.h
@@ -104,7 +104,7 @@
 #define XSANE_DEBUG_ENVIRONMENT	"XSANE_DEBUG"
 
 #define XSANE_PROGRESS_BAR_MIN_DELTA_PERCENT 0.025
-#define XSANE_DEFAULT_UMASK		0007
+#define XSANE_DEFAULT_UMASK		0077
 #define XSANE_HOLD_TIME			200
 #define XSANE_CONTINUOUS_HOLD_TIME	10
 #define XSANE_DEFAULT_DEVICE		"SANE_DEFAULT_DEVICE"
-- 
2.22.0

d322b3f5b514c8a2811efcd6a31606'>refs</a><a class='active' href='/guix/log/tests/substitute.scm'>log</a><a href='/guix/tree/tests/substitute.scm?id=4be896d6e0d322b3f5b514c8a2811efcd6a31606'>tree</a><a href='/guix/commit/tests/substitute.scm?id=4be896d6e0d322b3f5b514c8a2811efcd6a31606'>commit</a><a href='/guix/diff/tests/substitute.scm?id=4be896d6e0d322b3f5b514c8a2811efcd6a31606'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/substitute.scm'>
<input type='hidden' name='id' value='4be896d6e0d322b3f5b514c8a2811efcd6a31606'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=4be896d6e0d322b3f5b514c8a2811efcd6a31606'>root</a>/<a href='/guix/log/tests?id=4be896d6e0d322b3f5b514c8a2811efcd6a31606'>tests</a>/<a href='/guix/log/tests/substitute.scm?id=4be896d6e0d322b3f5b514c8a2811efcd6a31606'>substitute.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/substitute.scm?id=4be896d6e0d322b3f5b514c8a2811efcd6a31606&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-04-09 17:46:38 +0200'>2021-04-09</span></td><td><a href='/guix/commit/tests/substitute.scm?id=2d73086262e1fb33cd0f0f16f74a495fe06b38aa'>daemon: 'guix substitute' replies on FD 4.</a><span class='msg-avail'>...<span class='msg-tooltip'>This avoids the situation where error messages would unintentionally go
to stderr and be wrongfully interpreted as a reply by the daemon.

Fixes &lt;https://bugs.gnu.org/46362&gt;.
This is a followup to ee3226e9d54891c7e696912245e4904435be191c.

* guix/scripts/substitute.scm (display-narinfo-data): Add 'port'
parameter and honor it.
(process-query): Likewise.
(process-substitution): Likewise.
(%error-to-file-descriptor-4?, with-redirected-error-port): Remove.
(%reply-file-descriptor): New variable.
(guix-substitute): Remove use of 'with-redirected-error-port'.  Define
'reply-port' and pass it to 'process-query' and 'process-substitution'.
* nix/libstore/build.cc (SubstitutionGoal::handleChildOutput): Swap
'builderOut' and 'fromAgent'.
* nix/libstore/local-store.cc (LocalStore::getLineFromSubstituter):
Likewise.
* tests/substitute.scm &lt;top level&gt;: Set '%reply-file-descriptor'
rather than '%error-to-file-descriptor-4?'.
</span></span></td><td>Ludovic Courtès</td></tr>