diff --git a/dnssec-trigger-842455.patch b/dnssec-trigger-842455.patch deleted file mode 100644 index c92cc6c..0000000 --- a/dnssec-trigger-842455.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- dnssec-trigger-0.11-orig/riggerd/riggerd.c 2012-07-24 10:27:43.638865272 -0400 -+++ dnssec-trigger-0.11/riggerd/riggerd.c 2012-07-24 10:51:39.910814143 -0400 -@@ -298,6 +298,7 @@ - so that during the reboot there is no window of opportunity */ - if(svr->insecure_state) - hook_resolv_localhost(cfg); -+ hook_resolv_uninstall(cfg); /* we want to remove immutable flag on TERM when systemd signals us */ - unlink_pid(cfg->pidfile); - log_info("%s stop", PACKAGE_STRING); - svr_delete(svr); diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec index d94e2c2..e55f148 100644 --- a/dnssec-trigger.spec +++ b/dnssec-trigger.spec @@ -3,17 +3,13 @@ Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving Name: dnssec-trigger Version: 0.12 -Release: 4%{?dist} +Release: 5%{?dist} License: BSD Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/ Source0: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz Source1: dnssec-trigger.conf Source2: dnssec-trigger.tmpfiles.d -# Remove immutable attribute on failure (not in upstream) -# -# https://bugzilla.redhat.com/show_bug.cgi?id=842455 -Patch1: dnssec-trigger-842455.patch # Fix dnssec-trigger-script (diff between 0.12 and what has been submitted to # upstream) # @@ -51,7 +47,6 @@ dnssec-trigger-applet the option to go with insecure DNS only. sed -i "s/ Panel//" panel/dnssec-trigger-panel.desktop.in sed -i "s/-panel//" panel/dnssec-trigger-panel.desktop.in -%patch1 -p1 %patch2 -p1 # change default RSA key between deamon/control from 1536 to 3072 @@ -131,6 +126,9 @@ fi %systemd_postun_with_restart %{name}d.service %changelog +* Fri Jun 20 2014 Pavel Šimerda - 0.12-5 +- Related: #842455 - remove a patch that is now redundant + * Fri Jun 20 2014 Pavel Šimerda - 0.12-4 - update dnssec-trigger-script to current development submitted upstream