diff --git a/.gitignore b/.gitignore index 3d39692..ce77334 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /dnssec-trigger-0.11.tar.gz /dnssec-trigger-0.12.tar.gz /dnssec-trigger-0.13_20150714.tar.gz +/dnssec-trigger-0.13.tar.gz diff --git a/dnssec-trigger-0.13-Remove-restorecon-call-in-dnssec-triggerd-keygen.ser.patch b/dnssec-trigger-0.13-Remove-restorecon-call-in-dnssec-triggerd-keygen.ser.patch deleted file mode 100644 index 51aa644..0000000 --- a/dnssec-trigger-0.13-Remove-restorecon-call-in-dnssec-triggerd-keygen.ser.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b5a24c7985afa8ce7d0e2f3b80a4c72de69fea75 Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Tue, 14 Jul 2015 13:15:22 +0200 -Subject: [PATCH 2/2] Remove restorecon call in dnssec-triggerd-keygen.service - -Any SELinux issues should be fixed in the policy - -Signed-off-by: Tomas Hozza ---- - dnssec-triggerd-keygen.service | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/dnssec-triggerd-keygen.service b/dnssec-triggerd-keygen.service -index 8fcd4f3..e3b8b10 100644 ---- a/dnssec-triggerd-keygen.service -+++ b/dnssec-triggerd-keygen.service -@@ -5,5 +5,4 @@ ConditionPathExists=!/etc/dnssec-trigger/dnssec_trigger_control.key - [Service] - Type=oneshot - ExecStart=/usr/sbin/dnssec-trigger-control-setup -d /etc/dnssec-trigger/ --ExecStart=-/sbin/restorecon /etc/dnssec-trigger/* - RemainAfterExit=yes --- -2.4.3 - diff --git a/dnssec-trigger-0.13-Set-PidFile-in-the-dnssec-triggerd.service-file.patch b/dnssec-trigger-0.13-Set-PidFile-in-the-dnssec-triggerd.service-file.patch deleted file mode 100644 index 05bf673..0000000 --- a/dnssec-trigger-0.13-Set-PidFile-in-the-dnssec-triggerd.service-file.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a60ba46da9a4271247fd23439438866913644269 Mon Sep 17 00:00:00 2001 -From: Tomas Hozza -Date: Tue, 14 Jul 2015 13:09:57 +0200 -Subject: [PATCH 1/2] Set PIDFile in the dnssec-triggerd.service file - -Signed-off-by: Tomas Hozza ---- - dnssec-triggerd.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/dnssec-triggerd.service.in b/dnssec-triggerd.service.in -index e5f15e8..618a583 100644 ---- a/dnssec-triggerd.service.in -+++ b/dnssec-triggerd.service.in -@@ -5,6 +5,7 @@ Requires=unbound.service - Wants=dnssec-triggerd-keygen.service - - [Service] -+PIDFile=@pidfile@ - Type=simple - Restart=always - ExecStart=@sbindir@/dnssec-triggerd -d --- -2.4.3 - diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec index 63ea07d..ef1c05b 100644 --- a/dnssec-trigger.spec +++ b/dnssec-trigger.spec @@ -1,13 +1,14 @@ %global _hardened_build 1 -%global svn_snapshot 20150714 +#%%global svn_snapshot 20150714 Summary: Tool for dynamic reconfiguration of validating resolver Unbound Name: dnssec-trigger Version: 0.13 -Release: 0.6%{?svn_snapshot:.%{svn_snapshot}svn}%{?dist} +Release: 1%{?svn_snapshot:.%{svn_snapshot}svn}%{?dist} License: BSD Url: http://www.nlnetlabs.nl/downloads/dnssec-trigger/ + %if 0%{?svn_snapshot:1} # generated using './makedist.sh -s' in the cloned upstream trunk Source0: %{name}-%{version}_%{svn_snapshot}.tar.gz @@ -19,8 +20,6 @@ Source2: dnssec-trigger-default.conf Source3: dnssec-trigger-workstation.conf # Patches -Patch0: dnssec-trigger-0.13-Set-PidFile-in-the-dnssec-triggerd.service-file.patch -Patch1: dnssec-trigger-0.13-Remove-restorecon-call-in-dnssec-triggerd-keygen.ser.patch # to obsolete the version in which the panel was in main package Obsoletes: %{name} < 0.12-22 @@ -74,9 +73,6 @@ some user input is needed, the panel creates a dialog window. %prep %setup -q %{?svn_snapshot:-n %{name}-%{version}_%{svn_snapshot}} -%patch0 -p1 -%patch1 -p1 - # don't use DNSSEC for forward zones for now sed -i "s/validate_connection_provided_zones=yes/validate_connection_provided_zones=no/" dnssec.conf @@ -184,6 +180,10 @@ rm -rf ${RPM_BUILD_ROOT} %changelog +* Fri Feb 17 2017 Tomas Hozza - 0.13-1 +- Update to stable 0.13 upstream release +- Dropped merged patches + * Fri Feb 10 2017 Fedora Release Engineering - 0.13-0.6.20150714svn - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 01a1db1..9cb78de 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8eef1982013b95fbba6f633f7340b2be dnssec-trigger-0.13_20150714.tar.gz +SHA512 (dnssec-trigger-0.13.tar.gz) = 0d42625a71bfda8484fa67afa129bccb2002d28b96d5267a9862a1a4bf51e0e3b12f3205a79d5977449c43c25a1ab1c66cea8cc0e8fd95763a1fe5b3674f437c