Update to a more recent version of OpenBSD's CVS

This lacks a replacement for OpenBSD's use of pledge(2)

11 files changed, 52 insertions, 20 deletions

diff --git a/devel/opencvs/Makefile b/devel/opencvs/Makefile
index a01147bc548f..845e98ee1e32 100644
--- a/devel/opencvs/Makefile
+++ b/devel/opencvs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	opencvs
-PORTVERSION=	20150501
+PORTVERSION=	20151230
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.stack.nl/pub/users/johans/opencvs/ \
 		LOCAL/johans
diff --git a/devel/opencvs/distinfo b/devel/opencvs/distinfo
index b4b5b78ed904..9ac476dab8c5 100644
--- a/devel/opencvs/distinfo
+++ b/devel/opencvs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (opencvs-20150501.tar.gz) = 9d615b2d37ff58e8b052cb95403e89aed7593c08568df193d318addadcf51992
-SIZE (opencvs-20150501.tar.gz) = 162638
+SHA256 (opencvs-20151230.tar.gz) = c8de7cd9786265ef43b909bc44642144d8fe7e342c42679fd30cc449c06d95df
+SIZE (opencvs-20151230.tar.gz) = 162228
diff --git a/devel/opencvs/files/patch-Makefile b/devel/opencvs/files/patch-Makefile
index b67da4cc7114..f7cf9c5a753a 100644
--- a/devel/opencvs/files/patch-Makefile
+++ b/devel/opencvs/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2011-04-20 18:46:33 UTC
-+++ Makefile
+--- Makefile.orig	2011-04-20 20:46:33.000000000 +0200
++++ Makefile	2016-02-06 23:33:35.512773000 +0100
 @@ -1,7 +1,7 @@
  #	$OpenBSD: Makefile,v 1.48 2010/10/15 08:44:12 tobias Exp $
  
diff --git a/devel/opencvs/files/patch-cvs.c b/devel/opencvs/files/patch-cvs.c
new file mode 100644
index 000000000000..1910db9d9dde
--- /dev/null
+++ b/devel/opencvs/files/patch-cvs.c
@@ -0,0 +1,13 @@
+--- cvs.c.orig	2016-02-06 23:39:08.240246000 +0100
++++ cvs.c	2016-02-06 23:39:10.243855000 +0100
+@@ -187,8 +187,10 @@ main(int argc, char **argv)
+ 	struct stat st;
+ 	char fpath[PATH_MAX];
+ 
++#if 0
+ 	if (pledge("stdio rpath wpath cpath fattr proc exec", NULL) == -1)
+ 		err(1, "pledge");
++#endif
+ 
+ 	tzset();
+ 
diff --git a/devel/opencvs/files/patch-cvs.h b/devel/opencvs/files/patch-cvs.h
index 1ee069a064cf..2765876005ba 100644
--- a/devel/opencvs/files/patch-cvs.h
+++ b/devel/opencvs/files/patch-cvs.h
@@ -1,5 +1,5 @@
---- cvs.h.orig	2015-05-04 09:15:45 UTC
-+++ cvs.h
+--- cvs.h.orig	2015-05-04 11:15:45.000000000 +0200
++++ cvs.h	2016-02-06 23:33:35.522379000 +0100
 @@ -29,6 +29,10 @@
  
  #include <signal.h>
diff --git a/devel/opencvs/files/patch-date.y b/devel/opencvs/files/patch-date.y
new file mode 100644
index 000000000000..2b34acbff952
--- /dev/null
+++ b/devel/opencvs/files/patch-date.y
@@ -0,0 +1,10 @@
+--- date.y.orig	2016-02-06 23:34:07.626970000 +0100
++++ date.y	2016-02-06 23:34:12.389277000 +0100
+@@ -16,6 +16,7 @@
+ 
+ #include <ctype.h>
+ #include <string.h>
++#include <stdlib.h>
+ 
+ #include "cvs.h"
+ 
diff --git a/devel/opencvs/files/patch-log.h b/devel/opencvs/files/patch-log.h
index b204131f238b..08ac49063f12 100644
--- a/devel/opencvs/files/patch-log.h
+++ b/devel/opencvs/files/patch-log.h
@@ -1,5 +1,5 @@
---- log.h.orig	2008-06-10 01:00:34 UTC
-+++ log.h
+--- log.h.orig	2008-06-10 03:00:34.000000000 +0200
++++ log.h	2016-02-06 23:33:35.531120000 +0100
 @@ -29,6 +29,9 @@
  
  #include <stdarg.h>
