oasis

commit: 5891d59419c2660431305680f509b6b555846214
parent b85b1744456dd298605d4e08abbd659bd6576a3f
Author: Michael Forney <mforney@mforney.org>
Date:   Fri, 17 Jan 2020 01:03:11 -0800

openbsd: Fix tar patch to default to stdin

This can cause a segfault.

Diffstat:
M
pkg/openbsd/patch/0005-tar-Default-to-stdin.patch
8
++++----
M
pkg/openbsd/ver
2
+-

2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pkg/openbsd/patch/0005-tar-Default-to-stdin.patch b/pkg/openbsd/patch/0005-tar-Default-to-stdin.patch
@@ -1,4 +1,4 @@
-From cee8b0c189dd7b421e2f3e85557fb4ee4fdf4d6c Mon Sep 17 00:00:00 2001
+From 901940cdf7fc13516ff55e81df0b546eb7c74595 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,7 +8,7 @@ Subject: [PATCH] tar: Default to stdin
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/bin/pax/options.c b/bin/pax/options.c
-index d615e39cf..022c59664 100644
+index 5db0948858c..dbb4b816c37 100644
 --- a/bin/pax/options.c
 +++ b/bin/pax/options.c
 @@ -937,7 +937,7 @@ tar_options(int argc, char **argv)
@@ -16,10 +16,10 @@ index d615e39cf..022c59664 100644
  		arcname = getenv("TAPE");
  		if ((arcname == NULL) || (*arcname == '\0'))
 -			arcname = _PATH_DEFTAPE;
-+			arcname = NULL;
++			arcname = "-";
  	}
  	if ((arcname[0] == '-') && (arcname[1]== '\0'))
  		arcname = NULL;
 -- 
-2.12.2
+2.25.0
 
diff --git a/pkg/openbsd/ver b/pkg/openbsd/ver
@@ -1 +1 @@
-6.6 r2
+6.6 r3