Bug#753447: dnssec-trigger: NetworkManager script fails with /bin/sh linked to dash

[Gerald Turner]

Package: dnssec-trigger
Version: 0.12-1
Severity: normal
Tags: patch

Dear Maintainer,

In addition to bug #753318, the NetworkManager script fails with the
following output:

  Jul  1 16:22:33 p4xb3k nm-dispatcher.action[3775]: 
/etc/NetworkManager/dispatcher.d/01-dnssec-trigger: 102: [: down: unexpected 
operator
  ...
  Jul  1 16:24:58 p4xb3k nm-dispatcher.action[4634]: 
/etc/NetworkManager/dispatcher.d/01-dnssec-trigger: 106: [: no: unexpected 
operator
  Jul  1 16:24:58 p4xb3k nm-dispatcher.action[4634]: 
/etc/NetworkManager/dispatcher.d/01-dnssec-trigger: 115: 
/etc/NetworkManager/dispatcher.d/01-dnssec-trigger: cannot create 
/var/run/dnssec-trigger/6fc9918e-5f5c-470b-952a-3728e0d1665f: Directory 
nonexistent

Attached is a patch that fixes a few bashisms plus creates $state_dir.

-- System Information:
Debian Release: jessie/sid
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.14-1-amd64 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) (ignored: LC_ALL 
set to en_US.UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages dnssec-trigger depends on:
ii  libatk1.0-0          2.12.0-1
ii  libc6                2.19-4
ii  libcairo2            1.12.16-2
ii  libfontconfig1       2.11.0-5
ii  libfreetype6         2.5.2-1
ii  libgdk-pixbuf2.0-0   2.30.7-1
ii  libglib2.0-0         2.40.0-3
ii  libgtk2.0-0          2.24.24-1
ii  libldns1             1.6.17-4
ii  libpango-1.0-0       1.36.3-1
ii  libpangocairo-1.0-0  1.36.3-1
ii  libpangoft2-1.0-0    1.36.3-1
ii  libssl1.0.0          1.0.1h-3
ii  python               2.7.6-2
ii  unbound              1.4.22-1

dnssec-trigger recommends no packages.

dnssec-trigger suggests no packages.

-- Configuration Files:
/etc/NetworkManager/dispatcher.d/01-dnssec-trigger changed: (see patch)

-- no debconf information

-- debsums errors found:
debsums: changed file /usr/lib/x86_64-linux-gnu/dnssec-trigger-script (from 
dnssec-trigger package)

-- 
Gerald Turner <gtur...@unzane.com>        Encrypted mail preferred!
OpenPGP: 4096R / CA89 B27A 30FA 66C5 1B80  3858 EC94 2276 FDB8 716D

--- dnssec-trigger-0.12.orig/01-dnssec-trigger.in	2014-03-25 06:00:55.000000000 -0700
+++ dnssec-trigger-0.12/01-dnssec-trigger.in	2014-07-01 16:58:20.630472054 -0700
@@ -84,7 +84,7 @@
     if [ -r "$conn_zones_file" ]; then
         for domain in `cat $conn_zones_file`; do
             # Remove forward zone from unbound
-            if [ "$validate_forward_zones" == "no" ]; then
+            if [ "$validate_forward_zones" = "no" ]; then
             	unbound-control forward_remove +i $domain &> /dev/null
 	    else
             	unbound-control forward_remove $domain &> /dev/null
@@ -99,11 +99,11 @@
         rm -f $conn_zones_file &> /dev/null
     fi
 
-    if [ "$action" == "vpn-up" ] || [ "$action" == "up" ]; then
+    if [ "$action" = "vpn-up" -o "$action" = "up" ]; then
         if [ -n "$domains" ]; then
             for domain in $domains; do
                 # Add forward zone into unbound
-                if [ "$validate_forward_zones" == "no" ]; then
+                if [ "$validate_forward_zones" = "no" ]; then
                     unbound-control forward_add +i $domain $nameservers &> /dev/null
                 else
                     unbound-control forward_add $domain $nameservers &> /dev/null
@@ -112,6 +112,7 @@
                 unbound-control flush_requestlist &> /dev/null
 
                 # Create zone info file
+                mkdir -p $(dirname $conn_zones_file)
                 echo $domain >> $conn_zones_file
 
                 logger "dnssec-trigger-hook(networkmanager) $ifname $action added forward DNS zone $domain $nameservers"

pgpY5TvU2K1L5.pgp
Description: PGP signature