summaryrefslogtreecommitdiff
path: root/misc/screen
diff options
context:
space:
mode:
authorhe <he>2015-01-12 14:24:40 +0000
committerhe <he>2015-01-12 14:24:40 +0000
commitde0233ea5ac938390649092ae185489d32b457b0 (patch)
tree3f600ec4d24dae130ad17b1349a4fcd079d7aa67 /misc/screen
parentca92e7a4e5b44c4d9fb511806a56000a32cf60e2 (diff)
downloadpkgsrc-de0233ea5ac938390649092ae185489d32b457b0.tar.gz
The NetBSD -5 branch's version of realpath() insists on a non-NULL
second argument, so make the usage cater for that. Bump PKGREVISION.
Diffstat (limited to 'misc/screen')
-rw-r--r--misc/screen/Makefile4
-rw-r--r--misc/screen/distinfo3
-rw-r--r--misc/screen/patches/patch-tty.c19
3 files changed, 23 insertions, 3 deletions
diff --git a/misc/screen/Makefile b/misc/screen/Makefile
index 357deefecb1..9d75cc55247 100644
--- a/misc/screen/Makefile
+++ b/misc/screen/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2014/10/09 14:06:43 wiz Exp $
+# $NetBSD: Makefile,v 1.91 2015/01/12 14:24:40 he Exp $
DISTNAME= screen-4.2.1
-#PKGREVISION=
+PKGREVISION= 1
CATEGORIES= misc shells
MASTER_SITES= ${MASTER_SITE_GNU:=screen/}
diff --git a/misc/screen/distinfo b/misc/screen/distinfo
index 3634d383924..53892a5caa4 100644
--- a/misc/screen/distinfo
+++ b/misc/screen/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2014/08/25 20:02:32 kim Exp $
+$NetBSD: distinfo,v 1.35 2015/01/12 14:24:40 he Exp $
SHA1 (screen-4.2.1.tar.gz) = 21eadf5f1d64120649f3390346253c6bc8a5103c
RMD160 (screen-4.2.1.tar.gz) = 20ddf4a33f91e60a42a31f02aa2a30a9c5cba9b5
@@ -15,3 +15,4 @@ SHA1 (patch-an) = 2984db4597a1b09450a6632d0b9b7fb05a0ccb06
SHA1 (patch-ao) = d5d0eca07045b83ec06ee284e754c24ae90b405c
SHA1 (patch-ap) = 5082cf450f4cfa85570540504f1691ee2676dec4
SHA1 (patch-as) = 79af75200cbe428be9bb78ebf9aeba9f23a52eec
+SHA1 (patch-tty.c) = 5bbcacd286f9b936d516746762f8d02c5218920d
diff --git a/misc/screen/patches/patch-tty.c b/misc/screen/patches/patch-tty.c
new file mode 100644
index 00000000000..d519ab46388
--- /dev/null
+++ b/misc/screen/patches/patch-tty.c
@@ -0,0 +1,19 @@
+$NetBSD: patch-tty.c,v 1.1 2015/01/12 14:24:40 he Exp $
+
+NetBSD on the netbsd-5 branch insists on a non-NULL second argument
+to the realpath() function. Make it so.
+
+--- tty.c.orig 2015-01-12 09:30:15.000000000 +0000
++++ tty.c
+@@ -1833,8 +1833,10 @@ char *tty;
+ struct stat st;
+ char * real;
+ int rc;
++ char *ttynamebuf;
+
+- real = realpath(tty, NULL);
++ ttynamebuf = malloc(MAXPATHLEN);
++ real = realpath(tty, ttynamebuf);
+ if (!real)
+ return -1;
+