Prepare 6.0.2~bpo9+1debian/6.0.2_bpo9+1archive/debian/6.0.2_bpo9+1

Merge branch 'master' into dgit/stretch-backports

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

3 files changed, 18 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index f158a11..da21e32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,22 @@
-chiark-utils (6.0.0~bpo9+2) stretch-backports; urgency=medium
+chiark-utils (6.0.2~bpo9+1) stretch-backports; urgency=medium
 
-  * Rebuild with sbuild -A to include the arch:all packages too.
+  * Upload chiark-utils 6.0.2 to stretch-backports.
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 09 May 2018 00:39:01 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 09 May 2018 00:34:26 +0100
 
-chiark-utils (6.0.0~bpo9+1) stretch-backports; urgency=medium
+chiark-utils (6.0.2) unstable; urgency=medium
 
-  * Upload chiark-utils 6.x to stretch.  In particular, the
-    git-cache-proxy fixes are important and fishdescriptor is quite fun.
+  * Rebuild with arch:all packages included in the upload.
 
- -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Wed, 09 May 2018 00:34:26 +0100
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 11 Jun 2018 14:35:08 +0100
+
+chiark-utils (6.0.1) unstable; urgency=low
+
+  fishdescriptor:
+  * Fix numerous bugs, affecting the `exec' feature with nontrivial fd
+    specifications.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Mon, 11 Jun 2018 14:31:24 +0100
 
 chiark-utils (6.0.0) unstable; urgency=medium
 
diff --git a/fishdescriptor/fishdescriptor b/fishdescriptor/fishdescriptor
index 8abdfff..8955b46 100755
--- a/fishdescriptor/fishdescriptor
+++ b/fishdescriptor/fishdescriptor
@@ -62,7 +62,7 @@ def implement_pending():
     for (nominal, there), actual in zip(pending, actuals):
         overwriting_info = fdmap.get(nominal)
         if overwriting_info is not None: os.close(overwriting_info[0])
-        fdmap[nominal] = (actual, donor, there)
+        fdmap[nominal] = [actual, donor, there]
 
 def implement_sockinfo(nominal):
     (actual, tdonor, there) = fdmap[nominal]
@@ -126,9 +126,10 @@ def permute_fds_for_exec():
             if inway_intended is not None:
                 inway_moved = os.dup(intended)
                 actual2intended[inway_moved] = inway_intended
-                fdmap[inway_intented][0] = inway_moved
+                fdmap[inway_intended][0] = inway_moved
             os.dup2(actual, intended)
         os.close(actual)
+        del actual2intended[actual]
 
 def implement_exec(argl):
     if donor is not None: donor.detach()
diff --git a/fishdescriptor/py/fishdescriptor/fish.py b/fishdescriptor/py/fishdescriptor/fish.py
index 0f180bc..b47ac3d 100644
--- a/fishdescriptor/py/fishdescriptor/fish.py
+++ b/fishdescriptor/py/fishdescriptor/fish.py
@@ -154,6 +154,7 @@ class Donor():
 
             s = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
             s.bind(our_sockname)
+            os.chmod(our_sockname, 666)
             s.listen(1)
 
             ancil_len = d.donate(our_sockname, fds)