From 30a1b4331a54fcb0f017e750b0350d3ee198adb6 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Nov 17 2008 23:25:45 +0000 Subject: - Fix issues reading ifcfg files - Previously fixed: - Doesn't send DHCP hostname (rh #469336) - 'Auto eth0' forgets settings (rh #468612) - DHCP renewal sometimes breaks VPN (rh #471852) - Connection editor menu item in the wrong place (rh #471495) - Cannot make system-wide connections (rh #471308) --- diff --git a/NetworkManager-0.6.5-fixup-internal-applet-build.patch b/NetworkManager-0.6.5-fixup-internal-applet-build.patch deleted file mode 100644 index d7f4a2c..0000000 --- a/NetworkManager-0.6.5-fixup-internal-applet-build.patch +++ /dev/null @@ -1,127 +0,0 @@ -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac ---- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2008-06-17 13:51:13.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-10-12 08:25:08.000000000 -0400 -@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) - PKG_CHECK_MODULES(NMA, - [dbus-glib-1 >= 0.72 - glib-2.0 >= 2.10 -- NetworkManager >= 0.7.0 -- libnm_glib >= 0.7.0 -- libnm-util >= 0.7.0 -- libnm_glib_vpn >= 0.7.0 - gtk+-2.0 >= 2.10 - libglade-2.0 - gmodule-export-2.0 -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-08-11 13:40:26.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-10-12 08:25:08.000000000 -0400 -@@ -2,6 +2,10 @@ NULL= - - bin_PROGRAMS = nm-connection-editor - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_connection_editor_CPPFLAGS = \ - $(NMA_CFLAGS) \ - -DICONDIR=\""$(datadir)/icons"\" \ -@@ -65,7 +69,10 @@ nm_connection_editor_LDADD = \ - ${top_builddir}/src/wireless-security/libwireless-security.la \ - ${top_builddir}/src/utils/libutils.la \ - $(NMA_LIBS) \ -- $(POLKIT_LIBS) -+ $(POLKIT_LIBS) \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la - - gladedir = $(datadir)/nm-applet - glade_DATA = \ -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-10-12 08:25:08.000000000 -0400 -@@ -1,3 +1,7 @@ -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - noinst_LTLIBRARIES = libgconf-helpers.la - - libgconf_helpers_la_SOURCES = \ -@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \ - libgconf_helpers_la_LIBADD = \ - $(NMA_LIBS) \ - ${top_builddir}/src/marshallers/libmarshallers.la \ -- ${top_builddir}/src/utils/libutils.la -+ ${top_builddir}/src/utils/libutils.la \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2008-07-03 08:48:24.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-10-12 08:25:08.000000000 -0400 -@@ -4,6 +4,10 @@ NULL= - - bin_PROGRAMS = nm-applet - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - nm_applet_CPPFLAGS = \ - $(NMA_CFLAGS) \ - $(NOTIFY_CFLAGS) \ -@@ -57,7 +61,9 @@ nm_applet_LDADD = \ - ${top_builddir}/src/marshallers/libmarshallers.la \ - ${top_builddir}/src/utils/libutils.la \ - ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -- ${top_builddir}/src/wireless-security/libwireless-security.la -+ ${top_builddir}/src/wireless-security/libwireless-security.la \ -+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - - gladedir = $(datadir)/nm-applet - glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-10-12 08:25:09.000000000 -0400 -@@ -1,3 +1,7 @@ -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - noinst_LTLIBRARIES = libutils.la - - libutils_la_SOURCES = \ -@@ -11,4 +15,7 @@ libutils_la_CPPFLAGS = \ - -I${top_srcdir}/src/gconf-helpers \ - -I${top_srcdir}/src - --libutils_la_LIBADD = $(NMA_LIBS) -+libutils_la_LIBADD = $(NMA_LIBS) \ -+ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la -+ -diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 -+++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-10-12 08:25:09.000000000 -0400 -@@ -1,5 +1,9 @@ - noinst_LTLIBRARIES = libwireless-security.la - -+INCLUDES = -I${top_srcdir}/../include \ -+ -I${top_srcdir}/../libnm-util \ -+ -I${top_srcdir}/../libnm-glib -+ - libwireless_security_la_SOURCES = \ - wireless-security.h \ - wireless-security.c \ -@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \ - libwireless_security_la_LIBADD = \ - $(NMA_LIBS) \ - ${top_builddir}/src/utils/libutils.la \ -- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la -+ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ -+ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ -+ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la - diff --git a/NetworkManager.spec b/NetworkManager.spec index 1d084d5..90a5a80 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -9,8 +9,8 @@ ExcludeArch: s390 s390x %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot svn4293 -%define applet_snapshot svn1024 +%define snapshot svn4295 +%define applet_snapshot svn1031 Name: NetworkManager Summary: Network connection manager and user applications @@ -23,7 +23,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ 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 +Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -293,11 +293,20 @@ fi %{_datadir}/gtk-doc/html/libnm-glib/* %changelog +* Mon Nov 17 2008 Dan Williams - 1:0.7.0-0.12.svn4295 +- Fix issues reading ifcfg files +- Previously fixed: +- Doesn't send DHCP hostname (rh #469336) +- 'Auto eth0' forgets settings (rh #468612) +- DHCP renewal sometimes breaks VPN (rh #471852) +- Connection editor menu item in the wrong place (rh #471495) +- Cannot make system-wide connections (rh #471308) + * Fri Nov 14 2008 Dan Williams - 1:0.7.0-0.12.svn4293 - Update to NetworkManager 0.7.0 RC2 - Handle gateways on a different subnet from the interface - Clear VPN secrets on connection failure to ensure they are requested again (rh #429287) -- Add support for PKCS#12 private keys +- Add support for PKCS#12 private keys (rh #462705) - Fix mangling of VPN's default route on DHCP renew - Fix type detection of qemu/kvm network devices (rh #466340) - Clear up netmask/prefix confusion in the connection editor diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch new file mode 100644 index 0000000..7535391 --- /dev/null +++ b/nm-applet-internal-buildfixes.patch @@ -0,0 +1,127 @@ +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac +--- NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/configure.ac 2008-11-17 18:04:35.000000000 -0500 +@@ -68,10 +68,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) + PKG_CHECK_MODULES(NMA, + [dbus-glib-1 >= 0.72 + glib-2.0 >= 2.10 +- NetworkManager >= 0.7.0 +- libnm_glib >= 0.7.0 +- libnm-util >= 0.7.0 +- libnm_glib_vpn >= 0.7.0 + gtk+-2.0 >= 2.10 + libglade-2.0 + gmodule-export-2.0 +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +@@ -2,6 +2,10 @@ NULL= + + bin_PROGRAMS = nm-connection-editor + ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + nm_connection_editor_CPPFLAGS = \ + $(NMA_CFLAGS) \ + -DICONDIR=\""$(datadir)/icons"\" \ +@@ -64,7 +68,10 @@ nm_connection_editor_LDADD = \ + ${top_builddir}/src/wireless-security/libwireless-security.la \ + ${top_builddir}/src/utils/libutils.la \ + $(NMA_LIBS) \ +- $(POLKIT_LIBS) ++ $(POLKIT_LIBS) \ ++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib_vpn.la + + if NO_POLKIT_GNOME + nm_connection_editor_LDADD += \ +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +@@ -1,3 +1,7 @@ ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + noinst_LTLIBRARIES = libgconf-helpers.la + + libgconf_helpers_la_SOURCES = \ +@@ -19,5 +23,7 @@ libgconf_helpers_la_CPPFLAGS = \ + libgconf_helpers_la_LIBADD = \ + $(NMA_LIBS) \ + ${top_builddir}/src/marshallers/libmarshallers.la \ +- ${top_builddir}/src/utils/libutils.la ++ ${top_builddir}/src/utils/libutils.la \ ++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +@@ -4,6 +4,10 @@ NULL= + + bin_PROGRAMS = nm-applet + ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + nm_applet_CPPFLAGS = \ + $(NMA_CFLAGS) \ + $(NOTIFY_CFLAGS) \ +@@ -57,7 +61,9 @@ nm_applet_LDADD = \ + ${top_builddir}/src/marshallers/libmarshallers.la \ + ${top_builddir}/src/utils/libutils.la \ + ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ +- ${top_builddir}/src/wireless-security/libwireless-security.la ++ ${top_builddir}/src/wireless-security/libwireless-security.la \ ++ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + + gladedir = $(datadir)/nm-applet + glade_DATA = applet.glade keyring.png +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +@@ -1,3 +1,7 @@ ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + noinst_LTLIBRARIES = libutils.la + + libutils_la_SOURCES = \ +@@ -11,4 +15,7 @@ libutils_la_CPPFLAGS = \ + -I${top_srcdir}/src/gconf-helpers \ + -I${top_srcdir}/src + +-libutils_la_LIBADD = $(NMA_LIBS) ++libutils_la_LIBADD = $(NMA_LIBS) \ ++ -L${top_builddir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_builddir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la ++ +diff -up NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am +--- NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0/nm-applet-0.7.0/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +@@ -1,5 +1,9 @@ + noinst_LTLIBRARIES = libwireless-security.la + ++INCLUDES = -I${top_srcdir}/../include \ ++ -I${top_srcdir}/../libnm-util \ ++ -I${top_srcdir}/../libnm-glib ++ + libwireless_security_la_SOURCES = \ + wireless-security.h \ + wireless-security.c \ +@@ -36,5 +40,7 @@ libwireless_security_la_CPPFLAGS = \ + libwireless_security_la_LIBADD = \ + $(NMA_LIBS) \ + ${top_builddir}/src/utils/libutils.la \ +- ${top_builddir}/src/gconf-helpers/libgconf-helpers.la ++ ${top_builddir}/src/gconf-helpers/libgconf-helpers.la \ ++ -L${top_srcdir}/../libnm-util $(top_builddir)/../libnm-util/libnm-util.la \ ++ -L${top_srcdir}/../libnm-glib $(top_builddir)/../libnm-glib/libnm_glib.la + diff --git a/sources b/sources index df4caa3..e5bbcd0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d2625bb00cbf2744fd63bb5b1d0d3c7f nm-applet-0.7.0.svn1024.tar.gz -851a605bdfbe247be5521e5bca2860a1 NetworkManager-0.7.0.svn4293.tar.gz +01f5871f9f111409d06c78f210fc718c NetworkManager-0.7.0.svn4295.tar.gz +96a0b7f3e9c613148f25ccc8d81100f5 nm-applet-0.7.0.svn1031.tar.gz