- nm: fix serial port settings

NetworkManager.spec

@@ -16,7 +16,7 @@ Name: NetworkManager
 Summary: Network connection manager and user applications
 Epoch: 1
 Version: 0.7.1
-Release: 5%{snapshot}%{?dist}
+Release: 6%{snapshot}%{?dist}
 Group: System Environment/Base
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
@@ -26,6 +26,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: nm-serial-port-settings-fix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 PreReq:   chkconfig
@@ -143,8 +144,10 @@ NetworkManager functionality from applications that use glib.
 
 # unpack the applet
 tar -xjf %{SOURCE1}
+
 %patch1 -p1 -b .buildfix
 %patch2 -p1 -b .explain-dns1-dns2
+%patch3 -p1 -b .serial
 
 %build
 
@@ -325,6 +328,9 @@ fi
 %{_datadir}/gtk-doc/html/libnm-util/*
 
 %changelog
+* Thu Jun 25 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-6.git20090617
+- nm: fix serial port settings
+
 * Wed Jun 17 2009 Dan Williams <dcbw@redhat.com> - 0.7.1-5.git20090617
 - nm: fix AT&T Quicksilver modem connections (rh #502002)
 - nm: fix support for s390 bus types (rh #496820)

nm-serial-port-settings-fix.patch

@@ -0,0 +1,19 @@
+commit 793cc30b5d20d728719c568f5bfac98f3bca3dca
+Author: Robert Piasek <robert@piasek.co.uk>
+Date:   Mon Jun 22 11:57:28 2009 -0400
+
+    serial: fix serial port settings bug caused by 31a34fa7ffbceb79d5e6c16158e5dcce285dcff1
+
+diff --git a/src/nm-serial-device.c b/src/nm-serial-device.c
+index 54dd176..ad481d3 100644
+--- a/src/nm-serial-device.c
++++ b/src/nm-serial-device.c
+@@ -368,7 +368,7 @@ config_fd (NMSerialDevice *device, NMSettingSerial *setting)
+ 	stbuf.c_cflag &= ~(CBAUD | CSIZE | CSTOPB | CLOCAL | PARENB);
+ 	stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits);
+ 
+-	if (tcgetattr (priv->fd, &stbuf) < 0) {
++	if (tcsetattr (priv->fd, TCSANOW, &stbuf) < 0) {
+ 		nm_warning ("(%s) cannot control device (errno %d)",
+ 		            nm_device_get_iface (NM_DEVICE (device)), errno);
+ 		return FALSE;