openbsd: Build patch(1)

3 files changed, 69 insertions, 1 deletions

diff --git a/core/openbsd/gen.rc b/core/openbsd/gen.rc
index 220e5cb1..6c9c0b4a 100644
--- a/core/openbsd/gen.rc
+++ b/core/openbsd/gen.rc
@@ -2,7 +2,8 @@ cflags\
 	-D '''DEF_WEAK(n)=''' \
 	-I '$dir'/include\
 	-I '$builddir'/core/libressl/include\
-	-idirafter '$srcdir'/include
+	-idirafter '$srcdir'/include\
+	-idirafter '$srcdir'/sys
 
 # Link arc4random.c to '$outdir' so that it doesn't include the local
 # arc4random.h
@@ -47,3 +48,8 @@ file share/man/man1/fmt.1 '$srcdir'/usr.bin/fmt/fmt.1 644
 exe diff usr.bin/diff/^(diff.c diffdir.c diffreg.c xmalloc.c) libbsd.a
 file bin/diff '$outdir'/diff 755
 file share/man/man1/diff.1 '$srcdir'/usr.bin/diff/diff.1 644
+
+# patch
+exe patch usr.bin/patch/^(patch.c pch.c inp.c util.c backupfile.c mkpath.c ed.c) libbsd.a
+file bin/patch '$outdir'/patch 755
+file share/man/man1/patch.1 '$srcdir'/usr.bin/patch/patch.1 644
diff --git a/core/openbsd/patch/0008-patch-Add-missing-includes.patch b/core/openbsd/patch/0008-patch-Add-missing-includes.patch
new file mode 100644
index 00000000..7cd21532
--- /dev/null
+++ b/core/openbsd/patch/0008-patch-Add-missing-includes.patch
@@ -0,0 +1,37 @@
+From 36a8f4b67191e6b8f350a6db33e849380255595b 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
+
+---
+ usr.bin/patch/inp.c   | 1 +
+ usr.bin/patch/patch.c | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/usr.bin/patch/inp.c b/usr.bin/patch/inp.c
+index 6606ede..0a75bd6 100644
+--- a/usr.bin/patch/inp.c
++++ b/usr.bin/patch/inp.c
+@@ -32,6 +32,7 @@
+ #include <sys/mman.h>
+ 
+ #include <ctype.h>
++#include <fcntl.h>
+ #include <libgen.h>
+ #include <stddef.h>
+ #include <stdint.h>
+diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c
+index 8f8f8cd..8087a21 100644
+--- a/usr.bin/patch/patch.c
++++ b/usr.bin/patch/patch.c
+@@ -26,6 +26,7 @@
+  * behaviour
+  */
+ 
++#include <sys/cdefs.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-- 
+2.8.1
+
diff --git a/core/openbsd/patch/0009-patch-Avoid-d_namlen.patch b/core/openbsd/patch/0009-patch-Avoid-d_namlen.patch
new file mode 100644
index 00000000..0eb9f9d2
--- /dev/null
+++ b/core/openbsd/patch/0009-patch-Avoid-d_namlen.patch
@@ -0,0 +1,25 @@
+From 0d285d78276b91b101391a4dab53b0585d2812f8 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Sat, 4 Jun 2016 18:40:37 -0700
+Subject: [PATCH] patch: Avoid d_namlen
+
+---
+ usr.bin/patch/backupfile.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/usr.bin/patch/backupfile.c b/usr.bin/patch/backupfile.c
+index d9e40bc..1d7858a 100644
+--- a/usr.bin/patch/backupfile.c
++++ b/usr.bin/patch/backupfile.c
+@@ -95,7 +95,7 @@ max_backup_version(const char *file, const char *dir)
+ 	file_name_length = strlen(file);
+ 
+ 	while ((dp = readdir(dirp)) != NULL) {
+-		if (dp->d_namlen <= file_name_length)
++		if (strlen(dp->d_name) <= file_name_length)
+ 			continue;
+ 
+ 		this_version = version_number(file, dp->d_name, file_name_length);
+-- 
+2.8.1
+