Bug#926876: unblock: chiark-utils/6.0.4

[Ian Jackson <ijackson@chiark.greenend.org.uk>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package chiark-utils

chiark-utils is a portmanteau of different utiliies.  I am proposing
to fix two bugs.  Each bug is RC for the corresponding utility in the
sense that the utility is dangerous or useless without the fix.  (The
bugs are not IMO RC for the package as a whole, although I think the
dangerous one is "important".)

1. fishdescriptor has a bug which makes it not work on amd64 and could
cause malfunctions or even UB in the target process.  #926858

2. sync-accounts uses an ancient deprecated perl syntax and is
entirely rejected by current versions of perl.  #865985

Below is the source diff.  Assuming the unblock is granted I will
finalise the changelog entry for 6.0.4 and do a dgit push-source
to do a source-only upload.

(For my records: diff was generated from current master on chiark, ie
 0caba95b1c3f211fa3defcff017dde1374b3caa6)


unblock chiark-utils/6.0.4


diff --git a/debian/changelog b/debian/changelog
index 1d1758f..e0ecabd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+chiark-utils (6.0.4~iwj1) unstable; urgency=medium
+
+  * sync-accounts: Fix perl syntax error.  Closes:#865985.
+  * changelog: Document bug number for bugfix in 6.0.4~citrix1.
+
+ --
+
+chiark-utils (6.0.4~citrix1) unstable; urgency=medium
+
+  * fishdescriptor: cast __errno_location correctly.  Closes:#926858.
+
+ -- Ian Jackson <ian.jackson@citrix.com>  Mon, 08 Apr 2019 17:03:47 +0100
+
 chiark-utils (6.0.3) unstable; urgency=medium
 
   * Upload to Debian unstable.
diff --git a/fishdescriptor/py/fishdescriptor/indonor.py b/fishdescriptor/py/fishdescriptor/indonor.py
index 20bc807..e227fb2 100644
--- a/fishdescriptor/py/fishdescriptor/indonor.py
+++ b/fishdescriptor/py/fishdescriptor/indonor.py
@@ -142,7 +142,7 @@ class DonorImplementation():
         # in my browser).  Also the error is very nonspecific :-/.
         # This seems to happen on jessie, and is fixed in stretch.
         # Anyway:
-        return parse_eval(expr_pat % '(*((int (*)(void))__errno_location)())')
+        return parse_eval(expr_pat % '(*((int*(*)(void))__errno_location)())')
 
     # calling functions (need to cast the function name to the right
     # type in case maybe gdb doesn't know the type)
diff --git a/sync-accounts/sync-accounts b/sync-accounts/sync-accounts
index cef131c..5348a14 100755
--- a/sync-accounts/sync-accounts
+++ b/sync-accounts/sync-accounts
@@ -64,7 +64,7 @@ sub fields_fmt ($$) {
     my ($pfx,$fmt) = @_;
     my ($vn);
     $vn= "fields_pw_$fmt";
-    die "unknown format $fmt\n" unless defined @$vn;
+    die "unknown format $fmt\n" unless @$vn;
     fields($pfx,@$vn);
     $vn= "${pfx}_format";
     $$vn= $fmt;


-- System Information:
Debian Release: 9.8
  APT prefers stable-debug
  APT policy: (500, 'stable-debug'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.19.0-0.bpo.2-amd64 (SMP w/4 CPU cores)
Locale: LANG=C.UTF-8, LC_CTYPE=C.UTF-8 (charmap=UTF-8), LANGUAGE=C.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: sysvinit (via /sbin/init)