- fixed man page missing arguments (Resolves: #647024)
https://bugzilla.redhat.com/show_bug.cgi?id=647024 - fixed erroneous "Unknown file type (unallocated)" warning (Resolves: #174667) https://bugzilla.redhat.com/show_bug.cgi?id=174667
This commit is contained in:
parent
d9038f5d99
commit
730bcb0a08
191
cdrkit-1.1.11-manpagefix.patch
Normal file
191
cdrkit-1.1.11-manpagefix.patch
Normal file
@ -0,0 +1,191 @@
|
|||||||
|
diff -up cdrkit-1.1.11/genisoimage/genisoimage.1.orig cdrkit-1.1.11/genisoimage/genisoimage.1
|
||||||
|
--- cdrkit-1.1.11/genisoimage/genisoimage.1.orig 2011-01-21 14:26:20.709816708 +0100
|
||||||
|
+++ cdrkit-1.1.11/genisoimage/genisoimage.1 2011-01-24 08:49:24.283964211 +0100
|
||||||
|
@@ -180,6 +180,8 @@ in the
|
||||||
|
file.
|
||||||
|
.TP
|
||||||
|
.BI \-A " application_id"
|
||||||
|
+.TP
|
||||||
|
+.BI \-appid " application_id"
|
||||||
|
Specifies a text string that will be written into the volume header.
|
||||||
|
This should describe the application that will be on the disc. There
|
||||||
|
is space for 128 characters. Equivalent to
|
||||||
|
@@ -365,6 +367,8 @@ the Sun disk label will overlay the firs
|
||||||
|
boot image.
|
||||||
|
.TP
|
||||||
|
.BI \-b " eltorito_boot_image"
|
||||||
|
+.TP
|
||||||
|
+.BI \-eltorito\-boot " eltorito_boot_image"
|
||||||
|
Specifies the path and filename of the boot image to be used when making
|
||||||
|
an El Torito bootable CD for x86 PCs. The pathname must be relative to
|
||||||
|
the source path specified to
|
||||||
|
@@ -427,6 +431,8 @@ See the
|
||||||
|
section for a description of this table.
|
||||||
|
.TP
|
||||||
|
.BI \-C " last_sess_start,next_sess_start"
|
||||||
|
+.TP
|
||||||
|
+.BI \-cdrecord\-params " last_sess_start,next_sess_start"
|
||||||
|
This option is needed to create a CD Extra or the image of a second
|
||||||
|
session or a higher-level session for a multisession disc.
|
||||||
|
.B \-C
|
||||||
|
@@ -452,6 +458,8 @@ session on a CD Extra. This is a multise
|
||||||
|
in the first session and an ISO9660 filesystem in the second session.
|
||||||
|
.TP
|
||||||
|
.BI \-c " boot_catalog"
|
||||||
|
+.TP
|
||||||
|
+.BI \-eltorito\-catalog " boot_catalog"
|
||||||
|
Specifies the path and filename of the boot catalog, which is required
|
||||||
|
for an El Torito bootable CD. The pathname must be relative to the source
|
||||||
|
path specified to
|
||||||
|
@@ -488,6 +496,12 @@ For the parameter
|
||||||
|
see the description of
|
||||||
|
.BR \-M .
|
||||||
|
.TP
|
||||||
|
+.BI \-checksum_algorithm_iso " alg1,alg2,..."
|
||||||
|
+Specify the checksum types desired for the output image.
|
||||||
|
+.TP
|
||||||
|
+.BI \-checksum_algorithm_template " alg1,alg2,..."
|
||||||
|
+Specify the checksum types desired for the output jigdo template.
|
||||||
|
+.TP
|
||||||
|
.BI \-copyright " file"
|
||||||
|
Specifies copyright information, typically a filename on the disc.
|
||||||
|
There is space for 37 characters. Equivalent to
|
||||||
|
@@ -497,12 +511,16 @@ in the
|
||||||
|
file.
|
||||||
|
.TP
|
||||||
|
.B \-d
|
||||||
|
+.TP
|
||||||
|
+.B \-omit\-period
|
||||||
|
Do not append a period to files that do not have one.
|
||||||
|
.br
|
||||||
|
This violates the ISO9660 standard, but it happens to work on many systems.
|
||||||
|
Use with caution.
|
||||||
|
.TP
|
||||||
|
.B \-D
|
||||||
|
+.TP
|
||||||
|
+.B \-disable\-deep\-relocation
|
||||||
|
Do not use deep directory relocation, and instead just pack them in the
|
||||||
|
way we see them.
|
||||||
|
.br
|
||||||
|
@@ -510,6 +528,9 @@ If ISO9660:1999 has not been selected,
|
||||||
|
this violates the ISO9660 standard, but it happens to work on many systems.
|
||||||
|
Use with caution.
|
||||||
|
.TP
|
||||||
|
+.B \-debug
|
||||||
|
+Set debug flag.
|
||||||
|
+.TP
|
||||||
|
.BI \-dir\-mode " mode"
|
||||||
|
Overrides the mode of directories used to create the image to
|
||||||
|
.IR mode ,
|
||||||
|
@@ -535,7 +556,14 @@ another directory
|
||||||
|
needs to include all needed files (filenames must be all caps) for a
|
||||||
|
compliant DVD-Video filesystem.
|
||||||
|
.TP
|
||||||
|
+.BI \-e " efi_boot_file"
|
||||||
|
+.TP
|
||||||
|
+.BI \-efi\-boot " efi_boot_file"
|
||||||
|
+Set EFI boot image name.
|
||||||
|
+.TP
|
||||||
|
.B \-f
|
||||||
|
+.TP
|
||||||
|
+.B \-follow\-links
|
||||||
|
Follow symbolic links when generating the filesystem. When this option is not
|
||||||
|
in use, symbolic links will be entered using Rock Ridge if enabled, otherwise
|
||||||
|
they will be ignored.
|
||||||
|
@@ -740,6 +768,8 @@ See the
|
||||||
|
section below for more details.
|
||||||
|
.TP
|
||||||
|
.B \-l
|
||||||
|
+.TP
|
||||||
|
+.B \-full\-iso9660\-filenames
|
||||||
|
Allow full 31-character filenames. Normally the ISO9660 filename will be in an
|
||||||
|
8.3 format which is compatible with MS-DOS, even though the ISO9660 standard
|
||||||
|
allows filenames of up to 31 characters. If you use this option, the disc may
|
||||||
|
@@ -870,6 +900,8 @@ with
|
||||||
|
.BR \-C .
|
||||||
|
.TP
|
||||||
|
.B \-N
|
||||||
|
+.TP
|
||||||
|
+.B \-omit\-version\-number
|
||||||
|
Omit version numbers from ISO9660 filenames.
|
||||||
|
.br
|
||||||
|
This violates the ISO9660 standard, but no one really uses the
|
||||||
|
@@ -967,6 +999,8 @@ in the
|
||||||
|
file.
|
||||||
|
.TP
|
||||||
|
.BI \-p " preparer_id"
|
||||||
|
+.TP
|
||||||
|
+.BI \-preparer " preparer_id"
|
||||||
|
Specifies a text string that will be written into the volume header.
|
||||||
|
This should describe the preparer of the CD-ROM, usually with a mailing
|
||||||
|
address and phone number. There is space for 128 characters.
|
||||||
|
@@ -1008,10 +1042,14 @@ This makes
|
||||||
|
even less verbose. No progress output will be provided.
|
||||||
|
.TP
|
||||||
|
.B \-R
|
||||||
|
+.TP
|
||||||
|
+.B \-rock
|
||||||
|
Generate SUSP and RR records using the Rock Ridge protocol to further describe
|
||||||
|
the files on the ISO9660 filesystem.
|
||||||
|
.TP
|
||||||
|
.B \-r
|
||||||
|
+.TP
|
||||||
|
+.B \-rational\-rock
|
||||||
|
This is like the \-R option, but file ownership and modes are set to
|
||||||
|
more useful values. The uid and gid are set to zero, because they are
|
||||||
|
usually only useful on the author's system, and not useful to the
|
||||||
|
@@ -1092,6 +1130,11 @@ intentionally. Accessing several older v
|
||||||
|
support by the operating system to choose which sessions are to be
|
||||||
|
mounted.
|
||||||
|
.TP
|
||||||
|
+.BI \-s " sector type"
|
||||||
|
+.TP
|
||||||
|
+.BI \-sectype " sector type"
|
||||||
|
+Set output sector type to e.g. data/xa1/raw.
|
||||||
|
+ .TP
|
||||||
|
.BI \-sort " sort_file"
|
||||||
|
Sort file locations on the media. Sorting is controlled by a file that
|
||||||
|
contains pairs of filenames and sorting offset weighting.
|
||||||
|
@@ -1213,6 +1256,8 @@ in the
|
||||||
|
file.
|
||||||
|
.TP
|
||||||
|
.B \-T
|
||||||
|
+.TP
|
||||||
|
+.B \-translation\-table
|
||||||
|
Generate a file
|
||||||
|
.I TRANS.TBL
|
||||||
|
in each directory on the CD-ROM, which can be used
|
||||||
|
@@ -1262,6 +1307,8 @@ to
|
||||||
|
This option is the default on VMS.
|
||||||
|
.TP
|
||||||
|
.B \-U
|
||||||
|
+.TP
|
||||||
|
+.B \-untranslated\-filenames
|
||||||
|
Allows "untranslated" filenames, completely violating the ISO9660 standards
|
||||||
|
described above. Enables the following flags:
|
||||||
|
.B \-d \-l \-N \-allow\-leading\-dots \-relaxed\-filenames
|
||||||
|
@@ -1333,6 +1380,8 @@ must be specified before
|
||||||
|
on each command line.
|
||||||
|
.TP
|
||||||
|
.B \-v
|
||||||
|
+.TP
|
||||||
|
+.B \-verbose
|
||||||
|
Verbose execution. If given twice on the command line, extra debug information
|
||||||
|
will be printed.
|
||||||
|
.TP
|
||||||
|
@@ -1341,7 +1390,15 @@ Identical to
|
||||||
|
.B \-m
|
||||||
|
.IR glob .
|
||||||
|
.TP
|
||||||
|
+.B \-XA
|
||||||
|
+Generate XA directory attruibutes.
|
||||||
|
+.TP
|
||||||
|
+.B \-xa
|
||||||
|
+Generate rationalized XA directory attruibutes.
|
||||||
|
+.TP
|
||||||
|
.B \-z
|
||||||
|
+.TP
|
||||||
|
+.B \-transparent\-compression
|
||||||
|
Generate special
|
||||||
|
.I RRIP
|
||||||
|
records for transparently compressed files.
|
31
cdrkit-1.1.11-rootstat.patch
Normal file
31
cdrkit-1.1.11-rootstat.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
diff -up cdrkit-1.1.11/genisoimage/tree.c.rootstat cdrkit-1.1.11/genisoimage/tree.c
|
||||||
|
--- cdrkit-1.1.11/genisoimage/tree.c.rootstat 2011-01-25 14:15:36.766389403 +0100
|
||||||
|
+++ cdrkit-1.1.11/genisoimage/tree.c 2011-01-25 14:17:24.804643126 +0100
|
||||||
|
@@ -48,6 +48,7 @@
|
||||||
|
#include <fctldefs.h>
|
||||||
|
#include <device.h>
|
||||||
|
#include <schily.h>
|
||||||
|
+#include <libgen.h>
|
||||||
|
|
||||||
|
extern int allow_limited_size;
|
||||||
|
|
||||||
|
@@ -1421,12 +1422,16 @@ insert_file_entry(struct directory *this
|
||||||
|
return (0);
|
||||||
|
}
|
||||||
|
if (this_dir == root && strcmp(short_name, ".") == 0)
|
||||||
|
- root_statbuf = statbuf; /* Save this for later on */
|
||||||
|
+ memcpy(&root_statbuf, &statbuf, sizeof(root_statbuf)); /* Save this for later on */
|
||||||
|
|
||||||
|
/* We do this to make sure that the root entries are consistent */
|
||||||
|
if (this_dir == root && strcmp(short_name, "..") == 0) {
|
||||||
|
- statbuf = root_statbuf;
|
||||||
|
- lstatbuf = root_statbuf;
|
||||||
|
+ /* for the case .. comes before . */
|
||||||
|
+ if (!root_statbuf.st_ctime) {
|
||||||
|
+ stat_filter(dirname(whole_path), &root_statbuf);
|
||||||
|
+ }
|
||||||
|
+ memcpy(&statbuf, &root_statbuf, sizeof(statbuf));
|
||||||
|
+ memcpy(&lstatbuf, &root_statbuf, sizeof(lstatbuf));
|
||||||
|
}
|
||||||
|
if (S_ISLNK(lstatbuf.st_mode)) {
|
||||||
|
|
14
cdrkit.spec
14
cdrkit.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: A collection of CD/DVD utilities
|
Summary: A collection of CD/DVD utilities
|
||||||
Name: cdrkit
|
Name: cdrkit
|
||||||
Version: 1.1.11
|
Version: 1.1.11
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://cdrkit.org/
|
URL: http://cdrkit.org/
|
||||||
@ -13,6 +13,9 @@ Patch4: cdrkit-1.1.9-no_mp3.patch
|
|||||||
Patch5: cdrkit-1.1.9-buffer_overflow.patch
|
Patch5: cdrkit-1.1.9-buffer_overflow.patch
|
||||||
#Patch6: cdrkit-1.1.9-rr_joliet.patch
|
#Patch6: cdrkit-1.1.9-rr_joliet.patch
|
||||||
Patch6: cdrkit-1.1.10-build-fix.patch
|
Patch6: cdrkit-1.1.10-build-fix.patch
|
||||||
|
Patch7: cdrkit-1.1.11-manpagefix.patch
|
||||||
|
Patch8: cdrkit-1.1.11-rootstat.patch
|
||||||
|
|
||||||
|
|
||||||
BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
|
BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
|
||||||
|
|
||||||
@ -88,6 +91,8 @@ rates. Icedax can also be used as a CD player.
|
|||||||
%patch5 -p1 -b .buffer_overflow
|
%patch5 -p1 -b .buffer_overflow
|
||||||
#%patch6 -p1 -b .rr_joliet
|
#%patch6 -p1 -b .rr_joliet
|
||||||
%patch6 -p1 -b .build-fix
|
%patch6 -p1 -b .build-fix
|
||||||
|
%patch7 -p1 -b .manpagefix
|
||||||
|
%patch8 -p1 -b .rootstat
|
||||||
|
|
||||||
find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
|
find . -type f -print0 | xargs -0 perl -pi -e 's#/usr/local/bin/perl#/usr/bin/perl#g'
|
||||||
find doc -type f -print0 | xargs -0 chmod a-x
|
find doc -type f -print0 | xargs -0 chmod a-x
|
||||||
@ -234,6 +239,13 @@ fi
|
|||||||
%{_mandir}/man1/dirsplit.*
|
%{_mandir}/man1/dirsplit.*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 31 2011 Honza Horak <hhorak@redhat.com> 1.1.11-2
|
||||||
|
- fixed man page missing arguments (Resolves: #647024)
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=647024
|
||||||
|
- fixed erroneous "Unknown file type (unallocated)" warning
|
||||||
|
(Resolves: #174667)
|
||||||
|
https://bugzilla.redhat.com/show_bug.cgi?id=174667
|
||||||
|
|
||||||
* Mon Oct 18 2010 Nikola Pajkovsky <npajkovs@redhat.com> 1.1.11-1
|
* Mon Oct 18 2010 Nikola Pajkovsky <npajkovs@redhat.com> 1.1.11-1
|
||||||
- new upstream version 1.1.11
|
- new upstream version 1.1.11
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user