NetBSD Problem Report #34515
From ggm@garlique.algebras.org Wed Sep 13 06:04:33 2006
Return-Path: <ggm@garlique.algebras.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
by narn.NetBSD.org (Postfix) with ESMTP id A330E63B84D
for <gnats-bugs@gnats.NetBSD.org>; Wed, 13 Sep 2006 06:04:32 +0000 (UTC)
Message-Id: <20060913042637.1AEDD2B37@garlique.algebras.org>
Date: Wed, 13 Sep 2006 14:26:37 +1000 (EST)
From: ggm@pobox.com
Reply-To: ggm@pobox.com
To: gnats-bugs@NetBSD.org
Subject: patches to audio/id3lib to fix unicode writing issue for easytag
X-Send-Pr-Version: 3.95
>Number: 34515
>Category: pkg
>Synopsis: patches for audio/id3lib to fix unicode writing
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: pkg-manager
>State: closed
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Wed Sep 13 06:05:00 +0000 2006
>Closed-Date: Wed Sep 13 12:17:01 +0000 2006
>Last-Modified: Wed Sep 13 12:17:01 +0000 2006
>Originator: George Michaelson
>Release: NetBSD 4.99.1
>Organization:
George Michaelson email: ggm@apnic.net
Senior Technical Officer, APNIC sip: ggm@voip.apnic.net
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:/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>
+
+ * 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;
+ }
>Release-Note:
>Audit-Trail:
From: Ben Collver <ben@netbsd.org>
To: gnats-bugs@NetBSD.org
Cc:
Subject: PR/34515 CVS commit: pkgsrc/audio/id3lib
Date: Wed, 13 Sep 2006 12:06:28 +0000 (UTC)
Module Name: pkgsrc
Committed By: ben
Date: Wed Sep 13 12:06:28 UTC 2006
Modified Files:
pkgsrc/audio/id3lib: Makefile distinfo
Added Files:
pkgsrc/audio/id3lib/patches: patch-ah patch-ai
Log Message:
Fix the writing of unicode tags. bump pkgrevision. Addresses PR#34515.
http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
Patch adapted for pkgsrc by George Michaelson.
To generate a diff of this commit:
cvs rdiff -r1.24 -r1.25 pkgsrc/audio/id3lib/Makefile
cvs rdiff -r1.11 -r1.12 pkgsrc/audio/id3lib/distinfo
cvs rdiff -r0 -r1.3 pkgsrc/audio/id3lib/patches/patch-ah \
pkgsrc/audio/id3lib/patches/patch-ai
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
State-Changed-From-To: open->closed
State-Changed-By: ben@netbsd.org
State-Changed-When: Wed, 13 Sep 2006 12:17:01 +0000
State-Changed-Why:
Applied supplied patches, thank you for this PR!
bumped pkgrevision
had to apply patches by hand.
>Unformatted:
(Contact us)
$NetBSD: query-full-pr,v 1.51 2026/08/10 02:28:17 riastradh Exp $
$NetBSD: gnats_config.sh,v 1.10 2026/05/13 22:00:09 riastradh Exp $
Copyright © 1994-2026
The NetBSD Foundation, Inc. ALL RIGHTS RESERVED.