Date: Saturday, January 30, 2010 @ 13:51:24
Author: jgc
Revision: 65534
Merged revisions 65532 via svnmerge from
svn+ssh://gerolde.archlinux.org/srv/svn-packages/networkmanager/trunk
........
r65532 | jgc | 2010-01-30 19:50:50 +0100 (Sat, 30 Jan 2010) | 2 lines
upgpkg: networkmanager 0.7.999-2
Update the disable_set_hostname patch: only do hostname configuration
from configuration plugins (keyfile at this moment), disable all automatic
methods
........
Modified:
networkmanager/repos/testing-x86_64/ (properties)
networkmanager/repos/testing-x86_64/PKGBUILD
networkmanager/repos/testing-x86_64/disable_set_hostname.patch
----------------------------+
PKGBUILD | 12 ++++++-----
disable_set_hostname.patch | 46 ++++++++++++-------------------------------
2 files changed, 20 insertions(+), 38 deletions(-)
Property changes on: networkmanager/repos/testing-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
- /networkmanager/trunk:1-64896
+ /networkmanager/trunk:1-65533
Modified: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2010-01-30 18:51:05 UTC (rev 65533)
+++ testing-x86_64/PKGBUILD 2010-01-30 18:51:24 UTC (rev 65534)
@@ -7,7 +7,7 @@
pkgname=networkmanager
pkgver=0.7.999
-pkgrel=1
+pkgrel=2
pkgdesc="Network Management daemon"
arch=('i686' 'x86_64')
license=('GPL')
@@ -21,20 +21,22 @@
provides=("libnetworkmanager=${pkgver}")
conflicts=('libnetworkmanager')
source=(http://ftp.gnome.org/pub/gnome/sources/NetworkManager/0.7/NetworkManager-${pkgver}.tar.bz2
- nm-system-settings.conf disable_set_hostname.patch)
+ nm-system-settings.conf
+ disable_set_hostname.patch)
sha256sums=('6fa351b3efc78cff4daa1f42386ba8435474bc121b4358a7d08bd7c9fb63aaef'
'44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21'
- 'fc99590a451e845c428ed8e203612e48a0899ebeaef00e4928936328f71e35b2')
+ '00a16b694cd8d249d299349f02be1eefe646199ee7b5d1f910f8f7f353f463bf')
build() {
cd "${srcdir}/NetworkManager-${pkgver}"
- patch -Np1 -i $srcdir/disable_set_hostname.patch || return 1
+ patch -Np1 -i "${srcdir}/disable_set_hostname.patch" || return 1
./configure --prefix=/usr --sysconfdir=/etc \
--with-distro=arch --localstatedir=/var \
--libexecdir=/usr/lib/networkmanager \
--disable-static --with-dhcp-client=dhcpcd \
- --with-crypto=nss --with-iptables=/usr/sbin/iptables || return 1
+ --with-crypto=nss --with-iptables=/usr/sbin/iptables \
+ --enable-more-warnings=no || return 1
make || return 1
make DESTDIR="${pkgdir}" install || return 1
Modified: testing-x86_64/disable_set_hostname.patch
===================================================================
--- testing-x86_64/disable_set_hostname.patch 2010-01-30 18:51:05 UTC (rev
65533)
+++ testing-x86_64/disable_set_hostname.patch 2010-01-30 18:51:24 UTC (rev
65534)
@@ -1,39 +1,19 @@
-diff -Nur NetworkManager-0.7.998.old/src/NetworkManagerPolicy.c
NetworkManager-0.7.998/src/NetworkManagerPolicy.c
---- NetworkManager-0.7.998.old/src/NetworkManagerPolicy.c 2010-01-03
03:04:56.000000000 +0200
-+++ NetworkManager-0.7.998/src/NetworkManagerPolicy.c 2010-01-08
15:21:28.000000000 +0200
-@@ -391,7 +391,7 @@
-
- /* No valid IP4 config (!!); fall back to localhost.localdomain
*/
- msg = g_strdup_printf ("address lookup failed: %d",
thread->ret);
-- set_system_hostname (NULL, msg);
-+ //set_system_hostname (NULL, msg);
- g_free (msg);
- } else
- set_system_hostname (thread->hostname, "from address lookup");
-@@ -438,7 +438,7 @@
-
- if (!best) {
- /* No best device; fall back to localhost.localdomain */
-- set_system_hostname (NULL, "no default device");
-+ //set_system_hostname (NULL, "no default device");
+--- 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 @@
+ g_free (configured_hostname);
return;
}
-
-@@ -462,7 +462,7 @@
- || (nm_ip4_config_get_num_nameservers (ip4_config) == 0)
- || (nm_ip4_config_get_num_addresses (ip4_config) == 0)) {
- /* No valid IP4 config (!!); fall back to localhost.localdomain
*/
-- set_system_hostname (NULL, "no IPv4 config");
-+ //set_system_hostname (NULL, "no IPv4 config");
- return;
- }
-
-@@ -473,7 +473,7 @@
- policy->lookup = lookup_thread_new (nm_ip4_address_get_address (addr),
lookup_callback, policy);
- if (!policy->lookup) {
+-
++#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");
-+ //set_system_hostname (NULL, "error starting hostname thread");
+ set_system_hostname (NULL, "error starting hostname thread");
}
++#endif
}
+ static void
