kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 2.01.01a05, syncing patches with wip/cdrtools-devel.

Browse source 
Changes:
* Thu Feb 02 2006 - Release of a GPL compliant 2.01.01a05-ossdvd
  patch. This patch is for cdrtools-2.01.01a05.tar.bz2 and is adjusted
  to work with linux kernel 2.6.12 or higher and can be compiled with
  gcc-4.0.x. The rawio patch using libcap has been migrated to
  cdrtools-2.01.01a05-rawio.patch.bz2 . The patch called
  cdrtools-2.01.01-scsibuf.patch.bz has become redundant, as this has
  been integrated inside cdrtools-2.01.01a05.tar.bz2 . RPMS and SRPMS
  have been updated for mandriva 2006.0. The order of applying patches
  is now :
  1. cdrtools-2.01.01a05-ossdvd.patch.bz2     .ossdvd
  2. cdrtools-2.01.01a01-DVD-speed.patch.bz2  .dvd-speed
  3. cdrtools-2.01.01a05-rawio.patch.bz2      .rawio
  4. cdrtools-2.01.01a01-scanbus.patch.bz2    .scanbus
  Warly's Cdrecord DVD patch and others can now be found on
  http://people.mandriva.com/~warly/files/cdrtools/
This commit is contained in:
wiz 2006-02-04 12:05:17 +00:00
parent dc1f8663d0
commit ba9b350189
15 changed files with 151 additions and 114 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sysutils/cdrtools-ossdvd/Makefile
View file

@ -1,12 +1,12 @@
# $NetBSD: Makefile,v 1.21 2005/12/27 18:44:54 reed Exp $
# $NetBSD: Makefile,v 1.22 2006/02/04 12:05:17 wiz Exp $
DISTNAME= cdrtools-2.01.01a03
PKGNAME= cdrtools-ossdvd-2.01.1.35
DISTNAME= cdrtools-2.01.01a05
PKGNAME= cdrtools-ossdvd-2.01.1.36
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/
EXTRACT_SUFX= .tar.bz2
PATCHFILES= cdrtools-2.01.01a03-ossdvd.patch.bz2
PATCHFILES= cdrtools-2.01.01a05-ossdvd.patch.bz2
PATCH_SITES= ftp://ftp.crashrecovery.org/pub/linux/cdrtools/ \
http://crashrecovery.org/oss-dvd/
PATCH_DIST_STRIP= -p1
@ -17,10 +17,12 @@ COMMENT= Software for creating ISO9660 images and writing CDs/CD-RWs/DVDs
CONFLICTS= mkisofs-[0-9]* cdrecord-[0-9]* cdrtools-*
PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../mk/bsd.prefs.mk"
WRKSRC= ${WRKDIR}/cdrtools-2.01.01
USE_TOOLS+= gmake tbl
WRKSRC= ${WRKDIR}/cdrtools-2.01.01
USE_TOOLS+= gmake tbl
.if ${LOCALBASE} != "/opt/schily"
BUILDLINK_TRANSFORM+= rmdir:/opt/schily
@ -45,21 +47,18 @@ CDRECORD_CONF?= ${PKG_SYSCONFDIR}/cdrecord.conf
.if ${CDRECORD_CONF} != "/etc/default/cdrecord"
MESSAGE_SRC+= MESSAGE.cdrecord.conf
MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV}
MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF}
MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV:Q}
MESSAGE_SUBST+= CDRECORD_CONF=${CDRECORD_CONF:Q}
.endif
CDRECORD_CONF_FILES= cdrecord/defaults.c cdrecord/cdrecord.1
CDRECORD_CONF_FILES+= readcd/readcd.1
INSTALLATION_DIRS= bin man/man1 man/man8
post-patch:
@cd ${WRKSRC}; for conf in ${CDRECORD_CONF_FILES}; do \
${MV} ${WRKSRC}/$$conf ${WRKSRC}/$${conf}.old && \
${SED} -e 's|@CDRECORD_CONF@|${CDRECORD_CONF}|' \
${WRKSRC}/$${conf}.old > ${WRKSRC}/$$conf; \
done
SUBST_CLASSES+= fix
SUBST_STAGE.fix= post-patch
SUBST_FILES.fix= cdrecord/defaults.c cdrecord/cdrecord.1 \
readcd/readcd.1
SUBST_SED.fix= -e "s,@CDRECORD_CONF@,${CDRECORD_CONF},g"
SUBST_MESSAGE.fix= Fixing paths.
do-configure:
cd ${WRKSRC}/RULES; \

38
sysutils/cdrtools-ossdvd/distinfo
View file

@ -1,19 +1,21 @@
$NetBSD: distinfo,v 1.8 2005/12/06 23:56:06 wiz Exp $
$NetBSD: distinfo,v 1.9 2006/02/04 12:05:17 wiz Exp $
SHA1 (cdrtools-2.01.01a03.tar.bz2) = 165d4f687841a6cd99c72a50c5ee206c50e69a26
RMD160 (cdrtools-2.01.01a03.tar.bz2) = 9d0f2d7967637af13ade7d3b3cf467196d1aaf71
Size (cdrtools-2.01.01a03.tar.bz2) = 1423541 bytes
SHA1 (cdrtools-2.01.01a03-ossdvd.patch.bz2) = ac5f637bb73fdc8fd010dd79919be6154881dc0e
RMD160 (cdrtools-2.01.01a03-ossdvd.patch.bz2) = 55fc7214221d8808d17ee774b21f1fdd6412b9b2
Size (cdrtools-2.01.01a03-ossdvd.patch.bz2) = 15638 bytes
SHA1 (patch-ac) = 0d9217924ed353b1c23bac1ffd8b2ee69eda8f47
SHA1 (patch-ah) = 34ecab01125bcac2a28e295b198edce0de8b8777
SHA1 (patch-ai) = 5f705fca108ebe132f6c51590d21f2b7667b1521
SHA1 (patch-aj) = dec64abd60d70d947db400fff2d1d8f8fece9f59
SHA1 (patch-ba) = be87857e308b49f1197fd182d985b17930e00161
SHA1 (patch-bb) = f731a120143e4b875712afa332c56fbbb7f54006
SHA1 (patch-ca) = 12111a160a9e968d71c73f84685d998d4330ade6
SHA1 (patch-cb) = 3a2dac733caf087e63e545011a018953bdebd91f
SHA1 (patch-cc) = a14098dd14e0b58d3fed1167341a22167eea7c19
SHA1 (patch-cd) = 77b1d17ad5cc444862e3e7b976d9a519cfaafd50
SHA1 (patch-ce) = ecfb8bf57e05d6db8a45af0c95c79aa5ab52cb26
SHA1 (cdrtools-2.01.01a05.tar.bz2) = a4de142e6bd13c37d4701cf86496d708523976b3
RMD160 (cdrtools-2.01.01a05.tar.bz2) = 74dd5db073de43f1116f423f40e376808a07fb5c
Size (cdrtools-2.01.01a05.tar.bz2) = 1435799 bytes
SHA1 (cdrtools-2.01.01a05-ossdvd.patch.bz2) = f8bf9152cbdb88842e59e0217bea1a0468593feb
RMD160 (cdrtools-2.01.01a05-ossdvd.patch.bz2) = 8b872f7fc62c9578e467c8fc7f645cafe7ca0214
Size (cdrtools-2.01.01a05-ossdvd.patch.bz2) = 15629 bytes
SHA1 (patch-ac) = 6def0342f51fcb30f81b89a125afdb76e4f913a3
SHA1 (patch-ah) = 8dc829b923493f1d0f47926fc11af30ceeb4b0db
SHA1 (patch-ai) = f55c8efa1fd096a373983a2af611170c4e603d5d
SHA1 (patch-aj) = 6bae62f59745e5dd070ff4a6c93496d88f2ed99a
SHA1 (patch-ba) = 72d25c371894c0e4ededc5593a78f6b02f35b6de
SHA1 (patch-bb) = 528abe11c5a01615b4dbcd7304b39374f8d3c255
SHA1 (patch-ca) = 1b4d17e0d5d738d76f15e9cca0827b93d24dd095
SHA1 (patch-cb) = 575b11d6e2a7f1b2792c983c570e524c1972406f
SHA1 (patch-cc) = f018155aee1d966343758909f47632d39e96b5dd
SHA1 (patch-cd) = 6f7d7ac5bc5116e933bc19066ec0a38b5e04fc59
SHA1 (patch-ce) = 04d842a7f78f4d6ab89da652023f4f8d7d6403fa
SHA1 (patch-cf) = 50855c214fb718594837001e57fa0cdebb9b5cf0
SHA1 (patch-cg) = 686ac754c463ce37d15be19dcb8048741d8546f2

