diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD index af94296608d..1fe3be2d624 100644 --- a/main/awall/APKBUILD +++ b/main/awall/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Kaarle Ritvanen pkgname=awall pkgver=1.13.0 -pkgrel=0 +pkgrel=1 pkgdesc="Alpine Wall" url="https://gitlab.alpinelinux.org/alpine/awall" _luaver=5.4 @@ -53,5 +53,5 @@ policies() { sha512sums=" b25c704e6cc83d9ea0fa01007dfb39310887d23bcda96533c21708cdd30043ccbd788e18e8b0c0cc39b7e1f606ca9c924ebc1fcdbf4114ae8c4b4fbc31509bce awall-v1.13.0.tar.bz2 e83ea3281c298092530e45fa5b62f6f85b9e5109b11e109799465ea832608294c7d9c4c3f5b0f321dfc0e82040daf3a17d066e9dea65cb0dbae2c453ea9e62cd awall-init -ab67a2b31ee3d232620c9f8679292c6d6d9885cde80feaafc0eaf480a3bf75eca588a62a30e0e6152a689e35b1283e94c8710aa7e4cd3728ffaca88a1d064028 setup-firewall +953e60154411506f3bf2af100e85345c8f2651e6e07cdfb4d187e48b3e55186559e69260e84a99384b26f10d216efe811b9977722edc98030a16d28b6f328e6a setup-firewall " diff --git a/main/awall/setup-firewall b/main/awall/setup-firewall index c4c1c9cae94..3f1b7feb593 100755 --- a/main/awall/setup-firewall +++ b/main/awall/setup-firewall @@ -1,7 +1,7 @@ #!/bin/sh -e # Firewall setup script for Alpine Linux -# Copyright (C) 2018-2024 Kaarle Ritvanen +# Copyright (C) 2018-2025 Kaarle Ritvanen . /lib/libalpine.sh @@ -13,12 +13,11 @@ info() { fi } -_pgrep() { - pgrep -x $1 > /dev/null -} - is_running() { - _pgrep $1 || _pgrep /usr/sbin/$1 + ( + exec > /dev/null + pgrep -x $1 || pgrep -x /usr/sbin/$1 || pgrep ^$1: + ) } enable_policy() {