From fba09b2ea9a3c4d861a06886d8f668b8e6a6d412 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 17 Aug 2009 21:34:38 +0000 Subject: Just fix our patch 04-struct_termios.patch instead of adding a new patch. git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/networkmanager@3221 ceb527fc-18e6-0310-9fe2-813c157c29e7 --- debian/changelog | 5 ----- debian/patches/04-struct_termios.patch | 2 +- debian/patches/05-response-buffer-filled.patch | 19 ------------------- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 debian/patches/05-response-buffer-filled.patch diff --git a/debian/changelog b/debian/changelog index 5d490c72..acb1c1aa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,11 +20,6 @@ network-manager (0.7.1-2) UNRELEASED; urgency=low * debian/control - Add libnm-util-dev to the depends of libnm-glib-dev. (Closes: #539888) - [ 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. - -- Michael Biebl Sun, 16 Aug 2009 03:00:50 +0200 network-manager (0.7.1-1) unstable; urgency=low diff --git a/debian/patches/04-struct_termios.patch b/debian/patches/04-struct_termios.patch index 9b38e0bf..bddb0394 100644 --- a/debian/patches/04-struct_termios.patch +++ b/debian/patches/04-struct_termios.patch @@ -42,7 +42,7 @@ index 1cba1ca..afdc6a6 100644 stbuf.c_cflag |= (speed | bits | CREAD | 0 | parity | stopbits); - if (ioctl (priv->fd, TCSETA, &stbuf) < 0) { -+ 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/05-response-buffer-filled.patch b/debian/patches/05-response-buffer-filled.patch deleted file mode 100644 index 3a8a731a..00000000 --- a/debian/patches/05-response-buffer-filled.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 793cc30b5d20d728719c568f5bfac98f3bca3dca -Author: Robert Piasek -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; -- cgit 1.3.0-6-gf8a5