[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Patches] manual/Makefile: fix escaping of PKGVERSION and REPORT_BUGS_TO



crosstool-NG uses 'crosstool-NG @ mercurial-revno' as the default
package version.  This breaks the EGLIBC manuals as '@' starts a
Texinfo command.  Fix by escaping.

I noticed that REPORT_BUGS_TO is broken as well, but in a different
way.  There's a sed that converts @ into the escaped @@ to allow email
style bug URLs, but it applies it to the command as well as the value.

I've converted these to GNU make substitutions instead.  The change is EGLIBC
specific as GLIBC doesn't put the pkgversion in the manual.

-- Michael

Index: libc/ChangeLog.eglibc
===================================================================
--- libc/ChangeLog.eglibc	(revision 15493)
+++ libc/ChangeLog.eglibc	(working copy)
@@ -1,3 +1,8 @@
+2011-10-07  Michael Hope  <michael.hope@xxxxxxxxxx>
+
+	* manual/Makefile (stamp-pkgvers): Escape PKGVERSION.  Fix the
+	escaping of REPORT_BUGS_TO.
+
 2011-09-06  Dr. David Alan Gilbert  <david.gilbert@xxxxxxxxxx>
 
 	* elf/Makefile: Push tst-initorder through cross-test-wrapper.
Index: libc/manual/Makefile
===================================================================
--- libc/manual/Makefile	(revision 15493)
+++ libc/manual/Makefile	(working copy)
@@ -116,9 +116,8 @@
 # Package version and bug reporting URL.
 pkgvers.texi: stamp-pkgvers
 stamp-pkgvers:
-	echo "@set PKGVERSION $(PKGVERSION)" > pkgvers-tmp
-	echo "@set REPORT_BUGS_TO $(REPORT_BUGS_TO)" \
-	  | sed -e 's/@/@@/g' >> pkgvers-tmp
+	echo "@set PKGVERSION $(subst @,@@,$(PKGVERSION))" > pkgvers-tmp
+	echo "@set REPORT_BUGS_TO $(subst @,@@,$(REPORT_BUGS_TO))" >> pkgvers-tmp
 	$(move-if-change) pkgvers-tmp pkgvers.texi
 	touch $@
 

From Maxim_Kuvyrkov@xxxxxxxxxx  Fri Sep 30 03:28:29 2011
Return-Path: <Maxim_Kuvyrkov@xxxxxxxxxx>
Received: from mail.mroute.net (lax-gw17.mailroute.net [199.89.0.117])
	by palom.codesourcery.com (Postfix) with ESMTPS id 05B1312106
	for <patches@xxxxxxxxxx>; Fri, 30 Sep 2011 03:28:28 +0000 (UTC)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by lax-gw17.mroute.net (Postfix) with ESMTP id 1C90967D1ED6
	for <patches@xxxxxxxxxx>; Fri, 30 Sep 2011 03:25:19 +0000 (GMT)
X-Virus-Scanned: by MailRoute
X-Spam-Flag: NO
X-Spam-Score: -2
X-Spam-Score-Int: -2
X-Spam-Score-Float: -2.1
X-Spam-Level: 
X-Spam-Status: No, score=-2.1 tagged_above=-999 tests=[KHOP_RCVD_UNTRUST=0.5, 
	KHOP_THREADED=-0.5, L_P0F_Unix=-1, RCVD_IN_HOSTKARMA_W=-0.1,
	RCVD_IN_HOSTKARMA_WL=-1] autolearn=disabled
X-Amavis-OS-Fingerprint: Solaris 10 (beta) (firewall!), (distance 12, link:
	ethernet/modem), [192.94.38.131:46380]
Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131])
	by lax-gw17.mroute.net (Postfix) with ESMTP id 6B14867D1ECF
	for <patches@xxxxxxxxxx>; Fri, 30 Sep 2011 03:25:18 +0000 (GMT)
Received: from nat-ies.mentorg.com ([192.94.31.2]
	helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp 
	id 1R9Tfq-0000rn-AB from Maxim_Kuvyrkov@xxxxxxxxxx ;
	Thu, 29 Sep 2011 20:22:06 -0700
Received: from localhost.localdomain ([172.16.63.104]) by
	EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); 
	Fri, 30 Sep 2011 04:22:00 +0100
Mime-Version: 1.0 (Apple Message framework v1244.3)
Content-Type: text/plain; charset=iso-8859-1
From: Maxim Kuvyrkov <maxim_kuvyrkov@xxxxxxxxxx>
In-Reply-To: <CAH=+dTSSM+S+TprDhoAnmG31QN90F+-mCyFRyuXaQvrWsV8_TA@xxxxxxxxxxxxxx>
Date: Fri, 30 Sep 2011 16:21:57 +1300
Content-Transfer-Encoding: quoted-printable
Message-Id: <D69E7C11-889D-4090-A27A-81FF5136838B@xxxxxxxxxx>
References: <CAH=+dTSSM+S+TprDhoAnmG31QN90F+-mCyFRyuXaQvrWsV8_TA@xxxxxxxxxxxxxx>
To: Denis Zaitceff <zaitceff@xxxxxxxxx>
X-Mailer: Apple Mail (2.1244.3)
X-OriginalArrivalTime: 30 Sep 2011 03:22:00.0536 (UTC)
	FILETIME=[1DF7C580:01CC7F20]
X-Mailman-Approved-At: Wed, 12 Oct 2011 05:58:12 +0000
Cc: patches@xxxxxxxxxx
Subject: Re: [Patches] [patches] string/strncat.c ca'tbe compiled for some
	archs
X-BeenThere: patches@xxxxxxxxxx
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <patches.eglibc.org>
List-Unsubscribe: <http://eglibc.org/cgi-bin/mailman/options/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=unsubscribe>
List-Archive: <http://eglibc.org/cgi-bin/mailman/private/patches>
List-Post: <mailto:patches@xxxxxxxxxx>
List-Help: <mailto:patches-request@xxxxxxxxxx?subject=help>
List-Subscribe: <http://eglibc.org/cgi-bin/mailman/listinfo/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=subscribe>
X-List-Received-Date: Fri, 30 Sep 2011 03:28:29 -0000

Denis,

It seems your patch was merged to GLIBC on 2011-09-09, and it will find =
its way to EGLIBC with the next merge from GLIBC.

Thank you,

--
Maxim Kuvyrkov
Mentor Graphics


On 23/09/2011, at 3:33 AM, Denis Zaitceff wrote:

> I have sent this trivial patch to libc-alpha, but they are ignoring it
> for 2 months.  Probably it's already ok to send it here?
>=20
> Since has been changed recently string/strncat.c can't be compiled
> anymore for the arch's that have an inline strncat() defined in
> bits/string.h.  The reason is that   #undef strncat   is lost.
>=20
> My case is x86-32 and s390 must be the case too, but I haven't tested =
it.
>=20
> 2011-09-22  Denis Zaitceff  <zaitceff@xxxxxxxxx>
>=20
>       * string/strncat.c (strncat): Undef the symbol in case it has =
been
>       defined in bits/string.h.
>=20
>=20
> --- string/strncat.c
> +++ string/strncat.c
> @@ -25,6 +25,7 @@
> #endif
>=20
> #ifndef STRNCAT
> +# undef           strncat
> # define STRNCAT  strncat
> #endif


From Maxim_Kuvyrkov@xxxxxxxxxx  Wed Oct 12 17:18:05 2011
Return-Path: <Maxim_Kuvyrkov@xxxxxxxxxx>
X-Original-To: patches@xxxxxxxxxx
Delivered-To: patches@xxxxxxxxxx
Received: from mail.mroute.net (lax-gw18.mailroute.net [199.89.0.118])
	by palom.codesourcery.com (Postfix) with ESMTPS id E79E712116
	for <patches@xxxxxxxxxx>; Wed, 12 Oct 2011 17:18:04 +0000 (UTC)
Received: by lax-gw18.mroute.net (Postfix, from userid 89)
	id 25D975839A98; Wed, 12 Oct 2011 05:52:58 +0000 (GMT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by lax-gw18.mroute.net (Postfix) with ESMTP id D3A5E5839B8C
	for <patches@xxxxxxxxxx>; Tue, 11 Oct 2011 04:08:25 +0000 (GMT)
X-Virus-Scanned: by MailRoute
X-X-Spam-Flag: NO
X-X-Spam-Score: -2
X-X-Spam-Score-Int: -2
X-X-Spam-Score-Float: -2.1
X-X-Spam-Level: 
X-X-Spam-Status: No, score=-2.1 tagged_above=-999 tests=[KHOP_RCVD_UNTRUST=0.5,
	KHOP_THREADED=-0.5, L_P0F_Unix=-1, RCVD_IN_HOSTKARMA_W=-0.1,
	RCVD_IN_HOSTKARMA_WL=-1] autolearn=disabled
X-Amavis-OS-Fingerprint: Solaris 10 (beta) (firewall!), (distance 12, link:
	ethernet/modem), [192.94.38.131:52972]
Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131])
	by lax-gw18.mroute.net (Postfix) with ESMTP id A68F85839895
	for <patches@xxxxxxxxxx>; Tue, 11 Oct 2011 04:08:24 +0000 (GMT)
