Add VPN.Plugin to at_console; bug #294992

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 161 insertions, 5 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 920d03827c23..f6b84c4ce26f 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.70 2010/03/10 08:59:02 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.71 2010/03/30 15:37:22 dang Exp $
+
+*networkmanager-0.8-r1 (30 Mar 2010)
+
+  30 Mar 2010; Daniel Gryniewicz <dang@gentoo.org>
+  +networkmanager-0.8-r1.ebuild,
+  +files/networkmanager-0.8-confchanges.patch:
+  Add VPN.Plugin to at_console; bug #294992
 
   10 Mar 2010; Joseph Jezak <josejx@gentoo.org> networkmanager-0.8.ebuild:
   Marked ~ppc/~ppc64 for bug #296548.
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index e66597ea4160..13d4a7021d40 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -7,6 +7,7 @@ AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382
 AUX networkmanager-0.7.0-gentoo-dhclient.patch 956 RMD160 7d7cb94256350c92e95d9adcf57cc891a84cc086 SHA1 95663877b428803bdbb540cda6effe5a29dda9c5 SHA256 da9c943969ad22a9ad465efc914644c7a6c600c0c88b8b2a8b8807ff05e5f7ae
 AUX networkmanager-0.7.1-bad-link.patch 655 RMD160 24a431665b604d111a9b10efa33ff066a4363aad SHA1 9de1073f681623cb156444fed53c19d03e06076d SHA256 92bf60b9a10d804d0c295e73f8525bce67e9d6e36dc7ccf5468243c21183c113
 AUX networkmanager-0.7.1-confchanges.patch 968 RMD160 7216f028613a29cf619029db3178cb0510aa3c1b SHA1 d818ddeb553862e18f0f796dcf30e53e25af0bd4 SHA256 5032ffd7fddbd9f67ef05ee0159f77e67b8c08b1aac9ef5209363fb02297d437
+AUX networkmanager-0.8-confchanges.patch 1063 RMD160 25a0d45410fa5590098386556e9947dd15507eda SHA1 ba6eaa63188f97f93bbbb327676d8104bbf7e8c8 SHA256 9fcbe0b9ab4cc38c9057a0dde2f5153efc12515ed4d28920a455dad7fc2b1e09
 AUX networkmanager-0.8-nscd-clear-cache.patch 1214 RMD160 2381f455593202a740e634601c0ba8245ecb8fac SHA1 b4a0cec446b6f8fa81c06d5992db61b296f17057 SHA256 2d981bafa96607acb06740d78b8e33afdc675c52b0cf3ce5b098c67566362c99
 AUX networkmanager-0.8-read-hostname.patch 2380 RMD160 8b4349293235d2b63546b4e65d30a94d91ab9a04 SHA1 f7d57c686e9bd1f1ac58e67efcd8255c0fc9a5c5 SHA256 5ee07a0fb949c7ce299f0d2459c4f9840ace765308cd1a208d89eecec51a63fe
 AUX networkmanager-resolvconf-perms.patch 532 RMD160 453ce19560e1872d1da1fa48e0c9a365025e6b1b SHA1 a81be4e9c9bac854e092b82529c4ae2c12cdf91c SHA256 e1786f34a75d2e0a27ceccb960cf975176260886f70cc3e9b172180f8a1d2e6e
@@ -24,13 +25,14 @@ EBUILD networkmanager-0.7.1-r3.ebuild 4258 RMD160 c6b0326c2080c2b9ce2b38d3fbfa9a
 EBUILD networkmanager-0.7.1-r6.ebuild 4033 RMD160 a0629b415c2cbcc2de8569dac2c67552a61d03d4 SHA1 5f1c4fa2d71818685a7dc0c1fdc3bfdab392df8d SHA256 7602f8b235552c2be536cb41bc60a3095cc86fe4754dd0ac141f294770607f98
 EBUILD networkmanager-0.7.1_p20090824.ebuild 3867 RMD160 1d39ff7fdd486ffa1a5914e5afdbc2b17abaa546 SHA1 5dbe17ece7800176fa7c2fd77e2c631eb696d17e SHA256 f9f4ef9115d43d94f080d426229b0cca840cb8606605915052636d50137b3925
 EBUILD networkmanager-0.7.2.ebuild 3707 RMD160 18fe37ad670fe2a39422502963ec2cf0c710b73d SHA1 68701111f54980fb1a66596b35700e9b73060391 SHA256 fcc749b95097b7e69ff913c4db82378f367097912c90bf5e4ba75774d82ed5ab
