Drop setpassent/setgroupent patch and define them in terms of setpwent and setgrent

4 files changed, 3 insertions, 55 deletions

diff --git a/core/openbsd/patch/0004-pax-Set-listf-to-stderr-in-main.patch b/core/openbsd/patch/0003-pax-Set-listf-to-stderr-in-main.patch
index d04b5acb..05dfacad 100644
--- a/core/openbsd/patch/0004-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 67cc439f1b0db14d106ea1b6b96d66c6b6c7e15a Mon Sep 17 00:00:00 2001
+From 922ea08ad2487192bf46b077ec62d6924973c492 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
diff --git a/core/openbsd/patch/0003-pax-Use-setpwent-and-setgrent.patch b/core/openbsd/patch/0003-pax-Use-setpwent-and-setgrent.patch
deleted file mode 100644
index 82a082ad..00000000
--- a/core/openbsd/patch/0003-pax-Use-setpwent-and-setgrent.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From d9671f40b5ffc56b2c6ef449bd5eaaefdf538518 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Sun, 17 Apr 2016 23:46:28 -0700
-Subject: [PATCH] pax: Use setpwent and setgrent
-
----
- bin/pax/cache.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/bin/pax/cache.c b/bin/pax/cache.c
-index a0d38cb..8f2fc2a 100644
---- a/bin/pax/cache.c
-+++ b/bin/pax/cache.c
-@@ -191,7 +191,7 @@ name_uid(uid_t uid, int frc)
- 	 * No entry for this uid, we will add it
- 	 */
- 	if (!pwopn) {
--		setpassent(1);
-+		setpwent();
- 		++pwopn;
- 	}
- 	if (ptr == NULL)
-@@ -257,7 +257,7 @@ name_gid(gid_t gid, int frc)
- 	 * No entry for this gid, we will add it
- 	 */
- 	if (!gropn) {
--		setgroupent(1);
-+		setgrent();
- 		++gropn;
- 	}
- 	if (ptr == NULL)
-@@ -324,7 +324,7 @@ uid_name(char *name, uid_t *uid)
- 	}
- 
- 	if (!pwopn) {
--		setpassent(1);
-+		setpwent();
- 		++pwopn;
- 	}
- 
-@@ -387,7 +387,7 @@ gid_name(char *name, gid_t *gid)
- 	}
- 
- 	if (!gropn) {
--		setgroupent(1);
-+		setgrent();
- 		++gropn;
- 	}
- 	if (ptr == NULL)
--- 
-2.8.0
-
diff --git a/core/openbsd/patch/0005-pax-Add-some-includes.patch b/core/openbsd/patch/0004-pax-Add-some-includes.patch
index 9153eac5..8254b737 100644
--- a/core/openbsd/patch/0005-pax-Add-some-includes.patch
+++ b/core/openbsd/patch/0004-pax-Add-some-includes.patch
@@ -1,4 +1,4 @@
-From 9b164bcbe8ce53a6e3840dfb9da9b25a73103f47 Mon Sep 17 00:00:00 2001
+From 140c41d57f7bef789f4a0ea0db0426c1b3f0f38f Mon Sep 17 00:00:00 2001
 From: Michael Forney <mforney@mforney.org>
 Date: Mon, 18 Apr 2016 01:27:29 -0700
 Subject: [PATCH] pax: Add some includes
diff --git a/core/openbsd/patch/0006-tar-Default-to-stdin.patch b/core/openbsd/patch/0005-tar-Default-to-stdin.patch
index bac0f61f..ffbb3977 100644
--- a/core/openbsd/patch/0006-tar-Default-to-stdin.patch
+++ b/core/openbsd/patch/0005-tar-Default-to-stdin.patch
@@ -1,4 +1,4 @@
-From aa22c87e415d844f17991477187d607dac4a9371 Mon Sep 17 00:00:00 2001
+From 0578803f33e11349628ff98a2834bb0dae6fc4f4 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