reavertm 14/06/16 00:16:37 Modified: ChangeLog Added: networkmanager-0.9.8.10-r1.ebuild Removed: networkmanager-0.9.8.10.ebuild Log: Apply upstream patch for crash on Wifi re-scan. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)
Revision Changes Path 1.197 net-misc/networkmanager/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.197&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?rev=1.197&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/ChangeLog?r1=1.196&r2=1.197 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v retrieving revision 1.196 retrieving revision 1.197 diff -u -r1.196 -r1.197 --- ChangeLog 31 May 2014 20:39:59 -0000 1.196 +++ ChangeLog 16 Jun 2014 00:16:37 -0000 1.197 @@ -1,6 +1,13 @@ # ChangeLog for net-misc/networkmanager # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.196 2014/05/31 20:39:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.197 2014/06/16 00:16:37 reavertm Exp $ + +*networkmanager-0.9.8.10-r1 (16 Jun 2014) + + 16 Jun 2014; Maciej Mrozowski <reave...@gentoo.org> + +files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch, + +networkmanager-0.9.8.10-r1.ebuild, -networkmanager-0.9.8.10.ebuild: + Apply upstream patch for crash on Wifi re-scan. 31 May 2014; Samuli Suominen <ssuomi...@gentoo.org> networkmanager-0.9.8.10.ebuild, networkmanager-0.9.8.8.ebuild: 1.1 net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild?rev=1.1&content-type=text/plain Index: networkmanager-0.9.8.10-r1.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.8.10-r1.ebuild,v 1.1 2014/06/16 00:16:37 reavertm Exp $ EAPI="5" GNOME_ORG_MODULE="NetworkManager" VALA_MIN_API_VERSION="0.18" VALA_USE_DEPEND="vapigen" inherit bash-completion-r1 gnome.org linux-info systemd user readme.gentoo toolchain-funcs vala virtualx udev eutils DESCRIPTION="Universal network configuration daemon for laptops, desktops, servers and virtualization hosts" HOMEPAGE="http://projects.gnome.org/NetworkManager/"; LICENSE="GPL-2+" SLOT="0" # add subslot if libnm-util.so.2 or libnm-glib.so.4 bumps soname version IUSE="avahi bluetooth connection-sharing consolekit dhclient +dhcpcd gnutls +introspection kernel_linux +nss +modemmanager +ppp resolvconf systemd test vala +wext +wifi" # wimax KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~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.94 >=dev-libs/glib-2.30 >=dev-libs/libnl-3.2.7:3= >=sys-auth/polkit-0.106 >=net-libs/libsoup-2.26:2.4= >=virtual/udev-165[gudev] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi:=[autoipd] ) connection-sharing? ( net-dns/dnsmasq[dhcp] net-firewall/iptables ) gnutls? ( dev-libs/libgcrypt:0= net-libs/gnutls:= ) modemmanager? ( >=net-misc/modemmanager-0.7.991 ) 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] ) resolvconf? ( net-dns/openresolv ) systemd? ( >=sys-apps/systemd-183:0= ) || ( 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? ( dev-lang/python:2.7 dev-python/dbus-python[python_targets_python2_7] dev-python/pygobject:2[python_targets_python2_7] ) " 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 http://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 http://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." # Bug #402085, https://bugzilla.gnome.org/show_bug.cgi?id=387832 epatch "${FILESDIR}/${PN}-0.9.8.4-pre-sleep.patch" # https://www.mail-archive.com/networkmanager-list@gnome.org/msg24038.html epatch "${FILESDIR}/${PN}-0.9.8.9-fix-crash-on-wifi-rescan.patch" # Use python2.7 shebangs for test scripts sed -e 's@\(^#!.*python\)@\12.7@' \ -i */tests/*.py || die # Fix completiondir, avoid eautoreconf, bug #465100 sed -i "s|^completiondir =.*|completiondir = $(get_bashcompdir)|" \ cli/completion/Makefile.in || die "sed completiondir failed" ## Force use of /run, avoid eautoreconf 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 } src_configure() { # TODO: enable wimax when we have a libnl:3 compatible revision of it # We are not ready for bluez5 yet econf \ --enable-bluez4 \ --disable-more-warnings \ --disable-static \ --localstatedir=/var \ $(usex systemd '--disable-ifnet' '--enable-ifnet') \ --without-netconfig \ --with-dbus-sys-dir=/etc/dbus-1/system.d \ --with-udev-dir="$(udev_get_udevdir)" \ --with-iptables=/sbin/iptables \ --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 introspection) \ $(use_enable ppp) \ --disable-wimax \ $(use_with dhclient) \ $(use_with dhcpcd) \ $(use_with modemmanager modem-manager-1) \ $(use_with resolvconf) \ $(use_enable test tests) \ $(use_enable vala) \ $(use_with wext) \ "$(systemd_with_unitdir)" } src_test() { # bug #???? cp libnm-util/tests/certs/test_ca_cert.pem src/settings/plugins/ifnet/tests/ || die Xemake check } src_install() { default readme.gentoo_create_doc # Gentoo init script newinitd "${FILESDIR}/init.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 # Default conf.d file newconfd "${FILESDIR}/conf.d.NetworkManager" NetworkManager # Add keyfile plugin support keepdir /etc/NetworkManager/system-connections chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765 if ! use systemd; then insinto /etc/NetworkManager newins "${FILESDIR}/nm-system-settings.conf-ifnet" NetworkManager.conf fi # 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" prune_libtool_files --modules } 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 if use systemd; then if [[ ${REPLACING_VERSIONS} < 0.9.8.6 ]]; 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." fi if [[ -e "${EROOT}etc/NetworkManager/NetworkManager.conf" ]]; then if grep -q plugins "${EROOT}etc/NetworkManager/NetworkManager.conf" | grep -q ifnet; then ewarn "You seem to use 'ifnet' plugin in ${EROOT}etc/NetworkManager/NetworkManager.conf" ewarn "Since it won't be used when running under Systemd, you will need to stop setting" ewarn "ifnet plugin there to allow NetworkManager to work." fi fi fi }
