Sat Nov 7 21:47:07 2015 UTC ()
If we're going to use <termios.h>, which is reasonable, don't also use
<sgtty.h>. Hi joerg...


(dholland)
diff -r1.16 -r1.17 pkgsrc/chat/i2cb/distinfo
diff -r1.3 -r1.4 pkgsrc/chat/i2cb/patches/patch-aw
cvs diff -r1.16 -r1.17 pkgsrc/chat/i2cb/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/i2cb/distinfo 2015/11/03 01:20:19 1.16
+++ pkgsrc/chat/i2cb/distinfo 2015/11/07 21:47:07 1.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.16 2015/11/03 01:20:19 agc Exp $ 1$NetBSD: distinfo,v 1.17 2015/11/07 21:47:07 dholland Exp $
2 2
3SHA1 (i2cb-6.0_ALPHA.tar.gz) = 6d2ddd234403fe33426ece3fd4de4104cf1a6257 3SHA1 (i2cb-6.0_ALPHA.tar.gz) = 6d2ddd234403fe33426ece3fd4de4104cf1a6257
4RMD160 (i2cb-6.0_ALPHA.tar.gz) = 2c0683c20939fe5709fa08b6e335cbee2574ecd8 4RMD160 (i2cb-6.0_ALPHA.tar.gz) = 2c0683c20939fe5709fa08b6e335cbee2574ecd8
5SHA512 (i2cb-6.0_ALPHA.tar.gz) = a354f61a427bef7526371ac39926b4e4a14b2e98218e971786e727d25b9a4006d1f6b1cb87476ca733e76844da44b9d7a4ee97bfaab0c641b265b0b4681c2bfd 5SHA512 (i2cb-6.0_ALPHA.tar.gz) = a354f61a427bef7526371ac39926b4e4a14b2e98218e971786e727d25b9a4006d1f6b1cb87476ca733e76844da44b9d7a4ee97bfaab0c641b265b0b4681c2bfd
6Size (i2cb-6.0_ALPHA.tar.gz) = 73607 bytes 6Size (i2cb-6.0_ALPHA.tar.gz) = 73607 bytes
7SHA1 (patch-aa) = 4822a49729fe6e0a6a3d9554a0386c94fd099b39 7SHA1 (patch-aa) = 4822a49729fe6e0a6a3d9554a0386c94fd099b39
8SHA1 (patch-ab) = 358b366c16290d6d2326e72c281f977e49a8a98b 8SHA1 (patch-ab) = 358b366c16290d6d2326e72c281f977e49a8a98b
9SHA1 (patch-ac) = 9eba04f74fb94f555e5434885eda49be53b894d5 9SHA1 (patch-ac) = 9eba04f74fb94f555e5434885eda49be53b894d5
10SHA1 (patch-ad) = 9dcb98fe3543d8e4a7b2af338606db8ffe271f56 10SHA1 (patch-ad) = 9dcb98fe3543d8e4a7b2af338606db8ffe271f56
11SHA1 (patch-ae) = 0f8765883c2b7e77394556405ee7fee7a054ad56 11SHA1 (patch-ae) = 0f8765883c2b7e77394556405ee7fee7a054ad56
12SHA1 (patch-af) = 821de5d1a9a8a1e3dfb5de4ef92737f40f01e03e 12SHA1 (patch-af) = 821de5d1a9a8a1e3dfb5de4ef92737f40f01e03e
13SHA1 (patch-ag) = 5f78d326406e98d912acd0388d0bb98d2d4bd459 13SHA1 (patch-ag) = 5f78d326406e98d912acd0388d0bb98d2d4bd459
14SHA1 (patch-ah) = 1785c0f09a7a0f83b7cb886e9e749959b1753972 14SHA1 (patch-ah) = 1785c0f09a7a0f83b7cb886e9e749959b1753972
@@ -16,21 +16,21 @@ SHA1 (patch-ai) = f2b83d20f6357dd6cb3e46 @@ -16,21 +16,21 @@ SHA1 (patch-ai) = f2b83d20f6357dd6cb3e46
16SHA1 (patch-aj) = 710c961ce5f88d7462154e42ed4aab3b4ba56b38 16SHA1 (patch-aj) = 710c961ce5f88d7462154e42ed4aab3b4ba56b38
17SHA1 (patch-ak) = 0b907a2f7104e0e05a3ec62859190c9203960a91 17SHA1 (patch-ak) = 0b907a2f7104e0e05a3ec62859190c9203960a91
18SHA1 (patch-al) = 4c8b87c515fd7278dcfb37b62a44317e7d95442d 18SHA1 (patch-al) = 4c8b87c515fd7278dcfb37b62a44317e7d95442d
19SHA1 (patch-am) = 24d700b5e95248bc54253893bfbf4a664db50ace 19SHA1 (patch-am) = 24d700b5e95248bc54253893bfbf4a664db50ace
20SHA1 (patch-an) = 2b6db4e59da609a03c6cbe23d1866e01a48af756 20SHA1 (patch-an) = 2b6db4e59da609a03c6cbe23d1866e01a48af756
21SHA1 (patch-ao) = 73d6915d68bd02fbfc0e481f42f4626bbce18882 21SHA1 (patch-ao) = 73d6915d68bd02fbfc0e481f42f4626bbce18882
22SHA1 (patch-ap) = f04fea14ab6a07095f6b2f95c693988563aa4f3a 22SHA1 (patch-ap) = f04fea14ab6a07095f6b2f95c693988563aa4f3a
23SHA1 (patch-aq) = f07edc14636f1321f8c0b5c98e4962f3bfb1eee5 23SHA1 (patch-aq) = f07edc14636f1321f8c0b5c98e4962f3bfb1eee5
24SHA1 (patch-ar) = 9fea79c9d7f701962e40f1b311c38b538029e633 24SHA1 (patch-ar) = 9fea79c9d7f701962e40f1b311c38b538029e633
25SHA1 (patch-as) = 04caba156b07ef94552227b434ed51b83123b078 25SHA1 (patch-as) = 04caba156b07ef94552227b434ed51b83123b078
26SHA1 (patch-at) = 3f296af5201612777491b3c95d44a1840bc5c8e0 26SHA1 (patch-at) = 3f296af5201612777491b3c95d44a1840bc5c8e0
27SHA1 (patch-au) = 591bae1fcfe43ba86ec29c5ca53322bad5b572e7 27SHA1 (patch-au) = 591bae1fcfe43ba86ec29c5ca53322bad5b572e7
28SHA1 (patch-av) = 3ebe9872953147e9694f36e76584482167d2f34a 28SHA1 (patch-av) = 3ebe9872953147e9694f36e76584482167d2f34a
29SHA1 (patch-aw) = 27e6c09d15f7f0ece6337c6c14d66de2424a4068 29SHA1 (patch-aw) = 4027f62aed11ef66d7bbe226ccd1bf7806ecaf57
30SHA1 (patch-ax) = 610a34662113e800fa7455422b170312ef92fe4d 30SHA1 (patch-ax) = 610a34662113e800fa7455422b170312ef92fe4d
31SHA1 (patch-ay) = 442fdc77dfe58676c17212d4343ffba42ce44b8b 31SHA1 (patch-ay) = 442fdc77dfe58676c17212d4343ffba42ce44b8b
32SHA1 (patch-az) = 7e0cd06b7085bbbf451bedf406564f30c82a5aaf 32SHA1 (patch-az) = 7e0cd06b7085bbbf451bedf406564f30c82a5aaf
33SHA1 (patch-src_Makefile) = 1870de457bd29681313a72d6a977b69be5d42bd7 33SHA1 (patch-src_Makefile) = 1870de457bd29681313a72d6a977b69be5d42bd7
34SHA1 (patch-src_oset.c) = db0d3dbf3bd062330e548dc3507a486677931f16 34SHA1 (patch-src_oset.c) = db0d3dbf3bd062330e548dc3507a486677931f16
35SHA1 (patch-src_readlineinit.c) = 1a40db69bdea5d0d3cb96a817d502b0c08499721 35SHA1 (patch-src_readlineinit.c) = 1a40db69bdea5d0d3cb96a817d502b0c08499721
36SHA1 (patch-src_signals.c) = 9a9070a8c6f7350711e340cb6c18b59dfdf8f2ce 36SHA1 (patch-src_signals.c) = 9a9070a8c6f7350711e340cb6c18b59dfdf8f2ce
cvs diff -r1.3 -r1.4 pkgsrc/chat/i2cb/patches/patch-aw (expand / switch to unified diff)

