r5131 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: ps-guest
Date: 2012-01-24 09:09:37 +0000 (Tue, 24 Jan 2012)
New Revision: 5131
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
kfreebsd/local-sysdeps.diff: update to revision 4002 (from glibc-bsd). Closes: #630203.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-01-24 08:01:42 UTC (rev 5130)
+++ glibc-package/trunk/debian/changelog 2012-01-24 09:09:37 UTC (rev 5131)
@@ -19,6 +19,8 @@
fix error value.
[ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 4002 (from glibc-bsd).
+ Closes: #630203.
* fixup kfreebsd/local-use-thr-primitives.diff
-- Samuel Thibault <sthibault@debian.org> Tue, 27 Dec 2011 02:02:41 +0100
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2012-01-24 08:01:42 UTC (rev 5130)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2012-01-24 09:09:37 UTC (rev 5131)
@@ -4394,9 +4394,9 @@
+#endif /* need timeval */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/bits/typesizes.h
-@@ -0,0 +1,82 @@
+@@ -0,0 +1,90 @@
+/* bits/typesizes.h -- underlying types for *_t. kFreeBSD version.
-+ Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
++ Copyright (C) 2002, 2003, 2010, 2012 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
@@ -4443,7 +4443,15 @@
+#define __FSFILCNT_T_TYPE __ULONGWORD_TYPE
+#define __FSFILCNT64_T_TYPE __UQUAD_TYPE
+#define __ID_T_TYPE __U32_TYPE
++
++#if defined(__arm__) || defined(__powerpc__)
++#define __CLOCK_T_TYPE __U32_TYPE
++#elif defined(__i386__)
++/* clock_t is unsigned in FreeBSD/i386, but it's too late to fix that now... */
+#define __CLOCK_T_TYPE __S32_TYPE
++#else
++#define __CLOCK_T_TYPE __S32_TYPE
++#endif
+
+/*
+ * This one is a bit tricky. It needs to match the size
@@ -20768,7 +20776,7 @@
+#endif /* sys/kd.h */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/mount.h
-@@ -0,0 +1,437 @@
+@@ -0,0 +1,454 @@
+/* Header file for handling mounted filesystems. FreeBSD version.
+ Copyright (C) 2002 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
@@ -20963,8 +20971,23 @@
+typedef struct fhandle fhandle_t;
+
+/*
++ * Old export arguments without security flavor list
++ */
++struct oexport_args {
++ int ex_flags; /* export related flags */
++ uid_t ex_root; /* mapping for root uid */
++ struct xucred ex_anon; /* mapping for anonymous user */
++ struct sockaddr *ex_addr; /* net address to which exported */
++ __u_char ex_addrlen; /* and the net address length */
++ struct sockaddr *ex_mask; /* mask of valid bits in saddr */
++ __u_char ex_masklen; /* and the smask length */
++ char *ex_indexfile; /* index file for WebNFS URLs */
++};
++
++/*
+ * Export arguments for local filesystem mount calls.
+ */
++#define MAXSECFLAVORS 5
+struct export_args {
+ int ex_flags; /* export related flags */
+ uid_t ex_root; /* mapping for root uid */
@@ -20974,6 +20997,8 @@
+ struct sockaddr *ex_mask; /* mask of valid bits in saddr */
+ __u_char ex_masklen; /* and the smask length */
+ char *ex_indexfile; /* index file for WebNFS URLs */
++ int ex_numsecflavors; /* security flavor count */
++ int ex_secflavors[MAXSECFLAVORS]; /* list of security flavors */
+};
+
+/*
@@ -21208,7 +21233,7 @@
+#endif /* _SYS_MOUNT_H */
--- /dev/null
+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/sys/param.h
-@@ -0,0 +1,238 @@
+@@ -0,0 +1,239 @@
+/* Copyright (C) 1995,1996,1997,2000,2001,2003 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
@@ -21305,6 +21330,7 @@
+#else
+# define roundup(x, y) ((((x) + ((y) - 1)) / (y)) * (y))
+#endif
++#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1))) /* if y is powers of two */
+#define powerof2(x) ((((x) - 1) & (x)) == 0)
+
+/* Macros for min/max. */
Reply to: