rpms/NetworkManager
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge commit '38ea3e9999aff478d05f59c739bc593bc97e2791'

Browse Source 
Conflicts:
	.gitignore
	NetworkManager.spec
This commit is contained in:
Adam Williamson 2011-11-09 11:36:18 -08:00
commit 3a8d9ca672
3 changed files with 52 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -260,5 +260,7 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-0.9.0.tar.bz2
/network-manager-applet-0.9.0.tar.bz2
/NetworkManager-0.9.1.90.tar.xz
/NetworkManager-0.9.1.90.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

8
NetworkManager.spec
View File

@ -15,7 +15,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications
Epoch: 1
Version: 0.9.1.90
Release: 4%{snapshot}%{?dist}
Release: 5%{snapshot}%{?dist}
Group: System Environment/Base
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
@ -28,6 +28,7 @@ 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
@ -190,6 +191,7 @@ 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
@ -458,8 +460,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so
%changelog
* Wed Oct 26 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.9.1.90-4.git20110927
* Wed Nov 9 2011 Adam Williamson <awilliam@redhat.com> - 1:0.9.1.90-5.git20110927
- Rebuilt for glibc bug#747377
- core: fix setting hostname from DHCP options (rh #719100)
- skip a release to keep up with F16
* Tue Sep 27 2011 Dan Williams <dcbw@redhat.com> - 0.9.1.90-3.git20110927
- core: fix location of wifi.ui (rh #741448)

44
rh719100-dhcp-hostname-fix.patch Normal file
View File

@ -0,0 +1,44 @@
From 74615ce23c8db9bbb4404860523feed1c9a5ffc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
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š <jklimes@redhat.com>
---
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