From 9eccd66520a26aecc26dd192ace621208e1d7212 Mon Sep 17 00:00:00 2001
From: "fergus.henderson@gmail.com"
 <fergus.henderson@gmail.com@01de4be4-8c4a-0410-9132-4925637da917>
Date: Thu, 3 May 2012 20:58:24 +0000
Subject: Fix for distcc issue 109
 <http://code.google.com/p/distcc/issues/detail?id=109>: Apply a patch from
 Debian that was forwarded upstream by mandyke. The patch fixes a potential
 security problem in pump wrapper (pump.in).  If PYTHONPATH were originally
 unset or empty, the current working directory would be added to PYTHONPATH,
 which is a security risk.

git-svn-id: http://distcc.googlecode.com/svn/trunk@768 01de4be4-8c4a-0410-9132-4925637da917
---
 pump.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pump.in b/pump.in
index 9d10b04..3a0c7a8 100755
--- a/pump.in
+++ b/pump.in
@@ -295,7 +295,7 @@ StartIncludeServer() {
     # of one asterisk) without filename expansion.
     eval \
       "PYTHONOPTIMIZE='$PYTHONOPTIMIZE' " \
-      "PYTHONPATH='$pythonpath::$PYTHONPATH' " \
+      "PYTHONPATH='$pythonpath${PYTHONPATH:+:$PYTHONPATH}' " \
       "'$PYTHON'"                       \
          "'$include_server'"            \
          --port "'$socket'"             \
-- 
cgit v1.2.1