Merge pull request #16 from safing/fix/icons

Fix desktop and application icons, fixes #5

.github/actions/build-deb/Dockerfile

@@ -3,7 +3,9 @@ LABEL maintainer="Patrick Pacher <patrick@safing.io>"
 
 
 # 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

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 <noc@safing.io>  Thu, 30 Jul 2020 09:36:25 +0200
+
 portmaster (0.4.1.0) buster; urgency=medium
 
   * Updated systemd service file

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/

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

linux/debian/portmaster.triggers

@@ -0,0 +1,2 @@
+activate update-icon-caches
+activate update-desktop-database

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

linux/debian/rules

@@ -1,15 +1,23 @@
 #!/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
 
 #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)
 

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