From 45dec6cc73d892679e2d2343a0cf68842dd24bc0 Mon Sep 17 00:00:00 2001 From: Clayton Craft Date: Mon, 19 Feb 2024 16:03:17 -0800 Subject: [PATCH] pmos-base-ui: re-enable DNS filtering (MR 4846) Alpine aports will have a patch[1] to fix the bug this was working around, so let's re-enable it. This reverts commit 4dac896160b6c351298ee519064efd6033deda73. 1. https://gitlab.alpinelinux.org/alpine/aports/-/merge_requests/61103 fixes #2601 Also see #1430 --- .ci/shellcheck.sh | 1 + main/postmarketos-base-ui/APKBUILD | 8 ++++---- ...s-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh | 3 --- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.ci/shellcheck.sh b/.ci/shellcheck.sh index 1a1625af5..18195105f 100755 --- a/.ci/shellcheck.sh +++ b/.ci/shellcheck.sh @@ -16,6 +16,7 @@ fi sh_files=" ./main/mdss-fb-init-hack/mdss-fb-init-hack.sh ./main/postmarketos-base/rootfs-usr-lib-firmwareload.sh + ./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh ./main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh ./main/postmarketos-installkernel/installkernel-pmos ./main/postmarketos-initramfs/init.sh diff --git a/main/postmarketos-base-ui/APKBUILD b/main/postmarketos-base-ui/APKBUILD index 9f18fd313..9cc4a46ee 100644 --- a/main/postmarketos-base-ui/APKBUILD +++ b/main/postmarketos-base-ui/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Clayton Craft pkgname=postmarketos-base-ui -pkgver=22 -pkgrel=5 +pkgver=23 +pkgrel=0 pkgdesc="Meta package for minimal postmarketOS UI base" url="https://postmarketos.org" arch="noarch" @@ -172,7 +172,7 @@ _usb_tethering() { networkmanager() { depends=" busctl - dnsmasq-dnssec-dbus>=2.89-r2 + dnsmasq-dnssec-dbus>=2.90-r1 gojq networkmanager networkmanager-cli @@ -277,7 +277,7 @@ ebb7700018cf64fe6dcb747365cd2fb816deb6e06e7368af779284b51b1f0749e24f8e70b0b72fa6 1b8add60574ec4644197cb93263c0653325c2e88e03673de918be5fb3280c7b81e8e97dce498850a07f2f3307771c44f3c876922e5cbd5207523ede31816296f rootfs-usr-lib-NetworkManager-system-connections-USB_Networking.nmconnection d1ddd43489e6016e3ffd716027ed2bae4a2ab5f213118bdbcb96750e267ab7c0367cd0e0e386300aa5550352653144f5caeddd790621fe0879f83ca1995bb65c rootfs-etc-tinydm.d-env-wayland.d-50-firefox-wayland.sh ecaa57d033a119a53a6574c27636b7c89d659d75ea48a973a6a4ff6f90e5d07202529fd489bfc9dfc7430f5b60f40612f6d5c06f7fab47e681b0a3112a874058 rootfs-etc-tinydm.d-env-wayland.d-50-sdl-wayland.sh -91410389f8d59ee504068b108ea8b93b89d3e9dd40f8db44ac984ada9a5b82ded1c0bbe2fedd6d8803ba449a66967e3b302ebbf0e2362923edb277f6c75a84af rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh +52d58729cbf3cd0318de633e8a8da74c7af246025a8c5746d5e7c854bdabbf27fa07d8558ffec92a30491cdb687fe4414de5adcddd7da5be3510f918fba463a2 rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh 9dcf698c729e6a3d05201aa74c1618169f344f9c973e6a074591b0b4f352470235decbbc658393f44c62b6b1508c68f3c1787a640f219dbcc136e9335f3994c4 rootfs-usr-lib-NetworkManager-dispatcher.d-50-tethering.sh bf8db527c49fa724e640a90269ba2648a2555f5867b2adbfbd88d1f685261f757339757c09ee08f590c76de4bd3d0c73a47dea9bd340644dd4707e76152cefd1 rootfs-etc-profile.d-qt-mobile-controls.sh 6e193eca3961a78d47b4656892eae34d019d9317a255a201f5ea61e3300caff04c526a27cd98d0edc072b36e3eaf3a1768f4cd27c5e2be8b19c167d535c820a6 rootfs-etc-profile.d-qt-wayland.sh diff --git a/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh b/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh index 6f44b82d1..cbc57fc9b 100644 --- a/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh +++ b/main/postmarketos-base-ui/rootfs-usr-lib-NetworkManager-dispatcher.d-50-dns-filter.sh @@ -18,9 +18,6 @@ jq=gojq action="${2:-}" -logger -i -t "$log_tag" "FIX ME: **NOT** applying filtering due to https://gitlab.com/postmarketOS/pmaports/-/issues/2601" -exit 0 - # Get the gateway for the given connection and IP protocol version # $1: D-Bus path to connection # $2: IP version, e.g. '4' or '6'