diff --git a/devel/opencvs/files/patch-rcsparse.c b/devel/opencvs/files/patch-rcsparse.c
index e6d39a2263e4..e88439105276 100644
--- a/devel/opencvs/files/patch-rcsparse.c
+++ b/devel/opencvs/files/patch-rcsparse.c
@@ -1,6 +1,6 @@
---- rcsparse.c.orig	2015-05-04 09:15:45 UTC
-+++ rcsparse.c
-@@ -1228,8 +1228,6 @@ valid_login(char *login_name)
+--- rcsparse.c.orig	2016-02-06 23:25:25.000000000 +0100
++++ rcsparse.c	2016-02-06 23:33:35.539982000 +0100
+@@ -1227,8 +1227,6 @@ valid_login(char *login_name)
  			return 0;
  		}
  	}
diff --git a/devel/opencvs/files/patch-util.c b/devel/opencvs/files/patch-util.c
index 2cddb74bd906..9c67add7d8b4 100644
--- a/devel/opencvs/files/patch-util.c
+++ b/devel/opencvs/files/patch-util.c
@@ -1,5 +1,5 @@
---- util.c.orig	2015-05-04 09:15:45 UTC
-+++ util.c
+--- util.c.orig	2016-02-06 23:25:26.000000000 +0100
++++ util.c	2016-02-06 23:33:35.548485000 +0100
 @@ -30,7 +30,7 @@
  #include <sys/types.h>
  #include <sys/wait.h>
diff --git a/devel/opencvs/files/patch-xmalloc.c b/devel/opencvs/files/patch-xmalloc.c
index b8d2e940bc6a..870bdfdfa415 100644
--- a/devel/opencvs/files/patch-xmalloc.c
+++ b/devel/opencvs/files/patch-xmalloc.c
@@ -1,6 +1,6 @@
---- xmalloc.c.orig	2015-05-04 09:15:45 UTC
-+++ xmalloc.c
-@@ -17,6 +17,7 @@
+--- xmalloc.c.orig	2016-02-06 23:25:26.000000000 +0100
++++ xmalloc.c	2016-02-06 23:38:08.189826000 +0100
+@@ -19,6 +19,7 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <string.h>
@@ -8,3 +8,12 @@
  
  #include "log.h"
  #include "xmalloc.h"
+@@ -58,7 +59,7 @@ xreallocarray(void *ptr, size_t nmemb, s
+ 
+ 	if (nmemb == 0 || size == 0)
+ 		fatal("xreallocarray: zero size");
+-	new_ptr = reallocarray(ptr, nmemb, size);
++	new_ptr = realloc(ptr, nmemb * size); /* this lacks overflow check */
+ 	if (new_ptr == NULL)
+ 		fatal("xreallocarray: allocating %zu * %zu bytes: %s",
+ 		    nmemb, size, strerror(errno));
diff --git a/devel/opencvs/files/patch-xmalloc.h b/devel/opencvs/files/patch-xmalloc.h
index 1167cab5ea0e..6ba011a4ae8e 100644
--- a/devel/opencvs/files/patch-xmalloc.h
+++ b/devel/opencvs/files/patch-xmalloc.h
@@ -1,6 +1,6 @@
---- xmalloc.h.orig	2015-05-04 09:15:45 UTC
-+++ xmalloc.h
-@@ -29,7 +29,6 @@ int	 xasprintf(char **, const char *, ..
+--- xmalloc.h.orig	2016-02-06 23:25:26.000000000 +0100
++++ xmalloc.h	2016-02-06 23:33:35.565364000 +0100
+@@ -28,7 +28,6 @@ int	 xasprintf(char **, const char *, ..
                  __attribute__((__nonnull__ (2)));
  int	 xsnprintf(char *, size_t, const char *, ...)
  		__attribute__((__format__ (printf, 3, 4)))