rpms/valgrind/F-12 valgrind-3.5.0-adjtimex.patch, NONE, 1.1 valgrind.spec, 1.76, 1.77

[Jakub Jelinek]

Author: jakub

Update of /cvs/pkgs/rpms/valgrind/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30128

Modified Files:
	valgrind.spec 
Added Files:
	valgrind-3.5.0-adjtimex.patch 
Log Message:
3.5.0-11.fc12

valgrind-3.5.0-adjtimex.patch:
 coregrind/m_syswrap/syswrap-linux.c |    3 ++-
 include/vki/vki-linux.h             |    1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE valgrind-3.5.0-adjtimex.patch ---
--- valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2009-12-08 16:11:18.000000000 +0100
+++ valgrind-3.5.0/coregrind/m_syswrap/syswrap-linux.c	2009-12-09 15:06:39.000000000 +0100
@@ -627,7 +627,8 @@ PRE(sys_adjtimex)
       PRE_MEM_READ( "adjtimex(timex->"#field")",	\
 		    (Addr)&tx->field, sizeof(tx->field))
 
-   ADJX(VKI_ADJ_OFFSET, offset);
+   if ((tx->modes & VKI_ADJ_OFFSET_SS_READ) != VKI_ADJ_OFFSET_SS_READ)
+      ADJX(VKI_ADJ_OFFSET, offset);
    ADJX(VKI_ADJ_FREQUENCY, freq);
    ADJX(VKI_ADJ_MAXERROR, maxerror);
    ADJX(VKI_ADJ_ESTERROR, esterror);
--- valgrind-3.5.0/include/vki/vki-linux.h	2009-12-08 16:11:18.000000000 +0100
+++ valgrind-3.5.0/include/vki/vki-linux.h	2009-12-09 15:04:20.000000000 +0100
@@ -285,6 +285,7 @@ struct vki_timex {
 #define VKI_ADJ_TIMECONST		0x0020	/* pll time constant */
 #define VKI_ADJ_TICK			0x4000	/* tick value */
 //#define VKI_ADJ_OFFSET_SINGLESHOT	0x8001	/* old-fashioned adjtime */
+#define VKI_ADJ_OFFSET_SS_READ		0xa001	/* read-only adjtime */
 
 //----------------------------------------------------------------------
 // From linux-2.6.8.1/include/linux/times.h


Index: valgrind.spec
===================================================================
RCS file: /cvs/pkgs/rpms/valgrind/F-12/valgrind.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- valgrind.spec	2 Dec 2009 15:15:14 -0000	1.76
+++ valgrind.spec	21 Dec 2009 10:57:44 -0000	1.77
@@ -1,7 +1,7 @@
 Summary: Tool for finding memory management bugs in programs
 Name: valgrind
 Version: 3.5.0
-Release: 10%{?dist}
+Release: 11%{?dist}
 Epoch: 1
 Source0: http://www.valgrind.org/downloads/valgrind-%{version}.tar.bz2
 Patch1: valgrind-3.5.0-cachegrind-improvements.patch
@@ -22,6 +22,7 @@ Patch15: valgrind-3.5.0-preadv.patch
 Patch16: valgrind-3.5.0-glibc-2.11.patch
 Patch17: valgrind-3.5.0-syscalls2.patch
 Patch18: valgrind-3.5.0-dynbss.patch
+Patch19: valgrind-3.5.0-adjtimex.patch
 License: GPLv2
 URL: http://www.valgrind.org/
 Group: Development/Debuggers
@@ -93,6 +94,7 @@ or valgrind plugins.
 %patch16 -p1
 %patch17 -p1
 %patch18 -p1
+%patch19 -p1
 
 %build
 %ifarch x86_64 ppc64
@@ -178,6 +180,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 21 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-11
+- don't require offset field to be set in adjtimex's
+  ADJ_OFFSET_SS_READ mode (#545866)
+
 * Wed Dec  2 2009 Jakub Jelinek <jakub at redhat.com> 3.5.0-10
 - add handling of a bunch of recent syscalls and fix some
   other syscall wrappers (Dodji Seketeli)