rpms/firewalld
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- reunification of the firewalld spec files for all Fedora releases

Browse Source 
- fix dependencies for -applet and -config: use_python3 is the proper switch
  not with_python3 (RHBZ#1232493)

* New upstream version 0.3.14.2:

- firewalld.spec:
  - fixed requirements for -applet and -config
- man pages:
  - adapted firewall-applet man page to new version
- firewall-applet:
  - Only honour active connections for zone changes
  - Change QSettings path and file names
- firewall-config:
  - Only honour active connections for zone changes in the “Change Zones of Connections” menu
- Translations:
  - updated translations
  - marked translations for “Connections” for review
This commit is contained in:
Thomas Woerner 2015-06-17 11:54:16 +02:00
parent 3467da0208
commit a852a77a23
3 changed files with 137 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -33,3 +33,4 @@
/firewalld-0.3.12.tar.bz2
/firewalld-0.3.13.tar.bz2
/firewalld-0.3.14.1.tar.bz2
/firewalld-0.3.14.2.tar.bz2

141
firewalld.spec
View File

@ -7,8 +7,8 @@
Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
Name: firewalld
Version: 0.3.14.1
Release: 3%{?dist}
Version: 0.3.14.2
Release: 1%{?dist}
URL: http://www.firewalld.org
License: GPLv2+
Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2
@ -41,7 +41,11 @@ Requires: python3-firewall = %{version}-%{release}
%else #0%{?use_python3}
Requires: python-firewall = %{version}-%{release}
%endif #0%{?use_python3}
%if 0%{?fedora} == 21
Requires: firewalld-config
%endif
%if 0%{?fedora} > 21
Provides: variant_config(Server)
Provides: variant_config(Workstation)
@ -50,6 +54,7 @@ Obsoletes: firewalld-config-standard <= 0.3.13
Obsoletes: firewalld-config-cloud <= 0.3.13
Obsoletes: firewalld-config-server <= 0.3.13
Obsoletes: firewalld-config-workstation <= 0.3.13
%endif
%description
firewalld is a firewall service daemon that provides a dynamic customizable
@ -91,7 +96,7 @@ Summary: Firewall panel applet
Requires: %{name} = %{version}-%{release}
Requires: firewall-config = %{version}-%{release}
Requires: hicolor-icon-theme
%if 0%{?with_python3}
%if 0%{?use_python3}
Requires: python3-PyQt4
Requires: python3-gobject
%else
@ -110,7 +115,7 @@ Summary: Firewall configuration application
Requires: %{name} = %{version}-%{release}
Requires: hicolor-icon-theme
Requires: gtk3
%if 0%{?with_python3}
%if 0%{?use_python3}
Requires: python3-gobject
%else
Requires: pygobject3-base
@ -121,6 +126,42 @@ Requires: NetworkManager-glib
The firewall configuration application provides an configuration interface for
firewalld.
%if 0%{?fedora} == 21
%package config-standard
Summary: Firewalld standard configuration settings
Requires: firewalld = %{version}-%{release}
Provides: firewalld-config
Conflicts: system-release-server
Conflicts: firewalld-config-server
Conflicts: system-release-workstation
Conflicts: firewalld-config-workstation
%description config-standard
Standard product firewalld configuration settings.
%package config-server
Summary: Firewalld server configuration settings
Provides: firewalld-config
Requires: firewalld = %{version}-%{release}
Requires: system-release-server
Conflicts: firewalld-config-workstation
Conflicts: firewalld-config-standard
%description config-server
Server product specific firewalld configuration settings.
%package config-workstation
Summary: Firewalld workstation configuration settings
Provides: firewalld-config
Requires: firewalld = %{version}-%{release}
Requires: system-release-workstation
Conflicts: firewalld-config-server
Conflicts: firewalld-config-standard
%description config-workstation
Workstation product specific firewalld configuration settings.
%endif
%prep
%setup -q
%if 0%{?fedora}
@ -204,6 +245,7 @@ rm -f %{buildroot}%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.poli
%postun
%systemd_postun_with_restart firewalld.service
%if 0%{?fedora} > 21
%posttrans
# If we don't yet have a symlink or existing file for firewalld.conf,
# create it. Note: this will intentionally reset the policykit policy
@ -236,6 +278,7 @@ if [ ! -e %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy ]; th
ln -sf org.fedoraproject.FirewallD1.server.policy %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy || :
esac
fi
%endif
%post -n firewall-applet
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@ -266,6 +309,50 @@ fi
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%if 0%{?fedora} == 21
%post config-standard
if [ $1 -eq 1 ]; then # Initial installation
# link standard config
rm -f %{_sysconfdir}/firewalld/firewalld.conf
ln -sf firewalld-standard.conf %{_sysconfdir}/firewalld/firewalld.conf || :
fi
%triggerin config-standard -- firewalld
if [ $1 -eq 1 ]; then
# link server policy
rm -f %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
ln -sf org.fedoraproject.FirewallD1.server.policy %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy || :
fi
%post config-server
if [ $1 -eq 1 ]; then # Initial installation
# link server config
rm -f %{_sysconfdir}/firewalld/firewalld.conf
ln -sf firewalld-server.conf %{_sysconfdir}/firewalld/firewalld.conf || :
fi
%triggerin config-server -- firewalld
if [ $1 -eq 1 ]; then
# link server policy
rm -f %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
ln -sf org.fedoraproject.FirewallD1.server.policy %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy || :
fi
%post config-workstation
if [ $1 -eq 1 ]; then # Initial installation
# link workstation config
rm -f %{_sysconfdir}/firewalld/firewalld.conf
ln -sf firewalld-workstation.conf %{_sysconfdir}/firewalld/firewalld.conf || :
fi
%triggerin config-workstation -- firewalld
if [ $1 -eq 1 ]; then
# link desktop policy
rm -f %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
ln -sf org.fedoraproject.FirewallD1.desktop.policy %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy || :
fi
%endif
%files -f %{name}.lang
%doc COPYING README
%{_sbindir}/firewalld
@ -278,23 +365,31 @@ fi
%{_prefix}/lib/firewalld/zones/*.xml
%{_prefix}/lib/firewalld/xmlschema/*.xsd
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld
%if 0%{?fedora} <= 20
%config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
%endif
%if 0%{?fedora} > 21
%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
%config(noreplace) %{_sysconfdir}/firewalld/firewalld-standard.conf
%config(noreplace) %{_sysconfdir}/firewalld/firewalld-server.conf
%config(noreplace) %{_sysconfdir}/firewalld/firewalld-workstation.conf
%endif
%config(noreplace) %{_sysconfdir}/firewalld/lockdown-whitelist.xml
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/icmptypes
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services
%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones
%defattr(0644,root,root)
%config(noreplace) %{_sysconfdir}/sysconfig/firewalld
#%attr(0755,root,root) %{_initrddir}/firewalld
%{_unitdir}/firewalld.service
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/FirewallD.conf
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.desktop.policy
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.server.policy
%if 0%{?fedora} <= 20
%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
%endif
%if 0%{?fedora} > 21
%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
%endif
%{_mandir}/man1/firewall*cmd*.1*
%{_mandir}/man1/firewalld*.1*
%{_mandir}/man5/firewall*.5*
@ -361,7 +456,41 @@ fi
%{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallConfig.gschema.xml
%{_mandir}/man1/firewall-config*.1*
%if 0%{?fedora} == 21
%files config-standard
%config(noreplace) %{_sysconfdir}/firewalld/firewalld-standard.conf
%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
%files config-server
%config(noreplace) %{_sysconfdir}/firewalld/firewalld-server.conf
%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
%files config-workstation
%config(noreplace) %{_sysconfdir}/firewalld/firewalld-workstation.conf
%ghost %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf
%ghost %{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
%endif
%changelog
* Wed Jun 17 2015 Thomas Woerner <twoerner@redhat.com> - 0.3.14.2-1
- reunification of the firewalld spec files for all Fedora releases
- fix dependencies for -applet and -config: use_python3 is the proper switch
not with_python3 (RHBZ#1232493)
- firewalld.spec:
- fixed requirements for -applet and -config
- man pages:
- adapted firewall-applet man page to new version
- firewall-applet:
- Only honour active connections for zone changes
- Change QSettings path and file names
- firewall-config:
- Only honour active connections for zone changes in the “Change Zones of Connections” menu
- Translations:
- updated translations
- marked translations for “Connections” for review
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.14.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

2
sources
View File

@ -1 +1 @@
c00ed0ea081bccbcf8b450c771e95b42 firewalld-0.3.14.1.tar.bz2
5984690845a7be38dff3cedff273b73a firewalld-0.3.14.2.tar.bz2