diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | iconv/iconv_prog.c | 2 | ||||
| -rw-r--r-- | ports/ChangeLog.alpha | 5 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/alpha/nptl/pt-vfork.S | 2 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/alpha/nptl/vfork.S | 2 | ||||
| -rw-r--r-- | stdio-common/psiginfo-data.h | 2 |
7 files changed, 18 insertions, 8 deletions
@@ -1,3 +1,8 @@ +2013-10-12 Yuri Chornoivan <yurchor@ukr.net> + + * iconv/iconv_prog.c: Fix typos. + * stdio-common/psiginfo-data.h: Likewise. + 2013-10-12 Reuben Thomas <rrt@sc3d.org> [BZ #15764] @@ -12,10 +12,10 @@ Version 2.19 156, 431, 13982, 13985, 14155, 14547, 14699, 14910, 15048, 15362, 15400, 15427, 15522, 15531, 15532, 15608, 15609, 15610, 15632, 15640, 15680, 15681, 15723, 15734, 15735, 15736, 15748, 15749, 15754, 15760, 15764, - 15797, 15844, 15849, 15855, 15856, 15857, 15859, 15867, 15886, 15887, - 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923, - 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, 15923, - 15939, 15963, 15966, 15988, 16032, 16034, 16036. + 15797, 15844, 15847, 15849, 15855, 15856, 15857, 15859, 15867, 15886, + 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, + 15887, 15890, 15892, 15893, 15895, 15897, 15905, 15909, 15919, 15921, + 15923, 15939, 15963, 15966, 15988, 16032, 16034, 16036. * CVE-2012-4412 The strcoll implementation caches indices and rules for large collation sequences to optimize multiple passes. This cache diff --git a/iconv/iconv_prog.c b/iconv/iconv_prog.c index 1a1d0d0..11c7f08 100644 --- a/iconv/iconv_prog.c +++ b/iconv/iconv_prog.c @@ -789,7 +789,7 @@ print_known_names (void) if (human_readable) fputs (_("\ -The following list contain all the coded character sets known. This does\n\ +The following list contains all the coded character sets known. This does\n\ not necessarily mean that all combinations of these names can be used for\n\ the FROM and TO command line parameters. One coded character set can be\n\ listed with several different names (aliases).\n\n "), stdout); diff --git a/ports/ChangeLog.alpha b/ports/ChangeLog.alpha index 218cfad..68d430d 100644 --- a/ports/ChangeLog.alpha +++ b/ports/ChangeLog.alpha @@ -1,3 +1,8 @@ +2013-10-12 Yuri Chornoivan <yurchor@ukr.net> + + * sysdeps/unix/sysv/linux/alpha/nptl/pt-vfork.S: Fix typos. + * sysdeps/unix/sysv/linux/alpha/nptl/vfork.S: Likewise. + 2013-10-01 Richard Henderson <rth@redhat.com> * sysdeps/unix/alpha/sysdep.h (PTR_MANGLE): Improve conditions under diff --git a/ports/sysdeps/unix/sysv/linux/alpha/nptl/pt-vfork.S b/ports/sysdeps/unix/sysv/linux/alpha/nptl/pt-vfork.S index d9629b9..50b152d 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/pt-vfork.S +++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/pt-vfork.S @@ -25,7 +25,7 @@ ldl a2, PID_OFFSET(v0); \ mov v0, a1; \ /* Write back its negation, to indicate that the pid value is \ - uninitialized in the the child, and in the window between \ + uninitialized in the child, and in the window between \ here and the point at which we restore the value. */ \ negl a2, t0; \ stl t0, PID_OFFSET(v0); diff --git a/ports/sysdeps/unix/sysv/linux/alpha/nptl/vfork.S b/ports/sysdeps/unix/sysv/linux/alpha/nptl/vfork.S index 1ca7678..03aa37f 100644 --- a/ports/sysdeps/unix/sysv/linux/alpha/nptl/vfork.S +++ b/ports/sysdeps/unix/sysv/linux/alpha/nptl/vfork.S @@ -26,7 +26,7 @@ mov v0, a1; \ /* If the cached value is initialized (nonzero), then write \ back its negation, or INT_MIN, to indicate that the pid \ - value is uninitialized in the the child, and in the window \ + value is uninitialized in the child, and in the window \ between here and the point at which we restore the value. */ \ ldah t0, -0x8000; \ negl a2, t1; \ diff --git a/stdio-common/psiginfo-data.h b/stdio-common/psiginfo-data.h index 02ebf8a..05bb76c 100644 --- a/stdio-common/psiginfo-data.h +++ b/stdio-common/psiginfo-data.h @@ -34,7 +34,7 @@ P (TRAP_TRACE, N_("Process trace trap")) #if NOW == SIGCLD P (CLD_EXITED, N_("Child has exited")) P (CLD_KILLED, N_("Child has terminated abnormally and did not create a core file")) -P (CLD_DUMPED, N_("Child hat terminated abnormally and created a core file")) +P (CLD_DUMPED, N_("Child has terminated abnormally and created a core file")) P (CLD_TRAPPED, N_("Traced child has trapped")) P (CLD_STOPPED, N_("Child has stopped")) P (CLD_CONTINUED, N_("Stopped child has continued")) |