Date: Wed, 17 Sep 2008 03:35:18 GMT From: Warren Block <wblock@wonkity.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/127431: [patch] update xcdroast to fix obsolete mkisofs options Message-ID: <200809170335.m8H3ZIdb028596@www.freebsd.org> Resent-Message-ID: <200809170340.m8H3e01o099640@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127431
>Category: ports
>Synopsis: [patch] update xcdroast to fix obsolete mkisofs options
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 17 03:40:00 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Warren Block
>Release: 7.1-PRERELEASE
>Organization:
>Environment:
FreeBSD speedy 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Fri Sep 12 11:32:46 MDT 2008 root@speedy:/usr/obj/usr/src/sys/SPEEDY i386
>Description:
sysutils/xcdroast uses obsolete mkisofs options -L and -P. Current versions of mkisofs error out with these options. The attached patches replace -L with -allow-leading-dots and -P with -publisher in create.c and io.c. There may be other obsolete options, but this at least lets xcdroast create data CDs with recent versions of mkisofs.
>How-To-Repeat:
Run xcdroast. Try to create an ISO file or data CD. Go to the Create session/image tab: "mkisofs reported an error while calculating the session size!"
>Fix:
Patches attached.
Patch attached with submission follows:
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# patch-src-create.c
# patch-src-io.c
#
echo x - patch-src-create.c
sed 's/^X//' >patch-src-create.c << '7180186e19ae8f4a2990948a11925660'
X--- src/create.c.orig 2003-10-30 04:28:10.000000000 -0700
X+++ src/create.c 2008-09-16 21:05:00.000000000 -0600
X@@ -5051,7 +5051,7 @@
X gtk_widget_show(check);
X define_tooltip(check, _("This is like the other Rock Ridge option, but preserves the original permissions and file owner information. This should be used when you create CDs for backup purposes."));
X
X- /* -L allow isonames with starting period */
X+ /* -allow-leading-dots allow isonames with starting period */
X check = gtk_check_button_new_with_label(_("Allow ISO-files with a starting period"));
X isoopts[7] = check;
X gtk_signal_connect(GTK_OBJECT(check),"clicked",
X@@ -5435,7 +5435,7 @@
X gtk_widget_show(e1);
X define_tooltip(e1, _("This is the name of the disc as displayed on Windows or Mac systems. On Solaris this will be used as the mount point for the volume management system."));
X
X- /* -P publisher_id 128 chars */
X+ /* -publisher publisher_id 128 chars */
X l1 = rightjust_gtk_label_new(_("Publisher Id:"));
X gtk_table_attach_defaults(GTK_TABLE(tbl),l1,0,4,1,2);
X gtk_widget_show(l1);
7180186e19ae8f4a2990948a11925660
echo x - patch-src-io.c
sed 's/^X//' >patch-src-io.c << 'aea0558d6b91fdeac5508ede199a1a42'
X--- src/io.c.orig 2008-09-16 21:03:03.000000000 -0600
X+++ src/io.c 2008-09-16 21:04:16.000000000 -0600
X@@ -9026,7 +9026,7 @@
X strcat(tmp2,"-D ");
X }
X if (masterparam.opt[7]) {
X- strcat(tmp2,"-L ");
X+ strcat(tmp2,"-allow-leading-dots ");
X }
X if (masterparam.opt[8]) {
X strcat(tmp2,"-d ");
X@@ -9160,7 +9160,7 @@
X }
X if (masterparam.publisher) {
X strcpy(tmptmp, masterparam.publisher);
X- g_snprintf(tmp5,MAXLINE,"-P \"%s\" ",
X+ g_snprintf(tmp5,MAXLINE,"-publisher \"%s\" ",
X convert_escape(tmptmp));
X strcat(tmp4,tmp5);
X }
aea0558d6b91fdeac5508ede199a1a42
exit
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809170335.m8H3ZIdb028596>