mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
net-misc/networkmanager: bump to 1.8.2
Package-Manager: Portage-2.3.6_p23, Repoman-2.3.3_p1
This commit is contained in:
Mike Gilbert
@@ -1,2 +1,3 @@
|
||||
DIST NetworkManager-1.4.4.tar.xz 3762664 SHA256 829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14 WHIRLPOOL d5e4ca3868c2aa8bceec2029c573b61ccc2fbc9f9a84cb8360ecf7d7503011f0501e9bffd54b163de8e84606ad7977b3c187adb78beed3a44bf2a3ee9821631f
|
||||
DIST NetworkManager-1.8.0.tar.xz 3811100 SHA256 fa5a5c6a36cdf95b12df34cc575bd61a74f297ede9be22cac4807a1aff3cf69e SHA512 1f261a9bbba1013ec7ac88672f2ebdfdb9447874eb711ccfa7383534f003f37aabbcddb51aa868e14cec1d76c33d33a99d681a3858ea6239112fe6fce81a9c6c WHIRLPOOL 3e94a50cd50582f9cad26937ee8d597fe275a857882b1fe7ee3a85e3a30cedf16f559064f92afcb00e1703c42b34c0438a0b798538dcedf8cd29da596390b93a
|
||||
DIST NetworkManager-1.8.2.tar.xz 3818844 SHA256 71a5efcd9e4c237ab57b2893ccc8f91f884ace3bec0e2bd4b31a4c9677ff1bf4 SHA512 7bebea66d8f494c052313224e9d5b1b4cf665482f07ee5d93defc3543f32296545a2d1097ab1fff27dbebb58e07a4bc47fbc0101163db92953ae66ac9b95524d WHIRLPOOL 5928c3d4c1a35dc9485c303f3ce7e7b33c3949a058bd566f8b779d5d6dfa11ee8fc365e1a7954a214cabea70f2239b0f6e2079a67616f5487abbd1d6053260a3
|
||||
|
||||
323
net-misc/networkmanager/networkmanager-1.8.2.ebuild
Normal file
323
net-misc/networkmanager/networkmanager-1.8.2.ebuild
Normal file
@@ -0,0 +1,323 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
GNOME_ORG_MODULE="NetworkManager"
|
||||
GNOME2_LA_PUNT="yes"
|
||||
VALA_USE_DEPEND="vapigen"
|
||||
PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
|
||||
|
||||
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 dhcpcd elogind gnutls +introspection json kernel_linux +nss +modemmanager ncurses ofono policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi"
|
||||
|
||||
REQUIRED_USE="
|
||||
modemmanager? ( ppp )
|
||||
vala? ( introspection )
|
||||
wext? ( wifi )
|
||||
^^ ( nss gnutls )
|
||||
?? ( consolekit elogind systemd )
|
||||
"
|
||||
|
||||
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
|
||||
# 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=[${MULTILIB_USEDEP}]
|
||||
policykit? ( >=sys-auth/polkit-0.106 )
|
||||
net-libs/libndp[${MULTILIB_USEDEP}]
|
||||
net-misc/curl
|
||||
net-misc/iputils
|
||||
sys-apps/util-linux[${MULTILIB_USEDEP}]
|
||||
sys-libs/readline:0=
|
||||
>=virtual/libudev-175:=[${MULTILIB_USEDEP}]
|
||||
audit? ( sys-process/audit )
|
||||
bluetooth? ( >=net-wireless/bluez-5 )
|
||||
connection-sharing? (
|
||||
net-dns/dnsmasq[dbus,dhcp]
|
||||
net-firewall/iptables )
|
||||
consolekit? ( >=sys-auth/consolekit-1.0.0 )
|
||||
dhclient? ( >=net-misc/dhcp-4[client] )
|
||||
dhcpcd? ( net-misc/dhcpcd )
|
||||
elogind? ( sys-auth/elogind )
|
||||
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:0= )
|
||||
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= )
|
||||
teamd? (
|
||||
dev-libs/jansson
|
||||
>=net-misc/libteam-1.9
|
||||
)
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
|| (
|
||||
net-misc/iputils[arping(+)]
|
||||
net-analyzer/arping
|
||||
)
|
||||
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}]
|
||||
introspection? (
|
||||
$(python_gen_any_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]')
|
||||
dev-lang/perl
|
||||
dev-libs/libxslt
|
||||
)
|
||||
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 introspection; then
|
||||
has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]" || return
|
||||
fi
|
||||
if use test; then
|
||||
has_version "dev-python/dbus-python[${PYTHON_USEDEP}]" &&
|
||||
has_version "dev-python/pygobject:3[${PYTHON_USEDEP}]"
|
||||
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() {
|
||||
if use connection-sharing; then
|
||||
CONFIG_CHECK="~NF_NAT_IPV4 ~NF_NAT_MASQUERADE_IPV4"
|
||||
linux-info_pkg_setup
|
||||
fi
|
||||
enewgroup plugdev
|
||||
if use introspection || use test; then
|
||||
python-any-r1_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
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=(
|
||||
--disable-more-warnings
|
||||
--disable-static
|
||||
--localstatedir=/var
|
||||
--disable-lto
|
||||
--disable-config-plugin-ibft
|
||||
# ifnet plugin always disabled until someone volunteers to actively
|
||||
# maintain and fix it
|
||||
--disable-ifnet
|
||||
--disable-qt
|
||||
--without-netconfig
|
||||
--with-dbus-sys-dir=/etc/dbus-1/system.d
|
||||
# We need --with-libnm-glib (and dbus-glib dep) as reverse deps are
|
||||
# still not ready for removing that lib
|
||||
--with-libnm-glib
|
||||
--with-nmcli=yes
|
||||
--with-udev-dir="$(get_udevdir)"
|
||||
--with-config-plugins-default=keyfile
|
||||
--with-iptables=/sbin/iptables
|
||||
$(multilib_native_enable concheck)
|
||||
--with-crypto=$(usex nss nss gnutls)
|
||||
--with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind $(multilib_native_usex consolekit consolekit no)))
|
||||
--with-suspend-resume=$(multilib_native_usex systemd systemd $(multilib_native_usex elogind elogind consolekit))
|
||||
$(multilib_native_use_with audit libaudit)
|
||||
$(multilib_native_use_enable bluetooth bluez5-dun)
|
||||
$(use_with dhclient)
|
||||
$(use_with dhcpcd)
|
||||
$(multilib_native_use_enable introspection)
|
||||
$(multilib_native_use_enable json json-validation)
|
||||
$(multilib_native_use_enable ppp)
|
||||
--without-libpsl
|
||||
$(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)
|
||||
)
|
||||
|
||||
if multilib_is_native_abi && use policykit; then
|
||||
myconf+=( --enable-polkit=yes )
|
||||
else
|
||||
myconf+=( --enable-polkit=disabled )
|
||||
fi
|
||||
|
||||
# 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
|
||||
ln -s "${S}/docs" docs || die
|
||||
ln -s "${S}/man" man || die
|
||||
fi
|
||||
|
||||
ECONF_SOURCE=${S} runstatedir="/run" gnome2_src_configure "${myconf[@]}"
|
||||
}
|
||||
|
||||
multilib_src_compile() {
|
||||
if multilib_is_native_abi; then
|
||||
emake
|
||||
else
|
||||
local targets=(
|
||||
libnm/libnm.la
|
||||
libnm-util/libnm-util.la
|
||||
libnm-glib/libnm-glib.la
|
||||
libnm-glib/libnm-glib-vpn.la
|
||||
)
|
||||
emake "${targets[@]}"
|
||||
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
|
||||
local targets=(
|
||||
install-libLTLIBRARIES
|
||||
install-libdeprecatedHEADERS
|
||||
install-libnm_glib_libnmvpnHEADERS
|
||||
install-libnm_glib_libnmincludeHEADERS
|
||||
install-libnm_util_libnm_util_includeHEADERS
|
||||
install-libnmincludeHEADERS
|
||||
install-nodist_libnm_glib_libnmincludeHEADERS
|
||||
install-nodist_libnm_glib_libnmvpnHEADERS
|
||||
install-nodist_libnm_util_libnm_util_includeHEADERS
|
||||
install-nodist_libnmincludeHEADERS
|
||||
install-pkgconfigDATA
|
||||
)
|
||||
emake DESTDIR="${D}" "${targets[@]}"
|
||||
fi
|
||||
}
|
||||
|
||||
multilib_src_install_all() {
|
||||
! use systemd && readme.gentoo_create_doc
|
||||
|
||||
newinitd "${FILESDIR}/init.d.NetworkManager-r1" 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"
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
# 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
|
||||
}
|
||||
Reference in New Issue
Block a user