[dnssec-trigger/f17] * Thu Jun 28 2012 Paul Wouters <pwouters at redhat.com> - 0.11-3 - Fix DHCP hook for f17+ version of nm

[Paul Wouters]

commit f42065f8fc6ecfa4d3f525b2b953f9d6641cae9a
Author: Paul Wouters <pwouters at redhat.com>
Date:   Wed Jun 27 21:57:59 2012 -0400

    * Thu Jun 28 2012 Paul Wouters <pwouters at redhat.com> - 0.11-3
    - Fix DHCP hook for f17+ version of nmcli (rhbz#835298)

 01-dnssec-trigger-hook-f17 |   22 ++++++++++++++++++++++
 dnssec-trigger.spec        |    9 ++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/01-dnssec-trigger-hook-f17 b/01-dnssec-trigger-hook-f17
new file mode 100755
index 0000000..85a8837
--- /dev/null
+++ b/01-dnssec-trigger-hook-f17
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# NetworkManager trigger for in dispatcher.d
+# config items
+nmcli="nmcli"
+
+# implementation
+ifname="$1"
+action="$2"
+
+# get ips from NetworkManager
+if test -x "`which $nmcli 2>&1`"; then
+ips="`$nmcli -f IP4,IP6 dev list | fgrep 'DNS' | awk '{print $2;}'`"
+else
+ips="`nm-tool | grep 'DNS:' | awk '{print $2;}'`"
+fi
+# fix whitespace
+ips=`echo $ips`
+
+logger "dnssec-trigger-hook(networkmanager) $ifname $action DNS $ips"
+/usr/sbin/dnssec-trigger-control submit "$ips"
+exit 0
diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec
index 89bb7ac..6525d1b 100644
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@ -1,13 +1,14 @@
 Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
 Name: dnssec-trigger
 Version: 0.11
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: BSD
 Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/
 Source: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz
 Source1:dnssec-triggerd.service
 Source2: dnssec-triggerd-keygen.service
 Source3: dnssec-trigger.conf
+Source4: 01-dnssec-trigger-hook-f17
 Patch1: dnssec-trigger-0.11-gui.patch
 Requires(postun): initscripts
 Requires: ldns >= 1.6.10, NetworkManager, unbound, xdg-utils
@@ -51,6 +52,9 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/
 
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications dnssec-trigger-panel.desktop
 
+# overwrite the stock dhcp hook, as nmcli syntax changed on f17+
+cp -p %{SOURCE4} %{buildroot}/%{_sysconfdir}/NetworkManager/dispatcher.d/01-dnssec-trigger-hook
+
 # supress the panel name everywhere including the gnome3 panel at the bottom
 ln -s dnssec-trigger-panel %{buildroot}%{_bindir}/dnssec-trigger
 
@@ -97,6 +101,9 @@ fi
     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 
 %changelog
+* Thu Jun 28 2012 Paul Wouters <pwouters at redhat.com> - 0.11-3
+- Fix DHCP hook for f17+ version of nmcli (rhbz#835298)
+
 * Sun Jun 17 2012 Paul Wouters <pwouters at redhat.com> - 0.11-2
 - Small textual changes to some popup windows