summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorchristos <christos@pkgsrc.org>2013-07-30 19:15:30 +0000
committerchristos <christos@pkgsrc.org>2013-07-30 19:15:30 +0000
commitc99d61d9645f381970bf38e7ddb7b5edc79959d5 (patch)
tree7ab64d49ad30f42745fce3591b73ae7d0e8d416e /net
parentfb12b4a6ff1d82d9e6dd22ad58b99864888857e8 (diff)
downloadpkgsrc-c99d61d9645f381970bf38e7ddb7b5edc79959d5.tar.gz
PR/48100: Gergely Egervary: Fix compilation on older NetBSD systems.
Diffstat (limited to 'net')
-rw-r--r--net/xl2tpd/distinfo4
-rw-r--r--net/xl2tpd/patches/patch-pty.c21
2 files changed, 17 insertions, 8 deletions
diff --git a/net/xl2tpd/distinfo b/net/xl2tpd/distinfo
index f2a8fcf7c2f..59e0e637cd2 100644
--- a/net/xl2tpd/distinfo
+++ b/net/xl2tpd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2013/07/18 12:06:39 joerg Exp $
+$NetBSD: distinfo,v 1.4 2013/07/30 19:15:30 christos Exp $
SHA1 (xl2tpd-20130626.zip) = f115483cd04c8cd1af183be21842d13ce34fdc66
RMD160 (xl2tpd-20130626.zip) = 1a53199f5a288811fcd540b93812293a95c4ced5
@@ -11,5 +11,5 @@ SHA1 (patch-md5.c) = cc100db8b9314a86a96464cde4df78c387b56e9a
SHA1 (patch-misc.c) = 8c1b0bff81af1f5718cbf1d02e4f47fcad14c9a9
SHA1 (patch-misc.h) = dd7a42bee5a16cc583bfcfc31b1fc589d39515ab
SHA1 (patch-network.c) = b6a95181583ee8edace5fe05beb83534da200901
-SHA1 (patch-pty.c) = 7a4e00937a4d9ce0f36475047e926c16c5ba76b6
+SHA1 (patch-pty.c) = ac51a96aba040ae22d9208fa48923a284270a529
SHA1 (patch-xl2tpd.c) = f80c11eaf57d77ffdb17d7584e03cc889ebde767
diff --git a/net/xl2tpd/patches/patch-pty.c b/net/xl2tpd/patches/patch-pty.c
index 02e63c92e5c..c25bb9f3827 100644
--- a/net/xl2tpd/patches/patch-pty.c
+++ b/net/xl2tpd/patches/patch-pty.c
@@ -1,12 +1,21 @@
-$NetBSD: patch-pty.c,v 1.1 2013/07/02 00:22:17 christos Exp $
+$NetBSD: patch-pty.c,v 1.2 2013/07/30 19:15:30 christos Exp $
Fix pty allocation to use openpty(3) for all BSD's
Fix closing slave bug.
Set the pty queue size if we have it.
+Set set _NETBSRC_SOURCE for older NetBSD versions and sockaddr_storage.
---- pty.c 2013-06-17 06:17:24.000000000 -0400
-+++ pty.c 2013-06-24 15:53:14.000000000 -0400
-@@ -25,10 +25,10 @@
+--- pty.c.orig 2013-06-17 06:17:24.000000000 -0400
++++ pty.c 2013-07-30 14:58:46.000000000 -0400
+@@ -17,6 +17,7 @@
+ #define _ISOC99_SOURCE
+ #define _XOPEN_SOURCE
+ #define _BSD_SOURCE
++#define _NETBSD_SOURCE
+ #define _XOPEN_SOURCE_EXTENDED
+
+ #include <stdlib.h>
+@@ -25,10 +26,10 @@
#include <errno.h>
#include <stdio.h>
#include <fcntl.h>
@@ -18,7 +27,7 @@ Set the pty queue size if we have it.
#ifdef SOLARIS
#define PTY00 "/dev/ptyXX"
#define PTY10 "pqrstuvwxyz"
-@@ -41,13 +41,12 @@
+@@ -41,13 +42,12 @@
#define PTY01 "0123456789abcdef"
#endif
@@ -36,7 +45,7 @@ Set the pty queue size if we have it.
int getPtyMaster_pty (char *tty10, char *tty01)
{
char *p10;
-@@ -110,56 +109,63 @@
+@@ -110,56 +110,63 @@
return fd;
}