mirror of https://gitee.com/openkylin/cdrkit.git
Import Debian changes 9:1.1.11-ok1
cdrkit (9:1.1.11-ok1) yangtze; urgency=low * Build for openKylin.
This commit is contained in:
openKylinBot
parent
1754ec09ac
commit
e17b4cedd0
|
|
@ -0,0 +1,34 @@
|
|||
cdrkit for Debian
|
||||
----------------
|
||||
|
||||
cdrkit is Cd Recording Kit, a collection of applications related to creation
|
||||
of optical disk media on unixoid platforms. It is a spinoff from the original
|
||||
program distributed by the cdrtools project. However, the cdrtools developers
|
||||
are not involved in the development of this spinoff and therefore shall
|
||||
not be made responsible for any problem caused by it.
|
||||
Do not try to get support for this program by contacting the original authors.
|
||||
|
||||
If you want to report Bugs please read the following:
|
||||
|
||||
Please use only the recent version of cdrkit for bug-reports, it
|
||||
may be found on: http://alioth.debian.org/projects/debburn/.
|
||||
|
||||
Please always include the following information in your bug-report:
|
||||
|
||||
# The version number of the program that caused the bug.
|
||||
# The command line that was used for the failing command.
|
||||
# The complete output (including error messages) from (use -v switches)
|
||||
# The OS name, release and hardware (processor)
|
||||
# Special conditions of your environment (libc vers. SCSI transport ...)
|
||||
# Sufficient information on the media used. This is at least the ATIP
|
||||
data, a note to CD-R/CD-RW and information on the state and the case
|
||||
history of this media.
|
||||
|
||||
A message in the form: "Sorry, no CD/DVD-Recorder or unsupported
|
||||
CD/DVD-Recorder found" is not an acceptable error report, because we cannot
|
||||
see any reason why this message has been printed. For this reason we would
|
||||
need the complete inquiry output to understand why this message was printed.
|
||||
|
||||
-- Joerg Jaspert <joerg@debian.org>, Sun, 24 Sep 2006 01:35:09 +0200
|
||||
-- Eduard Bloch <blade@debian.org>, Wed, 23 Aug 2006 21:47:08 +0200
|
||||
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
/usr/share/doc/cdrkit-doc/cdda2wav
|
||||
/usr/share/doc/cdrkit-doc/wodim
|
||||
/usr/share/doc/cdrkit-doc/mkisofs
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
doc/* usr/share/doc/cdrkit-doc/
|
||||
3rd-party/zisofs_tools/README usr/share/doc/cdrkit-doc/zisofs
|
||||
ABOUT FORK FAQ usr/share/doc/cdrkit-doc/
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
cdrkit (9:1.1.11-ok1) yangtze; urgency=low
|
||||
|
||||
* Build for openKylin.
|
||||
|
||||
-- openKylinBot <openKylinBot@openkylin.com> Mon, 25 Apr 2022 22:03:04 +0800
|
||||
|
|
@ -0,0 +1 @@
|
|||
5
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
Source: cdrkit
|
||||
Priority: optional
|
||||
Section: otherosfs
|
||||
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
|
||||
XSBC-Original-Maintainer: Joerg Jaspert <joerg@debian.org>
|
||||
Uploaders: Eduard Bloch <blade@debian.org>, Steve McIntyre <93sam@debian.org>
|
||||
Build-Depends: debhelper (>=5.0.37.3), libbz2-dev, zlib1g-dev, autotools-dev, cmake (>= 2.4.2), libcap2-dev [linux-any], libcam-dev [kfreebsd-any], libmagic-dev
|
||||
Standards-Version: 3.9.2
|
||||
|
||||
Package: wodim
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Recommends: genisoimage
|
||||
Replaces: cdrtools-doc, cdrecord
|
||||
Suggests: cdrkit-doc
|
||||
Conflicts: cdrecord, xcdroast (<< 0.98+0alpha15-0)
|
||||
Provides: cdrecord
|
||||
Description: command line CD/DVD writing tool
|
||||
wodim allows you to create CDs or DVDs on a CD/DVD recorder.
|
||||
It supports writing data, audio, mixed, multi-session, and CD+ disc and DVD
|
||||
data and video disks on DVD capable devices, on just about every type of
|
||||
CD/DVD recorder out there.
|
||||
.
|
||||
Please install cdrkit-doc if you want most of the documentation and
|
||||
README files.
|
||||
|
||||
Package: genisoimage
|
||||
Architecture: any
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Suggests: wodim, cdrkit-doc
|
||||
Replaces: mkisofs
|
||||
Conflicts: mkhybrid, mkisofs
|
||||
Provides: mkisofs
|
||||
Description: Creates ISO-9660 CD-ROM filesystem images
|
||||
genisoimage is a pre-mastering program for creating ISO-9660 CD-ROM
|
||||
filesystem images, which can then be written to CD or DVD media using
|
||||
the wodim program. genisoimage includes support for making bootable
|
||||
"El Torito" CDs, as well as CDs with support for the
|
||||
Macintosh HFS filesystem.
|
||||
.
|
||||
The package also includes extra tools useful for working with ISO images:
|
||||
* mkzftree - create ISO-9660 image with compressed contents
|
||||
* dirsplit - easily separate large directory contents into disks of
|
||||
predefined size
|
||||
* geteltorito - extract an El Torito boot image from a CD image
|
||||
.
|
||||
Please install cdrkit-doc if you want most of the documentation and
|
||||
README files.
|
||||
|
||||
Package: icedax
|
||||
Architecture: any
|
||||
Suggests: vorbis-tools, cdrkit-doc
|
||||
Depends: ${shlibs:Depends}, ${misc:Depends}
|
||||
Section: sound
|
||||
Provides: cdda2wav
|
||||
Replaces: cdda2wav
|
||||
Conflicts: cdda2wav
|
||||
Description: Creates WAV files from audio CDs
|
||||
icedax lets you digitally copy ("rip") audio tracks from a CD, avoiding
|
||||
the distortion that is introduced when recording via a sound card. Data
|
||||
can be dumped into raw (cdr), wav or sun format sound files. Options control
|
||||
the recording format (stereo/mono; 8/16 bits; sampling rate, etc).
|
||||
.
|
||||
Please install cdrkit-doc if you want most of the documentation and
|
||||
README files.
|
||||
|
||||
Package: cdrkit-doc
|
||||
Architecture: all
|
||||
Depends: ${misc:Depends}
|
||||
Section: doc
|
||||
Replaces: cdrtools-doc
|
||||
Conflicts: cdrtools-doc
|
||||
Suggests: wodim, genisoimage, icedax
|
||||
Description: Documentation for the cdrkit package suite
|
||||
This is the documentation for the cdrkit package suite, namely
|
||||
wodim, genisoimage and icedax.
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
This package was first debianized by Erik Andersen andersee@debian.org.
|
||||
The current Debian maintainer is Joerg Jaspert <joerg@debian.org>.
|
||||
Co-maintainers: Eduard Bloch <blade@debian.org>,
|
||||
Steve McIntyre <93sam@debian.org>
|
||||
|
||||
It is available as free download on
|
||||
<https://alioth.debian.org/projects/debburn/>.
|
||||
The package contains parts of zisofs-tools, downloaded from
|
||||
<ftp://ftp.kernel.org/pub/linux/utils/fs/zisofs/>.
|
||||
|
||||
Upstream maintainers:
|
||||
The upstream author of zisofs-tools is H. Peter Anvin <hpa@zytor.com>.
|
||||
The rest is maintained by the Debian maintainers; see above.
|
||||
|
||||
Other authors:
|
||||
Joerg Schilling <schilling@fokus.fraunhofer.de>, Eric Youngdale and many
|
||||
others.
|
||||
|
||||
Names of relevant binary program(s) and copyright info have been adapted to
|
||||
avoid the violation of the GPL license (as offered by Joerg Schilling) and the
|
||||
obligations created by German laws.
|
||||
|
||||
Copyright:
|
||||
|
||||
* cdda2wav
|
||||
Copyright 1998-2003 Heiko Eissfeldt
|
||||
parts (C) Peter Widow
|
||||
parts (C) Thomas Niederreiter
|
||||
parts (C) RSA Data Security, Inc.
|
||||
License: GPLv2
|
||||
|
||||
* mkisofs
|
||||
Written by Eric Youngdale (1993).
|
||||
Copyright 1993 Yggdrasil Computing, Incorporated
|
||||
Copyright (c) 1999,2000-2004 J. Schilling
|
||||
APPLE_HYB James Pearson j.pearson@ge.ucl.ac.uk 22/2/2000
|
||||
License: GPLv2
|
||||
|
||||
* libedc compact disc reed-solomon routines
|
||||
(c) 1998-2002 by Heiko Eissfeldt, heiko@colossus.escape.de
|
||||
(c) 2002 by Joerg Schilling
|
||||
License: GPLv2
|
||||
|
||||
* libhfs_iso - Modified version of libhfs (v2.0) to work with mkhybrid.
|
||||
(C) 1996, 1997 Robert Leslie
|
||||
License: GPLv2
|
||||
|
||||
* libcdparanoia
|
||||
(C) by Monty (xiphmont@mit.edu)
|
||||
Modifications to make the code portable Copyright (c) 2002 J. Schilling
|
||||
License: GPLv2
|
||||
|
||||
* readcd
|
||||
Copyright (c) 1987, 1995-2003 J. Schilling
|
||||
License: GPLv2
|
||||
|
||||
* zisofs-tools:
|
||||
Copyright 2001 H. Peter Anvin - All Rights Reserved
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
|
||||
* 02110-1301 USA; either version 2 of the License, or (at your option) any
|
||||
* later version; incorporated herein by reference.
|
||||
|
||||
* geteltorito
|
||||
Author: Rainer Krienke
|
||||
Email: krienke@uni-koblenz.de
|
||||
License: GPL
|
||||
Version: 0.3
|
||||
|
||||
The complete text of the GNU General Public License version 2 is
|
||||
available in /usr/share/common-licenses/GPL-2 on a Debian system.
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
usr/bin
|
||||
usr/share/doc/genisoimage
|
||||
|
|
@ -0,0 +1 @@
|
|||
3rd-party/geteltorito/README.geteltorito
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
debian/tmp/usr/bin/genisoimage
|
||||
debian/tmp/usr/bin/devdump
|
||||
debian/tmp/usr/bin/isoinfo
|
||||
debian/tmp/usr/bin/isodump
|
||||
debian/tmp/usr/bin/isovfy
|
||||
debian/tmp/usr/bin/dirsplit
|
||||
debian/tmp/usr/bin/mkzftree
|
||||
debian/tmp/usr/bin/geteltorito
|
||||
debian/tmp/usr/share/man/man1/genisoimage.1
|
||||
debian/tmp/usr/share/man/man1/isoinfo.1
|
||||
debian/tmp/usr/share/man/man1/dirsplit.1
|
||||
debian/tmp/usr/share/man/man5/genisoimagerc.5
|
||||
|
|
@ -0,0 +1,5 @@
|
|||
usr/share/man/man1/isoinfo.1 usr/share/man/man1/isodump.1
|
||||
usr/share/man/man1/isoinfo.1 usr/share/man/man1/isovfy.1
|
||||
usr/share/man/man1/isoinfo.1 usr/share/man/man1/devdump.1
|
||||
usr/bin/genisoimage usr/bin/mkisofs
|
||||
usr/share/man/man1/genisoimage.1 usr/share/man/man1/mkisofs.1
|
||||
|
|
@ -0,0 +1 @@
|
|||
usr/share/bug/cdda2wav
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
debian/tmp/usr/bin/icedax
|
||||
debian/tmp/usr/bin/cdrkit.cdda2mp3
|
||||
debian/tmp/usr/bin/cdrkit.cdda2ogg
|
||||
debian/tmp/usr/bin/readmult
|
||||
debian/tmp/usr/bin/pitchplay
|
||||
debian/tmp/usr/share/man/man1/icedax.1
|
||||
debian/tmp/usr/share/man/man1/cdrkit.cdda2ogg.1
|
||||
debian/tmp/usr/share/man/man1/readmult.1
|
||||
debian/tmp/usr/share/man/man1/pitchplay.1
|
||||
debian/tmp/usr/share/man/man1/list_audio_tracks.1
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
usr/share/man/man1/cdrkit.cdda2ogg.1.gz usr/share/man/man1/cdrkit.cdda2mp3.1.gz
|
||||
usr/bin/icedax usr/bin/list_audio_tracks
|
||||
usr/bin/icedax usr/bin/cdda2wav
|
||||
usr/share/man/man1/icedax.1.gz usr/share/man/man1/cdda2wav.1.gz
|
||||
|
|
@ -0,0 +1,50 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <postinst> `configure' <most-recently-configured-version>
|
||||
# * <old-postinst> `abort-upgrade' <new version>
|
||||
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
|
||||
# <new-version>
|
||||
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
|
||||
# <failed-install-package> <version> `removing'
|
||||
# <conflicting-package> <version>
|
||||
# for details, see /usr/share/doc/packaging-manual/
|
||||
#
|
||||
# quoting from the policy:
|
||||
# Any necessary prompting should almost always be confined to the
|
||||
# post-installation script, and should be protected with a conditional
|
||||
# so that unnecessary prompting doesn't happen if a package's
|
||||
# installation fails and the `postinst' is called with `abort-upgrade',
|
||||
# `abort-remove' or `abort-deconfigure'.
|
||||
|
||||
case "$1" in
|
||||
configure)
|
||||
update-alternatives --quiet --install \
|
||||
/usr/bin/cdda2ogg cdda2ogg /usr/bin/cdrkit.cdda2ogg 50 \
|
||||
--slave /usr/share/man/man1/cdda2ogg.1.gz cdda2ogg.1.gz \
|
||||
/usr/share/man/man1/cdrkit.cdda2ogg.1.gz
|
||||
|
||||
update-alternatives --quiet --install \
|
||||
/usr/bin/cdda2mp3 cdda2mp3 /usr/bin/cdrkit.cdda2mp3 50 \
|
||||
--slave /usr/share/man/man1/cdda2mp3.1.gz cdda2mp3.1.gz \
|
||||
/usr/share/man/man1/cdrkit.cdda2mp3.1.gz
|
||||
;;
|
||||
|
||||
abort-upgrade|abort-remove|abort-deconfigure)
|
||||
;;
|
||||
|
||||
*)
|
||||
echo "postinst called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
# dh_installdeb will replace this with shell code automatically
|
||||
# generated by other debhelper scripts.
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
#! /bin/sh
|
||||
|
||||
set -e
|
||||
|
||||
# summary of how this script can be called:
|
||||
# * <prerm> `remove'
|
||||
# * <old-prerm> `upgrade' <new-version>
|
||||
# * <new-prerm> `failed-upgrade' <old-version>
|
||||
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
|
||||
# * <deconfigured's-prerm> `deconfigure' `in-favour'
|
||||
# <package-being-installed> <version> `removing'
|
||||
# <conflicting-package> <version>
|
||||
# for details, see /usr/share/doc/packaging-manual/
|
||||
|
||||
case "$1" in
|
||||
remove|upgrade|deconfigure)
|
||||
update-alternatives --quiet --remove cdda2ogg /usr/bin/cdrkit.cdda2ogg
|
||||
update-alternatives --quiet --remove cdda2mp3 /usr/bin/cdrkit.cdda2mp3
|
||||
;;
|
||||
failed-upgrade)
|
||||
;;
|
||||
*)
|
||||
echo "prerm called with unknown argument \`$1'" >&2
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
#DEBHELPER#
|
||||
|
||||
exit 0
|
||||
|
||||
|
|
@ -0,0 +1,192 @@
|
|||
diff --git a/genisoimage/eltorito.c b/genisoimage/eltorito.c
|
||||
index b97bdf1..5d7c2d1 100644
|
||||
--- a/genisoimage/eltorito.c
|
||||
+++ b/genisoimage/eltorito.c
|
||||
@@ -59,7 +59,7 @@ static void get_torito_desc(struct eltorito_boot_descriptor *boot_desc);
|
||||
static void fill_boot_desc(struct eltorito_defaultboot_entry *boot_desc_entry,
|
||||
struct eltorito_boot_entry_info *boot_entry);
|
||||
void get_boot_entry(void);
|
||||
-void new_boot_entry(void);
|
||||
+void new_boot_entry();
|
||||
static int tvd_write(FILE *outfile);
|
||||
|
||||
|
||||
@@ -283,6 +283,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
|
||||
int i;
|
||||
int offset;
|
||||
struct eltorito_defaultboot_entry boot_desc_record;
|
||||
+ struct eltorito_sectionheader_entry section_header;
|
||||
|
||||
memset(boot_desc, 0, sizeof (*boot_desc));
|
||||
boot_desc->type[0] = 0;
|
||||
@@ -317,7 +318,7 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
|
||||
*/
|
||||
memset(&valid_desc, 0, sizeof (valid_desc));
|
||||
valid_desc.headerid[0] = 1;
|
||||
- valid_desc.arch[0] = EL_TORITO_ARCH_x86;
|
||||
+ valid_desc.arch[0] = first_boot_entry->arch;
|
||||
|
||||
/*
|
||||
* we'll shove start of publisher id into id field,
|
||||
@@ -347,10 +348,53 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
|
||||
/* now write it to the virtual boot catalog */
|
||||
memcpy(de2->table, &valid_desc, 32);
|
||||
|
||||
- for (current_boot_entry = first_boot_entry, offset = sizeof (valid_desc);
|
||||
- current_boot_entry != NULL;
|
||||
- current_boot_entry = current_boot_entry->next,
|
||||
- offset += sizeof (boot_desc_record)) {
|
||||
+ /* Fill the first entry, since it's special and already has the
|
||||
+ * matching header via the validation header... */
|
||||
+ offset = sizeof (valid_desc);
|
||||
+ current_boot_entry = first_boot_entry;
|
||||
+
|
||||
+ if (offset >= SECTOR_SIZE) {
|
||||
+#ifdef USE_LIBSCHILY
|
||||
+ comerrno(EX_BAD, "Too many El Torito boot entries\n");
|
||||
+#else
|
||||
+ fprintf(stderr, "Too many El Torito boot entries\n");
|
||||
+ exit(1);
|
||||
+#endif
|
||||
+ }
|
||||
+ fill_boot_desc(&boot_desc_record, current_boot_entry);
|
||||
+ memcpy(de2->table + offset, &boot_desc_record,
|
||||
+ sizeof (boot_desc_record));
|
||||
+
|
||||
+ offset += sizeof(boot_desc_record);
|
||||
+
|
||||
+ for (current_boot_entry = current_boot_entry->next;
|
||||
+ current_boot_entry != NULL;
|
||||
+ current_boot_entry = current_boot_entry->next) {
|
||||
+ struct eltorito_sectionheader_entry section_header;
|
||||
+
|
||||
+ if (offset >= SECTOR_SIZE) {
|
||||
+#ifdef USE_LIBSCHILY
|
||||
+ comerrno(EX_BAD,
|
||||
+ "Too many El Torito boot entries\n");
|
||||
+#else
|
||||
+ fprintf(stderr,
|
||||
+ "Too many El Torito boot entries\n");
|
||||
+ exit(1);
|
||||
+#endif
|
||||
+ }
|
||||
+
|
||||
+ memset(§ion_header, '\0', sizeof(section_header));
|
||||
+ if (current_boot_entry->next)
|
||||
+ section_header.headerid[0] = EL_TORITO_SECTION_HEADER;
|
||||
+ else
|
||||
+ section_header.headerid[0] = EL_TORITO_LAST_SECTION_HEADER;
|
||||
+
|
||||
+ section_header.arch[0] = current_boot_entry->arch;
|
||||
+ set_721(section_header.num_entries, 1);
|
||||
+
|
||||
+ memcpy(de2->table + offset, §ion_header,
|
||||
+ sizeof(section_header));
|
||||
+ offset += sizeof(section_header);
|
||||
|
||||
if (offset >= SECTOR_SIZE) {
|
||||
#ifdef USE_LIBSCHILY
|
||||
@@ -365,6 +409,8 @@ get_torito_desc(struct eltorito_boot_descriptor *boot_desc)
|
||||
fill_boot_desc(&boot_desc_record, current_boot_entry);
|
||||
memcpy(de2->table + offset, &boot_desc_record,
|
||||
sizeof (boot_desc_record));
|
||||
+ offset += sizeof (boot_desc_record);
|
||||
+
|
||||
}
|
||||
}/* get_torito_desc(... */
|
||||
|
||||
diff --git a/genisoimage/genisoimage.c b/genisoimage/genisoimage.c
|
||||
index a5b0b46..8add1ac 100644
|
||||
--- a/genisoimage/genisoimage.c
|
||||
+++ b/genisoimage/genisoimage.c
|
||||
@@ -47,6 +47,7 @@
|
||||
|
||||
#include <mconfig.h>
|
||||
#include "genisoimage.h"
|
||||
+#include "iso9660.h"
|
||||
#include <errno.h>
|
||||
#include <timedefs.h>
|
||||
#include <fctldefs.h>
|
||||
@@ -523,6 +524,8 @@ static const struct ld_option ld_options[] =
|
||||
'\0', NULL, "Set debug flag", ONE_DASH},
|
||||
{{"eltorito-boot", required_argument, NULL, 'b'},
|
||||
'b', "FILE", "Set El Torito boot image name", ONE_DASH},
|
||||
+ {{"efi-boot", required_argument, NULL, 'e'},
|
||||
+ 'e', "FILE", "Set EFI boot image name", ONE_DASH},
|
||||
{{"eltorito-alt-boot", no_argument, NULL, OPTION_ALT_BOOT},
|
||||
'\0', NULL, "Start specifying alternative El Torito boot parameters", ONE_DASH},
|
||||
{{"sparc-boot", required_argument, NULL, 'B'},
|
||||
@@ -1502,6 +1505,7 @@ int main(int argc, char *argv[])
|
||||
all_files = 0;
|
||||
break;
|
||||
case 'b':
|
||||
+ case 'e':
|
||||
do_sort++; /* We sort bootcat/botimage */
|
||||
use_eltorito++;
|
||||
boot_image = optarg; /* pathname of the boot image */
|
||||
@@ -1517,6 +1521,10 @@ int main(int argc, char *argv[])
|
||||
#endif
|
||||
}
|
||||
get_boot_entry();
|
||||
+ if (c == 'e')
|
||||
+ current_boot_entry->arch = EL_TORITO_ARCH_EFI;
|
||||
+ else
|
||||
+ current_boot_entry->arch = EL_TORITO_ARCH_x86;
|
||||
current_boot_entry->boot_image = boot_image;
|
||||
break;
|
||||
case OPTION_ALT_BOOT:
|
||||
diff --git a/genisoimage/genisoimage.h b/genisoimage/genisoimage.h
|
||||
index bbedfb0..76e5e21 100644
|
||||
--- a/genisoimage/genisoimage.h
|
||||
+++ b/genisoimage/genisoimage.h
|
||||
@@ -293,6 +293,7 @@ struct deferred_write {
|
||||
struct eltorito_boot_entry_info {
|
||||
struct eltorito_boot_entry_info *next;
|
||||
char *boot_image;
|
||||
+ char arch;
|
||||
int not_bootable;
|
||||
int no_emul_boot;
|
||||
int hard_disk_boot;
|
||||
diff --git a/genisoimage/iso9660.h b/genisoimage/iso9660.h
|
||||
index c74c2a9..c8b7a05 100644
|
||||
--- a/genisoimage/iso9660.h
|
||||
+++ b/genisoimage/iso9660.h
|
||||
@@ -62,10 +62,14 @@ struct iso_volume_descriptor {
|
||||
#define EL_TORITO_ARCH_x86 0
|
||||
#define EL_TORITO_ARCH_PPC 1
|
||||
#define EL_TORITO_ARCH_MAC 2
|
||||
+#define EL_TORITO_ARCH_EFI 0xef
|
||||
|
||||
#define EL_TORITO_BOOTABLE 0x88
|
||||
#define EL_TORITO_NOT_BOOTABLE 0
|
||||
|
||||
+#define EL_TORITO_SECTION_HEADER 0x90
|
||||
+#define EL_TORITO_LAST_SECTION_HEADER 0x91
|
||||
+
|
||||
#define EL_TORITO_MEDIA_NOEMUL 0
|
||||
#define EL_TORITO_MEDIA_12FLOP 1
|
||||
#define EL_TORITO_MEDIA_144FLOP 2
|
||||
@@ -173,7 +177,7 @@ struct eltorito_validation_entry {
|
||||
struct eltorito_defaultboot_entry {
|
||||
char boot_id [ISODCL(1, 1)]; /* 711 */
|
||||
char boot_media [ISODCL(2, 2)];
|
||||
- char loadseg [ISODCL(3, 4)]; /* 711 */
|
||||
+ char loadseg [ISODCL(3, 4)]; /* 712 */
|
||||
char sys_type [ISODCL(5, 5)];
|
||||
char pad1 [ISODCL(6, 6)];
|
||||
char nsect [ISODCL(7, 8)];
|
||||
@@ -181,6 +185,14 @@ struct eltorito_defaultboot_entry {
|
||||
char pad2 [ISODCL(13, 32)];
|
||||
};
|
||||
|
||||
+/* El Torito Section Header Entry in boot catalog */
|
||||
+struct eltorito_sectionheader_entry {
|
||||
+ char headerid [ISODCL(1, 1)]; /* 711 */
|
||||
+ char arch [ISODCL(2, 2)];
|
||||
+ char num_entries [ISODCL(3, 4)]; /* 711 */
|
||||
+ char id [ISODCL(5, 32)];
|
||||
+};
|
||||
+
|
||||
/*
|
||||
* XXX JS: The next two structures have odd lengths!
|
||||
* Some compilers (e.g. on Sun3/mc68020) padd the structures to even length.
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
--- cdrkit-1.1.11.orig/wodim/CMakeLists.txt
|
||||
+++ cdrkit-1.1.11/wodim/CMakeLists.txt
|
||||
@@ -10,14 +10,14 @@ SET(CDRECORD_COMMON_SRCS cd_misc.c defau
|
||||
INCLUDE(CheckIncludeFiles)
|
||||
|
||||
#force libcap usage on Linux
|
||||
-CHECK_INCLUDE_FILES("sys/capability.h" HAVE_SYS_CAPABILITY_H)
|
||||
-IF(HAVE_SYS_CAPABILITY_H)
|
||||
- LIST(APPEND EXTRA_LIBS cap)
|
||||
-ELSE(HAVE_SYS_CAPABILITY_H)
|
||||
- IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
- MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.")
|
||||
- ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
-ENDIF(HAVE_SYS_CAPABILITY_H)
|
||||
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
+ CHECK_INCLUDE_FILES("sys/capability.h" HAVE_SYS_CAPABILITY_H)
|
||||
+ IF(HAVE_SYS_CAPABILITY_H)
|
||||
+ LIST(APPEND EXTRA_LIBS cap)
|
||||
+ ELSE(HAVE_SYS_CAPABILITY_H)
|
||||
+ MESSAGE(FATAL_ERROR "Error: found a Linux system but no libcap header. Install libcap-dev.")
|
||||
+ ENDIF(HAVE_SYS_CAPABILITY_H)
|
||||
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
||||
|
||||
LINK_DIRECTORIES(../librols ../libusal ../libedc)
|
||||
|
||||
|
|
@ -0,0 +1,31 @@
|
|||
--- cdrkit-1.1.11.orig/Changelog
|
||||
+++ cdrkit-1.1.11/Changelog
|
||||
@@ -129,7 +129,7 @@ cdrkit (1.1.5.1) RELEASED; urgency=low
|
||||
|
||||
cdrkit (1.1.5) RELEASED; urgency=low
|
||||
|
||||
- * wodim: explicite warning and more grace time if user manually specifies a size
|
||||
+ * wodim: explicit warning and more grace time if user manually specifies a size
|
||||
less than 301 sectors, which is likely to be a mistake from copy-pasting
|
||||
of genisoimage -print-size output and omitting the block factor
|
||||
* wodim: Native device name management directly in libusal now, the
|
||||
@@ -202,7 +202,7 @@ cdrkit (1.1.2) RELEASED; urgency=low
|
||||
|
||||
[ Eduard Bloch ]
|
||||
* stop confusion and bailing out if burnfree/burnproof options have been
|
||||
- explicitely specified
|
||||
+ explicitly specified
|
||||
* be move carefull with -dummy when the DVD media may not support it
|
||||
* extracting drive's default speed in attach_mdvd()
|
||||
* automatic recorder device guessing code, currently Linux-only
|
||||
--- cdrkit-1.1.11.orig/genisoimage/genisoimage.c
|
||||
+++ cdrkit-1.1.11/genisoimage/genisoimage.c
|
||||
@@ -197,7 +197,7 @@ int allow_lowercase = 0; /* Allow lower
|
||||
int allow_multidot = 0; /* Allow more than on dot in filename */
|
||||
int iso_translate = 1; /* 1 == enables '#', '-' and '~' removal */
|
||||
int allow_leading_dots = 0; /* DOS cannot read names with leading dots */
|
||||
-int allow_limited_size = 0; /* Let the user to allow the trick explicitely */
|
||||
+int allow_limited_size = 0; /* Let the user to allow the trick explicitly */
|
||||
#ifdef VMS
|
||||
int use_fileversion = 1; /* Use file version # from filesystem */
|
||||
#else
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
update_geteltorito.patch
|
||||
fix_typo.patch
|
||||
fix_libcap_detection.patch
|
||||
add-efi-boot.patch
|
||||
|
|
@ -0,0 +1,72 @@
|
|||
--- cdrkit-1.1.11.orig/3rd-party/geteltorito/README.geteltorito
|
||||
+++ cdrkit-1.1.11/3rd-party/geteltorito/README.geteltorito
|
||||
@@ -3,8 +3,8 @@ geteltorito
|
||||
|
||||
Author: Rainer Krienke
|
||||
Email: krienke@uni-koblenz.de
|
||||
-License: GPL
|
||||
-Version: 0.4
|
||||
+License: GPL v2
|
||||
+Version: 0.5
|
||||
Description: A El Torito boot image extractor
|
||||
|
||||
call: geteltorito CD-image > toritoimagefile
|
||||
--- cdrkit-1.1.11.orig/3rd-party/geteltorito/geteltorito.pl
|
||||
+++ cdrkit-1.1.11/3rd-party/geteltorito/geteltorito.pl
|
||||
@@ -11,10 +11,16 @@ use Getopt::Std;
|
||||
# License: GPL
|
||||
#
|
||||
# Get latest version from:
|
||||
-# http://www.uni-koblenz.de/~krienke/ftp/noarch/geteltorito
|
||||
+# http://userpages.uni-koblenz.de/~krienke/ftp/noarch/geteltorito
|
||||
#
|
||||
-$utilVersion="0.4";
|
||||
+$utilVersion="0.5";
|
||||
#
|
||||
+# Version 0.5
|
||||
+# 2009/06/22
|
||||
+# A patch for harddisk emulation images from <colimit@gmail.com>.
|
||||
+# For BootMediaType=4 (harddisk emulation) SectorCount is always 1, and geteltorito.pl
|
||||
+# returns just MBR. This patch guesses the correct bootimage size
|
||||
+# from MBR (offset+size of the first partitition).
|
||||
# Version 0.4
|
||||
# 2007/02/01
|
||||
# A patch from Santiago Garcia <manty@debian.org> to use a virtual sector
|
||||
@@ -31,9 +37,7 @@ $utilVersion="0.4";
|
||||
# Initial release
|
||||
#
|
||||
# For information on El Torito see
|
||||
-# http://wikipedia.org/
|
||||
-# or try this link directly:
|
||||
-# http://www.phoenix.com/en/Customer+Services/White+Papers-Specs/Platform+System+Software+Documents/default.htm
|
||||
+# http://en.wikipedia.org/wiki/El_torito
|
||||
|
||||
$vSecSize=512;
|
||||
$secSize=2048;
|
||||
@@ -179,19 +183,22 @@ if( $media == 0 ){
|
||||
}
|
||||
if( $media == 1 ){
|
||||
print STDERR "1.2meg floppy";
|
||||
- $count=1200*1024/$vSecSize;
|
||||
+ $count=1200*1024/$vSecSize;
|
||||
}
|
||||
if( $media == 2 ){
|
||||
print STDERR "1.44meg floppy";
|
||||
- $count=1440*1024/$vSecSize;
|
||||
+ $count=1440*1024/$vSecSize;
|
||||
}
|
||||
if( $media == 3 ){
|
||||
print STDERR "2.88meg floppy";
|
||||
- $count=2880*1024/$vSecSize;
|
||||
+ $count=2880*1024/$vSecSize;
|
||||
}
|
||||
if( $media == 4 ){
|
||||
print STDERR "harddisk";
|
||||
- $count=0;
|
||||
+ $MBR=getSector($imgStart, 1, $imageFile );
|
||||
+ $partition1=substr($MBR, 446, 16);
|
||||
+ ($unUsed, $firstSector, $partitionSize) = unpack( "A8VV", $partition1);
|
||||
+ $count=$firstSector + $partitionSize;
|
||||
}
|
||||
print STDERR "\n";
|
||||
|
||||
|
|
@ -0,0 +1,179 @@
|
|||
#!/usr/bin/make -f
|
||||
#
|
||||
# debian/rules file for cdrkit. GPL2
|
||||
# Original from Erik Andersen <andersee@debian.org>
|
||||
#
|
||||
|
||||
PACKAGE = cdrkit
|
||||
|
||||
CFLAGS = -g
|
||||
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
|
||||
CFLAGS += -O0
|
||||
else
|
||||
CFLAGS += -O2
|
||||
endif
|
||||
|
||||
i=$(shell pwd)/debian/tmp/usr
|
||||
b=$(shell pwd)/debian/build
|
||||
iso=genisoimage
|
||||
cdd=icedax
|
||||
cdr=wodim
|
||||
ziso_VERSION = $(shell cat 3rd-party/zisofs_tools/version)
|
||||
source_VERSION= $(shell dpkg-parsechangelog | sed -ne '/^Version:/s/^V.*://p')
|
||||
|
||||
build: build-arch build-indep
|
||||
build-arch: build/build-debstamp
|
||||
build-indep: build/build-debstamp
|
||||
build/build-debstamp:
|
||||
# @if test -f ../cdrkit_$(source_VERSION).tar.gz ; then \
|
||||
# echo "You should not create native packages! Remove ../cdrkit_$(source_VERSION).tar.gz and copy upstream source to .orig.tar.gz" ; \
|
||||
# exit 1 ; \
|
||||
# fi
|
||||
@echo "--- Compiling"
|
||||
dh_testdir
|
||||
echo "#define ZISOFS_TOOLS_VERSION \"$(ziso_VERSION)\"" > 3rd-party/zisofs_tools/version.h
|
||||
make CFLAGS='$(CFLAGS)'
|
||||
cd 3rd-party/zisofs_tools && CFLAGS='$(CFLAGS)' ./configure && $(MAKE)
|
||||
touch build/build-debstamp
|
||||
|
||||
clean:
|
||||
@echo "--- Cleaning"
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
-$(MAKE) -C 3rd-party/zisofs_tools distclean
|
||||
-./.clean
|
||||
dh_clean
|
||||
# clean up the stuff dh_clean leaves behind
|
||||
-rm -rf debian/build debian/files
|
||||
-rm -f `find . -name "*~"`
|
||||
-rm -rf `find . -name "\.deps"`
|
||||
-rm -rf `find . -name "\.libs"`
|
||||
-rm -rf `find . -name "*\.rej"`
|
||||
-rm -rf build
|
||||
|
||||
install: build build/install-debstamp
|
||||
build/install-debstamp:
|
||||
@echo "--- Installing"
|
||||
dh_testdir
|
||||
dh_testroot
|
||||
dh_clean
|
||||
rm -rf $(b)
|
||||
make install PREFIX=$(i)
|
||||
|
||||
install -m 755 3rd-party/geteltorito/geteltorito.pl $(i)/bin/geteltorito
|
||||
install -m 755 3rd-party/zisofs_tools/mkzftree $(i)/bin/
|
||||
install -m 755 icedax/cdda2ogg $(i)/bin/cdrkit.cdda2ogg
|
||||
install -m 755 icedax/cdda2mp3 $(i)/bin/cdrkit.cdda2mp3
|
||||
# XXX hack hack
|
||||
mv -v $(i)/share/man/man1/cdda2ogg.1 $(i)/share/man/man1/cdrkit.cdda2ogg.1
|
||||
install -m 755 icedax/readmult $(i)/bin/
|
||||
install -m 755 icedax/pitchplay $(i)/bin/
|
||||
touch build/install-debstamp
|
||||
|
||||
binary-indep: build install cdrkit-doc
|
||||
|
||||
binary-arch: build install wodim icedax genisoimage
|
||||
|
||||
#
|
||||
# wodim
|
||||
#
|
||||
|
||||
wodim: install
|
||||
@echo "--- Building: $@"
|
||||
dh_installdirs -p$@ -P$(b)/$@
|
||||
cp -a wodim/wodim.dfl $(b)/$@/etc/wodim.conf
|
||||
cp -a netscsid/netscsid.dfl $(b)/$@/etc/netscsid.conf
|
||||
# cp debian/reportbug.presubj $(b)/$@/usr/share/bug/wodim/presubj
|
||||
dh_link -p$@ -P$(b)/$@
|
||||
dh_installdocs -p$@ -P$(b)/$@
|
||||
dh_installchangelogs -p$@ -P$(b)/$@ Changelog
|
||||
dh_install -p$@ -P$(b)/$@
|
||||
dh_strip -p$@ -P$(b)/$@
|
||||
dh_installexamples -p$@ -P$(b)/$@ netscsid/netscsid.dfl wodim/wodim.dfl misc/burnstuff
|
||||
dh_compress -p$@ -P$(b)/$@
|
||||
dh_fixperms -p$@ -P$(b)/$@
|
||||
dh_makeshlibs -p$@ -P$(b)/$@ -V
|
||||
dh_installdeb -p$@ -P$(b)/$@
|
||||
dh_shlibdeps -p$@ -P$(b)/$@
|
||||
dh_installdebconf -p$@ -P$(b)/$@
|
||||
dh_gencontrol -p$@ -P$(b)/$@
|
||||
dh_md5sums -p$@ -P$(b)/$@
|
||||
dh_builddeb -p$@ -P$(b)/$@
|
||||
|
||||
#
|
||||
# genisoimage
|
||||
#
|
||||
|
||||
genisoimage: install
|
||||
@echo "--- Building: $@"
|
||||
dh_installdirs -p$@ -P$(b)/$@
|
||||
dh_installdocs -p$@ -P$(b)/$@
|
||||
dh_installchangelogs -p$@ -P$(b)/$@ $(iso)/ChangeLog zisofs_tools/CHANGES
|
||||
dh_install -p$@ -P$(b)/$@
|
||||
dh_installman -p$@ -P$(b)/$@ 3rd-party/zisofs_tools/mkzftree.1 3rd-party/geteltorito.1
|
||||
# cp debian/reportbug.presubj $(b)/$@/usr/share/bug/mkisofs/presubj
|
||||
# rm -f $(b)/$@/usr/bin/mkhybrid $(b)/$@/usr/share/man/man8/mkhybrid*
|
||||
dh_link -p$@ -P$(b)/$@
|
||||
dh_strip -p$@ -P$(b)/$@
|
||||
dh_compress -p$@ -P$(b)/$@
|
||||
dh_fixperms -p$@ -P$(b)/$@
|
||||
dh_makeshlibs -p$@ -P$(b)/$@ -V
|
||||
dh_installdeb -p$@ -P$(b)/$@
|
||||
dh_shlibdeps -p$@ -P$(b)/$@
|
||||
dh_gencontrol -p$@ -P$(b)/$@
|
||||
dh_md5sums -p$@ -P$(b)/$@
|
||||
dh_builddeb -p$@ -P$(b)/$@
|
||||
|
||||
|
||||
#
|
||||
# icedax
|
||||
#
|
||||
|
||||
icedax: install
|
||||
@echo "--- Building: $@"
|
||||
dh_installdirs -p$@ -P$(b)/$@
|
||||
dh_installdocs -p$@ -P$(b)/$@
|
||||
dh_installchangelogs -p$@ -P$(b)/$@
|
||||
dh_install -p$@ -P$(b)/$@
|
||||
# cp debian/reportbug.presubj $(b)/$@/usr/share/bug/icedax/presubj
|
||||
dh_strip -p$@ -P$(b)/$@
|
||||
chmod 755 $(b)/$@/usr/bin/cdrkit.cdda2*
|
||||
dh_link -p$@ -P$(b)/$@
|
||||
chmod 755 $(b)/$@/usr/bin/readmult
|
||||
chmod 755 $(b)/$@/usr/bin/pitchplay
|
||||
dh_installman -p$@ -P$(b)/$@
|
||||
# cludge, integrate into the official BS later
|
||||
# dh_installman -p$@ -P$(b)/$@ doc/readmult.man doc/pitchplay.man doc/list_audio_tracks.man
|
||||
dh_compress -p$@ -P$(b)/$@
|
||||
dh_fixperms -p$@ -P$(b)/$@
|
||||
dh_makeshlibs -p$@ -P$(b)/$@ -V
|
||||
dh_installdeb -p$@ -P$(b)/$@
|
||||
dh_shlibdeps -p$@ -P$(b)/$@
|
||||
dh_gencontrol -p$@ -P$(b)/$@
|
||||
dh_md5sums -p$@ -P$(b)/$@
|
||||
dh_builddeb -p$@ -P$(b)/$@
|
||||
|
||||
|
||||
#
|
||||
# cdrkit-doc
|
||||
#
|
||||
|
||||
cdrkit-doc: install
|
||||
@echo "--- Building: $@"
|
||||
dh_installdirs -p$@ -P$(b)/$@
|
||||
dh_installdocs -p$@ -P$(b)/$@
|
||||
dh_installchangelogs -p$@ -P$(b)/$@
|
||||
dh_install -p$@ -P$(b)/$@
|
||||
dh_link -p$@ -P$(b)/$@
|
||||
@-find $(b)/$@ | grep '\.svn' | xargs rm -rf
|
||||
# dh_strip -p$@ -P$(b)/$@
|
||||
dh_compress -p$@ -P$(b)/$@
|
||||
dh_fixperms -p$@ -P$(b)/$@
|
||||
dh_installdeb -p$@ -P$(b)/$@
|
||||
# dh_shlibdeps -p$@ -P$(b)/$@
|
||||
dh_gencontrol -p$@ -P$(b)/$@
|
||||
dh_md5sums -p$@ -P$(b)/$@
|
||||
dh_builddeb -p$@ -P$(b)/$@
|
||||
|
||||
binary: binary-indep binary-arch
|
||||
.PHONY: binary clean binary-indep binary-arch build install install-save install-saved
|
||||
|
|
@ -0,0 +1 @@
|
|||
3.0 (quilt)
|
||||
|
|
@ -0,0 +1 @@
|
|||
etc
|
||||
|
|
@ -0,0 +1,6 @@
|
|||
debian/tmp/usr/bin/wodim
|
||||
debian/tmp/usr/bin/readom
|
||||
debian/tmp/usr/sbin/netscsid
|
||||
debian/tmp/usr/share/man/man1/readom.1
|
||||
debian/tmp/usr/share/man/man1/wodim.1
|
||||
doc/READMEs/README.ATAPI.setup usr/share/doc/wodim/
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
usr/share/man/man1/wodim.1.gz usr/share/man/man1/netscsid.1.gz
|
||||
usr/bin/wodim usr/bin/cdrecord
|
||||
usr/share/man/man1/wodim.1.gz usr/share/man/man1/cdrecord.1.gz
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
#!/bin/sh
|
||||
|
||||
# order in descending importance. The loop could be separated, but I have this
|
||||
# set of checksums now, too lazy for research to separate that again
|
||||
if [ "$1" = "upgrade" ] || [ "$1" = "install" ] ; then
|
||||
# first kill old conffiles, then possible dangling symlinks created by that action
|
||||
for CONF in /etc/default/wodim /etc/rscsi.conf /etc/default/cdrecord /etc/default/rscsi \
|
||||
/etc/cdrecord/cdrecord /etc/cdrecord/rscsi \
|
||||
/etc/wodim/wodim /etc/wodim/rscsi
|
||||
do
|
||||
SUM="$(md5sum $CONF 2>/dev/null | cut -f1 -d\ )"
|
||||
# missing, empty, unchanged files
|
||||
case "$SUM" in
|
||||
00118d4a9c94c41d3ae415638cc055dd |\
|
||||
0bcdd41f5d7c6419d524b234701d18f0 |\
|
||||
1d2c06f0d52fae533ef0cd58b80d22e4 |\
|
||||
3016370f809f8bca713a2eee1ecbeb2d |\
|
||||
68e2b3b297d6b5cb0c6beb9136f2d918 |\
|
||||
6e3ce0b42b8971f0b10958ab6982b441 |\
|
||||
84e0801d1ca1b9d309532385c5864786 |\
|
||||
8c3e4a320aafda37f162a12526c0d431 |\
|
||||
d41d8cd98f00b204e9800998ecf8427e |\
|
||||
e05fdb0a48542ccbff5b28b100d083e3 |\
|
||||
e7e6151fe872d56351d04f4c2c3d9722 |\
|
||||
eff315991af0911ae8c96b9500c1714f |\
|
||||
7a4383a7c0995736dee9d646b0724d08 |\
|
||||
"")
|
||||
rm -f $CONF
|
||||
;;
|
||||
*)
|
||||
case $CONF in
|
||||
*rscsi|*rscsi.conf)
|
||||
if ! test -e /etc/netscsid.conf ; then
|
||||
cp $CONF /etc/netscsid.conf || true
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
if ! test -e /etc/wodim.conf ; then
|
||||
cp $CONF /etc/wodim.conf || true
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
done
|
||||
# drop directories but only if empty
|
||||
test -d /etc/cdrecord && rmdir /etc/cdrecord 2>/dev/null || true
|
||||
test -d /etc/wodim && rmdir /etc/wodim 2>/dev/null || true
|
||||
fi
|
||||
|
||||
#DEBHELPER#
|
||||
Loading…
Reference in New Issue