summaryrefslogtreecommitdiff
path: root/sysutils
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2001-08-07 11:23:57 +0000
committerdrochner <drochner@pkgsrc.org>2001-08-07 11:23:57 +0000
commit4c6407660edc9c848e88ad4f92552e2fa14b781b (patch)
tree22c051011afff02d551e7710c52e123bd2cb67a2 /sysutils
parent3428c99cdaa43d9703939f5abfbfb98b7dcff018 (diff)
downloadpkgsrc-4c6407660edc9c848e88ad4f92552e2fa14b781b.tar.gz
update to 1.10
There are MANY bugfixes and cleanups. The changelog file is 22k in size.
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/cdrecord/patches/patch-aa12
-rw-r--r--sysutils/cdrecord/patches/patch-ab6
-rw-r--r--sysutils/cdrecord/patches/patch-ac14
-rw-r--r--sysutils/cdrecord/patches/patch-ae13
-rw-r--r--sysutils/cdrecord/patches/patch-af6
-rw-r--r--sysutils/cdrecord/patches/patch-ag18
-rw-r--r--sysutils/cdrecord/patches/patch-ah40
-rw-r--r--sysutils/cdrecord/patches/patch-ai22
-rw-r--r--sysutils/cdrecord/patches/patch-aj16
-rw-r--r--sysutils/cdrecord/patches/patch-ba19
-rw-r--r--sysutils/cdrecord/patches/patch-bb19
11 files changed, 86 insertions, 99 deletions
diff --git a/sysutils/cdrecord/patches/patch-aa b/sysutils/cdrecord/patches/patch-aa
index 3fcb47c3f80..74e3f969b87 100644
--- a/sysutils/cdrecord/patches/patch-aa
+++ b/sysutils/cdrecord/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.5 2000/07/22 16:14:53 rh Exp $
+$NetBSD: patch-aa,v 1.6 2001/08/07 11:23:57 drochner Exp $
---- TARGETS/Targetdirs.orig Sun Apr 30 01:14:51 2000
-+++ TARGETS/Targetdirs Mon May 22 04:14:51 2000
+--- TARGETS/Targetdirs.orig Mon Aug 6 10:21:54 2001
++++ TARGETS/Targetdirs Mon Aug 6 10:22:26 2001
@@ -1,5 +1,5 @@
#ident %W% %E% %Q%
###########################################################################
- DIRS= patches conf inc lib libdeflt libscg libhfs_iso libfile libunls \
-- cdrecord mkisofs mkisofs/diag cdda2wav misc man
-+ cdrecord mkisofs mkisofs/diag cdda2wav misc
+ DIRS= patches conf inc lib libdeflt libscg librscg libhfs_iso libfile libunls \
+- cdrecord mkisofs mkisofs/diag cdda2wav misc rscsi scgcheck man
++ cdrecord mkisofs mkisofs/diag cdda2wav misc rscsi scgcheck
###########################################################################
diff --git a/sysutils/cdrecord/patches/patch-ab b/sysutils/cdrecord/patches/patch-ab
index 164b402e484..78987c6676f 100644
--- a/sysutils/cdrecord/patches/patch-ab
+++ b/sysutils/cdrecord/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2000/07/22 16:14:53 rh Exp $
+$NetBSD: patch-ab,v 1.5 2001/08/07 11:23:57 drochner Exp $
---- DEFAULTS/Defaults.netbsd.orig Tue Nov 2 12:41:03 1999
-+++ DEFAULTS/Defaults.netbsd Mon Nov 15 20:29:31 1999
+--- DEFAULTS/Defaults.netbsd.orig Mon Mar 13 13:37:50 2000
++++ DEFAULTS/Defaults.netbsd Mon Aug 6 10:24:20 2001
@@ -19,7 +19,7 @@
CWARNOPTS=
diff --git a/sysutils/cdrecord/patches/patch-ac b/sysutils/cdrecord/patches/patch-ac
index 9f9f67c96b1..c1fb66f0fc4 100644
--- a/sysutils/cdrecord/patches/patch-ac
+++ b/sysutils/cdrecord/patches/patch-ac
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.11 2000/07/22 16:14:53 rh Exp $
+$NetBSD: patch-ac,v 1.12 2001/08/07 11:23:57 drochner Exp $
---- include/btorder.h.orig Wed Jan 5 17:42:40 2000
-+++ include/btorder.h Sat Mar 4 16:28:55 2000
-@@ -25,6 +25,7 @@
- #define _BTORDER_H
-
+--- include/btorder.h.orig Sat Feb 17 23:24:23 2001
++++ include/btorder.h Mon Aug 6 10:27:20 2001
+@@ -28,6 +28,7 @@
#include <sys/types.h> /* try to load isa_defs.h on Solaris */
+ #define _INCL_SYS_TYPES_H
+ #endif
+#include <machine/endian.h>
#ifndef _MCONFIG_H
#include <mconfig.h>
-@@ -74,7 +75,7 @@
+@@ -77,7 +78,7 @@
# if defined(__ppc__) || defined(ppc) || defined(__ppc) || \
defined(__PPC) || defined(powerpc) || defined(__powerpc__)
diff --git a/sysutils/cdrecord/patches/patch-ae b/sysutils/cdrecord/patches/patch-ae
index 12830d2a632..4464884abe8 100644
--- a/sysutils/cdrecord/patches/patch-ae
+++ b/sysutils/cdrecord/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.3 2000/07/22 16:14:53 rh Exp $
+$NetBSD: patch-ae,v 1.4 2001/08/07 11:23:57 drochner Exp $
---- cdda2wav/Makefile.orig Tue Nov 16 00:48:52 1999
-+++ cdda2wav/Makefile Tue Nov 16 00:49:23 1999
+--- cdda2wav/Makefile.orig Sun Mar 11 17:56:52 2001
++++ cdda2wav/Makefile Mon Aug 6 10:29:26 2001
@@ -7,7 +7,8 @@
INSDIR= bin
@@ -12,12 +12,13 @@ $NetBSD: patch-ae,v 1.3 2000/07/22 16:14:53 rh Exp $
CFILES= cdda2wav.c interface.c semshm.c resample.c \
toc.c wav.c sun.c raw.c md5c.c setuid.c ringbuff.c \
sndconfig.c scsi_cmds.c aiff.c aifc.c \
-@@ -17,7 +18,7 @@
+@@ -17,7 +18,8 @@
config.h saveargs.h sndfile.h aiff.h aifc.h \
sndconfig.h scsi_cmds.h lowlevel.h byteorder.h mycdrom.h \
base64.h sha.h mmsystem.h
--LIBS= -lscg -lschily $(SCSILIB) $(EXTRALIB)
-+LIBS= -lscg -lschily $(SCSILIB) $(EXTRALIB) -lossaudio
+-LIBS= -lrscg -lscg -lschily $(SCSILIB) $(EXTRALIB) $(LIB_SOCKET)
++LIBS= -lrscg -lscg -lschily $(SCSILIB) $(EXTRALIB) $(LIB_SOCKET) \
++ -lossaudio
XMK_FILE= Makefile.man
LCONFIG= local.cnf
diff --git a/sysutils/cdrecord/patches/patch-af b/sysutils/cdrecord/patches/patch-af
index 36c77e5fe93..43eb00cbbfb 100644
--- a/sysutils/cdrecord/patches/patch-af
+++ b/sysutils/cdrecord/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.2 2000/07/22 16:14:54 rh Exp $
+$NetBSD: patch-af,v 1.3 2001/08/07 11:23:57 drochner Exp $
---- RULES/mk-gmake.id.orig Thu Mar 9 22:36:18 2000
-+++ RULES/mk-gmake.id Thu Mar 9 22:36:52 2000
+--- RULES/mk-gmake.id.orig Sun Dec 6 13:51:19 1998
++++ RULES/mk-gmake.id Mon Aug 6 10:31:33 2001
@@ -41,7 +41,7 @@
_ARCHCMD= (arch || /usr/ucb/arch || true) 2> /dev/null
diff --git a/sysutils/cdrecord/patches/patch-ag b/sysutils/cdrecord/patches/patch-ag
deleted file mode 100644
index 02aee70f744..00000000000
--- a/sysutils/cdrecord/patches/patch-ag
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2000/09/10 17:37:10 wiz Exp $
-
---- cdrecord/cdrecord.1.orig Thu Jul 20 19:14:40 2000
-+++ cdrecord/cdrecord.1
-@@ -1035,9 +1035,11 @@
- .RE
-
- .SH SEE ALSO
--.BR mkisofs (1),
-+.BR cdda2wav (1),
-+.BR readcd (1),
- .BR scg (7),
--.BR fbk (7).
-+.BR fbk (7),
-+.BR mkisofs (8).
-
- .SH NOTES
- .PP
diff --git a/sysutils/cdrecord/patches/patch-ah b/sysutils/cdrecord/patches/patch-ah
index 21492ba902b..8e94db3ec87 100644
--- a/sysutils/cdrecord/patches/patch-ah
+++ b/sysutils/cdrecord/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.1 2000/11/21 23:37:02 mycroft Exp $
+$NetBSD: patch-ah,v 1.2 2001/08/07 11:23:57 drochner Exp $
---- cdda2wav/setuid.c.orig Sat Apr 22 20:37:57 2000
-+++ cdda2wav/setuid.c Tue Nov 21 23:30:58 2000
+--- cdda2wav/setuid.c.orig Sat Apr 22 22:37:57 2000
++++ cdda2wav/setuid.c Mon Aug 6 10:36:07 2001
@@ -93,7 +93,7 @@
}
if (geteuid() == 0) return; /* nothing to do */
@@ -38,37 +38,3 @@ $NetBSD: patch-ah,v 1.1 2000/11/21 23:37:02 mycroft Exp $
if (setegid(real_gid)) {
perror("setegid in dontneedgroup()");
exit(1);
---- misc/readcd.c.orig Thu Jul 20 16:18:45 2000
-+++ misc/readcd.c Tue Nov 21 23:31:13 2000
-@@ -293,11 +293,11 @@
- /*
- * We don't need root privilleges anymore.
- */
--#ifdef HAVE_SETREUID
-- if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef HAVE_SETEUID
- if (seteuid(getuid()) < 0)
-+#else
-+#ifdef HAVE_SETREUID
-+ if (setreuid(-1, getuid()) < 0)
- #else
- if (setuid(getuid()) < 0)
- #endif
---- mkisofs/mkisofs.c.orig Thu Jul 20 16:31:17 2000
-+++ mkisofs/mkisofs.c Tue Nov 21 23:31:20 2000
-@@ -1802,11 +1802,11 @@
- }
- }
- /* We don't need root privilleges anymore. */
--#ifdef HAVE_SETREUID
-- if (setreuid(-1, getuid()) < 0)
--#else
- #ifdef HAVE_SETEUID
- if (seteuid(getuid()) < 0)
-+#else
-+#ifdef HAVE_SETREUID
-+ if (setreuid(-1, getuid()) < 0)
- #else
- if (setuid(getuid()) < 0)
- #endif
diff --git a/sysutils/cdrecord/patches/patch-ai b/sysutils/cdrecord/patches/patch-ai
index b7b7459a614..5f36da7bd35 100644
--- a/sysutils/cdrecord/patches/patch-ai
+++ b/sysutils/cdrecord/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2001/02/10 23:15:32 frueauf Exp $
+$NetBSD: patch-ai,v 1.2 2001/08/07 11:23:57 drochner Exp $
I know this patch is an ugly hack. But at least it makes "cdrecord -scanbus"
more usefull, which in turn makes xcdroast work. Feel free to implement
@@ -6,14 +6,14 @@ this cleanly however...
Thorsten Frueauf <frueauf@netbsd.org>, 2001.02.10
---- libscg/scsi-bsd.c.orig Sat Jul 1 12:22:50 2000
-+++ libscg/scsi-bsd.c Sat Feb 10 20:43:09 2001
+--- libscg/scsi-bsd.c.orig Sun Mar 18 15:10:21 2001
++++ libscg/scsi-bsd.c Mon Aug 6 14:55:09 2001
@@ -48,7 +48,7 @@
* 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.31"; /* The version for this transport*/
-+LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.31nb1"; /* The version for this transport*/
+-LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.40"; /* The version for this transport*/
++LOCAL char _scg_trans_version[] = "scsi-bsd.c-1.40nb1"; /* The version for this transport*/
#define MAX_SCG 16 /* Max # of SCSI controllers */
#define MAX_TGT 16
@@ -87,23 +87,23 @@ Thorsten Frueauf <frueauf@netbsd.org>, 2001.02.10
+ errno = EINVAL;
+ return (0);
+ }
-+ scgp->scsibus = busno = SADDR_BUS(mysaddr);
-+ scgp->target = tgt = SADDR_TARGET(mysaddr);
++ scg_scsibus(scgp) = busno = SADDR_BUS(mysaddr);
++ scg_target(scgp) = tgt = SADDR_TARGET(mysaddr);
+ if ((tlun >= 0) && (tlun != SADDR_LUN(mysaddr))) {
+ close(f);
+ errno = EINVAL;
+ return (0);
+ }
-+ scgp->lun = tlun = SADDR_LUN(mysaddr);
-+ if (scsi_setup(scgp, f, busno, tgt, tlun))
++ scg_lun(scgp) = tlun = SADDR_LUN(mysaddr);
++ if (scg_setup(scgp, f, busno, tgt, tlun))
+ nopen++;
+ }
+ }
+#else /* not __NetBSD__ */
if (busno >= 0 && tgt >= 0 && tlun >= 0) {
- sprintf(devname, "/dev/su%d-%d-%d", busno, tgt, tlun);
-@@ -190,6 +253,7 @@
+ js_snprintf(devname, sizeof(devname),
+@@ -192,6 +255,7 @@
}
}
}
diff --git a/sysutils/cdrecord/patches/patch-aj b/sysutils/cdrecord/patches/patch-aj
index af6b3bbaed6..94d21f99ea2 100644
--- a/sysutils/cdrecord/patches/patch-aj
+++ b/sysutils/cdrecord/patches/patch-aj
@@ -1,24 +1,24 @@
-$NetBSD: patch-aj,v 1.1 2001/06/20 16:46:13 bouyer Exp $
+$NetBSD: patch-aj,v 1.2 2001/08/07 11:23:57 drochner Exp $
---- cdrecord/scsi_cdr.c.orig Wed Jun 20 16:35:42 2001
-+++ cdrecord/scsi_cdr.c Wed Jun 20 16:42:53 2001
-@@ -262,6 +262,12 @@
+--- cdrecord/scsi_cdr.c.orig Wed Apr 11 00:22:21 2001
++++ cdrecord/scsi_cdr.c Mon Aug 6 11:14:44 2001
+@@ -271,6 +271,12 @@
request_sense(scgp)
SCSI *scgp;
{
+
+#ifdef __NetBSD__
+ /* request sense already done by kernel */
-+ scsiprsense((Uchar *)scgp->scmd->u_sense.cmd_sense,
++ 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;
-@@ -282,6 +288,7 @@
- if (scsicmd(scgp) < 0)
+@@ -290,6 +296,7 @@
+ if (scg_cmd(scgp) < 0)
return (-1);
- scsiprsense((Uchar *)sensebuf, CCS_SENSE_LEN - scsigetresid(scgp));
+ scg_prsense((Uchar *)sensebuf, CCS_SENSE_LEN - scg_getresid(scgp));
+#endif
return (0);
}
diff --git a/sysutils/cdrecord/patches/patch-ba b/sysutils/cdrecord/patches/patch-ba
new file mode 100644
index 00000000000..2f8b498fc9f
--- /dev/null
+++ b/sysutils/cdrecord/patches/patch-ba
@@ -0,0 +1,19 @@
+$NetBSD: patch-ba,v 1.1 2001/08/07 11:23:57 drochner Exp $
+
+--- misc/readcd.c.orig Fri Apr 13 19:41:39 2001
++++ misc/readcd.c Mon Aug 6 10:42:49 2001
+@@ -301,11 +301,11 @@
+ /*
+ * We don't need root privilleges anymore.
+ */
+-#ifdef HAVE_SETREUID
+- if (setreuid(-1, getuid()) < 0)
+-#else
+ #ifdef HAVE_SETEUID
+ if (seteuid(getuid()) < 0)
++#else
++#ifdef HAVE_SETREUID
++ if (setreuid(-1, getuid()) < 0)
+ #else
+ if (setuid(getuid()) < 0)
+ #endif
diff --git a/sysutils/cdrecord/patches/patch-bb b/sysutils/cdrecord/patches/patch-bb
new file mode 100644
index 00000000000..a788057c205
--- /dev/null
+++ b/sysutils/cdrecord/patches/patch-bb
@@ -0,0 +1,19 @@
+$NetBSD: patch-bb,v 1.1 2001/08/07 11:23:57 drochner Exp $
+
+--- mkisofs/mkisofs.c.orig Fri Apr 20 17:45:50 2001
++++ mkisofs/mkisofs.c Mon Aug 6 10:46:21 2001
+@@ -2072,11 +2072,11 @@
+ }
+ }
+ /* We don't need root privilleges anymore. */
+-#ifdef HAVE_SETREUID
+- if (setreuid(-1, getuid()) < 0)
+-#else
+ #ifdef HAVE_SETEUID
+ if (seteuid(getuid()) < 0)
++#else
++#ifdef HAVE_SETREUID
++ if (setreuid(-1, getuid()) < 0)
+ #else
+ if (setuid(getuid()) < 0)
+ #endif