summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/cdrtools-ossdvd/Makefile11
-rw-r--r--sysutils/cdrtools-ossdvd/distinfo22
-rw-r--r--sysutils/cdrtools-ossdvd/patches/patch-ai22
-rw-r--r--sysutils/cdrtools-ossdvd/patches/patch-aj6
-rw-r--r--sysutils/cdrtools-ossdvd/patches/patch-ba11
-rw-r--r--sysutils/cdrtools-ossdvd/patches/patch-bb11
-rw-r--r--sysutils/cdrtools-ossdvd/patches/patch-ca6
-rw-r--r--sysutils/cdrtools-ossdvd/patches/patch-cb8
8 files changed, 50 insertions, 47 deletions
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index a4171333df3..c4dcdab3734 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.9 2004/07/22 17:04:28 drochner Exp $
+# $NetBSD: Makefile,v 1.10 2004/08/04 21:19:26 wiz Exp $
-DISTNAME= cdrtools-2.01a24
-PKGNAME= cdrtools-ossdvd-2.01.1.24
+DISTNAME= cdrtools-2.01a27
+PKGNAME= cdrtools-ossdvd-2.01.1.27
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.berlios.de/pub/cdrecord/alpha/
-PATCHFILES= cdrtools-2.01a24-ossdvd.patch-rs.bz2
-PATCH_SITES= ftp://ftp.crashrecovery.org/pub/linux/cdrtools/
+PATCHFILES= cdrtools-2.01a27-ossdvd.patch.bz2
+PATCH_SITES= ftp://ftp.crashrecovery.org/pub/linux/cdrtools/ \
+ http://crashrecovery.org/oss-dvd/
PATCH_DIST_STRIP= -p1
MAINTAINER= tech-pkg@NetBSD.org
diff --git a/sysutils/cdrtools-ossdvd/distinfo b/sysutils/cdrtools-ossdvd/distinfo
index be40cb89cda..886b15b98f4 100644
--- a/sysutils/cdrtools-ossdvd/distinfo
+++ b/sysutils/cdrtools-ossdvd/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.2 2004/04/21 21:47:19 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/08/04 21:19:26 wiz Exp $
-SHA1 (cdrtools-2.01a24.tar.gz) = ff5cb0880855c83390ea0b7b0bb844e6b67528d9
-Size (cdrtools-2.01a24.tar.gz) = 1677736 bytes
-SHA1 (cdrtools-2.01a24-ossdvd.patch-rs.bz2) = 9bbf27d41298fb1b156178e85e64851af417a5a5
-Size (cdrtools-2.01a24-ossdvd.patch-rs.bz2) = 7392 bytes
+SHA1 (cdrtools-2.01a27.tar.gz) = efc78c2b1ae66d701187716fe84b8a0306573088
+Size (cdrtools-2.01a27.tar.gz) = 1692447 bytes
+SHA1 (cdrtools-2.01a27-ossdvd.patch.bz2) = 0042d20f58d10aced1dc36be9761ec092c5ba617
+Size (cdrtools-2.01a27-ossdvd.patch.bz2) = 7361 bytes
SHA1 (patch-ac) = 0d9217924ed353b1c23bac1ffd8b2ee69eda8f47
SHA1 (patch-ah) = 34ecab01125bcac2a28e295b198edce0de8b8777
-SHA1 (patch-ai) = 38f6bc8a9deee6861d5589dcf65dcd4968614457
-SHA1 (patch-aj) = e606fbd4fba068b96cc784d3a0f0ee0d7cf7a84a
-SHA1 (patch-ba) = 635f7584d125517309ae00919f5a7808b28ba127
-SHA1 (patch-bb) = 653956259faeb46106e243e543eb17eb25d5a371
-SHA1 (patch-ca) = 5dbc3d3f248781627b6d6100808c70db60e83bd4
-SHA1 (patch-cb) = c7060bce4ef117e55169a39eb0850a0b57de56c2
+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
diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ai b/sysutils/cdrtools-ossdvd/patches/patch-ai
index 6d9ad183e6a..999d3fcb69f 100644
--- a/sysutils/cdrtools-ossdvd/patches/patch-ai
+++ b/sysutils/cdrtools-ossdvd/patches/patch-ai
@@ -1,17 +1,17 @@
-$NetBSD: patch-ai,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
+$NetBSD: patch-ai,v 1.2 2004/08/04 21:19:26 wiz Exp $
---- libscg/scsi-bsd.c.orig Mon Oct 21 15:57:07 2002
-+++ libscg/scsi-bsd.c Sat Nov 30 18:20:19 2002
-@@ -48,7 +48,7 @@
+--- libscg/scsi-bsd.c.orig 2004-01-15 00:13:05.000000000 +0100
++++ libscg/scsi-bsd.c
+@@ -48,7 +48,7 @@ static char __sccsid[] =
* Choose your name instead of "schily" and make clear that the version
* string is related to a modified source.
*/
--LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.41"; /* The version for this transport*/
-+LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.41nb1"; /* The version for this transport*/
+-LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.42"; /* The version for this transport*/
++LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.42nb1"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
-@@ -108,7 +108,7 @@
+@@ -108,7 +108,7 @@ scgo_version(scgp, what)
* return "schily" for the SCG_AUTHOR request.
*/
case SCG_AUTHOR:
@@ -20,7 +20,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
case SCG_SCCS_ID:
return (__sccsid);
}
-@@ -140,6 +140,15 @@
+@@ -140,6 +140,15 @@ scgo_open(scgp, device)
register int l;
register int nopen = 0;
char devname[64];
@@ -36,7 +36,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
if (busno >= MAX_SCG || tgt >= MAX_TGT || tlun >= MAX_LUN) {
errno = EINVAL;
-@@ -166,6 +175,60 @@
+@@ -166,6 +175,60 @@ scgo_open(scgp, device)
if ((device != NULL && *device != '\0') || (busno == -2 && tgt == -2))
goto openbydev;
@@ -96,8 +96,8 @@ $NetBSD: patch-ai,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
+#else /* not __NetBSD__ */
if (busno >= 0 && tgt >= 0 && tlun >= 0) {
- js_snprintf(devname, sizeof(devname),
-@@ -202,6 +265,7 @@
+ js_snprintf(devname, sizeof (devname),
+@@ -202,6 +265,7 @@ scgo_open(scgp, device)
}
}
}
diff --git a/sysutils/cdrtools-ossdvd/patches/patch-aj b/sysutils/cdrtools-ossdvd/patches/patch-aj
index e29f16b2f7b..d75e501360f 100644
--- a/sysutils/cdrtools-ossdvd/patches/patch-aj
+++ b/sysutils/cdrtools-ossdvd/patches/patch-aj
@@ -1,6 +1,6 @@
-$NetBSD: patch-aj,v 1.1.1.1 2003/12/17 16:09:08 wiz Exp $
+$NetBSD: patch-aj,v 1.2 2004/08/04 21:19:26 wiz Exp $
---- cdrecord/scsi_cdr.c.orig Fri Nov 28 20:29:50 2003
+--- cdrecord/scsi_cdr.c.orig 2004-07-31 23:44:33.000000000 +0200
+++ cdrecord/scsi_cdr.c
@@ -315,6 +315,12 @@ EXPORT int
request_sense(scgp)
@@ -12,7 +12,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2003/12/17 16:09:08 wiz Exp $
+ scg_prsense((Uchar *)scgp->scmd->u_sense.cmd_sense,
+ scgp->scmd->sense_count);
+#else
- char sensebuf[CCS_SENSE_LEN];
+ char sensebuf[CCS_SENSE_LEN];
register struct scg_cmd *scmd = scgp->scmd;
@@ -334,6 +340,7 @@ request_sense(scgp)
diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ba b/sysutils/cdrtools-ossdvd/patches/patch-ba
index 6da84686377..7d3b8b4ef2d 100644
--- a/sysutils/cdrtools-ossdvd/patches/patch-ba
+++ b/sysutils/cdrtools-ossdvd/patches/patch-ba
@@ -1,8 +1,8 @@
-$NetBSD: patch-ba,v 1.1.1.1 2003/12/17 16:09:08 wiz Exp $
+$NetBSD: patch-ba,v 1.2 2004/08/04 21:19:26 wiz Exp $
---- readcd/readcd.c.orig Fri Jul 18 09:04:20 2003
+--- readcd/readcd.c.orig 2004-03-02 01:55:11.000000000 +0100
+++ readcd/readcd.c
-@@ -385,11 +385,11 @@ main(ac, av)
+@@ -389,12 +389,12 @@ main(ac, av)
/*
* We don't need root privilleges anymore.
*/
@@ -11,9 +11,10 @@ $NetBSD: patch-ba,v 1.1.1.1 2003/12/17 16:09:08 wiz Exp $
-#else
#ifdef HAVE_SETEUID
if (seteuid(getuid()) < 0)
-+#else
+ #else
+#ifdef HAVE_SETREUID
+ if (setreuid(-1, getuid()) < 0)
- #else
++#else
if (setuid(getuid()) < 0)
#endif
+ #endif
diff --git a/sysutils/cdrtools-ossdvd/patches/patch-bb b/sysutils/cdrtools-ossdvd/patches/patch-bb
index e1d804964fc..89b1ce22ea2 100644
--- a/sysutils/cdrtools-ossdvd/patches/patch-bb
+++ b/sysutils/cdrtools-ossdvd/patches/patch-bb
@@ -1,8 +1,8 @@
-$NetBSD: patch-bb,v 1.1.1.1 2003/12/17 16:09:08 wiz Exp $
+$NetBSD: patch-bb,v 1.2 2004/08/04 21:19:26 wiz Exp $
---- mkisofs/mkisofs.c.orig Sun Jul 13 14:42:16 2003
+--- mkisofs/mkisofs.c.orig 2004-03-05 00:22:28.000000000 +0100
+++ mkisofs/mkisofs.c
-@@ -2279,11 +2279,11 @@ parse_input_files:
+@@ -2342,12 +2342,12 @@ parse_input_files:
}
}
/* We don't need root privilleges anymore. */
@@ -11,9 +11,10 @@ $NetBSD: patch-bb,v 1.1.1.1 2003/12/17 16:09:08 wiz Exp $
-#else
#ifdef HAVE_SETEUID
if (seteuid(getuid()) < 0)
-+#else
+ #else
+#ifdef HAVE_SETREUID
+ if (setreuid(-1, getuid()) < 0)
- #else
++#else
if (setuid(getuid()) < 0)
#endif
+ #endif
diff --git a/sysutils/cdrtools-ossdvd/patches/patch-ca b/sysutils/cdrtools-ossdvd/patches/patch-ca
index 616ef16b2d6..4cb7975833f 100644
--- a/sysutils/cdrtools-ossdvd/patches/patch-ca
+++ b/sysutils/cdrtools-ossdvd/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
+$NetBSD: patch-ca,v 1.2 2004/08/04 21:19:26 wiz Exp $
---- cdrecord/defaults.c.orig Thu Aug 15 03:52:00 2002
+--- cdrecord/defaults.c.orig 2004-03-02 02:10:32.000000000 +0100
+++ cdrecord/defaults.c
-@@ -53,7 +53,7 @@ open_cdrdefaults()
+@@ -54,7 +54,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.
*/
diff --git a/sysutils/cdrtools-ossdvd/patches/patch-cb b/sysutils/cdrtools-ossdvd/patches/patch-cb
index fcaa7c69e84..79eeca682f1 100644
--- a/sysutils/cdrtools-ossdvd/patches/patch-cb
+++ b/sysutils/cdrtools-ossdvd/patches/patch-cb
@@ -1,8 +1,8 @@
-$NetBSD: patch-cb,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
+$NetBSD: patch-cb,v 1.2 2004/08/04 21:19:26 wiz Exp $
---- cdrecord/cdrecord.1.orig Sun Jul 20 23:06:32 2003
+--- cdrecord/cdrecord.1.orig 2004-02-29 18:13:20.000000000 +0100
+++ cdrecord/cdrecord.1
-@@ -1684,8 +1684,8 @@ login shell.
+@@ -1737,8 +1737,8 @@ login shell.
.SH FILES
.TP
@@ -13,7 +13,7 @@ $NetBSD: patch-cb,v 1.1.1.1 2003/12/17 16:09:07 wiz Exp $
For example:
.SM CDR_FIFOSIZE=8m
or
-@@ -1694,7 +1694,7 @@ or
+@@ -1747,7 +1747,7 @@ or
.TP
CDR_DEVICE
This may either hold a device identifier that is suitable to the open
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-27 01:10:16 +0000