From 6dda2f5d5e728ca4f7784707ea786fd2efab860a Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Thu, 26 Jan 2017 12:18:36 +0200 Subject: net-misc/networkmanager: Remove old Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- net-misc/networkmanager/Manifest | 1 - net-misc/networkmanager/files/1.2.4-upower.patch | 67 ---- .../files/networkmanager-1.0.12-wifi-wext.patch | 24 -- .../networkmanager/networkmanager-1.0.12-r1.ebuild | 346 --------------------- 4 files changed, 438 deletions(-) delete mode 100644 net-misc/networkmanager/files/1.2.4-upower.patch delete mode 100644 net-misc/networkmanager/files/networkmanager-1.0.12-wifi-wext.patch delete mode 100644 net-misc/networkmanager/networkmanager-1.0.12-r1.ebuild diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 89e7faa17c5e..49217b850dfa 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -1,3 +1,2 @@ -DIST NetworkManager-1.0.12.tar.xz 3490836 SHA256 3a470f8c60109b1acb5784ddc2423501706b5fe34c793a6faee87e591eb04a9e SHA512 926c0139dc7ade7bbc512f0d2e386a42a278aceff68996bc3a18fb1940f5d516f0ff2768459d6f50fd5669d72c15202307396bb3cf8b67c3dbac19db484b971c WHIRLPOOL 6178af61fb30a7e8b72cc05296a014a5be5b10fed41cd5385f0bebae1fa22519c83cf8c359479372f063fc2b891715015454c53cd4f1f1516fc03bca76a552ac DIST NetworkManager-1.4.0.tar.xz 3699568 SHA256 c4d5e075998a291074501602a5068a7e54d9e0f2658aba079d58145d65be531d SHA512 2580e885684f6ad464eebdf9e0dab5432d4d45f0f4127af7f8947be16fc5ce84a5cc090e195b68619c14e218d9cffcde1615400c19326e58bdac8fdf7b53fb46 WHIRLPOOL 39607ac0606039c242b2033b9e540c3beb88e7f48fdb8188d942341a57e097dc0e9c7bde248b6d9ae65bd3ac94df83b5e7d7a371baf7f32c8542581c3bdf778c DIST NetworkManager-1.4.4.tar.xz 3762664 SHA256 829378f318cc008d138a23ca6a9191928ce75344e7e47a2f2c35f4ac82133309 SHA512 a73e423e88b0e2694a46dc04f492a656d766796aa987b2e4644147a5939a6fdeb22ff5d8b36c723444bc0ab3d8740b80fa82c2f5e07f073998841695978d6e14 WHIRLPOOL d5e4ca3868c2aa8bceec2029c573b61ccc2fbc9f9a84cb8360ecf7d7503011f0501e9bffd54b163de8e84606ad7977b3c187adb78beed3a44bf2a3ee9821631f diff --git a/net-misc/networkmanager/files/1.2.4-upower.patch b/net-misc/networkmanager/files/1.2.4-upower.patch deleted file mode 100644 index a08e34ae370e..000000000000 --- a/net-misc/networkmanager/files/1.2.4-upower.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f864c58cfe87533c69dcf00e3ea236809392a8e0 Mon Sep 17 00:00:00 2001 -From: Beniamino Galvani -Date: Thu, 4 Aug 2016 16:25:30 +0200 -Subject: build: fix build with '--with-suspend-resume=upower' - -Now we have a single file for all suspend APIs and the selection is -done through the preprocessor: remove stale AM_CONDITIONALs and define -SUSPEND_RESUME_UPOWER when needed. - -Fixes: c76eb3e8f7a80b69c570b513ee3eb16bea1b34bd -(cherry picked from commit e4b2c989dc51818e52906b5120ea6a0659274631) - -diff --git a/configure.ac b/configure.ac -index 46775c3..7869f07 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -472,7 +472,9 @@ if test "z$with_suspend_resume" = "z"; then - fi - - case $with_suspend_resume in -- upower) ;; -+ upower) -+ AC_DEFINE([SUSPEND_RESUME_UPOWER], 1, [Define to 1 to use UPower suspend api]) -+ ;; - systemd) - PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd >= 209],, - [PKG_CHECK_MODULES(SYSTEMD_INHIBIT, [libsystemd-login >= 183])]) -@@ -485,9 +487,6 @@ case $with_suspend_resume in - AC_MSG_ERROR(--with-suspend-resume must be one of [upower, systemd, consolekit]) - ;; - esac --AM_CONDITIONAL(SUSPEND_RESUME_UPOWER, test "x$with_suspend_resume" = "xupower") --AM_CONDITIONAL(SUSPEND_RESUME_SYSTEMD, test "x$with_suspend_resume" = "xsystemd") --AM_CONDITIONAL(SUSPEND_RESUME_CONSOLEKIT, test "x$with_suspend_resume" = "xconsolekit") - - # SELinux support - AC_ARG_WITH(selinux, AS_HELP_STRING([--with-selinux=yes|no|auto], [Build with SELinux (default: auto)]),,[with_selinux=auto]) --- -cgit v0.10.2 - ---- a/config.h.in -+++ b/config.h.in -@@ -216,6 +216,9 @@ - /* Define to 1 to use systemd suspend api */ - #undef SUSPEND_RESUME_SYSTEMD - -+/* Define to 1 to use UPower suspend api */ -+#undef SUSPEND_RESUME_UPOWER -+ - /* Define to 1 if libsystemd-journald is available */ - #undef SYSTEMD_JOURNAL - ---- a/configure -+++ b/configure -@@ -22776,7 +22776,11 @@ - fi - - case $with_suspend_resume in -- upower) ;; -+ upower) -+ -+$as_echo "#define SUSPEND_RESUME_UPOWER 1" >>confdefs.h -+ -+ ;; - systemd) - - pkg_failed=no diff --git a/net-misc/networkmanager/files/networkmanager-1.0.12-wifi-wext.patch b/net-misc/networkmanager/files/networkmanager-1.0.12-wifi-wext.patch deleted file mode 100644 index 124cafe48dc6..000000000000 --- a/net-misc/networkmanager/files/networkmanager-1.0.12-wifi-wext.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 70c0defe753bc98ac75725cc32a84b36f32258e4 Mon Sep 17 00:00:00 2001 -From: Francesco Giudici -Date: Fri, 11 Mar 2016 09:55:39 +0100 -Subject: wifi: hack for wext devices reporting IW_MODE_AUTO configuration - mode. - -https://bugzilla.gnome.org/show_bug.cgi?id=763388 -(cherry picked from commit 0f6febc6fbeafde62e6e0a8c12f57204d94166fb) - -diff --git a/src/platform/wifi/wifi-utils-wext.c b/src/platform/wifi/wifi-utils-wext.c -index 470b73d..14a16ec 100644 ---- a/src/platform/wifi/wifi-utils-wext.c -+++ b/src/platform/wifi/wifi-utils-wext.c -@@ -122,6 +122,7 @@ wifi_wext_get_mode (WifiData *data) - case IW_MODE_MASTER: - return NM_802_11_MODE_AP; - case IW_MODE_INFRA: -+ case IW_MODE_AUTO: /* hack for WEXT devices reporting IW_MODE_AUTO */ - return NM_802_11_MODE_INFRA; - default: - break; --- -cgit v0.10.2 - diff --git a/net-misc/networkmanager/networkmanager-1.0.12-r1.ebuild b/net-misc/networkmanager/networkmanager-1.0.12-r1.ebuild deleted file mode 100644 index 5c4e6b94c04b..000000000000 --- a/net-misc/networkmanager/networkmanager-1.0.12-r1.ebuild +++ /dev/null @@ -1,346 +0,0 @@ -# Copyright 1999-2016 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_4,3_5} ) - -inherit autotools bash-completion-r1 eutils gnome2 linux-info multilib python-any-r1 systemd \ - user readme.gentoo toolchain-funcs vala versionator virtualx udev multilib-minimal - -DESCRIPTION="A set of co-operative tools that make networking simple and straightforward" -HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" - -LICENSE="GPL-2+" -SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version - -IUSE="bluetooth connection-sharing consolekit +dhclient dhcpcd gnutls +introspection \ -kernel_linux +nss +modemmanager ncurses +ppp resolvconf selinux systemd teamd test \ -vala +wext +wifi zeroconf" # wimax - -KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 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[${MULTILIB_USEDEP}] - >=dev-libs/dbus-glib-0.100[${MULTILIB_USEDEP}] - >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}] - >=dev-libs/libnl-3.2.8:3= - >=sys-auth/polkit-0.106 - net-libs/libndp - >=net-libs/libsoup-2.40:2.4= - net-misc/iputils - sys-libs/readline:0= - >=virtual/libgudev-165:=[${MULTILIB_USEDEP}] - bluetooth? ( >=net-wireless/bluez-5 ) - connection-sharing? ( - net-dns/dnsmasq[dhcp] - net-firewall/iptables ) - gnutls? ( - dev-libs/libgcrypt:0=[${MULTILIB_USEDEP}] - net-libs/gnutls:=[${MULTILIB_USEDEP}] ) - modemmanager? ( >=net-misc/modemmanager-0.7.991 ) - ncurses? ( >=dev-libs/newt-0.52.15 ) - nss? ( >=dev-libs/nss-3.11:=[${MULTILIB_USEDEP}] ) - dhclient? ( >=net-misc/dhcp-4[client] ) - 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." - - # wifi: hack for wext devices reporting IW_MODE_AUTO configuration mode. - # (from 1.0 branch) - epatch "${FILESDIR}"/${P}-wifi-wext.patch - - # Force use of /run, avoid eautoreconf, upstream bug #737139, fixed in 'master' - sed -e 's:$localstatedir/run/:/run/:' -i configure || die - - # Don't build examples, they are not needed and can cause build failure - sed -e '/^\s*examples\s*\\/d' -i Makefile.{am,in} || die - - use vala && vala_src_prepare - epatch_user # don't remove, users often want custom patches for NM - eautoreconf - gnome2_src_prepare -} - -multilib_src_configure() { - local myconf=() - - # Same hack as net-dialup/pptpd to get proper plugin dir for ppp, bug #519986 - if use ppp; then - local PPPD_VER=`best_version net-dialup/ppp` - PPPD_VER=${PPPD_VER#*/*-} #reduce it to ${PV}-${PR} - PPPD_VER=${PPPD_VER%%[_-]*} # main version without beta/pre/patch/revision - myconf+=( --with-pppd-plugin-dir=/usr/$(get_libdir)/pppd/${PPPD_VER} ) - fi - - # unit files directory needs to be passed only when systemd is enabled, - # otherwise systemd support is not disabled completely, bug #524534 - use systemd && myconf+=( "$(systemd_with_unitdir)" ) - - if multilib_is_native_abi; then - # work-around man out-of-source brokenness, must be done before configure - mkdir man || die - find "${S}"/man -name '*.?' -exec ln -s {} man/ ';' || die - else - # libnl, libndp are only used for executables, not libraries - myconf+=( LIB{NL,NDP}_{CFLAGS,LIBS}=' ' ) - fi - - # 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 - ECONF_SOURCE=${S} \ - 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 \ - $(multilib_native_with libsoup) \ - $(multilib_native_enable concheck) \ - --with-crypto=$(usex nss nss gnutls) \ - --with-session-tracking=$(multilib_native_usex systemd systemd $(multilib_native_usex consolekit consolekit no)) \ - --with-suspend-resume=$(multilib_native_usex systemd systemd upower) \ - $(multilib_native_use_enable bluetooth bluez5-dun) \ - $(multilib_native_use_enable introspection) \ - $(multilib_native_use_enable ppp) \ - --disable-wimax \ - $(use_with dhclient) \ - $(use_with dhcpcd) \ - $(multilib_native_use_with modemmanager modem-manager-1) \ - $(multilib_native_use_with ncurses nmtui) \ - $(multilib_native_use_with resolvconf) \ - $(multilib_native_use_with selinux) \ - $(multilib_native_use_enable teamd teamdctl) \ - $(multilib_native_use_enable test tests) \ - $(multilib_native_use_enable vala) \ - --without-valgrind \ - $(multilib_native_use_with wext) \ - $(multilib_native_use_enable wifi) \ - "${myconf[@]}" - - # work-around gtk-doc out-of-source brokedness - if multilib_is_native_abi; then - local d - for d in api libnm libnm-util libnm-glib; do - ln -s "${S}"/docs/${d}/html docs/${d}/html || die - done - fi -} - -multilib_src_compile() { - if multilib_is_native_abi; then - emake - else - emake all-am - emake -C include - emake -C introspection # generated headers, needed for libnm - emake -C libnm-core - emake -C libnm - emake -C libnm-util - emake -C libnm-glib - fi -} - -multilib_src_test() { - if multilib_is_native_abi; then - python_setup - Xemake check - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - # Install completions at proper place, bug #465100 - gnome2_src_install completiondir="$(get_bashcompdir)" - else - emake DESTDIR="${D}" install-am - emake DESTDIR="${D}" install -C include - emake DESTDIR="${D}" install -C introspection - emake DESTDIR="${D}" install -C libnm-core - emake DESTDIR="${D}" install -C libnm - emake DESTDIR="${D}" install -C libnm-util - emake DESTDIR="${D}" install -C libnm-glib - fi -} - -multilib_src_install_all() { - ! use systemd && readme.gentoo_create_doc - - newinitd "${FILESDIR}/init.d.NetworkManager" NetworkManager - newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager - - # /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, 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 - - # 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 -} -- cgit v1.2.3-65-gdbad