aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2020-07-07 08:26:18 -0300
committerRasmus Thomsen <oss@cogitri.dev>2020-07-07 16:36:30 +0000
commit5d7a3ad8ac2a1749ed39aff6276122b893eabd15 (patch)
tree40a6e8bf4572eb0b8d217d526aae01641c6c7508
parent38bb3187d37368833cfcc6927597cf78ff2e314f (diff)
downloadaports-5d7a3ad8ac2a1749ed39aff6276122b893eabd15.tar.gz
aports-5d7a3ad8ac2a1749ed39aff6276122b893eabd15.tar.bz2
aports-5d7a3ad8ac2a1749ed39aff6276122b893eabd15.tar.xz
community/networkmanager-elogind: modernize
-rw-r--r--community/networkmanager-elogind/APKBUILD25
-rw-r--r--community/networkmanager-elogind/README.alpine6
2 files changed, 17 insertions, 14 deletions
diff --git a/community/networkmanager-elogind/APKBUILD b/community/networkmanager-elogind/APKBUILD
index 4bfeab06e3..e88f89b87e 100644
--- a/community/networkmanager-elogind/APKBUILD
+++ b/community/networkmanager-elogind/APKBUILD
@@ -3,7 +3,7 @@
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=networkmanager-elogind
pkgver=1.24.2
-pkgrel=1
+pkgrel=2
pkgdesc="Network Management daemon (with elogind hibernation support)"
url="https://wiki.gnome.org/Projects/NetworkManager"
arch="all"
@@ -48,6 +48,7 @@ source="$pkgname-$pkgver.tar.xz::https://download.gnome.org/sources/NetworkManag
networkmanager.conf
networkmanager.initd
networkmanager.rules
+ README.alpine
musl-basic.patch
musl-network-support.patch
musl-fix-includes.patch
@@ -59,6 +60,8 @@ source="$pkgname-$pkgver.tar.xz::https://download.gnome.org/sources/NetworkManag
options="!check" # fail to compile on musl
provides="networkmanager"
+install_if="networkmanager elogind"
+
builddir="$srcdir"/NetworkManager-$pkgver
build() {
@@ -102,21 +105,14 @@ package() {
DESTDIR="$pkgdir" ninja -C output install
install -m755 -D "$srcdir"/networkmanager.initd "$pkgdir"/etc/init.d/networkmanager
- install -m644 -D "$srcdir/networkmanager.conf" "$pkgdir"/etc/NetworkManager/NetworkManager.conf
+ install -m644 -D "$srcdir"/networkmanager.conf "$pkgdir"/etc/NetworkManager/NetworkManager.conf
# allow plugdev users to modify connections
- install -m644 -D "$srcdir/networkmanager.rules" \
- "$pkgdir/usr/share/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
- mkdir -p "$pkgdir/usr/share/apk-tools/$pkgname"
+ install -m644 -D "$srcdir"/networkmanager.rules \
+ "$pkgdir"/usr/share/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules
+ mkdir -p "$pkgdir"/usr/share/apk-tools/$pkgname
# post-install message
- mv "$pkgdir/usr/share/doc/NetworkManager" "$pkgdir/usr/share/doc/$pkgname"
- cat > "$pkgdir"/usr/share/doc/$pkgname/README.alpine <<EOF
-To modify system network connections without the root password: add your user account to the 'plugdev' group, or use Polkit.
-
-To use iwd instead of the default wpa_supplicant install iwd, start its service and add the following to your /etc/NetworkManager/NetworkManager.conf:
-
-[device]
-wifi.backend=iwd
-EOF
+ mv "$pkgdir"/usr/share/doc/NetworkManager "$pkgdir"/usr/share/doc/$pkgname
+ install -Dm0644 "$srcdir"/README.alpine -t "$pkgdir"/usr/share/doc/$pkgname
}
dev() {
@@ -155,6 +151,7 @@ sha512sums="34fcbdffe5b621ff5d851e6b8de07ddf3f3ad294822adc36d6c36682049cc1f7e028
a6e507260e2ceffad4cacb2b49a1d4f6b933e5ae8bc50c1bd56f828298c5dc8d9d17aa4be766faeacefbe3c6c0c748e4ef499a55bb5ee40f0f04bbf766fbbc82 networkmanager.conf
5ac6d11b588c479de9c7e1fef79ed0a2c04dc159a2173636a6a77a2867c839cc1609860756109e9e794f23a02238a6d94834d8fb6fcb81a6be3ef1dbf4a34e6f networkmanager.initd
9820ed2ead0af689644842de57657bb10330a1eaff0e85b21ae9913f55e399e47d8b41b0a12956f30de80272b4424c6e55f33acbc88e156879003a260bf576f6 networkmanager.rules
+744570b30738f0603fe1b83d8f2051277c7bd908bb226e45339b791334d8c2baf4c185a3118bf7739c780e2938dfc11d08f4fc8b3ae6398305f28e528e16c1a2 README.alpine
9d1a9185b0b50f677a4173a8b67e808ba36971111165ae446e9a15b5c7adcc8cc6d44fa7bddac05762c50d80b04818a483756eaf2aaefe0162e1f37cd070fca4 musl-basic.patch
095c1d944f3274ba31435cd1af8e2affb4187bdd921a0cc0c185b59810b73cfab7919b5f551bab3d9e4644fbee8f9ac017b4c5d69a771fb68319cbefa37c71a3 musl-network-support.patch
aa756d7d54aceb213a05746d43367ed1871782f4b9678f3f51b302f4f9c7a4384dd3f6d3a5a4a0106c741faf2b4c13964a57c5aa0c5d0222f653a4d51422857a musl-fix-includes.patch
diff --git a/community/networkmanager-elogind/README.alpine b/community/networkmanager-elogind/README.alpine
new file mode 100644
index 0000000000..6cd02e884b
--- /dev/null
+++ b/community/networkmanager-elogind/README.alpine
@@ -0,0 +1,6 @@
+To modify system network connections without the root password: add your user account to the 'plugdev' group, or use Polkit.
+
+To use iwd instead of the default wpa_supplicant install iwd, start its service and add the following to your /etc/NetworkManager/NetworkManager.conf:
+
+[device]
+wifi.backend=iwd