Submitted By: Alexander E. Patrakov
Date: 2006-02-13
Initial Package Version: 2.01
Upstream Status: Knows about a similar RedHat patch, ignores the issue
Origin: Alexander E. Patrakov; RedHat does something very similar
Description: Replaces hard-coded ISO-8859-1 with ASCII approximations
To regenerate:
for F in cdrecord/cdrecord.c cdrecord/diskid.c cdrecord/sector.c \
readcd/readcd.c scgcheck/scgcheck.c scgskeleton/skel.c ; do
LC_ALL=de_DE iconv -f ISO-8859-1 -t US-ASCII//TRANSLIT $F >tmp
mv tmp $F
done
and remove hunks that modify comments.
RedHat converts to UTF-8 instead, but this is unacceptable for LFS because
not everyone uses UTF-8 based locales.
diff -urN cdrtools-2.01.orig/cdrecord/cdrecord.c cdrtools-2.01/cdrecord/cdrecord.c
old
|
new
|
|
297 | 297 | * |
298 | 298 | * Warning: you are not allowed to modify or to remove the |
299 | 299 | * Copyright and version printing code below! |
300 | | * See also GPL § 2 subclause c) |
| 300 | * See also GPL paragraph 2 subclause c) |
301 | 301 | * |
302 | 302 | * If you modify cdrecord you need to include additional version |
303 | 303 | * printing code that: |
… |
… |
|
349 | 349 | # define CLONE_TITLE "" |
350 | 350 | #endif |
351 | 351 | if ((flags & F_MSINFO) == 0 || lverbose || flags & F_VERSION) { |
352 | | printf("Cdrecord%s%s %s (%s-%s-%s) Copyright (C) 1995-2004 Jörg Schilling\n", |
| 352 | printf("Cdrecord%s%s %s (%s-%s-%s) Copyright (C) 1995-2004 Joerg Schilling\n", |
353 | 353 | PRODVD_TITLE, |
354 | 354 | CLONE_TITLE, |
355 | 355 | cdr_version, |
… |
… |
|
1651 | 1651 | error("\t-xamix Subsequent tracks are CD-ROM XA mode 2 form 1/2 - 2332 bytes\n"); |
1652 | 1652 | error("\t-cdi Subsequent tracks are CDI tracks\n"); |
1653 | 1653 | error("\t-isosize Use iso9660 file system size for next data track\n"); |
1654 | | error("\t-preemp Audio tracks are mastered with 50/15 µs preemphasis\n"); |
| 1654 | error("\t-preemp Audio tracks are mastered with 50/15 us preemphasis\n"); |
1655 | 1655 | error("\t-nopreemp Audio tracks are mastered with no preemphasis (default)\n"); |
1656 | 1656 | error("\t-copy Audio tracks have unlimited copy permission\n"); |
1657 | 1657 | error("\t-nocopy Audio tracks may only be copied once for personal use (default)\n"); |
diff -urN cdrtools-2.01.orig/cdrecord/diskid.c cdrtools-2.01/cdrecord/diskid.c
old
|
new
|
|
112 | 112 | LOCAL char m_grandadv[] = "Grand Advance Technology Ltd."; |
113 | 113 | LOCAL char m_digitalstor[] = "DIGITAL STORAGE TECHNOLOGY CO.,LTD"; |
114 | 114 | LOCAL char m_matsushita[] = "Matsushita Electric Industrial Co.,Ltd."; |
115 | | LOCAL char m_albrechts[] = "CDA Datenträger Albrechts GmbH."; |
116 | | LOCAL char m_xalbrechts[] = "??? CDA Datenträger Albrechts GmbH."; |
| 115 | LOCAL char m_albrechts[] = "CDA Datentraeger Albrechts GmbH."; |
| 116 | LOCAL char m_xalbrechts[] = "??? CDA Datentraeger Albrechts GmbH."; |
117 | 117 | |
118 | 118 | LOCAL char m_prodisc[] = "Prodisc Technology Inc."; |
119 | 119 | LOCAL char m_postech[] = "POSTECH Corporation"; |
… |
… |
|
150 | 150 | {{97, 27, 00}, 81, "ILLEGAL OLD CODE: Old Ritek Co.???" }, |
151 | 151 | {{97, 27, 25}, 0, m_ill }, |
152 | 152 | {{97, 30, 00}, 0, m_ill }, |
153 | | {{97, 33, 00}, 82, "ILLEGAL OLD CODE: Old CDA Datenträger Albrechts GmbH." }, |
| 153 | {{97, 33, 00}, 82, "ILLEGAL OLD CODE: Old CDA Datentraeger Albrechts GmbH." }, |
154 | 154 | {{97, 35, 44}, 0, m_ill }, |
155 | 155 | {{97, 39, 00}, 0, m_ill }, |
156 | 156 | {{97, 45, 36}, 83, "ILLEGAL OLD CODE: Old Kodak Photo CD" }, |
diff -urN cdrtools-2.01.orig/cdrecord/sector.c cdrtools-2.01/cdrecord/sector.c
old
|
new
|
|
125 | 125 | break; |
126 | 126 | } |
127 | 127 | if (be_verbose) { |
128 | | printf("Encoding speed : %dx (%d sectors/s) for libedc from Heiko Eißfeldt\n", |
| 128 | printf("Encoding speed : %dx (%d sectors/s) for libedc from Heiko Eissfeldt\n", |
129 | 129 | (i+74)/75, i); |
130 | 130 | } |
131 | 131 | return ((i+74)/75); |
diff -urN cdrtools-2.01.orig/readcd/readcd.c cdrtools-2.01/readcd/readcd.c
old
|
new
|
|
296 | 296 | if (help) |
297 | 297 | usage(0); |
298 | 298 | if (pversion) { |
299 | | printf("readcd %s (%s-%s-%s) Copyright (C) 1987, 1995-2003 Jörg Schilling\n", |
| 299 | printf("readcd %s (%s-%s-%s) Copyright (C) 1987, 1995-2003 Joerg Schilling\n", |
300 | 300 | cdr_version, |
301 | 301 | HOST_CPU, HOST_VENDOR, HOST_OS); |
302 | 302 | exit(0); |
diff -urN cdrtools-2.01.orig/scgcheck/scgcheck.c cdrtools-2.01/scgcheck/scgcheck.c
old
|
new
|
|
129 | 129 | if (help) |
130 | 130 | usage(0); |
131 | 131 | if (pversion) { |
132 | | printf("scgckeck %s (%s-%s-%s) Copyright (C) 1998-2002 Jörg Schilling\n", |
| 132 | printf("scgckeck %s (%s-%s-%s) Copyright (C) 1998-2002 Joerg Schilling\n", |
133 | 133 | scgc_version, |
134 | 134 | HOST_CPU, HOST_VENDOR, HOST_OS); |
135 | 135 | exit(0); |
… |
… |
|
153 | 153 | comerr("Cannot open logfile.\n"); |
154 | 154 | |
155 | 155 | printf("Scgcheck %s (%s-%s-%s) SCSI user level transport library ABI checker.\n\ |
156 | | Copyright (C) 1998,2001 Jörg Schilling\n", |
| 156 | Copyright (C) 1998,2001 Joerg Schilling\n", |
157 | 157 | scgc_version, |
158 | 158 | HOST_CPU, HOST_VENDOR, HOST_OS); |
159 | 159 | fprintf(logfile, "Scgcheck %s (%s-%s-%s) SCSI user level transport library ABI checker.\n\ |
160 | | Copyright (C) 1998,2001 Jörg Schilling\n", |
| 160 | Copyright (C) 1998,2001 Joerg Schilling\n", |
161 | 161 | scgc_version, |
162 | 162 | HOST_CPU, HOST_VENDOR, HOST_OS); |
163 | 163 | /* |
diff -urN cdrtools-2.01.orig/scgskeleton/skel.c cdrtools-2.01/scgskeleton/skel.c
old
|
new
|
|
155 | 155 | if (help) |
156 | 156 | usage(0); |
157 | 157 | if (pversion) { |
158 | | printf("scgskeleton %s (%s-%s-%s) Copyright (C) 1987, 1995-2003 Jörg Schilling\n", |
| 158 | printf("scgskeleton %s (%s-%s-%s) Copyright (C) 1987, 1995-2003 Joerg Schilling\n", |
159 | 159 | skel_version, |
160 | 160 | HOST_CPU, HOST_VENDOR, HOST_OS); |
161 | 161 | exit(0); |