diff options
author | he <he> | 2015-01-13 08:27:28 +0000 |
---|---|---|
committer | he <he> | 2015-01-13 08:27:28 +0000 |
commit | a97c757d413faa67c11c5694cca1142e3b805819 (patch) | |
tree | 4aa5d5c0daff99a11797bbeb00cb89a6c0d53d96 /misc/screen | |
parent | 471a1ce37a3089f4565b28e0ab6e495ccd246e78 (diff) | |
download | pkgsrc-a97c757d413faa67c11c5694cca1142e3b805819.tar.gz |
Remove patch for a generated(!) file. Remove the old-style-named patch
which already tweaked the tty.sh file, name it according to the new rules.
This is to actually get the netbsd-5 branch working with this, since
realpath() insists on a non-NULL second argument.
Diffstat (limited to 'misc/screen')
-rw-r--r-- | misc/screen/Makefile | 5 | ||||
-rw-r--r-- | misc/screen/distinfo | 5 | ||||
-rw-r--r-- | misc/screen/patches/patch-as | 14 | ||||
-rw-r--r-- | misc/screen/patches/patch-tty.c | 19 | ||||
-rw-r--r-- | misc/screen/patches/patch-tty.sh | 31 |
5 files changed, 36 insertions, 38 deletions
diff --git a/misc/screen/Makefile b/misc/screen/Makefile index 9d75cc55247..c50b9e1bafc 100644 --- a/misc/screen/Makefile +++ b/misc/screen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.91 2015/01/12 14:24:40 he Exp $ +# $NetBSD: Makefile,v 1.92 2015/01/13 08:27:28 he Exp $ DISTNAME= screen-4.2.1 PKGREVISION= 1 @@ -42,12 +42,13 @@ post-install: screen-terminfo . endif .endif +INSTALLATION_DIRS+= share/examples/screen + .if empty(UNPRIVILEGED:M[Yy][Ee][Ss]) SPECIAL_PERMS+= bin/${DISTNAME} ${SETUID_ROOT_PERMS} .endif post-install: - ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/screen ${INSTALL_DATA} ${WRKSRC}/etc/etcscreenrc \ ${DESTDIR}${PREFIX}/share/examples/screen/etcscreenrc ${INSTALL_DATA} ${WRKSRC}/etc/screenrc \ diff --git a/misc/screen/distinfo b/misc/screen/distinfo index 53892a5caa4..3d88b5894b5 100644 --- a/misc/screen/distinfo +++ b/misc/screen/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.35 2015/01/12 14:24:40 he Exp $ +$NetBSD: distinfo,v 1.36 2015/01/13 08:27:28 he Exp $ SHA1 (screen-4.2.1.tar.gz) = 21eadf5f1d64120649f3390346253c6bc8a5103c RMD160 (screen-4.2.1.tar.gz) = 20ddf4a33f91e60a42a31f02aa2a30a9c5cba9b5 @@ -14,5 +14,4 @@ SHA1 (patch-am) = 5fdc32f33ebbb5385292919f6cd01bedc30491d9 SHA1 (patch-an) = 2984db4597a1b09450a6632d0b9b7fb05a0ccb06 SHA1 (patch-ao) = d5d0eca07045b83ec06ee284e754c24ae90b405c SHA1 (patch-ap) = 5082cf450f4cfa85570540504f1691ee2676dec4 -SHA1 (patch-as) = 79af75200cbe428be9bb78ebf9aeba9f23a52eec -SHA1 (patch-tty.c) = 5bbcacd286f9b936d516746762f8d02c5218920d +SHA1 (patch-tty.sh) = f93a3e2063df25c2610c6e84a623f3dc2046761b diff --git a/misc/screen/patches/patch-as b/misc/screen/patches/patch-as deleted file mode 100644 index f9a4031aaf8..00000000000 --- a/misc/screen/patches/patch-as +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-as,v 1.2 2014/08/25 20:02:32 kim Exp $ - ---- tty.sh.orig 2014-04-26 16:29:40.000000000 +0000 -+++ tty.sh 2014-08-25 19:44:59.000000000 +0000 -@@ -812,7 +812,8 @@ - /* - * Under BSD we have to set the controlling terminal again explicitly. - */ --# if (defined(__FreeBSD_kernel__) || defined(__GNU__)) && defined(TIOCSCTTY) -+# if (defined(__FreeBSD_kernel__) || defined(__GNU__) || (BSD >= 199103)) \ -+ && defined(TIOCSCTTY) - ioctl(fd, TIOCSCTTY, (char *)0); - # endif - diff --git a/misc/screen/patches/patch-tty.c b/misc/screen/patches/patch-tty.c deleted file mode 100644 index d519ab46388..00000000000 --- a/misc/screen/patches/patch-tty.c +++ /dev/null @@ -1,19 +0,0 @@ -$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; - diff --git a/misc/screen/patches/patch-tty.sh b/misc/screen/patches/patch-tty.sh new file mode 100644 index 00000000000..9d9e5511782 --- /dev/null +++ b/misc/screen/patches/patch-tty.sh @@ -0,0 +1,31 @@ +$NetBSD: patch-tty.sh,v 1.1 2015/01/13 08:27:28 he Exp $ + +Change condition for using TIOCSCTTY. + +NetBSD on the netbsd-5 branch insists on a non-NULL second argument +to the realpath() function. Make it so. + +--- tty.sh.orig 2014-04-26 16:29:40.000000000 +0000 ++++ tty.sh +@@ -812,7 +812,8 @@ int fd; + /* + * Under BSD we have to set the controlling terminal again explicitly. + */ +-# if (defined(__FreeBSD_kernel__) || defined(__GNU__)) && defined(TIOCSCTTY) ++# if (defined(__FreeBSD_kernel__) || defined(__GNU__) || (BSD >= 199103)) \ ++ && defined(TIOCSCTTY) + ioctl(fd, TIOCSCTTY, (char *)0); + # endif + +@@ -1508,8 +1509,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; + |