pkg/34515: patches to audio/id3lib to fix unicode writing issue for easytag

[ggm%pobox.com@localhost]

>Number:         34515
>Category:       pkg
>Synopsis:       patches for audio/id3lib to fix unicode writing
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Wed Sep 13 06:05:00 +0000 2006
>Originator:     George Michaelson
>Release:        NetBSD 4.99.1
>Organization:
George Michaelson                      email:           ggm%apnic.net@localhost
Senior Technical Officer, APNIC          sip:      ggm%voip.apnic.net@localhost
http://www.apnic.net                   phone:         +61 7 3858 3100
>Environment:
        
        
System: NetBSD garlique.algebras.org 4.99.1 NetBSD 4.99.1 (GGM_ACPI) #2: Mon 
Sep 11 11:11:03 EST 2006 
ggm%garlique.algebras.org@localhost:/data/Build/obj/usr/src/sys/arch/i386/compile/GGM_ACPI
 i386
Architecture: i386
Machine: i386
>Description:
        easytag reports a recommended patch to fix unicode writing of tags.
        I have re-factored it as a NetBSD patchset on id3lib.
>How-To-Repeat:
        install easytag-devel, run in unicode enabled mode.
>Fix:
apply this patchset to pkgsrc/audio/id3lib. its made with cvs diff -u -N

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/audio/id3lib/distinfo,v
retrieving revision 1.11
diff -u -p -u -r1.11 distinfo
--- distinfo    23 Feb 2005 20:39:47 -0000      1.11
+++ distinfo    13 Sep 2006 04:22:56 -0000
@@ -6,3 +6,5 @@ Size (id3lib-3.8.3.tar.gz) = 950726 byte
 SHA1 (patch-aa) = 75b19258eeaeb65aa2fa43cd44769aa1d6e575c3
 SHA1 (patch-af) = 0266e9220791b7b14a35dc9b7564ab75cbc6562b
 SHA1 (patch-ag) = a047fe90d83c88e0f6d0a6a0595a440ef49276e3
+SHA1 (patch-ah) = 86386302fbe7bc3406887fb97c4f20326fdae864
+SHA1 (patch-ai) = 00cc0249e681eabd63e92476980e49884a8d3a65
Index: patches/patch-ah
===================================================================
RCS file: patches/patch-ah
diff -N patches/patch-ah
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ah    13 Sep 2006 04:22:56 -0000
@@ -0,0 +1,11 @@
+--- ChangeLog.orig     2003-03-02 10:23:00.000000000 +1000
++++ ChangeLog  2006-09-13 14:01:06.000000000 +1000
+@@ -1,3 +1,8 @@
++2006-02-17  Jerome Couderc
++
++    * Patch from Spoon to fix UTF-16 writing bug
++      
http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++
+ 2003-03-02 Sunday 17:38   Thijmen Klok <thijmen%id3lib.org@localhost>
+ 
+       * THANKS (1.20): added more people 
Index: patches/patch-ai
===================================================================
RCS file: patches/patch-ai
diff -N patches/patch-ai
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ai    13 Sep 2006 04:22:56 -0000
@@ -0,0 +1,26 @@
+--- src/io_helpers.cpp.orig    2003-03-02 10:23:00.000000000 +1000
++++ src/io_helpers.cpp 2006-09-13 14:01:16.000000000 +1000
+@@ -363,11 +363,22 @@
+     // Write the BOM: 0xFEFF
+     unicode_t BOM = 0xFEFF;
+     writer.writeChars((const unsigned char*) &BOM, 2);
++    // Patch from Spoon : 2004-08-25 14:17
++    //   
http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++    // Wrong code
++    //for (size_t i = 0; i < size; i += 2)
++    //{
++    //  unicode_t ch = (data[i] << 8) | data[i+1];
++    //  writer.writeChars((const unsigned char*) &ch, 2);
++    //}
++    // Right code
++    unsigned char *pdata = (unsigned char *) data.c_str();
+     for (size_t i = 0; i < size; i += 2)
+     {
+-      unicode_t ch = (data[i] << 8) | data[i+1];
++      unicode_t ch = (pdata[i] << 8) | pdata[i+1];
+       writer.writeChars((const unsigned char*) &ch, 2);
+     }
++    // End patch
+   }
+   return writer.getCur() - beg;
+ }

>Unformatted: