Skip to content
Snippets Groups Projects

systemd/networkmanager: upgrade to 1.50 and rebase APKBUILD

Merged Clayton Craft requested to merge craftyguy/systemd-networkmanager-1.50 into master_staging_systemd
All threads resolved!
@@ -4,7 +4,7 @@
pkgname=networkmanager
pkgver=9991.50.0
_pkgver=1.50.0
pkgrel=0
pkgrel=1
pkgdesc="Network Management daemon"
url="https://wiki.gnome.org/Projects/NetworkManager"
arch="all"
@@ -41,6 +41,7 @@ makedepends="
systemd-dev
util-linux-dev
vala
wireless-regdb
"
checkdepends="
bash
@@ -172,23 +173,24 @@ libnm() {
adsl() {
_default_plugin
pkgdesc="ADSL device plugin for NetworkManager"
install_if="$pkgname=$pkgver-r$pkgrel ppp-pppoe"
}
bluetooth() {
_default_plugin
pkgdesc="BlueTooth device plugin for NetworkManager"
depends="$depends bluez"
install_if="$pkgname=$pkgver-r$pkgrel bluez"
}
ovs() {
_default_plugin
pkgdesc="Open vSwitch device plugin for NetworkManager"
depends="$depends openvswitch"
install_if="$pkgname=$pkgver-r$pkgrel openvswitch"
}
ppp() {
pkgdesc="PPP plugin for NetworkManager"
depends="$pkgname=$pkgver-r$pkgrel"
install_if="$pkgname=$pkgver-r$pkgrel ppp"
amove $_plugindir/libnm-ppp-plugin.so
amove usr/lib/pppd/*/nm-pppd-plugin.so
@@ -197,14 +199,14 @@ ppp() {
wifi() {
_default_plugin
pkgdesc="WiFi device plugin for NetworkManager"
depends="$depends wireless-regdb"
install_if="$pkgname=$pkgver-r$pkgrel wireless-regdb"
install="$subpkgname.post-install"
}
wwan() {
_default_plugin
pkgdesc="Mobile broadband device plugin for NetworkManager"
depends="$depends mobile-broadband-provider-info"
install_if="$pkgname=$pkgver-r$pkgrel mobile-broadband-provider-info"
}
cli() {
@@ -237,14 +239,13 @@ gtkdoc() {
dnsmasq() {
pkgdesc="Support for NetworkManager dnsmasq features"
depends="$pkgname=$pkgver-r$pkgrel dnsmasq-dnssec-dbus"
install_if="$pkgname=$pkgver-r$pkgrel dnsmasq"
depends="dnsmasq-dnssec-dbus"
mkdir -p "$subpkgdir"
}
_default_plugin() {
depends="$pkgname=$pkgver-r$pkgrel"
amove $_plugindir/libnm*-${subpkgname#"$pkgname"-}.so
}
Loading