From 04ba8e9140b553a9be275d7c265db05af4c5631c Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 10 Nov 2011 12:23:14 -0600 Subject: [PATCH] Update to 0.9.2 --- .gitignore | 2 + NetworkManager.spec | 27 ++++++--- nm-applet-internal-buildfixes.patch | 85 +++++++++++++--------------- nm-applet-no-notifications.patch | 6 +- nm-applet-wifi-dialog-ui-fixes.patch | 6 +- rh719100-dhcp-hostname-fix.patch | 44 -------------- sources | 4 +- 7 files changed, 69 insertions(+), 105 deletions(-) delete mode 100644 rh719100-dhcp-hostname-fix.patch diff --git a/.gitignore b/.gitignore index c6faabe..a5b9ae2 100644 --- a/.gitignore +++ b/.gitignore @@ -264,3 +264,5 @@ network-manager-applet-0.8.1.tar.bz2 /network-manager-applet-0.9.1.90.tar.bz2 /NetworkManager-0.9.1.90.git20110927.tar.bz2 /network-manager-applet-0.9.1.90.git20110927.tar.bz2 +/NetworkManager-0.9.2.0.tar.bz2 +/network-manager-applet-0.9.2.0.tar.bz2 diff --git a/NetworkManager.spec b/NetworkManager.spec index fe4e837..b61c710 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,15 +7,15 @@ %define libnl_version 1.1 %define ppp_version 2.4.5 -%define snapshot .git20110927 -%define applet_snapshot .git20110927 -%define realversion 0.9.1.90 +%define snapshot %{nil} +%define applet_snapshot %{nil} +%define realversion 0.9.2.0 Name: NetworkManager Summary: Network connection manager and user applications Epoch: 1 -Version: 0.9.1.90 -Release: 5%{snapshot}%{?dist} +Version: 0.9.2 +Release: 1%{snapshot}%{?dist} Group: System Environment/Base License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -28,7 +28,6 @@ Patch2: explain-dns1-dns2.patch Patch3: nm-applet-no-notifications.patch Patch4: nm-polkit-permissive.patch Patch5: nm-applet-wifi-dialog-ui-fixes.patch -Patch6: rh719100-dhcp-hostname-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): chkconfig @@ -191,7 +190,6 @@ tar -xjf %{SOURCE1} %patch3 -p1 -b .no-notifications %patch4 -p1 -b .polkit-permissive %patch5 -p1 -b .applet-wifi-ui -%patch6 -p1 -b .dhcp-hostname %build @@ -460,8 +458,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libnm-gtk.so %changelog +* Thu Nov 09 2011 Dan Williams - 0.9.2-1 +- core: fix possible crash when talking to ModemManager +- core: improve handling of rfkill on some machines (eeepc 1005HA and others) +- ifcfg-rh: don't use spaces in ifcfg file names (rh #742273) +- core: accept IPv6 Router Advertisements when forwarding is on +- core: bump dnsmasq cache size to 400 entries +- core: ensure IPv6 static routes are flushed when device is deactivated +- ifcfg-rh: fix changing WPA connections to WEP +- core: fix setting hostname from DHCP (rh #719100) +- libnm-glib: fix various GObject introspection issues (rh #747302) +- core: don't change routing or DNS if no devices are managed +- core: ensure IPv6 RA-provided routes are honored + * Wed Nov 9 2011 Adam Williamson - 1:0.9.1.90-5.git20110927 -- Rebuilt for glibc bug#747377 +- Rebuilt for glibc (rh #747377) - core: fix setting hostname from DHCP options (rh #719100) - skip a release to keep up with F16 diff --git a/nm-applet-internal-buildfixes.patch b/nm-applet-internal-buildfixes.patch index e588671..ad1d14c 100644 --- a/nm-applet-internal-buildfixes.patch +++ b/nm-applet-internal-buildfixes.patch @@ -1,14 +1,14 @@ -diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac 2009-07-28 13:11:39.261718877 -0400 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac.buildfix 2009-07-28 10:01:26.000000000 -0400 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/configure.ac 2009-07-28 13:11:39.261718877 -0400 @@ -70,10 +70,6 @@ PKG_CHECK_MODULES(GOBJECT, gobject-2.0) PKG_CHECK_MODULES(NMA, [dbus-glib-1 >= 0.74 glib-2.0 >= 2.16 -- NetworkManager >= 0.9.1 -- libnm-glib >= 0.9.1 -- libnm-util >= 0.9.1 -- libnm-glib-vpn >= 0.9.1 +- NetworkManager >= 0.9.2 +- libnm-glib >= 0.9.2 +- libnm-util >= 0.9.2 +- libnm-glib-vpn >= 0.9.2 gmodule-export-2.0]) PKG_CHECK_MODULES(GCONF, [gconf-2.0]) @@ -17,16 +17,16 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/configure.ac.bu AC_MSG_CHECKING(for gnome-bluetooth) PKG_CHECK_MODULES(GNOME_BLUETOOTH, - gnome-bluetooth-1.0 >= 2.27.6 -- libnm-util >= 0.9.1 -- libnm-glib >= 0.9.1, +- libnm-util >= 0.9.2 +- libnm-glib >= 0.9.2, + gnome-bluetooth-1.0 >= 2.27.6, have_gbt=yes, have_gbt=no) ;; esac -diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am.buildfix 2009-07-23 10:51:39.000000000 -0400 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/connection-editor/Makefile.am 2009-07-28 11:29:11.685841724 -0400 @@ -1,5 +1,9 @@ bin_PROGRAMS = nm-connection-editor @@ -49,9 +49,9 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/connection- uidir = $(datadir)/nm-applet ui_DATA = \ -diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am.buildfix 2009-04-20 07:09:10.000000000 -0400 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,5 +1,9 @@ SUBDIRS=. tests @@ -82,9 +82,9 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/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.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am.buildfix 2011-03-10 02:19:03.664936744 -0600 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gconf-helpers/tests/Makefile.am 2011-03-10 02:20:10.784097638 -0600 @@ -1,4 +1,7 @@ -INCLUDES = -I$(top_srcdir)/src/utils +INCLUDES = -I$(top_srcdir)/src/utils \ @@ -94,9 +94,9 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gconf-helpe noinst_PROGRAMS = test-upgrade -diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am.buildfix 2009-07-28 13:23:40.282718683 -0400 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/gnome-bluetooth/Makefile.am 2009-07-28 13:24:56.316719077 -0400 @@ -6,6 +6,9 @@ INCLUDES = \ -I${top_builddir}/src/marshallers \ -I${top_srcdir}/src/utils \ @@ -118,9 +118,9 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/gnome-bluet endif EXTRA_DIST = $(BT_WIDGET_SOURCES) -diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am.buildfix 2009-07-27 15:26:53.000000000 -0400 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -2,6 +2,10 @@ SUBDIRS = marshallers utils gconf-helper bin_PROGRAMS = nm-applet @@ -143,9 +143,9 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/Makefile.am uidir = $(datadir)/nm-applet ui_DATA = gsm-unlock.ui info.ui wired-8021x.ui keyring.png -diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,5 +1,9 @@ SUBDIRS=. tests @@ -165,9 +165,9 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/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.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/utils/tests/Makefile.am 2009-07-28 11:29:11.686841642 -0400 @@ -1,4 +1,7 @@ -INCLUDES = -I$(top_srcdir)/src/utils +INCLUDES = -I$(top_srcdir)/src/utils \ @@ -177,9 +177,9 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/utils/tests noinst_PROGRAMS = test-utils -diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am.buildfix NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am.buildfix 2009-07-02 16:32:26.000000000 -0400 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/wireless-security/Makefile.am 2009-07-28 11:29:11.687841490 -0400 @@ -1,5 +1,9 @@ noinst_LTLIBRARIES = libwireless-security.la @@ -202,9 +202,9 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/wireless-se uidir = $(datadir)/nm-applet ui_DATA = \ -diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am.blah NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am.blah 2011-09-19 23:44:41.648498871 -0500 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/Makefile.am 2011-09-19 23:45:26.556937440 -0500 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am.blah NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am.blah 2011-09-19 23:44:41.648498871 -0500 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/Makefile.am 2011-09-19 23:45:26.556937440 -0500 @@ -1,3 +1,7 @@ +INCLUDES = -I${top_srcdir}/../include \ + -I${top_srcdir}/../libnm-util \ @@ -213,7 +213,7 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/M uidir = $(datadir)/libnm-gtk ui_DATA = wifi.ui -@@ -36,11 +40,14 @@ libnm_gtk_la_LIBADD = \ +@@ -36,7 +40,10 @@ libnm_gtk_la_LIBADD = \ $(NMA_LIBS) \ $(GNOME_KEYRING_LIBS) \ $(top_builddir)/src/marshallers/libmarshallers.la \ @@ -223,11 +223,6 @@ diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/M + -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 - libnm_gtk_la_LDFLAGS = -Wl,-no-undefined - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libnm-gtk.pc - --EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA) -\ No newline at end of file -+EXTRA_DIST = libnm-gtk.pc.in $(ui_DATA) + libnm_gtk_la_LDFLAGS = -Wl,-no-undefined \ + -export-symbols-regex '^nma_.*' + diff --git a/nm-applet-no-notifications.patch b/nm-applet-no-notifications.patch index 542a03b..d86b5e9 100644 --- a/nm-applet-no-notifications.patch +++ b/nm-applet-no-notifications.patch @@ -1,6 +1,6 @@ -diff -up NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in.foo NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 +diff -up NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in.foo NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in.foo 2009-10-21 17:23:29.480267635 -0700 ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/nm-applet.schemas.in 2009-10-21 17:39:42.734142996 -0700 @@ -6,7 +6,7 @@ /apps/nm-applet/disable-connected-notifications nm-applet diff --git a/nm-applet-wifi-dialog-ui-fixes.patch b/nm-applet-wifi-dialog-ui-fixes.patch index 296c4ec..2b3a118 100644 --- a/nm-applet-wifi-dialog-ui-fixes.patch +++ b/nm-applet-wifi-dialog-ui-fixes.patch @@ -1,7 +1,7 @@ -diff --git NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c +diff --git NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c index 2cd75e0..5ae4764 100644 ---- NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c -+++ NetworkManager-0.9.1.90/network-manager-applet-0.9.1.90/src/libnm-gtk/nm-wireless-dialog.c +--- NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c ++++ NetworkManager-0.9.2.0/network-manager-applet-0.9.2.0/src/libnm-gtk/nm-wireless-dialog.c @@ -1151,24 +1151,28 @@ internal_init (NMAWirelessDialog *self, tmp = g_strdup_printf (_("Passwords or encryption keys are required to access the wireless network '%s'."), diff --git a/rh719100-dhcp-hostname-fix.patch b/rh719100-dhcp-hostname-fix.patch deleted file mode 100644 index 0bc8fb8..0000000 --- a/rh719100-dhcp-hostname-fix.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 74615ce23c8db9bbb4404860523feed1c9a5ffc8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= -Date: Thu, 20 Oct 2011 16:51:02 +0200 -Subject: [PATCH] policy: fix setting hostname from DHCP options (rh #719100) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This commit fixes a regression introduced by commit -6272052f9dd9a27a2253515f47c8414ed53c09cf. - -dhclient prefixes options with "new_", however we remove that prefix -before putting options into NMDHCP4Config. - -Signed-off-by: Jiří Klimeš ---- - src/nm-policy.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/nm-policy.c b/src/nm-policy.c -index 02292f7..5c4059e 100644 ---- a/src/nm-policy.c -+++ b/src/nm-policy.c -@@ -322,7 +322,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) - /* Grab a hostname out of the device's DHCP4 config */ - dhcp4_config = nm_device_get_dhcp4_config (best4); - if (dhcp4_config) { -- p = dhcp_hostname = nm_dhcp4_config_get_option (dhcp4_config, "new_host_name"); -+ p = dhcp_hostname = nm_dhcp4_config_get_option (dhcp4_config, "host_name"); - if (dhcp_hostname && strlen (dhcp_hostname)) { - /* Sanity check; strip leading spaces */ - while (*p) { -@@ -341,7 +341,7 @@ update_system_hostname (NMPolicy *policy, NMDevice *best4, NMDevice *best6) - /* Grab a hostname out of the device's DHCP6 config */ - dhcp6_config = nm_device_get_dhcp6_config (best6); - if (dhcp6_config) { -- p = dhcp_hostname = nm_dhcp6_config_get_option (dhcp6_config, "new_host_name"); -+ p = dhcp_hostname = nm_dhcp6_config_get_option (dhcp6_config, "host_name"); - if (dhcp_hostname && strlen (dhcp_hostname)) { - /* Sanity check; strip leading spaces */ - while (*p) { --- -1.7.6.4 - diff --git a/sources b/sources index face1a7..1f37bbf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -485df497921ae4a9eba8f25fb2b5fc81 NetworkManager-0.9.1.90.git20110927.tar.bz2 -c8f0627d303ed3893c38e151086ad5a5 network-manager-applet-0.9.1.90.git20110927.tar.bz2 +bc0b00b8a187762d93c50a9706b4c5c3 NetworkManager-0.9.2.0.tar.bz2 +feaf2c8427d23924dde7de52ff4c5078 network-manager-applet-0.9.2.0.tar.bz2