diff options
| author | Michael Forney <mforney@mforney.org> | 2019-08-06 11:52:05 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2019-08-06 11:53:03 -0700 |
| commit | af514c16aaee13f205d116c395f0da4cf5130f1b (patch) | |
| tree | 3bed72488a703280ff1d13774d1051c6ec572c32 /pkg/openbsd | |
| parent | 66638a1f13c22700a10f7c5e3c02d03f4c8d79d6 (diff) | |
openbsd: Include sys/sysmacros.h if necessary
Diffstat (limited to 'pkg/openbsd')
| -rw-r--r-- | pkg/openbsd/patch/0030-Include-sys-sysmacros.h-if-necessary.patch | 73 | ||||
| -rw-r--r-- | pkg/openbsd/ver | 2 |
2 files changed, 74 insertions, 1 deletions
diff --git a/pkg/openbsd/patch/0030-Include-sys-sysmacros.h-if-necessary.patch b/pkg/openbsd/patch/0030-Include-sys-sysmacros.h-if-necessary.patch new file mode 100644 index 00000000..6b64a048 --- /dev/null +++ b/pkg/openbsd/patch/0030-Include-sys-sysmacros.h-if-necessary.patch @@ -0,0 +1,73 @@ +From a8d547a2cf005a00a111394464fc2692f426ceed Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Mon, 5 Aug 2019 21:42:54 -0700 +Subject: [PATCH] Include sys/sysmacros.h if necessary + +--- + bin/pax/cpio.c | 4 ++++ + bin/pax/gen_subs.c | 3 +++ + bin/pax/tar.c | 3 +++ + usr.bin/rsync/flist.c | 4 ++++ + 4 files changed, 14 insertions(+) + +diff --git a/bin/pax/cpio.c b/bin/pax/cpio.c +index 92fe965163a..3832b1e87aa 100644 +--- a/bin/pax/cpio.c ++++ b/bin/pax/cpio.c +@@ -41,6 +41,10 @@ + #include <stdio.h> + #include <unistd.h> + #include <stdlib.h> ++#ifndef major ++#include <sys/sysmacros.h> ++#endif ++ + #include "pax.h" + #include "cpio.h" + #include "extern.h" +diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c +index 42c70804fb7..405dd2c24ed 100644 +--- a/bin/pax/gen_subs.c ++++ b/bin/pax/gen_subs.c +@@ -45,6 +45,9 @@ + #include <unistd.h> + #include <utmp.h> + #include <vis.h> ++#ifndef major ++#include <sys/sysmacros.h> ++#endif + + #include "pax.h" + #include "extern.h" +diff --git a/bin/pax/tar.c b/bin/pax/tar.c +index a49a5e885fb..3bfa9444dd5 100644 +--- a/bin/pax/tar.c ++++ b/bin/pax/tar.c +@@ -45,6 +45,9 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> ++#ifndef major ++#include <sys/sysmacros.h> ++#endif + + #include "pax.h" + #include "extern.h" +diff --git a/usr.bin/rsync/flist.c b/usr.bin/rsync/flist.c +index ac29ad47098..9680883ca77 100644 +--- a/usr.bin/rsync/flist.c ++++ b/usr.bin/rsync/flist.c +@@ -17,6 +17,10 @@ + */ + #include <sys/param.h> + #include <sys/stat.h> ++#include <sys/types.h> ++#ifndef major ++#include <sys/sysmacros.h> ++#endif + + #include <assert.h> + #include <errno.h> +-- +2.22.0 + diff --git a/pkg/openbsd/ver b/pkg/openbsd/ver index 56a26497..aa19010e 100644 --- a/pkg/openbsd/ver +++ b/pkg/openbsd/ver @@ -1 +1 @@ -6.5 r2 +6.5 r3 |