diff options
| -rw-r--r-- | nonsystemd/networkmanager/10-openrc-status | 36 | ||||
| -rw-r--r-- | nonsystemd/networkmanager/NetworkManager.confd | 4 | ||||
| -rw-r--r-- | nonsystemd/networkmanager/NetworkManager.initd | 64 | ||||
| -rw-r--r-- | nonsystemd/networkmanager/PKGBUILD | 83 |
4 files changed, 38 insertions, 149 deletions
diff --git a/nonsystemd/networkmanager/10-openrc-status b/nonsystemd/networkmanager/10-openrc-status deleted file mode 100644 index f04658621..000000000 --- a/nonsystemd/networkmanager/10-openrc-status +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -# Copyright (c) 2012 Alexandre Rostovtsev -# Released under the 2-clause BSD license. - -# Ensures that the NetworkManager OpenRC service is marked as started and -# providing net only when it has a successful connection. - -if [ ! -e "/run/openrc/softlevel" ]; then - # OpenRC is not running - exit 0 -fi - -# Ensure rc-service is in PATH -PATH="${PATH}:/usr/bin:/usr/sbin" - -# Exit if the NetworkManager OpenRC service is not running -rc-service NetworkManager status 2>&1 | grep -Eq "status: (starting|started|inactive|stopping)" || exit 0 - -# Call rc-service in background mode so that the start/stop functions update -# NetworkManager service status to started or inactive instead of actually -# starting or stopping the daemon - -export IN_BACKGROUND=YES - -case "$2" in - up) nm-online -t 0 -x && - ! rc-service NetworkManager status 2>&1 | grep -q started && - exec rc-service NetworkManager start ;; - down) nm-online -t 0 -x || - rc-service NetworkManager status 2>&1 | grep -q stopped || - exec rc-service NetworkManager stop ;; - pre-sleep) rc-service NetworkManager status 2>&1 | grep -q stopped || - exec rc-service NetworkManager stop ;; -esac -exit 0 -# vim: set ts=4: diff --git a/nonsystemd/networkmanager/NetworkManager.confd b/nonsystemd/networkmanager/NetworkManager.confd deleted file mode 100644 index 4a9922965..000000000 --- a/nonsystemd/networkmanager/NetworkManager.confd +++ /dev/null @@ -1,4 +0,0 @@ -# If NetworkManager does not establish a connection within $INACTIVE_TIMEOUT -# seconds after starting, the service will be marked as inactive, and it will -# continue to wait for a connection in background mode. -INACTIVE_TIMEOUT=1 diff --git a/nonsystemd/networkmanager/NetworkManager.initd b/nonsystemd/networkmanager/NetworkManager.initd deleted file mode 100644 index 4829618da..000000000 --- a/nonsystemd/networkmanager/NetworkManager.initd +++ /dev/null @@ -1,64 +0,0 @@ -#!/usr/bin/openrc-run -# Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org> -# Copyright 2013-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="NetworkManager daemon. The service is marked as started only \ -when a network connection is established." -# supervisor="supervise-daemon" -# command="/usr/bin/NetworkManager" -# command_args="-n" -# pidfile="/run/NetworkManager/NetworkManager.pid" - -depend() { - need dbus - use logind - provide net -} - -start_pre() { - checkpath -q -d -m 0755 /run/NetworkManager -} - -start() { - # If we are re-called by a dispatcher event, we want to mark the service - # as started without starting the daemon again - yesno "${IN_BACKGROUND}" && return 0 - - [ -z "${INACTIVE_TIMEOUT}" ] && INACTIVE_TIMEOUT="1" - - ebegin "Starting NetworkManager" - start-stop-daemon --start --quiet --pidfile /run/NetworkManager/NetworkManager.pid \ - --exec /usr/sbin/NetworkManager -- --pid-file /run/NetworkManager/NetworkManager.pid - local _retval=$? - eend "${_retval}" - if [ "x${_retval}" = 'x0' ] && ! nm-online -t "${INACTIVE_TIMEOUT}"; then - einfo "Marking NetworkManager as inactive. It will automatically be marked" - einfo "as started after a network connection has been established." - mark_service_inactive - fi - return "${_retval}" -} - -stop() { - # If we are re-called by a dispatcher event, we want to mark the service - # as inactive without stopping the daemon - if yesno "${IN_BACKGROUND}"; then - mark_service_inactive "${SVCNAME}" - return 0 - fi - - ebegin "Stopping NetworkManager" - local pidfile=/run/NetworkManager/NetworkManager.pid - if [ ! -e "${pidfile}" ] && [ -e /var/run/NetworkManager.pid ]; then - # Try stopping the pid file used by <0.9.7 - pidfile=/var/run/NetworkManager.pid - start-stop-daemon --stop --quiet --pidfile "${pidfile}" - ret=$? - [ ${ret} = 0 ] && [ -e "${pidfile}" ] && rm "${pidfile}" - eend ${ret} - else - start-stop-daemon --stop --quiet --pidfile "${pidfile}" - eend $? - fi -} diff --git a/nonsystemd/networkmanager/PKGBUILD b/nonsystemd/networkmanager/PKGBUILD index dc667e65e..4061ccfb1 100644 --- a/nonsystemd/networkmanager/PKGBUILD +++ b/nonsystemd/networkmanager/PKGBUILD @@ -1,39 +1,35 @@ -# Maintainer: David P. <megver83@parabola.nu> -# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> -# Maintainer (Arch): Jan de Groot <jgc@archlinxu.org> -# Contributor (Arch): Wael Nasreddine <gandalf@siemens-mobiles.org> -# Contributor (Arch): Tor Krill <tor@krill.nu> -# Contributor (Arch): Will Rea <sillywilly@gmail.com> -# Contributor (Arch): Valentine Sinitsyn <e_val@inbox.ru> +# Maintainer: Nathan Owens <ndowens@artixlinux.org> +# Contributor: Jan de Groot <jgc@archlinxu.org> +# Contributor: Wael Nasreddine <gandalf@siemens-mobiles.org> +# Contributor: Tor Krill <tor@krill.nu> +# Contributor: Will Rea <sillywilly@gmail.com> +# Contributor: Valentine Sinitsyn <e_val@inbox.ru> pkgbase=networkmanager pkgname=(networkmanager libnm nm-cloud-setup) -pkgver=1.32.2 -pkgrel=1 +pkgver=1.38.2 +pkgrel=2 pkgrel+=.nonsystemd1 pkgdesc="Network connection manager and user applications" -url="https://wiki.gnome.org/Projects/NetworkManager" +url="https://networkmanager.dev/" arch=(x86_64) arch+=(i686 armv7h) -license=(GPL2) +license=(GPL) _pppver=2.4.9 makedepends=(intltool dhclient dhcpcd iptables-nft gobject-introspection gtk-doc "ppp=$_pppver" modemmanager iproute2 nss polkit wpa_supplicant curl - logind libmm-glib libnewt libndp libteam nftables vala perl-yaml + elogind libmm-glib libnewt libndp libteam nftables vala perl-yaml python-gobject git vala jansson bluez-libs glib2-docs iwd dnsmasq openresolv libpsl audit meson) checkdepends=(libx11 python-dbus) -_commit=bf1b09702ed442a3efe426c8ceba4ef1e6bb1902 # tags/1.20.6^0 -source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit" - NetworkManager.{confd,initd} 10-openrc-status) -sha256sums=('SKIP' - '4594573f01fe5e04b6dde4525796acf909158591bdcefd662ec23fe0d1c3e1bd' - 'eaf7d210540ed9f4c6b4ba81ddbb30a2aa5ce8b528057f7d64ce3478981f88e4' - 'd32a21c0683cf7a09370b35b7e3d3b3f28f5d4d242ecde2c866cfb400b94bcbe') +options=(debug) +_commit=abfd2d6ea729926bff0ddafa1367a54f6d6f4230 # tags/1.38.2^0 +source=("git+https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git#commit=$_commit") +b2sums=('SKIP') pkgver() { cd NetworkManager - git describe --abbrev=10 | sed 's/-dev/dev/;s/-rc/rc/;s/-/+/g' + git describe --tags | sed 's/-dev/dev/;s/-rc/rc/;s/[^-]*-g/r&/;s/-/+/g' } prepare() { @@ -41,7 +37,7 @@ prepare() { } build() { - local meson_args=( + local meson_options=( # system paths -D dbus_conf_dir=/usr/share/dbus-1/system.d @@ -50,7 +46,6 @@ build() { -D session_tracking_consolekit=false -D suspend_resume=elogind -D modify_system=true - -D polkit_agent=true -D selinux=false -D systemdsystemunitdir=no -D session_tracking=elogind @@ -79,7 +74,7 @@ build() { -D qt=false ) - arch-meson NetworkManager build "${meson_args[@]}" + arch-meson NetworkManager build "${meson_options[@]}" meson compile -C build } @@ -98,21 +93,22 @@ _pick() { } package_networkmanager() { - depends=(libnm iproute2 polkit wpa_supplicant libmm-glib libnewt libndp libteam curl + depends=(libnm iproute2 wpa_supplicant libmm-glib libnewt libndp libteam curl bluez-libs libpsl audit mobile-broadband-provider-info elogind) - optdepends=('dnsmasq: connection sharing' - 'nftables: connection sharing' - 'iptables: connection sharing' - 'bluez: Bluetooth support' - 'ppp: dialup connection support' - 'modemmanager: cellular network support' - 'iwd: wpa_supplicant alternative' - 'dhclient: alternative DHCP client' - 'dhcpcd: alternative DHCP client' - 'openresolv: alternative resolv.conf manager' - 'firewalld: firewall support') - provides=($pkgname-{elogind,openrc}) - replaces=($pkgname-{elogind,openrc}) + optdepends=( + 'polkit: let non-root users control networking' + 'dnsmasq: connection sharing' + 'nftables: connection sharing' + 'iptables: connection sharing' + 'bluez: Bluetooth support' + 'ppp: dialup connection support' + 'modemmanager: cellular network support' + 'iwd: wpa_supplicant alternative' + 'dhclient: alternative DHCP client' + 'dhcpcd: alternative DHCP client' + 'openresolv: alternative resolv.conf manager' + 'firewalld: firewall support' + ) backup=(etc/NetworkManager/NetworkManager.conf) meson install -C build --destdir "$pkgdir" @@ -125,6 +121,9 @@ package_networkmanager() { install -m644 /dev/stdin etc/NetworkManager/NetworkManager.conf <<END # Configuration file for NetworkManager. # See "man 5 NetworkManager.conf" for details. +[main] +plugins=keyfile +hostname-node=none END # packaged configuration @@ -144,16 +143,10 @@ END _pick libnm usr/share/vala/vapi/libnm.* _pick nm-cloud-setup "$pkgdir"/usr/lib/**/*nm-cloud-setup* -# _pick nm-cloud-setup "$pkgdir"/usr/share/man/*/nm-cloud-setup* (Parabola) +# _pick nm-cloud-setup "$pkgdir"/usr/share/man/*/nm-cloud-setup* (Artix) # Restore empty dir -# mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d" (Parabola) - - # Init script - install -Dm755 ${srcdir}/NetworkManager.confd ${pkgdir}/etc/conf.d/NetworkManager - install -Dm755 ${srcdir}/NetworkManager.initd ${pkgdir}/etc/init.d/NetworkManager - install -Dm755 "${srcdir}/10-openrc-status" "${pkgdir}/etc/NetworkManager/dispatcher.d/10-openrc-status" - +# mkdir "$pkgdir/usr/lib/NetworkManager/dispatcher.d/no-wait.d" (Artix) } package_libnm() { |