r4712 - in glibc-package/trunk/debian: . patches/kfreebsd
Author: aurel32
Date: 2011-06-05 11:23:38 +0000 (Sun, 05 Jun 2011)
New Revision: 4712
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
Log:
* kfreebsd/local-sysdeps.diff, update to revision 3402 (from glibc-bsd),
to fix <sys/mount.h>. Closes: #629289.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-06-04 22:27:29 UTC (rev 4711)
+++ glibc-package/trunk/debian/changelog 2011-06-05 11:23:38 UTC (rev 4712)
@@ -1,3 +1,10 @@
+eglibc (2.13-6) UNRELEASED; urgency=low
+
+ * kfreebsd/local-sysdeps.diff, update to revision 3402 (from glibc-bsd),
+ to fix <sys/mount.h>. Closes: #629289.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 05 Jun 2011 00:27:40 +0200
+
eglibc (2.13-5) unstable; urgency=low
[ Aurelien Jarno ]
Modified: glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff
===================================================================
--- glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2011-06-04 22:27:29 UTC (rev 4711)
+++ glibc-package/trunk/debian/patches/kfreebsd/local-sysdeps.diff 2011-06-05 11:23:38 UTC (rev 4712)
@@ -22686,8 +22686,8 @@
+#define MAXFIDSZ 16
+
+struct fid {
-+ u_short fid_len; /* length of data in bytes */
-+ u_short fid_reserved; /* force longword alignment */
++ __u_short fid_len; /* length of data in bytes */
++ __u_short fid_reserved; /* force longword alignment */
+ char fid_data[MAXFIDSZ]; /* data (variable length) */
+};
+
@@ -22835,8 +22835,8 @@
+ * Generic file handle
+ */
+struct fhandle {
-+ fsid_t fh_fsid; /* Filesystem id of mount point */
-+ struct fid fh_fid; /* Filesys specific id */
++ __fsid_t fh_fsid; /* Filesystem id of mount point */
++ struct fid fh_fid; /* Filesys specific id */
+};
+typedef struct fhandle fhandle_t;
+
@@ -22844,14 +22844,14 @@
+ * Export arguments for local filesystem mount calls.
+ */
+struct export_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 */
++ 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 */
+};
+
+/*
@@ -22873,7 +22873,7 @@
+ * XXX: Never change the first two arguments!
+ */
+struct vfsconf {
-+ u_int vfc_version; /* ABI version number */
++ __u_int vfc_version; /* ABI version number */
+ char vfc_name[MFSNAMELEN]; /* filesystem type name */
+ struct vfsops *vfc_vfsops; /* filesystem operations vector */
+ int vfc_typenum; /* historic filesystem type number */
@@ -22919,7 +22919,7 @@
+
+struct vfsidctl {
+ int vc_vers; /* should be VFSIDCTL_VERS1 (below) */
-+ fsid_t vc_fsid; /* fsid to operate on. */
++ __fsid_t vc_fsid; /* fsid to operate on. */
+ char vc_fstypename[MFSNAMELEN];
+ /* type of fs 'nfs' or '*' */
+ fsctlop_t vc_op; /* operation VFS_CTL_* (below) */
Reply to: