[Glibc-bsd-commits] r5550 - in trunk/kfreebsd-kernel-headers/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-19 23:27:15 +0000 (Fri, 19 Sep 2014)
New Revision: 5550

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
Log:
000_bruno_haible.diff: update sys/timex.h diff from upstream:
- define ntptimeval as ntptimeval4 (Closes: #756786)
- add missing extern declarations for ntp_adjtime, ntp_gettime


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2014-09-19 22:45:01 UTC (rev 5549)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2014-09-19 23:27:15 UTC (rev 5550)
@@ -1,3 +1,12 @@
+kfreebsd-kernel-headers (10.1~3) UNRELEASED; urgency=medium
+
+  [ Steven Chamberlain ]
+  * 000_bruno_haible.diff: update sys/timex.h diff from upstream:
+    - define ntptimeval as ntptimeval4 (Closes: #756786)
+    - add missing extern declarations for ntp_adjtime, ntp_gettime
+
+ -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Sat, 20 Sep 2014 00:22:24 +0100
+
 kfreebsd-kernel-headers (10.1~2) experimental; urgency=medium
 
   [ Christoph Egger ]

Modified: trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2014-09-19 22:45:01 UTC (rev 5549)
+++ trunk/kfreebsd-kernel-headers/debian/patches/000_bruno_haible.diff	2014-09-19 23:27:15 UTC (rev 5550)
@@ -1,32 +1,3 @@
----
- sys/amd64/include/pcb.h |    1 
- sys/i386/include/npx.h  |    2 
- sys/i386/include/pcb.h  |    2 
- sys/i386/include/pmap.h |    7 ++
- sys/net/if_arp.h        |   14 +++++
- sys/net/if_dl.h         |   14 ++---
- sys/nfsclient/nfs.h     |    5 ++
- sys/sys/callout.h       |    2 
- sys/sys/dvdio.h         |    2 
- sys/sys/extattr.h       |   52 ++++++++++-----------
- sys/sys/filedesc.h      |    1 
- sys/sys/jail.h          |   16 ++++--
- sys/sys/linker.h        |   22 +++++----
- sys/sys/lock.h          |    1 
- sys/sys/memrange.h      |    7 ++
- sys/sys/pciio.h         |    2 
- sys/sys/procfs.h        |    4 +
- sys/sys/resourcevar.h   |    2 
- sys/sys/rtprio.h        |   12 +++-
- sys/sys/signalvar.h     |   10 +++-
- sys/sys/sysctl.h        |  116 +++++++++++++++++++++++++++++++++++++++++++++---
- sys/sys/timepps.h       |    2 
- sys/sys/timex.h         |   21 +++++---
- sys/sys/ucred.h         |    3 +
- sys/vm/vm.h             |    2 
- sys/vm/vm_map.h         |    6 ++
- 26 files changed, 262 insertions(+), 66 deletions(-)
-
 --- a/sys/amd64/include/pcb.h
 +++ b/sys/amd64/include/pcb.h
 @@ -40,6 +40,7 @@
@@ -515,7 +486,7 @@
  
 --- a/sys/sys/timex.h
 +++ b/sys/sys/timex.h
-@@ -179,7 +179,13 @@
+@@ -179,7 +179,14 @@
   * Note: The time member is in microseconds if STA_NANO is zero and
   * nanoseconds if not.
   */
@@ -526,25 +497,25 @@
 +	long esterror;		/* estimated error (us) (ro) */
 +	int time_state;		/* time status */
 +};
++#define ntptimeval	ntptimeval4
 +struct ntptimeval4 {
  	struct timespec time;	/* current time (ns) (ro) */
  	long maxerror;		/* maximum error (us) (ro) */
  	long esterror;		/* estimated error (us) (ro) */
-@@ -228,9 +234,12 @@
- #else /* !_KERNEL */
- #include <sys/cdefs.h>
+@@ -234,6 +241,13 @@
+ __END_DECLS
+ #endif /* _KERNEL */
  
-+#define NTP_API		4	/* NTP API version */
-+#define ntptimeval	ntptimeval4
++#else /* !__FreeBSD__ */
 +
- __BEGIN_DECLS
--int	ntp_adjtime(struct timex *);
--int	ntp_gettime(struct ntptimeval *);
++__BEGIN_DECLS
 +extern int	ntp_adjtime(struct timex *) __THROW;
 +extern int	ntp_gettime(struct ntptimeval *) __THROW;
- __END_DECLS
- #endif /* _KERNEL */
++__END_DECLS
++
+ #endif /* __FreeBSD__ */
  
+ #endif /* !_SYS_TIMEX_H_ */
 --- a/sys/sys/ucred.h
 +++ b/sys/sys/ucred.h
 @@ -33,6 +33,9 @@