diff --git a/NetworkManager-0.7.1-localhost-localdomain.patch b/NetworkManager-0.7.1-localhost-localdomain.patch new file mode 100644 index 0000000..d82d6cb --- /dev/null +++ b/NetworkManager-0.7.1-localhost-localdomain.patch @@ -0,0 +1,31 @@ +commit 671c232544e109ab0289b6e099274fda54a35dbf +Author: Dan Williams +Date: Thu Feb 19 15:49:37 2009 -0500 + + ifcfg-rh: ignore explicitly set 'localhost' hostnames (rh #441453) + + To match 'network' service behavior, which would perform reverse + address lookups when the HOSTNAME from /etc/sysconfig/network + was 'localhost' or 'localhost.localdomain'. Just name your machine + already. + +diff --git a/system-settings/plugins/ifcfg-rh/plugin.c b/system-settings/plugins/ifcfg-rh/plugin.c +index e4f5bcf..b673615 100644 +--- a/system-settings/plugins/ifcfg-rh/plugin.c ++++ b/system-settings/plugins/ifcfg-rh/plugin.c +@@ -499,6 +499,15 @@ plugin_get_hostname (SCPluginIfcfg *plugin) + + hostname = svGetValue (network, "HOSTNAME"); + svCloseFile (network); ++ ++ /* Ignore a hostname of 'localhost' or 'localhost.localdomain' to preserve ++ * 'network' service behavior. ++ */ ++ if (hostname && (!strcmp (hostname, "localhost") || !strcmp (hostname, "localhost.localdomain"))) { ++ g_free (hostname); ++ hostname = NULL; ++ } ++ + return hostname; + } + diff --git a/NetworkManager.spec b/NetworkManager.spec index 852fc9c..b925d24 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -11,13 +11,13 @@ ExcludeArch: s390 s390x %define libnl_version 1.1 %define ppp_version 2.2.4 -%define snapshot .git20090225 -%define applet_snapshot .svn1202 +%define snapshot %{nil} +%define applet_snapshot %{nil} Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.7.0.98 +Version: 0.7.0.99 Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ @@ -28,6 +28,7 @@ Source1: network-manager-applet-%{version}%{applet_snapshot}.tar.bz2 Source2: nm-system-settings.conf Patch1: nm-applet-internal-buildfixes.patch Patch2: explain-dns1-dns2.patch +Patch3: NetworkManager-0.7.1-localhost-localdomain.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) PreReq: chkconfig @@ -45,9 +46,10 @@ Requires: dnsmasq Requires: udev Obsoletes: dhcdbd -Conflicts: NetworkManager-vpnc < 1:0.7.0-1 -Conflicts: NetworkManager-openvpn < 1:0.7.0-17 -Conflicts: NetworkManager-pptp < 1:0.7.0-1 +Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 +Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 +Conflicts: NetworkManager-pptp < 1:0.7.0.99-1 +Conflicts: NetworkManager-openconnect < 1:0.7.0.99-1 BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} @@ -144,6 +146,7 @@ NetworkManager functionality from applications that use glib. tar -xjf %{SOURCE1} %patch1 -p1 -b .buildfix %patch2 -p1 -b .explain-dns1-dns2 +%patch3 -p1 -R -b .keep-localhost-localdomain %build @@ -324,6 +327,16 @@ fi %{_datadir}/gtk-doc/html/libnm-util/* %changelog +* Wed Mar 4 2009 Dan Williams - 1:0.7.0.99-1 +- nm: make default wired "Auto ethX" connection modifiable if an enabled system settings + plugin supports modifying connections (rh #485555) +- nm: manpage fixes (rh #447233) +- nm: CVE-2009-0365 - GetSecrets disclosure +- applet: CVE-2009-0578 - local users can modify the connection settings +- applet: fix inability to choose WPA Ad-Hoc networks from the menu +- ifcfg-rh: add read-only support for WPA-PSK connections +- ifcfg-rh: revert fix for #441453 (honor localhost) until gdm gets fixed + * Wed Feb 25 2009 Dan Williams - 1:0.7.0.98-1.git20090225 - Fix getting secrets for system connections (rh #486696) - More compatible modem autodetection diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index 82ef7f8..89b3d5f 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/configure.ac.buildfix 2008-11-17 08:37:21.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/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 @@ -12,9 +12,9 @@ diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/configure.ac.bu gtk+-2.0 >= 2.10 libglade-2.0 gmodule-export-2.0 -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/connection-editor/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -2,6 +2,10 @@ NULL= bin_PROGRAMS = nm-connection-editor @@ -38,9 +38,9 @@ diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/connection- if NO_POLKIT_GNOME nm_connection_editor_LDADD += \ -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpers/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/gconf-helpers/Makefile.am.buildfix 2008-05-06 11:16:09.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/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 \ @@ -58,9 +58,9 @@ diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/gconf-helpe + -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.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am.buildfix 2008-11-17 08:37:20.000000000 -0500 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -4,6 +4,10 @@ NULL= bin_PROGRAMS = nm-applet @@ -83,9 +83,9 @@ diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/Makefile.am gladedir = $(datadir)/nm-applet glade_DATA = applet.glade keyring.png -diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/utils/Makefile.am.buildfix 2008-05-19 11:02:18.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/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 \ @@ -103,9 +103,9 @@ diff -up NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/utils/Makef + -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.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am ---- NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 -+++ NetworkManager-0.7.0.98/network-manager-applet-0.7.0.98/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 +diff -up NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am +--- NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am.buildfix 2008-03-30 13:17:59.000000000 -0400 ++++ NetworkManager-0.7.0.99/network-manager-applet-0.7.0.99/src/wireless-security/Makefile.am 2008-11-17 18:04:35.000000000 -0500 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la diff --git a/sources b/sources index 610cb55..a8827dd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -870f57ad87eafa2ef411b8e71a462e8a NetworkManager-0.7.0.98.git20090225.tar.bz2 -8f8ac796d7c14378cc7d073fdce8470c network-manager-applet-0.7.0.98.svn1202.tar.bz2 +2f3aef00a0cd1a2d32acba880bcca27c NetworkManager-0.7.0.99.tar.bz2 +8670d75dffe0d4fe5a497f0857a5ff00 network-manager-applet-0.7.0.99.tar.bz2