[glibc] 01/01: patches/kfreebsd/local-sysdeps.diff: update to revision 6032 (from glibc-bsd) to fix FTBFS. Closes: #822143.
This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 44bcc8bfea439057bef2c8f34b252c5964722ef4
Author: Aurelien Jarno <aurelien@aurel32.net>
Date: Wed Apr 27 11:17:41 2016 +0200
patches/kfreebsd/local-sysdeps.diff: update to revision 6032 (from glibc-bsd) to fix FTBFS. Closes: #822143.
---
debian/changelog | 4 +--
debian/patches/kfreebsd/local-sysdeps.diff | 41 ++++++++++++++++++------------
2 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a5099dc..9b88a99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,8 @@ glibc (2.22-8) UNRELEASED; urgency=medium
IPV6_*PKT* macros.
[ Aurelien Jarno ]
- * patches/kfreebsd/local-sysdeps.diff: update to revision 6015 (from
- glibc-bsd) to fix FTBFS.
+ * patches/kfreebsd/local-sysdeps.diff: update to revision 6032 (from
+ glibc-bsd) to fix FTBFS. Closes: #822143.
* patches/arm/unsubmitted-ldconfig-cache-abi.diff: apply fix from Steve
McIntyre to fix an armhf ABI detection crash in ldconfig on arm64.
Closes: #822489.
diff --git a/debian/patches/kfreebsd/local-sysdeps.diff b/debian/patches/kfreebsd/local-sysdeps.diff
index 2184fd3..51dd05b 100644
--- a/debian/patches/kfreebsd/local-sysdeps.diff
+++ b/debian/patches/kfreebsd/local-sysdeps.diff
@@ -23038,7 +23038,7 @@
+#endif /* net/ethernet.h */
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/net/if.h
-@@ -0,0 +1,438 @@
+@@ -0,0 +1,444 @@
+/*-
+ * Copyright (c) 1982, 1986, 1989, 1993
+ * The Regents of the University of California. All rights reserved.
@@ -23134,6 +23134,9 @@
+ unsigned long ifi_hwassist; /* HW offload capabilities, see IFCAP */
+ time_t ifi_epoch; /* uptime at attach or stat reset */
+ struct timeval ifi_lastchange; /* time of last administrative change */
++#ifdef _IFI_OQDROPS
++ unsigned long ifi_oqdrops; /* dropped on output */
++#endif
+};
+
+/*-
@@ -23411,16 +23414,6 @@
+#define ifc_req ifc_ifcu.ifcu_req /* array of structures returned */
+};
+
-+#if defined (__amd64__) || defined (COMPAT_32BIT)
-+struct ifconf32 {
-+ int ifc_len; /* size of associated buffer */
-+ union {
-+ unsigned int ifcu_buf;
-+ unsigned int ifcu_req;
-+ } ifc_ifcu;
-+};
-+#endif
-+
+/*
+ * interface groups
+ */
@@ -23464,6 +23457,19 @@
+ struct sockaddr_storage dstaddr; /* out */
+};
+
++/*
++ * Structure used to request i2c data
++ * from interface transceivers.
++ */
++struct ifi2creq {
++ unsigned char dev_addr; /* i2c address (0xA0, 0xA2) */
++ unsigned char offset; /* read offset */
++ unsigned char len; /* read length */
++ unsigned char spare0;
++ unsigned int spare1;
++ unsigned char data[8]; /* read buffer */
++};
++
+struct if_nameindex {
+ unsigned int if_index; /* 1, 2, ... */
+ char *if_name; /* null terminated name: "le0", ... */
@@ -28646,7 +28652,7 @@
+#endif /* sys/swap.h */
--- /dev/null
+++ b/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/syscall.h
-@@ -0,0 +1,502 @@
+@@ -0,0 +1,505 @@
+#ifndef _SYSCALL_H
+#define _SYSCALL_H 1
+
@@ -28655,7 +28661,7 @@
+ *
+ * DO NOT EDIT-- this file is automatically generated.
+ * $FreeBSD$
-+ * created from FreeBSD: head/sys/kern/syscalls.master 250853 2013-05-21 11:40:16Z kib
++ * created from FreeBSD: stable/10/sys/kern/syscalls.master 293474 2016-01-09 14:20:23Z dchagin
+ */
+
+#define SYS_syscall 0
@@ -29114,9 +29120,12 @@
+#define SYS_chflagsat 540
+#define SYS_accept4 541
+#define SYS_pipe2 542
-+#define SYS_aio_mlock 543
-+#define SYS_procctl 544
-+#define SYS_MAXSYSCALL 545
++#define SYS_aio_mlock 543
++#define SYS_procctl 544
++#define SYS_ppoll 545
++#define SYS_futimens 546
++#define SYS_utimensat 547
++#define SYS_MAXSYSCALL 548
+
+#define SYS_obreak SYS_break
+#define SYS_sysctl SYS___sysctl
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-glibc/glibc.git
Reply to: