diff --git a/dnssec-trigger-0.12-nm-script-2.patch b/dnssec-trigger-0.12-nm-script-2.patch new file mode 100644 index 0000000..b690b58 --- /dev/null +++ b/dnssec-trigger-0.12-nm-script-2.patch @@ -0,0 +1,30 @@ +commit 7c830e027a1b5c586ba66f1c1ff77fb79782bd6e +Author: Pavel Šimerda +Date: Fri Jun 13 12:42:11 2014 +0200 + + fix bug that prevents calling dnssec-trigger-control submit + +diff --git a/dnssec-trigger-script.in b/dnssec-trigger-script.in +index 297e36a..8f48dea 100644 +--- a/dnssec-trigger-script.in ++++ b/dnssec-trigger-script.in +@@ -279,10 +279,16 @@ class Store: + log.debug(self) + + def update(self, zones): +- """Commit a new zone list.""" ++ """Commit a new set of items and return True when it differs""" + +- self.cache = set(zones) +- log.debug(self) ++ zones = set(zones) ++ ++ if zones != self.cache: ++ self.cache = set(zones) ++ log.debug(self) ++ return True ++ ++ return False + + def remove(self, zone): + """Remove zone from the cache.""" diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec index 053a8d3..b8b866b 100644 --- a/dnssec-trigger.spec +++ b/dnssec-trigger.spec @@ -3,7 +3,7 @@ Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving Name: dnssec-trigger Version: 0.12 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/ Source0: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz @@ -19,6 +19,8 @@ Patch1: dnssec-trigger-842455.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1100794 # https://bugzilla.redhat.com/show_bug.cgi?id=1100794 Patch2: dnssec-trigger-0.12-nm-script.patch +# https://bugzilla.redhat.com/show_bug.cgi?id=1105896 +Patch3: dnssec-trigger-0.12-nm-script-2.patch Requires(postun): initscripts Requires: ldns >= 1.6.10, NetworkManager, NetworkManager-glib, unbound, xdg-utils @@ -46,6 +48,7 @@ sed -i "s/-panel//" panel/dnssec-trigger-panel.desktop.in %patch1 -p1 %patch2 -p1 +%patch3 -p1 # change default RSA key between deamon/control from 1536 to 3072 sed -i "s/BITS=1536/BITS=3072/" dnssec-trigger-control-setup.sh.in @@ -124,6 +127,9 @@ fi %systemd_postun_with_restart %{name}d.service %changelog +* Wed Jun 18 2014 Pavel Šimerda - 0.12-3 +- Resolves: #1105896 - the new script doesn't call dnssec-trigger-control submit + * Fri Jun 06 2014 Pavel Šimerda - 0.12-2 - fix various dnssec-trigger-script issues