From eab54d8bce8813fee765bbe1cf876dfa712bdbb2 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Sat, 5 Sep 2015 12:26:19 +0200 Subject: [PATCH] net-misc/networkmanager: Drop old Package-Manager: portage-2.2.20.1 --- net-misc/networkmanager/Manifest | 2 - ...networkmanager-0.9.10.1_pre20141101.ebuild | 302 ----------------- .../networkmanager-1.0.0.ebuild | 305 ------------------ .../networkmanager-1.0.4.ebuild | 296 ----------------- 4 files changed, 905 deletions(-) delete mode 100644 net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild delete mode 100644 net-misc/networkmanager/networkmanager-1.0.0.ebuild delete mode 100644 net-misc/networkmanager/networkmanager-1.0.4.ebuild diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 51c4280ff1b1..4b6cd8d06db3 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,6 +1,4 @@ -DIST NetworkManager-0.9.10.1_pre20141101.tar.xz 2507248 SHA256 5f2e61c74713ce9ebb755c23c9aca279f321eb924247c282bdd50c2c8337fe40 SHA512 0cc4ec34e5933229a9b25e25b26d7619ac1a61275cd4c33a658c98578e6a27d4d2b1337c1e839467c625739a6ae2175ab6d883c4bfbe35642dbbafb7b11a421d WHIRLPOOL 1d0fb976ffc26aba74fc8b8bee081efc236ea647da0970a5564730522f2f837bfa5cd0853268d5098126810a4429b2ff7840f9cf66e6faa3bd5829b175679681 DIST NetworkManager-0.9.8.10.tar.xz 2015492 SHA256 064d27223d3824859df12e1fb25b787fec1c68bbc864dc52a0289b9211c4c972 SHA512 8688b8dceadf87d26b76bdda76ecb0b383ecaa7991487e6f6ddc150cf311f2f0cb3487afd91f19ecde2925585e8d53c8761fd45743f25c488eff6a7811ca4200 WHIRLPOOL 29c4f2189eb812c23e8c1cfbce728c525282ad3f04d3c9c25b3a80a043c95f2a9419fa71ac6f8a59d7abde8a30275e68e3ef615b74f78c07846757d92f114e1c -DIST NetworkManager-1.0.0.tar.xz 3210884 SHA256 3a66afec670c975edd9832e620b725a5f16ed267a1b9e1b2d51ef27250d85947 SHA512 7089496ce31bfdffe99c0f031b6326734d2e36b3bb9a2ed0ecbe3dad64bff0dc993b2e6bcac770b31bcfe634833bd8dbabc23d128356dbba8243a6d8fc489a5e WHIRLPOOL df928cb0a9be0782b1f853d808273f798ca62be5f0fd650caf033fb16b98ef696c7f90eaed90488ef7f6a9e607cf74cd865848523fbbf08cd26487e98b4a455a DIST NetworkManager-1.0.2.tar.xz 3210588 SHA256 359385707494bedbb48cfe0992ccfbcc4ac147dae1f7a47055c71e96439508ff SHA512 9c5884c75c2a2aae478d99bde4ecbb0dc4293b3f50dcf78a1579aa13e09ab95b01981a366f1dc58cd5d02fe77dc90fc0941f00142cd5ef1cea14c3b9d89f5c36 WHIRLPOOL 0a9f4bc6cc0f176bfc1c82294b45392c86b6d6a65cefe38fc80fce8f09584f275a23163d1909dfde9427405fe7b4086b8e2bc4995eded4cf441b8024fa00657d DIST NetworkManager-1.0.4.tar.xz 3364168 SHA256 e4099fa2f4f4b8d95d0ad9fdd03ec20960845085fa500bf79aecbf54cee018c9 SHA512 b07583ca654a95dc018a712626ba0065c2ff5d9904b326891be684b32526f360f287b46cbd11026277a385558c1b55e38a086ae2b0aab059b63a4f3e11566cb1 WHIRLPOOL d6a612a855e216b7b46c620a85ceb3b3893029cf83bb9699ed0ba1c2d349abdeb4ee8921155216fb8285ac369cea64704836984e86bbf3813d8287b4803fc49a DIST NetworkManager-1.0.6.tar.xz 3381092 SHA256 38ea002403e3b884ffa9aae25aea431d2a8420f81f4919761c83fb92648254bd SHA512 74e8f91bbd9a70f1764b06c729717e091d2be0a8e316fe1b6235e644b65f43add5214be7a1100fe9d30b1511f4a00b9892dce79bb8ba0f0b0d57089d2ba6ddbb WHIRLPOOL 5f1d8c905e4aaa78c742c16e773f8fdbcdb2771edf36565f6b419af457776084573aa43b384ba32885992e76b399d4f2fc7dc94ad4295ac28dcfa3d6b6994b97 diff --git a/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild b/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild deleted file mode 100644 index 54d9952bfe57..000000000000 --- a/net-misc/networkmanager/networkmanager-0.9.10.1_pre20141101.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_MIN_API_VERSION="0.18" -VALA_USE_DEPEND="vapigen" - -# Tests need python2, https://bugzilla.gnome.org/show_bug.cgi?id=739448 -PYTHON_COMPAT=( python2_7 ) - -inherit bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd user readme.gentoo toolchain-funcs vala versionator virtualx udev - -DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -SRC_URI="https://dev.gentoo.org/~pacho/gnome/${GNOME_ORG_MODULE}-${PV}.tar.xz" - -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 dhcpcd gnutls +introspection \ -kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ -vala +wext +wifi zeroconf" # wimax - -KEYWORDS="amd64 arm ~ppc ~ppc64 x86" - -REQUIRED_USE=" - modemmanager? ( ppp ) - ^^ ( nss gnutls ) - ^^ ( dhclient dhcpcd ) -" - -S="${WORKDIR}/${GNOME_ORG_MODULE}-0.9.10.1" - -# 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: Qt support? -# -# iputils version needed due path changes (#523632). Upstream fixed -# it with a major refactor committed to 'master' for handling different -# paths for arping and other tools and, then, the version requirement -# will be able to be dropped on next major NM version -COMMON_DEPEND=" - >=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.32:2 - >=dev-libs/libnl-3.2.8:3= - >=sys-auth/polkit-0.106 - net-libs/libndp - >=net-libs/libsoup-2.26:2.4= - >=net-misc/iputils-20121221-r1 - sys-libs/readline:0 - >=virtual/libgudev-165:= - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dhcp] - net-firewall/iptables ) - gnutls? ( - dev-libs/libgcrypt:0= - net-libs/gnutls:= ) - modemmanager? ( >=net-misc/modemmanager-0.7.991 ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:= ) - dhclient? ( =net-misc/dhcp-4*[client] ) - dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe ) - resolvconf? ( net-dns/openresolv ) - systemd? ( >=sys-apps/systemd-183:0= ) - teamd? ( >=net-misc/libteam-1.9 ) - zeroconf? ( net-dns/avahi:=[autoipd] ) - || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-183 ) -" -RDEPEND="${COMMON_DEPEND} - consolekit? ( sys-auth/consolekit ) - wifi? ( >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] ) -" -DEPEND="${COMMON_DEPEND} - 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:2[${PYTHON_USEDEP}]') - ) -" - -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." - - # Find arping at proper place, bug #523632 - epatch "${FILESDIR}/${PN}-0.9.10.0-arpingpath.patch" - - # Force use of /run, avoid eautoreconf, upstream bug #737139 - sed -e 's:$localstatedir/run/:/run/:' -i configure || die - - use vala && vala_src_prepare - - epatch_user # don't remove, users often want custom patches for NM - - gnome2_src_prepare -} - -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="${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="${myconf} "$(systemd_with_unitdir)"" - - # TODO: enable wimax when we have a libnl:3 compatible revision of it - # wimax will be removed, bug #522822 - # ifnet plugin always disabled until someone volunteers to actively - # maintain and fix it - gnome2_src_configure \ - --disable-more-warnings \ - --disable-static \ - --localstatedir=/var \ - --disable-ifnet \ - --without-netconfig \ - --with-dbus-sys-dir=/etc/dbus-1/system.d \ - --with-udev-dir="$(get_udevdir)" \ - --with-config-plugins-default=keyfile \ - --with-iptables=/sbin/iptables \ - --with-libsoup=yes \ - --enable-concheck \ - --with-crypto=$(usex nss nss gnutls) \ - --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \ - --with-suspend-resume=$(usex systemd systemd upower) \ - $(use_enable bluetooth bluez5-dun) \ - $(use_enable introspection) \ - $(use_enable ppp) \ - --disable-wimax \ - $(use_with dhclient) \ - $(use_with dhcpcd) \ - $(use_with modemmanager modem-manager-1) \ - $(use_with ncurses nmtui) \ - $(use_with resolvconf) \ - $(use_with selinux) \ - $(use_enable teamd teamdctl) \ - $(use_enable test tests) \ - $(use_enable vala) \ - --without-valgrind \ - $(use_with wext) \ - ${myconf} -} - -src_test() { - python_setup - Xemake check -} - -src_install() { - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - - readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # /var/run/NetworkManager is used by some distros, but not by Gentoo - rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed" - - # 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 - - # 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 - 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 - - # ifnet plugin was disabled for systemd users with 0.9.8.6 version - # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) - if use systemd; then - if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then - ewarn "Ifnet plugin won't be used with systemd support enabled" - ewarn "as it is meant to be used with openRC and can cause collisions" - ewarn "(like bug #485658)." - ewarn "Because of this, you will likely need to reconfigure some of" - ewarn "your networks. To do this you can rely on Gnome control center," - ewarn "nm-connection-editor or nmtui tools for example once updated" - ewarn "NetworkManager version is installed." - fi - else - if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then - ewarn "Ifnet plugin is now disabled because of it being unattended" - ewarn "and unmaintained for a long time, leading to some unfixed bugs" - ewarn "and new problems appearing. We will now use upstream 'keyfile'" - ewarn "plugin." - ewarn "Because of this, you will likely need to reconfigure some of" - ewarn "your networks. To do this you can rely on Gnome control center," - ewarn "nm-connection-editor or nmtui tools for example once updated" - ewarn "NetworkManager version is installed." - fi - 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.0.0.ebuild b/net-misc/networkmanager/networkmanager-1.0.0.ebuild deleted file mode 100644 index 6ffd8ce4e83d..000000000000 --- a/net-misc/networkmanager/networkmanager-1.0.0.ebuild +++ /dev/null @@ -1,305 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_MIN_API_VERSION="0.18" -VALA_USE_DEPEND="vapigen" - -# Tests need python2, https://bugzilla.gnome.org/show_bug.cgi?id=739448 -PYTHON_COMPAT=( python2_7 ) - -inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \ - user readme.gentoo toolchain-funcs vala versionator virtualx udev - -DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts" -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 dhcpcd gnutls +introspection \ -kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ -vala +wext +wifi zeroconf" # wimax - -KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~sparc x86" - -REQUIRED_USE=" - modemmanager? ( ppp ) - ^^ ( nss gnutls ) - ^^ ( dhclient dhcpcd ) -" - -# 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: Qt support? -COMMON_DEPEND=" - >=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.32:2 - >=dev-libs/libnl-3.2.8:3= - >=sys-auth/polkit-0.106 - net-libs/libndp - >=net-libs/libsoup-2.26:2.4= - net-misc/iputils - sys-libs/readline:0 - >=virtual/libgudev-165:= - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dhcp] - net-firewall/iptables ) - gnutls? ( - dev-libs/libgcrypt:0= - net-libs/gnutls:= ) - modemmanager? ( >=net-misc/modemmanager-0.7.991 ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:= ) - dhclient? ( =net-misc/dhcp-4*[client] ) - dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe ) - resolvconf? ( net-dns/openresolv ) - systemd? ( >=sys-apps/systemd-209:0= ) - teamd? ( >=net-misc/libteam-1.9 ) - zeroconf? ( net-dns/avahi:=[autoipd] ) - || ( sys-power/upower sys-power/upower-pm-utils >=sys-apps/systemd-209 ) -" -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:2[${PYTHON_USEDEP}]') - ) -" - -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." - - # Find arping in our paths, upstream bug #742576 (from 1.0 branch) - epatch "${FILESDIR}"/${PN}-1.0.0-find-helpers.patch - - # Fix lto configure switch, upstream bug #742575 (from 1.0 branch) - epatch "${FILESDIR}"/${PN}-1.0.0-lto-switch.patch - - # Fix build with /bin/sh != bash, see bug #536540, upstream bug #743480 - epatch "${FILESDIR}/${PN}-1.0.0-remove-bashisms.patch" - - # Force use of /run, avoid eautoreconf, upstream bug #737139 - sed -e 's:$localstatedir/run/:/run/:' -i configure || die - - use vala && vala_src_prepare - - epatch_user # don't remove, users often want custom patches for NM - - eautoreconf - gnome2_src_prepare -} - -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="${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="${myconf} "$(systemd_with_unitdir)"" - - # TODO: enable wimax when we have a libnl:3 compatible revision of it - # wimax will be removed, bug #522822 - # ifnet plugin always disabled until someone volunteers to actively - # maintain and fix it - gnome2_src_configure \ - --disable-more-warnings \ - --disable-static \ - --localstatedir=/var \ - --disable-lto \ - --disable-config-plugin-ibft \ - --disable-ifnet \ - --without-netconfig \ - --with-dbus-sys-dir=/etc/dbus-1/system.d \ - --with-udev-dir="$(get_udevdir)" \ - --with-config-plugins-default=keyfile \ - --with-iptables=/sbin/iptables \ - --with-libsoup=yes \ - --enable-concheck \ - --with-crypto=$(usex nss nss gnutls) \ - --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \ - --with-suspend-resume=$(usex systemd systemd upower) \ - $(use_enable bluetooth bluez5-dun) \ - $(use_enable introspection) \ - $(use_enable ppp) \ - --disable-wimax \ - $(use_with dhclient) \ - $(use_with dhcpcd) \ - $(use_with modemmanager modem-manager-1) \ - $(use_with ncurses nmtui) \ - $(use_with resolvconf) \ - $(use_with selinux) \ - $(use_enable teamd teamdctl) \ - $(use_enable test tests) \ - $(use_enable vala) \ - --without-valgrind \ - $(use_with wext) \ - ${myconf} -} - -src_test() { - python_setup - Xemake check -} - -src_install() { - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - - readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # /var/run/NetworkManager is used by some distros, but not by Gentoo - rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed" - rmdir -v "${ED}/var/run" || die "rmdir failed" - - # 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 - - # 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 - 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 - - # ifnet plugin was disabled for systemd users with 0.9.8.6 version - # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) - if use systemd; then - if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then - ewarn "Ifnet plugin won't be used with systemd support enabled" - ewarn "as it is meant to be used with openRC and can cause collisions" - ewarn "(like bug #485658)." - ewarn "Because of this, you will likely need to reconfigure some of" - ewarn "your networks. To do this you can rely on Gnome control center," - ewarn "nm-connection-editor or nmtui tools for example once updated" - ewarn "NetworkManager version is installed." - fi - else - if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then - ewarn "Ifnet plugin is now disabled because of it being unattended" - ewarn "and unmaintained for a long time, leading to some unfixed bugs" - ewarn "and new problems appearing. We will now use upstream 'keyfile'" - ewarn "plugin." - ewarn "Because of this, you will likely need to reconfigure some of" - ewarn "your networks. To do this you can rely on Gnome control center," - ewarn "nm-connection-editor or nmtui tools for example once updated" - ewarn "NetworkManager version is installed." - fi - 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.0.4.ebuild b/net-misc/networkmanager/networkmanager-1.0.4.ebuild deleted file mode 100644 index de67526801eb..000000000000 --- a/net-misc/networkmanager/networkmanager-1.0.4.ebuild +++ /dev/null @@ -1,296 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" -GNOME_ORG_MODULE="NetworkManager" -GNOME2_LA_PUNT="yes" -VALA_USE_DEPEND="vapigen" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \ - user readme.gentoo toolchain-funcs vala versionator virtualx udev - -DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts" -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 dhcpcd gnutls +introspection \ -kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ -vala +wext +wifi zeroconf" # wimax - -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86" - -REQUIRED_USE=" - modemmanager? ( ppp ) - wext? ( wifi ) - ^^ ( nss gnutls ) - ^^ ( dhclient dhcpcd ) -" - -# 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: Qt support? -COMMON_DEPEND=" - >=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.100 - >=dev-libs/glib-2.37.6:2 - >=dev-libs/libnl-3.2.8:3= - >=sys-auth/polkit-0.106 - net-libs/libndp - >=net-libs/libsoup-2.26:2.4= - net-misc/iputils - sys-libs/readline:0 - >=virtual/libgudev-165:= - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dhcp] - net-firewall/iptables ) - gnutls? ( - dev-libs/libgcrypt:0= - net-libs/gnutls:= ) - modemmanager? ( >=net-misc/modemmanager-0.7.991 ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:= ) - dhclient? ( >=net-misc/dhcp-4[client] ) - dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) - introspection? ( >=dev-libs/gobject-introspection-0.10.3:= ) - ppp? ( >=net-dialup/ppp-2.4.5:=[ipv6] net-dialup/rp-pppoe ) - 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 ) - zeroconf? ( net-dns/avahi:=[autoipd] ) -" -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:2[${PYTHON_USEDEP}]') - ) -" - -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." - - # Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master' - sed -e 's:$localstatedir/run/:/run/:' -i configure || die - - use vala && vala_src_prepare - - epatch_user # don't remove, users often want custom patches for NM - - eautoreconf - - gnome2_src_prepare -} - -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="${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="${myconf} "$(systemd_with_unitdir)"" - - # TODO: enable wimax when we have a libnl:3 compatible revision of it - # wimax will be removed, bug #522822 - # ifnet plugin always disabled until someone volunteers to actively - # maintain and fix it - gnome2_src_configure \ - --disable-more-warnings \ - --disable-static \ - --localstatedir=/var \ - --disable-lto \ - --disable-config-plugin-ibft \ - --disable-ifnet \ - --without-netconfig \ - --with-dbus-sys-dir=/etc/dbus-1/system.d \ - --with-udev-dir="$(get_udevdir)" \ - --with-config-plugins-default=keyfile \ - --with-iptables=/sbin/iptables \ - --with-libsoup=yes \ - --enable-concheck \ - --with-crypto=$(usex nss nss gnutls) \ - --with-session-tracking=$(usex systemd systemd $(usex consolekit consolekit no)) \ - --with-suspend-resume=$(usex systemd systemd upower) \ - $(use_enable bluetooth bluez5-dun) \ - $(use_enable introspection) \ - $(use_enable ppp) \ - --disable-wimax \ - $(use_with dhclient) \ - $(use_with dhcpcd) \ - $(use_with modemmanager modem-manager-1) \ - $(use_with ncurses nmtui) \ - $(use_with resolvconf) \ - $(use_with selinux) \ - $(use_enable teamd teamdctl) \ - $(use_enable test tests) \ - $(use_enable vala) \ - --without-valgrind \ - $(use_with wext) \ - $(use_enable wifi) \ - ${myconf} -} - -src_test() { - python_setup - Xemake check -} - -src_install() { - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # /var/run/NetworkManager is used by some distros, but not by Gentoo - rmdir -v "${ED}/var/run/NetworkManager" || die "rmdir failed" - rmdir -v "${ED}/var/run" || die "rmdir failed" - - # 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 - - # 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 - - # 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 - - # ifnet plugin was disabled for systemd users with 0.9.8.6 version - # and for all people with 0.9.10.0-r1 (see ChangeLog for full explanations) - if use systemd; then - if ! version_is_at_least 0.9.8.6 ${REPLACING_VERSIONS}; then - ewarn "Ifnet plugin won't be used with systemd support enabled" - ewarn "as it is meant to be used with openRC and can cause collisions" - ewarn "(like bug #485658)." - ewarn "Because of this, you will likely need to reconfigure some of" - ewarn "your networks. To do this you can rely on Gnome control center," - ewarn "nm-connection-editor or nmtui tools for example once updated" - ewarn "NetworkManager version is installed." - fi - else - if ! version_is_at_least 0.9.10.0-r1 ${REPLACING_VERSIONS}; then - ewarn "Ifnet plugin is now disabled because of it being unattended" - ewarn "and unmaintained for a long time, leading to some unfixed bugs" - ewarn "and new problems appearing. We will now use upstream 'keyfile'" - ewarn "plugin." - ewarn "Because of this, you will likely need to reconfigure some of" - ewarn "your networks. To do this you can rely on Gnome control center," - ewarn "nm-connection-editor or nmtui tools for example once updated" - ewarn "NetworkManager version is installed." - fi - 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 -} -- 2.26.2