Index: libshouldbeinlibc/maptime.c
===================================================================
RCS file: /cvsroot/hurd/hurd/libshouldbeinlibc/maptime.c,v
retrieving revision 1.4
diff -u -r1.4 maptime.c
--- libshouldbeinlibc/maptime.c	23 Jul 1997 17:43:31 -0000	1.4
+++ libshouldbeinlibc/maptime.c	8 Aug 2003 17:56:23 -0000
@@ -1,6 +1,6 @@
 /* Support for mach's mapped time
 
-   Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 2003 Free Software Foundation, Inc.
 
    Written by Miles Bader <miles@gnu.ai.mit.edu>
 
@@ -45,7 +45,17 @@
       err = get_privileged_ports (0, &device_master);
       if (! err)
 	{
-	  err = device_open (device_master, 0, dev_name ?: "time", &device);
+#ifdef KERNEL_SECURITY_TOKEN_VALUE
+	  security_token_t sec_token = KERNEL_SECURITY_TOKEN_VALUE;
+#endif
+	  err = device_open (device_master,
+#ifdef KERN_INVALID_LEDGER
+			     MACH_PORT_NULL, 0,  /* OSF Mach */
+#endif
+#ifdef KERNEL_SECURITY_TOKEN_VALUE
+			     sec_token,  /* OSF Mach */
+#endif
+			     dev_name ?: "time", &device);
 	  mach_port_deallocate (mach_task_self (), device_master);
 	}
 
Index: libshouldbeinlibc/portinfo.c
===================================================================
RCS file: /cvsroot/hurd/hurd/libshouldbeinlibc/portinfo.c,v
retrieving revision 1.7
diff -u -r1.7 portinfo.c
--- libshouldbeinlibc/portinfo.c	8 May 2002 09:24:24 -0000	1.7
+++ libshouldbeinlibc/portinfo.c	8 Aug 2003 17:56:23 -0000
@@ -1,6 +1,6 @@
 /* Print information about a task's ports
 
-   Copyright (C) 1996,98,99,2002 Free Software Foundation, Inc.
+   Copyright (C) 1996,98,99,2002,2003 Free Software Foundation, Inc.
    Written by Miles Bader <miles@gnu.org>
 
    This program is free software; you can redistribute it and/or
@@ -62,7 +62,15 @@
       if (show & PORTINFO_DETAILS)
 	{
 	  struct mach_port_status status;
+#ifdef MACH_PORT_RECEIVE_STATUS
+	  mach_msg_type_number_t cnt = MACH_PORT_RECEIVE_STATUS_COUNT;
+	  error_t err = mach_port_get_attributes (task, name,
+						  MACH_PORT_RECEIVE_STATUS,
+						  (mach_port_info_t) &status,
+						  &cnt);
+#else
 	  error_t err = mach_port_get_receive_status (task, name, &status);
+#endif
 	  if (! err)
 	    {
 	      fprintf (stream, " (");
Index: libshouldbeinlibc/wire.c
===================================================================
RCS file: /cvsroot/hurd/hurd/libshouldbeinlibc/wire.c,v
retrieving revision 1.11
diff -u -r1.11 wire.c
--- libshouldbeinlibc/wire.c	8 May 2002 09:24:20 -0000	1.11
+++ libshouldbeinlibc/wire.c	8 Aug 2003 17:56:23 -0000
@@ -1,5 +1,5 @@
 /* Function to wire down text and data (including from shared libraries)
-   Copyright (C) 1996,99,2000,01,02 Free Software Foundation, Inc.
+   Copyright (C) 1996,99,2000,01,02,03 Free Software Foundation, Inc.
    Written by Michael I. Bushnell, p/BSG.
 
    This file is part of the GNU Hurd.
@@ -82,27 +82,43 @@
 static void
 wire_segment_internal (vm_address_t start,
 		       vm_size_t len,
-		       host_priv_t host_priv)
+		       mach_port_t host_priv)
 {
   vm_address_t addr;
   vm_size_t size;
   vm_prot_t protection;
   vm_prot_t max_protection;
+#ifdef VM_REGION_BASIC_INFO
+  vm_region_basic_info_data_t info;
+  mach_msg_type_number_t cnt = VM_REGION_BASIC_INFO_COUNT;
+#else
   vm_inherit_t inheritance;
   boolean_t shared;
-  mach_port_t object_name;
   vm_offset_t offset;
+#endif
+  mach_port_t object_name;
   error_t err;
   volatile char *poke;
 
   do
     {
       addr = start;
-      err = vm_region (mach_task_self (), &addr, &size, &protection,
-		       &max_protection, &inheritance, &shared, &object_name,
-		       &offset);
+      err = vm_region (mach_task_self (), &addr, &size,
+#ifdef VM_REGION_BASIC_INFO
+		       VM_REGION_BASIC_INFO, (vm_region_info_t) &info,
+		       &cnt, &object_name
+#else
+		       &protection, &max_protection, &inheritance, &shared,
+		       &object_name, &offset
+#endif
+		       );
       if (err)
 	return;
+
+#ifdef VM_REGION_BASIC_INFO
+      protection = info.protection;
+      max_protection = info.max_protection;
+#endif
 
       /* The current region begins at ADDR and is SIZE long.  If it
       	 extends beyond the LEN, prune it. */