commit: 6d943ce2a490f030b8dedaca0a833a9080f7e9ea Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Tue Jun 9 02:20:46 2020 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Tue Jun 9 02:20:46 2020 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=6d943ce2
net-misc/networkmanager: sync with stable keywords Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> net-misc/networkmanager/Manifest | 2 +- ...ix-bashisms.patch => 1.18.6-fix-bashisms.patch} | 11 ++-- .../networkmanager/files/init.d.NetworkManager-r2 | 62 ++++++++++++++++++++++ ...18.4-r3.ebuild => networkmanager-1.18.6.ebuild} | 6 +-- 4 files changed, 72 insertions(+), 9 deletions(-) diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 28743c1..1218137 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1 +1 @@ -DIST NetworkManager-1.18.4.tar.xz 4875196 BLAKE2B 9c58d6d7317562332dfa9639f8e236a0a7f6b58e7dad5af83916b1c6178899a6bcf12bc289fb401d84fd6420306364b4c4c0a25eda2a08eef812acde1862a18a SHA512 9fd22775a400ee8d20c75ebddfee842bfbd8780966444dd537e371a65918f41640e921d2c441853afe8f72d693e9b4c1415435136a07004666a6af4799fd3350 +DIST NetworkManager-1.18.6.tar.xz 4845144 BLAKE2B cf66789c025d9ec2007d1fe541acb8fd2b5204796ff8498fc5689124016e84a7e76509bee1b6650c796f0429cce6748c7b99e1976d95ac12bc31a1f1e67289b0 SHA512 92ab648e689dd903279fe676e867d7929f616c96dd478b2132854145a29debfcac5b083d70652ea0c7bccb0eb132534133fc9c005527237c47e2802556a29b92 diff --git a/net-misc/networkmanager/files/1.18.4-fix-bashisms.patch b/net-misc/networkmanager/files/1.18.6-fix-bashisms.patch similarity index 96% rename from net-misc/networkmanager/files/1.18.4-fix-bashisms.patch rename to net-misc/networkmanager/files/1.18.6-fix-bashisms.patch index 4d8d6c1..3d087ce 100644 --- a/net-misc/networkmanager/files/1.18.4-fix-bashisms.patch +++ b/net-misc/networkmanager/files/1.18.6-fix-bashisms.patch @@ -1,15 +1,16 @@ -From 03072c0039261e9980ab5e88b283e1f07b4002bb Mon Sep 17 00:00:00 2001 +From 0adfc0f511e1389ca166fb233b9d3feb12da91d2 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 19 Apr 2020 00:59:33 +0200 +Date: Mon, 8 Jun 2020 20:42:40 -0500 Subject: [PATCH] Remove subshells and fix invalid test syntax +Signed-off-by: Gilles Dartiguelongue <[email protected]> --- configure.ac | 28 ++++++++++++++-------------- m4/introspection.m4 | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac -index 33badfac0..fe43f844a 100644 +index 9dc0625..49cbba3 100644 --- a/configure.ac +++ b/configure.ac @@ -261,7 +261,7 @@ AC_ARG_WITH(libnm-glib, @@ -104,7 +105,7 @@ index 33badfac0..fe43f844a 100644 fi diff --git a/m4/introspection.m4 b/m4/introspection.m4 -index f3bda0e7c..8c64bd04c 100644 +index f3bda0e..8c64bd0 100644 --- a/m4/introspection.m4 +++ b/m4/introspection.m4 @@ -31,7 +31,7 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], @@ -126,5 +127,5 @@ index f3bda0e7c..8c64bd04c 100644 AC_MSG_ERROR([introspection enabled but can't be used]) fi -- -2.26.0 +2.26.2 diff --git a/net-misc/networkmanager/files/init.d.NetworkManager-r2 b/net-misc/networkmanager/files/init.d.NetworkManager-r2 new file mode 100644 index 0000000..f7b95c0 --- /dev/null +++ b/net-misc/networkmanager/files/init.d.NetworkManager-r2 @@ -0,0 +1,62 @@ +#!/sbin/openrc-run +# Copyright (c) 2008 Saleem Abdulrasool <[email protected]> +# 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." + +depend() { + need dbus + use consolekit + 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 +} + +# vim: set ft=gentoo-init-d ts=4 : diff --git a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild b/net-misc/networkmanager/networkmanager-1.18.6.ebuild similarity index 98% rename from net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild rename to net-misc/networkmanager/networkmanager-1.18.6.ebuild index ed2a4a6..c7b0a92 100644 --- a/net-misc/networkmanager/networkmanager-1.18.4-r3.ebuild +++ b/net-misc/networkmanager/networkmanager-1.18.6.ebuild @@ -28,7 +28,7 @@ REQUIRED_USE=" ?? ( consolekit elogind systemd ) " -KEYWORDS="amd64 arm arm64 ppc ppc64 x86" +KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ~ppc64 ~sparc x86" # gobject-introspection-0.10.3 is needed due to gnome bug 642300 # wpa_supplicant-0.7.3-r3 is needed due to bug 359271 @@ -105,7 +105,7 @@ DEPEND="${COMMON_DEPEND} PATCHES=( "${FILESDIR}"/${PN}-data-fix-the-ID_NET_DRIVER-udev-rule.patch - "${FILESDIR}"/${PV}-iwd1-compat.patch # included in 1.21.3+ + "${FILESDIR}"/1.18.4-iwd1-compat.patch # included in 1.21.3+ "${FILESDIR}"/${PV}-fix-bashisms.patch # Required to build on musl @@ -293,7 +293,7 @@ multilib_src_install_all() { einstalldocs ! use systemd && readme.gentoo_create_doc - newinitd "${FILESDIR}/init.d.NetworkManager-r1" NetworkManager + newinitd "${FILESDIR}/init.d.NetworkManager-r2" NetworkManager newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
