openbsd: Update to 6.0

9 files changed, 25 insertions, 24 deletions

diff --git a/core/openbsd/.rev b/core/openbsd/.rev
index 0cfbf088..00750edc 100644
--- a/core/openbsd/.rev
+++ b/core/openbsd/.rev
@@ -1 +1 @@
-2
+3
diff --git a/core/openbsd/include/stdlib.h b/core/openbsd/include/stdlib.h
index 752bb98a..07b121f8 100644
--- a/core/openbsd/include/stdlib.h
+++ b/core/openbsd/include/stdlib.h
@@ -5,3 +5,4 @@ long long strtonum(const char *, long long, long long, const char **);
 uint32_t arc4random(void);
 uint32_t arc4random_uniform(uint32_t);
 void arc4random_buf(void *, size_t);
+extern char *__progname;
diff --git a/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch b/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch
index d24d112c..fb3e7cbd 100644
--- a/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch
+++ b/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch
@@ -1,4 +1,4 @@
-From 29d959c4d9abdfd126f771e1c4b07da7cf26d7d6 Mon Sep 17 00:00:00 2001
+From 03bc025e5ccfc5ba5524cd76a83a5682263fd3e4 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sun, 17 Apr 2016 23:50:15 -0700
 Subject: [PATCH] fts: Avoid d_namlen
@@ -8,10 +8,10 @@ Subject: [PATCH] fts: Avoid d_namlen
  1 file changed, 7 insertions(+), 4 deletions(-)
 
 diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
-index e042b9f..caf679e 100644
+index 9a9b2a5..77e1e77 100644
 --- a/lib/libc/gen/fts.c
 +++ b/lib/libc/gen/fts.c
-@@ -557,6 +557,7 @@ fts_build(FTS *sp, int type)
+@@ -556,6 +556,7 @@ fts_build(FTS *sp, int type)
  	int nitems, cderrno, descend, level, nlinks, nostat, doadjust;
  	int saved_errno;
  	char *cp;
@@ -19,7 +19,7 @@ index e042b9f..caf679e 100644
  
  	/* Set current node pointer. */
  	cur = sp->fts_cur;
-@@ -655,11 +656,13 @@ fts_build(FTS *sp, int type)
+@@ -654,11 +655,13 @@ fts_build(FTS *sp, int type)
  		if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name))
  			continue;
  
@@ -36,7 +36,7 @@ index e042b9f..caf679e 100644
  				/*
  				 * No more memory for path or structures.  Save
  				 * errno, free up the current structure and the
-@@ -685,7 +688,7 @@ mem1:				saved_errno = errno;
+@@ -684,7 +687,7 @@ mem1:				saved_errno = errno;
  
  		p->fts_level = level;
  		p->fts_parent = sp->fts_cur;
@@ -46,5 +46,5 @@ index e042b9f..caf679e 100644
  			/*
  			 * If we wrap, free up the current structure and
 -- 
-2.8.1
+2.9.3
 
diff --git a/core/openbsd/patch/0002-fts-Add-some-includes.patch b/core/openbsd/patch/0002-fts-Add-some-includes.patch
index 2f06ad83..a6a16303 100644
--- a/core/openbsd/patch/0002-fts-Add-some-includes.patch
+++ b/core/openbsd/patch/0002-fts-Add-some-includes.patch
@@ -1,4 +1,4 @@
-From bbc201a46b66522423d83f69b1106ad859bcefba Mon Sep 17 00:00:00 2001
+From de6a55b9392c80bb9be3dd8b9bb816d8d269ee5b Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 18 Apr 2016 01:25:29 -0700
 Subject: [PATCH] fts: Add some includes
@@ -22,7 +22,7 @@ index eaf6be0..a5b3aff 100644
  	struct _ftsent *fts_cur;	/* current node */
  	struct _ftsent *fts_child;	/* linked list of children */
 diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c
-index caf679e..dc6d3d7 100644
+index 77e1e77..eff297c 100644
 --- a/lib/libc/gen/fts.c
 +++ b/lib/libc/gen/fts.c
 @@ -31,6 +31,7 @@
@@ -42,5 +42,5 @@ index caf679e..dc6d3d7 100644
  
  #define MAXIMUM(a, b)	(((a) > (b)) ? (a) : (b))
 -- 
-2.8.1
+2.9.3
 
diff --git a/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch b/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
index c43035f9..0ca88edf 100644
--- a/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
+++ b/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
@@ -1,4 +1,4 @@
-From 922ea08ad2487192bf46b077ec62d6924973c492 Mon Sep 17 00:00:00 2001
+From 2d5f85f2a77ee62751c4ec4193cc55207875a757 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 18 Apr 2016 00:13:51 -0700
 Subject: [PATCH] pax: Set listf to stderr in main
