[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r5157 - in glibc-package/trunk/debian: . patches/kfreebsd



Author: aurel32
Date: 2012-02-05 10:13:03 +0000 (Sun, 05 Feb 2012)
New Revision: 5157

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
  * kfreebsd/local-sysdeps.diff: update to revision 4080 (from glibc-bsd).
    Closes: #653380.



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2012-02-04 14:42:32 UTC (rev 5156)
+++ glibc-package/trunk/debian/changelog	2012-02-05 10:13:03 UTC (rev 5157)
@@ -4,8 +4,12 @@
   * patches/hurd-i386/local-select.diff: Do not apply the select(0) hack to
     vim, as it hurts its performance badly.
 
- -- Samuel Thibault <sthibault@debian.org>  Sat, 04 Feb 2012 15:40:55 +0100
+  [ Aurelien Jarno ]
+  * kfreebsd/local-sysdeps.diff: update to revision 4080 (from glibc-bsd).
+    Closes: #653380.
 
+ -- Aurelien Jarno <aurel32@debian.org>  Sun, 05 Feb 2012 11:12:52 +0100
+
 eglibc (2.13-26) unstable; urgency=low
 
   [ Aurelien Jarno ]

Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff	2012-02-04 14:42:32 UTC (rev 5156)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff	2012-02-05 10:13:03 UTC (rev 5157)
@@ -3110,7 +3110,7 @@
 +#endif /* ! _SIGSET_H_fns.  */
 --- /dev/null
 +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/socket.h
-@@ -0,0 +1,388 @@
+@@ -0,0 +1,397 @@
 +/* System-specific socket constants and types.  FreeBSD version.
 +   Copyright (C) 1991-1992,1994-1999,2000-2002 Free Software Foundation, Inc.
 +   This file is part of the GNU C Library.
@@ -3169,6 +3169,15 @@
 +#define SOCK_SEQPACKET SOCK_SEQPACKET
 +};
 +
++/*
++ * Structure used by kernel to pass protocol
++ * information in raw sockets.
++ */
++struct sockproto {
++	unsigned short	sp_family;		/* address family */
++	unsigned short	sp_protocol;		/* protocol */
++};
++
 +/* Protocol families.  */
 +#define	PF_UNSPEC	0	/* Unspecified.  */
 +#define	PF_LOCAL	1	/* Local to host (pipes and file-domain).  */
@@ -21184,7 +21193,7 @@
 +
 +	if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0)
 +		return (-1);
-+	xvfsp = malloc(buflen);
++	xvfsp = (struct xvfsconf *) malloc(buflen);
 +	if (xvfsp == NULL)
 +		return (-1);
 +	if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) {


Reply to: