summaryrefslogtreecommitdiff
path: root/sysutils/cdrtools/patches
diff options
context:
space:
mode:
Diffstat (limited to 'sysutils/cdrtools/patches')
-rw-r--r--sysutils/cdrtools/patches/patch-ai16
-rw-r--r--sysutils/cdrtools/patches/patch-aj31
-rw-r--r--sysutils/cdrtools/patches/patch-ba6
-rw-r--r--sysutils/cdrtools/patches/patch-bb6
-rw-r--r--sysutils/cdrtools/patches/patch-cf6
-rw-r--r--sysutils/cdrtools/patches/patch-cg18
-rw-r--r--sysutils/cdrtools/patches/patch-cj8
7 files changed, 35 insertions, 56 deletions
diff --git a/sysutils/cdrtools/patches/patch-ai b/sysutils/cdrtools/patches/patch-ai
index 6ade4ee71df..6d19c903ee6 100644
--- a/sysutils/cdrtools/patches/patch-ai
+++ b/sysutils/cdrtools/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
+$NetBSD: patch-ai,v 1.5 2007/09/18 23:07:26 wiz Exp $
---- libscg/scsi-bsd.c.orig 2004-01-14 23:13:05.000000000 +0000
+--- libscg/scsi-bsd.c.orig 2007-03-25 20:18:56.000000000 +0000
+++ libscg/scsi-bsd.c
-@@ -39,6 +39,7 @@ static char __sccsid[] =
+@@ -44,6 +44,7 @@ static char __sccsid[] =
#undef sense
#include <sys/scsiio.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
/*
* Warning: you may change this source, but if you do that
-@@ -47,7 +48,7 @@ static char __sccsid[] =
+@@ -52,7 +53,7 @@ static char __sccsid[] =
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
@@ -19,7 +19,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
-@@ -107,7 +108,7 @@ scgo_version(scgp, what)
+@@ -112,7 +113,7 @@ scgo_version(scgp, what)
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
@@ -28,7 +28,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
case SCG_SCCS_ID:
return (__sccsid);
}
-@@ -139,6 +140,10 @@ scgo_open(scgp, device)
+@@ -144,6 +145,10 @@ scgo_open(scgp, device)
register int l;
register int nopen = 0;
char devname[64];
@@ -39,7 +39,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
-@@ -165,6 +170,60 @@ scgo_open(scgp, device)
+@@ -170,6 +175,60 @@ scgo_open(scgp, device)
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
goto openbydev;
@@ -100,7 +100,7 @@ $NetBSD: patch-ai,v 1.4 2007/06/21 18:16:16 wiz Exp $
if (busno >= 0 && tgt >= 0 && tlun >= 0) {
js_snprintf(devname, sizeof (devname),
-@@ -201,6 +260,7 @@ scgo_open(scgp, device)
+@@ -206,6 +265,7 @@ scgo_open(scgp, device)
}
}
}
diff --git a/sysutils/cdrtools/patches/patch-aj b/sysutils/cdrtools/patches/patch-aj
index 27662919a73..7e3fe3cd80b 100644
--- a/sysutils/cdrtools/patches/patch-aj
+++ b/sysutils/cdrtools/patches/patch-aj
@@ -1,29 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-aj,v 1.3 2007/09/18 23:07:26 wiz Exp $
---- cdrecord/scsi_cdr.c.orig 2006-09-26 14:24:55.000000000 +0200
+--- cdrecord/scsi_cdr.c.orig 2007-09-01 12:09:48.000000000 +0000
+++ cdrecord/scsi_cdr.c
-@@ -312,7 +312,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
- fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
- scmd->addr = sensebuf;
- scmd->size = sizeof (sensebuf);
-@@ -328,6 +332,7 @@ request_sense(scgp)
- if (scg_cmd(scgp) < 0)
- return (-1);
- scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
-+#endif
- return (0);
- }
-
-@@ -339,7 +344,11 @@ request_sense_b(scgp, bp, cnt)
+@@ -340,7 +340,11 @@ request_sense_b(scgp, bp, cnt)
{
register struct scg_cmd *scmd = scgp->scmd;
@@ -31,12 +10,12 @@ $NetBSD: patch-aj,v 1.2 2007/03/16 22:04:54 bad Exp $
+#ifdef __NetBSD__
+ /* request sense already done by kernel */
+ memcpy(bp, scgp->scmd->u_sense.cmd_sense,
-+ (scgp->scmd->sense_count < cnt ? scgp->scmd->sense_count : cnt));
++ (scgp->scmd->sense_count < cnt ? scgp->scmd->sense_count : cnt));
+#else
fillbytes((caddr_t)scmd, sizeof (*scmd), '\0');
scmd->addr = bp;
scmd->size = cnt;
-@@ -354,6 +363,7 @@ request_sense_b(scgp, bp, cnt)
+@@ -355,6 +359,7 @@ request_sense_b(scgp, bp, cnt)
if (scg_cmd(scgp) < 0)
return (-1);
diff --git a/sysutils/cdrtools/patches/patch-ba b/sysutils/cdrtools/patches/patch-ba
index 6cb7bef0ad6..6ccabcd8ef5 100644
--- a/sysutils/cdrtools/patches/patch-ba
+++ b/sysutils/cdrtools/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-ba,v 1.3 2007/09/18 23:07:26 wiz Exp $
---- readcd/readcd.c.orig 2007-02-26 16:46:48.000000000 +0100
+--- readcd/readcd.c.orig 2007-08-12 20:45:39.000000000 +0000
+++ readcd/readcd.c
-@@ -431,12 +431,12 @@ main(ac, av)
+@@ -497,12 +497,12 @@ main(ac, av)
/*
* We don't need root privilleges anymore.
*/
diff --git a/sysutils/cdrtools/patches/patch-bb b/sysutils/cdrtools/patches/patch-bb
index 8511e5f9aba..4e39eb14166 100644
--- a/sysutils/cdrtools/patches/patch-bb
+++ b/sysutils/cdrtools/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-bb,v 1.3 2007/09/18 23:07:27 wiz Exp $
---- mkisofs/mkisofs.c.orig 2007-02-26 16:01:09.000000000 +0100
+--- mkisofs/mkisofs.c.orig 2007-08-20 16:18:07.000000000 +0000
+++ mkisofs/mkisofs.c
-@@ -2126,12 +2126,12 @@ args_ok:
+@@ -2239,12 +2239,12 @@ setcharset:
}
}
/* We don't need root privilleges anymore. */
diff --git a/sysutils/cdrtools/patches/patch-cf b/sysutils/cdrtools/patches/patch-cf
index 1654768ee0d..a888f81d3d3 100644
--- a/sysutils/cdrtools/patches/patch-cf
+++ b/sysutils/cdrtools/patches/patch-cf
@@ -1,8 +1,8 @@
-$NetBSD: patch-cf,v 1.2 2007/03/16 22:04:54 bad Exp $
+$NetBSD: patch-cf,v 1.3 2007/09/18 23:07:27 wiz Exp $
---- mkisofs/tree.c.orig 2006-11-25 16:49:32.000000000 +0100
+--- mkisofs/tree.c.orig 2007-08-20 16:34:53.000000000 +0000
+++ mkisofs/tree.c
-@@ -1562,7 +1562,7 @@ insert_file_entry(this_dir, whole_path,
+@@ -1632,7 +1632,7 @@ insert_file_entry(this_dir, whole_path,
/*
* >= is required by the large file summit standard.
*/
diff --git a/sysutils/cdrtools/patches/patch-cg b/sysutils/cdrtools/patches/patch-cg
index caea480e7ef..5b112245aca 100644
--- a/sysutils/cdrtools/patches/patch-cg
+++ b/sysutils/cdrtools/patches/patch-cg
@@ -1,17 +1,17 @@
-$NetBSD: patch-cg,v 1.3 2007/06/08 23:04:35 wiz Exp $
+$NetBSD: patch-cg,v 1.4 2007/09/18 23:07:27 wiz Exp $
---- mkisofs/write.c.orig 2006-10-08 13:49:17.000000000 +0000
+--- mkisofs/write.c.orig 2007-08-20 16:35:48.000000000 +0000
+++ mkisofs/write.c
-@@ -362,7 +362,7 @@ write_one_file(filename, size, outfile)
+@@ -372,7 +372,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) {
-@@ -428,7 +428,10 @@ static char buffer[SECTOR_SIZE * NSECT]
+ int unroundeduse;
+ int bytestowrite = 0; /* Dummy init. to serve GCC bug */
+ int correctedsize = 0;
+@@ -499,7 +499,10 @@ static char buffer[SECTOR_SIZE * NSECT]
fflush(stderr);
}
#endif
@@ -21,5 +21,5 @@ $NetBSD: patch-cg,v 1.3 2007/06/08 23:04:35 wiz Exp $
+ else
+ remain -= use;
}
- fclose(infile);
- } /* write_one_file(... */
+ #ifdef APPLE_HYB
+ #if defined(INSERTMACRESFORK) && defined(UDF)
diff --git a/sysutils/cdrtools/patches/patch-cj b/sysutils/cdrtools/patches/patch-cj
index 7e1d5237b9d..aa4331b2f20 100644
--- a/sysutils/cdrtools/patches/patch-cj
+++ b/sysutils/cdrtools/patches/patch-cj
@@ -1,11 +1,11 @@
-$NetBSD: patch-cj,v 1.2 2007/03/16 22:04:55 bad Exp $
+$NetBSD: patch-cj,v 1.3 2007/09/18 23:07:27 wiz Exp $
isoinfo extracts files at the painful rate of 1 sector at a time. This patch
speeds up file extraction significantly by using a much larger buffer.
---- mkisofs/diag/isoinfo.c.orig 2006-10-19 12:31:36.000000000 +0200
+--- mkisofs/diag/isoinfo.c.orig 2007-07-29 22:33:21.000000000 +0000
+++ mkisofs/diag/isoinfo.c
-@@ -649,7 +649,7 @@ extract_file(idr)
+@@ -648,7 +648,7 @@ extract_file(idr)
struct iso_directory_record *idr;
{
int extent, len, tlen;
@@ -14,7 +14,7 @@ speeds up file extraction significantly by using a much larger buffer.
#if defined(__CYGWIN32__) || defined(__CYGWIN__) || defined(__EMX__) || defined(__DJGPP__)
setmode(fileno(stdout), O_BINARY);
-@@ -659,16 +659,15 @@ extract_file(idr)
+@@ -658,16 +658,15 @@ extract_file(idr)
len = isonum_733((unsigned char *)idr->size);
while (len > 0) {
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-17 12:03:30 +0000