openbsd: Build diff(1)

7 files changed, 32 insertions, 8 deletions

diff --git a/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch b/core/openbsd/patch/0001-fts-Avoid-d_namlen.patch
index f0224439..d24d112c 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 dffe7fa7b5c16e95af5b7a274e256197c716c41b Mon Sep 17 00:00:00 2001
+From 29d959c4d9abdfd126f771e1c4b07da7cf26d7d6 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
@@ -46,5 +46,5 @@ index e042b9f..caf679e 100644
  			/*
  			 * If we wrap, free up the current structure and
 -- 
-2.8.0
+2.8.1
 
diff --git a/core/openbsd/patch/0002-fts-Add-some-includes.patch b/core/openbsd/patch/0002-fts-Add-some-includes.patch
index 55a40d3a..2f06ad83 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 3346d32277e367ad3b229dfec4b5f11ebafed9fb Mon Sep 17 00:00:00 2001
+From bbc201a46b66522423d83f69b1106ad859bcefba 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
@@ -42,5 +42,5 @@ index caf679e..dc6d3d7 100644
  
  #define MAXIMUM(a, b)	(((a) > (b)) ? (a) : (b))
 -- 
-2.8.0
+2.8.1
 
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 05dfacad..c43035f9 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
@@ -30,5 +30,5 @@ index 6d70b7a..51a36c9 100644
  	 * Keep a reference to cwd, so we can always come back home.
  	 */
 -- 
-2.8.0
+2.8.1
 
diff --git a/core/openbsd/patch/0004-pax-Add-some-includes.patch b/core/openbsd/patch/0004-pax-Add-some-includes.patch
index 8254b737..4061d470 100644
--- a/core/openbsd/patch/0004-pax-Add-some-includes.patch
+++ b/core/openbsd/patch/0004-pax-Add-some-includes.patch
@@ -59,5 +59,5 @@ index fc9194d..7bdbe46 100644
  #include "sel_subs.h"
  #include "extern.h"
 -- 
-2.8.0
+2.8.1
 
diff --git a/core/openbsd/patch/0005-tar-Default-to-stdin.patch b/core/openbsd/patch/0005-tar-Default-to-stdin.patch
index ffbb3977..1a1bf77d 100644
--- a/core/openbsd/patch/0005-tar-Default-to-stdin.patch
+++ b/core/openbsd/patch/0005-tar-Default-to-stdin.patch
@@ -23,5 +23,5 @@ index adb7f4a..89d29bb 100644
  			fstdin = 1;
  		}
 -- 
-2.8.0
+2.8.1
 
diff --git a/core/openbsd/patch/0006-yacc-Add-some-includes.patch b/core/openbsd/patch/0006-yacc-Add-some-includes.patch
index 0a51efac..a4b0ed78 100644
--- a/core/openbsd/patch/0006-yacc-Add-some-includes.patch
+++ b/core/openbsd/patch/0006-yacc-Add-some-includes.patch
@@ -20,5 +20,5 @@ index 7300cae..fab6e12 100644
  #include <ctype.h>
  #include <stdio.h>
 -- 
-2.8.0
+2.8.1
 
diff --git a/core/openbsd/patch/0007-diff-Add-missing-sys-cdefs.h-include.patch b/core/openbsd/patch/0007-diff-Add-missing-sys-cdefs.h-include.patch
new file mode 100644
index 00000000..6bc4b001
--- /dev/null
+++ b/core/openbsd/patch/0007-diff-Add-missing-sys-cdefs.h-include.patch
@@ -0,0 +1,24 @@
+From d7eab8f491d466c891b72b724087ec14c55225ae Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sat, 4 Jun 2016 14:48:20 -0700
+Subject: [PATCH] diff: Add missing sys/cdefs.h include
+
+---
+ usr.bin/diff/diff.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c
+index 2b075f1..80c7f84 100644
+--- a/usr.bin/diff/diff.c
++++ b/usr.bin/diff/diff.c
+@@ -20,6 +20,7 @@
+  * Materiel Command, USAF, under agreement number F39502-99-1-0512.
+  */
+ 
++#include <sys/cdefs.h>
+ #include <sys/stat.h>
+ 
+ #include <ctype.h>
+-- 
+2.8.1
+