Author: sthibault
Date: 2010-08-02 06:48:01 +0000 (Mon, 02 Aug 2010)
New Revision: 4371
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/hurd-i386/local-locarchive.diff
Log:
patches/hurd-i386/local-locarchive.diff: Extend to permit generating several
locales.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2010-07-31 22:34:38 UTC (rev
4370)
+++ glibc-package/trunk/debian/changelog 2010-08-02 06:48:01 UTC (rev
4371)
@@ -4,6 +4,8 @@
* testsuite-checking/expected-results-i486-gnu-libc: update.
* patches/hurd-i386/submitted-select.diff: New patch to fix select timeout
value.
+ * patches/hurd-i386/local-locarchive.diff: Extend to permit generating
several
+ locales.
[ Petr Salinger ]
* kfreebsd/local-sysdeps.diff: update to revision 3131 (from glibc-bsd).
Modified: glibc-package/trunk/debian/patches/hurd-i386/local-locarchive.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/local-locarchive.diff
2010-07-31 22:34:38 UTC (rev 4370)
+++ glibc-package/trunk/debian/patches/hurd-i386/local-locarchive.diff
2010-08-02 06:48:01 UTC (rev 4371)
@@ -2,8 +2,8 @@
archive extension (which is not supported on hurd-i386), lock it all.
---
- locale/programs/locarchive.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
+ locale/programs/locarchive.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
--- a/locale/programs/locarchive.c
+++ b/locale/programs/locarchive.c
@@ -24,3 +24,20 @@
{
int errval = errno;
unlink (fname);
+@@ -563,7 +572,16 @@ open_archive (struct locarhandle *ah, bool readonly)
+ error (EXIT_FAILURE, errno, _("cannot stat locale archive \"%s\""),
+ archivefname);
+
++#ifdef __GNU__
++ struct flock fl;
++ fl.l_whence = SEEK_SET;
++ fl.l_start = 0;
++ fl.l_len = 0;
++ fl.l_type = F_WRLCK;
++ if (!readonly && fcntl(fd, F_SETLKW, &fl) == -1)
++#else
+ if (!readonly && lockf64 (fd, F_LOCK, sizeof (struct locarhead)) == -1)
++#endif
+ {
+ close (fd);
+
--
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1ofooe-0002pv...@alioth.debian.org
