diff options
author | Dirk Froemberg <dirk@FreeBSD.org> | 2000-08-19 21:26:05 +0000 |
---|---|---|
committer | Dirk Froemberg <dirk@FreeBSD.org> | 2000-08-19 21:26:05 +0000 |
commit | fa627dd9574390f3c2092417728097e8a49441df (patch) | |
tree | a8403eeb9de4601e204769d4cb1fd3728f21337c /sysutils | |
parent | b2e81c917af4a009bf8c88dcc9b7968bdc95f76e (diff) | |
download | ports-fa627dd9574390f3c2092417728097e8a49441df.tar.gz ports-fa627dd9574390f3c2092417728097e8a49441df.zip |
Notes
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/cdrecord/files/patch-ae | 38 | ||||
-rw-r--r-- | sysutils/cdrecord/files/patch-af | 89 | ||||
-rw-r--r-- | sysutils/cdrecord/files/patch-ag | 20 | ||||
-rw-r--r-- | sysutils/cdrecord/files/patch-ah | 20 | ||||
-rw-r--r-- | sysutils/cdrtools-devel/files/patch-ae | 38 | ||||
-rw-r--r-- | sysutils/cdrtools-devel/files/patch-af | 89 | ||||
-rw-r--r-- | sysutils/cdrtools-devel/files/patch-ag | 20 | ||||
-rw-r--r-- | sysutils/cdrtools-devel/files/patch-ah | 20 | ||||
-rw-r--r-- | sysutils/cdrtools/files/patch-ae | 38 | ||||
-rw-r--r-- | sysutils/cdrtools/files/patch-af | 89 | ||||
-rw-r--r-- | sysutils/cdrtools/files/patch-ag | 20 | ||||
-rw-r--r-- | sysutils/cdrtools/files/patch-ah | 20 | ||||
-rw-r--r-- | sysutils/mkisofs-devel/files/patch-bc | 42 | ||||
-rw-r--r-- | sysutils/mkisofs-devel/files/patch-bd | 47 | ||||
-rw-r--r-- | sysutils/mkisofs-devel/files/patch-be | 33 | ||||
-rw-r--r-- | sysutils/mkisofs/files/patch-bc | 42 | ||||
-rw-r--r-- | sysutils/mkisofs/files/patch-bd | 47 | ||||
-rw-r--r-- | sysutils/mkisofs/files/patch-be | 33 |
18 files changed, 745 insertions, 0 deletions
diff --git a/sysutils/cdrecord/files/patch-ae b/sysutils/cdrecord/files/patch-ae new file mode 100644 index 000000000000..03f40b8e9ec0 --- /dev/null +++ b/sysutils/cdrecord/files/patch-ae @@ -0,0 +1,38 @@ +--- cdrecord/drv_philips.c.orig Sun May 7 14:39:57 2000 ++++ cdrecord/drv_philips.c Fri Aug 18 22:40:38 2000 +@@ -518,7 +518,7 @@ + int *speedp; + int dummy; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 16; + int page = 0x31; +@@ -539,7 +539,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -567,7 +567,7 @@ + int *speedp; + int dummy; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 20; + int page = 0x23; +@@ -588,7 +588,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + diff --git a/sysutils/cdrecord/files/patch-af b/sysutils/cdrecord/files/patch-af new file mode 100644 index 000000000000..3e6ff143cf50 --- /dev/null +++ b/sysutils/cdrecord/files/patch-af @@ -0,0 +1,89 @@ +--- cdrecord/drv_sony.c.orig Sun Jul 2 23:11:58 2000 ++++ cdrecord/drv_sony.c Fri Aug 18 22:40:38 2000 +@@ -399,12 +399,12 @@ + msf_t msf; + + char mode[256]; +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + struct sony_924_mode_page_22 *xp; + + dummy = get_page22_sony(scgp, mode); + if (dummy >= 0) { +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -572,7 +572,7 @@ + int sectype; + int tracktype; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 0x30; + int page = 0x23; +@@ -590,7 +590,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -613,7 +613,7 @@ + int sectype; + int tracktype; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 0x30; + int page = 0x23; +@@ -635,7 +635,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -707,7 +707,7 @@ + int toctype; + int multi; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int i; + int len = 0x30; +@@ -718,7 +718,7 @@ + if ((len = get_page22_sony(scgp, mode)) < 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -747,7 +747,7 @@ + SCSI *scgp; + char *mode; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + int len = 0x30; + int page = 0x22; + struct sony_924_mode_page_22 *xp; +@@ -764,7 +764,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + diff --git a/sysutils/cdrecord/files/patch-ag b/sysutils/cdrecord/files/patch-ag new file mode 100644 index 000000000000..e1b0f3b748e2 --- /dev/null +++ b/sysutils/cdrecord/files/patch-ag @@ -0,0 +1,20 @@ +--- cdrecord/modes.c.orig Sun May 7 14:49:37 2000 ++++ cdrecord/modes.c Fri Aug 18 22:40:38 2000 +@@ -58,7 +58,7 @@ + int hdlen; + int len = 1; /* Nach SCSI Norm */ + int try = 0; +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + + again: + fillbytes((caddr_t)mode, sizeof(mode), '\0'); +@@ -89,7 +89,7 @@ + scsiprbytes("Mode Sense Data", mode, len - scsigetresid(scgp)); + hdlen = sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len; +- mp = (struct scsi_mode_page_header *)(mode + hdlen); ++ mp = (struct scg_scsi_mode_page_header *)(mode + hdlen); + if (scgp->verbose) + scsiprbytes("Mode Page Data", (u_char *)mp, mp->p_len+2); + diff --git a/sysutils/cdrecord/files/patch-ah b/sysutils/cdrecord/files/patch-ah new file mode 100644 index 000000000000..d9bc5cd64fc0 --- /dev/null +++ b/sysutils/cdrecord/files/patch-ah @@ -0,0 +1,20 @@ +--- libscg/scg/scsireg.h.orig Sun May 28 23:31:20 2000 ++++ libscg/scg/scsireg.h Fri Aug 18 22:40:38 2000 +@@ -244,7 +244,7 @@ + + #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit p_code : 6; + Ucbit res : 1; + Ucbit parsave : 1; +@@ -262,7 +262,7 @@ + + #else /* Motorola byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit parsave : 1; + Ucbit res : 1; + Ucbit p_code : 6; diff --git a/sysutils/cdrtools-devel/files/patch-ae b/sysutils/cdrtools-devel/files/patch-ae new file mode 100644 index 000000000000..03f40b8e9ec0 --- /dev/null +++ b/sysutils/cdrtools-devel/files/patch-ae @@ -0,0 +1,38 @@ +--- cdrecord/drv_philips.c.orig Sun May 7 14:39:57 2000 ++++ cdrecord/drv_philips.c Fri Aug 18 22:40:38 2000 +@@ -518,7 +518,7 @@ + int *speedp; + int dummy; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 16; + int page = 0x31; +@@ -539,7 +539,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -567,7 +567,7 @@ + int *speedp; + int dummy; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 20; + int page = 0x23; +@@ -588,7 +588,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + diff --git a/sysutils/cdrtools-devel/files/patch-af b/sysutils/cdrtools-devel/files/patch-af new file mode 100644 index 000000000000..3e6ff143cf50 --- /dev/null +++ b/sysutils/cdrtools-devel/files/patch-af @@ -0,0 +1,89 @@ +--- cdrecord/drv_sony.c.orig Sun Jul 2 23:11:58 2000 ++++ cdrecord/drv_sony.c Fri Aug 18 22:40:38 2000 +@@ -399,12 +399,12 @@ + msf_t msf; + + char mode[256]; +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + struct sony_924_mode_page_22 *xp; + + dummy = get_page22_sony(scgp, mode); + if (dummy >= 0) { +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -572,7 +572,7 @@ + int sectype; + int tracktype; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 0x30; + int page = 0x23; +@@ -590,7 +590,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -613,7 +613,7 @@ + int sectype; + int tracktype; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 0x30; + int page = 0x23; +@@ -635,7 +635,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -707,7 +707,7 @@ + int toctype; + int multi; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int i; + int len = 0x30; +@@ -718,7 +718,7 @@ + if ((len = get_page22_sony(scgp, mode)) < 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -747,7 +747,7 @@ + SCSI *scgp; + char *mode; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + int len = 0x30; + int page = 0x22; + struct sony_924_mode_page_22 *xp; +@@ -764,7 +764,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + diff --git a/sysutils/cdrtools-devel/files/patch-ag b/sysutils/cdrtools-devel/files/patch-ag new file mode 100644 index 000000000000..e1b0f3b748e2 --- /dev/null +++ b/sysutils/cdrtools-devel/files/patch-ag @@ -0,0 +1,20 @@ +--- cdrecord/modes.c.orig Sun May 7 14:49:37 2000 ++++ cdrecord/modes.c Fri Aug 18 22:40:38 2000 +@@ -58,7 +58,7 @@ + int hdlen; + int len = 1; /* Nach SCSI Norm */ + int try = 0; +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + + again: + fillbytes((caddr_t)mode, sizeof(mode), '\0'); +@@ -89,7 +89,7 @@ + scsiprbytes("Mode Sense Data", mode, len - scsigetresid(scgp)); + hdlen = sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len; +- mp = (struct scsi_mode_page_header *)(mode + hdlen); ++ mp = (struct scg_scsi_mode_page_header *)(mode + hdlen); + if (scgp->verbose) + scsiprbytes("Mode Page Data", (u_char *)mp, mp->p_len+2); + diff --git a/sysutils/cdrtools-devel/files/patch-ah b/sysutils/cdrtools-devel/files/patch-ah new file mode 100644 index 000000000000..d9bc5cd64fc0 --- /dev/null +++ b/sysutils/cdrtools-devel/files/patch-ah @@ -0,0 +1,20 @@ +--- libscg/scg/scsireg.h.orig Sun May 28 23:31:20 2000 ++++ libscg/scg/scsireg.h Fri Aug 18 22:40:38 2000 +@@ -244,7 +244,7 @@ + + #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit p_code : 6; + Ucbit res : 1; + Ucbit parsave : 1; +@@ -262,7 +262,7 @@ + + #else /* Motorola byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit parsave : 1; + Ucbit res : 1; + Ucbit p_code : 6; diff --git a/sysutils/cdrtools/files/patch-ae b/sysutils/cdrtools/files/patch-ae new file mode 100644 index 000000000000..03f40b8e9ec0 --- /dev/null +++ b/sysutils/cdrtools/files/patch-ae @@ -0,0 +1,38 @@ +--- cdrecord/drv_philips.c.orig Sun May 7 14:39:57 2000 ++++ cdrecord/drv_philips.c Fri Aug 18 22:40:38 2000 +@@ -518,7 +518,7 @@ + int *speedp; + int dummy; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 16; + int page = 0x31; +@@ -539,7 +539,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -567,7 +567,7 @@ + int *speedp; + int dummy; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 20; + int page = 0x23; +@@ -588,7 +588,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + diff --git a/sysutils/cdrtools/files/patch-af b/sysutils/cdrtools/files/patch-af new file mode 100644 index 000000000000..3e6ff143cf50 --- /dev/null +++ b/sysutils/cdrtools/files/patch-af @@ -0,0 +1,89 @@ +--- cdrecord/drv_sony.c.orig Sun Jul 2 23:11:58 2000 ++++ cdrecord/drv_sony.c Fri Aug 18 22:40:38 2000 +@@ -399,12 +399,12 @@ + msf_t msf; + + char mode[256]; +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + struct sony_924_mode_page_22 *xp; + + dummy = get_page22_sony(scgp, mode); + if (dummy >= 0) { +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -572,7 +572,7 @@ + int sectype; + int tracktype; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 0x30; + int page = 0x23; +@@ -590,7 +590,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -613,7 +613,7 @@ + int sectype; + int tracktype; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int len = 0x30; + int page = 0x23; +@@ -635,7 +635,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -707,7 +707,7 @@ + int toctype; + int multi; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + char mode[256]; + int i; + int len = 0x30; +@@ -718,7 +718,7 @@ + if ((len = get_page22_sony(scgp, mode)) < 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + +@@ -747,7 +747,7 @@ + SCSI *scgp; + char *mode; + { +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + int len = 0x30; + int page = 0x22; + struct sony_924_mode_page_22 *xp; +@@ -764,7 +764,7 @@ + if (len == 0) + return (-1); + +- mp = (struct scsi_mode_page_header *) ++ mp = (struct scg_scsi_mode_page_header *) + (mode + sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len); + diff --git a/sysutils/cdrtools/files/patch-ag b/sysutils/cdrtools/files/patch-ag new file mode 100644 index 000000000000..e1b0f3b748e2 --- /dev/null +++ b/sysutils/cdrtools/files/patch-ag @@ -0,0 +1,20 @@ +--- cdrecord/modes.c.orig Sun May 7 14:49:37 2000 ++++ cdrecord/modes.c Fri Aug 18 22:40:38 2000 +@@ -58,7 +58,7 @@ + int hdlen; + int len = 1; /* Nach SCSI Norm */ + int try = 0; +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + + again: + fillbytes((caddr_t)mode, sizeof(mode), '\0'); +@@ -89,7 +89,7 @@ + scsiprbytes("Mode Sense Data", mode, len - scsigetresid(scgp)); + hdlen = sizeof(struct scsi_mode_header) + + ((struct scsi_mode_header *)mode)->blockdesc_len; +- mp = (struct scsi_mode_page_header *)(mode + hdlen); ++ mp = (struct scg_scsi_mode_page_header *)(mode + hdlen); + if (scgp->verbose) + scsiprbytes("Mode Page Data", (u_char *)mp, mp->p_len+2); + diff --git a/sysutils/cdrtools/files/patch-ah b/sysutils/cdrtools/files/patch-ah new file mode 100644 index 000000000000..d9bc5cd64fc0 --- /dev/null +++ b/sysutils/cdrtools/files/patch-ah @@ -0,0 +1,20 @@ +--- libscg/scg/scsireg.h.orig Sun May 28 23:31:20 2000 ++++ libscg/scg/scsireg.h Fri Aug 18 22:40:38 2000 +@@ -244,7 +244,7 @@ + + #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit p_code : 6; + Ucbit res : 1; + Ucbit parsave : 1; +@@ -262,7 +262,7 @@ + + #else /* Motorola byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit parsave : 1; + Ucbit res : 1; + Ucbit p_code : 6; diff --git a/sysutils/mkisofs-devel/files/patch-bc b/sysutils/mkisofs-devel/files/patch-bc new file mode 100644 index 000000000000..b8e8c1f84a8f --- /dev/null +++ b/sysutils/mkisofs-devel/files/patch-bc @@ -0,0 +1,42 @@ +--- mkisofs/modes.c.orig Sun May 7 14:49:37 2000 ++++ mkisofs/modes.c Thu Aug 17 21:02:57 2000 +@@ -58,7 +58,7 @@ + int hdlen; + int len = 1; /* Nach SCSI Norm */ + int try = 0; +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + + again: + fillbytes((caddr_t)mode, sizeof(mode), '\0'); +@@ -77,7 +77,7 @@ + scgp->silent--; + return (FALSE); + } else { +- len = ((struct scsi_mode_header *)mode)->sense_data_len + 1; ++ len = ((struct scg_scsi_mode_header *)mode)->sense_data_len + 1; + } + if (mode_sense(scgp, mode, len, page, 0) < 0) { /* Page n current */ + scgp->silent--; +@@ -87,9 +87,9 @@ + + if (scgp->verbose) + scsiprbytes("Mode Sense Data", mode, len - scsigetresid(scgp)); +- hdlen = sizeof(struct scsi_mode_header) + +- ((struct scsi_mode_header *)mode)->blockdesc_len; +- mp = (struct scsi_mode_page_header *)(mode + hdlen); ++ hdlen = sizeof(struct scg_scsi_mode_header) + ++ ((struct scg_scsi_mode_header *)mode)->blockdesc_len; ++ mp = (struct scg_scsi_mode_page_header *)(mode + hdlen); + if (scgp->verbose) + scsiprbytes("Mode Page Data", (u_char *)mp, mp->p_len+2); + +@@ -223,7 +223,7 @@ + ((struct scsi_modesel_header *)modep)->sense_data_len = 0; + ((struct scsi_modesel_header *)modep)->res2 = 0; + +- i = ((struct scsi_mode_header *)modep)->blockdesc_len; ++ i = ((struct scg_scsi_mode_header *)modep)->blockdesc_len; + if (i > 0) { + i_to_3_byte( + ((struct scsi_mode_data *)modep)->blockdesc.nlblock, diff --git a/sysutils/mkisofs-devel/files/patch-bd b/sysutils/mkisofs-devel/files/patch-bd new file mode 100644 index 000000000000..12e64251973f --- /dev/null +++ b/sysutils/mkisofs-devel/files/patch-bd @@ -0,0 +1,47 @@ +--- libscg/scg/scsireg.h.orig Sun May 28 23:31:20 2000 ++++ libscg/scg/scsireg.h Thu Aug 17 20:31:45 2000 +@@ -170,7 +170,7 @@ + + #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ + +-struct scsi_mode_header { ++struct scg_scsi_mode_header { + Ucbit sense_data_len : 8; + u_char medium_type; + Ucbit res2 : 4; +@@ -182,7 +182,7 @@ + + #else /* Motorola byteorder */ + +-struct scsi_mode_header { ++struct scg_scsi_mode_header { + Ucbit sense_data_len : 8; + u_char medium_type; + Ucbit write_prot : 1; +@@ -244,7 +244,7 @@ + + #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit p_code : 6; + Ucbit res : 1; + Ucbit parsave : 1; +@@ -262,7 +262,7 @@ + + #else /* Motorola byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit parsave : 1; + Ucbit res : 1; + Ucbit p_code : 6; +@@ -988,7 +988,7 @@ + + + struct scsi_mode_data { +- struct scsi_mode_header header; ++ struct scg_scsi_mode_header header; + struct scsi_mode_blockdesc blockdesc; + union pagex { + struct acb_mode_data acb; diff --git a/sysutils/mkisofs-devel/files/patch-be b/sysutils/mkisofs-devel/files/patch-be new file mode 100644 index 000000000000..422bb3d976fa --- /dev/null +++ b/sysutils/mkisofs-devel/files/patch-be @@ -0,0 +1,33 @@ +--- mkisofs/scsi_cdr.c.orig Sun Jul 2 23:11:23 2000 ++++ mkisofs/scsi_cdr.c Thu Aug 17 21:02:04 2000 +@@ -1791,7 +1791,7 @@ + int secsize; + { + struct scsi_mode_data md; +- int count = sizeof(struct scsi_mode_header) + ++ int count = sizeof(struct scg_scsi_mode_header) + + sizeof(struct scsi_mode_blockdesc); + + (void)test_unit_ready(scgp); /* clear any error situation */ +@@ -2462,8 +2462,8 @@ + return (NULL); + + mp = (struct cd_mode_page_2A *) +- (mode + sizeof(struct scsi_mode_header) + +- ((struct scsi_mode_header *)mode)->blockdesc_len); ++ (mode + sizeof(struct scg_scsi_mode_header) + ++ ((struct scg_scsi_mode_header *)mode)->blockdesc_len); + + /* + * Do some heuristics against pre SCSI-3/mmc VU page 2A +@@ -2481,8 +2481,8 @@ + if (val != 0 && val < 176) + return (NULL); + +- len -= sizeof(struct scsi_mode_header) + +- ((struct scsi_mode_header *)mode)->blockdesc_len; ++ len -= sizeof(struct scg_scsi_mode_header) + ++ ((struct scg_scsi_mode_header *)mode)->blockdesc_len; + if (modep) + mp2 = (struct cd_mode_page_2A *)modep; + else diff --git a/sysutils/mkisofs/files/patch-bc b/sysutils/mkisofs/files/patch-bc new file mode 100644 index 000000000000..b8e8c1f84a8f --- /dev/null +++ b/sysutils/mkisofs/files/patch-bc @@ -0,0 +1,42 @@ +--- mkisofs/modes.c.orig Sun May 7 14:49:37 2000 ++++ mkisofs/modes.c Thu Aug 17 21:02:57 2000 +@@ -58,7 +58,7 @@ + int hdlen; + int len = 1; /* Nach SCSI Norm */ + int try = 0; +- struct scsi_mode_page_header *mp; ++ struct scg_scsi_mode_page_header *mp; + + again: + fillbytes((caddr_t)mode, sizeof(mode), '\0'); +@@ -77,7 +77,7 @@ + scgp->silent--; + return (FALSE); + } else { +- len = ((struct scsi_mode_header *)mode)->sense_data_len + 1; ++ len = ((struct scg_scsi_mode_header *)mode)->sense_data_len + 1; + } + if (mode_sense(scgp, mode, len, page, 0) < 0) { /* Page n current */ + scgp->silent--; +@@ -87,9 +87,9 @@ + + if (scgp->verbose) + scsiprbytes("Mode Sense Data", mode, len - scsigetresid(scgp)); +- hdlen = sizeof(struct scsi_mode_header) + +- ((struct scsi_mode_header *)mode)->blockdesc_len; +- mp = (struct scsi_mode_page_header *)(mode + hdlen); ++ hdlen = sizeof(struct scg_scsi_mode_header) + ++ ((struct scg_scsi_mode_header *)mode)->blockdesc_len; ++ mp = (struct scg_scsi_mode_page_header *)(mode + hdlen); + if (scgp->verbose) + scsiprbytes("Mode Page Data", (u_char *)mp, mp->p_len+2); + +@@ -223,7 +223,7 @@ + ((struct scsi_modesel_header *)modep)->sense_data_len = 0; + ((struct scsi_modesel_header *)modep)->res2 = 0; + +- i = ((struct scsi_mode_header *)modep)->blockdesc_len; ++ i = ((struct scg_scsi_mode_header *)modep)->blockdesc_len; + if (i > 0) { + i_to_3_byte( + ((struct scsi_mode_data *)modep)->blockdesc.nlblock, diff --git a/sysutils/mkisofs/files/patch-bd b/sysutils/mkisofs/files/patch-bd new file mode 100644 index 000000000000..12e64251973f --- /dev/null +++ b/sysutils/mkisofs/files/patch-bd @@ -0,0 +1,47 @@ +--- libscg/scg/scsireg.h.orig Sun May 28 23:31:20 2000 ++++ libscg/scg/scsireg.h Thu Aug 17 20:31:45 2000 +@@ -170,7 +170,7 @@ + + #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ + +-struct scsi_mode_header { ++struct scg_scsi_mode_header { + Ucbit sense_data_len : 8; + u_char medium_type; + Ucbit res2 : 4; +@@ -182,7 +182,7 @@ + + #else /* Motorola byteorder */ + +-struct scsi_mode_header { ++struct scg_scsi_mode_header { + Ucbit sense_data_len : 8; + u_char medium_type; + Ucbit write_prot : 1; +@@ -244,7 +244,7 @@ + + #if defined(_BIT_FIELDS_LTOH) /* Intel byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit p_code : 6; + Ucbit res : 1; + Ucbit parsave : 1; +@@ -262,7 +262,7 @@ + + #else /* Motorola byteorder */ + +-struct scsi_mode_page_header { ++struct scg_scsi_mode_page_header { + Ucbit parsave : 1; + Ucbit res : 1; + Ucbit p_code : 6; +@@ -988,7 +988,7 @@ + + + struct scsi_mode_data { +- struct scsi_mode_header header; ++ struct scg_scsi_mode_header header; + struct scsi_mode_blockdesc blockdesc; + union pagex { + struct acb_mode_data acb; diff --git a/sysutils/mkisofs/files/patch-be b/sysutils/mkisofs/files/patch-be new file mode 100644 index 000000000000..422bb3d976fa --- /dev/null +++ b/sysutils/mkisofs/files/patch-be @@ -0,0 +1,33 @@ +--- mkisofs/scsi_cdr.c.orig Sun Jul 2 23:11:23 2000 ++++ mkisofs/scsi_cdr.c Thu Aug 17 21:02:04 2000 +@@ -1791,7 +1791,7 @@ + int secsize; + { + struct scsi_mode_data md; +- int count = sizeof(struct scsi_mode_header) + ++ int count = sizeof(struct scg_scsi_mode_header) + + sizeof(struct scsi_mode_blockdesc); + + (void)test_unit_ready(scgp); /* clear any error situation */ +@@ -2462,8 +2462,8 @@ + return (NULL); + + mp = (struct cd_mode_page_2A *) +- (mode + sizeof(struct scsi_mode_header) + +- ((struct scsi_mode_header *)mode)->blockdesc_len); ++ (mode + sizeof(struct scg_scsi_mode_header) + ++ ((struct scg_scsi_mode_header *)mode)->blockdesc_len); + + /* + * Do some heuristics against pre SCSI-3/mmc VU page 2A +@@ -2481,8 +2481,8 @@ + if (val != 0 && val < 176) + return (NULL); + +- len -= sizeof(struct scsi_mode_header) + +- ((struct scsi_mode_header *)mode)->blockdesc_len; ++ len -= sizeof(struct scg_scsi_mode_header) + ++ ((struct scg_scsi_mode_header *)mode)->blockdesc_len; + if (modep) + mp2 = (struct cd_mode_page_2A *)modep; + else |