8
sysutils/cdrtools-ossdvd/patches/patch-ac
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ac,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
$NetBSD: patch-ac,v 1.2 2006/02/04 12:05:17 wiz Exp $
--- include/btorder.h.orig Sun Jun 15 23:41:22 2003
--- include/btorder.h.orig 2003-06-15 21:41:22.000000000 +0000
+++ include/btorder.h
@@ -28,6 +28,9 @@
@@ -27,6 +27,9 @@
#include <sys/types.h> /* try to load isa_defs.h on Solaris */
#define _INCL_SYS_TYPES_H
#endif
@ -12,7 +12,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
#ifndef _MCONFIG_H
#include <mconfig.h> /* load bit/byte-oder from xmconfig.h*/
@@ -108,7 +111,7 @@ error Only one of _BIT_FIELDS_LTOH or _
@@ -107,7 +110,7 @@ error Only one of _BIT_FIELDS_LTOH or _
# if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
defined(__PPC) || defined(powerpc) || defined(__powerpc__)

14
sysutils/cdrtools-ossdvd/patches/patch-ah
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ah,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
$NetBSD: patch-ah,v 1.2 2006/02/04 12:05:17 wiz Exp $
--- cdda2wav/setuid.c.orig Thu Nov 21 16:12:35 2002
+++ cdda2wav/setuid.c Sat Nov 30 18:17:51 2002
@@ -92,7 +92,7 @@
--- cdda2wav/setuid.c.orig 2004-08-19 12:54:34.000000000 +0200
+++ cdda2wav/setuid.c
@@ -94,7 +94,7 @@ void needroot(necessary)
if (geteuid() == 0) return; /* nothing to do */
@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
if (seteuid(effective_uid)) {
perror("seteuid in needroot()");
exit(PERM_ERROR);
@@ -126,7 +126,7 @@
@@ -133,7 +133,7 @@ void dontneedroot()
return;
if (geteuid() != 0) return; /* nothing to do */
@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
if (seteuid(real_uid)) {
perror("seteuid in dontneedroot()");
exit(PERM_ERROR);
@@ -186,7 +186,7 @@
@@ -217,7 +217,7 @@ void needgroup(necessary)
if (getegid() == effective_gid) return; /* nothing to do */
@ -29,7 +29,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
if (setegid(effective_gid)) {
perror("setegid in needgroup()");
exit(PERM_ERROR);
@@ -217,7 +217,7 @@
@@ -249,7 +249,7 @@ void dontneedgroup()
exit(INTERNAL_ERROR);
}
if (getegid() != effective_gid) return; /* nothing to do */

16
sysutils/cdrtools-ossdvd/patches/patch-ai
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ai,v 1.2 2004/08/04 21:19:26 wiz Exp $
$NetBSD: patch-ai,v 1.3 2006/02/04 12:05:17 wiz Exp $
--- libscg/scsi-bsd.c.orig 2004-01-15 00:13:05.000000000 +0100
--- libscg/scsi-bsd.c.orig 2004-01-14 23:13:05.000000000 +0000
+++ libscg/scsi-bsd.c
@@ -48,7 +48,7 @@ static char __sccsid[] =
@@ -47,7 +47,7 @@ static char __sccsid[] =
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
@ -11,7 +11,7 @@ $NetBSD: patch-ai,v 1.2 2004/08/04 21:19:26 wiz Exp $
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
@@ -108,7 +108,7 @@ scgo_version(scgp, what)
@@ -107,7 +107,7 @@ scgo_version(scgp, what)
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
@ -20,13 +20,13 @@ $NetBSD: patch-ai,v 1.2 2004/08/04 21:19:26 wiz Exp $
case SCG_SCCS_ID:
return (__sccsid);
}
@@ -140,6 +140,15 @@ scgo_open(scgp, device)
@@ -139,6 +139,15 @@ scgo_open(scgp, device)
register int l;
register int nopen = 0;
char devname[64];
+#if defined(__NetBSD__)
+ struct scsi_addr mysaddr;
+#if defined(__i386__)
+#if defined(__i386__) || defined(__amd64__)
+ char slicename[] = "d"; /* i386 is special */
+#else
+ char slicename[] = "c"; /* this is what the rest uses */
@ -36,7 +36,7 @@ $NetBSD: patch-ai,v 1.2 2004/08/04 21:19:26 wiz Exp $
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
@@ -166,6 +175,60 @@ scgo_open(scgp, device)
@@ -165,6 +174,60 @@ scgo_open(scgp, device)
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
goto openbydev;
@ -97,7 +97,7 @@ $NetBSD: patch-ai,v 1.2 2004/08/04 21:19:26 wiz Exp $
if (busno >= 0 && tgt >= 0 && tlun >= 0) {
js_snprintf(devname, sizeof (devname),
@@ -202,6 +265,7 @@ scgo_open(scgp, device)
@@ -201,6 +264,7 @@ scgo_open(scgp, device)
}
}
}

