diff options
| author |   Robert Piasek <dagger@gentoo.org> | 2010-08-23 14:29:11 +0000 |
|---|---|---|
| committer | Robert Piasek <dagger@gentoo.org> | 2010-08-23 14:29:11 +0000 |
| commit | 198c0da955a1c46bdd9346b8313132fea33ca779 (patch) | |
| tree | df398644121b36806acce2a3853170815ef586fd /net-misc/networkmanager | |
| parent | Version bump openvpn-2.1.2. (diff) | |
| download | historical-198c0da955a1c46bdd9346b8313132fea33ca779.tar.gz historical-198c0da955a1c46bdd9346b8313132fea33ca779.tar.bz2 historical-198c0da955a1c46bdd9346b8313132fea33ca779.zip | |
explicitly disable dhclient if dhcpcd is enabled. That should finally fix
bug #331547
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 | 4 | ||||
| -rw-r--r-- | net-misc/networkmanager/networkmanager-0.8.1-r5.ebuild (renamed from net-misc/networkmanager/networkmanager-0.8.1-r4.ebuild) | 8 |
3 files changed, 14 insertions, 7 deletions
diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog index c3678c7bbf1b..f1b104898374 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.82 2010/08/23 11:44:36 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.83 2010/08/23 14:29:11 dagger Exp $ + +*networkmanager-0.8.1-r5 (23 Aug 2010) + + 23 Aug 2010; Robert Piasek <dagger@gentoo.org> + -networkmanager-0.8.1-r4.ebuild, +networkmanager-0.8.1-r5.ebuild: + explicitly disable dhclient if dhcpcd is enabled. That should finally fix + bug #331547 *networkmanager-0.8.1-r4 (23 Aug 2010) diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest index 4ee122339baf..f68be3ed4354 100644 --- a/net-misc/networkmanager/Manifest +++ b/net-misc/networkmanager/Manifest @@ -28,6 +28,6 @@ EBUILD networkmanager-0.6.6.ebuild 2621 RMD160 7516ea6287cfe7c9b98e4f8e5203bf4b1 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-r4.ebuild 4538 RMD160 fe7baa03ce38221944ad07c63e6b617cd8897f4e SHA1 76162d157535e5b9ace6f19235664dcf381d72d9 SHA256 fbea65ec0105647bf06e085c6e509f28a38c5d3e9a7d1f217e15df169a8a4894 -MISC ChangeLog 17378 RMD160 a2f4db989cd6ae71616471e96b82edebef8a30cf SHA1 ca399b671d505e4cbfe8920e70359db9af78785a SHA256 102399c2b779287c95d6cf9198d6c0f01b7edcc7e9e57716c97a644d9246c09c +EBUILD networkmanager-0.8.1-r5.ebuild 4593 RMD160 38b29c4dc9f8051776c601cdbc33a6a5af45ae0e SHA1 0c5a2537d7d872dad679188438e78da99d1a4eb6 SHA256 9608e29449ea33f16bfa85765664812604e17aa31e0f87d788e84634a3dfa601 +MISC ChangeLog 17626 RMD160 0d4cbd51c44f989977dcff865508c57bd754d8f9 SHA1 f19db05d717497e2355657f31c8fcb053f16c77b SHA256 4aed5fe0d009ee2103f83474886e8fda9a92e906ac9fb4832a4f67cc3a6ba8e2 MISC metadata.xml 975 RMD160 7f7f8f54c53fe2098dae8ed0a4cd177900289d3f SHA1 11de32f78915bbc01c6b0665b45233d004d75c25 SHA256 e0ce95394f82f5631ecec62c6595dc4dad9afc52cf5e1bb0f30618edfb79becc diff --git a/net-misc/networkmanager/networkmanager-0.8.1-r4.ebuild b/net-misc/networkmanager/networkmanager-0.8.1-r5.ebuild index 66da49ac3276..37ae4c7fc1c8 100644 --- a/net-misc/networkmanager/networkmanager-0.8.1-r4.ebuild +++ b/net-misc/networkmanager/networkmanager-0.8.1-r5.ebuild @@ -1,6 +1,6 @@ # 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-r4.ebuild,v 1.1 2010/08/23 11:44:36 dagger Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.8.1-r5.ebuild,v 1.1 2010/08/23 14:29:11 dagger Exp $ EAPI="2" @@ -114,12 +114,12 @@ src_configure() { # default is dhcpcd (if none or both are specified), ISC dchclient otherwise if use dhclient ; then if use dhcpcd ; then - ECONF="${ECONF} --with-dhcpcd" + ECONF="${ECONF} --with-dhcpcd --without-dhclient" else - ECONF="${ECONF} --with-dhclient" + ECONF="${ECONF} --with-dhclient --without-dhcpcd" fi else - ECONF="${ECONF} --with-dhcpcd" + ECONF="${ECONF} --with-dhcpcd --without-dhclient" fi # default is NSS (if none or both are specified), GnuTLS otherwise |