Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=bouleetbiltesting.git;a=commitdiff;h=8f86912c74b655ffa076d3a77d2f7aace383f3b5
commit 8f86912c74b655ffa076d3a77d2f7aace383f3b5
Author: bouleetbil <bouleet...@frogdev.info>
Date: Tue Oct 27 11:25:58 2009 +0100
networkmanager-0.7.1.997-3-i686
*added patch for dns
diff --git a/source/network-extra/networkmanager/FrugalBuild
b/source/network-extra/networkmanager/FrugalBuild
index 4247ad4..418c89c 100644
--- a/source/network-extra/networkmanager/FrugalBuild
+++ b/source/network-extra/networkmanager/FrugalBuild
@@ -4,7 +4,7 @@
pkgname=networkmanager
_F_gnome_name=NetworkManager
pkgver=0.7.1.997
-pkgrel=2
+pkgrel=3
pkgdesc="Network Management daemon"
depends=('wireless_tools' 'hal' 'iproute2' 'dhcpcd>=5.1.3' 'nss' \
'libnl' 'ppp' 'wpa_supplicant' 'iptables' 'policykit')
@@ -14,10 +14,11 @@ archs=('i686')
_F_gnome_devel="y"
Finclude gnome
backup=('etc/NetworkManager/nm-system-settings.conf')
-source=($source \
+source=($source explaindns.diff \
nm-system-settings.conf README.Frugalware \
dbus-acces.diff rc.networkmanager detectdhcpcd.diff)
sha1sums=('ae72fc0482a1d4175d4c026fff5d58676a11073d' \
+ 'a6c681028035a6b7af2b7f864b4b137670211df0' \
'49ba558d20f5ca5a201e027e13b878dd5ac3569c' \
'493e33f57fe82525309a728f7df46c5e4346abca' \
'de85f4b83115170e6554c469ca421fb31f75acee' \
diff --git a/source/network-extra/networkmanager/explaindns.diff
b/source/network-extra/networkmanager/explaindns.diff
new file mode 100644
index 0000000..bbfc70a
--- /dev/null
+++ b/source/network-extra/networkmanager/explaindns.diff
@@ -0,0 +1,27 @@
+diff -up
NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2
NetworkManager-0.7.0/src/named-manager/nm-named-manager.c
+---
NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.explain-dns1-dns2
2008-09-15 10:33:29.000000000 -0400
++++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c 2008-10-12
08:25:48.000000000 -0400
+@@ -243,7 +243,7 @@ write_resolv_conf (FILE *f, const char *
+ g_free (tmp_str);
+ }
+
+- if (nameservers) {
++ if (nameservers && g_strv_length (nameservers)) {
+ GString *str;
+ int num;
+
+@@ -265,6 +265,14 @@ write_resolv_conf (FILE *f, const char *
+ }
+
+ nameservers_str = g_string_free (str, FALSE);
++ } else {
++ nameservers_str = g_strdup_printf ("\n\n%s%s%s%s%s%s",
++ "# No nameservers found; try
putting DNS servers into your\n",
++ "# ifcfg files in
/etc/sysconfig/network-scripts like so:\n",
++ "#\n",
++ "# DNS1=xxx.xxx.xxx.xxx\n",
++ "# DNS2=xxx.xxx.xxx.xxx\n",
++ "# DOMAIN=lab.foo.com
bar.foo.com\n");
+ }
+
+ if (fprintf (f, "%s%s%s",
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
