Update to version 1.6.5 (and fix known vulnerabilities).

Submitted by:	George Reid <greid@ukug.uk.freebsd.org>

5 files changed, 44 insertions, 7 deletions

diff --git a/misc/splitvt/Makefile b/misc/splitvt/Makefile
index 9337704e0bc4..05b1ab2b487a 100644
--- a/misc/splitvt/Makefile
+++ b/misc/splitvt/Makefile
@@ -7,20 +7,20 @@
 #
 
 PORTNAME=	splitvt
-PORTVERSION=	1.6.3
+PORTVERSION=	1.6.5
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	utils/console
+MASTER_SITES=	http://www.devolution.com/~slouken/projects/splitvt/
 
 MAINTAINER=	obrien@FreeBSD.org
 
-FORBIDDEN=	"Doesn't change permissions on pty, leaving it mode 666. Making it setuid isn't a solution because there's a buffer overflow."
-
 HAS_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	Configure
 ALL_TARGET=
 MAN1=			splitvt.1
 
+post-patch:
+	@(cd ${WRKSRC} && ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \
+		config.c > foo && ${MV} foo config.c)
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/splitvt ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/splitvt.1 ${PREFIX}/man/man1
diff --git a/misc/splitvt/distinfo b/misc/splitvt/distinfo
index 5a85ea14947a..024583897f79 100644
--- a/misc/splitvt/distinfo
+++ b/misc/splitvt/distinfo
@@ -1 +1 @@
-MD5 (splitvt-1.6.3.tar.gz) = e95e166145ec51d2a9d80aa6472f9f98
+MD5 (splitvt-1.6.5.tar.gz) = f93974daa4f39945b3d5b9cc39bb1b0f
diff --git a/misc/splitvt/files/patch-config.c b/misc/splitvt/files/patch-config.c
new file mode 100644
index 000000000000..4206aae3d9b4
--- /dev/null
+++ b/misc/splitvt/files/patch-config.c
@@ -0,0 +1,13 @@
+--- config.c.orig	Sun Jan 14 11:33:17 2001
++++ config.c	Sun Jan 14 11:33:36 2001
+@@ -237,8 +237,8 @@
+ #endif
+ 	fprintf(makefile, "\nclean: \n\trm -f *.o core \n");
+ 	fprintf(makefile, "\ndistclean: clean\n\trm -f splitvt Makefile\n");
+-	fprintf(makefile, "\ninstall: \n\tmv splitvt /usr/local/bin/splitvt\n");
+-	fprintf(makefile, "\tmv examples/xsplitvt /usr/local/bin/xsplitvt\n");
++	fprintf(makefile, "\ninstall: \n\tmv splitvt %%PREFIX%%/bin/splitvt\n");
++	fprintf(makefile, "\tmv examples/xsplitvt %%PREFIX%%/bin/xsplitvt\n");
+ 
+ 	fclose(makefile);
+ 	exit(0);
diff --git a/misc/splitvt/files/patch-splitvt.1 b/misc/splitvt/files/patch-splitvt.1
new file mode 100644
index 000000000000..8a0fd0bf5cf1
--- /dev/null
+++ b/misc/splitvt/files/patch-splitvt.1
@@ -0,0 +1,13 @@
+--- splitvt.1.orig	Sun Jan 14 11:36:23 2001
++++ splitvt.1	Sun Jan 14 11:39:03 2001
+@@ -173,8 +173,8 @@
+ splitvt will attempt to erase the current utmp entry, and replace it
+ with entries for the two windows.  This allows you to use programs
+ such as 'talk' within the splitvt windows.  If you do not have write
+-permission to the /etc/utmp file, you will not be able to modify the
+-utmp entries.
++permission to the /var/run/utmp file, you will not be able to modify
++the utmp entries.
+ 
+ splitvt can be made set-uid root.  splitvt will reset its user id to
+ that of the person running it, just before it exec()'s the shell under
diff --git a/misc/splitvt/files/patch-utmp.c b/misc/splitvt/files/patch-utmp.c
new file mode 100644
index 000000000000..fe4fcdfc3e87
--- /dev/null
+++ b/misc/splitvt/files/patch-utmp.c
@@ -0,0 +1,11 @@
+--- utmp.c.orig	Sun Jan 14 11:36:17 2001
++++ utmp.c	Sun Jan 14 11:38:25 2001
+@@ -12,7 +12,7 @@
+ #define UTMP_FILE  "/tmp/utmp"
+ #else
+ #ifndef UTMP_FILE
+-#define UTMP_FILE  "/etc/utmp"
++#define UTMP_FILE _PATH_UTMP
+ #endif /* UTMP_FILE */
+ #endif /* DEBUG_UTMP */
+