Force use of GNU tar, as the messages shown by "pax as tar" are not recognized

properly by the program.  Fixes multiple crashes and handling of tar archives.
Closes PR pkg/24206.

Also depend on zip and unzip and ensure paths to them are correct.

Bump PKGREVISION to 2.

2 files changed, 89 insertions, 0 deletions

diff --git a/archivers/file-roller/patches/patch-aa b/archivers/file-roller/patches/patch-aa
new file mode 100644
index 00000000000..c1b56526a6d
--- /dev/null
+++ b/archivers/file-roller/patches/patch-aa
@@ -0,0 +1,40 @@
+$NetBSD: patch-aa,v 1.1 2004/02/10 11:52:05 jmmv Exp $
+
+--- src/fr-command-tar.c.orig	2004-01-26 12:31:55.000000000 +0100
++++ src/fr-command-tar.c
+@@ -177,7 +177,7 @@ fr_command_tar_list (FRCommand *comm)
+ 				      comm);
+ 
+ 	fr_process_clear (comm->process);
+-	fr_process_begin_command (comm->process, "tar");
++	fr_process_begin_command (comm->process, FILEROLLER_TAR);
+ 	fr_process_add_arg (comm->process, "--force-local");
+ 	fr_process_add_arg (comm->process, "-tvf");
+ 	fr_process_add_arg (comm->process, comm->e_filename);
+@@ -235,7 +235,7 @@ fr_command_tar_add (FRCommand     *comm,
+ 				      process_line__add,
+ 				      comm);
+ 
+-	fr_process_begin_command (comm->process, "tar");
++	fr_process_begin_command (comm->process, FILEROLLER_TAR);
+ 	fr_process_add_arg (comm->process, "--force-local");
+ 	fr_process_add_arg (comm->process, "-v");
+ 
+@@ -286,7 +286,7 @@ fr_command_tar_delete (FRCommand *comm,
+ 				      process_line__delete,
+ 				      comm);
+ 
+-	fr_process_begin_command (comm->process, "tar");
++	fr_process_begin_command (comm->process, FILEROLLER_TAR);
+ 	fr_process_set_begin_func (comm->process, begin_func__delete, comm);
+ 	fr_process_add_arg (comm->process, "--force-local");
+ 	fr_process_add_arg (comm->process, "-v");
+@@ -323,7 +323,7 @@ fr_command_tar_extract (FRCommand  *comm
+ 				      process_line__extract,
+ 				      comm);
+ 
+-	fr_process_begin_command (comm->process, "tar");
++	fr_process_begin_command (comm->process, FILEROLLER_TAR);
+ 	fr_process_add_arg (comm->process, "--force-local");
+ 	fr_process_add_arg (comm->process, "-v");
+ 	fr_process_add_arg (comm->process, "-xf");
diff --git a/archivers/file-roller/patches/patch-ab b/archivers/file-roller/patches/patch-ab
new file mode 100644
index 00000000000..711136adeb2
--- /dev/null
+++ b/archivers/file-roller/patches/patch-ab
@@ -0,0 +1,49 @@
+$NetBSD: patch-ab,v 1.1 2004/02/10 11:52:05 jmmv Exp $
+
+--- src/fr-command-zip.c.orig	2004-01-26 12:31:55.000000000 +0100
++++ src/fr-command-zip.c
+@@ -221,7 +221,7 @@ fr_command_zip_list (FRCommand *comm)
+ 				      comm);
+ 
+ 	fr_process_clear (comm->process);
+-	fr_process_begin_command (comm->process, "unzip");
++	fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
+ 	fr_process_add_arg (comm->process, "-qq");
+ 	fr_process_add_arg (comm->process, "-v");
+ 	fr_process_add_arg (comm->process, "-l");
+@@ -264,7 +264,7 @@ fr_command_zip_add (FRCommand     *comm,
+ 				      process_line__common,
+ 				      comm);
+ 
+-	fr_process_begin_command (comm->process, "zip");
++	fr_process_begin_command (comm->process, FILEROLLER_ZIP);
+ 
+ 	if (base_dir != NULL) 
+ 		fr_process_set_working_dir (comm->process, base_dir);
+@@ -310,7 +310,7 @@ fr_command_zip_delete (FRCommand *comm,
+ 				      process_line__common,
+ 				      comm);
+ 
+-	fr_process_begin_command (comm->process, "zip");
++	fr_process_begin_command (comm->process, FILEROLLER_ZIP);
+ 	fr_process_add_arg (comm->process, "-d");
+ 	add_filename_arg (comm);
+ 
+@@ -339,7 +339,7 @@ fr_command_zip_extract (FRCommand  *comm
+ 				      process_line__common,
+ 				      comm);
+ 
+-	fr_process_begin_command (comm->process, "unzip");
++	fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
+ 	
+ 	if (dest_dir != NULL) {
+ 		char *e_dest_dir = shell_escape (dest_dir);
+@@ -377,7 +377,7 @@ static void
+ fr_command_zip_test (FRCommand   *comm,
+ 		     const char  *password)
+ {
+-	fr_process_begin_command (comm->process, "unzip");
++	fr_process_begin_command (comm->process, FILEROLLER_UNZIP);
+ 	fr_process_add_arg (comm->process, "-t");
+ 	add_password_arg (comm, password);
+ 	add_filename_arg (comm);