22
sysutils/cdrtools-ossdvd/patches/patch-aj
View file

@ -1,21 +1,21 @@
$NetBSD: patch-aj,v 1.2 2004/08/04 21:19:26 wiz Exp $
$NetBSD: patch-aj,v 1.3 2006/02/04 12:05:17 wiz Exp $
--- cdrecord/scsi_cdr.c.orig 2004-07-31 23:44:33.000000000 +0200
--- cdrecord/scsi_cdr.c.orig 2004-05-24 22:36:01.000000000 +0000
+++ cdrecord/scsi_cdr.c
@@ -315,6 +315,12 @@ EXPORT int
request_sense(scgp)
SCSI *scgp;
{
+
@@ -318,7 +318,11 @@ request_sense(scgp)
char sensebuf[CCS_SENSE_LEN];
register struct scg_cmd *scmd = scgp->scmd;
-
+#ifdef __NetBSD__
+ /* request sense already done by kernel */
+ scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense,
+ scgp->scmd->sense_count);
+#else
char sensebuf[CCS_SENSE_LEN];
register struct scg_cmd *scmd = scgp->scmd;
@@ -334,6 +340,7 @@ request_sense(scgp)
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = sensebuf;
scmd->size = sizeof (sensebuf);
@@ -334,6 +338,7 @@ request_sense(scgp)
if (scg_cmd(scgp) < 0)
return (-1);
scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));

6
sysutils/cdrtools-ossdvd/patches/patch-ba
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ba,v 1.2 2004/08/04 21:19:26 wiz Exp $
$NetBSD: patch-ba,v 1.3 2006/02/04 12:05:17 wiz Exp $
--- readcd/readcd.c.orig 2004-03-02 01:55:11.000000000 +0100
--- readcd/readcd.c.orig 2005-06-11 13:22:10.000000000 +0000
+++ readcd/readcd.c
@@ -389,12 +389,12 @@ main(ac, av)
@@ -399,12 +399,12 @@ main(ac, av)
/*
* We don't need root privilleges anymore.
*/

6
sysutils/cdrtools-ossdvd/patches/patch-bb
View file

@ -1,8 +1,8 @@
$NetBSD: patch-bb,v 1.2 2004/08/04 21:19:26 wiz Exp $
$NetBSD: patch-bb,v 1.3 2006/02/04 12:05:17 wiz Exp $
--- mkisofs/mkisofs.c.orig 2004-03-05 00:22:28.000000000 +0100
--- mkisofs/mkisofs.c.orig 2006-01-12 00:29:46.000000000 +0000
+++ mkisofs/mkisofs.c
@@ -2342,12 +2342,12 @@ parse_input_files:
@@ -2412,12 +2412,12 @@ parse_input_files:
}
}
/* We don't need root privilleges anymore. */