--- pkgsrc/chat/i2cb/patches/patch-aw 2013/08/31 14:45:43 1.3
+++ pkgsrc/chat/i2cb/patches/patch-aw 2015/11/07 21:47:07 1.4
@@ -1,32 +1,69 @@ @@ -1,32 +1,69 @@
1$NetBSD: patch-aw,v 1.3 2013/08/31 14:45:43 joerg Exp $ 1$NetBSD: patch-aw,v 1.4 2015/11/07 21:47:07 dholland Exp $
 2
 3- Use standard headers.
 4- Throw out a raft of legacy sgtty/termio logic.
 5- Don't fail if NAME_MAX is missing.
2 6
3--- src/unix.c.orig 2000-03-15 22:13:29.000000000 +0000 7--- src/unix.c.orig 2000-03-15 22:13:29.000000000 +0000
4+++ src/unix.c 8+++ src/unix.c
5@@ -6,11 +6,14 @@ 9@@ -6,11 +6,14 @@
6  10
7 #include <sys/types.h> 11 #include <sys/types.h>
8 #include <sys/param.h> 12 #include <sys/param.h>
9+#include <sys/ioctl.h> 13+#include <sys/ioctl.h>
10 #include <stdio.h> 14 #include <stdio.h>
11 #include <stdlib.h> 15 #include <stdlib.h>
12 #include <string.h> 16 #include <string.h>
13 #include <pwd.h> 17 #include <pwd.h>
14-#include <sys/dir.h> 18-#include <sys/dir.h>
15+#include <dirent.h> 19+#include <dirent.h>
16+#include <limits.h> 20+#include <limits.h>
17+#include <termios.h> 21+#include <termios.h>
18 #include <time.h> 22 #include <time.h>
19 #include <unistd.h> 23 #include <unistd.h>
20 #include "icb.h" 24 #include "icb.h"
21@@ -235,7 +238,11 @@ tildexpand (char *s) 25@@ -32,32 +35,10 @@ void noecho (void);
 26 #undef stty
 27 #undef gtty
 28
 29-#if defined(__linux__)
 30-#include <termios.h>
 31-#include <sys/ioctl.h>
 32 #define TTYSTRUCT termios
 33 #define stty(fd,buf) tcgetattr((fd), (buf))
 34 #define gtty(fd,buf) tcsetattr((fd), TCSANOW, (buf))
 35 #define SYSV
 36-#else
 37-#ifndef SYSV
 38-
 39-#ifdef linux
 40-#include <bsd/sgtty.h>
 41-#else
 42-#include <sgtty.h>
 43-#endif
 44-
 45-#define TTYSTRUCT sgttyb
 46-#define stty(fd,buf) ioctl((fd),TIOCSETN,(buf))
 47-#define gtty(fd,buf) ioctl((fd),TIOCGETP,(buf))
 48-#else /* SYSV */
 49-#include <termio.h>
 50-#define TTYSTRUCT termio
 51-#define stty(fd,buf) ioctl((fd),TCSETA,(buf))
 52-#define gtty(fd,buf) ioctl((fd),TCGETA,(buf))
 53-#endif /* SYSV */
 54-#endif /* __linux__ */
 55
 56 char *getlogin();
 57
 58@@ -235,7 +216,11 @@ tildexpand (char *s)
22 struct passwd *pw; 59 struct passwd *pw;
23 char login[17]; 60 char login[17];
24 char *p = login; 61 char *p = login;
25+#ifdef NAME_MAX 62+#ifdef NAME_MAX
26+ static char path[NAME_MAX + 1]; 63+ static char path[NAME_MAX + 1];
27+#else 64+#else
28 static char path[MAXNAMLEN+1]; 65 static char path[MAXNAMLEN+1];
29+#endif 66+#endif
30  67
31 /* has to start with a tilde */ 68 /* has to start with a tilde */
32 if (*s++ != '~') 69 if (*s++ != '~')