[dnssec-trigger/f20: 3/3] Update to 0.12 version

Tomas Hozza thozza at fedoraproject.org
Fri May 23 09:43:14 UTC 2014 

commit 6d7e7fa28868e1eb2954cfd03fa1a882e6cb739c
Author: Tomas Hozza <thozza at redhat.com>
Date:   Fri May 23 11:22:22 2014 +0200

    Update to 0.12 version
    
    - Drop merged patches
    - Drop downstream files (systemd, dispatcher scripts)
    
    Signed-off-by: Tomas Hozza <thozza at redhat.com>

 .gitignore                                     |    1 +
 01-dnssec-trigger-hook                         |  550 ------------------------
 dnssec-trigger-0.11-coverity_scan.patch        |   39 --
 dnssec-trigger-0.11-improve_dialog_texts.patch |  134 ------
 dnssec-trigger-0.11-nl489.patch                |   12 -
 dnssec-trigger.spec                            |   64 +--
 dnssec-triggerd-keygen.service                 |   12 -
 dnssec-triggerd-resolvconf-handle.service      |   11 -
 dnssec-triggerd-resolvconf-handle.sh           |   62 ---
 dnssec-triggerd.service                        |   22 -
 dnssec.conf.sample                             |   54 ---
 sources                                        |    2 +-
 12 files changed, 24 insertions(+), 939 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7a7a8d..6888079 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /dnssec-trigger-0.9.tar.gz
 /dnssec-trigger-0.10.tar.gz
 /dnssec-trigger-0.11.tar.gz
+/dnssec-trigger-0.12.tar.gz
diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec
index 0f1ab6c..051a0ba 100644
--- a/dnssec-trigger.spec
+++ b/dnssec-trigger.spec
@@ -1,29 +1,16 @@
-global _hardened_build 1
+%global _hardened_build 1
 
 Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving
 Name: dnssec-trigger
-Version: 0.11
-Release: 21%{?dist}
+Version: 0.12
+Release: 1%{?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
-# Latest NM dispatcher hook from upstream SVN
-# http://www.nlnetlabs.nl/svn/dnssec-trigger/trunk/contrib/01-dnssec-trigger-hook-new_nm
-Source4: 01-dnssec-trigger-hook
-Source5: dnssec-trigger.tmpfiles.d
-Source6: dnssec-triggerd-resolvconf-handle.sh
-Source7: dnssec-triggerd-resolvconf-handle.service
-# http://www.nlnetlabs.nl/svn/dnssec-trigger/trunk/contrib/dnssec.conf.sample
-# we turned the validation of forward zones off, to not break existing installations.
-Source8: dnssec.conf.sample
-Patch1: dnssec-trigger-0.11-improve_dialog_texts.patch
-Patch2: dnssec-trigger-842455.patch
-# https://www.nlnetlabs.nl/bugs-script/show_bug.cgi?id=489
-Patch3: dnssec-trigger-0.11-nl489.patch
-Patch4: dnssec-trigger-0.11-coverity_scan.patch
+Source0: http://www.nlnetlabs.nl/downloads/dnssec-trigger/%{name}-%{version}.tar.gz
+Source1: dnssec-trigger.conf
+Source2: dnssec-trigger.tmpfiles.d
+
+Patch1: dnssec-trigger-842455.patch
 
 Requires(postun): initscripts
 Requires: ldns >= 1.6.10, NetworkManager, NetworkManager-glib, unbound, xdg-utils
@@ -48,42 +35,31 @@ dnssec-trigger-applet the option to go with insecure DNS only.
 # Fixup the name to not include "panel" in the menu item or name
 sed -i "s/ Panel//" panel/dnssec-trigger-panel.desktop.in
 sed -i "s/-panel//" panel/dnssec-trigger-panel.desktop.in
-# NM has no /usr/sbin in path
-sed -i "s/^dnssec-trigger-control/\/usr\/sbin\/dnssec-trigger-control/" 01-dnssec-trigger-hook.sh.in
-# change some text in the popups
+
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -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
+# don't use DNSSEC for forward zones for now
+sed -i "s/validate_connection_provided_zones=yes/validate_connection_provided_zones=no/" dnssec.conf
 
 %build
-%configure  --with-keydir=/etc/dnssec-trigger 
+%configure  --with-keydir=/etc/dnssec-trigger --with-hooks=networkmanager
 %{__make} %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} install
 install -d 0755 %{buildroot}%{_unitdir}
-install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}d.service
-install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}d-keygen.service
-install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/
+install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
 
 mkdir -p %{buildroot}%{_libexecdir}
-install -m 0755 %{SOURCE6} %{buildroot}%{_libexecdir}/%{name}d-resolvconf-handle.sh
-install -m 0644 %{SOURCE7} %{buildroot}%{_unitdir}/%{name}d-resolvconf-handle.service
 
 desktop-file-install --dir=%{buildroot}%{_datadir}/applications dnssec-trigger-panel.desktop
 
-# overwrite the stock NM hook since there is new and improved one in upstream SVN contrib/
-install -p -m 0755 %{SOURCE4} %{buildroot}/%{_sysconfdir}/NetworkManager/dispatcher.d/01-dnssec-trigger-hook
-# install the /etc/dnssec.conf
-install -p -m 0644 %{SOURCE8} %{buildroot}/%{_sysconfdir}/dnssec.conf
-
 # install the configuration for /var/run/dnssec-trigger into tmpfiles.d dir
 mkdir -p %{buildroot}%{_tmpfilesdir}
-install -m 644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}.conf
+install -m 644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_tmpfilesdir}/%{name}.conf
 # we must create the /var/run/dnssec-trigger directory
 mkdir -p %{buildroot}%{_localstatedir}/run
 install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
@@ -106,10 +82,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc README LICENSE
 %{_unitdir}/%{name}d.service
 %{_unitdir}/%{name}d-keygen.service
-%{_unitdir}/%{name}d-resolvconf-handle.service
 
 %attr(0755,root,root) %dir %{_sysconfdir}/%{name}
-%attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/01-dnssec-trigger-hook
+%attr(0755,root,root) %{_sysconfdir}/NetworkManager/dispatcher.d/01-dnssec-trigger
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/dnssec.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/dnssec-trigger.conf
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/xdg/autostart/dnssec-trigger-panel.desktop
@@ -118,7 +93,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/dnssec-trigger-panel
 %{_bindir}/dnssec-trigger
 %{_sbindir}/dnssec-trigger*
-%{_libexecdir}/%{name}d-resolvconf-handle.sh
+%{_libexecdir}/dnssec-trigger-script
 %{_mandir}/*/*
 %attr(0755,root,root) %dir %{_datadir}/%{name}
 %attr(0644,root,root) %{_datadir}/%{name}/*
@@ -140,6 +115,11 @@ fi
 %systemd_postun_with_restart %{name}d.service
 
 %changelog
+* Fri May 23 2014 Tomas Hozza <thozza at redhat.com> - 0.12-1
+- Update to 0.12 version
+- Drop merged patches
+- Drop downstream files (systemd, dispatcher scripts)
+
 * Tue May 13 2014 Paul Wouters <pwouters at redhat.com> - 0.11-21
 - Enable full hardening (includig PIE)
 - Resolves: rhbz#1045689 dnssec-trigger creates long-time RSA key with inappropriate size
diff --git a/sources b/sources
index 3131e3d..26bb275 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7efb79cb5813b1fab10c4a9518810431  dnssec-trigger-0.11.tar.gz
+811b14e79b97defcff17ea4d58325b2b  dnssec-trigger-0.12.tar.gz

More information about the scm-commits mailing list