rpms/NetworkManager/F-10 NetworkManager-0.7.1-localhost-localdomain.patch, NONE, 1.1 NetworkManager.spec, 1.257, 1.258 nm-applet-internal-buildfixes.patch, 1.4, 1.5 sources, 1.133, 1.134
Daniel Williams
dcbw at fedoraproject.org
Thu Mar 5 10:54:11 UTC 2009
Author: dcbw
Update of /cvs/pkgs/rpms/NetworkManager/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32746
Modified Files:
NetworkManager.spec nm-applet-internal-buildfixes.patch
sources
Added Files:
NetworkManager-0.7.1-localhost-localdomain.patch
Log Message:
* Wed Mar 4 2009 Dan Williams <dcbw at redhat.com> - 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
NetworkManager-0.7.1-localhost-localdomain.patch:
--- NEW FILE NetworkManager-0.7.1-localhost-localdomain.patch ---
commit 671c232544e109ab0289b6e099274fda54a35dbf
Author: Dan Williams <dcbw at redhat.com>
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;
}
Index: NetworkManager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/NetworkManager.spec,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- NetworkManager.spec 25 Feb 2009 20:40:44 -0000 1.257
+++ NetworkManager.spec 5 Mar 2009 10:53:40 -0000 1.258
@@ -11,13 +11,13 @@
%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 @@
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: 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 @@
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 @@
%{_datadir}/gtk-doc/html/libnm-util/*
%changelog
+* Wed Mar 4 2009 Dan Williams <dcbw at redhat.com> - 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 <dcbw at redhat.com> - 1:0.7.0.98-1.git20090225
- Fix getting secrets for system connections (rh #486696)
- More compatible modem autodetection
nm-applet-internal-buildfixes.patch:
Index: nm-applet-internal-buildfixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/nm-applet-internal-buildfixes.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nm-applet-internal-buildfixes.patch 25 Feb 2009 20:40:44 -0000 1.4
+++ nm-applet-internal-buildfixes.patch 5 Mar 2009 10:53:40 -0000 1.5
@@ -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 @@
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 @@
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 @@
+ -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 @@
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 @@
+ -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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager/F-10/sources,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- sources 25 Feb 2009 20:40:44 -0000 1.133
+++ sources 5 Mar 2009 10:53:40 -0000 1.134
@@ -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
More information about the scm-commits
mailing list