diff options
author | Daniel Gryniewicz <dang@gentoo.org> | 2010-03-30 15:37:22 +0000 |
---|---|---|
committer | Daniel Gryniewicz <dang@gentoo.org> | 2010-03-30 15:37:22 +0000 |
commit | 175d7c073a7cae1ec36a97a90753008e975e1ac6 (patch) | |
tree | b4dc43e554f09cdb6d8164bc43d362b949ad814f /net-misc/networkmanager | |
parent | Version bump. (diff) | |
download | gentoo-2-175d7c073a7cae1ec36a97a90753008e975e1ac6.tar.gz gentoo-2-175d7c073a7cae1ec36a97a90753008e975e1ac6.tar.bz2 gentoo-2-175d7c073a7cae1ec36a97a90753008e975e1ac6.zip |
Add VPN.Plugin to at_console; bug #294992
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'net-misc/networkmanager')
-rw-r--r-- | net-misc/networkmanager/ChangeLog | 9 | ||||
-rw-r--r-- | net-misc/networkmanager/files/networkmanager-0.8-confchanges.patch | 19 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-0.8-r1.ebuild | 128 |
3 files changed, 155 insertions, 1 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/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"' +} |