Received: from nat-ies.mentorg.com ([192.94.31.2]
	helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp 
	id 1RDTdf-0000Sv-DZ from Maxim_Kuvyrkov@xxxxxxxxxx 
	for patches@xxxxxxxxxx; Mon, 10 Oct 2011 21:08:23 -0700
Received: from [127.0.0.1] ([172.16.63.104]) by EU1-MAIL.mgc.mentorg.com with
	Microsoft SMTPSVC(6.0.3790.1830); Tue, 11 Oct 2011 05:08:22 +0100
Content-Type: text/plain; charset=iso-8859-1
Mime-Version: 1.0 (Apple Message framework v1244.3)
From: Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxxxx>
In-Reply-To: <CAH=+dTSSM+S+TprDhoAnmG31QN90F+-mCyFRyuXaQvrWsV8_TA@xxxxxxxxxxxxxx>
Date: Tue, 11 Oct 2011 17:08:19 +1300
Content-Transfer-Encoding: quoted-printable
Message-Id: <BAD25FFA-DAC4-48AA-A931-337D7E4130D2@xxxxxxxxxxxxxxxx>
References: <CAH=+dTSSM+S+TprDhoAnmG31QN90F+-mCyFRyuXaQvrWsV8_TA@xxxxxxxxxxxxxx>
To: patches@xxxxxxxxxx
X-Mailer: Apple Mail (2.1244.3)
X-OriginalArrivalTime: 11 Oct 2011 04:08:22.0411 (UTC)
	FILETIME=[6AA375B0:01CC87CB]
Subject: Re: [Patches] [patches] string/strncat.c ca'tbe compiled for some
	archs
X-BeenThere: patches@xxxxxxxxxx
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <patches.eglibc.org>
List-Unsubscribe: <http://eglibc.org/cgi-bin/mailman/options/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=unsubscribe>
List-Archive: <http://eglibc.org/cgi-bin/mailman/private/patches>
List-Post: <mailto:patches@xxxxxxxxxx>
List-Help: <mailto:patches-request@xxxxxxxxxx?subject=help>
List-Subscribe: <http://eglibc.org/cgi-bin/mailman/listinfo/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=subscribe>
X-List-Received-Date: Wed, 12 Oct 2011 17:18:05 -0000

[reposting to the mailing list]

Denis,

It seems your patch was merged to GLIBC on 2011-09-09, and it will find =
its way to EGLIBC with the next merge from GLIBC.

Thank you,

--
Maxim Kuvyrkov
CodeSourcery / Mentor Graphics


On 23/09/2011, at 3:33 AM, Denis Zaitceff wrote:

> I have sent this trivial patch to libc-alpha, but they are ignoring it
> for 2 months.  Probably it's already ok to send it here?
>=20
> Since has been changed recently string/strncat.c can't be compiled
> anymore for the arch's that have an inline strncat() defined in
> bits/string.h.  The reason is that   #undef strncat   is lost.
>=20
> My case is x86-32 and s390 must be the case too, but I haven't tested =
it.
>=20
> 2011-09-22  Denis Zaitceff  <zaitceff@xxxxxxxxx>
>=20
>       * string/strncat.c (strncat): Undef the symbol in case it has =
been
>       defined in bits/string.h.
>=20
>=20
> --- string/strncat.c
> +++ string/strncat.c
> @@ -25,6 +25,7 @@
> #endif
>=20
> #ifndef STRNCAT
> +# undef           strncat
> # define STRNCAT  strncat
> #endif


From Maxim_Kuvyrkov@xxxxxxxxxx  Wed Oct 12 17:18:05 2011
Return-Path: <Maxim_Kuvyrkov@xxxxxxxxxx>
X-Original-To: patches@xxxxxxxxxx
Delivered-To: patches@xxxxxxxxxx
Received: from mail.mroute.net (lax-gw18.mailroute.net [199.89.0.118])
	by palom.codesourcery.com (Postfix) with ESMTPS id DDC7812113
	for <patches@xxxxxxxxxx>; Wed, 12 Oct 2011 17:18:04 +0000 (UTC)
Received: by lax-gw18.mroute.net (Postfix, from userid 89)
	id 78B385839C22; Wed, 12 Oct 2011 05:52:57 +0000 (GMT)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by lax-gw18.mroute.net (Postfix) with ESMTP id 672675839B8E
	for <patches@xxxxxxxxxx>; Tue, 11 Oct 2011 04:24:28 +0000 (GMT)
X-Virus-Scanned: by MailRoute
X-X-Spam-Flag: NO
X-X-Spam-Score: -2
X-X-Spam-Score-Int: -2
X-X-Spam-Score-Float: -2.023
X-X-Spam-Level: 
X-X-Spam-Status: No, score=-2.023 tagged_above=-999
	tests=[KHOP_RCVD_UNTRUST=0.5, KHOP_THREADED=-0.5, L_P0F_Unix=-1,
	RCVD_IN_HOSTKARMA_W=-0.1, RCVD_IN_HOSTKARMA_WL=-1, TW_KG=0.077]
	autolearn=disabled
X-Amavis-OS-Fingerprint: Solaris 10 (beta) (firewall!), (distance 12, link:
	ethernet/modem), [192.94.38.131:54040]
Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131])
	by lax-gw18.mroute.net (Postfix) with ESMTP id C9FCD5839B7D
	for <patches@xxxxxxxxxx>; Tue, 11 Oct 2011 04:24:27 +0000 (GMT)
Received: from nat-ies.mentorg.com ([192.94.31.2]
	helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp 
	id 1RDTtB-0001IQ-T5 from Maxim_Kuvyrkov@xxxxxxxxxx ;
	Mon, 10 Oct 2011 21:24:26 -0700
Received: from [127.0.0.1] ([172.16.63.104]) by EU1-MAIL.mgc.mentorg.com with
	Microsoft SMTPSVC(6.0.3790.1830); Tue, 11 Oct 2011 05:24:24 +0100
Mime-Version: 1.0 (Apple Message framework v1244.3)
Content-Type: text/plain; charset=us-ascii
From: Maxim Kuvyrkov <maxim@xxxxxxxxxxxxxxxx>
In-Reply-To: <8762jyvsta.fsf@xxxxxxxxxx>
Date: Tue, 11 Oct 2011 17:24:21 +1300
Content-Transfer-Encoding: quoted-printable
Message-Id: <DBF56522-CB71-47AC-AA21-3000A93416C7@xxxxxxxxxxxxxxxx>
References: <8762jyvsta.fsf@xxxxxxxxxx>
To: Michael Hope <michael.hope@xxxxxxxxxx>
X-Mailer: Apple Mail (2.1244.3)
X-OriginalArrivalTime: 11 Oct 2011 04:24:24.0708 (UTC)
	FILETIME=[A8365440:01CC87CD]
Cc: patches@xxxxxxxxxx, patches@xxxxxxxxxx
Subject: Re: [Patches] manual/Makefile: fix escaping of PKGVERSION and
	REPORT_BUGS_TO
X-BeenThere: patches@xxxxxxxxxx
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <patches.eglibc.org>
List-Unsubscribe: <http://eglibc.org/cgi-bin/mailman/options/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=unsubscribe>
List-Archive: <http://eglibc.org/cgi-bin/mailman/private/patches>
List-Post: <mailto:patches@xxxxxxxxxx>
List-Help: <mailto:patches-request@xxxxxxxxxx?subject=help>
List-Subscribe: <http://eglibc.org/cgi-bin/mailman/listinfo/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=subscribe>
X-List-Received-Date: Wed, 12 Oct 2011 17:18:05 -0000

On 10/10/2011, at 9:00 AM, Michael Hope wrote:

> crosstool-NG uses 'crosstool-NG @ mercurial-revno' as the default
> package version.  This breaks the EGLIBC manuals as '@' starts a
> Texinfo command.  Fix by escaping.
>=20
> I noticed that REPORT_BUGS_TO is broken as well, but in a different
> way.  There's a sed that converts @ into the escaped @@ to allow email
> style bug URLs, but it applies it to the command as well as the value.
>=20
> I've converted these to GNU make substitutions instead.  The change is =
EGLIBC
> specific as GLIBC doesn't put the pkgversion in the manual.

Michael,

Yeap, you are right, I will check in your patch shortly.

It should fix the overly pessimistic beginning of EGLIBC docs [*] :-).

[*] https://sourcery.mentor.com/GNUToolchain/doc12125/libc.pdf

Thanks for fixing this,

--
Maxim Kuvyrkov
CodeSourcery / Mentor Graphics



From michael.hope@xxxxxxxxxx  Wed Oct 12 17:33:12 2011
Return-Path: <michael.hope@xxxxxxxxxx>
X-Original-To: patches@xxxxxxxxxx
Delivered-To: patches@xxxxxxxxxx
Received: from lax-gw16.mroute.net (lax-gw16.mailroute.net [199.89.0.116])
	by palom.codesourcery.com (Postfix) with ESMTPS id E4A841A407C
	for <patches@xxxxxxxxxx>; Wed, 12 Oct 2011 17:33:11 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by lax-gw16.mroute.net (Postfix) with ESMTP id 5DA7863B0902
	for <patches@xxxxxxxxxx>; Wed, 12 Oct 2011 03:04:03 +0000 (GMT)
X-Virus-Scanned: by MailRoute
X-Spam-Flag: NO
X-Spam-Score: 0
X-Spam-Score-Int: 0
X-Spam-Score-Float: -0.513
X-Spam-Level: 
X-Spam-Status: No, score=-0.513 tagged_above=-999 tests=[KHOP_THREADED=-0.5,
	L_P0F_Linux=-0.1, RCVD_IN_DNSWL_NONE=-0.0001,
	RCVD_IN_HOSTKARMA_YE=0.01, TW_KG=0.077] autolearn=disabled
X-Amavis-OS-Fingerprint: Linux 2.6 (newer, 2) (firewall!) (up: 7891 hrs),
	(distance 11, link: (Google 2)), [74.125.82.47:33444]
Received: from mail-ww0-f47.google.com (mail-ww0-f47.google.com [74.125.82.47])
	(using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by lax-gw16.mroute.net (Postfix) with ESMTPS id DC08363B0374
	for <patches@xxxxxxxxxx>; Wed, 12 Oct 2011 03:04:01 +0000 (GMT)
Received: by wwe5 with SMTP id 5so387521wwe.4
	for <patches@xxxxxxxxxx>; Tue, 11 Oct 2011 20:04:00 -0700 (PDT)
Received: by 10.216.192.35 with SMTP id h35mr2026599wen.9.1318388640119; Tue,
	11 Oct 2011 20:04:00 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.180.7.170 with HTTP; Tue, 11 Oct 2011 20:03:40 -0700 (PDT)
In-Reply-To: <Pine.LNX.4.64.1110111526310.30672@xxxxxxxxxxxxxxxxxxxxxxxx>
References: <8762jyvsta.fsf@xxxxxxxxxx>
	<Pine.LNX.4.64.1110111526310.30672@xxxxxxxxxxxxxxxxxxxxxxxx>
From: Michael Hope <michael.hope@xxxxxxxxxx>
Date: Wed, 12 Oct 2011 16:03:40 +1300
Message-ID: <CANLjY-ndFbtQAnw2SAE_=FmY0Q_xaB+k_vQSQmCAASGJtv4D=g@xxxxxxxxxxxxxx>
To: "Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>
Content-Type: multipart/mixed; boundary=0016e64974d491fe4504af114632
Cc: patches@xxxxxxxxxx, patches@xxxxxxxxxx
Subject: Re: [Patches] manual/Makefile: fix escaping of PKGVERSION and
	REPORT_BUGS_TO
X-BeenThere: patches@xxxxxxxxxx
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <patches.eglibc.org>
List-Unsubscribe: <http://eglibc.org/cgi-bin/mailman/options/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=unsubscribe>
List-Archive: <http://eglibc.org/cgi-bin/mailman/private/patches>
List-Post: <mailto:patches@xxxxxxxxxx>
List-Help: <mailto:patches-request@xxxxxxxxxx?subject=help>
List-Subscribe: <http://eglibc.org/cgi-bin/mailman/listinfo/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=subscribe>
X-List-Received-Date: Wed, 12 Oct 2011 17:33:12 -0000

--0016e64974d491fe4504af114632
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

On Wed, Oct 12, 2011 at 4:28 AM, Joseph S. Myers
<joseph@xxxxxxxxxxxxxxxx> wrote:
> On Mon, 10 Oct 2011, Michael Hope wrote:
>
>> crosstool-NG uses 'crosstool-NG @ mercurial-revno' as the default
>> package version. =A0This breaks the EGLIBC manuals as '@' starts a
>> Texinfo command. =A0Fix by escaping.
>>
>> I noticed that REPORT_BUGS_TO is broken as well, but in a different
>> way. =A0There's a sed that converts @ into the escaped @@ to allow email
>> style bug URLs, but it applies it to the command as well as the value.
>>
>> I've converted these to GNU make substitutions instead. =A0The change is=
 EGLIBC
>> specific as GLIBC doesn't put the pkgversion in the manual.
>
> I see Maxim committed this, but I don't think it's the right approach.
> The autoconf macros used (shared with GCC, binutils etc.) define
> REPORT_BUGS_TEXI, and that's what should be used for the manual.

The attached version defines PKGVERSION_TEXI and uses the *_TEXI
versions in the manual.

-- Michael

--0016e64974d491fe4504af114632
Content-Type: text/x-patch; charset=US-ASCII; name="manual-escape.diff"
Content-Disposition: attachment; filename="manual-escape.diff"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_gtnqjcmg0

SW5kZXg6IGxpYmMvY29uZmlnLm1ha2UuaW4KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbGliYy9jb25maWcubWFr
ZS5pbgkocmV2aXNpb24gMTU1MDgpCisrKyBsaWJjL2NvbmZpZy5tYWtlLmluCSh3b3JraW5nIGNv
cHkpCkBAIC0xNDAsNiArMTQwLDggQEAKIAogIyBQYWNrYWdlIHZlcnNpb25zIGFuZCBidWcgcmVw
b3J0aW5nIGNvbmZpZ3VyYXRpb24uCiBQS0dWRVJTSU9OID0gQFBLR1ZFUlNJT05ACitQS0dWRVJT
SU9OX1RFWEkgPSBAUEtHVkVSU0lPTl9URVhJQAogUkVQT1JUX0JVR1NfVE8gPSBAUkVQT1JUX0JV
R1NfVE9ACitSRVBPUlRfQlVHU19URVhJID0gQFJFUE9SVF9CVUdTX1RFWElACiAKICMgTW9yZSB2
YXJpYWJsZXMgbWF5IGJlIGluc2VydGVkIGJlbG93IGJ5IGNvbmZpZ3VyZS4KSW5kZXg6IGxpYmMv
YWNsb2NhbC5tNAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09Ci0tLSBsaWJjL2FjbG9jYWwubTQJKHJldmlzaW9uIDE1NTA4
KQorKysgbGliYy9hY2xvY2FsLm00CSh3b3JraW5nIGNvcHkpCkBAIC0xMzEsNyArMTMxLDkgQEAK
ICAgICAgZXNhY10sCiAgICAgUEtHVkVSU0lPTj0iKCQxKSAiCiAgICkKKyAgUEtHVkVSU0lPTl9U
RVhJPWBlY2hvICIkUEtHVkVSU0lPTiIgfCBzZWQgJ3MvQC9AQC9nJ2AKICAgQUNfU1VCU1QoUEtH
VkVSU0lPTikKKyAgQUNfU1VCU1QoUEtHVkVSU0lPTl9URVhJKQogXSkKIAogZG5sIFN1cHBvcnQg
dGhlIC0td2l0aC1idWd1cmwgY29uZmlndXJlIG9wdGlvbi4KSW5kZXg6IGxpYmMvbWFudWFsL01h
a2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT0KLS0tIGxpYmMvbWFudWFsL01ha2VmaWxlCShyZXZpc2lvbiAxNTUw
OCkKKysrIGxpYmMvbWFudWFsL01ha2VmaWxlCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYsOSArMTE2
LDggQEAKICMgUGFja2FnZSB2ZXJzaW9uIGFuZCBidWcgcmVwb3J0aW5nIFVSTC4KIHBrZ3ZlcnMu
dGV4aTogc3RhbXAtcGtndmVycwogc3RhbXAtcGtndmVyczoKLQllY2hvICJAc2V0IFBLR1ZFUlNJ
T04gJChzdWJzdCBALEBALCQoUEtHVkVSU0lPTikpIiA+IHBrZ3ZlcnMtdG1wCi0JZWNobyAiQHNl
dCBSRVBPUlRfQlVHU19UTyAkKHN1YnN0IEAsQEAsJChSRVBPUlRfQlVHU19UTykpIiBcCi0JICA+
PiBwa2d2ZXJzLXRtcAorCWVjaG8gIkBzZXQgUEtHVkVSU0lPTiAkKFBLR1ZFUlNJT05fVEVYSSki
ID4gcGtndmVycy10bXAKKwllY2hvICJAc2V0IFJFUE9SVF9CVUdTX1RPICQoUkVQT1JUX0JVR1Nf
VEVYSSkiID4+IHBrZ3ZlcnMtdG1wCiAJJChtb3ZlLWlmLWNoYW5nZSkgcGtndmVycy10bXAgcGtn
dmVycy50ZXhpCiAJdG91Y2ggJEAKIApJbmRleDogbGliYy9jb25maWd1cmUKPT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot
LS0gbGliYy9jb25maWd1cmUJKHJldmlzaW9uIDE1NTA4KQorKysgbGliYy9jb25maWd1cmUJKHdv
cmtpbmcgY29weSkKQEAgLTczMyw2ICs3MzMsNyBAQAogbGliY19jdl9uc3NfY3J5cHQKIFJFUE9S
VF9CVUdTX1RFWEkKIFJFUE9SVF9CVUdTX1RPCitQS0dWRVJTSU9OX1RFWEkKIFBLR1ZFUlNJT04K
IGFsbF93YXJuaW5ncwogZm9yY2VfaW5zdGFsbApAQCAtMzgzMSwxMCArMzgzMiwxMiBAQAogCiBm
aQogCisgIFBLR1ZFUlNJT05fVEVYST1gZWNobyAiJFBLR1ZFUlNJT04iIHwgc2VkICdzL0AvQEAv
ZydgCiAKIAogCiAKKwogIyBDaGVjayB3aGV0aGVyIC0td2l0aC1idWd1cmwgd2FzIGdpdmVuLgog
aWYgdGVzdCAiJHt3aXRoX2J1Z3VybCtzZXR9IiA9IHNldDsgdGhlbgogICB3aXRodmFsPSR3aXRo
X2J1Z3VybDsgY2FzZSAiJHdpdGh2YWwiIGluCkluZGV4OiBsaWJjL0NoYW5nZUxvZy5lZ2xpYmMK
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PQotLS0gbGliYy9DaGFuZ2VMb2cuZWdsaWJjCShyZXZpc2lvbiAxNTUwOCkKKysr
IGxpYmMvQ2hhbmdlTG9nLmVnbGliYwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDExIEBACisy
MDExLTEwLTEyICBNaWNoYWVsIEhvcGUgIDxtaWNoYWVsLmhvcGVAbGluYXJvLm9yZz4KKworCSog
YWNsb2NhbC5tNCAoUEtHVkVSU0lPTl9URVhJKTogRGVmaW5lLgorCSogY29uZmlnLm1ha2UuaW4g
KFBLR1ZFUlNJT05fVEVYSSwgUkVQT1JUX0JVR1NfVEVYSSk6IERlZmluZS4KKwkqIG1hbnVhbC9N
YWtlZmlsZSAoc3RhbXAtcGtndmVycyk6IFVzZSBQS0dWRVJTSU9OX1RFWEkgYW5kCisJUkVQT1JU
X0JVR1NfVEVYSS4KKwkqIGNvbmZpZ3VyZTogUmVnZW5lcmF0ZS4KKwogMjAxMS0xMC0wNyAgTWlj
aGFlbCBIb3BlICA8bWljaGFlbC5ob3BlQGxpbmFyby5vcmc+CiAKIAkqIG1hbnVhbC9NYWtlZmls
ZSAoc3RhbXAtcGtndmVycyk6IEVzY2FwZSBQS0dWRVJTSU9OLiAgRml4IHRoZQo=
--0016e64974d491fe4504af114632--

From joseph_myers@xxxxxxxxxx  Wed Oct 12 17:33:06 2011
Return-Path: <joseph_myers@xxxxxxxxxx>
X-Original-To: patches@xxxxxxxxxx
Delivered-To: patches@xxxxxxxxxx
Received: from lax-gw16.mroute.net (lax-gw16.mailroute.net [199.89.0.116])
	by palom.codesourcery.com (Postfix) with ESMTPS id E269D1A407A
	for <patches@xxxxxxxxxx>; Wed, 12 Oct 2011 17:33:05 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by lax-gw16.mroute.net (Postfix) with ESMTP id 8945C63B0AAF
	for <patches@xxxxxxxxxx>; Tue, 11 Oct 2011 15:28:12 +0000 (GMT)
X-Virus-Scanned: by MailRoute
X-Spam-Flag: NO
X-Spam-Score: -2
X-Spam-Score-Int: -2
X-Spam-Score-Float: -2.023
X-Spam-Level: 
X-Spam-Status: No, score=-2.023 tagged_above=-999
	tests=[KHOP_RCVD_UNTRUST=0.5, KHOP_THREADED=-0.5, L_P0F_Unix=-1,
	RCVD_IN_HOSTKARMA_W=-0.1, RCVD_IN_HOSTKARMA_WL=-1, TW_KG=0.077]
	autolearn=disabled
X-Amavis-OS-Fingerprint: Solaris 10 (beta) (firewall!), (distance 12, link:
	ethernet/modem), [192.94.38.131:47271]
Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131])
	by lax-gw16.mroute.net (Postfix) with ESMTP id E7D8563B0320
	for <patches@xxxxxxxxxx>; Tue, 11 Oct 2011 15:28:11 +0000 (GMT)
Received: from nat-ies.mentorg.com ([192.94.31.2]
	helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp 
	id 1RDeFW-00063C-DD from joseph_myers@xxxxxxxxxx ;
	Tue, 11 Oct 2011 08:28:10 -0700
Received: from digraph.polyomino.org.uk ([172.16.63.104]) by
	EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); 
	Tue, 11 Oct 2011 16:28:08 +0100
Received: from jsm28 (helo=localhost)
	by digraph.polyomino.org.uk with local-esmtp (Exim 4.74)
	(envelope-from <joseph@xxxxxxxxxxxxxxxx>)
	id 1RDeFT-0000lP-K7; Tue, 11 Oct 2011 15:28:07 +0000
Date: Tue, 11 Oct 2011 15:28:07 +0000 (UTC)
From: "Joseph S. Myers" <joseph@xxxxxxxxxxxxxxxx>
X-X-Sender: jsm28@xxxxxxxxxxxxxxxxxxxxxxxx
To: Michael Hope <michael.hope@xxxxxxxxxx>
In-Reply-To: <8762jyvsta.fsf@xxxxxxxxxx>
Message-ID: <Pine.LNX.4.64.1110111526310.30672@xxxxxxxxxxxxxxxxxxxxxxxx>
References: <8762jyvsta.fsf@xxxxxxxxxx>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
Sender: Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
X-OriginalArrivalTime: 11 Oct 2011 15:28:09.0276 (UTC)
	FILETIME=[618127C0:01CC882A]
X-Mailman-Approved-At: Thu, 13 Oct 2011 15:43:21 +0000
Cc: patches@xxxxxxxxxx, patches@xxxxxxxxxx
Subject: Re: [Patches] manual/Makefile: fix escaping of PKGVERSION and
 REPORT_BUGS_TO
X-BeenThere: patches@xxxxxxxxxx
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <patches.eglibc.org>
List-Unsubscribe: <http://eglibc.org/cgi-bin/mailman/options/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=unsubscribe>
List-Archive: <http://eglibc.org/cgi-bin/mailman/private/patches>
List-Post: <mailto:patches@xxxxxxxxxx>
List-Help: <mailto:patches-request@xxxxxxxxxx?subject=help>
List-Subscribe: <http://eglibc.org/cgi-bin/mailman/listinfo/patches>,
	<mailto:patches-request@xxxxxxxxxx?subject=subscribe>
X-List-Received-Date: Wed, 12 Oct 2011 17:33:06 -0000

On Mon, 10 Oct 2011, Michael Hope wrote:

> crosstool-NG uses 'crosstool-NG @ mercurial-revno' as the default
> package version.  This breaks the EGLIBC manuals as '@' starts a
> Texinfo command.  Fix by escaping.
> 
> I noticed that REPORT_BUGS_TO is broken as well, but in a different
> way.  There's a sed that converts @ into the escaped @@ to allow email
> style bug URLs, but it applies it to the command as well as the value.
> 
> I've converted these to GNU make substitutions instead.  The change is EGLIBC
> specific as GLIBC doesn't put the pkgversion in the manual.

I see Maxim committed this, but I don't think it's the right approach.  
The autoconf macros used (shared with GCC, binutils etc.) define 
REPORT_BUGS_TEXI, and that's what should be used for the manual.

-- 
Joseph S. Myers
joseph@xxxxxxxxxxxxxxxx