about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2009-07-08 20:15:19 +0000
committerSimon McVittie <smcv@debian.org>2009-07-08 20:15:19 +0000
commit1d9798ef284edc4d614832296362cbe6462aa5ff (patch)
treea3188ea8511572906503b5ba5bc4072aa5142376
parent889825bc82129ab7563785ffbb2870b87dd80b45 (diff)
debian/patches/05-response-buffer-filled.patch: new, from upstream git
0.7 branch. Fixes "response buffer filled before repsonse received" (sic)
during communication with serial modems.

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3151 ceb527fc-18e6-0310-9fe2-813c157c29e7
-rw-r--r--debian/changelog5
-rw-r--r--debian/patches/05-response-buffer-filled.patch19
-rw-r--r--debian/patches/series1
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 7ddaad1f..7e351dcd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low
   * debian/control
     - Add libnm-util-dev to the depends of libnm-glib-dev
 
+  [ Simon McVittie ]
+  * debian/patches/05-response-buffer-filled.patch: new, from upstream git
+    0.7 branch. Fixes "response buffer filled before repsonse received" (sic)
+    during communication with serial modems.
+
  -- Sjoerd Simons <sjoerd@debian.org>  Tue, 30 Jun 2009 16:18:28 +0100
 
 network-manager (0.7.1-1) unstable; urgency=low
diff --git a/debian/patches/05-response-buffer-filled.patch b/debian/patches/05-response-buffer-filled.patch
new file mode 100644
index 00000000..3a8a731a
--- /dev/null
+++ b/debian/patches/05-response-buffer-filled.patch
@@ -0,0 +1,19 @@
+commit 793cc30b5d20d728719c568f5bfac98f3bca3dca
+Author: Robert Piasek <robert@piasek.co.uk>
+Date:   2009-06-22 11:57:28 -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;
diff --git a/debian/patches/series b/debian/patches/series
index 9f9fb610..15d456d1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 #03-F3507g.patch
 #20-manual_means_always_online.patch
 04-struct_termios.patch
+05-response-buffer-filled.patch