r4036 - in glibc-package/trunk/debian: . patches patches/any
Author: aurel32
Date: 2009-12-25 19:54:44 +0000 (Fri, 25 Dec 2009)
New Revision: 4036
Added:
glibc-package/trunk/debian/patches/any/local-ntp-update.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series
Log:
* Add debian/patches/any/local-ntp-update.diff to partially update the NTP
API, backported from upstream. Closes: #559482.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-12-25 13:59:35 UTC (rev 4035)
+++ glibc-package/trunk/debian/changelog 2009-12-25 19:54:44 UTC (rev 4036)
@@ -14,6 +14,8 @@
* debian/local/manpages/gai.conf.5: fix a typo. Closes: #560144.
* Replace debian/any/submitted-nis-not-configured.diff by upstream patch
debian/any/cvs-nis-not-configured.diff.
+ * Add debian/patches/any/local-ntp-update.diff to partially update the NTP
+ API, backported from upstream. Closes: #559482.
[ Samuel Thibault ]
* testsuite-checking/expected-results-i486-linux-gnu-libc: Add hurd-i386
Added: glibc-package/trunk/debian/patches/any/local-ntp-update.diff
===================================================================
--- glibc-package/trunk/debian/patches/any/local-ntp-update.diff (rev 0)
+++ glibc-package/trunk/debian/patches/any/local-ntp-update.diff 2009-12-25 19:54:44 UTC (rev 4036)
@@ -0,0 +1,13 @@
+Partial update of the NTP API, backported from commit eb4157390cac6212921ef198353635e138dc0a00
+
+--- a/sysdeps/unix/sysv/linux/sys/timex.h
++++ b/sysdeps/unix/sysv/linux/sys/timex.h
+@@ -85,6 +85,8 @@
+ #define MOD_TIMECONST ADJ_TIMECONST
+ #define MOD_CLKB ADJ_TICK
+ #define MOD_CLKA ADJ_OFFSET_SINGLESHOT /* 0x8000 in original */
++#define MOD_MICRO ADJ_MICRO
++#define MOD_NANO ADJ_NANO
+
+
+ /* Status codes (timex.status) */
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2009-12-25 13:59:35 UTC (rev 4035)
+++ glibc-package/trunk/debian/patches/series 2009-12-25 19:54:44 UTC (rev 4036)
@@ -218,3 +218,4 @@
any/cvs-nis-not-configured.diff
any/submitted-getaddrinfo-nodata.diff
any/submitted-gethostbyname3.diff
+any/local-ntp-update.diff
Reply to: