From 8bdd7d67c25dc1801a52eb89f7e060e3c32c2d59 Mon Sep 17 00:00:00 2001 From: Tomas Hozza Date: Jul 15 2015 12:24:08 +0000 Subject: split dnssec-trigger panel into separate subpackage (#1236363) - SPEC file cleanup based on rpmlint and fedora-review issues Signed-off-by: Tomas Hozza --- diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec index 58377f7..7764be9 100644 --- a/dnssec-trigger.spec +++ b/dnssec-trigger.spec @@ -2,7 +2,7 @@ %global svn_snapshot 20150714 -Summary: NetworkManager plugin to update/reconfigure DNSSEC resolving +Summary: Tool for dynamic reconfiguration of validating resolver Unbound Name: dnssec-trigger Version: 0.13 Release: 0.1%{?svn_snapshot:.%{svn_snapshot}svn}%{?dist} @@ -21,10 +21,10 @@ Source2: dnssec-trigger.tmpfiles.d 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 -Requires(postun): initscripts -Requires: ldns >= 1.6.10, NetworkManager-glib, unbound, xdg-utils +# to obsolete the version in which the panel was in main package +Obsoletes: %{name} < 0.12-22 +Suggests: %{name}-panel # Require a version of NetworkManager that doesn't forget to issue dhcp-change -# # https://bugzilla.redhat.com/show_bug.cgi?id=1112248 %if 0%{?rhel} >= 7 Requires: NetworkManager >= 0.9.9.1-13 @@ -35,9 +35,9 @@ Requires: NetworkManager >= 0.9.9.95-1 Requires: NetworkManager >= 0.9.9.0-40 %endif %endif -Requires(pre): shadow-utils -BuildRequires: desktop-file-utils systemd-units, openssl-devel, ldns-devel, python3-devel -BuildRequires: gtk2-devel, NetworkManager-devel +Requires: ldns >= 1.6.10, NetworkManager-glib, unbound +BuildRequires: openssl-devel, ldns-devel, python3-devel +BuildRequires: NetworkManager-devel BuildRequires: systemd Requires(post): systemd @@ -45,11 +45,26 @@ Requires(preun): systemd Requires(postun): systemd %description -dnssec-trigger reconfigures the local unbound DNS server. This unbound DNS -server performs DNSSEC validation, but dnssec-trigger will signal it to -use the DHCP obtained forwarders if possible, and fallback to doing its -own AUTH queries if that fails, and if that fails prompt the user via -dnssec-trigger-applet the option to go with insecure DNS only. +dnssec-trigger reconfigures the local Unbound DNS server. Unbound is a +resolver performing DNSSEC validation. dnssec-trigger is a set of daemon +and script. On every network configuration change dnssec-trigger performs +set of tests and configures Unbound based on the current NetworkManager +configuration, its own configuration and results of performed tests. + + +%package panel +Summary: Applet for interaction between the user and dnssec-trigger +Requires: %{name} = %{version}-%{release} +Obsoletes: %{name} < 0.12-22 +Requires: xdg-utils +BuildRequires: gtk2-devel, desktop-file-utils + +%description panel +This package provides the GTK panel for interaction between the user +and dnssec-trigger daemon. It is able to show the current state and +results of probing performed by dnssec-trigger daemon. Also in case +some user input is needed, the panel creates a dialog window. + %prep %setup -q %{?svn_snapshot:-n %{name}-%{version}_%{svn_snapshot}} @@ -57,24 +72,24 @@ dnssec-trigger-applet the option to go with insecure DNS only. %patch0 -p1 %patch1 -p1 -# 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 - # 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 \ + --with-keydir=%{_sysconfdir}/dnssec-trigger \ --with-hooks=networkmanager \ - --with-python=%{__python3} + --with-python=%{__python3} \ + --with-pidfile=%{_localstatedir}/run/%{name}d.pid %{__make} %{?_smp_mflags} + %install rm -rf %{buildroot} %{__make} DESTDIR=%{buildroot} install + install -d 0755 %{buildroot}%{_unitdir} install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/ @@ -99,48 +114,54 @@ for all in dnssec-trigger-control dnssec-trigger-control-setup dnssec-triggerd; done ln -s %{_mandir}/man8/dnssec-trigger.8 %{buildroot}/%{_mandir}/man8/dnssec-trigger.conf.8 + +%post +%systemd_post %{name}d.service + +%preun +%systemd_preun %{name}d.service +# Package removal, not upgrade +if [ "$1" -eq "0" ] ; then + # dnssec-triggerd makes /etc/resolv.conf immutable, undo that on removal + chattr -i %{_sysconfdir}/resolv.conf +fi + +%postun +%systemd_postun_with_restart %{name}d.service + + %clean rm -rf ${RPM_BUILD_ROOT} -%files -%defattr(-,root,root,-) -%doc README LICENSE + +%files +%license LICENSE +%doc README +%{_bindir}/dnssec-trigger +%{_sbindir}/dnssec-trigger* +%{_libexecdir}/dnssec-trigger-script %{_unitdir}/%{name}d.service %{_unitdir}/%{name}d-keygen.service - %attr(0755,root,root) %dir %{_sysconfdir}/%{name} %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 %dir %{_localstatedir}/run/%{name} %{_tmpfilesdir}/%{name}.conf +%{_mandir}/man8/dnssec-trigger* + +%files panel %{_bindir}/dnssec-trigger-panel -%{_bindir}/dnssec-trigger -%{_sbindir}/dnssec-trigger* -%{_libexecdir}/dnssec-trigger-script -%{_mandir}/*/* %attr(0755,root,root) %dir %{_datadir}/%{name} %attr(0644,root,root) %{_datadir}/%{name}/* %attr(0644,root,root) %{_datadir}/applications/dnssec-trigger-panel.desktop +%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/xdg/autostart/dnssec-trigger-panel.desktop -%post -%systemd_post %{name}d.service - -%preun -%systemd_preun %{name}d.service -# Package removal, not upgrade -if [ "$1" -eq "0" ] ; then - # dnssec-triggerd makes /etc/resolv.conf immutable, undo that on removal - chattr -i /etc/resolv.conf -fi - -%postun -%systemd_postun_with_restart %{name}d.service - %changelog * Wed Jul 15 2015 Tomas Hozza - 0.13-0.1.20150714svn +- split dnssec-trigger panel into separate subpackage (#1236363) +- SPEC file cleanup based on rpmlint and fedora-review issues - implement some suggestions (#1236363) - rebase to the latest svn trunk snapshot 0.13_20150714 - Script is not searching local user directories any more (#1213062)