oasis

commit: d3ad1e285cc29934772cef06f8e0e114bb3cacb6
parent 38aaafbb3f3924fdeb5b635b063b1a55f228d149
Author: Michael Forney <mforney@mforney.org>
Date:   Mon,  2 Apr 2018 10:38:52 -0700

openbsd: Update to 6.3

Diffstat:
M
pkg/openbsd/patch/0019-nc-Port-to-linux.patch
24
++++++++++++------------
M
pkg/openbsd/rev
2
+-
M
pkg/openbsd/sha256
4
++--
M
pkg/openbsd/url
4
++--

4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/pkg/openbsd/patch/0019-nc-Port-to-linux.patch b/pkg/openbsd/patch/0019-nc-Port-to-linux.patch
@@ -1,4 +1,4 @@
-From 67f9a56d25334db296561d0269b4cec6a7e24cf7 Mon Sep 17 00:00:00 2001
+From 5c2d730713faaf09febc887e5d6e51e4f65e9c9d Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Fri, 16 Jun 2017 20:32:42 -0700
 Subject: [PATCH] nc: Port to linux
@@ -8,12 +8,12 @@ Subject: [PATCH] nc: Port to linux
  1 file changed, 31 insertions(+), 14 deletions(-)
 
 diff --git a/usr.bin/nc/netcat.c b/usr.bin/nc/netcat.c
-index ce55972a7c2..24d1c463f51 100644
+index fcc38897c..632ba4b1f 100644
 --- a/usr.bin/nc/netcat.c
 +++ b/usr.bin/nc/netcat.c
-@@ -75,6 +75,31 @@
- #define TLS_MUSTSTAPLE	(1 << 5)
- #define TLS_COMPAT	(1 << 6)
+@@ -73,6 +73,31 @@
+ #define TLS_CCERT	(1 << 3)
+ #define TLS_MUSTSTAPLE	(1 << 4)
  
 +#ifndef IPTOS_DSCP_CS0
 +# define IPTOS_DSCP_CS0 0x00
@@ -43,7 +43,7 @@ index ce55972a7c2..24d1c463f51 100644
  /* Command Line Options */
  int	dflag;					/* detached, no stdin */
  int	Fflag;					/* fdpass sock to stdout */
-@@ -97,7 +122,6 @@ int	Iflag;					/* TCP receive buffer size */
+@@ -95,7 +120,6 @@ int	Iflag;					/* TCP receive buffer size */
  int	Oflag;					/* TCP send buffer size */
  int	Sflag;					/* TCP MD5 signature option */
  int	Tflag = -1;				/* IP Type of Service */
@@ -51,7 +51,7 @@ index ce55972a7c2..24d1c463f51 100644
  
  int	usetls;					/* use TLS */
  char    *Cflag;					/* Public cert file */
-@@ -266,12 +290,6 @@ main(int argc, char *argv[])
+@@ -267,12 +291,6 @@ main(int argc, char *argv[])
  		case 'u':
  			uflag = 1;
  			break;
@@ -64,7 +64,7 @@ index ce55972a7c2..24d1c463f51 100644
  		case 'v':
  			vflag = 1;
  			break;
-@@ -344,10 +362,6 @@ main(int argc, char *argv[])
+@@ -345,10 +363,6 @@ main(int argc, char *argv[])
  	argc -= optind;
  	argv += optind;
  
@@ -75,7 +75,7 @@ index ce55972a7c2..24d1c463f51 100644
  	if (family == AF_UNIX) {
  		if (pledge("stdio rpath wpath cpath tmppath unix", NULL) == -1)
  			err(1, "pledge");
-@@ -907,8 +921,12 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
+@@ -901,8 +915,12 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
  		if (sflag || pflag) {
  			struct addrinfo ahints, *ares;
  
@@ -89,7 +89,7 @@ index ce55972a7c2..24d1c463f51 100644
  			memset(&ahints, 0, sizeof(struct addrinfo));
  			ahints.ai_family = res->ai_family;
  			ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
-@@ -1721,7 +1739,6 @@ help(void)
+@@ -1732,7 +1750,6 @@ help(void)
  	\t-t		Answer TELNET negotiation\n\
  	\t-U		Use UNIX domain socket\n\
  	\t-u		UDP mode\n\
@@ -97,7 +97,7 @@ index ce55972a7c2..24d1c463f51 100644
  	\t-v		Verbose\n\
  	\t-W recvlimit	Terminate after receiving a number of packets\n\
  	\t-w timeout	Timeout for connects and final net reads\n\
-@@ -1742,7 +1759,7 @@ usage(int ret)
+@@ -1753,7 +1770,7 @@ usage(int ret)
  	    "\t  [-i interval] [-K keyfile] [-M ttl] [-m minttl] [-O length]\n"
  	    "\t  [-o staplefile] [-P proxy_username] [-p source_port] "
  	    "[-R CAfile]\n"
@@ -107,5 +107,5 @@ index ce55972a7c2..24d1c463f51 100644
  	    "\t  [-X proxy_protocol] [-x proxy_address[:port]] "
  	    "[-Z peercertfile]\n"
 -- 
-2.14.2
+2.16.2
 
diff --git a/pkg/openbsd/rev b/pkg/openbsd/rev
@@ -1 +1 @@
-17
+18
diff --git a/pkg/openbsd/sha256 b/pkg/openbsd/sha256
@@ -1,2 +1,2 @@
-732d9eadb07aebb0ca08b2f94bd0695250b5ff7621942b061e9f4dfbb94a3550  src.tar.gz
-dd4e6cec36c331d0e71268bf7430cf143d5ab1708df0d759d82b9f1059ffa3d6  sys.tar.gz
+23f9905b26f1dfd981c2f89a46cbcf2d25c3fa75167efc34da96c60af9f71274  src.tar.gz
+ac9729a0c7b845b68e76e0b5f0ac2a8f874c486f84bbb369d5e5954a8f762d4b  sys.tar.gz
diff --git a/pkg/openbsd/url b/pkg/openbsd/url
@@ -1,5 +1,5 @@
 remote-name
-url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.2/src.tar.gz"
+url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.3/src.tar.gz"
 
 remote-name
-url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.2/sys.tar.gz"
+url = "https://fastly.cdn.openbsd.org/pub/OpenBSD/6.3/sys.tar.gz"