Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 017C1780ED8 for ; Sun, 9 Feb 2020 18:16:15 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id g1so7433345wmh.4 for ; Sun, 09 Feb 2020 10:16:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brixit-nl.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cvZG9T3WBifGzAu/LITHt5Mc8EEiWgANQhXlCD0PKgY=; b=eqlDclAFcahs5Zir+aE4S6NLSfsvQPB3+xYD82vsTFAY9mh9NZ137IIsM7nfMjAyMX ezNsXFO9plMiGaMrqA3itTpZTrXPKR2GlyKbf2QkM83+7jvtlXwpjhR2xeaT+ZVbe7ml F6tvP/v2quZFDxV+j+lKkntITUs8VEyliVEMUIgaMYR2FL1hV1xlcuPnjQsdpM633ubY ceCiA1zGrLwZKA9d4T5h+4sRdslZf11+RY++UFki7bnsRZ5VPtn20kTMhv225WcdUv0d 9QhmJN2bgUafG0L4TRreYvu2uugVi5Gk08Gyzxiy+leE4S4srjsaEuXb+DK/NsKQzhF0 5kww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=cvZG9T3WBifGzAu/LITHt5Mc8EEiWgANQhXlCD0PKgY=; b=olvP8RFNoLBb9kTmazEGjJz1JryEJ5TvEqNEbhmDxsY6zCo1xfBmh9e0N0M1ycCk2D qMbWjs4VZEobsGQhJE4h16M1bgBUDd9EmUrpzCvMdbAOhIDdiG3qXE6oYgpMXrumdsZA e9Bk4GINiwjHGsXDqThzRXGZgLR7pE7hgZkdWJy24AgkluqZfkR2aEDhb44h3xnWWHY0 4x6oa6vRxrvZp/yjH3Mdh6q4otJ+frm4zmuSWRi/RqtWQtK+LjC8ztmWEwRIPlt6ImSr Vtfe5ZVb/TpoGdaDskztPfaKbRsK5xK3ixVuYdxy71GOp+Sss6Sj8a2s/slGydzctmWi 39DA== X-Gm-Message-State: APjAAAV+AeGR7eIJExw7lszHLzbZ4xNEWJa0v2PIs8ptbqqHGdmWBhsu HMGEr0Pq05qklaS0lFSkuCODMk5Couw= X-Google-Smtp-Source: APXvYqw9HF3/3t12wfQjJ8ikCkUAqpDX/5uRz9olb9HlqWBz4wRujYC+ZsNKmu2vLPwYVSIVOJcapg== X-Received: by 2002:a1c:a9c4:: with SMTP id s187mr10380148wme.97.1581272174898; Sun, 09 Feb 2020 10:16:14 -0800 (PST) Received: from msi.localhost ([185.54.207.135]) by smtp.gmail.com with ESMTPSA id f207sm12932730wme.9.2020.02.09.10.16.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 09 Feb 2020 10:16:14 -0800 (PST) From: Martijn Braam To: alpine-aports@lists.alpinelinux.org Cc: Martijn Braam Subject: [PATCH] community/modemmanager: rewrite polkit rules Date: Sun, 9 Feb 2020 19:16:01 +0100 Message-Id: <20200209181601.7591-1-martijn@brixit.nl> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Rewrite polkit rules to no longer use a regex but use seperate string comparisons instead. This brings it in line with the gnome-control-center rules. --- community/modemmanager/APKBUILD | 4 ++-- community/modemmanager/modemmanager.rules | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/community/modemmanager/APKBUILD b/community/modemmanager/APKBUILD index f60d08fd7e..0e45787415 100644 --- a/community/modemmanager/APKBUILD +++ b/community/modemmanager/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Stuart Cardall pkgname=modemmanager pkgver=1.12.4 -pkgrel=0 +pkgrel=1 pkgdesc="ModemManager library" url="http://www.freedesktop.org/wiki/Software/ModemManager" arch="all" @@ -69,5 +69,5 @@ check() { } sha512sums="a0eb87e16ea32b8c0646667787ca8c88bf16a589d858fb134b814d7352ac9c84925ec168eaa49257e79ccd8b5d7cfe6cc5add8369e524ea14d88982a5b00fc8a ModemManager-1.12.4.tar.xz -3c76ee577334e25c836857f8e7fef6a249cdd9fcd8f889cb64d9c1667bc6a95c087267a153bddd1a13256c59f8cd578ccb448e6b9cb54b73bb74acb8a0ca1e3f modemmanager.rules +8d736f477649e42c05b34ac55391353c7f0c17138d039e049b16b07624d86fd9968ef1aa14672a63decf8b2c0ae984a34a0770322198b326775efba58f566685 modemmanager.rules e2769401c52c3fff0b8057c13c6f7f2e5656c2963239ecbd647a01e66a344f6852cf2ba065358248315945bdf6ebbc4976903565b12ace2d15df6586dcc1de5b modemmanager.initd" diff --git a/community/modemmanager/modemmanager.rules b/community/modemmanager/modemmanager.rules index 09e586e642..6b4a95fbc8 100644 --- a/community/modemmanager/modemmanager.rules +++ b/community/modemmanager/modemmanager.rules @@ -1,6 +1,9 @@ // Let users in plugdev group modify ModemManager polkit.addRule(function(action, subject) { - if (/^org\.freedesktop\.ModemManager1\.(Device\.Control|Contacts|Messaging|Location)$/.test(action.id) && + if ((action.id == "org.freedesktop.ModemManager1.Device.Control" || + action.id == "org.freedesktop.ModemManager1.Contacts" || + action.id == "org.freedesktop.ModemManager1.Messaging" || + action.id == "org.freedesktop.ModemManager1.Location") && subject.isInGroup("plugdev") && subject.active) { return "yes"; } -- 2.24.1