From e6ed280b1e1d511db29f720f107aa0e84bf3dba5 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Fri, 7 Sep 2018 12:15:28 +0300 Subject: net-misc/networkmanager: bump to 1.12.2, support iwd iwd support is always built with USE=wifi, as net-wireless/iwd itself is not necessary for build due to pure dbus usage. USE=iwd controls whether USE=wifi ensures wpa_supplicant or iwd is present at runtime, and adds a default config snippet to use iwd as wifi.backend instead of wpa_supplicant. As a result, iwd and wpa_supplicant can be used interchangably with configuration overrides in /etc, despite what NM iwd USE setting was on the install, as long as USE=wifi was enabled; but a choice based default is ensured to be working in lack of overrides. Also remove unused versionator and toolchain-funcs inherits and add now needed glib-utils build dep directly for glib migration to that. Closes: https://bugs.gentoo.org/661278 Package-Manager: Portage-2.3.48, Repoman-2.3.10 --- net-misc/networkmanager/Manifest | 2 + net-misc/networkmanager/metadata.xml | 5 +- .../networkmanager/networkmanager-1.12.2.ebuild | 341 +++++++++++++++++++++ 3 files changed, 346 insertions(+), 2 deletions(-) create mode 100644 net-misc/networkmanager/networkmanager-1.12.2.ebuild (limited to 'net-misc/networkmanager') diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index a2cc516d2886..2ea3f1ed390e 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,4 +1,6 @@ DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65 SHA512 e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645 DIST NetworkManager-1.10.6.tar.xz 4029656 BLAKE2B 0fa99dbb54c3f51755329f229f941e408d883aeff24bbcf0f9df143544190ab59ed5742caca42ea7cced949de0891ecc148394fbff1b9cd87b26c3a84f2a728e SHA512 8406ed561efff13b63dc218babdd2ad9e2816bcc829ba3ef2ce942bb5fa027640de28660381203016fa9cddb61412d3cd5102b7cbd29d0e284b5cb8d13dd8610 +DIST NetworkManager-1.12.2.tar.xz 4193776 BLAKE2B bc2b55f33e85dc8381eb18148cef02059e96abe1863da35af2b8f5671e3b2a4296eb1f9b79d864f3d0e6b362f7dbebdea4518a96d255acda9141b9ae95b49038 SHA512 cf5dae6ca8b6d3819a79485082f959907213d43413d15c41b79eb7da40edb913a41e7c18586b14bbf84f30ac493e2d9d466f5e66130c636f041ce939aaf49f35 DIST NetworkManager-1.4.4.tar.xz 3762664 BLAKE2B 430f5a15540c43d067c27927b627ecb1c7935f42566e9b14b82b6f70cf7dae3ed7398bb45647911e91d8ce14558b1eccc0f6ffa97eae852dd524219dcc536a90 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14 DIST NetworkManager-1.8.4.tar.xz 3821500 BLAKE2B 7db1c95af5b8006cd3b7e1d960f9763c05caf5aadcc139bbe349a12ef996821afc38250afe4b078fd4d1953be19c1f16c6813562c5f4792e6c17f28ee0521c06 SHA512 e9aa26e2abe4537c6cbba53e281493e32be8a9f0624d5323212848f286d1279ad2ab79a39de34ad0ea188c888b1b61c4ba4d4d053c4d227e68f9236955f69bb1 +DIST networkmanager-1.12.2-patchset.tar.xz 4944 BLAKE2B 3ab6e395b4e13fd019fbcf851286f1cc8a08eff9d93891174c19949efe10390c69d9aaf6cdbe81f33503ec96838eb001eda67f6d1da034195327e172527cd72b SHA512 bdb22c42a8c53dce2f81ecfd026685240c8b790c44b0f13767ccfa0834cb2edec61ade69c828fb21c54ad3d37412e89b15f1fff4a98577a5bea460ba78d43bc3 diff --git a/net-misc/networkmanager/metadata.xml b/net-misc/networkmanager/metadata.xml index a6c3ffe13269..d2f416137039 100644 --- a/net-misc/networkmanager/metadata.xml +++ b/net-misc/networkmanager/metadata.xml @@ -14,6 +14,8 @@ getting ip Use net-misc/dhcpcd for getting ip Use sys-auth/elogind for session tracking + Use net-wireless/iwd instead of + net-wireless/wpa_supplicant for wifi support by default Enable JSON validation via dev-libs/jansson in libnm. Enable support for mobile broadband devices @@ -26,8 +28,7 @@ Use net-dns/openresolv for managing DNS information Enable Teamd control support - Enable support for wifi and 802.1x security using - net-wireless/wpa_supplicant + Enable support for wifi and 802.1x security Enable support for the deprecated Wext (Wireless Extensions) API; needed for some older drivers (e.g. ipw2200, ndiswrapper) diff --git a/net-misc/networkmanager/networkmanager-1.12.2.ebuild b/net-misc/networkmanager/networkmanager-1.12.2.ebuild new file mode 100644 index 000000000000..cdfd87acdf7e --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.12.2.ebuild @@ -0,0 +1,341 @@ +# Copyright 1999-2018 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 vala virtualx udev multilib-minimal + +DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" +HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" +SRC_URI="${SRC_URI} https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz" + +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 iwd json kernel_linux +nss +modemmanager ncurses ofono ovs policykit +ppp resolvconf selinux systemd teamd test vala +wext +wifi" + +REQUIRED_USE=" + iwd? ( wifi ) + 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 +COMMON_DEPEND=" + >=sys-apps/dbus-1.2[${MULTILIB_USEDEP}] + >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}] + policykit? ( >=sys-auth/polkit-0.106 ) + net-libs/libndp[${MULTILIB_USEDEP}] + >=net-misc/curl-7.24 + 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-219 ) + 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-2.5[${MULTILIB_USEDEP}] ) + 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 ) + ovs? ( dev-libs/jansson ) + 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? ( + !iwd? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) + iwd? ( net-wireless/iwd ) + ) +" +DEPEND="${COMMON_DEPEND} + dev-util/gdbus-codegen + dev-util/glib-utils + 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}]') + ) +" + +PATCHES=( "${WORKDIR}"/patches/ ) # Selective patches from nm-1-12 branch, most importantly fix for NM_AVAILABLE_IN_1_12_2 macro, otherwise nm-applet and co fail to compile + +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 + --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, bug #665338 + --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) + $(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_enable ovs) + $(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 wifi iwd) + $(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" + + if use iwd; then + # This goes to $nmlibdir/conf.d/ and $nmlibdir is '${prefix}'/lib/$PACKAGE, thus always lib, not get_libdir + cat <<-EOF > "${ED%/}"/usr/lib/NetworkManager/conf.d/iwd.conf + [device] + wifi.backend=iwd + EOF + fi + + # Empty + rmdir "${ED%/}"/var{/lib{/NetworkManager,},} || die +} + +pkg_postinst() { + gnome2_pkg_postinst + systemd_reenable NetworkManager.service + ! 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 +} -- cgit v1.2.3-65-gdbad