diff options
| author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-19 09:10:33 +0800 |
|---|---|---|
| committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2006-11-19 09:10:33 +0800 |
| commit | 2feb676a88c0dc2a3dad18cfa77ccc062f84adb5 (patch) | |
| tree | 39916a1f39caf7c2f60092c6ebc3d103900af1ac | |
| parent | 02a6cc8090f35e3c3bd4105abcfe191c6ed9c840 (diff) | |
| download | marcuscom-ports-2feb676a88c0dc2a3dad18cfa77ccc062f84adb5.tar marcuscom-ports-2feb676a88c0dc2a3dad18cfa77ccc062f84adb5.tar.gz marcuscom-ports-2feb676a88c0dc2a3dad18cfa77ccc062f84adb5.tar.bz2 marcuscom-ports-2feb676a88c0dc2a3dad18cfa77ccc062f84adb5.tar.lz marcuscom-ports-2feb676a88c0dc2a3dad18cfa77ccc062f84adb5.tar.xz marcuscom-ports-2feb676a88c0dc2a3dad18cfa77ccc062f84adb5.tar.zst marcuscom-ports-2feb676a88c0dc2a3dad18cfa77ccc062f84adb5.zip | |
Fix ISO extraction by making sure the fully-qualified path is passed to
isoinfo, and the isoinfo.sh script does not echo any extraneous data
to stdout.
Reported by: ahze
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7934 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | archivers/file-roller/Makefile | 4 | ||||
| -rw-r--r-- | archivers/file-roller/files/patch-src_fr-command-iso.c | 35 | ||||
| -rw-r--r-- | archivers/file-roller/files/patch-src_sh_isoinfo.sh | 11 |
3 files changed, 48 insertions, 2 deletions
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 148796761..003d61ff8 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -3,12 +3,12 @@ # Whom: Anders Nordby <anders@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/archivers/file-roller/Makefile,v 1.107 2006/11/07 23:57:19 marcus Exp $ +# $MCom: ports/archivers/file-roller/Makefile,v 1.108 2006/11/11 19:07:07 marcus Exp $ # PORTNAME= file-roller PORTVERSION= 2.17.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= archivers gnome MASTER_SITES= ${MASTER_SITE_GNOME} diff --git a/archivers/file-roller/files/patch-src_fr-command-iso.c b/archivers/file-roller/files/patch-src_fr-command-iso.c new file mode 100644 index 000000000..e312c2a08 --- /dev/null +++ b/archivers/file-roller/files/patch-src_fr-command-iso.c @@ -0,0 +1,35 @@ +--- src/fr-command-iso.c.orig Sat Nov 18 20:04:49 2006 ++++ src/fr-command-iso.c Sat Nov 18 20:05:00 2006 +@@ -159,6 +159,7 @@ fr_command_iso_extract (FRCommand *comm + gboolean junk_paths, + const char *password) + { ++ FRCommandIso *comm_iso = FR_COMMAND_ISO (comm); + char *e_dest_dir; + GList *scan; + +@@ -181,6 +182,8 @@ fr_command_iso_extract (FRCommand *comm + if (e_temp_dest_dir == NULL) + continue; + ++ extract_path = g_build_filename (comm_iso->cur_path, path, NULL); ++ + temp_dest_dir = unescape_str (e_temp_dest_dir); + ensure_dir_exists (temp_dest_dir, 0700); + +@@ -189,13 +192,14 @@ fr_command_iso_extract (FRCommand *comm + fr_process_add_arg (comm->process, "-i"); + fr_process_add_arg (comm->process, comm->e_filename); + fr_process_add_arg (comm->process, "-x"); +- fr_process_add_arg (comm->process, path); ++ fr_process_add_arg (comm->process, extract_path); + fr_process_add_arg (comm->process, ">"); + fr_process_add_arg (comm->process, filename); + fr_process_end_command (comm->process); + + g_free (e_temp_dest_dir); + g_free (temp_dest_dir); ++ g_free (extract_path); + } + + g_free (e_dest_dir); diff --git a/archivers/file-roller/files/patch-src_sh_isoinfo.sh b/archivers/file-roller/files/patch-src_sh_isoinfo.sh new file mode 100644 index 000000000..b9cdf2c0d --- /dev/null +++ b/archivers/file-roller/files/patch-src_sh_isoinfo.sh @@ -0,0 +1,11 @@ +--- src/sh/isoinfo.sh.orig Sat Nov 18 20:05:33 2006 ++++ src/sh/isoinfo.sh Sat Nov 18 20:05:46 2006 +@@ -5,7 +5,7 @@ filename=$2 + JOLIET=true + ROCK_RIDGE=true + +-echo "isoinfo -d -i $filename" ++#echo "isoinfo -d -i $filename" + + ISOINFO=`isoinfo -d -i $filename` + if echo $ISOINFO | grep "NO Joliet present" >/dev/null 2>&1; then |