diff --git a/.gitignore b/.gitignore index e74d60d..92d0288 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /firewalld-0.1.2.tar.bz2 /firewalld-0.1.3.tar.bz2 +/firewalld-0.2.0.tar.bz2 diff --git a/firewalld.spec b/firewalld.spec index db32419..eb4496c 100644 --- a/firewalld.spec +++ b/firewalld.spec @@ -1,26 +1,29 @@ +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")} + Summary: A firewall daemon with D-BUS interface providing a dynamic firewall Name: firewalld -Version: 0.1.3 -Release: 4%{?dist} +Version: 0.2.0 +Release: 1%{?dist} URL: http://fedorahosted.org/firewalld License: GPLv2+ ExclusiveOS: Linux Group: System Environment/Base +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildArch: noarch Source0: https://fedorahosted.org/released/firewalld/%{name}-%{version}.tar.bz2 -Source1: firewalld.service BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool BuildRequires: systemd-units +Requires: dbus-python +Requires: python-slip-dbus >= 0.2.7 +Requires: iptables, ebtables +Requires(post): chkconfig +Requires(preun): chkconfig Requires(post): systemd-sysv Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units -Requires: system-config-firewall-base >= 1.2.28 -Requires: dbus-python -Requires: python-slip-dbus >= 0.2.7 -Requires: iptables, ebtables %description firewalld is a firewall service daemon that provides a dynamic customizable @@ -60,12 +63,9 @@ the firewall settings. %configure %install -make install DESTDIR=%{buildroot} +rm -rf %{buildroot} -# systemd -rm -rf %{buildroot}%{_initddir} -mkdir -p %{buildroot}%{_unitdir} -install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/ +make install DESTDIR=%{buildroot} desktop-file-install --delete-original \ --dir %{buildroot}%{_datadir}/applications \ @@ -76,10 +76,13 @@ desktop-file-install --delete-original \ %find_lang %{name} --all-name +%clean +rm -rf %{buildroot} + %post -if [ $1 -eq 1 ] ; then - # Initial installation - /bin/systemctl daemon-reload >/dev/null 2>&1 || : +if [ $1 -eq 1 ] ; then # Initial installation + /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl enable firewalld.service >/dev/null 2>&1 || : fi touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then @@ -87,24 +90,22 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then fi %preun -if [ $1 = 0 ]; then - # Package removal, not upgrade - /bin/systemctl --no-reload disable firewalld.service > /dev/null 2>&1 || : - /bin/systemctl stop firewalld.service > /dev/null 2>&1 || : +if [ $1 -eq 0 ]; then # Package removal, not upgrade + /bin/systemctl --no-reload disable firewalld.service > /dev/null 2>&1 || : + /bin/systemctl stop firewalld.service > /dev/null 2>&1 || : fi %postun /bin/systemctl daemon-reload >/dev/null 2>&1 || : -if [ $1 -ge 1 ] ; then - # Package upgrade, not uninstall - /bin/systemctl try-restart firewalld.service >/dev/null 2>&1 || : +if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall + /bin/systemctl try-restart firewalld.service >/dev/null 2>&1 || : fi touch --no-create %{_datadir}/icons/hicolor if [ -x /usr/bin/gtk-update-icon-cache ]; then gtk-update-icon-cache -q %{_datadir}/icons/hicolor fi -%triggerun -- httpd < 1.0-2 +%triggerun -- firewalld < 0.1.3-3 # Save the current service runlevel info # User must manually run systemd-sysv-convert --apply firewalld # to migrate them to systemd targets @@ -116,18 +117,35 @@ fi %files -f %{name}.lang +%defattr(-,root,root) %doc COPYING %{_sbindir}/firewalld %{_bindir}/firewall-cmd -%defattr(0644,root,root) -%attr(0755,root,root) %dir %{_sysconfdir}/firewalld +%defattr(0640,root,root) +%attr(0750,root,root) %dir %{_sysconfdir}/firewalld +%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/icmptypes +%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/services +%attr(0750,root,root) %dir %{_sysconfdir}/firewalld/zones +%{_sysconfdir}/firewalld/icmptypes/*.xml +%{_sysconfdir}/firewalld/services/*.xml +%{_sysconfdir}/firewalld/zones/*.xml %config(noreplace) %{_sysconfdir}/firewalld/firewalld.conf +%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.FirewallD.policy -%attr(0755,root,root) %dir %{_datadir}/firewalld/ -%{_datadir}/firewalld/*.py* +%attr(0755,root,root) %dir %{python_sitelib}/firewall +%attr(0755,root,root) %dir %{python_sitelib}/firewall/config +%attr(0755,root,root) %dir %{python_sitelib}/firewall/core +%attr(0755,root,root) %dir %{python_sitelib}/firewall/core/io +%attr(0755,root,root) %dir %{python_sitelib}/firewall/server +%{python_sitelib}/firewall/*.py* +%{python_sitelib}/firewall/config/*.py* +%{python_sitelib}/firewall/core/*.py* +%{python_sitelib}/firewall/core/io/*.py* +%{python_sitelib}/firewall/server/*.py* %{_mandir}/man1/firewall-cmd.1* %files -n firewall-applet @@ -136,6 +154,7 @@ fi %defattr(0644,root,root) %{_datadir}/applications/firewall-applet.desktop %{_datadir}/icons/hicolor/*/apps/firewall-applet*.* +%{_datadir}/glib-2.0/schemas/org.fedoraproject.FirewallApplet.gschema.xml #%files -n firewall-config #%defattr(-,root,root) @@ -146,7 +165,17 @@ fi #%{_datadir}/icons/hicolor/*/apps/firewall-config*.* %changelog -* Fri Jan 13 2012 Fedora Release Engineering - 0.1.3-4 +* Mon Feb 6 2012 Thomas Woerner 0.2.0-1 +- version 0.2.0 with new FirewallD1 D-BUS interface +- supports zones with a default zone +- new direct interface as a replacement of the partial virt interface with + additional passthrough functionality +- dropped custom rules, use direct interface instead +- dropped trusted interface funcionality, use trusted zone instead +- using zone, service and icmptype configuration files +- not using any system-config-firewall parts anymore + +* Fri Jan 13 2012 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild * Fri Sep 9 2011 Tom Callaway 0.1.3-3 @@ -161,9 +190,6 @@ fi - translation updates: de, es, gu, it, ja, kn, ml, nl, or, pa, pl, ru, ta, uk, zh_CN -* Tue Feb 08 2011 Fedora Release Engineering - 0.1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - * Mon Jan 3 2011 Thomas Woerner 0.1.2-1 - fixed package according to package review (rhbz#665395): - non executable scripts: dropped shebang diff --git a/sources b/sources index 1b05dfc..8cee180 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -936eeaed708893e4e0cdf85b4799c7b3 firewalld-0.1.3.tar.bz2 +aea998ad550e3f0f26762b7f66943eb9 firewalld-0.2.0.tar.bz2