[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r24309 - in /fsf/trunk/libc: ./ locale/ locale/programs/ manual/ ports/
- To: commits@xxxxxxxxxx
- Subject: [Commits] r24309 - in /fsf/trunk/libc: ./ locale/ locale/programs/ manual/ ports/
- From: eglibc@xxxxxxxxxx
- Date: Sat, 19 Oct 2013 07:01:58 -0000
Author: eglibc
Date: Sat Oct 19 00:01:56 2013
New Revision: 24309
Log:
Import glibc-mainline for 2013-10-19
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/locale/locarchive.h
fsf/trunk/libc/locale/programs/localedef.c
fsf/trunk/libc/locale/programs/localedef.h
fsf/trunk/libc/locale/programs/locarchive.c
fsf/trunk/libc/locale/programs/locfile.c
fsf/trunk/libc/manual/crypt.texi
fsf/trunk/libc/ports/ChangeLog
fsf/trunk/libc/ports/ChangeLog.hppa
fsf/trunk/libc/ports/ChangeLog.ia64
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Oct 19 00:01:56 2013
@@ -1,3 +1,24 @@
+2013-10-18 Carlos O'Donell <carlos@xxxxxxxxxx>
+
+ * manual/crypt.texi (Cryptographic Functions): Using SunRPC and
+ AUTH_DES will prevent FIPS 140-2 compliance. Add vindex for
+ AUTH_DES and cindex for FIPS 140-2.
+ (DES Encryption): Add cindex FIPS 46-3.
+
+ * locale/locarchive.h (struct locarhandle): Add fname.
+ * locale/programs/localedef.c (main): Pass ARGV[remaining]
+ if an optional argument was specified to --list-archive,
+ otherwise NULL.
+ * locale/programs/locarchive.c (show_archive_content): Take new
+ argument fname and pass it via ah.fname to open_archive.
+ * locale/programs/localedef.h: Update decl.
+ (open_archive): If AH->fname is non-null, open that file
+ rather than the default file name, and don't ignore ENOENT.
+ (create_archive): Set AH.fname to NULL.
+ (delete_locales_from_archive): Likewise.
+ (add_locales_to_archive): Likewise.
+ * locale/programs/locfile.c (write_all_categories): Likewise.
+
2013-10-18 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
Aldy Hernandez <aldyh@xxxxxxxxxx>
Modified: fsf/trunk/libc/locale/locarchive.h
==============================================================================
--- fsf/trunk/libc/locale/locarchive.h (original)
+++ fsf/trunk/libc/locale/locarchive.h Sat Oct 19 00:01:56 2013
@@ -80,6 +80,8 @@
struct locarhandle
{
+ /* Full path to the locale archive file. */
+ const char *fname;
int fd;
void *addr;
size_t mmaped;
Modified: fsf/trunk/libc/locale/programs/localedef.c
==============================================================================
--- fsf/trunk/libc/locale/programs/localedef.c (original)
+++ fsf/trunk/libc/locale/programs/localedef.c Sat Oct 19 00:01:56 2013
@@ -209,7 +209,7 @@
/* Handle a few special cases. */
if (list_archive)
- show_archive_content (verbose);
+ show_archive_content (remaining > 1 ? argv[remaining] : NULL, verbose);
if (add_to_archive)
return add_locales_to_archive (argc - remaining, &argv[remaining],
replace_archive);
Modified: fsf/trunk/libc/locale/programs/localedef.h
==============================================================================
--- fsf/trunk/libc/locale/programs/localedef.h (original)
+++ fsf/trunk/libc/locale/programs/localedef.h Sat Oct 19 00:01:56 2013
@@ -170,7 +170,9 @@
/* Removed named locales from archive. */
extern int delete_locales_from_archive (size_t nlist, char *list[]);
-/* List content of locale archive. */
-extern void show_archive_content (int verbose) __attribute__ ((noreturn));
+/* List content of locale archive. If FNAME is non-null use that as
+ the locale archive to list, otherwise the default. */
+extern void show_archive_content (const char *fname,
+ int verbose) __attribute__ ((noreturn));
#endif /* localedef.h */
Modified: fsf/trunk/libc/locale/programs/locarchive.c
==============================================================================
--- fsf/trunk/libc/locale/programs/locarchive.c (original)
+++ fsf/trunk/libc/locale/programs/locarchive.c Sat Oct 19 00:01:56 2013
@@ -223,6 +223,7 @@
_("cannot change mode of new locale archive"));
}
+ ah->fname = NULL;
ah->fd = fd;
ah->mmap_base = mmap_base;
ah->mmap_len = mmap_len;
@@ -562,11 +563,17 @@
struct locarhead head;
int retry = 0;
size_t prefix_len = output_prefix ? strlen (output_prefix) : 0;
- char archivefname[prefix_len + sizeof (ARCHIVE_NAME)];
-
- if (output_prefix)
- memcpy (archivefname, output_prefix, prefix_len);
- strcpy (archivefname + prefix_len, ARCHIVE_NAME);
+ char default_fname[prefix_len + sizeof (ARCHIVE_NAME)];
+ char *archivefname = ah->fname;
+
+ /* If ah has a non-NULL fname open that otherwise open the default. */
+ if (archivefname == NULL)
+ {
+ archivefname = default_fname;
+ if (output_prefix)
+ memcpy (archivefname, output_prefix, prefix_len);
+ strcpy (archivefname + prefix_len, ARCHIVE_NAME);
+ }
while (1)
{
@@ -574,8 +581,11 @@
fd = open64 (archivefname, readonly ? O_RDONLY : O_RDWR);
if (fd == -1)
{
- /* Maybe the file does not yet exist. */
- if (errno == ENOENT)
+ /* Maybe the file does not yet exist? If we are opening
+ the default locale archive we ignore the failure and
+ list an empty archive, otherwise we print an error
+ and exit. */
+ if (errno == ENOENT && archivefname == default_fname)
{
if (readonly)
{
@@ -1329,6 +1339,7 @@
/* Open the archive. This call never returns if we cannot
successfully open the archive. */
+ ah.fname = NULL;
open_archive (&ah, false);
while (nlist-- > 0)
@@ -1528,6 +1539,7 @@
/* Open the archive. This call never returns if we cannot
successfully open the archive. */
+ ah.fname = NULL;
open_archive (&ah, false);
head = ah.addr;
@@ -1617,7 +1629,7 @@
void
-show_archive_content (int verbose)
+show_archive_content (const char *fname, int verbose)
{
struct locarhandle ah;
struct locarhead *head;
@@ -1627,6 +1639,7 @@
/* Open the archive. This call never returns if we cannot
successfully open the archive. */
+ ah.fname = fname;
open_archive (&ah, true);
head = ah.addr;
Modified: fsf/trunk/libc/locale/programs/locfile.c
==============================================================================
--- fsf/trunk/libc/locale/programs/locfile.c (original)
+++ fsf/trunk/libc/locale/programs/locfile.c Sat Oct 19 00:01:56 2013
@@ -343,6 +343,7 @@
/* Open the archive. This call never returns if we cannot
successfully open the archive. */
+ ah.fname = NULL;
open_archive (&ah, false);
if (add_locale_to_archive (&ah, locname, to_archive, true) != 0)
Modified: fsf/trunk/libc/manual/crypt.texi
==============================================================================
--- fsf/trunk/libc/manual/crypt.texi (original)
+++ fsf/trunk/libc/manual/crypt.texi Sat Oct 19 00:01:56 2013
@@ -30,8 +30,15 @@
and the other based on the Data Encryption Standard (DES) that is
compatible with Unix systems.
+@vindex AUTH_DES
+@cindex FIPS 140-2
It also provides support for Secure RPC, and some library functions that
-can be used to perform normal DES encryption.
+can be used to perform normal DES encryption. The @code{AUTH_DES}
+authentication flavor in Secure RPC, as provided by @theglibc{},
+uses DES and does not comply with FIPS 140-2 nor does any other use of DES
+within @theglibc{}. It is recommended that Secure RPC should not be used
+for systems that need to comply with FIPS 140-2 since all flavors of
+encrypted authentication use normal DES.
@menu
* Legal Problems:: This software can get you locked up, or worse.
@@ -203,6 +210,7 @@
@node DES Encryption
@section DES Encryption
+@cindex FIPS 46-3
The Data Encryption Standard is described in the US Government Federal
Information Processing Standards (FIPS) 46-3 published by the National
Institute of Standards and Technology. The DES has been very thoroughly
Modified: fsf/trunk/libc/ports/ChangeLog
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog (original)
+++ fsf/trunk/libc/ports/ChangeLog Sat Oct 19 00:01:56 2013
@@ -1,14 +1,3 @@
-2013-10-04 Alan Modra <amodra@xxxxxxxxx>
-
- * sysdeps/ia64/fpu/printf_fphex.c: Adjust for fpnum change.
-
-2013-09-02 Mike Frysinger <vapier@xxxxxxxxxx>
-
- * sysdeps/unix/sysv/linux/hppa/syscalls.list (fanotify_mark): New
- entry.
- * sysdeps/unix/sysv/linux/hppa/Versions (libc): Add GLIBC_2.19 and
- fanotify_mark.
-
2013-01-02 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* README: Update copyright dates in example.
Modified: fsf/trunk/libc/ports/ChangeLog.hppa
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.hppa (original)
+++ fsf/trunk/libc/ports/ChangeLog.hppa Sat Oct 19 00:01:56 2013
@@ -1,6 +1,13 @@
2013-09-11 Andreas Schwab <schwab@xxxxxxx>
* sysdeps/unix/sysv/linux/hppa/bits/fcntl.h (__O_TMPFILE): Define.
+
+2013-09-02 Mike Frysinger <vapier@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/hppa/syscalls.list (fanotify_mark): New
+ entry.
+ * sysdeps/unix/sysv/linux/hppa/Versions (libc): Add GLIBC_2.19 and
+ fanotify_mark.
2013-08-30 OndÃÂej BÃÂlka <neleai@xxxxxxxxx>
Modified: fsf/trunk/libc/ports/ChangeLog.ia64
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.ia64 (original)
+++ fsf/trunk/libc/ports/ChangeLog.ia64 Sat Oct 19 00:01:56 2013
@@ -1,3 +1,7 @@
+2013-10-04 Alan Modra <amodra@xxxxxxxxx>
+
+ * sysdeps/ia64/fpu/printf_fphex.c: Adjust for fpnum change.
+
2013-09-22 Carlos O'Donell <carlos@xxxxxxxxxx>
[BZ #15754]
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits