Merge pull request #8 from siemens/develop

Develop

.goreleaser.yaml

@@ -75,6 +75,20 @@ nfpms:
       postremove: packaging/linux/post-remove.sh
     dependencies:
       - desktop-file-utils
+    overrides:
+      apk:
+        dependencies:
+          - wireshark-common
+          - desktop-file-utils
+      deb:
+        dependencies:
+          - wireshark-common
+          - desktop-file-utils
+        recommends:
+          - tshark | wireshark
+      rpm:
+        dependencies:
+          - wireshark-cli
 
 archives:
   - id: default

Makefile

@@ -8,9 +8,16 @@ help: ## list available targets
 	@# Derived from Gomega's Makefile (github.com/onsi/gomega) under MIT License
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-16s\033[0m %s\n", $$1, $$2}'
 
-dist: ## build snapshot cshargextcap binary packages+archives in dist/
+dist: ## build snapshot cshargextcap binary packages+archives in dist/ and test them
 # gorelease will run go generate anyway
 	@scripts/goreleaser.sh --snapshot --clean
+	for distro in alpine debian fedora ubuntu; do \
+		( \
+			echo "== test package installation on $${distro} ==" \
+			&& cd packaging/linux/test/$${distro} \
+			&& ./test.sh \
+		) || exit 1; \
+	done
 	@ls -lh dist/cshargextcap_*
 	@echo "🏁  done"
 

README.md

@@ -101,7 +101,7 @@ Then install this plugin: on Windows download and install the cshargextcap
 installer artifact. On Linux, download and install the cshargextcap package for
 your distribution (apk, deb, or rpm). In case you want to create the
 installation files yourself, then simply run `make dist` in the base directory
-of this repository. Afterwards, installation files will be found in the `dist/`
+of this repository. Please note that this will also test install the packages in distro-specific test containers to ensure the distro packages are fine. Afterwards, installation files can be found in the `dist/`
 directory.
 
 Now fire up Wireshark. If the installation went through correctly, Wireshark now

packaging/aur/makepackage.sh

@@ -7,5 +7,5 @@ NOCOLOR="\033[0m"
 
 docker build --pull -f Dockerfile -t archpkgbuilder .
 docker run --rm --name archpkgbuilder -v .:/pkg archpkgbuilder \
-    && echo "${GREEN}SUCCESS${NOCOLOR}" \
-    || (echo "${RED}FAIL${NOCOLOR}"; exit 1)
+    && echo -e "${GREEN}SUCCESS${NOCOLOR}" \
+    || (echo -e "${RED}FAIL${NOCOLOR}"; exit 1)

packaging/linux/post-install.sh

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/sh
 update-desktop-database

packaging/linux/post-remove.sh

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/bin/sh
 update-desktop-database

packaging/linux/test/alpine/Dockerfile

@@ -0,0 +1,4 @@
+# Do a test installation of the cshargextcap*.apk package on Alpine.
+FROM alpine:latest
+COPY install.sh /
+CMD ["/bin/sh", "install.sh"]

packaging/linux/test/alpine/install.sh

@@ -0,0 +1,33 @@
+#!/bin/sh
+set -e
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+arch=$(uname -m)
+case ${arch} in
+    x86_64)   arch="amd64";;
+    aarch64) arch="arm64";;
+    *)        echo -e "${RED}FAIL:${NOCOLOR} unsupported architecture ${arch}"; exit 1;;
+esac
+
+# test harness
+apk update
+apk add xdg-utils
+
+# the real deal...
+apk add --allow-untrusted /dist/cshargextcap_*_${arch}.apk
+
+apk add tshark
+
+# Ask tshark to tell us the extcap interfaces it knows of: this must list the
+# packetflix extcap so we know we've installed the plugin properly.
+tshark -D | grep packetflix \
+    && echo -e "${GREEN}OK:${NOCOLOR} tshark detects extcap plugin" \
+    || (echo -e "${RED}FAIL:${NOCOLOR} tshark doesn't detect the packetflix extcap"; exit 1)
+
+# Check that the default URL scheme handler registration is in place.
+xdg-mime query default x-scheme-handler/packetflix | grep "packetflix.desktop" \
+    && echo -e "${GREEN}OK:${NOCOLOR} packetflix URL scheme handler registered" \
+    || (echo -e "${RED}FAIL:${NOCOLOR} packetflix URL scheme handler not detected"; exit 1)

packaging/linux/test/alpine/test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+docker build --pull -f Dockerfile -t cshargextcap-alpine-test-install .
+docker run --rm --name cshargextcap-alpine-test-install -v ./../../../../dist:/dist cshargextcap-alpine-test-install \
+    && echo -e "${GREEN}SUCCESS${NOCOLOR}" \
+    || (echo -e "${RED}FAIL${NOCOLOR}"; exit 1)

packaging/linux/test/debian/Dockerfile

@@ -0,0 +1,4 @@
+# Do a test installation of the cshargextcap*.deb package on Debian.
+FROM debian:12-slim
+COPY install.sh /
+CMD ["/bin/bash", "install.sh"]

packaging/linux/test/debian/install.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+arch=$(uname -m)
+case ${arch} in
+    x86_64)   arch="amd64";;
+    aarch64) arch="arm64";;
+    *)        echo -e "${RED}FAIL:${NOCOLOR} unsupported architecture ${arch}"; exit 1;;
+esac
+
+# test harness
+apt-get update
+apt-get install --no-install-recommends --no-install-suggests -y xdg-utils
+
+# the real deal...
+apt-get install --no-install-suggests -y /dist/cshargextcap_*_${arch}.deb
+
+apt-get install --no-install-recommends --no-install-suggests -y tshark
+
+# Ask tshark to tell us the extcap interfaces it knows of: this must list the
+# packetflix extcap so we know we've installed the plugin properly.
+tshark -D | grep packetflix \
+    && echo -e "${GREEN}OK:${NOCOLOR} tshark detects extcap plugin" \
+    || (echo -e "${RED}FAIL:${NOCOLOR} tshark doesn't detect the packetflix extcap"; exit 1)
+
+# Check that the default URL scheme handler registration is in place.
+xdg-mime query default x-scheme-handler/packetflix | grep "packetflix.desktop" \
+    && echo -e "${GREEN}OK:${NOCOLOR} packetflix URL scheme handler registered" \
+    || (echo -e "${RED}FAIL:${NOCOLOR} packetflix URL scheme handler not detected"; exit 1)

packaging/linux/test/debian/test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+docker build --pull -f Dockerfile -t cshargextcap-debian-test-install .
+docker run --rm --name cshargextcap-debian-test-install -v ./../../../../dist:/dist cshargextcap-debian-test-install \
+    && echo -e "${GREEN}SUCCESS${NOCOLOR}" \
+    || (echo -e "${RED}FAIL${NOCOLOR}"; exit 1)

packaging/linux/test/fedora/Dockerfile

@@ -0,0 +1,4 @@
+# Do a test installation of the cshargextcap*.rpm package on Fedora.
+FROM fedora:latest
+COPY install.sh /
+CMD ["/bin/bash", "install.sh"]

packaging/linux/test/fedora/install.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+arch=$(uname -m)
+case ${arch} in
+    x86_64)   arch="amd64";;
+    aarch64) arch="arm64";;
+    *)        echo -e "${RED}FAIL:${NOCOLOR} unsupported architecture ${arch}"; exit 1;;
+esac
+
+# test harness
+dnf install -y xdg-utils
+
+# the real deal...
+dnf install -y /dist/cshargextcap_*_${arch}.rpm
+
+# Ask tshark to tell us the extcap interfaces it knows of: this must list the
+# packetflix extcap so we know we've installed the plugin properly.
+tshark -D | grep packetflix \
+    && echo -e "${GREEN}OK:${NOCOLOR} tshark detects extcap plugin" \
+    || (echo -e "${RED}FAIL:${NOCOLOR} tshark doesn't detect the packetflix extcap"; exit 1)
+
+# Check that the default URL scheme handler registration is in place.
+xdg-mime query default x-scheme-handler/packetflix | grep "packetflix.desktop" \
+    && echo -e "${GREEN}OK:${NOCOLOR} packetflix URL scheme handler registered" \
+    || (echo -e "${RED}FAIL:${NOCOLOR} packetflix URL scheme handler not detected"; exit 1)

packaging/linux/test/fedora/test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+docker build --pull -f Dockerfile -t cshargextcap-fedora-test-install .
+docker run --rm --name cshargextcap-fedora-test-install -v ./../../../../dist:/dist cshargextcap-fedora-test-install \
+    && echo -e "${GREEN}SUCCESS${NOCOLOR}" \
+    || (echo -e "${RED}FAIL${NOCOLOR}"; exit 1)

packaging/linux/test/ubuntu/Dockerfile

@@ -0,0 +1,4 @@
+# Do a test installation of the cshargextcap*.deb package on Ubuntu.
+FROM ubuntu:rolling
+COPY install.sh /
+CMD ["/bin/bash", "install.sh"]

packaging/linux/test/ubuntu/install.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+set -e
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+arch=$(uname -m)
+case ${arch} in
+    x86_64)   arch="amd64";;
+    aarch64) arch="arm64";;
+    *)        echo -e "${RED}FAIL:${NOCOLOR} unsupported architecture ${arch}"; exit 1;;
+esac
+
+# test harness
+apt-get update
+apt-get install --no-install-recommends --no-install-suggests -y xdg-utils
+
+# the real deal...
+apt-get install --no-install-suggests -y /dist/cshargextcap_*_${arch}.deb
+
+apt-get install --no-install-recommends --no-install-suggests -y tshark
+
+# Ask tshark to tell us the extcap interfaces it knows of: this must list the
+# packetflix extcap so we know we've installed the plugin properly.
+tshark -D | grep packetflix \
+    && echo -e "${GREEN}OK:${NOCOLOR} tshark detects extcap plugin" \
+    || (echo -e "${RED}FAIL:${NOCOLOR} tshark doesn't detect the packetflix extcap"; exit 1)
+
+# Check that the default URL scheme handler registration is in place.
+xdg-mime query default x-scheme-handler/packetflix | grep "packetflix.desktop" \
+    && echo -e "${GREEN}OK:${NOCOLOR} packetflix URL scheme handler registered" \
+    || (echo -e "${RED}FAIL:${NOCOLOR} packetflix URL scheme handler not detected"; exit 1)

packaging/linux/test/ubuntu/test.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+
+
+RED="\033[1;31m"
+GREEN="\033[1;32m"
+NOCOLOR="\033[0m"
+
+docker build --pull -f Dockerfile -t cshargextcap-ubuntu-test-install .
+docker run --rm --name cshargextcap-ubuntu-test-install -v ./../../../../dist:/dist cshargextcap-ubuntu-test-install \
+    && echo -e "${GREEN}SUCCESS${NOCOLOR}" \
+    || (echo -e "${RED}FAIL${NOCOLOR}"; exit 1)

packaging/windows/pluginversion.nsh

@@ -1,5 +1,5 @@
-!define VERSION "0.9.1-4-g9413ea6"
-!define FILEVERSION "0.9.1.0"
+!define VERSION "0.9.7-7-g83a50af"
+!define FILEVERSION "0.9.7.0"
 !define COPYRIGHT "Copyright © Siemens 2023"
 !define BINARYPATH "/cshargextcap/dist/windows_windows_amd64_v1"
 !define BINARYNAME "cshargextcap-amd64.exe"