* [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/, net-misc/networkmanager/files/
@ 2016-09-29 18:31 99% Pacho Ramos
0 siblings, 0 replies; 1+ results
From: Pacho Ramos @ 2016-09-29 18:31 UTC (permalink / raw
To: gentoo-commits
commit: e9606f0e918e2ade8431684f3e40bc800cd0efcb
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 29 17:47:36 2016 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Thu Sep 29 18:31:13 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9606f0e
net-misc/networkmanager: Drop old
Package-Manager: portage-2.3.0
net-misc/networkmanager/Manifest | 1 -
net-misc/networkmanager/files/1.2.4-upower.patch | 67 ----
...anager-1.2.2-sleep-monitor-upower-include.patch | 30 --
.../networkmanager/networkmanager-1.2.4.ebuild | 333 --------------------
.../networkmanager/networkmanager-1.4.0.ebuild | 341 ---------------------
5 files changed, 772 deletions(-)
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index c37c3c3..0c9fa51 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,3 +1,2 @@
DIST NetworkManager-1.0.12.tar.xz 3490836 SHA256 3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e SHA512 926c0139dc7ade7bbc512f0d2e386a42a278aceff68996bc3a18fb1940f5d516f0ff2768459d6f50fd5669d72c15202307396bb3cf8b67c3dbac19db484b971c WHIRLPOOL 6178af61fb30a7e8b72cc05296a014a5be5b10fed41cd5385f0bebae1fa22519c83cf8c359479372f063fc2b891715015454c53cd4f1f1516fc03bca76a552ac
-DIST NetworkManager-1.2.4.tar.xz 3728788 SHA256 19bfb7306dd472d010443a8027d91f9fd50fe6e0c5aa4ea8083845de0fa38faa SHA512 83fa179c0f360c7f40504cf58275e28638b5a986458c99adc85567595ca170ac3d081ffa0c99e5619c97d4a3228e5318e613330894547ad3438eaa2bfcc1f28b WHIRLPOOL 625cf2a32f5fb1e5ae537f2285f6945ca14f438959fb5556b490a90fe16eddcfb22e84c82f8f0f479f2387ec54ba292b18f28c0676375d729f9bb6a435d9e12b
DIST NetworkManager-1.4.0.tar.xz 3699568 SHA256 c4d5e075998a291074501602a5068a7e54d9e0f2658aba079d58145d65be531d SHA512 2580e885684f6ad464eebdf9e0dab5432d4d45f0f4127af7f8947be16fc5ce84a5cc090e195b68619c14e218d9cffcde1615400c19326e58bdac8fdf7b53fb46 WHIRLPOOL 39607ac0606039c242b2033b9e540c3beb88e7f48fdb8188d942341a57e097dc0e9c7bde248b6d9ae65bd3ac94df83b5e7d7a371baf7f32c8542581c3bdf778c
diff --git a/net-misc/networkmanager/files/1.2.4-upower.patch b/net-misc/networkmanager/files/1.2.4-upower.patch
deleted file mode 100644
index a08e34a..00000000
--- a/net-misc/networkmanager/files/1.2.4-upower.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From f864c58cfe87533c69dcf00e3ea236809392a8e0 Mon Sep 17 00:00:00 2001
-From: Beniamino Galvani <bgalvani@redhat.com>
-Date: Thu, 4 Aug 2016 16:25:30 +0200
-Subject: build: fix build with '--with-suspend-resume=upower'
-
-Now we have a single file for all suspend APIs and the selection is
-done through the preprocessor: remove stale AM_CONDITIONALs and define
-SUSPEND_RESUME_UPOWER when needed.
-
-Fixes: c76eb3e8f7a80b69c570b513ee3eb16bea1b34bd
-(cherry picked from commit e4b2c989dc51818e52906b5120ea6a0659274631)
-
-diff --git a/configure.ac b/configure.ac
-index 46775c3..7869f07 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -472,7 +472,9 @@ if test "z$with_suspend_resume" = "z"; then
- fi
-
- case $with_suspend_resume in
-- upower) ;;
-+ upower)
-+ AC_DEFINE([SUSPEND_RESUME_UPOWER], 1, [Define to 1 to use UPower suspend api])
-+ ;;
- systemd)
- PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],,
- [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])])
-@@ -485,9 +487,6 @@ case $with_suspend_resume in
- AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, consolekit])
- ;;
- esac
--AM_CONDITIONAL(SUSPEND_RESUME_UPOWER, test "x$with_suspend_resume" = "xupower")
--AM_CONDITIONAL(SUSPEND_RESUME_SYSTEMD, test "x$with_suspend_resume" = "xsystemd")
--AM_CONDITIONAL(SUSPEND_RESUME_CONSOLEKIT, test "x$with_suspend_resume" = "xconsolekit")
-
- # SELinux support
- AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux (default: auto)]),,[with_selinux=auto])
---
-cgit v0.10.2
-
---- a/config.h.in
-+++ b/config.h.in
-@@ -216,6 +216,9 @@
- /* Define to 1 to use systemd suspend api */
- #undef SUSPEND_RESUME_SYSTEMD
-
-+/* Define to 1 to use UPower suspend api */
-+#undef SUSPEND_RESUME_UPOWER
-+
- /* Define to 1 if libsystemd-journald is available */
- #undef SYSTEMD_JOURNAL
-
---- a/configure
-+++ b/configure
-@@ -22776,7 +22776,11 @@
- fi
-
- case $with_suspend_resume in
-- upower) ;;
-+ upower)
-+
-+$as_echo "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h
-+
-+ ;;
- systemd)
-
- pkg_failed=no
diff --git a/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch b/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch
deleted file mode 100644
index 52a21c4..00000000
--- a/net-misc/networkmanager/files/networkmanager-1.2.2-sleep-monitor-upower-include.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 10ba492047b1ad80adeeb878e7f155a13638da7f Mon Sep 17 00:00:00 2001
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Wed, 18 May 2016 10:43:51 +0200
-Subject: [PATCH] sleep-monitor-upower: add missing include
-
-Otherwise building fails with:
-
- nm-sleep-monitor-upower.c:132:45: error: expected declaration specifiers or '...' before 'nm_sleep_monitor_get'
- nm-sleep-monitor-upower.c:132:67: error: expected declaration specifiers or '...' before '(' token
-
-https://mail.gnome.org/archives/networkmanager-list/2016-May/msg00053.html
----
- src/nm-sleep-monitor-upower.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/nm-sleep-monitor-upower.c b/src/nm-sleep-monitor-upower.c
-index 5f0ff24..8d07190 100644
---- a/src/nm-sleep-monitor-upower.c
-+++ b/src/nm-sleep-monitor-upower.c
-@@ -24,6 +24,7 @@
- #include <sys/stat.h>
-
- #include "nm-core-internal.h"
-+#include "NetworkManagerUtils.h"
-
- #include "nm-sleep-monitor.h"
-
---
-2.9.0
-
diff --git a/net-misc/networkmanager/networkmanager-1.2.4.ebuild b/net-misc/networkmanager/networkmanager-1.2.4.ebuild
deleted file mode 100644
index 773be0e..00000000
--- a/net-misc/networkmanager/networkmanager-1.2.4.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
- user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="bluetooth connection-sharing consolekit +dhclient gnutls +introspection \
-kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \
-vala +wext +wifi"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- wext? ( wifi )
- ^^ ( nss gnutls )
-"
-
-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
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=dev-libs/libnl-3.2.8:3=
- >=sys-auth/polkit-0.106
- net-libs/libndp
- >=net-libs/libsoup-2.40:2.4=
- net-misc/iputils
- sys-libs/readline:0=
- >=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- gnutls? (
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
- modemmanager? ( >=net-misc/modemmanager-0.7.991 )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- dhclient? ( >=net-misc/dhcp-4[client] )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
- resolvconf? ( net-dns/openresolv )
- systemd? ( >=sys-apps/systemd-209:0= )
- !systemd? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
- teamd? ( >=net-misc/libteam-1.9 )
-"
-RDEPEND="${COMMON_DEPEND}
- consolekit? ( sys-auth/consolekit )
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]')
- )
-"
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- else
- return 0
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- enewgroup plugdev
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- local PATCHES=(
- # https://bugs.gentoo.org/590432
- "${FILESDIR}/1.2.4-upower.patch"
- )
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=()
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
- if multilib_is_native_abi; then
- # work-around man out-of-source brokenness, must be done before configure
- mkdir man || die
- find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
- else
- # libnl, libndp are only used for executables, not libraries
- myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
- fi
-
- # ifnet plugin always disabled until someone volunteers to actively
- # maintain and fix it
- # Also disable dhcpcd support as it's also completely unmaintained
- # and facing bugs like #563938 and many others
- #
- # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
- # still not ready for removing that lib
- ECONF_SOURCE=${S} \
- runstatedir="/run" \
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- --disable-lto \
- --disable-config-plugin-ibft \
- --disable-ifnet \
- --disable-qt \
- --without-netconfig \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-libnm-glib \
- --with-nmcli=yes \
- --with-udev-dir="$(get_udevdir)" \
- --with-config-plugins-default=keyfile \
- --with-iptables=/sbin/iptables \
- $(multilib_native_with libsoup) \
- $(multilib_native_enable concheck) \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
- --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \
- $(multilib_native_use_enable bluetooth bluez5-dun) \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_enable ppp) \
- $(use_with dhclient) \
- --without-dhcpcd \
- $(multilib_native_use_with modemmanager modem-manager-1) \
- $(multilib_native_use_with ncurses nmtui) \
- $(multilib_native_use_with resolvconf) \
- $(multilib_native_use_with selinux) \
- $(multilib_native_use_with systemd systemd-journal) \
- $(multilib_native_use_enable teamd teamdctl) \
- $(multilib_native_use_enable test tests) \
- $(multilib_native_use_enable vala) \
- --without-valgrind \
- $(multilib_native_use_with wext) \
- $(multilib_native_use_enable wifi) \
- "${myconf[@]}"
-
- # work-around gtk-doc out-of-source brokedness
- if multilib_is_native_abi; then
- local d
- for d in api libnm libnm-util libnm-glib; do
- ln -s "${S}"/docs/${d}/html docs/${d}/html || die
- done
- fi
-
- # Disable examples
- # https://bugzilla.gnome.org/show_bug.cgi?id=769711
- cat > examples/Makefile <<-EOF
- .PHONY: all check install
- all:
- check:
- install:
- EOF
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- emake all-am
- emake -C shared
- emake -C introspection # generated headers, needed for libnm
- emake -C libnm-core
- emake -C libnm
- emake -C libnm-util
- emake -C libnm-glib
- fi
-}
-
-multilib_src_test() {
- if use test && multilib_is_native_abi; then
- python_setup
- virtx emake check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
- else
- emake DESTDIR="${D}" install-am
- emake DESTDIR="${D}" install -C shared
- emake DESTDIR="${D}" install -C introspection
- emake DESTDIR="${D}" install -C libnm-core
- emake DESTDIR="${D}" install -C libnm
- emake DESTDIR="${D}" install -C libnm-util
- emake DESTDIR="${D}" install -C libnm-glib
- fi
-}
-
-multilib_src_install_all() {
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
- # Remove empty /run/NetworkManager
- rmdir "${D}"/run/NetworkManager "${D}"/run || die
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- 574d0cfa7e911b1f7792077003060240* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-}
diff --git a/net-misc/networkmanager/networkmanager-1.4.0.ebuild b/net-misc/networkmanager/networkmanager-1.4.0.ebuild
deleted file mode 100644
index c735125..00000000
--- a/net-misc/networkmanager/networkmanager-1.4.0.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-GNOME_ORG_MODULE="NetworkManager"
-GNOME2_LA_PUNT="yes"
-VALA_USE_DEPEND="vapigen"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} )
-
-inherit bash-completion-r1 gnome2 linux-info multilib python-any-r1 systemd \
- user readme.gentoo-r1 toolchain-funcs vala versionator virtualx udev multilib-minimal
-
-DESCRIPTION="A set of co-operative tools that make networking simple and straightforward"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
-
-LICENSE="GPL-2+"
-SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version
-
-IUSE="audit bluetooth connection-sharing consolekit +dhclient gnutls +introspection \
-json kernel_linux +nss +modemmanager ncurses ofono +ppp resolvconf selinux \
-systemd teamd test vala +wext +wifi"
-
-REQUIRED_USE="
- modemmanager? ( ppp )
- vala? ( introspection )
- wext? ( wifi )
- ^^ ( nss gnutls )
-"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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
-# TODO: need multilib janson (linked to libnm.so)
-COMMON_DEPEND="
- >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}]
- >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}]
- >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
- >=dev-libs/libnl-3.2.8:3=
- >=sys-auth/polkit-0.106
- net-libs/libndp
- >=net-libs/libsoup-2.40:2.4=
- net-misc/iputils
- sys-libs/readline:0=
- >=virtual/libgudev-165:=[${MULTILIB_USEDEP}]
- audit? ( sys-process/audit )
- bluetooth? ( >=net-wireless/bluez-5 )
- connection-sharing? (
- net-dns/dnsmasq[dhcp]
- net-firewall/iptables )
- consolekit? ( >=sys-auth/consolekit-1.0.0 )
- dhclient? ( >=net-misc/dhcp-4[client] )
- gnutls? (
- dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}]
- >=net-libs/gnutls-2.12:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-0.10.3:= )
- json? ( dev-libs/jansson )
- modemmanager? ( >=net-misc/modemmanager-0.7.991 )
- ncurses? ( >=dev-libs/newt-0.52.15 )
- nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] )
- ofono? ( net-misc/ofono )
- ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] )
- resolvconf? ( net-dns/openresolv )
- selinux? ( sys-libs/libselinux )
- systemd? ( >=sys-apps/systemd-209:0= )
- !systemd? (
- !consolekit? ( || ( sys-power/upower sys-power/upower-pm-utils ) )
- )
- teamd? ( >=net-misc/libteam-1.9 )
-"
-RDEPEND="${COMMON_DEPEND}
- wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] )
-"
-DEPEND="${COMMON_DEPEND}
- dev-util/gdbus-codegen
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.40
- >=sys-devel/gettext-0.17
- >=sys-kernel/linux-headers-2.6.29
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- vala? ( $(vala_depend) )
- test? (
- $(python_gen_any_dep '
- dev-python/dbus-python[${PYTHON_USEDEP}]
- dev-python/pygobject:3[${PYTHON_USEDEP}]')
- )
-"
-
-python_check_deps() {
- if use test; then
- has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
- has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
- else
- return 0
- fi
-}
-
-sysfs_deprecated_check() {
- ebegin "Checking for SYSFS_DEPRECATED support"
-
- if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
- eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
- eerror "or NetworkManager will not work correctly."
- eerror "See https://bugs.gentoo.org/333639 for more info."
- die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
- fi
- eend $?
-}
-
-pkg_pretend() {
- if use kernel_linux; then
- get_version
- if linux_config_exists; then
- sysfs_deprecated_check
- else
- ewarn "Was unable to determine your kernel .config"
- ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
- ewarn "See https://bugs.gentoo.org/333639 for more info."
- fi
-
- fi
-}
-
-pkg_setup() {
- enewgroup plugdev
-
- use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
- DOC_CONTENTS="To modify system network connections without needing to enter the
- root password, add your user account to the 'plugdev' group."
-
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-multilib_src_configure() {
- local myconf=()
-
- # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986
- if use ppp; then
- local PPPD_VER=`best_version net-dialup/ppp`
- PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision
- myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} )
- fi
-
- # unit files directory needs to be passed only when systemd is enabled,
- # otherwise systemd support is not disabled completely, bug #524534
- use systemd && myconf+=( --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-
- if multilib_is_native_abi; then
- # work-around man out-of-source brokenness, must be done before configure
- mkdir man || die
- find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die
- else
- # libnl, libndp are only used for executables, not libraries
- myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' )
- fi
-
- # ifnet plugin always disabled until someone volunteers to actively
- # maintain and fix it
- # Also disable dhcpcd support as it's also completely unmaintained
- # and facing bugs like #563938 and many others
- #
- # We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
- # still not ready for removing that lib
- ECONF_SOURCE=${S} \
- runstatedir="/run" \
- gnome2_src_configure \
- --disable-more-warnings \
- --disable-static \
- --localstatedir=/var \
- --disable-lto \
- --disable-config-plugin-ibft \
- --disable-ifnet \
- --disable-qt \
- --without-netconfig \
- --with-dbus-sys-dir=/etc/dbus-1/system.d \
- --with-libnm-glib \
- --with-nmcli=yes \
- --with-udev-dir="$(get_udevdir)" \
- --with-config-plugins-default=keyfile \
- --with-iptables=/sbin/iptables \
- $(multilib_native_with libsoup) \
- $(multilib_native_enable concheck) \
- --with-crypto=$(usex nss nss gnutls) \
- --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \
- --with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit upower)) \
- $(multilib_native_use_with audit libaudit) \
- $(multilib_native_use_enable bluetooth bluez5-dun) \
- $(multilib_native_use_enable introspection) \
- $(multilib_native_use_enable json json-validation) \
- $(multilib_native_use_enable ppp) \
- $(use_with dhclient) \
- --without-dhcpcd \
- $(multilib_native_use_with modemmanager modem-manager-1) \
- $(multilib_native_use_with ncurses nmtui) \
- $(multilib_native_use_with ofono) \
- $(multilib_native_use_with resolvconf) \
- $(multilib_native_use_with selinux) \
- $(multilib_native_use_with systemd systemd-journal) \
- $(multilib_native_use_enable teamd teamdctl) \
- $(multilib_native_use_enable test tests) \
- $(multilib_native_use_enable vala) \
- --without-valgrind \
- $(multilib_native_use_with wext) \
- $(multilib_native_use_enable wifi) \
- "${myconf[@]}"
-
- # work-around gtk-doc out-of-source brokedness
- if multilib_is_native_abi; then
- local d
- for d in api libnm libnm-util libnm-glib; do
- ln -s "${S}"/docs/${d}/html docs/${d}/html || die
- done
- fi
-
- # Disable examples
- # https://bugzilla.gnome.org/show_bug.cgi?id=769711
- cat > examples/Makefile <<-EOF
- .PHONY: all check install
- all:
- check:
- install:
- EOF
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi; then
- emake
- else
- emake all-am
- emake -C shared
- emake -C introspection # generated headers, needed for libnm
- emake -C libnm-core
- emake -C libnm
- emake -C libnm-util
- emake -C libnm-glib
- fi
-}
-
-multilib_src_test() {
- if use test && multilib_is_native_abi; then
- python_setup
- virtx emake check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi; then
- # Install completions at proper place, bug #465100
- gnome2_src_install completiondir="$(get_bashcompdir)"
- else
- emake DESTDIR="${D}" install-am
- emake DESTDIR="${D}" install -C shared
- emake DESTDIR="${D}" install -C introspection
- emake DESTDIR="${D}" install -C libnm-core
- emake DESTDIR="${D}" install -C libnm
- emake DESTDIR="${D}" install -C libnm-util
- emake DESTDIR="${D}" install -C libnm-glib
- fi
-}
-
-multilib_src_install_all() {
- ! use systemd && readme.gentoo_create_doc
-
- newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager
- newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager
-
- # Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
- keepdir /etc/NetworkManager/dispatcher.d
-
- # Provide openrc net dependency only when nm is connected
- exeinto /etc/NetworkManager/dispatcher.d
- newexe "${FILESDIR}/10-openrc-status-r4" 10-openrc-status
- sed -e "s:@EPREFIX@:${EPREFIX}:g" \
- -i "${ED}/etc/NetworkManager/dispatcher.d/10-openrc-status" || die
-
- keepdir /etc/NetworkManager/system-connections
- chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765, upstream bug #754594
-
- # Allow users in plugdev group to modify system connections
- insinto /usr/share/polkit-1/rules.d/
- doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
-
- # Remove empty /run/NetworkManager
- rmdir "${D}"/run/NetworkManager "${D}"/run || die
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- ! use systemd && readme.gentoo_print_elog
-
- if [[ -e "${EROOT}etc/NetworkManager/nm-system-settings.conf" ]]; then
- ewarn "The ${PN} system configuration file has moved to a new location."
- ewarn "You must migrate your settings from ${EROOT}/etc/NetworkManager/nm-system-settings.conf"
- ewarn "to ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn
- ewarn "After doing so, you can remove ${EROOT}etc/NetworkManager/nm-system-settings.conf"
- fi
-
- # The polkit rules file moved to /usr/share
- old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.NetworkManager.settings.modify.system.rules"
- if [[ -f "${old_rules}" ]]; then
- case "$(md5sum ${old_rules})" in
- 574d0cfa7e911b1f7792077003060240* )
- # Automatically delete the old rules.d file if the user did not change it
- elog
- elog "Removing old ${old_rules} ..."
- rm -f "${old_rules}" || eerror "Failed, please remove ${old_rules} manually"
- ;;
- * )
- elog "The ${old_rules}"
- elog "file moved to /usr/share/polkit-1/rules.d/ in >=networkmanager-0.9.4.0-r4"
- elog "If you edited ${old_rules}"
- elog "without changing its behavior, you may want to remove it."
- ;;
- esac
- fi
-
- # NM fallbacks to plugin specified at compile time (upstream bug #738611)
- # but still show a warning to remember people to have cleaner config file
- if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then
- if grep plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then
- ewarn
- ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf"
- ewarn "Since it won't be used, you will need to stop setting ifnet plugin there."
- ewarn
- fi
- fi
-
- # NM shows lots of errors making nmcli neither unusable, bug #528748 upstream bug #690457
- if grep -r "psk-flags=1" "${EROOT}"/etc/NetworkManager/; then
- ewarn "You have psk-flags=1 setting in above files, you will need to"
- ewarn "either reconfigure affected networks or, at least, set the flag"
- ewarn "value to '0'."
- fi
-}
^ permalink raw reply related [relevance 99%]
Results 1-1 of 1 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2016-09-29 18:31 99% [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager/, net-misc/networkmanager/files/ Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox