From 728686f0e68d331ec44ca8d52254529e4dda8843 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Wed, 11 Jun 2008 16:11:56 +0000 Subject: [PATCH] - Update to latest SVN - Enable connection sharing - Respect VPN-provided routes --- NetworkManager.spec | 19 ++++++++------- explain-dns1-dns2.patch | 39 ++++++++++++++++--------------- optionally-wait-for-network.patch | 27 --------------------- shutdown-later.patch | 21 ----------------- sources | 4 ++-- 5 files changed, 33 insertions(+), 77 deletions(-) delete mode 100644 optionally-wait-for-network.patch delete mode 100644 shutdown-later.patch diff --git a/NetworkManager.spec b/NetworkManager.spec index 6afda5a..8792d02 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,14 +9,14 @@ ExcludeArch: s390 s390x %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.9.4.%{snapshot}%{?dist} +Release: 0.10.%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -24,10 +24,9 @@ Source: %{name}-%{version}.%{snapshot}.tar.gz Source1: nm-applet-%{version}.%{applet_snapshot}.tar.gz Source2: nm-system-settings.conf Patch1: NetworkManager-0.6.5-fixup-internal-applet-build.patch -Patch3: optionally-wait-for-network.patch +Patch2: disable-editing-system-connections-for-now.patch Patch4: serial-debug.patch Patch5: explain-dns1-dns2.patch -Patch6: shutdown-later.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -99,7 +98,7 @@ Requires: gnome-panel 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 @@ -141,10 +140,9 @@ NetworkManager functionality from applications that use glib. # unpack the applet tar -xzf %{SOURCE1} %patch1 -p1 -b .buildfix -%patch3 -p1 -b .wait-for-network +%patch2 -p1 -b .disable-system %patch4 -p1 -b .serial-debug %patch5 -p1 -b .explain-dns1-dns2 -%patch6 -p1 -b .shutdown-later %build # Even though we don't require named, we still build with it @@ -297,6 +295,11 @@ fi %{_libdir}/libnm-util.so %changelog +* Wed Jun 11 2008 Dan Williams - 1:0.7.0-0.10.svn3747 +- Update to latest SVN +- Enable connection sharing +- Respect VPN-provided routes + * Wed Jun 4 2008 Dan Williams - 1:0.7.0-0.9.4.svn3675 - Move NM later in the shutdown process (rh #449070) - Move libnm-util into a subpackage to allow NM to be removed more easily (rh #351101) diff --git a/explain-dns1-dns2.patch b/explain-dns1-dns2.patch index 1c20c19..b10b87f 100644 --- a/explain-dns1-dns2.patch +++ b/explain-dns1-dns2.patch @@ -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 : "", diff --git a/optionally-wait-for-network.patch b/optionally-wait-for-network.patch deleted file mode 100644 index fbedf31..0000000 --- a/optionally-wait-for-network.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in 2008-04-05 12:17:55.000000000 -0400 -+++ NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in 2008-04-16 13:10:41.000000000 -0400 -@@ -34,6 +34,9 @@ - # Source function library. - . /etc/rc.d/init.d/functions - -+# Source network configuration -+. /etc/sysconfig/network -+ - # so we can rearrange this easily - processname=NetworkManager - servicename=NetworkManager -@@ -50,6 +53,14 @@ - daemon --check $servicename $processname --pid-file=$pidfile - RETVAL=$? - echo -+ if [ -n "${NETWORKWAIT}" ]; then -+ [ -z "${LINKDELAY}" ] && LINKDELAY=10 -+ echo -n $"Waiting for network..." -+ nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30 -+ [ "$?" = "0" ] && success "network startup" || failure "network startup" -+ echo -+ [ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY} -+ fi - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename - } - diff --git a/shutdown-later.patch b/shutdown-later.patch deleted file mode 100644 index 95df802..0000000 --- a/shutdown-later.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in.stop-later NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in ---- NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in.stop-later 2008-06-04 17:18:53.000000000 -0400 -+++ NetworkManager-0.7.0/initscript/RedHat/NetworkManager.in 2008-06-04 17:34:32.000000000 -0400 -@@ -2,7 +2,7 @@ - # - # NetworkManager: NetworkManager daemon - # --# chkconfig: - 27 73 -+# chkconfig: - 27 84 - # description: This is a daemon for automatically switching network \ - # connections to the best available connection. - # -@@ -12,7 +12,7 @@ - ### BEGIN INIT INFO - # Provides: network_manager $network - # Required-Start: messagebus haldaemon --# Required-Stop: messagebus haldaemon -+# Required-Stop: messagebus - # Default-Start: 2 3 4 5 - # Default-Stop: 0 1 6 - # Short-Description: start and stop NetworkManager diff --git a/sources b/sources index 2d2ce23..70f1cc9 100644 --- a/sources +++ b/sources @@ -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