pool/firewalld
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 362870 from security:netfilter

Browse Source 
- Set DISABLE_RESTART_ON_UPDATE to 'yes' instead of '1'. The macros in
  /etc/rpm/macros.systemd only check for the 'yes' value so fix it to
  properly prevent the firewalld service from being restarted during
  updates.

- Drop typelib(NetworkManager), NetworkManager-glib, gtk3
  and libnotify dependencies (see OBS SR#360792)

- firewall-config needs typelib(NetworkManager) to run

OBS-URL: https://build.opensuse.org/request/show/362870
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/firewalld?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2016-03-01 08:45:28 +00:00 committed by Git OBS Bridge
commit 4d81e65d1c
3 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -1,5 +1,5 @@
<services>
<service name="verify_file" mode='localonly'>
<service name="verify_file" mode="localonly">
<param name="file">firewalld-0.4.0.tar.bz2</param>
<param name="verifier">sha1</param>
<param name="checksum">f1818ed82a3e3f14b4315a2dd32c2a268ce223b3</param>

19
firewalld.changes
View File

@ -1,3 +1,22 @@
-------------------------------------------------------------------
Mon Feb 29 09:39:27 UTC 2016 - mchandras@suse.de
- Set DISABLE_RESTART_ON_UPDATE to 'yes' instead of '1'. The macros in
/etc/rpm/macros.systemd only check for the 'yes' value so fix it to
properly prevent the firewalld service from being restarted during
updates.
-------------------------------------------------------------------
Mon Feb 22 13:18:19 UTC 2016 - mchandras@suse.de
- Drop typelib(NetworkManager), NetworkManager-glib, gtk3
and libnotify dependencies (see OBS SR#360792)
-------------------------------------------------------------------
Mon Feb 22 10:18:26 UTC 2016 - jslaby@suse.com
- firewall-config needs typelib(NetworkManager) to run
-------------------------------------------------------------------
Mon Feb 1 11:28:12 UTC 2016 - mchandras@suse.de

8
firewalld.spec
View File

@ -60,10 +60,7 @@ Summary: Firewall panel applet
Group: Productivity/Networking/Security
Requires: %{name} = %{version}-%{release}
Requires: firewall-config = %{version}-%{release}
Requires: gtk3
Requires: hicolor-icon-theme
Requires: libnotify
Requires: NetworkManager-glib
Requires: python-gobject
Requires: python-qt4
@ -75,9 +72,7 @@ the firewall settings.
Summary: Firewall configuration application
Group: Productivity/Networking/Security
Requires: %{name} = %{version}-%{release}
Requires: gtk3
Requires: hicolor-icon-theme
Requires: NetworkManager-glib
Requires: python-gobject
%description -n firewall-config
@ -131,7 +126,7 @@ install -D -m644 config/macros.firewalld %{buildroot}%{_sysconfdir}/rpm/macros.f
# made it permanent yet so restarting the service could be
# dangerous. It's safer to not touch the firewall ourselves but
# Let the user restart it whenever he feels like it.
export DISABLE_RESTART_ON_UPDATE=1
export DISABLE_RESTART_ON_UPDATE=yes
%service_del_postun firewalld.service
%post -n firewall-applet
@ -148,7 +143,6 @@ fi
%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%post -n firewall-config
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :