Skip to content
Snippets Groups Projects
Commit bc58feb4 authored by Martin Pitt's avatar Martin Pitt
Browse files

Stop shipping firewall service file with recent firewalld

firewalld 0.6 includes cockpit's firewall service. To avoid a file
conflict between the packages and keep backportability, stop shipping
our firewalld service file on Debian > 9 and Ubuntu > 18.04.

Closes: #905389
parent 02ce78e0
No related branches found
No related tags found
No related merge requests found
......@@ -181,6 +181,7 @@ Depends: ${misc:Depends},
${shlibs:Depends},
glib-networking,
adduser,
Conflicts: ${ws:Conflicts}
Description: Cockpit Web Service
The Cockpit Web Service listens on the network, and authenticates
users.
......@@ -8,6 +8,12 @@ ifneq ($(shell dpkg -s libpcp3-dev >/dev/null 2>&1 && echo yes),yes)
CONFIG_OPTIONS = --disable-pcp
endif
# newer firewalld ships cockpit.xml, but keep it for backports
FIREWALLD_SERVICE = $(findstring $(shell . /etc/os-release; echo $$VERSION_ID),8 9 16.04 18.04)
ifeq ($(FIREWALLD_SERVICE),)
WS_CONFLICTS = firewalld (<< 0.6.0)
endif
%:
dh $@ --with=systemd,autoreconf
......@@ -72,5 +78,7 @@ override_dh_install:
dh_install --fail-missing -Xusr/src/debug
make install-tests DESTDIR=debian/cockpit-tests
if [ -z "$(FIREWALLD_SERVICE)" ]; then rm debian/cockpit-ws/usr/lib/firewalld/services/cockpit.xml; rmdir -p --ignore-fail-on-non-empty debian/cockpit-ws/usr/lib/firewalld/services/; fi
override_dh_gencontrol:
dh_gencontrol -- -Vbridge:minversion="$(shell tools/min-base-version)"
dh_gencontrol -- -Vbridge:minversion="$(shell tools/min-base-version)" -Vws:Conflicts="$(WS_CONFLICTS)"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment