← Back to branch summary

~ubuntu-branches/ubuntu/saucy/net-tools/saucy-proposed

« back to all changes in this revision

Viewing changes to debian/patches/CVS-20051204-slttach.c_sync.patch

  • Committer: Bazaar Package Importer
  • Author(s): Muharem Hrnjadovic
  • Date: 2009-05-04 12:29:43 UTC
  • mfrom: (3.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090504122943-6zyafjosb8a1u21q
Tags: 1.60-23ubuntu1
https://launchpad.net/bugs/240073
https://launchpad.net/bugs/66209
* Merge from debian unstable, remaining changes:
  Ubuntu_unit_conversion.patch:
    - the diff-style patch was converted into quilt format
    - Ubuntu Policy: output using standard SI unit multiples:
      KB (10^3), MB (10^6), GB (10^9), TB (10^12) and PB (10^15).
      Includes manpage update to remove comment about IEC units.
      LP: #240073.
  Dropped patches, already in debian:
    - lib/ec_hw.c: #include <stddef.h to get definition of NULL.
    - lib/fddi.c: #include <linux/types.h> to get types.  LP: #66209.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/CVS-20051204-slttach.c_sync.patch
 
1
Sync with upstream CVS, complete log:
 
2
 
 
3
Revision 1.11 - Sun Dec 4 05:15:36 2005 UTC by ecki
 
4
use file version
 
5
 
 
6
Revision 1.10 - Sun Dec 4 05:14:08 2005 UTC by ecki
 
7
make slattach 3-wire -L mode work (no RTSCTS) (Debian Bug #175743)
 
8
 
 
9
Index: net-tools/slattach.c
 
10
===================================================================
 
11
--- net-tools.orig/slattach.c
 
12
+++ net-tools/slattach.c
 
13
@@ -73,7 +73,7 @@
 
14
 
 
15
 
 
16
 const char *Release = RELEASE,
 
17
-          *Version = "@(#) slattach 1.21 (1999-11-21)",
 
18
+          *Version = "$Id: slattach.c,v 1.11 2005/12/04 05:15:36 ecki Exp $",
 
19
           *Signature = "net-tools, Fred N. van Kempen et al.";
 
20
 
 
21
 
 
22
@@ -115,7 +115,7 @@ int         opt_h = 0;              /* "hangup" on carrier 
 
23
 int            opt_k = 0;              /* "keepalive" value            */
 
24
 #endif
 
25
 int            opt_l = 0;              /* "lock it" flag               */
 
26
-int            opt_L = 0;              /* clocal flag                  */
 
27
+int            opt_L = 0;              /* 3-wire mode flag             */
 
28
 int            opt_m = 0;              /* "set RAW mode" flag          */
 
29
 int            opt_n = 0;              /* "set No Mesg" flag           */
 
30
 #ifdef SIOCSOUTFILL
 
31
@@ -342,9 +342,11 @@ tty_set_raw(struct termios *tty)
 
32
   tty->c_oflag = (0);                          /* output flags         */
 
33
   tty->c_lflag = (0);                          /* local flags          */
 
34
   speed = (tty->c_cflag & CBAUD);              /* save current speed   */
 
35
-  tty->c_cflag = (CRTSCTS | HUPCL | CREAD);    /* UART flags           */
 
36
+  tty->c_cflag = (HUPCL | CREAD);              /* UART flags           */
 
37
   if (opt_L) 
 
38
        tty->c_cflag |= CLOCAL;
 
39
+  else
 
40
+       tty->c_cflag |= CRTSCTS;
 
41
   tty->c_cflag |= speed;                       /* restore speed        */
 
42
   return(0);
 
43
 }