From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by mail.openembedded.org (Postfix) with ESMTP id 6C26A60670 for ; Wed, 29 Oct 2014 11:15:31 +0000 (UTC) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.14.9/8.14.5) with ESMTP id s9TBFVjo010528 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL) for ; Wed, 29 Oct 2014 04:15:32 -0700 (PDT) Received: from [128.224.162.231] (128.224.162.231) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server (TLS) id 14.3.174.1; Wed, 29 Oct 2014 04:15:31 -0700 Message-ID: <5450CC50.1040809@windriver.com> Date: Wed, 29 Oct 2014 19:15:28 +0800 From: Kang Kai User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.4.0 MIME-Version: 1.0 To: References: <1414580771-32464-1-git-send-email-kai.kang@windriver.com> <1414580771-32464-2-git-send-email-kai.kang@windriver.com> In-Reply-To: <1414580771-32464-2-git-send-email-kai.kang@windriver.com> X-Originating-IP: [128.224.162.231] Subject: Re: [PATCH 2/2] python-2.7.3:remove BOM insertion code X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 11:15:43 -0000 Content-Type: text/plain; charset="UTF-8"; format=flowed Content-Transfer-Encoding: 8bit On 2014年10月29日 19:06, Kai Kang wrote: > Backport patch from: > https://hg.python.org/cpython/rev/af46a001d5ec > > SysLogHandler converts message to utf8 and adds BOM, supposedly > to conform with RFC5424, but the implementation is broken: > the RFC specifies that the BOM should prefix only unstructured > message part, but current Python implementation puts it in the > middle of structured part, thus confusing RFC-compliant receivers. > > Signed-off-by: yzhu1 > Signed-off-by: Kai Kang > --- > .../python/python/remove-BOM-insection-code.patch | 24 ++++++++++++++++++++++ > meta/recipes-devtools/python/python_2.7.3.bb | 1 + > 2 files changed, 25 insertions(+) > create mode 100644 meta/recipes-devtools/python/python/remove-BOM-insection-code.patch > > diff --git a/meta/recipes-devtools/python/python/remove-BOM-insection-code.patch b/meta/recipes-devtools/python/python/remove-BOM-insection-code.patch > new file mode 100644 > index 0000000..6c96e30 > --- /dev/null > +++ b/meta/recipes-devtools/python/python/remove-BOM-insection-code.patch > @@ -0,0 +1,24 @@ > +# HG changeset patch > +# User Vinay Sajip > +# Date 1334583503 -3600 > +# Node ID af46a001d5eca99a7ff44ed18256c235c5c3f1d0 > +# Parent 33bc53e0aa9ea42c6a6bb077d182e62c8c569aa1 > +Issue #14452: remove BOM insertion code. > + > +Backport from https://hg.python.org/cpython/rev/af46a001d5ec. > + > +Upstream-Status: Pending Oops. Please ignore this thread. V2 will be sent. --Kai > +Signed-off-by: Kai Kang > +--- > +diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py > +--- a/Lib/logging/handlers.py > ++++ b/Lib/logging/handlers.py > +@@ -821,8 +821,6 @@ class SysLogHandler(logging.Handler): > + # Message is a string. Convert to bytes as required by RFC 5424 > + if type(msg) is unicode: > + msg = msg.encode('utf-8') > +- if codecs: > +- msg = codecs.BOM_UTF8 + msg > + msg = prio + msg > + try: > + if self.unixsocket: > diff --git a/meta/recipes-devtools/python/python_2.7.3.bb b/meta/recipes-devtools/python/python_2.7.3.bb > index cc92ebc..f2e6fde 100644 > --- a/meta/recipes-devtools/python/python_2.7.3.bb > +++ b/meta/recipes-devtools/python/python_2.7.3.bb > @@ -38,6 +38,7 @@ SRC_URI += "\ > file://python-2.7.3-CVE-2014-1912.patch \ > file://json-flaw-fix.patch \ > file://posix_close.patch \ > + file://remove-BOM-insection-code.patch \ > " > > S = "${WORKDIR}/Python-${PV}" -- Regards, Neil | Kai Kang