6
sysutils/cdrtools-ossdvd/patches/patch-ca
View file

@ -1,8 +1,8 @@
$NetBSD: patch-ca,v 1.2 2004/08/04 21:19:26 wiz Exp $
$NetBSD: patch-ca,v 1.3 2006/02/04 12:05:17 wiz Exp $
--- cdrecord/defaults.c.orig 2004-03-02 02:10:32.000000000 +0100
--- cdrecord/defaults.c.orig 2005-05-31 09:52:33.000000000 +0000
+++ cdrecord/defaults.c
@@ -54,7 +54,7 @@ open_cdrdefaults()
@@ -53,7 +53,7 @@ open_cdrdefaults()
* don't contribute work and don't give support, they are causing extra
* work for me and this way slow down the cdrecord development.
*/

8
sysutils/cdrtools-ossdvd/patches/patch-cb
View file

@ -1,8 +1,8 @@
$NetBSD: patch-cb,v 1.2 2004/08/04 21:19:26 wiz Exp $
$NetBSD: patch-cb,v 1.3 2006/02/04 12:05:17 wiz Exp $
--- cdrecord/cdrecord.1.orig 2004-02-29 18:13:20.000000000 +0100
--- cdrecord/cdrecord.1.orig 2005-05-15 12:41:01.000000000 +0000
+++ cdrecord/cdrecord.1
@@ -1737,8 +1737,8 @@ login shell.
@@ -2033,8 +2033,8 @@ login shell.
.SH FILES
.TP
@ -13,7 +13,7 @@ $NetBSD: patch-cb,v 1.2 2004/08/04 21:19:26 wiz Exp $
For example:
.SM CDR_FIFOSIZE=8m
or
@@ -1747,7 +1747,7 @@ or
@@ -2043,7 +2043,7 @@ or
.TP
CDR_DEVICE
This may either hold a device identifier that is suitable to the open

6
sysutils/cdrtools-ossdvd/patches/patch-cc
View file

@ -1,8 +1,8 @@
$NetBSD: patch-cc,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
$NetBSD: patch-cc,v 1.2 2006/02/04 12:05:17 wiz Exp $
--- readcd/readcd.1.orig Wed Dec 25 02:28:41 2002
--- readcd/readcd.1.orig 2006-01-11 23:06:28.000000000 +0000
+++ readcd/readcd.1
@@ -186,7 +186,7 @@ If the argument to the
@@ -183,7 +183,7 @@ If the argument to the
.B dev=
option does not contain the characters ',', '/', '@' or ':',
it is interpreted as an label name that may be found in the file

33
sysutils/cdrtools-ossdvd/patches/patch-cd
View file

@ -1,22 +1,13 @@
$NetBSD: patch-cd,v 1.1 2005/11/04 22:20:37 dbj Exp $
$NetBSD: patch-cd,v 1.2 2006/02/04 12:05:17 wiz Exp $
--- cdda2wav/cdda2wav.c.orig 2004-08-24 11:06:14.000000000 -0400
+++ cdda2wav/cdda2wav.c
@@ -970,7 +970,7 @@ prio_done:
dontneedroot();
}
#else
-#if defined _POSIX_PRIORITY_SCHEDULING
+#if defined _POSIX_PRIORITY_SCHEDULING && (_POSIX_PRIORITY_SCHEDULING != -1)
#include <sched.h>
static void
@@ -2616,7 +2616,7 @@ Rate Divider Rate Divider
if ( global.verbose != 0 ) {
fputs( "#Cdda2wav version ", stderr );
fputs( VERSION, stderr );
-#if defined _POSIX_PRIORITY_SCHEDULING || defined HAVE_SYS_PRIOCNTL_H
+#if (defined _POSIX_PRIORITY_SCHEDULING && (_POSIX_PRIORITY_SCHEDULING != -1)) || defined HAVE_SYS_PRIOCNTL_H
fputs( ", real time sched.", stderr );
#endif
#if defined ECHO_TO_SOUNDCARD
--- include/schily.h.orig 2006-01-11 23:26:07.000000000 +0000
+++ include/schily.h
@@ -115,7 +115,7 @@ extern int fspawnl __PR((FILE *, FILE *,
extern int fspawnv_nowait __PR((FILE *, FILE *, FILE *,
const char *, int, char *const*));
extern int fgetline __PR((FILE *, char *, int));
-extern int fgetstr __PR((FILE *, char *, int));
+extern int schily_fgetstr __PR((FILE *, char *, int));
extern void file_raise __PR((FILE *, int));
extern int fileclose __PR((FILE *));
extern FILE *fileluopen __PR((int, const char *));

31
sysutils/cdrtools-ossdvd/patches/patch-ce
View file

@ -1,13 +1,20 @@
$NetBSD: patch-ce,v 1.1 2005/11/04 22:20:37 dbj Exp $
$NetBSD: patch-ce,v 1.2 2006/02/04 12:05:17 wiz Exp $
--- cdrecord/drv_mmc.c.orig 2005-09-27 11:44:46.000000000 -0400
+++ cdrecord/drv_mmc.c
@@ -86,7 +86,7 @@ LOCAL cdr_t *identify_mmc __PR((SCSI *s
LOCAL int attach_mmc __PR((SCSI *scgp, cdr_t *));
LOCAL int attach_mdvd __PR((SCSI *scgp, cdr_t *));
EXPORT int check_writemodes_mmc __PR((SCSI *scgp, cdr_t *dp));
-EXPORT int check_writemodes_mdvd __PR((SCSI *scgp, cdr_t *dp));
+LOCAL int check_writemodes_mdvd __PR((SCSI *scgp, cdr_t *dp));
LOCAL int deflt_writemodes_mmc __PR((SCSI *scgp, BOOL reset_dummy));
LOCAL int deflt_writemodes_mdvd __PR((SCSI *scgp, BOOL reset_dummy));
LOCAL int get_diskinfo __PR((SCSI *scgp, struct disk_info *dip));
--- libschily/stdio/fgetstr.c.orig 2004-09-25 12:26:06.000000000 +0000
+++ libschily/stdio/fgetstr.c
@@ -25,7 +25,7 @@
*/
EXPORT int
-fgetstr(f, buf, len)
+schily_fgetstr(f, buf, len)
register FILE *f;
char *buf;
register int len;
@@ -59,5 +59,5 @@ getstr(buf, len)
char *buf;
int len;
{
- return (fgetstr(stdin, buf, len));
+ return (schily_fgetstr(stdin, buf, len));
}

13
sysutils/cdrtools-ossdvd/patches/patch-cf Normal file
View file

@ -0,0 +1,13 @@
$NetBSD: patch-cf,v 1.1 2006/02/04 12:05:17 wiz Exp $
--- mkisofs/tree.c.orig 2004-06-12 13:16:37.000000000 +0000
+++ mkisofs/tree.c
@@ -1577,7 +1577,7 @@ insert_file_entry(this_dir, whole_path,
/*
* >= is required by the large file summit standard.
*/
- if (S_ISREG(lstatbuf.st_mode) && (lstatbuf.st_size >= (off_t)0x7FFFFFFF)) {
+ if (S_ISREG(lstatbuf.st_mode) && (lstatbuf.st_size >= (off_t)0x0FFFFFFFF)) {
#endif
#ifdef EOVERFLOW
errno = EOVERFLOW;

25
sysutils/cdrtools-ossdvd/patches/patch-cg Normal file
View file

@ -0,0 +1,25 @@
$NetBSD: patch-cg,v 1.1 2006/02/04 12:05:17 wiz Exp $
--- mkisofs/write.c.orig 2005-08-07 14:50:48.000000000 +0000
+++ mkisofs/write.c
@@ -463,7 +463,7 @@ write_one_file(filename, size, outfile)
static char buffer[SECTOR_SIZE * NSECT];
FILE *infile;
off_t remain;
- int use;
+ off_t use;
if ((infile = fopen(filename, "rb")) == NULL) {
@@ -554,7 +554,10 @@ static char buffer[SECTOR_SIZE * NSECT]
fflush(stderr);
}
#endif
- remain -= use;
+ if (use > remain)
+ remain = 0;
+ else
+ remain -= use;
}
fclose(infile);
}/* write_one_file(... */