Ticket #2011: cdrtools-2.01-ascii-1.patch

File cdrtools-2.01-ascii-1.patch, 5.9 KB (added by andy@…, 19 years ago)

fixed cdrtools-2.01-ascii.patch

  • TabularUnified cdrecord/cdrecord.c

    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  
    297297         *
    298298         * Warning: you are not allowed to modify or to remove the
    299299         * Copyright and version printing code below!
    300          * See also GPL § 2 subclause c)
     300         * See also GPL paragraph 2 subclause c)
    301301         *
    302302         * If you modify cdrecord you need to include additional version
    303303         * printing code that:
     
    349349#       define  CLONE_TITLE     ""
    350350#endif
    351351        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",
    353353                                                                PRODVD_TITLE,
    354354                                                                CLONE_TITLE,
    355355                                                                cdr_version,
     
    16511651        error("\t-xamix         Subsequent tracks are CD-ROM XA mode 2 form 1/2 - 2332 bytes\n");
    16521652        error("\t-cdi           Subsequent tracks are CDI tracks\n");
    16531653        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");
    16551655        error("\t-nopreemp      Audio tracks are mastered with no preemphasis (default)\n");
    16561656        error("\t-copy          Audio tracks have unlimited copy permission\n");
    16571657        error("\t-nocopy                Audio tracks may only be copied once for personal use (default)\n");
  • TabularUnified cdrecord/diskid.c

    diff -urN cdrtools-2.01.orig/cdrecord/diskid.c cdrtools-2.01/cdrecord/diskid.c
    old new  
    112112LOCAL   char    m_grandadv[]    = "Grand Advance Technology Ltd.";
    113113LOCAL   char    m_digitalstor[] = "DIGITAL STORAGE TECHNOLOGY CO.,LTD";
    114114LOCAL   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.";
     115LOCAL   char    m_albrechts[]   = "CDA Datentraeger Albrechts GmbH.";
     116LOCAL   char    m_xalbrechts[]  = "??? CDA Datentraeger Albrechts GmbH.";
    117117
    118118LOCAL   char    m_prodisc[]     = "Prodisc Technology Inc.";
    119119LOCAL   char    m_postech[]     = "POSTECH Corporation";
     
    150150        {{97, 27, 00}, 81, "ILLEGAL OLD CODE: Old Ritek Co.???" },
    151151        {{97, 27, 25},  0, m_ill },
    152152        {{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." },
    154154        {{97, 35, 44},  0, m_ill },
    155155        {{97, 39, 00},  0, m_ill },
    156156        {{97, 45, 36}, 83, "ILLEGAL OLD CODE: Old Kodak Photo CD" },
  • TabularUnified cdrecord/sector.c

     
    diff -urN cdrtools-2.01.orig/cdrecord/sector.c cdrtools-2.01/cdrecord/sector.c
    old new  
    125125                        break;
    126126        }
    127127        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",
    129129                                (i+74)/75, i);
    130130        }
    131131        return ((i+74)/75);
  • TabularUnified readcd/readcd.c

    diff -urN cdrtools-2.01.orig/readcd/readcd.c cdrtools-2.01/readcd/readcd.c
    old new  
    296296        if (help)
    297297                usage(0);
    298298        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",
    300300                                                                cdr_version,
    301301                                                                HOST_CPU, HOST_VENDOR, HOST_OS);
    302302                exit(0);
  • TabularUnified scgcheck/scgcheck.c

    diff -urN cdrtools-2.01.orig/scgcheck/scgcheck.c cdrtools-2.01/scgcheck/scgcheck.c
    old new  
    129129        if (help)
    130130                usage(0);
    131131        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",
    133133                                                                scgc_version,
    134134                                                                HOST_CPU, HOST_VENDOR, HOST_OS);
    135135                exit(0);
     
    153153                comerr("Cannot open logfile.\n");
    154154
    155155        printf("Scgcheck %s (%s-%s-%s) SCSI user level transport library ABI checker.\n\
    156 Copyright (C) 1998,2001 Jörg Schilling\n",
     156Copyright (C) 1998,2001 Joerg Schilling\n",
    157157                                                scgc_version,
    158158                                                HOST_CPU, HOST_VENDOR, HOST_OS);
    159159        fprintf(logfile, "Scgcheck %s (%s-%s-%s) SCSI user level transport library ABI checker.\n\
    160 Copyright (C) 1998,2001 Jörg Schilling\n",
     160Copyright (C) 1998,2001 Joerg Schilling\n",
    161161                                                scgc_version,
    162162                                                HOST_CPU, HOST_VENDOR, HOST_OS);
    163163        /*
  • TabularUnified scgskeleton/skel.c

    diff -urN cdrtools-2.01.orig/scgskeleton/skel.c cdrtools-2.01/scgskeleton/skel.c
    old new  
    155155        if (help)
    156156                usage(0);
    157157        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",
    159159                                                                skel_version,
    160160                                                                HOST_CPU, HOST_VENDOR, HOST_OS);
    161161                exit(0);