From fefdd617a647e0a8286b038e77430beedde6d1f9 Mon Sep 17 00:00:00 2001 From: Stephen Klimaszewski Date: Sun, 10 Feb 2008 01:07:55 +0000 Subject: Bump NetworkManager, this should fix the issue of NM dying when plugging in an ethernet device while a wireless one is active. Package-Manager: portage-2.1.4.1 --- net-misc/networkmanager/ChangeLog | 9 +- net-misc/networkmanager/Manifest | 6 +- .../networkmanager-0.6.5_p20080130.ebuild | 96 ---------------------- .../networkmanager-0.6.5_p20080205.ebuild | 96 ++++++++++++++++++++++ 4 files changed, 107 insertions(+), 100 deletions(-) delete mode 100644 net-misc/networkmanager/networkmanager-0.6.5_p20080130.ebuild create mode 100644 net-misc/networkmanager/networkmanager-0.6.5_p20080205.ebuild (limited to 'net-misc/networkmanager') diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index 00da7c1c1cd5..45a13aca9a12 100644 --- a/net-misc/networkmanager/ChangeLog +++ b/net-misc/networkmanager/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for net-misc/networkmanager # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.26 2008/02/04 22:34:02 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.27 2008/02/10 01:07:55 steev Exp $ + +*networkmanager-0.6.5_p20080205 (10 Feb 2008) + + 10 Feb 2008; Steev Klimaszewski + -networkmanager-0.6.5_p20080130.ebuild, + +networkmanager-0.6.5_p20080205.ebuild: + Bump NetworkManager snapshot 04 Feb 2008; Steev Klimaszewski networkmanager-0.6.5_p20070823.ebuild: diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 962145b66f2a..7a3370afe1a8 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -4,9 +4,9 @@ AUX networkmanager-resolvconf-perms.patch 532 RMD160 453ce19560e1872d1da1fa48e0c AUX networkmanager-updatedbackend.patch 17700 RMD160 685132b4a98843416264f06c480ff205fa87f789 SHA1 a83d2b0ea7e4a563af3d14567ba1da3605fbf654 SHA256 ee4a1583db867fd6a1851a9dd243401166f29ee9d00ad6e03e5b677915e5bf43 AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 SHA1 a9e269c9021888ca058b9fb72f9a71dc25a7488b SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402 DIST NetworkManager-0.6.5_p20070823.tar.gz 956975 RMD160 9d8556e3b5fc3155632bafdb726a5861412ae94b SHA1 c1d795cf114d2f5951a746eb4aa770e54eece9b6 SHA256 e6181ac9aadf1c36a20b979d313cfd0ae947bcf93f61c1c028cc1642c216454c -DIST NetworkManager-0.6.5_p20080130.tar.gz 993127 RMD160 eed10709c2d11fbcd5cc542bb49cacf0307f5d2d SHA1 d1eb43f403a4b25724dce74c9ee499594a1c8c0f SHA256 917342e4cb28b784f8db186dcb2bc7c63c9e3bb7cf8b44725b6582aa066d31c5 +DIST NetworkManager-0.6.5_p20080205.tar.gz 993199 RMD160 fcc8e2310da806e0603340d8acf79d5a7891048b SHA1 502f9fb1d3936a90c4ec01c71ca4b49687bd5e31 SHA256 30f3aec4f21c85190111535f69c35d6b8b0a393c63f767ff1ce869513f725b44 DIST networkmanager-0.6.5_p20070823-updatedbackend.patch.bz2 5006 RMD160 f35c35a3db8dbd3178c8325a4eb8a641653a85f0 SHA1 5f9a3b1d85e4a08fa242ab1ff73c6d08ec2791d8 SHA256 0ee0ee38a3e5ac1f501d83dd424dd95e69871dd9e7d67cf2e09e9a378ae10fa8 EBUILD networkmanager-0.6.5_p20070823.ebuild 2690 RMD160 2a4ec5ea7d7312cf435fd545c16ea1547f995d7b SHA1 8688a390034902027360d74e47161e7182e71dbd SHA256 144452f9180c8ffad3a32605835e908048c6b935fa21df5b78dcdfe6f5a3614a -EBUILD networkmanager-0.6.5_p20080130.ebuild 2889 RMD160 1300d9f983645aff56f8d25befc04d4caf50d266 SHA1 9130be5d9b44e3f1922eded8ea78c2fcc0205971 SHA256 c04eb13c330f397719282c940bbc85ea086937d1a7d943a88ca7e1c0b6e7c140 -MISC ChangeLog 5876 RMD160 4810bf605596b35de4d425f498922577ae4cdcae SHA1 d02179f5c4539880373d1a6198e221c3b70af055 SHA256 30b2b5a2d29fb16be677550f6294b6fd27d0626d2470e45dc440d7329ea1937d +EBUILD networkmanager-0.6.5_p20080205.ebuild 2889 RMD160 a558caa0a91b61b25f634d74993dd8427a49236d SHA1 41d34b1f82880b105b26f85347fbe9882e176c7e SHA256 c10ec5ba44ddfc2214d6b0aa0b0616c36c16b5830314610db60e9e565e4fdb6e +MISC ChangeLog 6092 RMD160 78c44eb7ffffaa77a1621fadeb7958ca2cdb5d14 SHA1 25093c8a0ae89ee2a19a8c05d343e3524d128bb3 SHA256 5736f8289bd7eec4946b8bf3f0f00fe1d62b91df14f17161a286831215e1ea6c MISC metadata.xml 352 RMD160 dc1d33b6866b7a51fd60cc8508668cb80ccdf797 SHA1 401add51065c746c71da8b5992874c0556cedc04 SHA256 c5b303e6d5dbe90d34284c51a1c7ea8015e87c41d6f63446a1bf7ba5daf0d26d diff --git a/net-misc/networkmanager/networkmanager-0.6.5_p20080130.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20080130.ebuild deleted file mode 100644 index 80e4d8f5bfd0..000000000000 --- a/net-misc/networkmanager/networkmanager-0.6.5_p20080130.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20080130.ebuild,v 1.2 2008/02/02 07:37:39 steev Exp $ - -inherit gnome2 eutils - -# NetworkManager likes itself with capital letters -MY_P=${P/networkmanager/NetworkManager} - -DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." -HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" -# Snapshot from SVN, hosted by steev -SRC_URI="http://steev.net/files/distfiles/${MY_P}.tar.gz - mirror://gentoo/${PN}-0.6.5_p20070823-updatedbackend.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="crypt doc gnome" - -# Yes, I know that configure will accept libnl 1.0-pre8, however we only have -# 1.1 in the tree, therefore dep on it. -RDEPEND=">=sys-apps/dbus-0.60 - >=sys-apps/hal-0.5.10 - sys-apps/iproute2 - >=dev-libs/libnl-1.1 - >=net-misc/dhcdbd-1.4 - >=net-wireless/wireless-tools-28_pre9 - >=net-wireless/wpa_supplicant-0.4.8 - >=dev-libs/glib-2.8 - >=x11-libs/libnotify-0.3.2 - gnome? ( >=x11-libs/gtk+-2.8 - >=gnome-base/libglade-2 - >=gnome-base/gnome-keyring-0.4 - >=gnome-base/gnome-panel-2 - >=gnome-base/gconf-2 - >=gnome-base/libgnomeui-2 ) - crypt? ( dev-libs/libgcrypt )" -DEPEND="${RDEPEND} - dev-util/pkgconfig - dev-util/intltool" -PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.6.5 )" - -DOCS="AUTHORS ChangeLog NEWS README" -USE_DESTDIR="1" - -G2CONF="${G2CONF} \ - `use_with crypt gcrypt` \ - `use_with gnome` \ - --disable-more-warnings \ - --localstatedir=/var \ - --with-distro=gentoo \ - --with-dbus-sys=/etc/dbus-1/system.d" - -S=${WORKDIR}/NetworkManager-0.6.5 - -pkg_setup() { - if built_with_use sys-apps/iproute2 minimal ; then - eerror "Please rebuild sys-apps/iproute2 without the minimal useflag." - die "Fix iproute2 first." - fi -} - -src_unpack () { - unpack ${A} - cd "${S}" - - # Update to use our backend - epatch "${WORKDIR}/${PN}-0.6.5_p20070823-updatedbackend.patch" - # Use the kernel headers - epatch "${FILESDIR}/${PN}-use-kernel-headers.patch" - # Fix the resolv.conf permissions - epatch "${FILESDIR}/${PN}-resolvconf-perms.patch" - # Fix up the dbus conf file to use plugdev group - epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch" -} - -src_install() { - gnome2_src_install - # Need to keep the /var/run/NetworkManager directory - keepdir /var/run/NetworkManager - newinitd "${FILESDIR}/NetworkManagerDispatcher" NetworkManagerDispatcher -} - -pkg_postinst() { - gnome2_icon_cache_update - elog "You need to be in the plugdev group in order to use NetworkManager" - elog "Problems with your hostname getting changed?" - elog "" - elog "Add the following to /etc/dhcp/dhclient.conf" - elog 'send host-name "YOURHOSTNAME";' - elog 'supersede host-name "YOURHOSTNAME";' - - elog "You will need to restart DBUS if this is your first time" - elog "installing NetworkManager." -} diff --git a/net-misc/networkmanager/networkmanager-0.6.5_p20080205.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20080205.ebuild new file mode 100644 index 000000000000..88be26d10094 --- /dev/null +++ b/net-misc/networkmanager/networkmanager-0.6.5_p20080205.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20080205.ebuild,v 1.1 2008/02/10 01:07:55 steev Exp $ + +inherit gnome2 eutils + +# NetworkManager likes itself with capital letters +MY_P=${P/networkmanager/NetworkManager} + +DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent." +HOMEPAGE="http://www.gnome.org/projects/NetworkManager/" +# Snapshot from SVN, hosted by steev +SRC_URI="http://steev.net/files/distfiles/${MY_P}.tar.gz + mirror://gentoo/${PN}-0.6.5_p20070823-updatedbackend.patch.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="crypt doc gnome" + +# Yes, I know that configure will accept libnl 1.0-pre8, however we only have +# 1.1 in the tree, therefore dep on it. +RDEPEND=">=sys-apps/dbus-0.60 + >=sys-apps/hal-0.5.10 + sys-apps/iproute2 + >=dev-libs/libnl-1.1 + >=net-misc/dhcdbd-1.4 + >=net-wireless/wireless-tools-28_pre9 + >=net-wireless/wpa_supplicant-0.4.8 + >=dev-libs/glib-2.8 + >=x11-libs/libnotify-0.3.2 + gnome? ( >=x11-libs/gtk+-2.8 + >=gnome-base/libglade-2 + >=gnome-base/gnome-keyring-0.4 + >=gnome-base/gnome-panel-2 + >=gnome-base/gconf-2 + >=gnome-base/libgnomeui-2 ) + crypt? ( dev-libs/libgcrypt )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + dev-util/intltool" +PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.6.5 )" + +DOCS="AUTHORS ChangeLog NEWS README" +USE_DESTDIR="1" + +G2CONF="${G2CONF} \ + `use_with crypt gcrypt` \ + `use_with gnome` \ + --disable-more-warnings \ + --localstatedir=/var \ + --with-distro=gentoo \ + --with-dbus-sys=/etc/dbus-1/system.d" + +S=${WORKDIR}/NetworkManager-0.6.5 + +pkg_setup() { + if built_with_use sys-apps/iproute2 minimal ; then + eerror "Please rebuild sys-apps/iproute2 without the minimal useflag." + die "Fix iproute2 first." + fi +} + +src_unpack () { + unpack ${A} + cd "${S}" + + # Update to use our backend + epatch "${WORKDIR}/${PN}-0.6.5_p20070823-updatedbackend.patch" + # Use the kernel headers + epatch "${FILESDIR}/${PN}-use-kernel-headers.patch" + # Fix the resolv.conf permissions + epatch "${FILESDIR}/${PN}-resolvconf-perms.patch" + # Fix up the dbus conf file to use plugdev group + epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch" +} + +src_install() { + gnome2_src_install + # Need to keep the /var/run/NetworkManager directory + keepdir /var/run/NetworkManager + newinitd "${FILESDIR}/NetworkManagerDispatcher" NetworkManagerDispatcher +} + +pkg_postinst() { + gnome2_icon_cache_update + elog "You need to be in the plugdev group in order to use NetworkManager" + elog "Problems with your hostname getting changed?" + elog "" + elog "Add the following to /etc/dhcp/dhclient.conf" + elog 'send host-name "YOURHOSTNAME";' + elog 'supersede host-name "YOURHOSTNAME";' + + elog "You will need to restart DBUS if this is your first time" + elog "installing NetworkManager." +} -- cgit v1.2.3-65-gdbad