rpms/NetworkManager/F-8 preserve-f8-priorities.patch, NONE, 1.1 NetworkManager.spec, 1.212, 1.213 explain-dns1-dns2.patch, 1.1, 1.2 pk-06-fixes.patch, 1.1, 1.2 sources, 1.104, 1.105 optionally-wait-for-network.patch, 1.3, NONE

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9745

Modified Files:
	NetworkManager.spec explain-dns1-dns2.patch pk-06-fixes.patch 
	sources 
Added Files:
	preserve-f8-priorities.patch 
Removed Files:
	optionally-wait-for-network.patch 
Log Message:
* Wed Jun 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.7.svn3747
- Update to latest SVN
- Enable connection sharing
- Respect VPN-provided routes



preserve-f8-priorities.patch:

--- NEW FILE preserve-f8-priorities.patch ---
diff -up NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in.wait-for-network NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in
--- NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in.wait-for-network	2008-04-24 11:49:01.000000000 -0400
+++ NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in	2008-04-27 21:51:07.000000000 -0400
@@ -2,7 +2,7 @@
 #
 # NetworkManager:   NetworkManager daemon
 #
-# chkconfig: - 27 84
+# chkconfig: - 98 02
 # description:  This is a daemon for automatically switching network \
 #               connections to the best available connection.
 #
@@ -10,7 +10,7 @@
 # pidfile: /var/run/NetworkManager/NetworkManager.pid
 #
 ### BEGIN INIT INFO
-# Provides: network_manager $network
+# Provides: network_manager
 # Required-Start: messagebus haldaemon
 # Required-Stop: messagebus
 # Default-Start: 2 3 4 5



Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/NetworkManager.spec,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- NetworkManager.spec	6 Jun 2008 19:38:39 -0000	1.212
+++ NetworkManager.spec	11 Jun 2008 16:11:15 -0000	1.213
@@ -9,14 +9,14 @@
 %define libnl_version 1.0-0.15.pre8.git20071218
 %define ppp_version 2.2.4
 
-%define snapshot svn3675
-%define applet_snapshot svn727
+%define snapshot svn3747
+%define applet_snapshot svn755
 
 Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.0
-Release: 0.6.9.%{snapshot}%{?dist}
+Release: 0.7.%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -25,10 +25,10 @@
 Source2: nm-system-settings.conf
 Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch
 Patch2: disable-editing-system-connections-for-now.patch
-Patch3: optionally-wait-for-network.patch
 Patch4: serial-debug.patch
 Patch5: explain-dns1-dns2.patch
 Patch6: pk-06-fixes.patch
+Patch7: preserve-f8-priorities.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -101,7 +101,7 @@
 Requires: dbus >= %{dbus_version}
 Requires: dbus-glib >= %{dbus_glib_version}
 Requires: hal >= %{hal_version}
-Requires: libnotify >= 0.3
+Requires: libnotify >= 0.4.3
 PreReq:  gtk2 >= %{gtk2_version}
 Requires: gnome-keyring
 Requires: nss >= 3.11.7
@@ -144,10 +144,10 @@
 tar -xzf %{SOURCE1}
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .disable-system
-%patch3 -p1 -b .wait-for-network
 %patch4 -p1 -b .serial-debug
 %patch5 -p1 -b .explain-dns1-dns2
 %patch6 -p1 -b .pk-06-fixes
+%patch7 -p1 -b .f8-priorities
 
 %build
 # Even though we don't require named, we still build with it
@@ -300,6 +300,11 @@
 
 
 %changelog
