sablink/sablink-distro
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bumping nm with fixed staticIP patch

Browse Source 
git-svn-id: http://svn.sabayonlinux.org/overlay@776 d7aec97c-591d-0410-af39-a8856400b30a
This commit is contained in:
debatem1
2007-01-24 06:02:42 +00:00
parent 07a9c4d92d
commit f93ec1df6c
4 changed files with 164 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net-misc/networkmanager/Manifest
+11
View File
@@ -46,6 +46,10 @@ AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b8
MD5 e9879921dd5b0669337e27ca2196cfd4 files/networkmanager-use-kernel-headers.patch 466
RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 files/networkmanager-use-kernel-headers.patch 466
SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402 files/networkmanager-use-kernel-headers.patch 466
AUX nm-dhcp-manager.c.patch 1284 RMD160 b9b7bae215a86ba524afdea4c728775ae2e277f1 SHA1 47e7b720bf6fc9c565de3b565c0195dd25d7a27e SHA256 a7ce5aabb73b4aea180cfad9442d9295be12fde1e8c9a26ef3d8921018c7ce12
MD5 3173009c0f3c347e7bc2da2efa3237e3 files/nm-dhcp-manager.c.patch 1284
RMD160 b9b7bae215a86ba524afdea4c728775ae2e277f1 files/nm-dhcp-manager.c.patch 1284
SHA256 a7ce5aabb73b4aea180cfad9442d9295be12fde1e8c9a26ef3d8921018c7ce12 files/nm-dhcp-manager.c.patch 1284
DIST NetworkManager-0.6.4_pre20061028.tar.bz2 1780993 RMD160 eef9c8fedaacba413b833b98ee56af5bd74ada2b SHA1 ddbdb4579908f2ce73ee9c6ce31b79fd4082e8a6 SHA256 4a7114367d0f14eeaee094e3c08bfb728a175fd23ac6b97a5868aa734011583c
EBUILD networkmanager-0.6.4_pre20061223.ebuild 3296 RMD160 393f83343f8e2a84c6efed8d5ccfbd55f3d78a09 SHA1 b058553d5579217022b8f9aea9e84f108ad4dde0 SHA256 4002a6b3e22de2f47c2cd480cd55f67a1d79c99866e3992f1bb8fe2efecc8f5f
MD5 f12904aab82e3236068ef61160598981 networkmanager-0.6.4_pre20061223.ebuild 3296
@@ -55,9 +59,16 @@ EBUILD networkmanager-0.6.4_pre20070122-r1.ebuild 3461 RMD160 b7df2c77f1cc640bd1
MD5 d5de57910eaabd081e6451329e1d54b7 networkmanager-0.6.4_pre20070122-r1.ebuild 3461
RMD160 b7df2c77f1cc640bd1ce6556a83749807c2adbb4 networkmanager-0.6.4_pre20070122-r1.ebuild 3461
SHA256 b8460d116d55410a52babb6a262af3fa978161bb07a5318393b57479c83e4c37 networkmanager-0.6.4_pre20070122-r1.ebuild 3461
EBUILD networkmanager-0.6.4_pre20070122-r2.ebuild 3452 RMD160 63b625b928989b03640b467d301395a7b20b3da1 SHA1 0a658fcabf203632fdf50aab3318d49acac191a0 SHA256 9e4edb862953f0ac2309fbb1623f43d1a8197e1ac05183a136bc106f5d4268ec
MD5 d0d852b5264a1f45b1103b902fc1adc6 networkmanager-0.6.4_pre20070122-r2.ebuild 3452
RMD160 63b625b928989b03640b467d301395a7b20b3da1 networkmanager-0.6.4_pre20070122-r2.ebuild 3452
SHA256 9e4edb862953f0ac2309fbb1623f43d1a8197e1ac05183a136bc106f5d4268ec networkmanager-0.6.4_pre20070122-r2.ebuild 3452
MD5 25e40b69e15e1d17224bf3a584bd3038 files/digest-networkmanager-0.6.4_pre20061223 304
RMD160 991b9fdcb07c2cc321db6e8c26cb5860b9905844 files/digest-networkmanager-0.6.4_pre20061223 304
SHA256 f06e1d714c3ceb634d637c0927c02176da3f4144d7fafb66ab646562102d43f7 files/digest-networkmanager-0.6.4_pre20061223 304
MD5 25e40b69e15e1d17224bf3a584bd3038 files/digest-networkmanager-0.6.4_pre20070122-r1 304
RMD160 991b9fdcb07c2cc321db6e8c26cb5860b9905844 files/digest-networkmanager-0.6.4_pre20070122-r1 304
SHA256 f06e1d714c3ceb634d637c0927c02176da3f4144d7fafb66ab646562102d43f7 files/digest-networkmanager-0.6.4_pre20070122-r1 304
MD5 25e40b69e15e1d17224bf3a584bd3038 files/digest-networkmanager-0.6.4_pre20070122-r2 304
RMD160 991b9fdcb07c2cc321db6e8c26cb5860b9905844 files/digest-networkmanager-0.6.4_pre20070122-r2 304
SHA256 f06e1d714c3ceb634d637c0927c02176da3f4144d7fafb66ab646562102d43f7 files/digest-networkmanager-0.6.4_pre20070122-r2 304
net-misc/networkmanager/files/digest-networkmanager-0.6.4_pre20070122-r2
+3
View File
@@ -0,0 +1,3 @@
MD5 730d6a1b66ff007c2cb52e29d7104f0c NetworkManager-0.6.4_pre20061028.tar.bz2 1780993
RMD160 eef9c8fedaacba413b833b98ee56af5bd74ada2b NetworkManager-0.6.4_pre20061028.tar.bz2 1780993
SHA256 4a7114367d0f14eeaee094e3c08bfb728a175fd23ac6b97a5868aa734011583c NetworkManager-0.6.4_pre20061028.tar.bz2 1780993
net-misc/networkmanager/files/nm-dhcp-manager.c.patch
+33
View File
@@ -0,0 +1,33 @@
--- NetworkManager-0.6.4/src/dhcp-manager/nm-dhcp-manager.c 2006-03-29 14:03:02.000000000 -0500
+++ fixed-nm-dhcp-manager.c 2007-01-23 18:33:14.000000000 -0500
@@ -604,7 +604,7 @@
case DHCDBD_REBIND:
return "rebind";
case DHCDBD_TIMEOUT:
- return "timeout";
+ return "bound";
case DHCDBD_FAIL:
return "fail";
case DHCDBD_START:
@@ -681,14 +681,14 @@
}
break;
- case DHCDBD_TIMEOUT: /* timed out contacting DHCP server */
- if (nm_act_request_get_stage (req) == NM_ACT_STAGE_IP_CONFIG_START)
- {
- nm_device_activate_schedule_stage4_ip_config_timeout (req);
- remove_timeout (manager, req);
+ case DHCDBD_TIMEOUT: /* timed out contacting DHCP server */
+ nm_info ("Static IP override");
+ state = DHCDBD_BOUND;
+ if (nm_act_request_get_stage (req) == NM_ACT_STAGE_IP_CONFIG_START) {
+ nm_device_activate_schedule_stage4_ip_config_get (req);
+ remove_timeout (manager, req);
}
- break;
-
+ break;
case DHCDBD_FAIL: /* all attempts to contact server timed out, sleeping */
case DHCDBD_ABEND: /* dhclient exited abnormally */
// case DHCDBD_END: /* dhclient exited normally */
net-misc/networkmanager/networkmanager-0.6.4_pre20070122-r2.ebuild
+117
View File
@@ -0,0 +1,117 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.4_pre20061028.ebuild,v 1.2 2006/11/05 01:36:44 steev Exp $
inherit gnome2 eutils
DESCRIPTION="Network configuration and management in an easy way. Desktop env independent"
HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
SRC_URI="http://dev.gentoo.org/~metalgod/files/NetworkManager-0.6.4_pre20061028.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="crypt doc gnome"
RDEPEND=">=sys-apps/dbus-0.60
>=sys-apps/hal-0.5
sys-apps/iproute2
>=dev-libs/libnl-1.0_pre6
net-misc/dhcdbd
>=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"
S=${WORKDIR}/NetworkManager
DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
USE_DESTDIR="1"
src_unpack () {
unpack ${A}
cd ${S}
epatch ${FILESDIR}/${PN}-updatedbackend.patch
epatch ${FILESDIR}/${PN}-use-kernel-headers.patch
epatch ${FILESDIR}/${PN}-resolvconf-perms.patch
epatch ${FILESDIR}/${PN}-0.6.4-gentooinitscript.patch
epatch ${FILESDIR}/${PN}-0.6.4-confchanges.patch
# Adds support for knm to utilize static IP and "profiles"
# THIS PATCH BREAKS COMPILATION !!!!!!!!!!!!!!!!
epatch ${FILESDIR}/nm-dhcp-manager.c.patch
# From the Mailing list, while we're waiting for a version bump
epatch ${FILESDIR}/${PN}-0.6.4-fix-various-memleaks.patch
epatch ${FILESDIR}/${PN}-0.6.4-fix-nm-applet-memleaks.patch
# Dbus 1.0 support
epatch ${FILESDIR}/${PN}-0.6.4-dbus-1.0.patch
# Fix possible early-xdm related problem
epatch ${FILESDIR}/networkmanager-0.6.4-force-before-xdm.patch
# Fix possible associations problems
epatch ${FILESDIR}/networkmanager-0.6.4-high-delay.patch
# Add some workarounds for various drivers
epatch ${FILESDIR}/networkmanager-0.6.4-wireless-drivers-workarounds.patch
}
src_compile() {
G2CONF="${G2CONF} \
`use_with crypt gcrypt` \
--disable-more-warnings \
--localstatedir=/var \
--with-distro=gentoo \
--with-dbus-sys=/etc/dbus-1/system.d"
if use gnome; then
G2CONF="${G2CONF} --enable-notification-icon"
else
G2CONF="${G2CONF} --without-gnome"
fi
gnome2_src_compile
}
src_install() {
gnome2_src_install
keepdir /var/run/NetworkManager
}
pkg_postinst() {
gnome2_icon_cache_update
einfo
einfo "NetworkManager doesn't work with all wifi devices"
einfo "to see if your card is supported please visit"
einfo "http://live.gnome.org/NetworkManagerHardware"
einfo
einfo "You can use NetworkManager instead of baselayout"
einfo "to manage your networks but you are advised to use"
einfo "baselayout because NetworkManager is beta software"
einfo "and don't work fully as expected."
einfo
einfo "If it's the first time you run NetworkManager please"
einfo "restart dbus doing /etc/init.d/dbus restart"
einfo
einfo "To use NetworkManager disable all entries on runlevels"
einfo "net.***X and run /etc/init.d/NetworkManager"
einfo "you can add to runlevels writing on your terminal"
einfo "rc-update add NetworkManager default"
einfo
ebeep
}