diff --git a/.github/actions/build-deb/Dockerfile b/.github/actions/build-deb/Dockerfile index 4fff426..6dba9f4 100644 --- a/.github/actions/build-deb/Dockerfile +++ b/.github/actions/build-deb/Dockerfile @@ -3,7 +3,9 @@ LABEL maintainer="Patrick Pacher " # Installs the `dpkg-buildpackage` command -RUN apt-get update && apt-get install curl build-essential debhelper devscripts equivs -y --no-install-recommends && apt-get clean +RUN apt-get update \ + && apt-get install curl build-essential debhelper devscripts equivs imagemagick -y --no-install-recommends \ + && apt-get clean # Copies your code file from your action repository to the filesystem path `/` of the container diff --git a/linux/debian/changelog b/linux/debian/changelog index 64f6e8d..b83185e 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,10 @@ +portmaster (0.4.1.2) buster; urgency=low + + * Fix application icon + * Remove SystemCallFilter as it's broken on Mint 19 + + -- Safing Thu, 30 Jul 2020 09:36:25 +0200 + portmaster (0.4.1.0) buster; urgency=medium * Updated systemd service file diff --git a/linux/debian/portmaster.install b/linux/debian/portmaster.install index fec3f6c..5b4e025 100644 --- a/linux/debian/portmaster.install +++ b/linux/debian/portmaster.install @@ -2,4 +2,9 @@ portmaster_notifier.desktop /etc/xdg/autostart/ portmaster-start /var/lib/portmaster portmaster.desktop /usr/share/applications/ portmaster_notifier.desktop /usr/share/applications/ -portmaster.png /usr/share/pixmaps/ +icons/32/portmaster.png /usr/share/pixmaps/ +icons/16/portmaster.png /usr/share/icons/hicolor/16x16/apps/ +icons/32/portmaster.png /usr/share/icons/hicolor/32x32/apps/ +icons/48/portmaster.png /usr/share/icons/hicolor/48x48/apps/ +icons/96/portmaster.png /usr/share/icons/hicolor/96x96/apps/ +icons/128/portmaster.png /usr/share/icons/hicolor/128x128/apps/ diff --git a/linux/debian/portmaster.service b/linux/debian/portmaster.service index 5bfb4df..e4c74f9 100644 --- a/linux/debian/portmaster.service +++ b/linux/debian/portmaster.service @@ -44,8 +44,12 @@ PrivateDevices=yes AmbientCapabilities=cap_chown cap_kill cap_net_admin cap_net_bind_service cap_net_broadcast cap_net_raw cap_sys_module cap_sys_ptrace cap_dac_override CapabilityBoundingSet=cap_chown cap_kill cap_net_admin cap_net_bind_service cap_net_broadcast cap_net_raw cap_sys_module cap_sys_ptrace cap_dac_override SystemCallArchitectures=native -SystemCallFilter=@system-service @module -SystemCallErrorNumber=EPERM +# +# Seems like at least Mint19 does not have the system-service +# call group so we leave that feature disabled for now. +# +#SystemCallFilter=@system-service @module +#SystemCallErrorNumber=EPERM ExecStart=/var/lib/portmaster/portmaster-start --data /var/lib/portmaster core -- --log $LOGLEVEL $PORTMASTER_ARGS ExecStopPost=-/sbin/iptables -F C17 ExecStopPost=-/sbin/iptables -t mangle -F C170 diff --git a/linux/debian/portmaster.triggers b/linux/debian/portmaster.triggers new file mode 100644 index 0000000..44f91a9 --- /dev/null +++ b/linux/debian/portmaster.triggers @@ -0,0 +1,2 @@ +activate update-icon-caches +activate update-desktop-database diff --git a/linux/debian/postinst b/linux/debian/postinst index 9986f78..0c9709f 100644 --- a/linux/debian/postinst +++ b/linux/debian/postinst @@ -28,6 +28,7 @@ else print_dl_help "skipped downloading modules!" fi + # with 0.4.0 portmaster-control has ben renamed to portmaster-start # and is not placed into /usr/bin anymore. rm /usr/bin/portmaster-control 2> /dev/null || true diff --git a/linux/debian/rules b/linux/debian/rules index 119c941..247b67e 100755 --- a/linux/debian/rules +++ b/linux/debian/rules @@ -1,8 +1,10 @@ #!/usr/bin/make -f STARTURL ?= https://updates.safing.io/latest/linux_amd64/start/portmaster-start\?CI +.PHONY: icons + # We don't build here, we download the built binaries -build: portmaster-start +build: icons portmaster-start %: dh $@ --with=systemd @@ -10,6 +12,12 @@ build: portmaster-start #portmaster.png: # convert logo.png -resize 32x32 portmaster.png +icons: + for res in 16 32 48 96 128 ; do \ + mkdir -p icons/$$res ; \ + convert ./portmaster_logo.png -resize $${res}x$${res} icons/$${res}/portmaster.png ; \ + done + portmaster-start: curl --fail --user-agent GitHub -o portmaster-start $(STARTURL) diff --git a/linux/portmaster.desktop b/linux/portmaster.desktop index 4cc689b..d398e08 100644 --- a/linux/portmaster.desktop +++ b/linux/portmaster.desktop @@ -2,7 +2,7 @@ Name=Portmaster GenericName=Application Firewall Exec=/var/lib/portmaster/portmaster-start app --data=/var/lib/portmaster -Icon=/usr/share/pixmaps/portmaster.png +Icon=portmaster Terminal=false Type=Application Categories=System diff --git a/linux/portmaster.png b/linux/portmaster.png deleted file mode 100644 index a53eb85..0000000 Binary files a/linux/portmaster.png and /dev/null differ diff --git a/linux/portmaster_logo.png b/linux/portmaster_logo.png new file mode 100644 index 0000000..7ac111c Binary files /dev/null and b/linux/portmaster_logo.png differ diff --git a/linux/portmaster_logo.svg b/linux/portmaster_logo.svg new file mode 100644 index 0000000..911e65e --- /dev/null +++ b/linux/portmaster_logo.svg @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +