From MAILER-DAEMON Tue Sep 01 07:28:18 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZWjje-0003dj-JE
for mharc-bug-gnulib@gnu.org; Tue, 01 Sep 2015 07:28:18 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55327)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from
) id 1ZWjja-0003ce-Tw
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 07:28:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from
) id 1ZWjjP-0000F7-Uk
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 07:28:14 -0400
Received: from mx1.redhat.com ([209.132.183.28]:42004)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from
) id 1ZWjjP-0000Ef-Mq
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 07:28:03 -0400
Received: from int-mx13.intmail.prod.int.phx2.redhat.com
(int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26])
by mx1.redhat.com (Postfix) with ESMTPS id 172CD14AAA;
Tue, 1 Sep 2015 11:28:02 +0000 (UTC)
Received: from localhost.localdomain.com (ovpn-116-130.ams2.redhat.com
[10.36.116.130])
by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP
id t81BS0B8012561; Tue, 1 Sep 2015 07:28:01 -0400
From: =?UTF-8?q?P=C3=A1draig=20Brady?=
To: bug-gnulib@gnu.org
Subject: [PATCH] base32: mark function as __attribute__ const
Date: Tue, 1 Sep 2015 12:27:57 +0100
Message-Id: <1441106877-31378-1-git-send-email-P@draigBrady.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=y
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 209.132.183.28
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 01 Sep 2015 11:28:16 -0000
* lib/base32.h (isbase32): Mark __attribute__ const as
suggested by GCC, and consistent with the base64 module.
---
ChangeLog | 6 ++++++
lib/base32.h | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index 7384900..cfefa5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-01 P=C3=A1draig Brady
+
+ base32: mark function as __attribute__ const
+ * lib/base32.h (isbase32): Mark __attribute__ const as
+ suggested by GCC, and consistent with the base64 module.
+
2015-08-20 Daiki Ueno
=20
gnulib-tool: don't transform binary files with sed
diff --git a/lib/base32.h b/lib/base32.h
index f2cc060..7787da9 100644
--- a/lib/base32.h
+++ b/lib/base32.h
@@ -34,7 +34,7 @@ struct base32_decode_context
char buf[8];
};
=20
-extern bool isbase32 (char ch);
+extern bool isbase32 (char ch) _GL_ATTRIBUTE_CONST;
=20
extern void base32_encode (const char *restrict in, size_t inlen,
char *restrict out, size_t outlen);
--=20
2.4.1
From MAILER-DAEMON Tue Sep 01 14:09:25 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZWpzp-0000xM-BO
for mharc-bug-gnulib@gnu.org; Tue, 01 Sep 2015 14:09:25 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46150)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZWpPQ-0006Ge-7d
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 13:31:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZWpPL-0004Nd-7m
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 13:31:48 -0400
Received: from script.cs.helsinki.fi ([128.214.11.1]:34582)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZWpPK-0004KU-U3
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 13:31:43 -0400
X-DKIM: Courier DKIM Filter v0.50+pk-2015-04-12 mail.cs.helsinki.fi Tue,
01 Sep 2015 20:31:38 +0300
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.helsinki.fi;
h=mime-version:date:content-type:message-id:from:subject:to; s=
dkim20130528; bh=xNsDYCk0PFIe1VKnRCrbALdHBz7QkCSE3o6dbl8oqm4=; b=
P7KyX46/U32pTuL5EG4lhbdzi65IhMo/AFH1w+KiHTrQiFjZNkRx7tM22SoJfgFC
lYzblp10DWeMhkO1m3G1uoOf0uGTqSd5FhwE3NFbzkA3VMMKtYpQnv+qMaKTtRSb
SisROVq+vAZrH2zVQ2f4HVkDuUugW32BcJN+xGZaKR4=
Received: from webmail.cs.helsinki.fi (svm-32.cs.helsinki.fi [128.214.166.232])
(AUTH: PLAIN rodionef, TLS: TLSv1/SSLv3,256bits,AES256-SHA)
by mail.cs.helsinki.fi with ESMTPSA; Tue, 01 Sep 2015 20:31:38 +0300
id 00000000005A0033.0000000055E5E0FA.00001219
MIME-Version: 1.0
Date: Tue, 01 Sep 2015 17:31:38 +0000
Content-Type: multipart/alternative;
boundary="----=_Part_321_590292395.1441128698"
Message-ID: <08b0cad40c5de87e4c0847e701ab0e30@webmail.cs.helsinki.fi>
X-Mailer: AfterLogic webmail client
From: "Rodion Efremov"
Subject: [More sorting algorithms for gnulib]
To: bug-gnulib@gnu.org
X-Priority: 3 (Normal)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 128.214.11.1
X-Mailman-Approved-At: Tue, 01 Sep 2015 14:09:24 -0400
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 01 Sep 2015 17:31:50 -0000
------=_Part_321_590292395.1441128698
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: Quoted-Printable
Hello, everybody.=0A=0AI just found gnulib, and would like to inquire whe=
ther there is a need for more sorting algorithms. So far I have implement=
ed natural merge sorts (both parallel and sequential) and MSD radix sorts=
for integer key arrays (both parallel and sequential once again). Unfort=
unately, they all are in Java, yet, fortunately, it should not be hard to=
rewrite them in C.=0A=0ABest regards,=0Arodde
------=_Part_321_590292395.1441128698
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: Quoted-Printable
=0A
Hello, everybody.
I just found g=
nulib, and would like to inquire whether there is a need for more sorting=
algorithms. So far I have implemented natural merge sorts (both parallel=
and sequential) and MSD radix sorts for integer key arrays (both paralle=
l and sequential once again). Unfortunately, they all are in Java, yet, f=
ortunately, it should not be hard to rewrite them in C.
Best regar=
ds,
rodde
=0A
------=_Part_321_590292395.1441128698--
From MAILER-DAEMON Tue Sep 01 14:09:27 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZWpzr-00010K-HC
for mharc-bug-gnulib@gnu.org; Tue, 01 Sep 2015 14:09:27 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:49970)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZWpYK-0005ci-93
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 13:41:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZWpYF-00023E-Pt
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 13:41:00 -0400
Received: from script.cs.helsinki.fi ([128.214.11.1]:53626)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZWpYF-00022h-Am
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 13:40:55 -0400
X-DKIM: Courier DKIM Filter v0.50+pk-2015-04-12 mail.cs.helsinki.fi Tue,
01 Sep 2015 20:40:52 +0300
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cs.helsinki.fi;
h=mime-version:date:content-type:message-id:from:subject:to; s=
dkim20130528; bh=Rjj0zKiZxq/pCrQVKaiq+b33qz8vxaj3D8d2gZXVh4M=; b=
YjLQg5dJUGXoSztqZlcoomjEJ9MM0QJSMGfQ35wlchvrjDQKNgvwgYILrsANqWIS
UlKoFh47OKQS/GDyLAJlMKGdJUFt1pMbTW9+GW9qR9+QupYYU9QpfVfJ3GbUsaEh
TfVokg1ThI+7eeQLKwzCTxsZg2G/g7IJQS8jY1RsJjw=
Received: from webmail.cs.helsinki.fi (svm-32.cs.helsinki.fi [128.214.166.232])
(AUTH: PLAIN rodionef, TLS: TLSv1/SSLv3,256bits,AES256-SHA)
by mail.cs.helsinki.fi with ESMTPSA; Tue, 01 Sep 2015 20:40:52 +0300
id 00000000005A0038.0000000055E5E324.00004D44
MIME-Version: 1.0
Date: Tue, 01 Sep 2015 17:40:52 +0000
Content-Type: multipart/alternative;
boundary="----=_Part_644_246206764.1441129252"
Message-ID:
X-Mailer: AfterLogic webmail client
From: "Rodion Efremov"
Subject: [More sorting routines needed?]
To: bug-gnulib@gnu.org
X-Priority: 3 (Normal)
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 128.214.11.1
X-Mailman-Approved-At: Tue, 01 Sep 2015 14:09:25 -0400
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 01 Sep 2015 17:41:01 -0000
------=_Part_644_246206764.1441129252
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: Quoted-Printable
Hello, everybody.=0A=0AI just found gnulib, and would like to inquire whe=
ther there is a need for more sorting algorithms. So far I have implement=
ed natural merge sorts (both parallel and sequential) and MSD radix sorts=
for integer key arrays (both parallel and sequential once again). Unfort=
unately, they all are in Java, yet, fortunately, it should not be hard to=
rewrite them in C. So what do you about that?=0A=0ABest regards,=0Arodde=
=0A=0APS. This might be a second trial for posting to the list. If so, so=
rry about any inconvenience.
------=_Part_644_246206764.1441129252
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: Quoted-Printable
Hello, everybody.
I just found gnulib, and would like to inquire =0Awhether there is a nee=
d for more sorting algorithms. So far I have =0Aimplemented natural merge=
sorts (both parallel and sequential) and MSD =0Aradix sorts for integer =
key arrays (both parallel and sequential once =0Aagain). Unfortunately, t=
hey all are in Java, yet, fortunately, it should=0A not be hard to rewrit=
e them in C. So what do you about that?
Best regards,
rodde
=
PS. This might be a second trial for posting to the list. If so, sorr=
y about any inconvenience.
------=_Part_644_246206764.1441129252--
From MAILER-DAEMON Tue Sep 01 15:10:33 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZWqwz-0006AA-P5
for mharc-bug-gnulib@gnu.org; Tue, 01 Sep 2015 15:10:33 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41399)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZWqwx-00069k-JT
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 15:10:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZWqws-00021T-HG
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 15:10:31 -0400
Received: from zimbra.cs.ucla.edu ([131.179.128.68]:53184)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZWqws-000218-BB
for bug-gnulib@gnu.org; Tue, 01 Sep 2015 15:10:26 -0400
Received: from localhost (localhost [127.0.0.1])
by zimbra.cs.ucla.edu (Postfix) with ESMTP id D7D47160838;
Tue, 1 Sep 2015 12:10:25 -0700 (PDT)
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032)
with ESMTP id RVjXWSDRlw9O; Tue, 1 Sep 2015 12:10:25 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
by zimbra.cs.ucla.edu (Postfix) with ESMTP id 40FE3160FB9;
Tue, 1 Sep 2015 12:10:25 -0700 (PDT)
X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026)
with ESMTP id cZh8-Y3t_eWv; Tue, 1 Sep 2015 12:10:25 -0700 (PDT)
Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200])
by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 29AC9160838;
Tue, 1 Sep 2015 12:10:25 -0700 (PDT)
Subject: Re: [More sorting algorithms for gnulib]
To: Rodion Efremov , bug-gnulib@gnu.org
References: <08b0cad40c5de87e4c0847e701ab0e30@webmail.cs.helsinki.fi>
From: Paul Eggert
Organization: UCLA Computer Science Department
Message-ID: <55E5F820.10202@cs.ucla.edu>
Date: Tue, 1 Sep 2015 12:10:24 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
Thunderbird/38.1.0
MIME-Version: 1.0
In-Reply-To: <08b0cad40c5de87e4c0847e701ab0e30@webmail.cs.helsinki.fi>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 131.179.128.68
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 01 Sep 2015 19:10:32 -0000
Thanks for your interest in improving gnulib. Yes, it's mostly written
in C so that'd be a more natural language to use here. But more
important, gnulib is intended as a portability library for use in other
utilities such as coreutils and tar and grep and so forth, and we'd need
to see why the new sorting code would be useful in that context.
From MAILER-DAEMON Fri Sep 04 10:03:40 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZXrae-0006dK-Nc
for mharc-bug-gnulib@gnu.org; Fri, 04 Sep 2015 10:03:40 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36739)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZXntx-0000Pc-JY
for bug-gnulib@gnu.org; Fri, 04 Sep 2015 06:07:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZXntu-0002Ra-AJ
for bug-gnulib@gnu.org; Fri, 04 Sep 2015 06:07:21 -0400
Received: from plane.gmane.org ([80.91.229.3]:49589)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZXntu-0002RH-2h
for bug-gnulib@gnu.org; Fri, 04 Sep 2015 06:07:18 -0400
Received: from list by plane.gmane.org with local (Exim 4.69)
(envelope-from ) id 1ZXntk-0006b4-AI
for bug-gnulib@gnu.org; Fri, 04 Sep 2015 12:07:08 +0200
Received: from alouette.sbs.ch ([194.29.12.218])
by main.gmane.org with esmtp (Gmexim 0.1 (Debian))
id 1AlnuQ-0007hv-00
for ; Fri, 04 Sep 2015 12:07:08 +0200
Received: from christian.egli by alouette.sbs.ch with local (Gmexim 0.1
(Debian)) id 1AlnuQ-0007hv-00
for ; Fri, 04 Sep 2015 12:07:08 +0200
X-Injected-Via-Gmane: http://gmane.org/
To: bug-gnulib@gnu.org
From: Christian Egli
Subject: [PATCH] Document how to use multiple instances of gnulib
Date: Fri, 04 Sep 2015 12:06:46 +0200
Organization: Swiss Library for the Blind, Visually Impaired and Print Disabled
Lines: 137
Message-ID: <87d1xy7b2h.fsf@sbs.ch>
Mime-Version: 1.0
Content-Type: text/plain
X-Complaints-To: usenet@ger.gmane.org
X-Gmane-NNTP-Posting-Host: alouette.sbs.ch
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux)
Cancel-Lock: sha1:CUKTymCkU4hvzPC/s+5uBww9pao=
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 80.91.229.3
X-Mailman-Approved-At: Fri, 04 Sep 2015 10:03:39 -0400
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Fri, 04 Sep 2015 10:07:25 -0000
* doc/gnulib-tool.texi: Add a section to the manual outlining how two
instances of gnulib with different modules can be used, for example one
for a lib and another one for associated tools.
---
doc/gnulib-tool.texi | 109 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 109 insertions(+)
diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi
index f749abb..93b269a 100644
--- a/doc/gnulib-tool.texi
+++ b/doc/gnulib-tool.texi
@@ -44,6 +44,7 @@ a real run without changing anything.
* Modified imports:: Changing the import specification.
* Simple update:: Tracking Gnulib development.
* Source changes:: Impact of Gnulib on your source files.
+* Multiple instances:: Using Gnulib for both a library and a binary
* gettextize and autopoint:: Caveat: @code{gettextize} and @code{autopoint} users!
* Localization:: Handling Gnulib's own message translations.
* VCS Issues:: Integration with Version Control Systems.
@@ -448,6 +449,114 @@ used to set system dependent flags (such as @code{_GNU_SOURCE} on GNU systems),
and these flags have no effect after any system header file has been included.
+@node Multiple instances
+@section Using Gnulib for both a library and a binary
+
+Your project might build both a library and some accompanying binaries
+in the same source tree. In that case you might want to use different
+modules for the library than for the binaries. Typically the binaries
+might want to make use of @code{getopt-posix} or @code{version-etc},
+while the library wants to stay clear of these modules for technical
+or licensing reasons.
+
+Let's assume that your project contains a @file{lib} directory where
+the source of the library resides and a @file{src} directory for the
+sources of the binaries as follows.
+
+@example
+.
+|-- configure.ac
+|-- lib
+| |-- foo.c
+| `-- Makefile.am
+|-- Makefile.am
+`-- src
+ |-- bar.c
+ `-- Makefile.am
+@end example
+
+You can now add two instances of Gnulib to your project in separate
+source trees:
+
+@example
+~/src/libfoo$ gnulib-tool --import --lib=libgnu --source-base=gnulib \
+ --m4-base=gnulib/m4 --macro-prefix=gl strndup
+~/src/libfoo$ gnulib-tool --import --lib=libgnutools \
+ --source-base=src/gnulib --m4-base=src/gnulib/m4 \
+ --macro-prefix=gl_tools getopt-gnu
+@end example
+
+The first one will import the module @code{strndup} in @file{gnulib}
+and the second one will import @code{getopt-gnu} in @file{src/gnulib}
+and you will end up with the following source tree (many files omitted
+in the interest of brevity):
+
+@example
+.
+|-- configure.ac
+|-- gnulib
+| |-- m4
+| |-- strndup.c
+|-- lib
+| |-- foo.c
+| `-- Makefile.am
+|-- Makefile.am
+`-- src
+ |-- bar.c
+ |-- gnulib
+ | |-- getopt.c
+ | |-- getopt.in.h
+ | |-- m4
+ `-- Makefile.am
+@end example
+
+Integration with your code is basically the same as outlined in
+@ref{Initial import} with the one exception that you have to add both
+the macro @code{gl_EARLY} and the macro @code{gl_tools_EARLY} to your
+@file{configure.ac} (and of course also both macros @code{gl_INIT} and
+@code{gl_tools_INIT}). Obviously the name of the second macro is
+dependent on the value of the @option{--macro-prefix} option in your
+@command{gnulib-tool} invocation.
+
+@example
+...
+AC_PROG_CC
+gl_EARLY
+gl_tools_EARLY
+...
+# For gnulib.
+gl_INIT
+gl_tools_INIT
+...
+@end example
+
+Also as outlined in @ref{Initial import} you will have to add compiler
+and linker flags. For the library you might have to add something
+along the line of the following to your @file{Makefile.am}:
+
+@example
+...
+AM_CPPFLAGS = -I$(top_srcdir)/gnulib -I$(top_builddir)/gnulib
+...
+libfoo_la_LIBADD = $(top_builddir)/gnulib/libgnu.la
+...
+@end example
+
+Correspondingly for the binary you will have to add something along
+the lines of to the following:
+
+@example
+...
+AM_CPPFLAGS = -I$(top_srcdir)/src/gnulib -I$(top_builddir)/src/gnulib
+...
+LIBADD = $(top_builddir)/src/gnulib/libgnutools.la
+...
+@end example
+
+The name of the library that you have pass in the linker option
+depends on the @option{--lib} option in @command{gnulib-tool}
+invocation.
+
@node gettextize and autopoint
@section Caveat: @code{gettextize} and @code{autopoint} users
--
2.1.4
From MAILER-DAEMON Tue Sep 08 17:18:12 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZZQHM-0006xD-7w
for mharc-bug-gnulib@gnu.org; Tue, 08 Sep 2015 17:18:12 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45041)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZZQHK-0006vr-5N
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 17:18:10 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from
) id 1ZZQHG-0001aK-6u
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 17:18:10 -0400
Received: from mail1.vodafone.ie ([213.233.128.43]:63928)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from
) id 1ZZQHG-0001Zl-1w
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 17:18:06 -0400
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AoMFAKpP71VtTftS/2dsb2JhbABdglFSgn6BFb93glYCgTlMAQEBAQEBgQuEJAEBBDIBVgsNCwkWDwkDAgECAUUGAQwIAQGILgG9HI5LLIV4hXaFE4QsAQSVVZYMkWUmhAE9iHwBAQE
Received: from unknown (HELO localhost.localdomain) ([109.77.251.82])
by mail1.vodafone.ie with ESMTP; 08 Sep 2015 22:18:03 +0100
Message-ID: <55EF508B.5040804@draigBrady.com>
Date: Tue, 08 Sep 2015 22:18:03 +0100
From: =?windows-1252?Q?P=E1draig_Brady?=
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
rv:31.0) Gecko/20100101 Thunderbird/31.6.0
MIME-Version: 1.0
To: Christian Egli , bug-gnulib@gnu.org
Subject: Re: [PATCH] Document how to use multiple instances of gnulib
References: <87d1xy7b2h.fsf@sbs.ch>
In-Reply-To: <87d1xy7b2h.fsf@sbs.ch>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 8bit
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 213.233.128.43
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 08 Sep 2015 21:18:10 -0000
On 04/09/15 11:06, Christian Egli wrote:
>
> * doc/gnulib-tool.texi: Add a section to the manual outlining how two
> instances of gnulib with different modules can be used, for example one
> for a lib and another one for associated tools.
Looks good. Pushed.
thanks!
Pádraig
From MAILER-DAEMON Tue Sep 08 17:51:28 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZZQnY-0007FB-Le
for mharc-bug-gnulib@gnu.org; Tue, 08 Sep 2015 17:51:28 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:57515)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZZQnW-0007E4-8C
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 17:51:26 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from
) id 1ZZQnR-0001jG-6Y
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 17:51:26 -0400
Received: from mail1.vodafone.ie ([213.233.128.43]:36953)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from
) id 1ZZQnR-0001j2-0w
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 17:51:21 -0400
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AoMFAMtX71VtTftS/2dsb2JhbABdglFSgn6BFb93glYCgTpMAQEBAQEBgQuEJAEBBDIBVgsNCwkWDwkDAgECAUUGAQwIAQGILgG9D45QLIV4hXaFE4QsAQSVVZYMhWKMAyaEAT2IfAEBAQ
Received: from unknown (HELO localhost.localdomain) ([109.77.251.82])
by mail1.vodafone.ie with ESMTP; 08 Sep 2015 22:51:19 +0100
Message-ID: <55EF5857.3090507@draigBrady.com>
Date: Tue, 08 Sep 2015 22:51:19 +0100
From: =?windows-1252?Q?P=E1draig_Brady?=
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
rv:31.0) Gecko/20100101 Thunderbird/31.6.0
MIME-Version: 1.0
To: Dave Chiluk , bug-gnulib@gnu.org
Subject: Re: [PATCH] Add me_mountroot to mount_entry for linux machines
References: <55E4C1F8.607@canonical.com>
<1441055278-9013-1-git-send-email-chiluk@canonical.com>
In-Reply-To: <1441055278-9013-1-git-send-email-chiluk@canonical.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 8bit
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 213.233.128.43
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 08 Sep 2015 21:51:27 -0000
On 31/08/15 22:07, Dave Chiluk wrote:
> Add me_mountroot to mount_entry so linux machines based on
> /proc/self/mountinfo can distinguish between bind mounts and original
> mounts. In reality bind mounts aren't treated any different than
> mountroot=/ mounts by the kernel, but this is still confusing to the
> user, and a change in behavior
There were a couple of places where me_mntroot wasn't set to NULL correctly.
I fixed that and the commit message and pushed.
thanks!
Pádraig.
From MAILER-DAEMON Tue Sep 08 19:45:22 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZZSZm-0006BQ-3d
for mharc-bug-gnulib@gnu.org; Tue, 08 Sep 2015 19:45:22 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:34491)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZZSZi-000689-U1
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 19:45:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZZSZe-0007EU-UN
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 19:45:18 -0400
Received: from mail-qg0-x22b.google.com ([2607:f8b0:400d:c04::22b]:34984)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZZSZe-0007DT-R8
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 19:45:14 -0400
Received: by qgt47 with SMTP id 47so97054396qgt.2
for ; Tue, 08 Sep 2015 16:45:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=date:from:to:cc:subject:message-id:references:mime-version
:content-type:content-disposition:in-reply-to:user-agent;
bh=4g4fwVUkH88jdZSLr8bH5CLrvVKxAKJg8WJtWTOgpuo=;
b=yVzJ0jNl4sQG7WUoxXNibpOkFXW3EAQj5mXTV+JWVPZzKfXfMG25MTVkmHJh0zC9xw
XGZ5tXiYhSkPWF8qV167XGmmHvo2xtFVWmTajXHpWq6PYcfB8eetoJ/7273mPflz5PAw
8w8Z7phwgSM/3UWM2WZxgEfGDVdsQD3L44tiOPIIcNUlQyG19nQ4AQ3eNJMupIPBw8z1
x+/HjmAdzwWlHoFOSNnOAf2jP15hjxvyguLaUD76n3FFom0XHSJ+0dyt5UqEmeUOdUAA
JDMGT1+QC0QkK+8BemaAsDWuCKxJLLNMVijZnTvoPSW63zJGL7mVd7Vb/LN5nkvn7LWk
ZrwQ==
X-Received: by 10.140.237.209 with SMTP id i200mr22206061qhc.92.1441755913057;
Tue, 08 Sep 2015 16:45:13 -0700 (PDT)
Received: from gmail.com (housegordon.org. [104.236.108.240])
by smtp.gmail.com with ESMTPSA id
j13sm2804010qge.27.2015.09.08.16.45.12
(version=TLSv1.2 cipher=RC4-SHA bits=128/128);
Tue, 08 Sep 2015 16:45:12 -0700 (PDT)
Date: Tue, 8 Sep 2015 23:44:41 +0000
From: Assaf Gordon
To: Paul Eggert
Subject: Re: Buggy ceill on OpenBSD, and possible gnulib test problem
Message-ID: <20150908234440.GA8914@gmail.com>
References: <20150812180810.GD5049@gmail.com> <55CB8FD9.1070600@cs.ucla.edu>
<20150812200612.GE5049@gmail.com> <55CBD698.10002@cs.ucla.edu>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="kVXhAStRUZ/+rrGn"
Content-Disposition: inline
In-Reply-To: <55CBD698.10002@cs.ucla.edu>
User-Agent: Mutt/1.5.21 (2010-09-15)
X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address
(bad octet value).
X-Received-From: 2607:f8b0:400d:c04::22b
Cc: bug-gnulib@gnu.org
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Tue, 08 Sep 2015 23:45:20 -0000
--kVXhAStRUZ/+rrGn
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
Hello,
On Wed, Aug 12, 2015 at 04:28:24PM -0700, Paul Eggert wrote:
>Thanks, looks good, though I'd change "(ceill(d)==1)" to "(ceill (d)
>== 1)" as per the usual GNU style.
fix attached.
>It's big enough that we'll need paperwork from you for Gnulib.
Copyright assignments for gnulib are now in place.
Thanks,
- assaf
--kVXhAStRUZ/+rrGn
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="gnulib-ceill-buggy-v3.patch"
>From a2abacb8133f07c9aa629db03a8e9008d0d15931 Mon Sep 17 00:00:00 2001
From: Assaf Gordon
Date: Tue, 8 Sep 2015 19:43:32 -0400
Subject: [PATCH] ceill: detect buggy OpenBSD implementation
* m4/ceill.m4: detect buggy openBSD implementation which returns zero
for small values. discussed here:
http://lists.gnu.org/archive/html/bug-gnulib/2015-08/msg00010.html
---
m4/ceill.m4 | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/m4/ceill.m4 b/m4/ceill.m4
index 51c0c56..756d29a 100644
--- a/m4/ceill.m4
+++ b/m4/ceill.m4
@@ -69,6 +69,31 @@ int main (int argc, char *argv[])
else
HAVE_DECL_CEILL=0
fi
+ dnl On OpenBSD5.6 the system's native ceill() is buggy:
+ dnl it returns '0' for small values. Test for this anomaly.
+ if test $REPLACE_CEILL = 0 ; then
+ AC_CACHE_CHECK([whether ceill() breaks with small values],
+ [gl_cv_func_ceill_buggy],
+ [
+ save_LIBS="$LIBS"
+ LIBS="$CEILL_LIBM"
+ AC_RUN_IFELSE(
+ [AC_LANG_PROGRAM(
+ [[#include
+long double d = 0.3L;]],
+ [[return (!(ceill (d) == 1)); ]])],
+ [gl_cv_func_ceill_buggy=no], [gl_cv_func_ceill_buggy=yes],
+ [case $host_os in
+ openbsd*) gl_cv_func_ceill_buggy="guessing yes";;
+ *) gl_cv_func_ceill_buggy="guessing no";;
+ esac])
+ LIBS="$save_LIBS"
+ ])
+ case "$gl_cv_func_ceill_buggy" in
+ *yes)
+ REPLACE_CEILL=1 ;;
+ esac
+ fi
if test $HAVE_DECL_CEILL = 0 || test $REPLACE_CEILL = 1; then
dnl Find libraries needed to link lib/ceill.c.
if test $HAVE_SAME_LONG_DOUBLE_AS_DOUBLE = 1; then
--
1.9.1
--kVXhAStRUZ/+rrGn--
From MAILER-DAEMON Tue Sep 08 20:22:17 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZZT9V-0007GQ-Sh
for mharc-bug-gnulib@gnu.org; Tue, 08 Sep 2015 20:22:17 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45492)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZZT9T-0007GJ-OO
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 20:22:16 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZZT9O-0000p4-TO
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 20:22:15 -0400
Received: from zimbra.cs.ucla.edu ([131.179.128.68]:48669)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZZT9O-0000ow-Nm
for bug-gnulib@gnu.org; Tue, 08 Sep 2015 20:22:10 -0400
Received: from localhost (localhost [127.0.0.1])
by zimbra.cs.ucla.edu (Postfix) with ESMTP id B2CFB160808;
Tue, 8 Sep 2015 17:22:09 -0700 (PDT)
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032)
with ESMTP id M57teZeJfWsV; Tue, 8 Sep 2015 17:22:09 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
by zimbra.cs.ucla.edu (Postfix) with ESMTP id 1C4B3160875;
Tue, 8 Sep 2015 17:22:09 -0700 (PDT)
X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026)
with ESMTP id gY4h_73kfwyb; Tue, 8 Sep 2015 17:22:09 -0700 (PDT)
Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net
[100.32.155.148])
by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id F3090160808;
Tue, 8 Sep 2015 17:22:08 -0700 (PDT)
Subject: Re: Buggy ceill on OpenBSD, and possible gnulib test problem
To: Assaf Gordon
References: <20150812180810.GD5049@gmail.com> <55CB8FD9.1070600@cs.ucla.edu>
<20150812200612.GE5049@gmail.com> <55CBD698.10002@cs.ucla.edu>
<20150908234440.GA8914@gmail.com>
From: Paul Eggert
Organization: UCLA Computer Science Department
Message-ID: <55EF7BB0.8020408@cs.ucla.edu>
Date: Tue, 8 Sep 2015 17:22:08 -0700
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101
Thunderbird/38.2.0
MIME-Version: 1.0
In-Reply-To: <20150908234440.GA8914@gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 131.179.128.68
Cc: bug-gnulib@gnu.org
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Wed, 09 Sep 2015 00:22:16 -0000
Thanks, I installed that after minor ChangeLog reformatting.
From MAILER-DAEMON Wed Sep 09 18:25:56 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZZnoS-00072c-6z
for mharc-bug-gnulib@gnu.org; Wed, 09 Sep 2015 18:25:56 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:42229)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZZn1W-00079g-62
for bug-gnulib@gnu.org; Wed, 09 Sep 2015 17:35:22 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZZn1R-0002iO-7A
for bug-gnulib@gnu.org; Wed, 09 Sep 2015 17:35:22 -0400
Received: from youngberry.canonical.com ([91.189.89.112]:38613)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZZn1R-0002hU-2d
for bug-gnulib@gnu.org; Wed, 09 Sep 2015 17:35:17 -0400
Received: from 1.general.chiluk.us.vpn ([10.172.65.168])
by youngberry.canonical.com with esmtpsa
(TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.76)
(envelope-from ) id 1ZZn1P-0004wy-SY
for bug-gnulib@gnu.org; Wed, 09 Sep 2015 21:35:16 +0000
Message-ID: <55F0A612.4020105@canonical.com>
Date: Wed, 09 Sep 2015 16:35:14 -0500
From: Dave Chiluk
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
rv:31.0) Gecko/20100101 Thunderbird/31.8.0
MIME-Version: 1.0
To: bug-gnulib@gnu.org
Subject: Re: [PATCH] Add me_mountroot to mount_entry for linux machines
References: <55E4C1F8.607@canonical.com> <1441055278-9013-1-git-send-email-chiluk@canonical.com>
<55EF5857.3090507@draigBrady.com>
In-Reply-To: <55EF5857.3090507@draigBrady.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 8bit
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 91.189.89.112
X-Mailman-Approved-At: Wed, 09 Sep 2015 18:25:55 -0400
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
Reply-To: dave.chiluk@canonical.com
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Wed, 09 Sep 2015 21:35:23 -0000
On 09/08/2015 04:51 PM, Pádraig Brady wrote:
> On 31/08/15 22:07, Dave Chiluk wrote:
>> Add me_mountroot to mount_entry so linux machines based on
>> /proc/self/mountinfo can distinguish between bind mounts and original
>> mounts. In reality bind mounts aren't treated any different than
>> mountroot=/ mounts by the kernel, but this is still confusing to the
>> user, and a change in behavior
>
> There were a couple of places where me_mntroot wasn't set to NULL correctly.
> I fixed that and the commit message and pushed.
>
> thanks!
> Pádraig.
>
I see I missed one. Let me know if there's anything you want me to do
on the df patch.
Thanks again,
Dave Chiluk
From MAILER-DAEMON Thu Sep 17 12:36:32 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZccAi-0000R3-G8
for mharc-bug-gnulib@gnu.org; Thu, 17 Sep 2015 12:36:32 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:36266)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZccAc-0000K8-J5
for bug-gnulib@gnu.org; Thu, 17 Sep 2015 12:36:30 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZccAY-0005kb-Dc
for bug-gnulib@gnu.org; Thu, 17 Sep 2015 12:36:26 -0400
Received: from h82-117-100-142.dynamic.se.alltele.net ([82.117.100.142]:60841
helo=mail.gisladisker.se) by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZccAY-0005PK-5s
for bug-gnulib@gnu.org; Thu, 17 Sep 2015 12:36:22 -0400
Received: by mail.gisladisker.se (Postfix, from userid 1002)
id 4EDFB4E889; Thu, 17 Sep 2015 18:36:04 +0200 (CEST)
Date: Thu, 17 Sep 2015 18:36:04 +0200
From: Mats Erik Andersson
To: bug-gnulib
Subject: [PATCH] gc: Fix detection of recent libgcrypt releases.
Message-ID: <20150917163603.GA56597@aun.utmark.mea>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="G4iJoqBmSsgzjUCe"
Content-Disposition: inline
X-Message-Flag: Do not send HTML.
User-Agent: Mutt/1.5.23 (2014-03-12)
X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x
X-Received-From: 82.117.100.142
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Thu, 17 Sep 2015 16:36:30 -0000
--G4iJoqBmSsgzjUCe
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Dear all,
the m4 script related to gcrypt needs an update,
as release 1.6 of libgcrypt has removed the macro
on which the test is based. We received a bug report
to help-shishi [1] which boils down to this remedy
A suitable patch is included.
Best regards, on behalf of Shishi
Mats Erik Andersson
[1] http://lists.gnu.org/archive/html/help-shishi/2015-09/msg00000.html
--G4iJoqBmSsgzjUCe
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0001-gc-Fix-detection-of-recent-libgcrypt-releases.patch"
>From 70eecce9272602f347bc0df7ce125ba8ea7c23c7 Mon Sep 17 00:00:00 2001
From: Mats Erik Andersson
Date: Thu, 17 Sep 2015 13:46:51 +0200
Subject: [PATCH] gc: Fix detection of recent libgcrypt releases.
* m4/gc.m4: Test libcrypt version macro and reject those
earlier than 1.4.4. The macro GCRY_MODULE_ID_USER was
deleted in release 1.6.0. Use a proper `#error' directive.
---
ChangeLog | 7 +++++++
m4/gc.m4 | 11 +++++------
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index de20d36..866c1b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-09-17 Mats Erik Andersson
+
+ gc: Fix detection of recent libgcrypt releases.
+ * m4/gc.m4: Test libcrypt version macro and reject those
+ earlier than 1.4.4. The macro GCRY_MODULE_ID_USER was
+ deleted in release 1.6.0. Use a proper `#error' directive.
+
2015-09-08 Assaf Gordon
ceill: detect buggy OpenBSD implementation
diff --git a/m4/gc.m4 b/m4/gc.m4
index 8f7d1d0..2fe3f35 100644
--- a/m4/gc.m4
+++ b/m4/gc.m4
@@ -1,4 +1,4 @@
-# gc.m4 serial 9
+# gc.m4 serial 10
dnl Copyright (C) 2005-2015 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -13,11 +13,10 @@ AC_DEFUN([gl_GC],
if test "$libgcrypt" != no; then
AC_LIB_HAVE_LINKFLAGS([gcrypt], [gpg-error], [
#include
-/* GCRY_MODULE_ID_USER was added in 1.4.4 and gc-libgcrypt.c
- will fail on startup if we don't have 1.4.4 or later, so
- test for it early. */
-#if !defined GCRY_MODULE_ID_USER
-error too old libgcrypt
+/* gc-libgcrypt.c will fail on startup if we don't have 1.4.4
+ or later, so test for this version early on. */
+#if GCRYPT_VERSION_NUMBER < 0x010404
+# error Too old libgcrypt version.
#endif
])
fi
--
1.7.3.2
--G4iJoqBmSsgzjUCe--
From MAILER-DAEMON Thu Sep 17 14:13:45 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1Zcdgm-0001o9-Vm
for mharc-bug-gnulib@gnu.org; Thu, 17 Sep 2015 14:13:44 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55187)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1Zcdgk-0001nY-6W
for bug-gnulib@gnu.org; Thu, 17 Sep 2015 14:13:43 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from
) id 1Zcdgg-0000LJ-Tw
for bug-gnulib@gnu.org; Thu, 17 Sep 2015 14:13:42 -0400
Received: from mx1.redhat.com ([209.132.183.28]:47200)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from
) id 1Zcdgg-0000L6-PW
for bug-gnulib@gnu.org; Thu, 17 Sep 2015 14:13:38 -0400
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
by mx1.redhat.com (Postfix) with ESMTPS id 5CE978EA2A;
Thu, 17 Sep 2015 18:13:38 +0000 (UTC)
Received: from localhost.localdomain (ovpn-116-111.ams2.redhat.com
[10.36.116.111])
by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP
id t8HIDZZS024934
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
Thu, 17 Sep 2015 14:13:36 -0400
Message-ID: <55FB02CE.3090602@draigBrady.com>
Date: Thu, 17 Sep 2015 19:13:34 +0100
From: =?windows-1252?Q?P=E1draig_Brady?=
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
rv:31.0) Gecko/20100101 Thunderbird/31.6.0
MIME-Version: 1.0
To: Mats Erik Andersson ,
bug-gnulib
Subject: Re: [PATCH] gc: Fix detection of recent libgcrypt releases.
References: <20150917163603.GA56597@aun.utmark.mea>
In-Reply-To: <20150917163603.GA56597@aun.utmark.mea>
Content-Type: text/plain; charset=windows-1252
X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22
Content-Transfer-Encoding: quoted-printable
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 209.132.183.28
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Thu, 17 Sep 2015 18:13:43 -0000
On 17/09/15 17:36, Mats Erik Andersson wrote:
> Dear all,
>=20
> the m4 script related to gcrypt needs an update,
> as release 1.6 of libgcrypt has removed the macro
> on which the test is based. We received a bug report
> to help-shishi [1] which boils down to this remedy
> A suitable patch is included.
>=20
> Best regards, on behalf of Shishi
> Mats Erik Andersson
>=20
> [1] http://lists.gnu.org/archive/html/help-shishi/2015-09/msg00000.html
Thanks for the patch. However it seems that GCRYPT_VERSION_NUMBER
has only been available since 1.6.0, so testing for versions before that =
is moot.
Perhaps using AM_PATH_LIBGCRYPT like is done in the following is better?
http://lists.freedesktop.org/archives/systemd-devel/2013-May/010885.html
thanks,
P=E1draig.
From MAILER-DAEMON Thu Sep 17 23:27:26 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZcmKc-00063W-U8
for mharc-bug-gnulib@gnu.org; Thu, 17 Sep 2015 23:27:26 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:47351)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZcmKa-00062h-7e
for bug-gnulib@gnu.org; Thu, 17 Sep 2015 23:27:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZcmKX-0005hM-1f
for bug-gnulib@gnu.org; Thu, 17 Sep 2015 23:27:24 -0400
Received: from out3-smtp.messagingengine.com ([66.111.4.27]:34465)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZcmKW-0005gR-TO
for bug-gnulib@gnu.org; Thu, 17 Sep 2015 23:27:20 -0400
Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
by mailout.nyi.internal (Postfix) with ESMTP id 6FFE520DEA
for ; Thu, 17 Sep 2015 23:27:19 -0400 (EDT)
Received: from web6 ([10.202.2.216])
by compute2.internal (MEProxy); Thu, 17 Sep 2015 23:27:19 -0400
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=iSKUNK.ORG; h=
content-transfer-encoding:content-type:date:from:message-id
:mime-version:subject:to:x-sasl-enc:x-sasl-enc; s=mesmtp; bh=gTu
IQGCiJS9Pr7K0ax2rtslmx2o=; b=ZwJrUsccg9Qwnrya16OAUIkNS+oJ+8nj7PP
YVwlxp8vVorr1xJptvt22NJqUiXCByIDjJcAYCRHR5M6I0FagvLGw2XhOeGbPGwP
wwX13wnYf+3ru/2IXDpxTxWsduZw8zzZJhk2jsd0Guw3OGGK7spftbexp779r5Qh
P5RGcimo=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
messagingengine.com; h=content-transfer-encoding:content-type
:date:from:message-id:mime-version:subject:to:x-sasl-enc
:x-sasl-enc; s=smtpout; bh=gTuIQGCiJS9Pr7K0ax2rtslmx2o=; b=NNs9C
Oe2TGU6QyZajS9R6VYrOMK/SbEHxOlXx+kkaW+8C6MdhOwcC/jwMxN8Ln5qN5Mkt
/Skh5RHVROh7dYr4Glhhka9ZpIY/6hXkHSG3U6JTJ+Pgw/6LqxohdktyUf8z6Y8f
E6iHeuEuTV15vNFFRRzYnn5d/hGH0TilFxOCpY=
Received: by web6.nyi.internal (Postfix, from userid 99)
id 3AD6F42E10; Thu, 17 Sep 2015 23:27:19 -0400 (EDT)
Message-Id: <1442546839.1052411.386911553.7D651C83@webmail.messagingengine.com>
X-Sasl-Enc: MLTXVieuZMaJ7u+cJhTRDWr2wrWigsGZpTAAeq/vzW8Q 1442546839
From: "Daniel Richard G."
To: bug-gnulib@gnu.org
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain
X-Mailer: MessagingEngine.com Webmail Interface - html
Subject: Bug in nanosleep() implementation for Unix platforms lacking same
Date: Thu, 17 Sep 2015 23:27:19 -0400
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 66.111.4.27
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Fri, 18 Sep 2015 03:27:25 -0000
Hello list,
Lately I am testing and enhancing Gnulib on a relatively exotic
POSIX platform.
This platform lacks nanosleep(), and so uses the implementation
starting at lib/nanosleep.c:227 (Git master). Investigating a failure
in test-nanosleep, I found that the following assertion...
ASSERT (nanosleep (&ts, &ts) == -1);
...tripped because the function returned 0, despite having been
interrupted by a SIGALRM. This appeared to occur not because of a
platform issue, but due to the implementation itself. I was able to
reproduce this failure on Linux after forcing Gnulib to use that same
implementation.
In nanosleep.c, the sighandler() function is never called (is the
program supposed to receive SIGCONT when some other signal interrupts
select()?), and even if it did, the nanosleep() implementation would
then return 1 instead of the correct value of -1.
Please Cc: any replies to me, as I am not subscribed to this list.
--Daniel
--
Daniel Richard G. || skunk@iSKUNK.ORG
My ASCII-art .sig got a bad case of Times New Roman.
From MAILER-DAEMON Fri Sep 18 04:32:19 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1Zcr5e-00017U-V3
for mharc-bug-gnulib@gnu.org; Fri, 18 Sep 2015 04:32:19 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:37286)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1Zcr5c-00013P-DY
for bug-gnulib@gnu.org; Fri, 18 Sep 2015 04:32:17 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from
) id 1Zcr5Y-0001r2-8Z
for bug-gnulib@gnu.org; Fri, 18 Sep 2015 04:32:16 -0400
Received: from mail2.vodafone.ie ([213.233.128.44]:37895)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from
) id 1Zcr5Y-0001ov-2l
for bug-gnulib@gnu.org; Fri, 18 Sep 2015 04:32:12 -0400
X-IronPort-Anti-Spam-Filtered: true
X-IronPort-Anti-Spam-Result: AgcFANvK+1VtTIKh/2dsb2JhbABWB4JRUsQtglYCgUBMAQEBAQEBgQuEIwEBAQMBfgsLDQsJFg8JAwIBAgFFBgEMCAEBiCIMAbxujj8BK4V4hXiERU+ELAEElWKWHpICY4IRHIFVPYhYI4ElAQEB
Received: from unknown (HELO localhost.localdomain) ([109.76.130.161])
by mail2.vodafone.ie with ESMTP; 18 Sep 2015 09:32:08 +0100
Message-ID: <55FBCC08.4030004@draigBrady.com>
Date: Fri, 18 Sep 2015 09:32:08 +0100
From: =?windows-1252?Q?P=E1draig_Brady?=
User-Agent: Mozilla/5.0 (X11; Linux x86_64;
rv:31.0) Gecko/20100101 Thunderbird/31.6.0
MIME-Version: 1.0
To: "Daniel Richard G." , bug-gnulib@gnu.org
Subject: Re: Bug in nanosleep() implementation for Unix platforms lacking same
References: <1442546839.1052411.386911553.7D651C83@webmail.messagingengine.com>
In-Reply-To: <1442546839.1052411.386911553.7D651C83@webmail.messagingengine.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
X-detected-operating-system: by eggs.gnu.org: Genre and OS details not
recognized.
X-Received-From: 213.233.128.44
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Fri, 18 Sep 2015 08:32:17 -0000
On 18/09/15 04:27, Daniel Richard G. wrote:
> Hello list,
>
> Lately I am testing and enhancing Gnulib on a relatively exotic
> POSIX platform.
>
> This platform lacks nanosleep(), and so uses the implementation
> starting at lib/nanosleep.c:227 (Git master). Investigating a failure
> in test-nanosleep, I found that the following assertion...
>
> ASSERT (nanosleep (&ts, &ts) == -1);
>
> ...tripped because the function returned 0, despite having been
> interrupted by a SIGALRM. This appeared to occur not because of a
> platform issue, but due to the implementation itself. I was able to
> reproduce this failure on Linux after forcing Gnulib to use that same
> implementation.
>
> In nanosleep.c, the sighandler() function is never called (is the
> program supposed to receive SIGCONT when some other signal interrupts
> select()?),
I think the SIGCONT handling is to handle reception of
explicit SIGSTOP and SIGCONT
> and even if it did, the nanosleep() implementation would
> then return 1 instead of the correct value of -1.
Yes that looks incorrect.
Perhaps something like this suffices:
diff --git a/lib/nanosleep.c b/lib/nanosleep.c
index 3060db0..1364f7a 100644
--- a/lib/nanosleep.c
+++ b/lib/nanosleep.c
@@ -202,7 +202,7 @@ sighandler (int sig)
/* Suspend execution for at least *TS_DELAY seconds. */
-static void
+static int
my_usleep (const struct timespec *ts_delay)
{
struct timeval tv_delay;
@@ -218,7 +218,7 @@ my_usleep (const struct timespec *ts_delay)
tv_delay.tv_usec = 0;
}
}
- select (0, NULL, NULL, NULL, &tv_delay);
+ return select (0, NULL, NULL, NULL, &tv_delay);
}
/* Suspend execution for at least *REQUESTED_DELAY seconds. The
@@ -256,19 +256,21 @@ nanosleep (const struct timespec *requested_delay,
suspended = 0;
- my_usleep (requested_delay);
-
- if (suspended)
+ if (my_usleep (requested_delay) == -1)
{
- /* Calculate time remaining. */
- /* FIXME: the code in sleep doesn't use this, so there's no
- rush to implement it. */
+ if (suspended)
+ {
+ /* Calculate time remaining. */
+ /* FIXME: the code in sleep doesn't use this, so there's no
+ rush to implement it. */
- errno = EINTR;
+ errno = EINTR;
+ }
+ return -1;
}
/* FIXME: Restore sig handler? */
- return suspended;
+ return 0;
}
#endif
From MAILER-DAEMON Fri Sep 18 20:25:26 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1Zd5y2-0008RR-H7
for mharc-bug-gnulib@gnu.org; Fri, 18 Sep 2015 20:25:26 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45886)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1Zd5y0-0008RI-Jj
for bug-gnulib@gnu.org; Fri, 18 Sep 2015 20:25:25 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1Zd5xv-00027q-Sl
for bug-gnulib@gnu.org; Fri, 18 Sep 2015 20:25:24 -0400
Received: from out1-smtp.messagingengine.com ([66.111.4.25]:45342)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1Zd5xv-00027l-NA
for bug-gnulib@gnu.org; Fri, 18 Sep 2015 20:25:19 -0400
Received: from compute2.internal (compute2.nyi.internal [10.202.2.42])
by mailout.nyi.internal (Postfix) with ESMTP id 8394E20313
for ; Fri, 18 Sep 2015 20:25:19 -0400 (EDT)
Received: from web6 ([10.202.2.216])
by compute2.internal (MEProxy); Fri, 18 Sep 2015 20:25:19 -0400
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=iSKUNK.ORG; h=
content-transfer-encoding:content-type:date:from:in-reply-to
:message-id:mime-version:references:subject:to:x-sasl-enc
:x-sasl-enc; s=mesmtp; bh=nH1zB5kOL7D5kTh8rnsrZ3XQfoU=; b=gaRLNQ
mFHtjDWEwbZPeU+S5F9b7ZV1xCschWpwfWncFsXUhG+b5DuJwpende+v+I4FEiwV
P1O98NC/giy3lFG5ALzjRwW9OEeL0Mt29LLKToHLGYoRrDLlSlPCZCb0PgIcx66s
pAgwtWP/gmperP7Miq9nlKN5SKNZacg06BVts=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
messagingengine.com; h=content-transfer-encoding:content-type
:date:from:in-reply-to:message-id:mime-version:references
:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=nH1zB5kOL7D5kTh
8rnsrZ3XQfoU=; b=P3F9dni1U6h3lnuSdqUZoxhGy/RatHUHhcffnaoWarV9+uw
aVK0Z48Tlsg/0JJs1CeQY4LkEpXhIJtBrNAjJL9fhC0ost0WfHpDwcrf5ozHBbuV
KCpVFBRP+Hg1FuQdxuv7XjCvTZaM2CU/ERXoTKnQv9+T4ejwWlMhehpOmK5s=
Received: by web6.nyi.internal (Postfix, from userid 99)
id 55089450BA; Fri, 18 Sep 2015 20:25:19 -0400 (EDT)
Message-Id: <1442622319.1336922.387657993.60E34E20@webmail.messagingengine.com>
X-Sasl-Enc: RcMhxKIUbySyQsTNB6CwU65XRS5iaVzoLzo5N7QWE/B1 1442622319
From: "Daniel Richard G."
To: =?UTF-8?Q?P=C3=A1draig=20Brady?= , bug-gnulib@gnu.org
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="UTF-8"
X-Mailer: MessagingEngine.com Webmail Interface - html
In-Reply-To: <55FBCC08.4030004@draigBrady.com>
References: <1442546839.1052411.386911553.7D651C83@webmail.messagingengine.com>
<55FBCC08.4030004@draigBrady.com>
Subject: Re: Bug in nanosleep() implementation for Unix platforms lacking same
Date: Fri, 18 Sep 2015 20:25:19 -0400
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]
X-Received-From: 66.111.4.25
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 19 Sep 2015 00:25:25 -0000
On Fri, 2015 Sep 18 09:32+0100, P=C3=A1draig Brady wrote:
>=20
> I think the SIGCONT handling is to handle reception of explicit
> SIGSTOP and SIGCONT
Ah, okay, that makes sense.
> > and even if it did, the nanosleep() implementation would then return
> > 1 instead of the correct value of -1.
>=20
> Yes that looks incorrect.
> Perhaps something like this suffices:
Indeed, test-nanosleep now passes for me on both Linux (when using that
implementation) and the system I'm working on. Thank you for the fix!
--Daniel
--=20
Daniel Richard G. || skunk@iSKUNK.ORG
My ASCII-art .sig got a bad case of Times New Roman.
From MAILER-DAEMON Sat Sep 19 13:17:52 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZdLlo-0006Er-Mw
for mharc-bug-gnulib@gnu.org; Sat, 19 Sep 2015 13:17:52 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54198)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZdLll-0006Dz-Eq
for bug-gnulib@gnu.org; Sat, 19 Sep 2015 13:17:51 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZdLlh-0008Qv-78
for bug-gnulib@gnu.org; Sat, 19 Sep 2015 13:17:49 -0400
Received: from zimbra.cs.ucla.edu ([131.179.128.68]:48792)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZdLlg-0008Q5-UL
for bug-gnulib@gnu.org; Sat, 19 Sep 2015 13:17:45 -0400
Received: from localhost (localhost [127.0.0.1])
by zimbra.cs.ucla.edu (Postfix) with ESMTP id 4E632161124
for ; Sat, 19 Sep 2015 10:17:42 -0700 (PDT)
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032)
with ESMTP id nsIn56Na301f; Sat, 19 Sep 2015 10:17:40 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
by zimbra.cs.ucla.edu (Postfix) with ESMTP id 492E216111A;
Sat, 19 Sep 2015 10:17:40 -0700 (PDT)
X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026)
with ESMTP id y3Bdh9czfdxs; Sat, 19 Sep 2015 10:17:40 -0700 (PDT)
Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200])
by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 2617E16083E;
Sat, 19 Sep 2015 10:17:40 -0700 (PDT)
From: Paul Eggert
To: bug-gnulib@gnu.org
Subject: [PATCH 1/2] regex: merge patches from libc
Date: Sat, 19 Sep 2015 10:17:25 -0700
Message-Id: <1442683046-25737-1-git-send-email-eggert@cs.ucla.edu>
X-Mailer: git-send-email 2.1.0
X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x
X-Received-From: 131.179.128.68
Cc: Paul Eggert
X-BeenThere: bug-gnulib@gnu.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: Gnulib discussion list
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
X-List-Received-Date: Sat, 19 Sep 2015 17:17:51 -0000
2015-09-08 Joseph Myers
Move bits/libc-lock.h and bits/libc-lockP.h out of bits/ (bug 14912).
* lib/regex_internal.h:
Include instead of .
2015-06-09 Joseph Myers
Fix regcomp wcscoll, wcscmp namespace (bug 18497).
* lib/regcomp.c (build_range_exp): Call __wcscoll instead of
wcscoll.
* lib/regexec.c (check_node_accept_bytes): Likewise.
2015-06-05 Joseph Myers
Fix regex wcrtomb namespace (bug 18496).
* lib/regex_internal.c (build_wcs_upper_buffer): Call __wcrtomb
instead of wcrtomb.
2015-06-05 Joseph Myers
Fix regex wctype namespace (bug 18495).
* lib/regcomp.c (re_compile_fastmap_iter): Call __towlower
instead of towlower.
* lib/regex_internal.c (build_wcs_upper_buffer): Call __iswlower
instead of iswlower. Call __towupper instead of towupper.
* lib/regex_internal.h (IS_WIDE_WORD_CHAR): Call __iswalnum
instead of iswalnum.
2015-01-07 Chris Metcalf
* lib/regcomp.c (parse_bracket_exp): Initialize type to
COLL_SYM in a couple of places to avoid uninitialized variable
wanings on tilegx gcc 4.8.2.
2014-11-24 Siddhesh Poyarekar
* lib/regex_internal.h: Remove NOT_IN_libc.
2014-11-17 Andreas Schwab
* lib/regex_internal.h: Don't include .
2014-09-11 Roland McGrath
Move findidx nested functions to top-level.
* lib/regcomp.c [_LIBC]: #include .
(build_equiv_class) [_LIBC]: Don't #include it inside the function.
Pass new arguments to findidx.
* lib/regexec.c [RE_ENABLE_I18N] [_LIBC]: #include .
[RE_ENABLE_I18N] (check_node_accept_bytes) [_LIBC]:
Don't #include it inside the function. Pass new arguments to findidx.
* lib/regex_internal.h:
[!NOT_IN_libc] [_LIBC]: #include .
(re_string_elem_size_at): Don't #include it inside the function.
Pass new arguments to findidx.
2014-08-01 Siddhesh Poyarekar
Check if DEBUG is defined in regex_internal.c
* lib/regex_internal.c: Check if DEBUG is defined and is set.
---
ChangeLog | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/regcomp.c | 16 +++++++++------
lib/regex_internal.c | 6 +++---
lib/regex_internal.h | 29 ++++++++++++++------------
lib/regexec.c | 8 +++++---
5 files changed, 91 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index de20d36..f846aac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,60 @@
+2015-09-19 Paul Eggert
+
+ regex: merge patches from libc
+
+ 2015-09-08 Joseph Myers
+ Move bits/libc-lock.h and bits/libc-lockP.h out of bits/ (bug 14912).
+ * lib/regex_internal.h:
+ Include instead of .
+
+ 2015-06-09 Joseph Myers
+ Fix regcomp wcscoll, wcscmp namespace (bug 18497).
+ * lib/regcomp.c (build_range_exp): Call __wcscoll instead of
+ wcscoll.
+ * lib/regexec.c (check_node_accept_bytes): Likewise.
+
+ 2015-06-05 Joseph Myers
+ Fix regex wcrtomb namespace (bug 18496).
+ * lib/regex_internal.c (build_wcs_upper_buffer): Call __wcrtomb
+ instead of wcrtomb.
+
+ 2015-06-05 Joseph Myers
+ Fix regex wctype namespace (bug 18495).
+ * lib/regcomp.c (re_compile_fastmap_iter): Call __towlower
+ instead of towlower.
+ * lib/regex_internal.c (build_wcs_upper_buffer): Call __iswlower
+ instead of iswlower. Call __towupper instead of towupper.
+ * lib/regex_internal.h (IS_WIDE_WORD_CHAR): Call __iswalnum
+ instead of iswalnum.
+
+ 2015-01-07 Chris Metcalf
+ * lib/regcomp.c (parse_bracket_exp): Initialize type to
+ COLL_SYM in a couple of places to avoid uninitialized variable
+ wanings on tilegx gcc 4.8.2.
+
+ 2014-11-24 Siddhesh Poyarekar
+ * lib/regex_internal.h: Remove NOT_IN_libc.
+
+ 2014-11-17 Andreas Schwab
+ * lib/regex_internal.h: Don't include .
+
+ 2014-09-11 Roland McGrath
+ Move findidx nested functions to top-level.
+ * lib/regcomp.c [_LIBC]: #include .
+ (build_equiv_class) [_LIBC]: Don't #include it inside the function.
+ Pass new arguments to findidx.
+ * lib/regexec.c [RE_ENABLE_I18N] [_LIBC]: #include .
+ [RE_ENABLE_I18N] (check_node_accept_bytes) [_LIBC]:
+ Don't #include it inside the function. Pass new arguments to findidx.
+ * lib/regex_internal.h:
+ [!NOT_IN_libc] [_LIBC]: #include .
+ (re_string_elem_size_at): Don't #include it inside the function.
+ Pass new arguments to findidx.
+
+ 2014-08-01 Siddhesh Poyarekar
+ Check if DEBUG is defined in regex_internal.c
+ * lib/regex_internal.c: Check if DEBUG is defined and is set.
+
2015-09-08 Assaf Gordon
ceill: detect buggy OpenBSD implementation
diff --git a/lib/regcomp.c b/lib/regcomp.c
index 840220f..f50afb4 100644
--- a/lib/regcomp.c
+++ b/lib/regcomp.c
@@ -17,6 +17,10 @@
License along with the GNU C Library; if not, see
. */
+#ifdef _LIBC
+# include
+#endif
+
static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
size_t length, reg_syntax_t syntax);
static void re_compile_fastmap_iter (regex_t *bufp,
@@ -335,7 +339,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
memset (&state, '\0', sizeof (state));
if (__mbrtowc (&wc, (const char *) buf, p - buf,
&state) == p - buf
- && (__wcrtomb ((char *) buf, towlower (wc), &state)
+ && (__wcrtomb ((char *) buf, __towlower (wc), &state)
!= (size_t) -1))
re_set_fastmap (fastmap, false, buf[0]);
}
@@ -411,7 +415,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state,
re_set_fastmap (fastmap, icase, *(unsigned char *) buf);
if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1)
{
- if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state)
+ if (__wcrtomb (buf, __towlower (cset->mbchars[i]), &state)
!= (size_t) -1)
re_set_fastmap (fastmap, false, *(unsigned char *) buf);
}
@@ -3175,6 +3179,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
re_token_t token2;
start_elem.opr.name = start_name_buf;
+ start_elem.type = COLL_SYM;
ret = parse_bracket_element (&start_elem, regexp, token, token_len, dfa,
syntax, first_round);
if (BE (ret != REG_NOERROR, 0))
@@ -3218,6 +3223,7 @@ parse_bracket_exp (re_string_t *regexp, re_dfa_t *dfa, re_token_t *token,
if (is_range_exp == true)
{
end_elem.opr.name = end_name_buf;
+ end_elem.type = COLL_SYM;
ret = parse_bracket_element (&end_elem, regexp, &token2, token_len2,
dfa, syntax, true);
if (BE (ret != REG_NOERROR, 0))
@@ -3492,8 +3498,6 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
int32_t idx1, idx2;
unsigned int ch;
size_t len;
- /* This #include defines a local function! */
-# include
/* Calculate the index for equivalence class. */
cp = name;
table = (const int32_t *) _NL_CURRENT (LC_COLLATE, _NL_COLLATE_TABLEMB);
@@ -3503,7 +3507,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
_NL_COLLATE_EXTRAMB);
indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
_NL_COLLATE_INDIRECTMB);
- idx1 = findidx (&cp, -1);
+ idx1 = findidx (table, indirect, extra, &cp, -1);
if (BE (idx1 == 0 || *cp != '\0', 0))
/* This isn't a valid character. */
return REG_ECOLLATE;
@@ -3514,7 +3518,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
{
char_buf[0] = ch;
cp = char_buf;
- idx2 = findidx (&cp, 1);
+ idx2 = findidx (table, indirect, extra, &cp, 1);
/*
idx2 = table[ch];
*/
diff --git a/lib/regex_internal.c b/lib/regex_internal.c
index 36ae6ab..93d7ee9 100644
--- a/lib/regex_internal.c
+++ b/lib/regex_internal.c
@@ -311,12 +311,12 @@ build_wcs_upper_buffer (re_string_t *pstr)
+ byte_idx), remain_len, &pstr->cur_state);
if (BE (mbclen < (size_t) -2, 1))
{
- wchar_t wcu = towupper (wc);
+ wchar_t wcu = __towupper (wc);
if (wcu != wc)
{
size_t mbcdlen;
- mbcdlen = wcrtomb (buf, wcu, &prev_st);
+ mbcdlen = __wcrtomb (buf, wcu, &prev_st);
if (BE (mbclen == mbcdlen, 1))
memcpy (pstr->mbs + byte_idx, buf, mbclen);
else
@@ -380,7 +380,7 @@ build_wcs_upper_buffer (re_string_t *pstr)
mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state);
if (BE (mbclen < (size_t) -2, 1))
{
- wchar_t wcu = towupper (wc);
+ wchar_t wcu = __towupper (wc);
if (wcu != wc)
{
size_t mbcdlen;
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index ff486bb..0307a34 100644
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -34,7 +34,7 @@
#include
#ifdef _LIBC
-# include
+# include
# define lock_define(name) __libc_lock_define (, name)
# define lock_init(lock) (__libc_lock_init (lock), 0)
# define lock_fini(lock) 0
@@ -87,7 +87,6 @@
# ifndef _RE_DEFINE_LOCALE_FUNCTIONS
# define _RE_DEFINE_LOCALE_FUNCTIONS 1
# include
-# include
# include
# endif
#endif
@@ -137,7 +136,10 @@
# undef __wctype
# undef __iswctype
# define __wctype wctype
+# define __iswalnum iswalnum
# define __iswctype iswctype
+# define __towlower towlower
+# define __towupper towupper
# define __btowc btowc
# define __mbrtowc mbrtowc
# define __wcrtomb wcrtomb
@@ -447,23 +449,23 @@ typedef struct re_dfa_t re_dfa_t;
#ifndef _LIBC
# define internal_function
+# define IS_IN(libc) false
#endif
-#ifndef NOT_IN_libc
static reg_errcode_t re_string_realloc_buffers (re_string_t *pstr,
Idx new_buf_len)
internal_function;
-# ifdef RE_ENABLE_I18N
+#ifdef RE_ENABLE_I18N
static void build_wcs_buffer (re_string_t *pstr) internal_function;
static reg_errcode_t build_wcs_upper_buffer (re_string_t *pstr)
internal_function;
-# endif /* RE_ENABLE_I18N */
+#endif /* RE_ENABLE_I18N */
static void build_upper_buffer (re_string_t *pstr) internal_function;
static void re_string_translate_buffer (re_string_t *pstr) internal_function;
static unsigned int re_string_context_at (const re_string_t *input, Idx idx,
int eflags)
internal_function __attribute__ ((pure));
-#endif
+
#define re_string_peek_byte(pstr, offset) \
((pstr)->mbs[(pstr)->cur_idx + offset])
#define re_string_fetch_byte(pstr) \
@@ -556,7 +558,7 @@ typedef struct bin_tree_storage_t bin_tree_storage_t;
#define IS_WORD_CHAR(ch) (isalnum (ch) || (ch) == '_')
#define IS_NEWLINE(ch) ((ch) == NEWLINE_CHAR)
-#define IS_WIDE_WORD_CHAR(ch) (iswalnum (ch) || (ch) == L'_')
+#define IS_WIDE_WORD_CHAR(ch) (__iswalnum (ch) || (ch) == L'_')
#define IS_WIDE_NEWLINE(ch) ((ch) == WIDE_NEWLINE_CHAR)
#define NOT_SATISFY_PREV_CONSTRAINT(constraint,context) \
@@ -860,15 +862,17 @@ re_string_wchar_at (const re_string_t *pstr, Idx idx)
return (wint_t) pstr->wcs[idx];
}
-# ifndef NOT_IN_libc
+# ifdef _LIBC
+# include
+# endif
+
static int
internal_function __attribute__ ((pure, unused))
re_string_elem_size_at (const re_string_t *pstr, Idx idx)
{
-# ifdef _LIBC
+# ifdef _LIBC
const unsigned char *p, *extra;
const int32_t *table, *indirect;
-# include
uint_fast32_t nrules = _NL_CURRENT_WORD (LC_COLLATE, _NL_COLLATE_NRULES);
if (nrules != 0)
@@ -879,14 +883,13 @@ re_string_elem_size_at (const re_string_t *pstr, Idx idx)
indirect = (const int32_t *) _NL_CURRENT (LC_COLLATE,
_NL_COLLATE_INDIRECTMB);
p = pstr->mbs + idx;
- findidx (&p, pstr->len - idx);
+ findidx (table, indirect, extra, &p, pstr->len - idx);
return p - pstr->mbs - idx;
}
else
-# endif /* _LIBC */
+# endif /* _LIBC */
return 1;
}
-# endif
#endif /* RE_ENABLE_I18N */
#ifndef __GNUC_PREREQ
diff --git a/lib/regexec.c b/lib/regexec.c
index d3920c4..db50a56 100644
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -3776,6 +3776,10 @@ group_nodes_into_DFAstates (const re_dfa_t *dfa, const re_dfastate_t *state,
one collating element like '.', '[a-z]', opposite to the other nodes
can only accept one byte. */
+# ifdef _LIBC
+# include
+# endif
+
static int
internal_function
check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
@@ -3895,8 +3899,6 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
const int32_t *table, *indirect;
const unsigned char *weights, *extra;
const char *collseqwc;
- /* This #include defines a local function! */
-# include
/* match with collating_symbol? */
if (cset->ncoll_syms)
@@ -3953,7 +3955,7 @@ check_node_accept_bytes (const re_dfa_t *dfa, Idx node_idx,
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_EXTRAMB);
indirect = (const int32_t *)
_NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
- int32_t idx = findidx (&cp, elem_len);
+ int32_t idx = findidx (table, indirect, extra, &cp, elem_len);
if (idx > 0)
for (i = 0; i < cset->nequiv_classes; ++i)
{
--
2.1.0
From MAILER-DAEMON Sat Sep 19 13:17:52 2015
Received: from list by lists.gnu.org with archive (Exim 4.71)
id 1ZdLlo-0006Eb-JB
for mharc-bug-gnulib@gnu.org; Sat, 19 Sep 2015 13:17:52 -0400
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54200)
by lists.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZdLll-0006E2-SZ
for bug-gnulib@gnu.org; Sat, 19 Sep 2015 13:17:50 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
(envelope-from ) id 1ZdLlh-0008R3-Cv
for bug-gnulib@gnu.org; Sat, 19 Sep 2015 13:17:49 -0400
Received: from zimbra.cs.ucla.edu ([131.179.128.68]:48802)
by eggs.gnu.org with esmtp (Exim 4.71)
(envelope-from ) id 1ZdLlh-0008Qp-7f
for bug-gnulib@gnu.org; Sat, 19 Sep 2015 13:17:45 -0400
Received: from localhost (localhost [127.0.0.1])
by zimbra.cs.ucla.edu (Postfix) with ESMTP id 5776C161125
for ; Sat, 19 Sep 2015 10:17:44 -0700 (PDT)
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032)
with ESMTP id j4XBY3suJaUK; Sat, 19 Sep 2015 10:17:43 -0700 (PDT)
Received: from localhost (localhost [127.0.0.1])
by zimbra.cs.ucla.edu (Postfix) with ESMTP id 51D3416111A;
Sat, 19 Sep 2015 10:17:43 -0700 (PDT)
X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu
Received: from zimbra.cs.ucla.edu ([127.0.0.1])
by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026)
with ESMTP id ud6WxyrwOtsp; Sat, 19 Sep 2015 10:17:43 -0700 (PDT)
Received: from Penguin.CS.UCLA.EDU (Penguin.CS.UCLA.EDU [131.179.64.200])
by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 3D6FC16083E;
Sat, 19 Sep 2015 10:17:43 -0700 (PDT)
From: Paul Eggert