Date: Sunday, August 1, 2010 @ 11:04:26
Author: ibiru
Revision: 86417
upgpkg: networkmanager 0.8.1-1 update to 0.8.1
Modified:
networkmanager/trunk/PKGBUILD
networkmanager/trunk/disable_set_hostname.patch
----------------------------+
PKGBUILD | 9 +++------
disable_set_hostname.patch | 18 +++++++++---------
2 files changed, 12 insertions(+), 15 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-08-01 14:49:42 UTC (rev 86416)
+++ PKGBUILD 2010-08-01 15:04:26 UTC (rev 86417)
@@ -6,7 +6,7 @@
# Contributor: Valentine Sinitsyn <e_...@inbox.ru>
pkgname=networkmanager
-pkgver=0.8.0.999
+pkgver=0.8.1
pkgrel=1
pkgdesc="Network Management daemon"
arch=('i686' 'x86_64')
@@ -17,15 +17,12 @@
optdepends=('modemmanager: for modem management service')
options=('!libtool' '!makeflags')
backup=('etc/NetworkManager/nm-system-settings.conf')
-replaces=('libnetworkmanager')
-provides=("libnetworkmanager=${pkgver}")
-conflicts=('libnetworkmanager')
source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.8/NetworkManager-${pkgver}.tar.bz2
nm-system-settings.conf
disable_set_hostname.patch)
-sha256sums=('1d81b455136177a9b267e8864dfb077f5d8014f863e894049e40757351b6948b'
+sha256sums=('dc126fbe3199d47899c4781e4fff32cee404dc7c728c6ade9eaa899bd80f19fa'
'44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
- 'aee905e15ba6fae154de05aaa1af9fbdd2855d66cdfbbcc90cfc0c8e98cdfda6')
+ '941cb6cfbfc6b0e6e3d5ace140e17956d29b909d6a72c8f12f00734f3d6b6066')
build() {
cd "${srcdir}/NetworkManager-${pkgver}"
Modified: disable_set_hostname.patch
===================================================================
--- disable_set_hostname.patch 2010-08-01 14:49:42 UTC (rev 86416)
+++ disable_set_hostname.patch 2010-08-01 15:04:26 UTC (rev 86417)
@@ -1,6 +1,6 @@
-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
+diff -Nur NetworkManager-0.8.1.orig/src/nm-policy.c
NetworkManager-0.8.1/src/nm-policy.c
+--- NetworkManager-0.8.1.orig/src/nm-policy.c 2010-07-21 18:48:36.000000000
-0500
++++ NetworkManager-0.8.1/src/nm-policy.c 2010-08-01 19:48:57.474426178
-0500
@@ -286,7 +286,7 @@
g_free (configured_hostname);
return;
@@ -10,11 +10,11 @@
/* Try automatically determined hostname from the best device's IP
config */
if (!best)
best = get_best_ip4_device (policy->manager, &best_req);
-@@ -298,6 +298,7 @@
- _set_hostname (policy->orig_hostname, "no default device");
- return;
+@@ -318,6 +318,7 @@
+ }
}
+
+#endif
-
- /* Grab a hostname out of the device's DHCP4 config */
- dhcp4_config = nm_device_get_dhcp4_config (best);
+ /* If no automatically-configured hostname, try using the hostname from
+ * when NM started up.
+ */