@@ -8,7 +8,7 @@ Subject: [PATCH] pax: Set listf to stderr in main
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/bin/pax/pax.c b/bin/pax/pax.c
-index 6d70b7a..51a36c9 100644
+index 1b17b8c..7e62c51 100644
 --- a/bin/pax/pax.c
 +++ b/bin/pax/pax.c
 @@ -91,7 +91,7 @@ int	docrc;			/* check/create file crc */
@@ -30,5 +30,5 @@ index 6d70b7a..51a36c9 100644
  	 * Keep a reference to cwd, so we can always come back home.
  	 */
 -- 
-2.8.1
+2.9.3
 
diff --git a/core/openbsd/patch/0005-tar-Default-to-stdin.patch b/core/openbsd/patch/0005-tar-Default-to-stdin.patch
index 1a1bf77d..f4c2e08c 100644
--- a/core/openbsd/patch/0005-tar-Default-to-stdin.patch
+++ b/core/openbsd/patch/0005-tar-Default-to-stdin.patch
@@ -1,4 +1,4 @@
-From 0578803f33e11349628ff98a2834bb0dae6fc4f4 Mon Sep 17 00:00:00 2001
+From 4e6eb43b544fff46d7ca4307b4c0e7699a261ed7 Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 18 Apr 2016 01:16:12 -0700
 Subject: [PATCH] tar: Default to stdin
@@ -8,10 +8,10 @@ Subject: [PATCH] tar: Default to stdin
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/bin/pax/options.c b/bin/pax/options.c
-index adb7f4a..89d29bb 100644
+index 8721eaa..51101c7 100644
 --- a/bin/pax/options.c
 +++ b/bin/pax/options.c
-@@ -877,9 +877,7 @@ tar_options(int argc, char **argv)
+@@ -871,9 +871,7 @@ tar_options(int argc, char **argv)
  
  	if (!fstdin && ((arcname == NULL) || (*arcname == '\0'))) {
  		arcname = getenv("TAPE");
@@ -23,5 +23,5 @@ index adb7f4a..89d29bb 100644
  			fstdin = 1;
  		}
 -- 
-2.8.1
+2.9.3
 
diff --git a/core/openbsd/patch/0008-patch-Add-missing-includes.patch b/core/openbsd/patch/0008-patch-Add-missing-includes.patch
index 7cd21532..782880c4 100644
--- a/core/openbsd/patch/0008-patch-Add-missing-includes.patch
+++ b/core/openbsd/patch/0008-patch-Add-missing-includes.patch
@@ -1,4 +1,4 @@
-From 36a8f4b67191e6b8f350a6db33e849380255595b Mon Sep 17 00:00:00 2001
+From e47145b05bd63b51df6219855747a8247c0910fc Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Sat, 4 Jun 2016 18:40:24 -0700
 Subject: [PATCH] patch: Add missing includes
@@ -9,7 +9,7 @@ Subject: [PATCH] patch: Add missing includes
  2 files changed, 2 insertions(+)
 
 diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c
-index 6606ede..0a75bd6 100644
+index 3f60861..80c4801 100644
 --- a/usr.bin/patch/inp.c
 +++ b/usr.bin/patch/inp.c
 @@ -32,6 +32,7 @@
@@ -33,5 +33,5 @@ index 8f8f8cd..8087a21 100644
  #include <sys/stat.h>
  #include <unistd.h>
 -- 
-2.8.1
+2.9.3
 
diff --git a/core/openbsd/sha256 b/core/openbsd/sha256
index e052ef12..4a497a70 100644
--- a/core/openbsd/sha256
+++ b/core/openbsd/sha256
@@ -1,2 +1,2 @@
-0e2c07bbfb3e173be1715da3d70ba16a246e151d66a56251ee4cf416c507deb8  src.tar.gz
-868775750a405c252d1ba78df69d6ebb101ccb26e776d5407a087ec030970baa  sys.tar.gz
+bcb1cc9fafe2f03ce52455bf07d5cdc90b26ee2550fba1598e938a5fb077b959  src.tar.gz
+2e10bf43f5d649a7b58f95c70848ef792fff159affbac5b6c14838cbf4f8b7fa  sys.tar.gz
diff --git a/core/openbsd/url b/core/openbsd/url
index 841dafd0..2fac84b9 100644
--- a/core/openbsd/url
+++ b/core/openbsd/url
@@ -1,3 +1,3 @@
-url = "http://mirrors.sonic.net/pub/OpenBSD/5.9/src.tar.gz"
+url = "http://mirrors.sonic.net/pub/OpenBSD/6.0/src.tar.gz"
 -O
-url = "http://mirrors.sonic.net/pub/OpenBSD/5.9/sys.tar.gz"
+url = "http://mirrors.sonic.net/pub/OpenBSD/6.0/sys.tar.gz"