about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--NEWS2
-rw-r--r--sysdeps/unix/sysv/linux/sys/ptrace.h2
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9fcda2796f..2971fcc684 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-25  Carlos O'Donell  <carlos@redhat.com>
+
+	[BZ #16245]
+	* sysdeps/unix/sysv/linux/sys/ptrace.h (__ptrace_eventcodes):
+	Rename PTRAVE_EVENT_SECCOMP to PTRACE_EVENT_SECCOMP.
+
 2013-11-25  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/powerpc/nofpu/fenv_libc.h (__fegetround): New macro.
diff --git a/NEWS b/NEWS
index 0f70fc1be0..bc68143120 100644
--- a/NEWS
+++ b/NEWS
@@ -19,7 +19,7 @@ Version 2.19
   15905, 15909, 15917, 15919, 15921, 15923, 15939, 15948, 15963, 15966,
   15985, 15988, 15997, 16032, 16034, 16036, 16037, 16041, 16055, 16071,
   16072, 16074, 16078, 16103, 16112, 16143, 16144, 16146, 16150, 16151,
-  16153, 16167, 16172.
+  16153, 16167, 16172, 16245.
 
 * CVE-2012-4412 The strcoll implementation caches indices and rules for
   large collation sequences to optimize multiple passes.  This cache
diff --git a/sysdeps/unix/sysv/linux/sys/ptrace.h b/sysdeps/unix/sysv/linux/sys/ptrace.h
index 2b78565db1..8aa4c087ea 100644
--- a/sysdeps/unix/sysv/linux/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sys/ptrace.h
@@ -184,7 +184,7 @@ enum __ptrace_eventcodes
   PTRACE_EVENT_EXEC	= 4,
   PTRACE_EVENT_VFORK_DONE = 5,
   PTRACE_EVENT_EXIT	= 6,
-  PTRAVE_EVENT_SECCOMP  = 7
+  PTRACE_EVENT_SECCOMP  = 7
 };
 
 /* Arguments for PTRACE_PEEKSIGINFO.  */