+EBUILD networkmanager-0.8-r1.ebuild 3710 RMD160 5aa041431a73df3914fa1f2c4a219864e849a98f SHA1 ba66a1fcf5651c924d344720839f7af360a6a972 SHA256 201427b635e960b46a9a9db259a8d491514ada69d6c4f2fb484b39cb846df2a2
 EBUILD networkmanager-0.8.ebuild 3711 RMD160 f7cda9d0a386b9e409923d76ca1657cc8fa7942f SHA1 97624cd6ec29e09663f4cc6360a371e181704afb SHA256 acf8f441d94d748dcd38c891ec14d9e967910ef5bddd5a8eca43ebaf18a521f2
-MISC ChangeLog 14510 RMD160 def98cdcb7a24c045fd13d1896e7116ee7025f20 SHA1 08e6713e58bb2d260d259fe392c9df4b2f10f4fc SHA256 8c3115ddf9e21b20643132e0085985c86a68c366bee64e63aa90b3bcd8d5d8c1
+MISC ChangeLog 14722 RMD160 7c7c33338b6344661e2e846ccd2274cbbcad052c SHA1 b570b8e44286b2774c556f6affc0ec0d9d09790d SHA256 9498e3cb3518c7283d0d2464ccbe4e73ee53e6cf2a83a61ddde7a81810686f33
 MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAkuXX0EACgkQcsIHjyDViGShPgCgm0oi4pT399QZgC9tlvSRHLJ3
-VlYAn3mzn1fJl1yptnKIvm95E1x4CHJC
-=rHoR
+iEYEARECAAYFAkuyGqoACgkQomPajV0RnrFNvwCeMc6JQFNt2RgT69/d5TsIEsVA
+3fsAn23WUkHYLCgF8pU94WlMcKRifs1X
+=MC4o
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/networkmanager-0.8-confchanges.patch b/net-misc/networkmanager/files/networkmanager-0.8-confchanges.patch
new file mode 100644
index 000000000000..039a074f724f
--- /dev/null
+++ b/net-misc/networkmanager/files/networkmanager-0.8-confchanges.patch
@@ -0,0 +1,19 @@
+diff '--exclude-from=/home/dang/.scripts/diffrc' -up -ruN NetworkManager-0.8.orig/src/NetworkManager.conf NetworkManager-0.8/src/NetworkManager.conf
+--- NetworkManager-0.8.orig/src/NetworkManager.conf	2010-02-18 10:47:45.000000000 -0500
++++ NetworkManager-0.8/src/NetworkManager.conf	2010-03-30 11:27:27.751522916 -0400
+@@ -56,6 +56,15 @@
+ 
+                 <allow send_destination="org.freedesktop.NetworkManager"
+                        send_interface="org.freedesktop.NetworkManager.VPN.Connection"/>
++
++                <allow send_destination="org.freedesktop.NetworkManager"
++                       send_interface="org.freedesktop.NetworkManager.VPN.Plugin"/>
++        </policy>
++        <policy group="plugdev">
++                <allow send_destination="org.freedesktop.NetworkManager"/>
++
++                <deny send_destination="org.freedesktop.NetworkManager"
++                      send_interface="org.freedesktop.NetworkManager.PPP"/>
+         </policy>
+         <policy context="default">
+                 <deny own="org.freedesktop.NetworkManager"/>
diff --git a/net-misc/networkmanager/networkmanager-0.8-r1.ebuild b/net-misc/networkmanager/networkmanager-0.8-r1.ebuild
new file mode 100644
index 000000000000..fcf7361fb0d9
--- /dev/null
+++ b/net-misc/networkmanager/networkmanager-0.8-r1.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8-r1.ebuild,v 1.1 2010/03/30 15:37:22 dang Exp $
+
+EAPI="2"
+
+inherit gnome.org eutils
+
+# NetworkManager likes itself with capital letters
+MY_PN=${PN/networkmanager/NetworkManager}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
+HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
+SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd resolvconf connection-sharing"
+
+RDEPEND=">=sys-apps/dbus-1.2
+	>=dev-libs/dbus-glib-0.75
+	>=net-wireless/wireless-tools-28_pre9
+	>=sys-fs/udev-145[extras]
+	>=dev-libs/glib-2.18
+	>=sys-auth/polkit-0.92
+	>=dev-libs/libnl-1.1
+	>=net-misc/modemmanager-0.2
+	>=net-wireless/wpa_supplicant-0.5.10[dbus]
+	bluetooth? ( net-wireless/bluez )
+	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
+	avahi? ( net-dns/avahi[autoipd] )
+	gnutls? (
+		nss? ( >=dev-libs/nss-3.11 )
+		!nss? ( dev-libs/libgcrypt
+			net-libs/gnutls ) )
+	!gnutls? ( >=dev-libs/nss-3.11 )
+	dhclient? (
+		dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+		!dhcpcd? ( >=net-misc/dhcp-3.0.0 ) )
+	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
+	resolvconf? ( net-dns/openresolv )
+	connection-sharing? (
+		net-dns/dnsmasq
+		net-firewall/iptables )"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	net-dialup/ppp
+	doc? ( >=dev-util/gtk-doc-1.8 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# Fix up the dbus conf file to use plugdev group
+	epatch "${FILESDIR}/${PN}-0.8-confchanges.patch"
+
+	# Hack keyfile plugin to read hostname file, fixes bug 176873
+	epatch "${FILESDIR}/${P}-read-hostname.patch"
+
+	# Clear NSCD cache rather then kill daemon bug 301720
+	epatch "${FILESDIR}/${P}-nscd-clear-cache.patch"
+}
+
+src_configure() {
+	ECONF="--disable-more-warnings
+		--localstatedir=/var
+		--with-distro=gentoo
+		--with-dbus-sys-dir=/etc/dbus-1/system.d
+		--with-udev-dir=/etc/udev
+		--with-iptables=/sbin/iptables
+		$(use_enable doc gtk-doc)
+		$(use_with doc docs)
+		$(use_with resolvconf)"
+
+	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
+	if use dhclient ; then
+		if use dhcpcd ; then
+			ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+		else
+			ECONF="${ECONF} --with-dhcp-client=dhclient"
+		fi
+	else
+		ECONF="${ECONF} --with-dhcp-client=dhcpcd"
+	fi
+
+	# default is NSS (if none or both are specified), GnuTLS otherwise
+	if use gnutls ; then
+		if use nss ; then
+			ECONF="${ECONF} --with-crypto=nss"
+		else
+			ECONF="${ECONF} --with-crypto=gnutls"
+		fi
+	else
+		ECONF="${ECONF} --with-crypto=nss"
+	fi
+
+	econf ${ECONF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	# Need to keep the /var/run/NetworkManager directory
+	keepdir /var/run/NetworkManager
+
+	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
+	keepdir /etc/NetworkManager/dispatcher.d
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die "dodoc failed"
+
+	# Add keyfile plugin support
+	keepdir /etc/NetworkManager/system-connections
+	insinto /etc/NetworkManager
+	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
+		|| die "newins failed"
+}
+
+pkg_postinst() {
+	elog "You will need to restart DBUS if this is your first time"
+	elog "installing NetworkManager."
+	elog ""
+	elog "To save system-wide settings as a user, that user needs to have the"
+	elog "right policykit privileges. You can add them by running:"
+	elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify --user "USERNAME"'
+}