Date: Monday, May 10, 2010 @ 10:34:46
Author: ibiru
Revision: 80006
upgpkg: networkmanager 0.8.0.997-1
update to 0.8.0.997
Modified:
networkmanager/trunk/PKGBUILD
networkmanager/trunk/disable_set_hostname.patch
----------------------------+
PKGBUILD | 10 +++++-----
disable_set_hostname.patch | 19 ++++++++++---------
2 files changed, 15 insertions(+), 14 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-05-10 14:33:41 UTC (rev 80005)
+++ PKGBUILD 2010-05-10 14:34:46 UTC (rev 80006)
@@ -6,13 +6,13 @@
# Contributor: Valentine Sinitsyn <e_...@inbox.ru>
pkgname=networkmanager
-pkgver=0.8
+pkgver=0.8.0.997
pkgrel=1
pkgdesc="Network Management daemon"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.gnome.org/projects/NetworkManager/";
-depends=('wireless_tools' 'iproute2' 'libnl>=1.1' 'ppp' 'dhcpcd>=4.0'
'wpa_supplicant>=0.6.9' 'iptables' 'nss>=3.12.4' 'polkit>=0.95' 'udev>=146')
+depends=('wireless_tools' 'iproute2' 'libnl>=1.1' 'ppp' 'dhcpcd>=5.2.2'
'wpa_supplicant>=0.6.10' 'iptables' 'nss>=3.12.4' 'polkit>=0.96' 'udev>=151')
makedepends=('pkgconfig' 'intltool')
optdepends=('modemmanager: for modem management service')
options=('!libtool' '!makeflags')
@@ -23,9 +23,9 @@
source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
nm-system-settings.conf
disable_set_hostname.patch)
-sha256sums=('4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05'
+sha256sums=('d12ea30ca5913132289a97703f64038adba3f3aa0722b5a2032a29db114cebfe'
'44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
- '00a16b694cd8d249d299349f02be1eefe646199ee7b5d1f910f8f7f353f463bf')
+ 'aee905e15ba6fae154de05aaa1af9fbdd2855d66cdfbbcc90cfc0c8e98cdfda6')
build() {
cd "${srcdir}/NetworkManager-${pkgver}"
@@ -34,7 +34,7 @@
./configure --prefix=/usr --sysconfdir=/etc \
--with-distro=arch --localstatedir=/var \
--libexecdir=/usr/lib/networkmanager \
- --disable-static --with-dhcp-client=dhcpcd \
+ --disable-static --with-dhcpcd=/sbin/dhcpcd \
--with-crypto=nss --with-iptables=/usr/sbin/iptables \
--enable-more-warnings=no || return 1
Modified: disable_set_hostname.patch
===================================================================
--- disable_set_hostname.patch 2010-05-10 14:33:41 UTC (rev 80005)
+++ disable_set_hostname.patch 2010-05-10 14:34:46 UTC (rev 80006)
@@ -1,6 +1,7 @@
---- NetworkManager-0.7.999/src/NetworkManagerPolicy.c.orig 2010-01-30
19:43:15.000000000 +0100
-+++ NetworkManager-0.7.999/src/NetworkManagerPolicy.c 2010-01-30
19:45:02.000000000 +0100
-@@ -431,7 +431,7 @@
+diff -Nur NetworkManager-0.8.0.997.orig/src/nm-policy.c
NetworkManager-0.8.0.997/src/nm-policy.c
+--- NetworkManager-0.8.0.997.orig/src/nm-policy.c 2010-05-05
10:38:52.000000000 +0300
++++ NetworkManager-0.8.0.997/src/nm-policy.c 2010-05-10 16:15:02.995948368
+0300
+@@ -286,7 +286,7 @@
g_free (configured_hostname);
return;
}
@@ -8,12 +9,12 @@
+#if 0
/* Try automatically determined hostname from the best device's IP
config */
if (!best)
- best = get_best_device (policy->manager, &best_req);
-@@ -475,6 +475,7 @@
- /* Fall back to 'localhost.localdomain' */
- set_system_hostname (NULL, "error starting hostname thread");
+ best = get_best_ip4_device (policy->manager, &best_req);
+@@ -298,6 +298,7 @@
+ _set_hostname (policy->orig_hostname, "no default device");
+ return;
}
+#endif
- }
- static void
+ /* Grab a hostname out of the device's DHCP4 config */
+ dhcp4_config = nm_device_get_dhcp4_config (best);
