From 736acafc5b31bbd89536534eddb34862386c4883 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 28 Dec 2018 00:26:33 +0000 Subject: net-misc/{networkmanager,modemmanager} : version bump --- net-misc/modemmanager/Manifest | 2 +- .../modemmanager/modemmanager-1.6.12-r1.ebuild | 113 ------- .../modemmanager/modemmanager-1.8.2-r1337.ebuild | 121 ++++++++ net-misc/networkmanager/Manifest | 2 +- .../networkmanager-1.10.10-r1.ebuild | 328 -------------------- .../networkmanager-1.14.4-r1337.ebuild | 339 +++++++++++++++++++++ 6 files changed, 462 insertions(+), 443 deletions(-) delete mode 100644 net-misc/modemmanager/modemmanager-1.6.12-r1.ebuild create mode 100644 net-misc/modemmanager/modemmanager-1.8.2-r1337.ebuild delete mode 100644 net-misc/networkmanager/networkmanager-1.10.10-r1.ebuild create mode 100644 net-misc/networkmanager/networkmanager-1.14.4-r1337.ebuild (limited to 'net-misc') diff --git a/net-misc/modemmanager/Manifest b/net-misc/modemmanager/Manifest index f2b09ab3..98348490 100644 --- a/net-misc/modemmanager/Manifest +++ b/net-misc/modemmanager/Manifest @@ -1 +1 @@ -DIST ModemManager-1.6.12.tar.xz 1402364 BLAKE2B 11335c495cc428936c9b0dd319449a7bf4c58a95ccd53b7a5bb276d78030272a7f29e5f0fa96a96613c5e0cb6a62239d864a23de6260fb55f6ecab09a18e6454 SHA512 2ac72fb2d36530204528cc0cd4815d0b93a1a8c8539ac345101e5e15bbfffd3eda888bbdc54298d3547b9aeacb94c75be5c600e993099671da2f9f27e8ee93cd +DIST ModemManager-1.8.2.tar.xz 2088248 BLAKE2B e53ec3dacac2b1d57191de0eba130ea575a40047e5faa1c813543f1ca17164d71a18478ec6c0392adabea94d2455ee510ceceefc16798fec6f26ec834ebbf84c SHA512 fb00ce6f3dc9795468e81ba295ad82e9586add2d7118661ea5f287a99afca97dc3aea64488393792bb1198e7abf2605bbc5ded2517980d67f8819931effdeea5 diff --git a/net-misc/modemmanager/modemmanager-1.6.12-r1.ebuild b/net-misc/modemmanager/modemmanager-1.6.12-r1.ebuild deleted file mode 100644 index 15074afc..00000000 --- a/net-misc/modemmanager/modemmanager-1.6.12-r1.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" - -inherit gnome2 user readme.gentoo-r1 systemd udev vala - -DESCRIPTION="Modem and mobile broadband management libraries" -HOMEPAGE="https://cgit.freedesktop.org/ModemManager/ModemManager/" -SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" - -LICENSE="GPL-2+" -SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" - -IUSE="+introspection mbim policykit +qmi systemd vala" -REQUIRED_USE=" - vala? ( introspection ) -" - -RDEPEND=" - >=dev-libs/glib-2.36.0:2 - >=virtual/libgudev-230:= - introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) - mbim? ( >=net-libs/libmbim-1.14.0 ) - policykit? ( >=sys-auth/polkit-0.106[introspection] ) - qmi? ( >=net-libs/libqmi-1.16.0:= ) - systemd? ( >=sys-apps/systemd-209 ) -" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/gtk-doc-am-1 - >=dev-util/intltool-0.40 - >=sys-devel/gettext-0.19.3 - virtual/pkgconfig - vala? ( $(vala_depend) ) -" - -S="${WORKDIR}/ModemManager-${PV}" - -src_prepare() { - DOC_CONTENTS="If your USB modem shows up as a Flash drive when you plug it in, - You should install sys-apps/usb_modeswitch which will automatically - switch it over to USB modem mode whenever you plug it in.\n" - - if use policykit; then - DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, - add your user account to the 'plugdev' group." - fi - - use vala && vala_src_prepare - gnome2_src_prepare -} - -src_configure() { - gnome2_src_configure \ - --disable-more-warnings \ - --with-udev-base-dir="$(get_udevdir)" \ - --disable-static \ - --with-dist-version=${PVR} \ - $(use_enable introspection) \ - $(use_with mbim) \ - $(use_with policykit polkit) \ - $(usex systemd --with-suspend-resume=systemd --with-suspend-resume=no) \ - $(use_with qmi) \ - $(use_enable vala) -} - -src_install() { - gnome2_src_install - - # Allow users in plugdev group full control over their modem - if use policykit; then - insinto /usr/share/polkit-1/rules.d/ - doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules - fi - - # create OpenRC service file - newinitd "${FILESDIR}/init.d.ModemManager" ModemManager - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_pkg_postinst - - use policykit && enewgroup plugdev - - # The polkit rules file moved to /usr/share - old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" - if [[ -f "${old_rules}" ]]; then - case "$(md5sum ${old_rules})" in - c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) - # 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 >=modemmanager-0.5.2.0-r2" - elog "If you edited ${old_rules}" - elog "without changing its behavior, you may want to remove it." - ;; - esac - fi - - systemd_reenable ModemManager.service - - readme.gentoo_print_elog -} diff --git a/net-misc/modemmanager/modemmanager-1.8.2-r1337.ebuild b/net-misc/modemmanager/modemmanager-1.8.2-r1337.ebuild new file mode 100644 index 00000000..66015faa --- /dev/null +++ b/net-misc/modemmanager/modemmanager-1.8.2-r1337.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +VALA_USE_DEPEND="vapigen" + +inherit gnome2 user readme.gentoo-r1 systemd udev vala + +DESCRIPTION="Modem and mobile broadband management libraries" +HOMEPAGE="https://www.freedesktop.org/wiki/Software/ModemManager/" +SRC_URI="https://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" + +LICENSE="GPL-2+" +SLOT="0/1" # subslot = dbus interface version, i.e. N in org.freedesktop.ModemManager${N} +KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86" + +IUSE="+introspection mbim policykit +qmi systemd +udev vala" +REQUIRED_USE=" + vala? ( introspection ) +" + +RDEPEND=" + >=dev-libs/glib-2.36.0:2 + udev? ( >=virtual/libgudev-230:= ) + introspection? ( >=dev-libs/gobject-introspection-0.9.6:= ) + mbim? ( >=net-libs/libmbim-1.16.0 ) + policykit? ( >=sys-auth/polkit-0.106[introspection] ) + qmi? ( >=net-libs/libqmi-1.20.0:= ) + systemd? ( >=sys-apps/systemd-209 ) +" +DEPEND="${RDEPEND} + dev-util/gdbus-codegen + dev-util/glib-utils + >=dev-util/gtk-doc-am-1 + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + vala? ( $(vala_depend) ) +" + +S="${WORKDIR}/ModemManager-${PV}" + +src_prepare() { + DOC_CONTENTS=" + If your USB modem shows up only as a storage device when you plug it in, + then you should install sys-apps/usb_modeswitch, which will automatically + switch it over to USB modem mode whenever you plug it in.\n" + + if use policykit; then + DOC_CONTENTS+="\nTo control your modem without needing to enter the root password, + add your user account to the 'plugdev' group." + fi + + use vala && vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure \ + --disable-more-warnings \ + --disable-static \ + --with-dist-version=${PVR} \ + --with-udev-base-dir="$(get_udevdir)" \ + $(use_with udev) \ + $(use_enable introspection) \ + $(use_with mbim) \ + $(use_with policykit polkit) \ + $(use_with systemd systemd-suspend-resume) \ + $(use_with systemd systemd-journal) \ + $(use_with qmi) \ + $(use_enable vala) +} + +src_install() { + gnome2_src_install + + # Allow users in plugdev group full control over their modem + if use policykit; then + insinto /usr/share/polkit-1/rules.d/ + doins "${FILESDIR}"/01-org.freedesktop.ModemManager1.rules + fi + + # create OpenRC service file + newinitd "${FILESDIR}/init.d.ModemManager" ModemManager + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_pkg_postinst + + use policykit && enewgroup plugdev + + # The polkit rules file moved to /usr/share + old_rules="${EROOT}etc/polkit-1/rules.d/01-org.freedesktop.ModemManager.rules" + if [[ -f "${old_rules}" ]]; then + case "$(md5sum ${old_rules})" in + c5ff02532cb1da2c7545c3069e5d0992* | 5c50f0dc603c0a56e2851a5ce9389335* ) + # 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 >=modemmanager-0.5.2.0-r2" + elog "If you edited ${old_rules}" + elog "without changing its behavior, you may want to remove it." + ;; + esac + fi + + if ! use udev; then + ewarn "You have built ModemManager without udev support. You may have to teach it" + ewarn "about your modem port manually." + fi + + systemd_reenable ModemManager.service + + readme.gentoo_print_elog +} diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index d3cadc79..8954a381 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1 +1 @@ -DIST NetworkManager-1.10.10.tar.xz 4038552 BLAKE2B a0a3c2a74dd641d25267ec7932f0801e30720334cb905c86abfaeb9bc3c60a2c1e9372b738b1eb43c55a34edf952905d94e3513cef653ea62e470d56bc575b65 SHA512 e536598b19064e0ab7fe3e92362de9c380281ff53a1481438216c2247b2d5287244e735be41c56c53040a5861bf36bbb979e36578244fabd6448a50ea42c4645 +DIST NetworkManager-1.14.4.tar.xz 4414196 BLAKE2B 31b236ee143892725cccccfe26a83bc75f938e19f52c5d09fb6ea3635f517feb5bab428eec4ee5e617920a8a8dd6bfe72bf9b760ecf16dec0bac4bb8663c58e4 SHA512 4199d6d7bbbee318b0f69cf2c1bf46cc3721c764121634751753c3cc833c4c5ac0856467896536e3d403ba8783fe452aaa79bfcd71a5ec324a4274989fb656c7 diff --git a/net-misc/networkmanager/networkmanager-1.10.10-r1.ebuild b/net-misc/networkmanager/networkmanager-1.10.10-r1.ebuild deleted file mode 100644 index 4c6417e0..00000000 --- a/net-misc/networkmanager/networkmanager-1.10.10-r1.ebuild +++ /dev/null @@ -1,328 +0,0 @@ -# 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 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 ovs 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 -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-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[${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? ( >=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) - $(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 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" - - # 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 -} diff --git a/net-misc/networkmanager/networkmanager-1.14.4-r1337.ebuild b/net-misc/networkmanager/networkmanager-1.14.4-r1337.ebuild new file mode 100644 index 00000000..f23ac591 --- /dev/null +++ b/net-misc/networkmanager/networkmanager-1.14.4-r1337.ebuild @@ -0,0 +1,339 @@ +# Copyright 1999-2018 Gentoo Authors +# 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,3_7} ) + +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" + +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}]') + ) +" + +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() { + einstalldocs + ! 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