Version bump

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 367 insertions, 1 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 8a0d9e14dbf3..58b81d193587 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.221 2015/01/08 10:05:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.222 2015/01/10 14:51:52 pacho Exp $
+
+*networkmanager-1.0.0 (10 Jan 2015)
+
+  10 Jan 2015; Pacho Ramos <pacho@gentoo.org>
+  +files/networkmanager-1.0.0-find-helpers.patch,
+  +files/networkmanager-1.0.0-lto-switch.patch, +networkmanager-1.0.0.ebuild:
+  Version bump
 
   08 Jan 2015; Pacho Ramos <pacho@gentoo.org>
   networkmanager-0.9.10.1_pre20141101.ebuild:
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch
new file mode 100644
index 000000000000..a84909c8253e
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.0.0-find-helpers.patch
@@ -0,0 +1,23 @@
+From 6f643d2761650e53fd3b647526110a8473138b5d Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Thu, 8 Jan 2015 11:55:50 +0100
+Subject: core: add /bin to the default search path
+
+https://bugzilla.gnome.org/show_bug.cgi?id=742576
+(cherry picked from commit abbca50ca9d552a28eca792f12ec618df6128fff)
+
+diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c
+index 2c291cd..6747b65 100644
+--- a/src/NetworkManagerUtils.c
++++ b/src/NetworkManagerUtils.c
+@@ -814,6 +814,7 @@ const char *const NM_PATHS_DEFAULT[] = {
+ 	"/sbin/",
+ 	"/usr/sbin/",
+ 	"/usr/local/sbin/",
++	"/bin/",
+ 	"/usr/bin/",
+ 	"/usr/local/bin/",
+ 	NULL,
+-- 
+cgit v0.10.2
+
diff --git a/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch b/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch
new file mode 100644
index 000000000000..5d66c3393c71
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-1.0.0-lto-switch.patch
@@ -0,0 +1,36 @@
+From cda2802fe960737abb4623166ca4f75a63b5fe5a Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Thu, 8 Jan 2015 12:01:32 +0100
+Subject: build: fix --enable-lto configure option to allow disabling option
+ explicitly
+
+When specifying '--enable-lto=anything' or '--disable-lto',
+the configure script would always set enable_lto=yes.
+
+The only way to disable lto, was *not* specifying the
+configure option.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=742575
+(cherry picked from commit 6eccfda0face594f86dea495d2ed2546b0d37e77)
+
+diff --git a/configure.ac b/configure.ac
+index b6bf38e..b407686 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -821,10 +821,11 @@ AM_CONDITIONAL(BUILD_NMTUI, test "$build_nmtui" = yes)
+ 
+ NM_COMPILER_WARNINGS
+ 
+-AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]),
+-              [enable_lto=yes], [enable_lto=no])
++AC_ARG_ENABLE(lto, AS_HELP_STRING([--enable-lto], [Enable Link Time Optimization for smaller size (default: no)]))
+ if (test "${enable_lto}" = "yes"); then
+     CFLAGS="-flto $CFLAGS"
++else
++    enable_lto='no'
+ fi
+ 
+ 
+-- 
+cgit v0.10.2
+
diff --git a/net-misc/networkmanager/networkmanager-1.0.0.ebuild b/net-misc/networkmanager/networkmanager-1.0.0.ebuild
new file mode 100644
index 000000000000..6a8ad98be94b
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-1.0.0.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-1.0.0.ebuild,v 1.1 2015/01/10 14:51:52 pacho Exp $
+
+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 ~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
+	>=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/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 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."
+
+	# 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
+
+	# 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"
+
+	# 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
+}