+* Wed Jun 11 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.7.svn3747
+- Update to latest SVN
+- Enable connection sharing
+- Respect VPN-provided routes
+
 * Fri Jun  6 2008 Dan Williams <dcbw at redhat.com> - 1:0.7.0-0.6.9.svn3675
 - Fix PolicyKit issues when running in SELinux Enforcing mode (rh #449662)
 

explain-dns1-dns2.patch:

Index: explain-dns1-dns2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/explain-dns1-dns2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- explain-dns1-dns2.patch	30 Apr 2008 19:47:15 -0000	1.1
+++ explain-dns1-dns2.patch	11 Jun 2008 16:11:15 -0000	1.2
@@ -1,21 +1,22 @@
-diff -up NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.foo NetworkManager-0.7.0/src/named-manager/nm-named-manager.c
---- NetworkManager-0.7.0/src/named-manager/nm-named-manager.c.foo	2008-04-29 23:19:22.000000000 -0400
-+++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c	2008-04-29 23:25:10.000000000 -0400
-@@ -385,6 +385,17 @@ rewrite_resolv_conf (NMNamedManager *mgr
- 		/* Using glibc resolver */
- 		char *nameservers = compute_nameservers (composite);
+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-05-30 14:39:45.000000000 -0400
++++ NetworkManager-0.7.0/src/named-manager/nm-named-manager.c	2008-06-11 08:54:34.000000000 -0400
+@@ -268,6 +268,18 @@ rewrite_resolv_conf (NMNamedManager *mgr
  
-+		if (!nameservers || !strlen (nameservers)) {
-+			g_free (nameservers);
-+			nameservers = 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",
-+			                               "# SEARCH=lab.foo.com bar.foo.com\n");
-+		}
+ 	/* Using glibc resolver */
+ 	nameservers = compute_nameservers (composite);
 +
- 		if (fprintf (f, "%s%s%s\n",
- 		             domain ? domain : "",
- 		             searches ? searches : "",
++	if (!nameservers || !strlen (nameservers)) {
++		g_free (nameservers);
++		nameservers = 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",
++		                               "# SEARCH=lab.foo.com bar.foo.com\n");
++	}
++
+ 	if (fprintf (f, "%s%s%s\n",
+ 	             domain ? domain : "",
+ 	             searches ? searches : "",

pk-06-fixes.patch:

Index: pk-06-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/pk-06-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pk-06-fixes.patch	6 Jun 2008 19:38:39 -0000	1.1
+++ pk-06-fixes.patch	11 Jun 2008 16:11:15 -0000	1.2
@@ -12,23 +12,4 @@
    <action id="org.freedesktop.network-manager-settings.system.modify">
      <description>Modify system connections</description>
      <message>System policy prevents modification of system settings</message>
-diff -up NetworkManager-0.7.0/system-settings/src/nm-polkit-helpers.c.pk-06-fixes NetworkManager-0.7.0/system-settings/src/nm-polkit-helpers.c
---- NetworkManager-0.7.0/system-settings/src/nm-polkit-helpers.c.pk-06-fixes	2008-05-13 12:21:23.000000000 -0400
-+++ NetworkManager-0.7.0/system-settings/src/nm-polkit-helpers.c	2008-06-06 15:36:48.000000000 -0400
-@@ -86,10 +86,14 @@ create_polkit_context (void)
- 	polkit_context_set_io_watch_functions (global_context, pk_io_add_watch, pk_io_remove_watch);
- 	err = NULL;
- 	if (!polkit_context_init (global_context, &err)) {
--		g_warning ("Cannot initialize libpolkit: %s", polkit_error_get_error_message (err));
--		polkit_error_free (err);
-+		g_warning ("Cannot initialize libpolkit: %s",
-+		           err ? polkit_error_get_error_message (err) : "unknown error");
-+		if (err)
-+			polkit_error_free (err);
- 
-+#if (POLKIT_VERSION_MAJOR == 0) && (POLKIT_VERSION_MINOR >= 7)
- 		polkit_context_unref (global_context);
-+#endif
- 		global_context = NULL;
- 	}
- 
+


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-8/sources,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- sources	5 Jun 2008 15:54:37 -0000	1.104
+++ sources	11 Jun 2008 16:11:15 -0000	1.105
@@ -1,2 +1,2 @@
-68f70309e5a8c53e73467318199725cc  NetworkManager-0.7.0.svn3675.tar.gz
-82d5aa2ed1942fb419f46895f9817ad2  nm-applet-0.7.0.svn727.tar.gz
+25a1612c01ec19ba2864ad97ac98c759  NetworkManager-0.7.0.svn3747.tar.gz
+4ae0a5d13783f4de4e4e6f7fb949aaed  nm-applet-0.7.0.svn755.tar.gz


--- optionally-wait-for-network.patch DELETED ---