diff options
author | Robert Piasek <dagger@gentoo.org> | 2010-08-23 11:44:36 +0000 |
---|---|---|
committer | Robert Piasek <dagger@gentoo.org> | 2010-08-23 11:44:36 +0000 |
commit | e1f62305b5d8e6338e3ed4c2d4f41985262f323f (patch) | |
tree | afa1593a28e343c4d619a38338b60fcc7656082f /net-misc/networkmanager | |
parent | Version bumps (diff) | |
download | historical-e1f62305b5d8e6338e3ed4c2d4f41985262f323f.tar.gz historical-e1f62305b5d8e6338e3ed4c2d4f41985262f323f.tar.bz2 historical-e1f62305b5d8e6338e3ed4c2d4f41985262f323f.zip |
Updated ifnet plugin. Added extra kernel checks.
Fixes bugs: #333257, #333639, #333785
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
Diffstat (limited to 'net-misc/networkmanager')
-rw-r--r-- | net-misc/networkmanager/ChangeLog | 9 | ||||
-rw-r--r-- | net-misc/networkmanager/Manifest | 6 | ||||
-rw-r--r-- | net-misc/networkmanager/networkmanager-0.8.1-r4.ebuild (renamed from net-misc/networkmanager/networkmanager-0.8.1-r3.ebuild) | 37 |
3 files changed, 43 insertions, 9 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index c4c0ab884edb..c3678c7bbf1b 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.81 2010/08/23 10:49:53 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.82 2010/08/23 11:44:36 dagger Exp $ + +*networkmanager-0.8.1-r4 (23 Aug 2010) + + 23 Aug 2010; Robert Piasek <dagger@gentoo.org> + -networkmanager-0.8.1-r3.ebuild, +networkmanager-0.8.1-r4.ebuild: + Updated ifnet plugin. Added extra kernel checks. + Fixes bugs: #333257, #333639, #333785 23 Aug 2010; Robert Piasek <dagger@gentoo.org> networkmanager-0.8-r1.ebuild, files/nm-system-settings.conf, diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index dcae542477c1..4ee122339baf 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -23,11 +23,11 @@ DIST NetworkManager-0.7.1.tar.bz2 1226975 RMD160 117677b5da4e66df0287e5a974c8070 DIST NetworkManager-0.7.2.tar.bz2 1315036 RMD160 b4cfe2cdb8df5a7ae7f6e7d580337e9cc9094e2b SHA1 0de68cb77698b4788f415b0361b48258f4734119 SHA256 8d6f47432ae372aaffdc78f056cec9e9fc6bb1547a454e0c1ad7d130a9198470 DIST NetworkManager-0.8.1.tar.bz2 1505134 RMD160 82f5ad1a641fa49acf34604f89154c865f3d5fbc SHA1 778989ed73cfd7ec05714f77121fa8bfc1bf0981 SHA256 dc126fbe3199d47899c4781e4fff32cee404dc7c728c6ade9eaa899bd80f19fa DIST NetworkManager-0.8.tar.bz2 1376044 RMD160 40074f52a79965510de816c0e94d1b9ac582c522 SHA1 fd290057a9246055fa59507b6a3d6b99ceb4c3dc SHA256 4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05 -DIST networkmanager-ifnet-308267b4.patch 263345 RMD160 ceefeacea0c2e6cedb4ded62b9628173c0a7c7db SHA1 1249e86d9ba1769160a8dcf8a2482c5f93f0fe63 SHA256 60b5d9a3604fd093d4cff2be806500bcaa59e1d69848aeea9d4f9f8aed26a11c +DIST networkmanager-ifnet-540e40f.patch 268068 RMD160 954ffb9915fdd8ae650963b66aba7e185ddfe0c6 SHA1 0bd0cfcb02a0511d17179d2994e40a663b49dd6f SHA256 8a870fb5ed708eea5523b954e23be05471c5b6783cd2d0a19071a1d253fcab51 EBUILD networkmanager-0.6.6.ebuild 2621 RMD160 7516ea6287cfe7c9b98e4f8e5203bf4b1642c8e6 SHA1 6dfc5a1e518e5b4b335a28ceeb248f8e1c639175 SHA256 8dce1c81ef039889d0bdd0ec9c18a3f3da14b42f20ba6ced5639808d6708bbe5 EBUILD networkmanager-0.7.1-r6.ebuild 4033 RMD160 a0629b415c2cbcc2de8569dac2c67552a61d03d4 SHA1 5f1c4fa2d71818685a7dc0c1fdc3bfdab392df8d SHA256 7602f8b235552c2be536cb41bc60a3095cc86fe4754dd0ac141f294770607f98 EBUILD networkmanager-0.7.2.ebuild 3707 RMD160 18fe37ad670fe2a39422502963ec2cf0c710b73d SHA1 68701111f54980fb1a66596b35700e9b73060391 SHA256 fcc749b95097b7e69ff913c4db82378f367097912c90bf5e4ba75774d82ed5ab EBUILD networkmanager-0.8-r1.ebuild 3514 RMD160 394e3297797d6e014a8247cfc011651f07ace94a SHA1 9aeca4e514b1d5dd0879591b3b15d2b5a8626f68 SHA256 3540f2e7336adefbd80b07bd75e7abc3b108c6e4800fb178a44f6fb098d259d9 -EBUILD networkmanager-0.8.1-r3.ebuild 3719 RMD160 e0ad8b770fc776fae8c9a4f4a75427ba3f30e4ea SHA1 66018812c0eb3db8801aed25277b01ae7fa1ec40 SHA256 0f77eba3b33a194a1cac9feb05a8b9df9b08acfdf1abe3d6dad1acaaf72a41b8 -MISC ChangeLog 17129 RMD160 fced1f7b2fb0b4f08b03642c3f6a641f19af0c4f SHA1 638c16e87de44bf4650c740683665f99ed15df17 SHA256 fcc69474852486ddaf4cbe7dac11010cdda6b46207d193e46ed507f5a9012855 +EBUILD networkmanager-0.8.1-r4.ebuild 4538 RMD160 fe7baa03ce38221944ad07c63e6b617cd8897f4e SHA1 76162d157535e5b9ace6f19235664dcf381d72d9 SHA256 fbea65ec0105647bf06e085c6e509f28a38c5d3e9a7d1f217e15df169a8a4894 +MISC ChangeLog 17378 RMD160 a2f4db989cd6ae71616471e96b82edebef8a30cf SHA1 ca399b671d505e4cbfe8920e70359db9af78785a SHA256 102399c2b779287c95d6cf9198d6c0f01b7edcc7e9e57716c97a644d9246c09c MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc diff --git a/net-misc/networkmanager/networkmanager-0.8.1-r3.ebuild b/net-misc/networkmanager/networkmanager-0.8.1-r4.ebuild index 9d741a943490..66da49ac3276 100644 --- a/net-misc/networkmanager/networkmanager-0.8.1-r3.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.1-r4.ebuild @@ -1,10 +1,10 @@ # 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.1-r3.ebuild,v 1.2 2010/08/23 10:52:31 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.1-r4.ebuild,v 1.1 2010/08/23 11:44:36 dagger Exp $ EAPI="2" -inherit gnome.org eutils autotools +inherit autotools eutils gnome.org linux-info # NetworkManager likes itself with capital letters MY_PN=${PN/networkmanager/NetworkManager} @@ -13,12 +13,12 @@ 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}} - http://dev.gentoo.org/~dagger/files/${PN}-ifnet-308267b4.patch" + http://dev.gentoo.org/~dagger/files/${PN}-ifnet-540e40f.patch" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" -IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd resolvconf connection-sharing" +IUSE="avahi bluetooth doc nss gnutls dhclient dhcpcd kernel_linux resolvconf connection-sharing" RDEPEND=">=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 @@ -54,10 +54,37 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} +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_setup() { + + 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 +} + src_prepare() { # Gentoo system-plugin - epatch "${DISTDIR}/${PN}-ifnet-308267b4.patch" + epatch "${DISTDIR}/${PN}-ifnet-540e40f.patch" # Fix up the dbus conf file to use plugdev group epatch "${FILESDIR}/${P}-confchanges.patch" |