* New snapshot from CVS.

    + Includes a patch to make pthread_* function aliases strong.
    (Closes: #407208)
    +  debian/patches/console_ioperms.patch: Removed, fixed upstream.
    +  debian/patches/no-debian-dir.patch: Removed, applied upstream.

5 files changed, 6 insertions, 443 deletions

diff --git a/debian/changelog b/debian/changelog
index 7c8b442a..eae55f37 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,14 @@
-hurd (20060825-2+SVN) unreleased; urgency=low
+hurd (20070605-0+SVN) unreleased; urgency=low
 
+  * New snapshot from CVS.
+    + Includes a patch to make pthread_* function aliases strong.
+    (Closes: #407208)
+    +  debian/patches/console_ioperms.patch: Removed, fixed upstream.
+    +  debian/patches/no-debian-dir.patch: Removed, applied upstream.
   * debian/local/soundcard.h: Updated by Samuel Thibault.
-  * debian/patches/pthread_mutex_strong_alias.patch: New patch by 
-    Samuel Thibault. (Closes: #407208)
   * debian/control (Build-Depends): Added libc0.3-dev (>= 2.5-5).
   * debian/copyright: Clarify that the package is maintained by the
     Debian GNU Hurd maintainers and no longer by upstream.
-  * debian/patches/glibc_stat_updates.patch: New patch, updates for 
-    stat changes in glibc, by Thomas Schwinge.
-  * debian/patches/convert_nano_to_microseconds_fix.patch: New patch,
-    fix conversion from nanoseconds to microseconds, taken from CVS.
 
  -- Michael Banck <mbanck@debian.org>  Sat,  7 Oct 2006 14:31:57 +0200
 
diff --git a/debian/patches/console_ioperms.patch b/debian/patches/console_ioperms.patch
deleted file mode 100644
index feb6528c..00000000
--- a/debian/patches/console_ioperms.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-2006-01-02  Samuel Thibault  <samuel.thibault@ens-lyon.org>
-
-        * generic-speaker.c: include <mach.h>, <mach/i386/mach_i386.h> and
-        <device/device.h> for IO ports access.
-	(kd_port): New variable.
-	(generic_speaker_start): Add IO ports access request for gnumach1.
-        * vga-support.c: include <mach.h>, <mach/i386/mach_i386.h> and
-        <device/device.h> for IO ports access.
-	(kd_port): New variable.
-	(vga_init): Add IO ports access request for gnumach1.
-	(vga_fini): Add IO ports access relinquish for gnumach1.
-
-Index: console-client/generic-speaker.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/console-client/generic-speaker.c,v
-retrieving revision 1.4
-diff -u -u -r1.4 generic-speaker.c
---- console-client/generic-speaker.c	21 Mar 2004 19:57:00 -0000	1.4
-+++ console-client/generic-speaker.c	2 Jan 2006 22:47:54 -0000
-@@ -25,6 +25,10 @@
- 
- #include <cthreads.h>
- 
-+#include <mach.h>
-+#include <mach/i386/mach_i386.h>
-+#include <device/device.h>
-+
- #include "driver.h"
- #include "timer.h"
- 
-@@ -40,6 +44,9 @@
- static struct bell_ops generic_speaker_ops;
- 
- 
-+/* Port for i/o access.  */
-+static mach_port_t kd_port;
-+
- /* The speaker port.  */
- #define SPEAKER			0x61
- 
-@@ -477,6 +484,18 @@
-     return errno;
-   if (ioperm (PIT_COUNTER_2, PIT_CTRL - PIT_COUNTER_2 + 1, 1) < 0)
-     return errno;
-+#else
-+  mach_port_t priv;
-+  err = get_privileged_ports (NULL, &priv);
-+  if (err)
-+    return err;
-+  err = device_open(priv, D_READ|D_WRITE, "kd", &kd_port);
-+  mach_port_deallocate(mach_task_self(), priv);
-+  if (err)
-+    return err;
-+  err = i386_io_port_add(mach_thread_self(), kd_port);
-+  if (err)
-+    return err;
- #endif
- 
-   beep_off ();
-Index: console-client/vga-support.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/console-client/vga-support.c,v
-retrieving revision 1.4
-diff -u -u -r1.4 vga-support.c
---- console-client/vga-support.c	18 Nov 2002 07:35:47 -0000	1.4
-+++ console-client/vga-support.c	2 Jan 2006 22:47:54 -0000
-@@ -27,10 +27,17 @@
- #include <sys/types.h>
- #include <string.h>
- 
-+#include <mach.h>
-+#include <mach/i386/mach_i386.h>
-+#include <device/device.h>
-+
- #include "vga-hw.h"
- #include "vga-support.h"
- 
- 
-+/* Port for i/o access.  */
-+static mach_port_t kd_port;
-+
- /* The base of the video memory mapping.  */
- char *vga_videomem;
- 
-@@ -78,6 +85,7 @@
-   error_t err;
-   int fd;
- 
-+#ifdef OSKIT_MACH
-   /* Acquire I/O port access.  */
-   if (ioperm (VGA_MIN_REG, VGA_MAX_REG - VGA_MIN_REG + 1, 1) < 0)
-     {
-@@ -90,6 +98,19 @@
- 	  return errno;
- 	}
-     }
-+#else
-+  mach_port_t priv;
-+  err = get_privileged_ports (NULL, &priv);
-+  if (err)
-+    return err;
-+  err = device_open(priv, D_READ|D_WRITE, "kd", &kd_port);
-+  mach_port_deallocate(mach_task_self(), priv);
-+  if (err)
-+    return err;
-+  err = i386_io_port_add(mach_thread_self(), kd_port);
-+  if (err)
-+    return err;
-+#endif
- 
-   fd = open ("/dev/mem", O_RDWR);
-   if (fd >= 0)
-@@ -229,7 +250,12 @@
-   outb (VGA_CRT_CURSOR_LOW, VGA_CRT_ADDR_REG);
-   outb (vga_state->crt_cursor_low, VGA_CRT_DATA_REG);
- 
--  ioperm (VGA_MIN_REG, VGA_MAX_REG, 0);
-+#ifdef OSKIT_MACH
-+  ioperm (VGA_MIN_REG, VGA_MAX_REG - VGA_MIN_REG + 1, 0);
-+#else
-+  i386_io_port_remove(mach_thread_self(), kd_port);
-+  mach_port_deallocate(mach_task_self(), kd_port);
-+#endif
-   munmap (vga_videomem, VGA_VIDEO_MEM_LENGTH);
- }
- 
diff --git a/debian/patches/convert_nano_to_microseconds_fix.patch b/debian/patches/convert_nano_to_microseconds_fix.patch
deleted file mode 100644
index b01e3275..00000000
--- a/debian/patches/convert_nano_to_microseconds_fix.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-2007-03-25  Thomas Schwinge  <tschwinge@gnu.org>
-
-	* isofs/inode.c (read_disknode): Correctly convert from nanoseconds to
-	microseconds.
-
-2007-03-30  Thomas Schwinge  <tschwinge@gnu.org>
-
-	* inode.c (read_node): Correctly convert from nanoseconds to
-	microseconds.
-
-===================================================================
-RCS file: /sources/hurd/hurd/fatfs/inode.c,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- hurd/fatfs/inode.c	2003/08/06 21:47:57	1.5
-+++ hurd/fatfs/inode.c	2007/03/30 14:15:49	1.6
-@@ -384,7 +387,7 @@
-     fat_to_epoch (dr->write_date, dr->write_time, &ts);
-     st->st_ctime = st->st_mtime = st->st_atime = ts.tv_sec;
-     st->st_ctime_usec = st->st_mtime_usec = st->st_atime_usec
--      = ts.tv_nsec * 1000;
-+      = ts.tv_nsec / 1000;
-   }
-   
-   st->st_blksize = bytes_per_sector;
-===================================================================
-RCS file: /sources/hurd/hurd/isofs/inode.c,v
-retrieving revision 1.16
-retrieving revision 1.17
-diff -u -r1.16 -r1.17
---- hurd/isofs/inode.c	2002/08/06 12:33:17	1.16
-+++ hurd/isofs/inode.c	2007/03/25 20:29:33	1.17
-@@ -1,5 +1,5 @@
- /*
--   Copyright (C) 1997,98,2002 Free Software Foundation, Inc.
-+   Copyright (C) 1997, 1998, 2002, 2007 Free Software Foundation, Inc.
-    Written by Thomas Bushnell, n/BSG.
- 
-    This file is part of the GNU Hurd.
-@@ -433,7 +433,7 @@
-       isodate_915 (dr->date, &ts);
-       st->st_ctime = st->st_mtime = st->st_atime = ts.tv_sec;
-       st->st_ctime_usec = st->st_mtime_usec = st->st_atime_usec
--	= ts.tv_nsec * 1000;
-+	= ts.tv_nsec / 1000;
-     }
- 
-   /* Override what we have better info for */
-@@ -442,19 +442,19 @@
-       if (rl->tfflags & TF_CREATION)
- 	{
- 	  st->st_ctime = rl->ctime.tv_sec;
--	  st->st_ctime_usec = rl->ctime.tv_nsec * 1000;
-+	  st->st_ctime_usec = rl->ctime.tv_nsec / 1000;
- 	}
- 
-       if (rl->tfflags & TF_ACCESS)
- 	{
- 	  st->st_atime = rl->atime.tv_sec;
--	  st->st_atime_usec = rl->atime.tv_nsec * 1000;
-+	  st->st_atime_usec = rl->atime.tv_nsec / 1000;
- 	}
- 
-       if (rl->tfflags & TF_MODIFY)
- 	{
- 	  st->st_mtime = rl->mtime.tv_sec;
--	  st->st_mtime_usec = rl->mtime.tv_nsec * 1000;
-+	  st->st_mtime_usec = rl->mtime.tv_nsec / 1000;
- 	}
-     }
- 
diff --git a/debian/patches/no-debian-dir.patch b/debian/patches/no-debian-dir.patch
deleted file mode 100644
index 7a342bbe..00000000
--- a/debian/patches/no-debian-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.bak	2004-05-09 17:03:38.000000000 -0400
-+++ Makefile	2004-05-09 17:04:22.000000000 -0400
-@@ -43,7 +43,7 @@
- 	       benchmarks fstests
- 
- # Other directories
--other-subdirs = hurd doc config release include debian
-+other-subdirs = hurd doc config release include
- 
- # All the subdirectories together
- subdirs = $(lib-subdirs) $(prog-subdirs) $(other-subdirs)
diff --git a/debian/patches/pthread_mutex_strong_alias.patch b/debian/patches/pthread_mutex_strong_alias.patch
deleted file mode 100644
index 297bd3d0..00000000
--- a/debian/patches/pthread_mutex_strong_alias.patch
+++ /dev/null
@@ -1,227 +0,0 @@
-Index: libpthread/sysdeps/generic/pt-mutex-destroy.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutex-destroy.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 pt-mutex-destroy.c
---- libpthread/sysdeps/generic/pt-mutex-destroy.c	10 Oct 2002 23:05:06 -0000	1.1
-+++ libpthread/sysdeps/generic/pt-mutex-destroy.c	20 Jan 2007 01:59:26 -0000
-@@ -32,4 +32,4 @@ _pthread_mutex_destroy (pthread_mutex_t 
-   return 0;
- }
- 
--weak_alias (_pthread_mutex_destroy, pthread_mutex_destroy);
-+strong_alias (_pthread_mutex_destroy, pthread_mutex_destroy);
-Index: libpthread/sysdeps/generic/pt-mutex-init.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutex-init.c,v
-retrieving revision 1.2
-diff -u -p -r1.2 pt-mutex-init.c
---- libpthread/sysdeps/generic/pt-mutex-init.c	12 May 2005 20:55:38 -0000	1.2
-+++ libpthread/sysdeps/generic/pt-mutex-init.c	20 Jan 2007 01:59:26 -0000
-@@ -45,4 +45,4 @@ _pthread_mutex_init (pthread_mutex_t *mu
-   return 0;
- }
- 
--weak_alias (_pthread_mutex_init, pthread_mutex_init);
-+strong_alias (_pthread_mutex_init, pthread_mutex_init);
-Index: libpthread/sysdeps/generic/pt-mutex-lock.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutex-lock.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 pt-mutex-lock.c
---- libpthread/sysdeps/generic/pt-mutex-lock.c	10 Oct 2002 23:05:06 -0000	1.1
-+++ libpthread/sysdeps/generic/pt-mutex-lock.c	20 Jan 2007 01:59:26 -0000
-@@ -33,5 +33,5 @@ __pthread_mutex_lock (struct __pthread_m
-   return __pthread_mutex_timedlock_internal (mutex, 0);
- }
- 
--weak_alias (__pthread_mutex_lock, _pthread_mutex_lock);
--weak_alias (__pthread_mutex_lock, pthread_mutex_lock);
-+strong_alias (__pthread_mutex_lock, _pthread_mutex_lock);
-+strong_alias (__pthread_mutex_lock, pthread_mutex_lock);
-Index: libpthread/sysdeps/generic/pt-mutex-trylock.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutex-trylock.c,v
-retrieving revision 1.3
-diff -u -p -r1.3 pt-mutex-trylock.c
---- libpthread/sysdeps/generic/pt-mutex-trylock.c	12 May 2005 20:55:38 -0000	1.3
-+++ libpthread/sysdeps/generic/pt-mutex-trylock.c	20 Jan 2007 01:59:26 -0000
-@@ -88,5 +88,5 @@ __pthread_mutex_trylock (struct __pthrea
-   return err;
- }
- 
--weak_alias (__pthread_mutex_trylock, _pthread_mutex_trylock);
--weak_alias (__pthread_mutex_trylock, pthread_mutex_trylock);
-+strong_alias (__pthread_mutex_trylock, _pthread_mutex_trylock);
-+strong_alias (__pthread_mutex_trylock, pthread_mutex_trylock);
-Index: libpthread/sysdeps/generic/pt-mutex-unlock.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutex-unlock.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 pt-mutex-unlock.c
---- libpthread/sysdeps/generic/pt-mutex-unlock.c	10 Oct 2002 23:05:06 -0000	1.1
-+++ libpthread/sysdeps/generic/pt-mutex-unlock.c	20 Jan 2007 01:59:26 -0000
-@@ -78,5 +78,5 @@ __pthread_mutex_unlock (pthread_mutex_t 
-   return 0;
- }
- 
--weak_alias (__pthread_mutex_unlock, _pthread_mutex_unlock);
--weak_alias (__pthread_mutex_unlock, pthread_mutex_unlock);
-+strong_alias (__pthread_mutex_unlock, _pthread_mutex_unlock);
-+strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock);
-Index: libpthread/sysdeps/generic/pt-rwlock-destroy.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-rwlock-destroy.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 pt-rwlock-destroy.c
---- libpthread/sysdeps/generic/pt-rwlock-destroy.c	10 Oct 2002 23:05:06 -0000	1.1
-+++ libpthread/sysdeps/generic/pt-rwlock-destroy.c	20 Jan 2007 01:59:26 -0000
-@@ -26,4 +26,4 @@ _pthread_rwlock_destroy (pthread_rwlock_
-   return 0;
- }
- 
--weak_alias (_pthread_rwlock_destroy, pthread_rwlock_destroy);
-+strong_alias (_pthread_rwlock_destroy, pthread_rwlock_destroy);
-Index: libpthread/sysdeps/generic/pt-rwlock-init.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-rwlock-init.c,v
-retrieving revision 1.2
-diff -u -p -r1.2 pt-rwlock-init.c
---- libpthread/sysdeps/generic/pt-rwlock-init.c	12 May 2005 20:55:38 -0000	1.2
-+++ libpthread/sysdeps/generic/pt-rwlock-init.c	20 Jan 2007 01:59:26 -0000
-@@ -42,4 +42,4 @@ _pthread_rwlock_init (pthread_rwlock_t *
-   return 0;
- }
- 
--weak_alias (_pthread_rwlock_init, pthread_rwlock_init);
-+strong_alias (_pthread_rwlock_init, pthread_rwlock_init);
-Index: libpthread/sysdeps/generic/sem-close.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-close.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 sem-close.c
---- libpthread/sysdeps/generic/sem-close.c	12 May 2005 11:50:42 -0000	1.1
-+++ libpthread/sysdeps/generic/sem-close.c	20 Jan 2007 01:59:26 -0000
-@@ -29,4 +29,4 @@ __sem_close (sem_t *sem)
-   return -1;
- }
- 
--weak_alias (__sem_close, sem_close);
-+strong_alias (__sem_close, sem_close);
-Index: libpthread/sysdeps/generic/sem-destroy.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-destroy.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 sem-destroy.c
---- libpthread/sysdeps/generic/sem-destroy.c	12 May 2005 11:50:42 -0000	1.1
-+++ libpthread/sysdeps/generic/sem-destroy.c	20 Jan 2007 01:59:26 -0000
-@@ -35,4 +35,4 @@ __sem_destroy (sem_t *sem)
-   return 0;
- }
- 
--weak_alias (__sem_destroy, sem_destroy);
-+strong_alias (__sem_destroy, sem_destroy);
-Index: libpthread/sysdeps/generic/sem-getvalue.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-getvalue.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 sem-getvalue.c
---- libpthread/sysdeps/generic/sem-getvalue.c	12 May 2005 11:50:42 -0000	1.1
-+++ libpthread/sysdeps/generic/sem-getvalue.c	20 Jan 2007 01:59:26 -0000
-@@ -30,4 +30,4 @@ __sem_getvalue (sem_t *restrict sem, int
-   return 0;
- }
- 
--weak_alias (__sem_getvalue, sem_getvalue);
-+strong_alias (__sem_getvalue, sem_getvalue);
-Index: libpthread/sysdeps/generic/sem-init.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-init.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 sem-init.c
---- libpthread/sysdeps/generic/sem-init.c	12 May 2005 11:50:42 -0000	1.1
-+++ libpthread/sysdeps/generic/sem-init.c	20 Jan 2007 01:59:26 -0000
-@@ -43,4 +43,4 @@ __sem_init (sem_t *sem, int pshared, uns
-   return 0;
- }
- 
--weak_alias (__sem_init, sem_init);
-+strong_alias (__sem_init, sem_init);
-Index: libpthread/sysdeps/generic/sem-open.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-open.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 sem-open.c
---- libpthread/sysdeps/generic/sem-open.c	12 May 2005 11:50:42 -0000	1.1
-+++ libpthread/sysdeps/generic/sem-open.c	20 Jan 2007 01:59:26 -0000
-@@ -29,4 +29,4 @@ __sem_open (const char *name, int open_f
-   return SEM_FAILED;
- }
- 
--weak_alias (__sem_open, sem_open);
-+strong_alias (__sem_open, sem_open);
-Index: libpthread/sysdeps/generic/sem-post.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-post.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 sem-post.c
---- libpthread/sysdeps/generic/sem-post.c	12 May 2005 11:50:42 -0000	1.1
-+++ libpthread/sysdeps/generic/sem-post.c	20 Jan 2007 01:59:26 -0000
-@@ -59,4 +59,4 @@ __sem_post (sem_t *sem)
-   return 0;
- }
- 
--weak_alias (__sem_post, sem_post);
-+strong_alias (__sem_post, sem_post);
-Index: libpthread/sysdeps/generic/sem-timedwait.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-timedwait.c,v
-retrieving revision 1.2
-diff -u -p -r1.2 sem-timedwait.c
---- libpthread/sysdeps/generic/sem-timedwait.c	12 May 2005 20:55:38 -0000	1.2
-+++ libpthread/sysdeps/generic/sem-timedwait.c	20 Jan 2007 01:59:26 -0000
-@@ -89,4 +89,4 @@ __sem_timedwait (sem_t *restrict sem,
-   return __sem_timedwait_internal (sem, timeout);
- }
- 
--weak_alias (__sem_timedwait, sem_timedwait);
-+strong_alias (__sem_timedwait, sem_timedwait);
-Index: libpthread/sysdeps/generic/sem-trywait.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-trywait.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 sem-trywait.c
---- libpthread/sysdeps/generic/sem-trywait.c	12 May 2005 11:50:42 -0000	1.1
-+++ libpthread/sysdeps/generic/sem-trywait.c	20 Jan 2007 01:59:26 -0000
-@@ -39,4 +39,4 @@ __sem_trywait (sem_t *sem)
-   return -1;
- }
- 
--weak_alias (__sem_trywait, sem_trywait);
-+strong_alias (__sem_trywait, sem_trywait);
-Index: libpthread/sysdeps/generic/sem-unlink.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-unlink.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 sem-unlink.c
---- libpthread/sysdeps/generic/sem-unlink.c	12 May 2005 11:50:42 -0000	1.1
-+++ libpthread/sysdeps/generic/sem-unlink.c	20 Jan 2007 01:59:26 -0000
-@@ -29,4 +29,4 @@ __sem_unlink (const char *name)
-   return -1;
- }
- 
--weak_alias (__sem_unlink, sem_unlink);
-+strong_alias (__sem_unlink, sem_unlink);
-Index: libpthread/sysdeps/generic/sem-wait.c
-===================================================================
-RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/sem-wait.c,v
-retrieving revision 1.1
-diff -u -p -r1.1 sem-wait.c
---- libpthread/sysdeps/generic/sem-wait.c	12 May 2005 11:50:42 -0000	1.1
-+++ libpthread/sysdeps/generic/sem-wait.c	20 Jan 2007 01:59:26 -0000
-@@ -29,4 +29,4 @@ __sem_wait (sem_t *sem)
-   return __sem_timedwait_internal (sem, 0);
- }
- 
--weak_alias (__sem_wait, sem_wait);
-+strong_alias (__sem_wait, sem_wait);