diff options
Diffstat (limited to 'debian/patches')
35 files changed, 640 insertions, 681 deletions
diff --git a/debian/patches/MAKEDEV.patch b/debian/patches/MAKEDEV.patch index 50e0d87a..5f701874 100644 --- a/debian/patches/MAKEDEV.patch +++ b/debian/patches/MAKEDEV.patch @@ -6,8 +6,10 @@ Date: Sun Sep 27 23:33:29 2009 +0200 The script makes big use of bashisms. -diff --git a/sutils/MAKEDEV.sh b/sutils/MAKEDEV.sh -index c9bd209..260e93b 100644 +--- + sutils/MAKEDEV.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + --- a/sutils/MAKEDEV.sh +++ b/sutils/MAKEDEV.sh @@ -1,4 +1,4 @@ diff --git a/debian/patches/console_current_vcs.patch b/debian/patches/console_current_vcs.patch index db9a2cc6..c905677f 100644 --- a/debian/patches/console_current_vcs.patch +++ b/debian/patches/console_current_vcs.patch @@ -11,11 +11,13 @@ Date: Sun Oct 25 20:55:04 2009 +0100 (vcs_repeat_fini): Rename function into... (current_vcs_fini): ... this. -diff --git a/console-client/current-vcs.c b/console-client/current-vcs.c -index a86c670..1b63e0b 100644 +--- + console-client/current-vcs.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + --- a/console-client/current-vcs.c +++ b/console-client/current-vcs.c -@@ -167,7 +167,7 @@ static struct argp argp = {options, parse_opt, 0, doc}; +@@ -167,7 +167,7 @@ static struct argp argp = {options, pars /* Initialize the current VCS driver. */ static error_t @@ -24,7 +26,7 @@ index a86c670..1b63e0b 100644 { error_t err; int pos = 1; -@@ -184,7 +184,7 @@ vcs_repeat_init (void **handle, int no_exit, int argc, char *argv[], int *next) +@@ -184,7 +184,7 @@ vcs_repeat_init (void **handle, int no_e } static error_t @@ -42,7 +44,7 @@ index a86c670..1b63e0b 100644 { console_unregister_consnode (vcs_node); console_destroy_consnode (vcs_node); -@@ -214,10 +214,10 @@ vcs_repeat_fini (void *handle, int force) +@@ -214,10 +214,10 @@ vcs_repeat_fini (void *handle, int force } diff --git a/debian/patches/console_utf-8.patch b/debian/patches/console_utf-8.patch index 2d292f42..663e21bd 100644 --- a/debian/patches/console_utf-8.patch +++ b/debian/patches/console_utf-8.patch @@ -2,9 +2,13 @@ * console.c (DEFAULT_ENCODING): Set to UTF-8. ---- hurd/console/console.c.orig 2006-08-26 00:48:56.000000000 +0200 -+++ hurd/console/console.c 2006-08-26 00:49:19.000000000 +0200 -@@ -55,7 +55,7 @@ +--- + console/console.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/console/console.c ++++ b/console/console.c +@@ -58,7 +58,7 @@ int netfs_maxsymlinks = 16; /* Arbitrary /* Handy source of time. */ volatile struct mapped_time_value *console_maptime; diff --git a/debian/patches/dir_acces_fix.patch b/debian/patches/dir_acces_fix.patch index d40a5a11..964b39a5 100644 --- a/debian/patches/dir_acces_fix.patch +++ b/debian/patches/dir_acces_fix.patch @@ -1,10 +1,9 @@ -Index: libfshelp/perms-access.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libfshelp/perms-access.c,v -retrieving revision 1.2 -diff -u -p -r1.2 perms-access.c ---- libfshelp/perms-access.c 14 Jul 2008 22:38:13 -0000 1.2 -+++ libfshelp/perms-access.c 18 Apr 2009 15:28:45 -0000 +--- + libfshelp/perms-access.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/libfshelp/perms-access.c ++++ b/libfshelp/perms-access.c @@ -30,7 +30,7 @@ fshelp_access (struct stat *st, int op, { int gotit; diff --git a/debian/patches/diskfs_no_inherit_dir_group.patch b/debian/patches/diskfs_no_inherit_dir_group.patch index d94ab4b8..34938e68 100644 --- a/debian/patches/diskfs_no_inherit_dir_group.patch +++ b/debian/patches/diskfs_no_inherit_dir_group.patch @@ -1,6 +1,10 @@ ---- hurd/libdiskfs/init-init.c 2001-08-21 00:45:11.000000000 +0200 -+++ hurd/libdiskfs/init-init.c 2007-03-31 23:29:57.000000000 +0200 -@@ -57,6 +57,9 @@ +--- + libdiskfs/init-init.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/libdiskfs/init-init.c ++++ b/libdiskfs/init-init.c +@@ -57,6 +57,9 @@ diskfs_init_diskfs (void) { error_t err; diff --git a/debian/patches/exec_fix.patch b/debian/patches/exec_fix.patch index 00c88d42..2d53678a 100644 --- a/debian/patches/exec_fix.patch +++ b/debian/patches/exec_fix.patch @@ -5,13 +5,12 @@ Fixes long-standing random hang of exec. * exec.c (finish): Set FILE_DATA and MAP_BUFFER members of E to NULL after freeing them. -Index: exec/exec.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/exec/exec.c,v -retrieving revision 1.93 -diff -u -p -r1.93 exec.c ---- exec/exec.c 2 Apr 2009 23:06:37 -0000 1.93 -+++ exec/exec.c 25 May 2009 09:39:35 -0000 +--- + exec/exec.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/exec/exec.c ++++ b/exec/exec.c @@ -1008,10 +1008,13 @@ finish (struct execdata *e, int dealloc_ #ifdef EXECDATA_STREAM fclose (&e->stream); diff --git a/debian/patches/ext2fs_large_stores.patch b/debian/patches/ext2fs_large_stores.patch index 0828a302..2da3a4d7 100644 --- a/debian/patches/ext2fs_large_stores.patch +++ b/debian/patches/ext2fs_large_stores.patch @@ -1,6 +1,32 @@ -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/console/pager.c hurd/console/pager.c ---- ../cvs/hurd/console/pager.c 2002-09-22 04:28:35.000000000 +0300 -+++ hurd/console/pager.c 2004-11-11 18:16:15.000000000 +0200 +--- + console/pager.c | 10 + ext2fs/balloc.c | 57 +++-- + ext2fs/ext2_fs.h | 3 + ext2fs/ext2fs.c | 8 + ext2fs/ext2fs.h | 145 +++++++++++-- + ext2fs/getblk.c | 31 +- + ext2fs/hyper.c | 34 ++- + ext2fs/ialloc.c | 41 +++ + ext2fs/inode.c | 58 +++-- + ext2fs/pager.c | 497 +++++++++++++++++++++++++++++++++++++++++++---- + ext2fs/pokel.c | 41 +++ + ext2fs/truncate.c | 11 - + fatfs/pager.c | 11 - + isofs/pager.c | 12 - + libdiskfs/disk-pager.c | 6 + libdiskfs/diskfs-pager.h | 3 + libpager/data-request.c | 17 - + libpager/data-return.c | 78 +++++-- + libpager/pager-create.c | 4 + libpager/pager.h | 29 ++ + libpager/priv.h | 1 + storeio/pager.c | 9 + tmpfs/pager-stubs.c | 8 + ufs/pager.c | 11 - + 24 files changed, 940 insertions(+), 185 deletions(-) + +--- a/console/pager.c ++++ b/console/pager.c @@ -94,6 +94,14 @@ pager_unlock_page (struct user_pager_inf } @@ -25,9 +51,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/console/pager.c hurd/conso if (!user_pager->pager) { free (upi); -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/balloc.c hurd/ext2fs/balloc.c ---- ../cvs/hurd/ext2fs/balloc.c 2000-03-10 06:54:55.000000000 +0200 -+++ hurd/ext2fs/balloc.c 2004-11-11 18:29:43.000000000 +0200 +--- a/ext2fs/balloc.c ++++ b/ext2fs/balloc.c @@ -92,7 +92,7 @@ ext2_free_blocks (block_t block, unsigne block, count); } @@ -220,9 +245,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/balloc.c hurd/ext2f if (gdp->bg_free_blocks_count != x) ext2_error ("wrong free blocks count for group %d," " stored = %d, counted = %lu", -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/ext2_fs.h hurd/ext2fs/ext2_fs.h ---- ../cvs/hurd/ext2fs/ext2_fs.h 2000-02-05 13:59:54.000000000 +0200 -+++ hurd/ext2fs/ext2_fs.h 2004-11-11 18:16:38.000000000 +0200 +--- a/ext2fs/ext2_fs.h ++++ b/ext2fs/ext2_fs.h @@ -25,7 +25,8 @@ /* * Define EXT2FS_DEBUG to produce debug messages @@ -233,9 +257,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/ext2_fs.h hurd/ext2 /* * Define EXT2_PREALLOCATE to preallocate data blocks for expanding files -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/ext2fs.c hurd/ext2fs/ext2fs.c ---- ../cvs/hurd/ext2fs/ext2fs.c 2002-06-03 00:40:56.000000000 +0300 -+++ hurd/ext2fs/ext2fs.c 2004-11-11 18:16:15.000000000 +0200 +--- a/ext2fs/ext2fs.c ++++ b/ext2fs/ext2fs.c @@ -106,7 +106,7 @@ parse_opt (int key, char *arg, struct ar if (values == 0) return ENOMEM; @@ -266,9 +289,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/ext2fs.c hurd/ext2f + map_hypermetadata (); return 0; } -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/ext2fs.h hurd/ext2fs/ext2fs.h ---- ../cvs/hurd/ext2fs/ext2fs.h 2004-01-11 00:08:58.000000000 +0200 -+++ hurd/ext2fs/ext2fs.h 2004-11-11 18:16:15.000000000 +0200 +--- a/ext2fs/ext2fs.h ++++ b/ext2fs/ext2fs.h @@ -23,7 +23,9 @@ #include <hurd/pager.h> #include <hurd/fshelp.h> @@ -498,9 +520,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/ext2fs.h hurd/ext2f pokel_sync (&global_pokel, wait); } -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/getblk.c hurd/ext2fs/getblk.c ---- ../cvs/hurd/ext2fs/getblk.c 2004-01-11 00:08:58.000000000 +0200 -+++ hurd/ext2fs/getblk.c 2004-11-11 18:16:15.000000000 +0200 +--- a/ext2fs/getblk.c ++++ b/ext2fs/getblk.c @@ -52,7 +52,7 @@ ext2_discard_prealloc (struct node *node if (node->dn->info.i_prealloc_count) { @@ -579,9 +600,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/getblk.c hurd/ext2f */ ext2_debug ("block = %u, next = %u, goal = %u", block, -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/hyper.c hurd/ext2fs/hyper.c ---- ../cvs/hurd/ext2fs/hyper.c 2002-06-03 00:40:59.000000000 +0300 -+++ hurd/ext2fs/hyper.c 2004-11-11 18:16:16.000000000 +0200 +--- a/ext2fs/hyper.c ++++ b/ext2fs/hyper.c @@ -58,12 +58,15 @@ static int ext2fs_clean; /* fs clean bef void get_hypermetadata (void) @@ -649,9 +669,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/hyper.c hurd/ext2fs if (!readonly && !(sblock->s_state & EXT2_VALID_FS)) ext2_warning ("UNCLEANED FILESYSTEM NOW WRITABLE"); -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/ialloc.c hurd/ext2fs/ialloc.c ---- ../cvs/hurd/ext2fs/ialloc.c 2002-10-09 02:10:09.000000000 +0300 -+++ hurd/ext2fs/ialloc.c 2004-11-11 18:16:16.000000000 +0200 +--- a/ext2fs/ialloc.c ++++ b/ext2fs/ialloc.c @@ -60,7 +60,7 @@ diskfs_free_node (struct node *np, mode_ assert (!diskfs_readonly); @@ -789,10 +808,9 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/ialloc.c hurd/ext2f if (gdp->bg_free_inodes_count != x) ext2_error ("wrong free inodes count in group %d, " "stored = %d, counted = %lu", -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs/inode.c ---- ../cvs/hurd/ext2fs/inode.c 2002-10-09 02:10:09.000000000 +0300 -+++ hurd/ext2fs/inode.c 2004-11-11 18:16:16.000000000 +0200 -@@ -91,7 +91,7 @@ diskfs_cached_lookup (ino_t inum, struct +--- a/ext2fs/inode.c ++++ b/ext2fs/inode.c +@@ -92,7 +92,7 @@ diskfs_cached_lookup (ino_t inum, struct dn->dir_idx = 0; dn->pager = 0; rwlock_init (&dn->alloc_lock); @@ -801,7 +819,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs /* Create the new node. */ np = diskfs_make_node (dn); -@@ -200,13 +200,17 @@ read_node (struct node *np) +@@ -201,13 +201,17 @@ read_node (struct node *np) error_t err; struct stat *st = &np->dn_stat; struct disknode *dn = np->dn; @@ -820,7 +838,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs st->st_fstype = FSTYPE_EXT2FS; st->st_fsid = getpid (); /* This call is very cheap. */ st->st_ino = np->cache_id; -@@ -275,7 +279,9 @@ read_node (struct node *np) +@@ -285,7 +289,9 @@ read_node (struct node *np) info->i_high_size = di->i_size_high; if (info->i_high_size) /* XXX */ { @@ -830,7 +848,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs return EFBIG; } } -@@ -297,20 +303,12 @@ read_node (struct node *np) +@@ -307,20 +313,12 @@ read_node (struct node *np) } dn->info_i_translator = di->i_translator; @@ -853,7 +871,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs else /* Allocsize should be zero for anything except directories, files, and long symlinks. These are the only things allowed to have any blocks -@@ -398,7 +396,9 @@ write_node (struct node *np) +@@ -408,7 +406,9 @@ write_node (struct node *np) { error_t err; struct stat *st = &np->dn_stat; @@ -864,7 +882,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs if (np->dn->info.i_prealloc_count) ext2_discard_prealloc (np); -@@ -409,12 +409,14 @@ write_node (struct node *np) +@@ -419,12 +419,14 @@ write_node (struct node *np) assert (!diskfs_readonly); @@ -880,7 +898,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs di->i_generation = st->st_gen; /* We happen to know that the stat mode bits are the same -@@ -490,6 +492,7 @@ write_node (struct node *np) +@@ -505,6 +507,7 @@ write_node (struct node *np) diskfs_end_catch_exception (); np->dn_stat_dirty = 0; @@ -888,7 +906,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs return di; } else -@@ -649,7 +652,7 @@ diskfs_set_translator (struct node *np, +@@ -664,7 +667,7 @@ diskfs_set_translator (struct node *np, if (err) return err; @@ -897,7 +915,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs blkno = di->i_translator; if (namelen && !blkno) -@@ -662,6 +665,7 @@ diskfs_set_translator (struct node *np, +@@ -677,6 +680,7 @@ diskfs_set_translator (struct node *np, 0, 0, 0); if (blkno == 0) { @@ -905,7 +923,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs diskfs_end_catch_exception (); return ENOSPC; } -@@ -685,15 +689,20 @@ diskfs_set_translator (struct node *np, +@@ -700,15 +704,20 @@ diskfs_set_translator (struct node *np, np->dn_stat.st_mode &= ~S_IPTRANS; np->dn_set_ctime = 1; } @@ -929,7 +947,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs np->dn_stat.st_mode |= S_IPTRANS; np->dn_set_ctime = 1; -@@ -711,7 +720,7 @@ diskfs_get_translator (struct node *np, +@@ -726,7 +735,7 @@ diskfs_get_translator (struct node *np, error_t err = 0; daddr_t blkno; unsigned datalen; @@ -938,7 +956,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs assert (sblock->s_creator_os == EXT2_OS_HURD); -@@ -719,9 +728,11 @@ diskfs_get_translator (struct node *np, +@@ -734,9 +743,11 @@ diskfs_get_translator (struct node *np, if (err) return err; @@ -952,7 +970,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs datalen = ((unsigned char *)transloc)[0] + (((unsigned char *)transloc)[1] << 8); -@@ -736,6 +747,7 @@ diskfs_get_translator (struct node *np, +@@ -751,6 +762,7 @@ diskfs_get_translator (struct node *np, memcpy (*namep, transloc + 2, datalen); } @@ -960,7 +978,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs diskfs_end_catch_exception (); *namelen = datalen; -@@ -757,7 +769,7 @@ write_symlink (struct node *node, const +@@ -772,7 +784,7 @@ write_symlink (struct node *node, const assert (node->dn_stat.st_blocks == 0); @@ -969,7 +987,7 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs node->dn_stat.st_size = len - 1; node->dn_set_ctime = 1; node->dn_set_mtime = 1; -@@ -774,7 +786,7 @@ read_symlink (struct node *node, char *t +@@ -789,7 +801,7 @@ read_symlink (struct node *node, char *t assert (node->dn_stat.st_size < MAX_INODE_SYMLINK); @@ -978,9 +996,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/inode.c hurd/ext2fs return 0; } -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/pager.c hurd/ext2fs/pager.c ---- ../cvs/hurd/ext2fs/pager.c 2002-06-12 00:38:01.000000000 +0300 -+++ hurd/ext2fs/pager.c 2004-11-11 18:16:16.000000000 +0200 +--- a/ext2fs/pager.c ++++ b/ext2fs/pager.c @@ -18,17 +18,18 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ @@ -1665,9 +1682,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/pager.c hurd/ext2fs if (node->dn->pager == 0) { diskfs_nrele_light (node); -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/pokel.c hurd/ext2fs/pokel.c ---- ../cvs/hurd/ext2fs/pokel.c 1996-01-16 00:28:56.000000000 +0200 -+++ hurd/ext2fs/pokel.c 2004-11-11 18:16:16.000000000 +0200 +--- a/ext2fs/pokel.c ++++ b/ext2fs/pokel.c @@ -67,12 +67,27 @@ pokel_add (struct pokel *pokel, void *lo vm_offset_t p_offs = pl->offset; vm_size_t p_end = p_offs + pl->length; @@ -1733,9 +1749,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/pokel.c hurd/ext2fs if (last) { -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/truncate.c hurd/ext2fs/truncate.c ---- ../cvs/hurd/ext2fs/truncate.c 2000-12-03 06:41:37.000000000 +0200 -+++ hurd/ext2fs/truncate.c 2004-11-11 18:16:16.000000000 +0200 +--- a/ext2fs/truncate.c ++++ b/ext2fs/truncate.c @@ -124,7 +124,7 @@ trunc_indirect (struct node *node, block { unsigned index; @@ -1772,9 +1787,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ext2fs/truncate.c hurd/ext static void force_delayed_copies (struct node *node, off_t length) { -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/fatfs/pager.c hurd/fatfs/pager.c ---- ../cvs/hurd/fatfs/pager.c 2003-07-29 01:42:26.000000000 +0300 -+++ hurd/fatfs/pager.c 2004-11-11 18:16:16.000000000 +0200 +--- a/fatfs/pager.c ++++ b/fatfs/pager.c @@ -596,6 +596,13 @@ pager_unlock_page (struct user_pager_inf return 0; } @@ -1807,9 +1821,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/fatfs/pager.c hurd/fatfs/p if (node->dn->pager == 0) { diskfs_nrele_light (node); -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/isofs/pager.c hurd/isofs/pager.c ---- ../cvs/hurd/isofs/pager.c 2001-01-07 19:06:26.000000000 +0200 -+++ hurd/isofs/pager.c 2004-11-11 18:16:16.000000000 +0200 +--- a/isofs/pager.c ++++ b/isofs/pager.c @@ -94,6 +94,13 @@ pager_unlock_page (struct user_pager_inf return EROFS; } @@ -1843,9 +1856,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/isofs/pager.c hurd/isofs/p if (upi->p == 0) { diskfs_nrele_light (np); -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libdiskfs/disk-pager.c hurd/libdiskfs/disk-pager.c ---- ../cvs/hurd/libdiskfs/disk-pager.c 2002-05-08 12:56:56.000000000 +0300 -+++ hurd/libdiskfs/disk-pager.c 2004-11-11 18:16:17.000000000 +0200 +--- a/libdiskfs/disk-pager.c ++++ b/libdiskfs/disk-pager.c @@ -46,7 +46,8 @@ service_paging_requests (any_t arg) void @@ -1866,9 +1878,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libdiskfs/disk-pager.c hur assert (diskfs_disk_pager); /* Get a port to the disk pager. */ -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libdiskfs/diskfs-pager.h hurd/libdiskfs/diskfs-pager.h ---- ../cvs/hurd/libdiskfs/diskfs-pager.h 1997-02-05 18:39:19.000000000 +0200 -+++ hurd/libdiskfs/diskfs-pager.h 2004-11-11 18:16:17.000000000 +0200 +--- a/libdiskfs/diskfs-pager.h ++++ b/libdiskfs/diskfs-pager.h @@ -33,7 +33,8 @@ mapped is returned in IMAGE. INFO, PAGER_BUCKET, & MAY_CACHE are passed to `pager_create'. */ @@ -1879,9 +1890,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libdiskfs/diskfs-pager.h h size_t size, void **image); extern struct pager *diskfs_disk_pager; -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/data-request.c hurd/libpager/data-request.c ---- ../cvs/hurd/libpager/data-request.c 2002-05-08 12:22:14.000000000 +0300 -+++ hurd/libpager/data-request.c 2004-11-11 19:43:24.000000000 +0200 +--- a/libpager/data-request.c ++++ b/libpager/data-request.c @@ -40,11 +40,11 @@ _pager_seqnos_memory_object_data_request if (!p) return EOPNOTSUPP; @@ -1927,9 +1937,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/data-request.c hu MACH_PORT_NULL); mutex_lock (&p->interlock); _pager_mark_object_error (p, offset, length, 0); -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/data-return.c hurd/libpager/data-return.c ---- ../cvs/hurd/libpager/data-return.c 2002-05-08 12:22:14.000000000 +0300 -+++ hurd/libpager/data-return.c 2004-11-11 20:08:53.000000000 +0200 +--- a/libpager/data-return.c ++++ b/libpager/data-return.c @@ -39,6 +39,7 @@ _pager_do_write_request (mach_port_t obj struct pager *p; short *pm_entries; @@ -2068,9 +2077,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/data-return.c hur ports_port_deref (p); return 0; -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/pager-create.c hurd/libpager/pager-create.c ---- ../cvs/hurd/libpager/pager-create.c 1996-05-09 19:47:42.000000000 +0300 -+++ hurd/libpager/pager-create.c 2004-11-11 18:16:17.000000000 +0200 +--- a/libpager/pager-create.c ++++ b/libpager/pager-create.c @@ -22,7 +22,8 @@ struct pager * pager_create (struct user_pager_info *upi, struct port_bucket *bucket, @@ -2089,9 +2097,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/pager-create.c hu p->memobjcntl = MACH_PORT_NULL; p->memobjname = MACH_PORT_NULL; p->seqno = -1; -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/pager.h hurd/libpager/pager.h ---- ../cvs/hurd/libpager/pager.h 1999-07-04 02:51:02.000000000 +0300 -+++ hurd/libpager/pager.h 2004-11-11 18:16:17.000000000 +0200 +--- a/libpager/pager.h ++++ b/libpager/pager.h @@ -32,18 +32,21 @@ int pager_demuxer (mach_msg_header_t *in mach_msg_header_t *outp); @@ -2148,9 +2155,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/pager.h hurd/libp /* The user must define this function. It should report back (in *OFFSET and *SIZE the minimum valid address the pager will accept and the size of the object. */ -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/priv.h hurd/libpager/priv.h ---- ../cvs/hurd/libpager/priv.h 2000-07-25 22:40:27.000000000 +0300 -+++ hurd/libpager/priv.h 2004-11-11 19:42:20.000000000 +0200 +--- a/libpager/priv.h ++++ b/libpager/priv.h @@ -45,6 +45,7 @@ struct pager boolean_t may_cache; @@ -2159,9 +2165,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/libpager/priv.h hurd/libpa /* Interface ports */ memory_object_control_t memobjcntl; -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/storeio/pager.c hurd/storeio/pager.c ---- ../cvs/hurd/storeio/pager.c 2002-05-08 13:17:41.000000000 +0300 -+++ hurd/storeio/pager.c 2004-11-11 18:16:18.000000000 +0200 +--- a/storeio/pager.c ++++ b/storeio/pager.c @@ -109,6 +109,13 @@ pager_unlock_page (struct user_pager_inf return 0; } @@ -2185,9 +2190,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/storeio/pager.c hurd/store if (dev->pager == NULL) { mutex_unlock (&dev->pager_lock); -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/tmpfs/pager-stubs.c hurd/tmpfs/pager-stubs.c ---- ../cvs/hurd/tmpfs/pager-stubs.c 2001-02-26 06:13:58.000000000 +0200 -+++ hurd/tmpfs/pager-stubs.c 2004-11-11 18:16:18.000000000 +0200 +--- a/tmpfs/pager-stubs.c ++++ b/tmpfs/pager-stubs.c @@ -57,6 +57,14 @@ pager_unlock_page (struct user_pager_inf return EIEIO; } @@ -2203,9 +2207,8 @@ diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/tmpfs/pager-stubs.c hurd/t /* The user must define this function. It should report back (in *OFFSET and *SIZE the minimum valid address the pager will accept and the size of the object. */ -diff -urpN --exclude='*~' --exclude=build ../cvs/hurd/ufs/pager.c hurd/ufs/pager.c ---- ../cvs/hurd/ufs/pager.c 1999-09-13 09:35:07.000000000 +0300 -+++ hurd/ufs/pager.c 2004-11-11 18:16:18.000000000 +0200 +--- a/ufs/pager.c ++++ b/ufs/pager.c @@ -425,6 +425,13 @@ pager_unlock_page (struct user_pager_inf return err; } diff --git a/debian/patches/extern_inline_fix.patch b/debian/patches/extern_inline_fix.patch index 8ee7add5..8ff4f0bb 100644 --- a/debian/patches/extern_inline_fix.patch +++ b/debian/patches/extern_inline_fix.patch @@ -1,6 +1,16 @@ -diff -Nur hurd_orig/libdiskfs/diskfs.h hurd/libdiskfs/diskfs.h ---- hurd_orig/libdiskfs/diskfs.h 2009-02-16 17:05:59.000000000 +0100 -+++ hurd/libdiskfs/diskfs.h 2009-05-24 13:05:23.000000000 +0200 +--- + libdiskfs/diskfs.h | 17 ++++++---- + libpipe/pipe.h | 74 ++++++++++++++++++++++++++++++++------------ + libpipe/pq.h | 57 ++++++++++++++++++++++++++------- + libshouldbeinlibc/idvec.h | 29 ++++++++++++----- + libshouldbeinlibc/maptime.h | 13 ++++--- + libshouldbeinlibc/ugids.h | 25 ++++++++++---- + libstore/store.h | 13 ++++--- + libthreads/rwlock.h | 27 +++++++++++----- + 8 files changed, 184 insertions(+), 71 deletions(-) + +--- a/libdiskfs/diskfs.h ++++ b/libdiskfs/diskfs.h @@ -27,10 +27,7 @@ #include <hurd/fshelp.h> #include <hurd/iohelp.h> @@ -13,7 +23,7 @@ diff -Nur hurd_orig/libdiskfs/diskfs.h hurd/libdiskfs/diskfs.h /* Each user port referring to a file points to one of these (with the aid of the ports library). */ -@@ -781,10 +778,16 @@ +@@ -781,10 +778,16 @@ error_t diskfs_start_protid (struct pero the user to install is USER. */ void diskfs_finish_protid (struct protid *cred, struct iouser *user); @@ -31,7 +41,7 @@ diff -Nur hurd_orig/libdiskfs/diskfs.h hurd/libdiskfs/diskfs.h diskfs_begin_using_protid_port (file_t port) { return ports_lookup_port (diskfs_port_bucket, port, diskfs_protid_class); -@@ -793,13 +796,15 @@ +@@ -793,13 +796,15 @@ diskfs_begin_using_protid_port (file_t p /* Called by MiG after server routines have been run; this balances begin_using_protid_port, and is arranged for the io and fs interfaces by fsmutations.h. */ @@ -48,9 +58,8 @@ diff -Nur hurd_orig/libdiskfs/diskfs.h hurd/libdiskfs/diskfs.h /* Called when a protid CRED has no more references. (Because references\ to protids are maintained by the port management library, this is installed in the clean routines list.) The ports library will -diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h ---- hurd_orig/libpipe/pipe.h 1996-10-24 21:27:08.000000000 +0200 -+++ hurd/libpipe/pipe.h 2009-05-24 13:13:37.000000000 +0200 +--- a/libpipe/pipe.h ++++ b/libpipe/pipe.h @@ -24,13 +24,10 @@ #define EWOULDBLOCK EAGAIN /* XXX */ @@ -66,7 +75,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h /* A description of a class of pipes and how to operate on them. */ struct pipe_class -@@ -107,9 +104,24 @@ +@@ -107,9 +104,24 @@ struct pipe /* Pipe flags. */ #define PIPE_BROKEN 0x1 /* This pipe isn't connected. */ @@ -92,7 +101,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_readable (struct pipe *pipe, int data_only) { size_t readable = 0; -@@ -128,7 +140,7 @@ +@@ -128,7 +140,7 @@ pipe_readable (struct pipe *pipe, int da then `control' packets are ignored. Note that this is different than (pipe_readable (PIPE) > 0) in the case where a control packet containing only ports is present. */ @@ -101,7 +110,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_is_readable (struct pipe *pipe, int data_only) { struct pq *pq = pipe->queue; -@@ -143,7 +155,7 @@ +@@ -143,7 +155,7 @@ pipe_is_readable (struct pipe *pipe, int this operation will return EWOULDBLOCK instead of blocking when no data is immediately available. If DATA_ONLY is true, then `control' packets are ignored. */ @@ -110,7 +119,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_wait_readable (struct pipe *pipe, int noblock, int data_only) { while (! pipe_is_readable (pipe, data_only) && ! (pipe->flags & PIPE_BROKEN)) -@@ -160,7 +172,7 @@ +@@ -160,7 +172,7 @@ pipe_wait_readable (struct pipe *pipe, i returns once threads waiting using pipe_wait_readable have been woken and given a chance to read, and if there is still data available thereafter. If DATA_ONLY is true, then `control' packets are ignored. */ @@ -119,7 +128,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_select_readable (struct pipe *pipe, int data_only) { while (! pipe_is_readable (pipe, data_only) && ! (pipe->flags & PIPE_BROKEN)) -@@ -172,7 +184,7 @@ +@@ -172,7 +184,7 @@ pipe_select_readable (struct pipe *pipe, /* Block until data can be written to PIPE. If NOBLOCK is true, then EWOULDBLOCK is returned instead of blocking if this can't be done immediately. */ @@ -128,7 +137,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_wait_writable (struct pipe *pipe, int noblock) { size_t limit = pipe->write_limit; -@@ -193,7 +205,7 @@ +@@ -193,7 +205,7 @@ pipe_wait_writable (struct pipe *pipe, i /* Block until some data can be written to PIPE. This call only returns once threads waiting using pipe_wait_writable have been woken and given a chance to write, and if there is still space available thereafter. */ @@ -137,7 +146,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_select_writable (struct pipe *pipe) { size_t limit = pipe->write_limit; -@@ -203,6 +215,8 @@ +@@ -203,6 +215,8 @@ pipe_select_writable (struct pipe *pipe) return 0; } @@ -146,7 +155,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h /* Creates a new pipe of class CLASS and returns it in RESULT. */ error_t pipe_create (struct pipe_class *class, struct pipe **pipe); -@@ -223,8 +237,28 @@ +@@ -223,8 +237,28 @@ void _pipe_no_readers (struct pipe *pipe should be locked. */ void _pipe_no_writers (struct pipe *pipe); @@ -176,7 +185,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_acquire_reader (struct pipe *pipe) { mutex_lock (&pipe->lock); -@@ -233,7 +267,7 @@ +@@ -233,7 +267,7 @@ pipe_acquire_reader (struct pipe *pipe) } /* Lock PIPE and increment its writers count. */ @@ -185,7 +194,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_acquire_writer (struct pipe *pipe) { mutex_lock (&pipe->lock); -@@ -243,7 +277,7 @@ +@@ -243,7 +277,7 @@ pipe_acquire_writer (struct pipe *pipe) /* Decrement PIPE's (which should be locked) reader count and unlock it. If there are no more refs to PIPE, it will be destroyed. */ @@ -194,7 +203,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_release_reader (struct pipe *pipe) { if (--pipe->readers == 0) -@@ -254,7 +288,7 @@ +@@ -254,7 +288,7 @@ pipe_release_reader (struct pipe *pipe) /* Decrement PIPE's (which should be locked) writer count and unlock it. If there are no more refs to PIPE, it will be destroyed. */ @@ -203,7 +212,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_release_writer (struct pipe *pipe) { if (--pipe->writers == 0) -@@ -264,7 +298,7 @@ +@@ -264,7 +298,7 @@ pipe_release_writer (struct pipe *pipe) } /* Increment PIPE's reader count. PIPE should be unlocked. */ @@ -212,7 +221,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_add_reader (struct pipe *pipe) { pipe_acquire_reader (pipe); -@@ -272,7 +306,7 @@ +@@ -272,7 +306,7 @@ pipe_add_reader (struct pipe *pipe) } /* Increment PIPE's writer count. PIPE should be unlocked. */ @@ -221,7 +230,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_add_writer (struct pipe *pipe) { pipe_acquire_writer (pipe); -@@ -281,7 +315,7 @@ +@@ -281,7 +315,7 @@ pipe_add_writer (struct pipe *pipe) /* Decrement PIPE's (which should be unlocked) reader count and unlock it. If there are no more refs to PIPE, it will be destroyed. */ @@ -230,7 +239,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_remove_reader (struct pipe *pipe) { mutex_lock (&pipe->lock); -@@ -290,7 +324,7 @@ +@@ -290,7 +324,7 @@ pipe_remove_reader (struct pipe *pipe) /* Decrement PIPE's (which should be unlocked) writer count and unlock it. If there are no more refs to PIPE, it will be destroyed. */ @@ -239,7 +248,7 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h pipe_remove_writer (struct pipe *pipe) { mutex_lock (&pipe->lock); -@@ -298,12 +332,14 @@ +@@ -298,12 +332,14 @@ pipe_remove_writer (struct pipe *pipe) } /* Empty out PIPE of any data. PIPE should be locked. */ @@ -255,9 +264,8 @@ diff -Nur hurd_orig/libpipe/pipe.h hurd/libpipe/pipe.h /* Writes up to LEN bytes of DATA, to PIPE, which should be locked, and returns the amount written in AMOUNT. If present, the information in CONTROL & PORTS is written in a preceding control packet. If an error is -diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h ---- hurd_orig/libpipe/pq.h 2006-07-25 16:06:14.000000000 +0200 -+++ hurd/libpipe/pq.h 2009-05-24 13:17:15.000000000 +0200 +--- a/libpipe/pq.h ++++ b/libpipe/pq.h @@ -25,10 +25,7 @@ #include <stddef.h> /* for size_t */ #include <string.h> @@ -270,7 +278,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h struct packet -@@ -70,13 +67,19 @@ +@@ -70,13 +67,19 @@ error_t packet_set_ports (struct packet /* If PACKET has any ports, deallocates them. */ void packet_dealloc_ports (struct packet *packet); @@ -291,7 +299,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h /* Append the bytes in DATA, of length DATA_LEN, to what's already in PACKET, and return the amount appended in AMOUNT if that's not the null pointer. */ error_t packet_write (struct packet *packet, -@@ -94,14 +97,20 @@ +@@ -94,14 +97,20 @@ error_t packet_read (struct packet *pack error_t packet_read_ports (struct packet *packet, mach_port_t **ports, size_t *num_ports); @@ -313,7 +321,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h /* The packet size above which we start to do things differently to avoid copying around data. */ -@@ -125,9 +134,17 @@ +@@ -125,9 +134,17 @@ int packet_extend (struct packet *packet returned. */ error_t packet_realloc (struct packet *packet, size_t new_len); @@ -332,7 +340,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h packet_fit (struct packet *packet, size_t amount) { char *buf = packet->buf, *end = packet->buf_end; -@@ -159,7 +176,7 @@ +@@ -159,7 +176,7 @@ packet_fit (struct packet *packet, size_ /* Make sure that PACKET has room for at least AMOUNT more bytes, or return the reason why not. */ @@ -341,7 +349,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h packet_ensure (struct packet *packet, size_t amount) { if (! packet_fit (packet, amount)) -@@ -176,7 +193,7 @@ +@@ -176,7 +193,7 @@ packet_ensure (struct packet *packet, si it can be done efficiently, e.g., the packet can be grown in place, rather than moving the contents (or there is little enough data so that copying it is OK). True is returned if room was made, false otherwise. */ @@ -350,7 +358,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h packet_ensure_efficiently (struct packet *packet, size_t amount) { if (! packet_fit (packet, amount)) -@@ -189,6 +206,8 @@ +@@ -189,6 +206,8 @@ packet_ensure_efficiently (struct packet } return 0; } @@ -359,7 +367,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h struct pq { -@@ -201,10 +220,14 @@ +@@ -201,10 +220,14 @@ struct pq the packet, or deallocated by calling pipe_dealloc_addr. */ struct packet *pq_queue (struct pq *pq, unsigned type, void *source); @@ -375,7 +383,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h pq_tail (struct pq *pq, unsigned type, void *source) { struct packet *tail = pq->tail; -@@ -214,16 +237,24 @@ +@@ -214,16 +237,24 @@ pq_tail (struct pq *pq, unsigned type, v return tail; } @@ -401,7 +409,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h pq_head (struct pq *pq, unsigned type, void *source) { struct packet *head = pq->head; -@@ -237,7 +268,7 @@ +@@ -237,7 +268,7 @@ pq_head (struct pq *pq, unsigned type, v } /* The same as pq_head, but first discards the head of the queue. */ @@ -410,7 +418,7 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h pq_next (struct pq *pq, unsigned type, void *source) { if (!pq->head) -@@ -246,6 +277,8 @@ +@@ -246,6 +277,8 @@ pq_next (struct pq *pq, unsigned type, v return pq_head (pq, type, source); } @@ -419,9 +427,8 @@ diff -Nur hurd_orig/libpipe/pq.h hurd/libpipe/pq.h /* Dequeues all packets in PQ. */ void pq_drain (struct pq *pq); -diff -Nur hurd_orig/libshouldbeinlibc/idvec.h hurd/libshouldbeinlibc/idvec.h ---- hurd_orig/libshouldbeinlibc/idvec.h 2001-02-26 05:15:22.000000000 +0100 -+++ hurd/libshouldbeinlibc/idvec.h 2009-05-24 13:20:47.000000000 +0200 +--- a/libshouldbeinlibc/idvec.h ++++ b/libshouldbeinlibc/idvec.h @@ -24,10 +24,7 @@ #include <hurd/hurd_types.h> #include <errno.h> @@ -434,7 +441,7 @@ diff -Nur hurd_orig/libshouldbeinlibc/idvec.h hurd/libshouldbeinlibc/idvec.h struct idvec { -@@ -50,22 +47,30 @@ +@@ -50,22 +47,30 @@ void idvec_free_wrapper (struct idvec *i /* Free IDVEC and any storage associated with it. */ void idvec_free (struct idvec *idvec); @@ -468,7 +475,7 @@ diff -Nur hurd_orig/libshouldbeinlibc/idvec.h hurd/libshouldbeinlibc/idvec.h idvec_equal (const struct idvec *idvec1, const struct idvec *idvec2) { size_t num = idvec1->num; -@@ -74,6 +79,8 @@ +@@ -74,6 +79,8 @@ idvec_equal (const struct idvec *idvec1, || memcmp (idvec1->ids, idvec2->ids, num * sizeof *idvec1->ids) == 0); } @@ -477,7 +484,7 @@ diff -Nur hurd_orig/libshouldbeinlibc/idvec.h hurd/libshouldbeinlibc/idvec.h /* Ensure that IDVEC has enough spaced allocated to hold NUM ids, thus ensuring that any subsequent ids added won't return a memory allocation error unless it would result in more ids that NUM. ENOMEM is returned if -@@ -87,13 +94,19 @@ +@@ -87,13 +94,19 @@ error_t idvec_grow (struct idvec *idvec, /* Returns true if IDVEC contains ID, at or after position POS. */ int idvec_tail_contains (const struct idvec *idvec, unsigned pos, uid_t id); @@ -498,9 +505,8 @@ diff -Nur hurd_orig/libshouldbeinlibc/idvec.h hurd/libshouldbeinlibc/idvec.h /* Insert ID into IDVEC at position POS, returning ENOMEM if there wasn't enough memory, or 0. */ error_t idvec_insert (struct idvec *idvec, unsigned pos, uid_t id); -diff -Nur hurd_orig/libshouldbeinlibc/maptime.h hurd/libshouldbeinlibc/maptime.h ---- hurd_orig/libshouldbeinlibc/maptime.h 2007-02-04 16:06:27.000000000 +0100 -+++ hurd/libshouldbeinlibc/maptime.h 2009-05-24 13:21:39.000000000 +0200 +--- a/libshouldbeinlibc/maptime.h ++++ b/libshouldbeinlibc/maptime.h @@ -21,13 +21,10 @@ #ifndef __MAPTIME_H__ #define __MAPTIME_H__ @@ -530,16 +536,15 @@ diff -Nur hurd_orig/libshouldbeinlibc/maptime.h hurd/libshouldbeinlibc/maptime.h maptime_read (volatile struct mapped_time_value *mtime, struct timeval *tv) { do -@@ -49,4 +50,6 @@ +@@ -49,4 +50,6 @@ maptime_read (volatile struct mapped_tim while (tv->tv_sec != mtime->check_seconds); } +# endif /* Use extern inlines. */ + #endif /* __MAPTIME_H__ */ -diff -Nur hurd_orig/libshouldbeinlibc/ugids.h hurd/libshouldbeinlibc/ugids.h ---- hurd_orig/libshouldbeinlibc/ugids.h 2001-04-01 01:01:43.000000000 +0200 -+++ hurd/libshouldbeinlibc/ugids.h 2009-05-24 13:25:12.000000000 +0200 +--- a/libshouldbeinlibc/ugids.h ++++ b/libshouldbeinlibc/ugids.h @@ -23,10 +23,7 @@ #include <stdlib.h> /* For inline function stuff. */ @@ -552,7 +557,7 @@ diff -Nur hurd_orig/libshouldbeinlibc/ugids.h hurd/libshouldbeinlibc/ugids.h /* A structure holding a set of the common various types of ids. */ struct ugids -@@ -47,8 +44,18 @@ +@@ -47,8 +44,18 @@ struct ugids /* Return a new ugids structure, or 0 if an allocation error occurs. */ struct ugids *make_ugids (); @@ -572,7 +577,7 @@ diff -Nur hurd_orig/libshouldbeinlibc/ugids.h hurd/libshouldbeinlibc/ugids.h ugids_fini (struct ugids *ugids) { idvec_fini (&ugids->eff_uids); -@@ -60,7 +67,7 @@ +@@ -60,7 +67,7 @@ ugids_fini (struct ugids *ugids) } /* Free all resources used by UGIDS. */ @@ -581,7 +586,7 @@ diff -Nur hurd_orig/libshouldbeinlibc/ugids.h hurd/libshouldbeinlibc/ugids.h ugids_free (struct ugids *ugids) { ugids_fini (ugids); -@@ -68,7 +75,7 @@ +@@ -68,7 +75,7 @@ ugids_free (struct ugids *ugids) } /* Return true if UGIDS contains no ids. */ @@ -590,7 +595,7 @@ diff -Nur hurd_orig/libshouldbeinlibc/ugids.h hurd/libshouldbeinlibc/ugids.h ugids_is_empty (const struct ugids *ugids) { /* We needn't test the imp_*_gids vectors because they are subsets of the -@@ -81,7 +88,7 @@ +@@ -81,7 +88,7 @@ ugids_is_empty (const struct ugids *ugid } /* Free all resources used by UGIDS except UGIDS itself. */ @@ -599,7 +604,7 @@ diff -Nur hurd_orig/libshouldbeinlibc/ugids.h hurd/libshouldbeinlibc/ugids.h ugids_equal (const struct ugids *ugids1, const struct ugids *ugids2) { return -@@ -93,6 +100,8 @@ +@@ -93,6 +100,8 @@ ugids_equal (const struct ugids *ugids1, && idvec_equal (&ugids1->imp_avail_gids, &ugids2->imp_avail_gids); } @@ -608,9 +613,8 @@ diff -Nur hurd_orig/libshouldbeinlibc/ugids.h hurd/libshouldbeinlibc/ugids.h /* Add all ids in NEW to UGIDS. */ error_t ugids_merge (struct ugids *ugids, const struct ugids *new); -diff -Nur hurd_orig/libstore/store.h hurd/libstore/store.h ---- hurd_orig/libstore/store.h 2005-09-25 02:38:07.000000000 +0200 -+++ hurd/libstore/store.h 2009-05-24 13:18:35.000000000 +0200 +--- a/libstore/store.h ++++ b/libstore/store.h @@ -33,10 +33,7 @@ #include <mach.h> #include <device/device.h> @@ -623,7 +627,7 @@ diff -Nur hurd_orig/libstore/store.h hurd/libstore/store.h /* Type for addresses inside the store. */ -@@ -270,9 +267,13 @@ +@@ -270,9 +267,13 @@ error_t store_set_child_flags (struct st STORE's flags. */ error_t store_clear_child_flags (struct store *store, int flags); @@ -638,7 +642,7 @@ diff -Nur hurd_orig/libstore/store.h hurd/libstore/store.h store_is_securely_returnable (struct store *store, int open_flags) { int flags = store->flags; -@@ -283,6 +284,8 @@ +@@ -283,6 +284,8 @@ store_is_securely_returnable (struct sto || (flags & STORE_HARD_READONLY))); } @@ -647,9 +651,8 @@ diff -Nur hurd_orig/libstore/store.h hurd/libstore/store.h /* Fills in the values of the various fields in STORE that are derivable from the set of runs & the block size. */ void _store_derive (struct store *store); -diff -Nur hurd_orig/libthreads/rwlock.h hurd/libthreads/rwlock.h ---- hurd_orig/libthreads/rwlock.h 1996-10-24 21:29:49.000000000 +0200 -+++ hurd/libthreads/rwlock.h 2009-05-24 13:23:33.000000000 +0200 +--- a/libthreads/rwlock.h ++++ b/libthreads/rwlock.h @@ -21,6 +21,7 @@ #include <cthreads.h> @@ -658,7 +661,7 @@ diff -Nur hurd_orig/libthreads/rwlock.h hurd/libthreads/rwlock.h struct rwlock { -@@ -31,12 +32,20 @@ +@@ -31,12 +32,20 @@ struct rwlock int readers_waiting; }; @@ -683,7 +686,7 @@ diff -Nur hurd_orig/libthreads/rwlock.h hurd/libthreads/rwlock.h rwlock_reader_lock (struct rwlock *lock) { mutex_lock (&lock->master); -@@ -53,7 +62,7 @@ +@@ -53,7 +62,7 @@ rwlock_reader_lock (struct rwlock *lock) } /* Get a writer lock on reader-writer lock LOCK for disknode DN */ @@ -692,7 +695,7 @@ diff -Nur hurd_orig/libthreads/rwlock.h hurd/libthreads/rwlock.h rwlock_writer_lock (struct rwlock *lock) { mutex_lock (&lock->master); -@@ -70,7 +79,7 @@ +@@ -70,7 +79,7 @@ rwlock_writer_lock (struct rwlock *lock) } /* Release a reader lock on reader-writer lock LOCK for disknode DN */ @@ -701,7 +704,7 @@ diff -Nur hurd_orig/libthreads/rwlock.h hurd/libthreads/rwlock.h rwlock_reader_unlock (struct rwlock *lock) { mutex_lock (&lock->master); -@@ -82,7 +91,7 @@ +@@ -82,7 +91,7 @@ rwlock_reader_unlock (struct rwlock *loc } /* Release a writer lock on reader-writer lock LOCK for disknode DN */ @@ -710,7 +713,7 @@ diff -Nur hurd_orig/libthreads/rwlock.h hurd/libthreads/rwlock.h rwlock_writer_unlock (struct rwlock *lock) { mutex_lock (&lock->master); -@@ -94,7 +103,7 @@ +@@ -94,7 +103,7 @@ rwlock_writer_unlock (struct rwlock *loc } /* Initialize reader-writer lock LOCK */ @@ -719,7 +722,7 @@ diff -Nur hurd_orig/libthreads/rwlock.h hurd/libthreads/rwlock.h rwlock_init (struct rwlock *lock) { mutex_init (&lock->master); -@@ -104,6 +113,8 @@ +@@ -104,6 +113,8 @@ rwlock_init (struct rwlock *lock) lock->writers_waiting = 0; } diff --git a/debian/patches/hurd_console_startup.patch b/debian/patches/hurd_console_startup.patch index 28a6dc01..ed601235 100644 --- a/debian/patches/hurd_console_startup.patch +++ b/debian/patches/hurd_console_startup.patch @@ -1,6 +1,10 @@ ---- daemons/runsystem.sh.orig 2001-12-20 18:29:33.000000000 +0100 -+++ daemons/runsystem.sh 2005-06-18 01:05:30.398035896 +0200 -@@ -127,10 +127,24 @@ +--- + daemons/runsystem.sh | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- a/daemons/runsystem.sh ++++ b/daemons/runsystem.sh +@@ -127,10 +127,24 @@ while : ; do trap "kill -$sig \${runttys_pid}" $sig done diff --git a/debian/patches/init_try_runsystem.gnu.patch b/debian/patches/init_try_runsystem.gnu.patch index 86220951..a8f8afa0 100644 --- a/debian/patches/init_try_runsystem.gnu.patch +++ b/debian/patches/init_try_runsystem.gnu.patch @@ -1,6 +1,11 @@ ---- init/init.c 4 Feb 2006 18:39:33 -0000 1.131 -+++ init/init.c 19 Nov 2007 21:14:40 -0000 -@@ -1082,10 +1082,12 @@ +--- + daemons/console-run.c | 7 +++++++ + init/init.c | 24 ++++++++++++++++++++---- + 2 files changed, 27 insertions(+), 4 deletions(-) + +--- a/init/init.c ++++ b/init/init.c +@@ -1082,10 +1082,12 @@ start_child (const char *prog, char **pr static void launch_something (const char *why) { @@ -13,7 +18,7 @@ _PATH_BSHELL, "/bin/shd", /* XXX */ }; -@@ -1093,12 +1095,26 @@ +@@ -1093,12 +1095,26 @@ launch_something (const char *why) if (why) error (0, 0, "%s %s", tries[try - 1], why); @@ -44,9 +49,9 @@ crash_system (); } ---- daemons/console-run.c 26 Mar 2002 18:59:31 -0000 1.5 -+++ daemons/console-run.c 19 Nov 2007 20:16:15 -0000 -@@ -49,6 +49,7 @@ +--- a/daemons/console-run.c ++++ b/daemons/console-run.c +@@ -49,6 +49,7 @@ int main (int argc, char **argv) { mach_port_t consdev = get_console (); @@ -54,7 +59,7 @@ char *consname; if (consdev == MACH_PORT_NULL) -@@ -62,6 +63,12 @@ +@@ -62,6 +63,12 @@ main (int argc, char **argv) if (argc < 2) error (1, 0, "Usage: %s PROGRAM [ARG...]", program_invocation_short_name); diff --git a/debian/patches/install-msgids.diff b/debian/patches/install-msgids.diff index 2e8c5715..305e0e0d 100644 --- a/debian/patches/install-msgids.diff +++ b/debian/patches/install-msgids.diff @@ -5,14 +5,13 @@ (install): Specify install-header and install-msgids as prerequisites. -=================================================================== -RCS file: /var/lib/cvs/sources/hurd/hurd/hurd/Makefile,v -retrieving revision 1.28 -retrieving revision 1.28.2.1 -diff -u -r1.28 -r1.28.2.1 ---- hurd/hurd/hurd/Makefile 2002/08/22 21:25:04 1.28 -+++ hurd/hurd/hurd/Makefile 2005/08/26 07:39:28 1.28.2.1 -@@ -22,15 +22,20 @@ +--- + hurd/Makefile | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +--- a/hurd/Makefile ++++ b/hurd/Makefile +@@ -22,15 +22,20 @@ DIST_FILES = subsystems $(notdir $(hdrs) INSTHDRS = hurd_types.h version.h ioctl_types.h paths.h shared.h console.h \ $(notdir $(wildcard $(srcdir)/*.defs)) diff --git a/debian/patches/libdiskfs-rename.patch b/debian/patches/libdiskfs-rename.patch index 626d48d1..06d631e8 100644 --- a/debian/patches/libdiskfs-rename.patch +++ b/debian/patches/libdiskfs-rename.patch @@ -1,5 +1,7 @@ -diff --git a/libdiskfs/dir-rename.c b/libdiskfs/dir-rename.c -index 747c666..d0e5b60 100644 +--- + libdiskfs/dir-rename.c | 5 +++++ + 1 file changed, 5 insertions(+) + --- a/libdiskfs/dir-rename.c +++ b/libdiskfs/dir-rename.c @@ -19,6 +19,7 @@ @@ -10,7 +12,7 @@ index 747c666..d0e5b60 100644 /* To avoid races in checkpath, and to prevent a directory from being simultaneously renamed by two processes, we serialize all renames of -@@ -44,6 +45,10 @@ diskfs_S_dir_rename (struct protid *fromcred, +@@ -44,6 +45,10 @@ diskfs_S_dir_rename (struct protid *from if (! tocred) return EXDEV; diff --git a/debian/patches/libpager_update_seqno.patch b/debian/patches/libpager_update_seqno.patch index ec77ad19..6246e8a1 100644 --- a/debian/patches/libpager_update_seqno.patch +++ b/debian/patches/libpager_update_seqno.patch @@ -12,9 +12,15 @@ * stubs.c (_pager_seqnos_memory_object_data_write): Likewise. (_pager_seqnos_memory_object_supply_completed): Likewise. -diff -dur libpager.orig/notify-stubs.c libpager/notify-stubs.c ---- libpager.orig/notify-stubs.c 1995-06-22 18:01:46.000000000 +0200 -+++ libpager/notify-stubs.c 2005-08-10 15:56:52.000000000 +0200 +--- + libpager/notify-stubs.c | 6 ++++++ + libpager/priv.h | 1 + + libpager/seqnos.c | 22 ++++++++++++++++++++++ + libpager/stubs.c | 9 +++++++++ + 4 files changed, 38 insertions(+) + +--- a/libpager/notify-stubs.c ++++ b/libpager/notify-stubs.c @@ -18,6 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. */ @@ -23,7 +29,7 @@ diff -dur libpager.orig/notify-stubs.c libpager/notify-stubs.c #include "notify_S.h" #include <errno.h> -@@ -29,6 +30,7 @@ +@@ -29,6 +30,7 @@ _pager_do_seqnos_mach_notify_port_delete mach_port_t name __attribute__ ((unused))) { @@ -31,7 +37,7 @@ diff -dur libpager.orig/notify-stubs.c libpager/notify-stubs.c return 0; } -@@ -40,6 +42,7 @@ +@@ -40,6 +42,7 @@ _pager_do_seqnos_mach_notify_msg_accepte mach_port_t name __attribute__ ((unused))) { @@ -39,7 +45,7 @@ diff -dur libpager.orig/notify-stubs.c libpager/notify-stubs.c return 0; } -@@ -51,6 +54,7 @@ +@@ -51,6 +54,7 @@ _pager_do_seqnos_mach_notify_port_destro mach_port_t name __attribute__ ((unused))) { @@ -47,7 +53,7 @@ diff -dur libpager.orig/notify-stubs.c libpager/notify-stubs.c return 0; } -@@ -60,6 +64,7 @@ +@@ -60,6 +64,7 @@ _pager_do_seqnos_mach_notify_send_once ( mach_port_seqno_t seqno __attribute__ ((unused))) { @@ -55,17 +61,16 @@ diff -dur libpager.orig/notify-stubs.c libpager/notify-stubs.c return 0; } -@@ -71,5 +76,6 @@ +@@ -71,5 +76,6 @@ _pager_do_seqnos_mach_notify_dead_name ( mach_port_t name __attribute__ ((unused))) { + _pager_stubs_update_seqno (notify, seqno); return 0; } -diff -dur libpager.orig/priv.h libpager/priv.h ---- libpager.orig/priv.h 2000-07-25 21:40:27.000000000 +0200 -+++ libpager/priv.h 2005-08-10 15:56:52.000000000 +0200 -@@ -133,6 +133,7 @@ +--- a/libpager/priv.h ++++ b/libpager/priv.h +@@ -134,6 +134,7 @@ struct port_class *_pager_class; void _pager_wait_for_seqno (struct pager *, int); void _pager_release_seqno (struct pager *, int); @@ -73,10 +78,9 @@ diff -dur libpager.orig/priv.h libpager/priv.h void _pager_block_termination (struct pager *); void _pager_allow_termination (struct pager *); error_t _pager_pagemap_resize (struct pager *, vm_address_t); -diff -dur libpager.orig/seqnos.c libpager/seqnos.c ---- libpager.orig/seqnos.c 1994-06-01 18:57:29.000000000 +0200 -+++ libpager/seqnos.c 2005-08-10 16:37:11.000000000 +0200 -@@ -47,3 +47,25 @@ +--- a/libpager/seqnos.c ++++ b/libpager/seqnos.c +@@ -47,3 +47,25 @@ _pager_release_seqno (struct pager *p, condition_broadcast (&p->wakeup); } } @@ -102,10 +106,9 @@ diff -dur libpager.orig/seqnos.c libpager/seqnos.c + } +} + -diff -dur libpager.orig/stubs.c libpager/stubs.c ---- libpager.orig/stubs.c 1994-07-22 17:55:06.000000000 +0200 -+++ libpager/stubs.c 2005-08-10 15:56:52.000000000 +0200 -@@ -29,6 +29,9 @@ +--- a/libpager/stubs.c ++++ b/libpager/stubs.c +@@ -29,6 +29,9 @@ _pager_seqnos_memory_object_copy (mach_p mach_port_t new) { printf ("m_o_copy called\n"); @@ -115,7 +118,7 @@ diff -dur libpager.orig/stubs.c libpager/stubs.c return EOPNOTSUPP; } -@@ -41,6 +44,9 @@ +@@ -41,6 +44,9 @@ _pager_seqnos_memory_object_data_write ( vm_size_t data_cnt) { printf ("m_o_data_write called\n"); @@ -125,7 +128,7 @@ diff -dur libpager.orig/stubs.c libpager/stubs.c return EOPNOTSUPP; } -@@ -54,6 +60,9 @@ +@@ -54,6 +60,9 @@ _pager_seqnos_memory_object_supply_compl vm_offset_t err_off) { printf ("m_o_supply_completed called\n"); diff --git a/debian/patches/libports_stability.patch b/debian/patches/libports_stability.patch index 462fc1ca..84edc491 100644 --- a/debian/patches/libports_stability.patch +++ b/debian/patches/libports_stability.patch @@ -1,9 +1,13 @@ Ideally we should be able to time out and see translators go away automatically, however it makes all threads often wake at the same time and overload Mach. ---- libports/manage-multithread.c 29 Dec 2008 18:38:02 -0000 1.20 -+++ libports/manage-multithread.c 20 Aug 1997 20:41:57 -0000 1.19 -@@ -157,6 +157,8 @@ +--- + libports/manage-multithread.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/libports/manage-multithread.c ++++ b/libports/manage-multithread.c +@@ -157,6 +157,8 @@ ports_manage_port_operations_multithread return 0; } diff --git a/debian/patches/libpthread_cancel_init.patch b/debian/patches/libpthread_cancel_init.patch index 94727286..36351c15 100644 --- a/debian/patches/libpthread_cancel_init.patch +++ b/debian/patches/libpthread_cancel_init.patch @@ -8,11 +8,13 @@ Date: Tue Oct 13 20:15:08 2009 +0200 portability to various compilation flags, use standard initializer for struct __pthread_cancelation_handler __handler instead of old-gcc-style. -diff --git a/sysdeps/generic/bits/cancelation.h b/sysdeps/generic/bits/cancelation.h -index f446d59..db9169a 100644 +--- + libpthread/sysdeps/generic/bits/cancelation.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + --- a/libpthread/sysdeps/generic/bits/cancelation.h +++ b/libpthread/sysdeps/generic/bits/cancelation.h -@@ -38,9 +38,9 @@ struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void); +@@ -38,9 +38,9 @@ struct __pthread_cancelation_handler **_ = __pthread_get_cleanup_stack (); \ struct __pthread_cancelation_handler __handler = \ { \ diff --git a/debian/patches/libpthread_fix.patch b/debian/patches/libpthread_fix.patch index cfd78d3f..56e03850 100644 --- a/debian/patches/libpthread_fix.patch +++ b/debian/patches/libpthread_fix.patch @@ -1,20 +1,22 @@ Temporary patch from Thomas Schwinge to fix libpthread bugs. -diff --git libpthread/sysdeps/mach/pt-thread-dealloc.c b/sysdeps/mach/pt-thread-dealloc.c -index 55d8c4d..0c4a4fc 100644 ---- libpthread/sysdeps/mach/pt-thread-dealloc.c -+++ libpthread/sysdeps/mach/pt-thread-dealloc.c -@@ -38,4 +38,6 @@ __pthread_thread_dealloc (struct __pthread *thread) +--- + libpthread/sysdeps/mach/hurd/pt-init-specific.c | 29 ++++++++++++++++++++++++ + libpthread/sysdeps/mach/pt-thread-dealloc.c | 2 + + libpthread/sysdeps/mach/pt-thread-halt.c | 19 ++++++++++++++- + 3 files changed, 48 insertions(+), 2 deletions(-) + +--- a/libpthread/sysdeps/mach/pt-thread-dealloc.c ++++ b/libpthread/sysdeps/mach/pt-thread-dealloc.c +@@ -38,4 +38,6 @@ __pthread_thread_dealloc (struct __pthre assert. */ __mach_port_destroy (__mach_task_self (), thread->wakeupmsg.msgh_remote_port); + + thread->have_kernel_resources = 0; } -diff --git libpthread/sysdeps/mach/pt-thread-halt.c b/sysdeps/mach/pt-thread-halt.c -index 973cde1..a9c3858 100644 ---- libpthread/sysdeps/mach/pt-thread-halt.c -+++ libpthread/sysdeps/mach/pt-thread-halt.c +--- a/libpthread/sysdeps/mach/pt-thread-halt.c ++++ b/libpthread/sysdeps/mach/pt-thread-halt.c @@ -32,6 +32,21 @@ void __pthread_thread_halt (struct __pthread *thread) @@ -39,10 +41,8 @@ index 973cde1..a9c3858 100644 + } + } } - - ---- /dev/null 2007-12-29 19:47:02.000000000 +0000 -+++ libpthread/sysdeps/mach/hurd/pt-init-specific.c 2009-04-23 22:46:31.000000000 +0000 +--- /dev/null ++++ b/libpthread/sysdeps/mach/hurd/pt-init-specific.c @@ -0,0 +1,29 @@ +/* __pthread_init_specific. Mach version. + Copyright (C) 2002, 2009 Free Software Foundation, Inc. diff --git a/debian/patches/libpthread_kill_0.patch b/debian/patches/libpthread_kill_0.patch index c0523bb6..4aa307dc 100644 --- a/debian/patches/libpthread_kill_0.patch +++ b/debian/patches/libpthread_kill_0.patch @@ -7,8 +7,10 @@ Date: Sun Oct 18 00:24:19 2009 +0200 * sysdeps/hurd/pt-kill.c (pthread_kill): Return immediately after checks without calling _hurd_raise_signal if sig is 0. -diff --git a/sysdeps/hurd/pt-kill.c b/sysdeps/hurd/pt-kill.c -index f970e06..d204e3f 100644 +--- + libpthread/sysdeps/hurd/pt-kill.c | 3 +++ + 1 file changed, 3 insertions(+) + --- a/libpthread/sysdeps/hurd/pt-kill.c +++ b/libpthread/sysdeps/hurd/pt-kill.c @@ -39,6 +39,9 @@ pthread_kill (pthread_t thread, int sig) diff --git a/debian/patches/libpthread_mutex_owner.patch b/debian/patches/libpthread_mutex_owner.patch index 684a7de5..466cffae 100644 --- a/debian/patches/libpthread_mutex_owner.patch +++ b/debian/patches/libpthread_mutex_owner.patch @@ -1,10 +1,9 @@ -Index: libpthread/sysdeps/generic/pt-mutex-trylock.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutex-trylock.c,v -retrieving revision 1.7 -diff -u -p -r1.7 pt-mutex-trylock.c ---- libpthread/sysdeps/generic/pt-mutex-trylock.c 12 Aug 2008 15:07:49 -0000 1.7 -+++ libpthread/sysdeps/generic/pt-mutex-trylock.c 29 Apr 2009 08:20:19 -0000 +--- + libpthread/sysdeps/generic/pt-mutex-trylock.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/libpthread/sysdeps/generic/pt-mutex-trylock.c ++++ b/libpthread/sysdeps/generic/pt-mutex-trylock.c @@ -34,6 +34,7 @@ __pthread_mutex_trylock (struct __pthrea if (__pthread_spin_trylock (&mutex->__held) == 0) /* Acquired the lock. */ diff --git a/debian/patches/libpthread_recursive_mutex_initializer.patch b/debian/patches/libpthread_recursive_mutex_initializer.patch index d9332b70..c6e3e536 100644 --- a/debian/patches/libpthread_recursive_mutex_initializer.patch +++ b/debian/patches/libpthread_recursive_mutex_initializer.patch @@ -1,8 +1,19 @@ -Index: libpthread/include/pthread/pthread.h -=================================================================== ---- libpthread/include/pthread/pthread.h.orig 2009-05-27 23:53:05.000000000 +0000 -+++ libpthread/include/pthread/pthread.h 2009-05-27 23:53:40.000000000 +0000 -@@ -313,6 +313,8 @@ +--- + libpthread/include/pthread/pthread.h | 2 ++ + libpthread/sysdeps/generic/bits/mutex-attr.h | 1 + + libpthread/sysdeps/generic/bits/mutex.h | 10 +++++++++- + libpthread/sysdeps/generic/pt-mutex-destroy.c | 3 ++- + libpthread/sysdeps/generic/pt-mutex-init.c | 11 ++++------- + libpthread/sysdeps/generic/pt-mutex-timedlock.c | 22 ++++++++++++++-------- + libpthread/sysdeps/generic/pt-mutex-transfer-np.c | 11 +++++++++-- + libpthread/sysdeps/generic/pt-mutex-trylock.c | 14 ++++++++++---- + libpthread/sysdeps/generic/pt-mutex-unlock.c | 16 +++++++++++----- + libpthread/sysdeps/generic/pt-mutexattr.c | 8 ++++++++ + 10 files changed, 70 insertions(+), 28 deletions(-) + +--- a/libpthread/include/pthread/pthread.h ++++ b/libpthread/include/pthread/pthread.h +@@ -313,6 +313,8 @@ extern int pthread_mutexattr_settype(pth /* Static initializer for recursive mutexes. */ #ifdef __USE_GNU @@ -11,10 +22,8 @@ Index: libpthread/include/pthread/pthread.h # define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP \ __PTHREAD_RECURSIVE_MUTEX_INITIALIZER #endif -Index: libpthread/sysdeps/generic/pt-mutex-destroy.c -=================================================================== ---- libpthread/sysdeps/generic/pt-mutex-destroy.c.orig 2008-08-12 15:07:49.000000000 +0000 -+++ libpthread/sysdeps/generic/pt-mutex-destroy.c 2009-05-27 23:53:40.000000000 +0000 +--- a/libpthread/sysdeps/generic/pt-mutex-destroy.c ++++ b/libpthread/sysdeps/generic/pt-mutex-destroy.c @@ -26,7 +26,8 @@ int _pthread_mutex_destroy (pthread_mutex_t *mutex) @@ -25,11 +34,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-destroy.c /* Static attributes. */ ; else -Index: libpthread/sysdeps/generic/pt-mutex-init.c -=================================================================== ---- libpthread/sysdeps/generic/pt-mutex-init.c.orig 2008-08-12 15:07:49.000000000 +0000 -+++ libpthread/sysdeps/generic/pt-mutex-init.c 2009-05-27 23:53:40.000000000 +0000 -@@ -35,14 +35,11 @@ +--- a/libpthread/sysdeps/generic/pt-mutex-init.c ++++ b/libpthread/sysdeps/generic/pt-mutex-init.c +@@ -35,14 +35,11 @@ _pthread_mutex_init (pthread_mutex_t *mu /* The default attributes. */ return 0; @@ -48,11 +55,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-init.c if (! mutex->attr) return ENOMEM; -Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c -=================================================================== ---- libpthread/sysdeps/generic/pt-mutex-timedlock.c.orig 2008-10-02 12:00:42.000000000 +0000 -+++ libpthread/sysdeps/generic/pt-mutex-timedlock.c 2009-05-27 23:53:40.000000000 +0000 -@@ -31,6 +31,12 @@ +--- a/libpthread/sysdeps/generic/pt-mutex-timedlock.c ++++ b/libpthread/sysdeps/generic/pt-mutex-timedlock.c +@@ -31,6 +31,12 @@ __pthread_mutex_timedlock_internal (stru const struct timespec *abstime) { struct __pthread *self; @@ -65,7 +70,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c __pthread_spin_lock (&mutex->__lock); if (__pthread_spin_trylock (&mutex->__held) == 0) -@@ -50,8 +56,8 @@ +@@ -50,8 +56,8 @@ __pthread_mutex_timedlock_internal (stru #endif #endif @@ -76,7 +81,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c { case PTHREAD_MUTEX_NORMAL: break; -@@ -75,7 +81,7 @@ +@@ -75,7 +81,7 @@ __pthread_mutex_timedlock_internal (stru self = _pthread_self (); assert (self); @@ -85,7 +90,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c { #if defined(ALWAYS_TRACK_MUTEX_OWNER) assert (mutex->owner != self); -@@ -83,7 +89,7 @@ +@@ -83,7 +89,7 @@ __pthread_mutex_timedlock_internal (stru } else { @@ -94,7 +99,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c { case PTHREAD_MUTEX_ERRORCHECK: if (mutex->owner == self) -@@ -108,7 +114,7 @@ +@@ -108,7 +114,7 @@ __pthread_mutex_timedlock_internal (stru } #if !defined(ALWAYS_TRACK_MUTEX_OWNER) @@ -103,7 +108,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c #endif assert (mutex->owner); -@@ -147,14 +153,14 @@ +@@ -147,14 +153,14 @@ __pthread_mutex_timedlock_internal (stru __pthread_block (self); #if !defined(ALWAYS_TRACK_MUTEX_OWNER) @@ -121,11 +126,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-timedlock.c { case PTHREAD_MUTEX_NORMAL: break; -Index: libpthread/sysdeps/generic/pt-mutex-transfer-np.c -=================================================================== ---- libpthread/sysdeps/generic/pt-mutex-transfer-np.c.orig 2008-10-02 12:00:40.000000000 +0000 -+++ libpthread/sysdeps/generic/pt-mutex-transfer-np.c 2009-05-27 23:53:40.000000000 +0000 -@@ -29,13 +29,20 @@ +--- a/libpthread/sysdeps/generic/pt-mutex-transfer-np.c ++++ b/libpthread/sysdeps/generic/pt-mutex-transfer-np.c +@@ -29,13 +29,20 @@ __pthread_mutex_transfer_np (struct __pt assert (mutex->owner == _pthread_self ()); struct __pthread *thread = __pthread_getid (tid); @@ -147,7 +150,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-transfer-np.c { if (mutex->owner != _pthread_self ()) -@@ -46,7 +53,7 @@ +@@ -46,7 +53,7 @@ __pthread_mutex_transfer_np (struct __pt #ifndef NDEBUG # if !defined(ALWAYS_TRACK_MUTEX_OWNER) @@ -156,11 +159,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-transfer-np.c # endif { mutex->owner = thread; -Index: libpthread/sysdeps/generic/pt-mutex-trylock.c -=================================================================== ---- libpthread/sysdeps/generic/pt-mutex-trylock.c.orig 2009-05-27 23:53:39.000000000 +0000 -+++ libpthread/sysdeps/generic/pt-mutex-trylock.c 2009-05-27 23:53:40.000000000 +0000 -@@ -29,6 +29,12 @@ +--- a/libpthread/sysdeps/generic/pt-mutex-trylock.c ++++ b/libpthread/sysdeps/generic/pt-mutex-trylock.c +@@ -29,6 +29,12 @@ __pthread_mutex_trylock (struct __pthrea { int err; struct __pthread *self; @@ -173,7 +174,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-trylock.c __pthread_spin_lock (&mutex->__lock); if (__pthread_spin_trylock (&mutex->__held) == 0) -@@ -48,8 +54,8 @@ +@@ -48,8 +54,8 @@ __pthread_mutex_trylock (struct __pthrea #endif #endif @@ -184,7 +185,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-trylock.c { case PTHREAD_MUTEX_NORMAL: break; -@@ -70,10 +76,10 @@ +@@ -70,10 +76,10 @@ __pthread_mutex_trylock (struct __pthrea err = EBUSY; @@ -197,11 +198,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-trylock.c { case PTHREAD_MUTEX_NORMAL: break; -Index: libpthread/sysdeps/generic/pt-mutex-unlock.c -=================================================================== ---- libpthread/sysdeps/generic/pt-mutex-unlock.c.orig 2008-10-02 12:00:37.000000000 +0000 -+++ libpthread/sysdeps/generic/pt-mutex-unlock.c 2009-05-27 23:53:40.000000000 +0000 -@@ -28,10 +28,16 @@ +--- a/libpthread/sysdeps/generic/pt-mutex-unlock.c ++++ b/libpthread/sysdeps/generic/pt-mutex-unlock.c +@@ -28,10 +28,16 @@ int __pthread_mutex_unlock (pthread_mutex_t *mutex) { struct __pthread *wakeup; @@ -220,7 +219,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-unlock.c { #if defined(ALWAYS_TRACK_MUTEX_OWNER) # ifndef NDEBUG -@@ -45,7 +51,7 @@ +@@ -45,7 +51,7 @@ __pthread_mutex_unlock (pthread_mutex_t #endif } else @@ -229,7 +228,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-unlock.c { case PTHREAD_MUTEX_ERRORCHECK: case PTHREAD_MUTEX_RECURSIVE: -@@ -55,7 +61,7 @@ +@@ -55,7 +61,7 @@ __pthread_mutex_unlock (pthread_mutex_t return EPERM; } @@ -238,7 +237,7 @@ Index: libpthread/sysdeps/generic/pt-mutex-unlock.c if (--mutex->locks > 0) { __pthread_spin_unlock (&mutex->__lock); -@@ -82,7 +88,7 @@ +@@ -82,7 +88,7 @@ __pthread_mutex_unlock (pthread_mutex_t #ifndef NDEBUG # if !defined (ALWAYS_TRACK_MUTEX_OWNER) @@ -247,11 +246,9 @@ Index: libpthread/sysdeps/generic/pt-mutex-unlock.c # endif { mutex->owner = wakeup; -Index: libpthread/sysdeps/generic/pt-mutexattr.c -=================================================================== ---- libpthread/sysdeps/generic/pt-mutexattr.c.orig 2008-08-12 15:07:49.000000000 +0000 -+++ libpthread/sysdeps/generic/pt-mutexattr.c 2009-05-27 23:53:40.000000000 +0000 -@@ -28,6 +28,14 @@ +--- a/libpthread/sysdeps/generic/pt-mutexattr.c ++++ b/libpthread/sysdeps/generic/pt-mutexattr.c +@@ -28,6 +28,14 @@ const struct __pthread_mutexattr __pthre mutex_type: PTHREAD_MUTEX_DEFAULT }; @@ -266,11 +263,9 @@ Index: libpthread/sysdeps/generic/pt-mutexattr.c const struct __pthread_mutexattr __pthread_recursive_mutexattr = { prioceiling: 0, -Index: libpthread/sysdeps/generic/bits/mutex.h -=================================================================== ---- libpthread/sysdeps/generic/bits/mutex.h.orig 2009-01-10 13:22:27.000000000 +0000 -+++ libpthread/sysdeps/generic/bits/mutex.h 2009-05-27 23:53:40.000000000 +0000 -@@ -57,9 +57,17 @@ +--- a/libpthread/sysdeps/generic/bits/mutex.h ++++ b/libpthread/sysdeps/generic/bits/mutex.h +@@ -57,9 +57,17 @@ struct __pthread_mutex # define __PTHREAD_MUTEX_INITIALIZER \ { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0, 0 } @@ -289,11 +284,9 @@ Index: libpthread/sysdeps/generic/bits/mutex.h # endif #endif /* Not __pthread_mutex_defined. */ -Index: libpthread/sysdeps/generic/bits/mutex-attr.h -=================================================================== ---- libpthread/sysdeps/generic/bits/mutex-attr.h.orig 2009-05-27 23:59:37.000000000 +0000 -+++ libpthread/sysdeps/generic/bits/mutex-attr.h 2009-05-27 23:59:44.000000000 +0000 -@@ -35,6 +35,7 @@ +--- a/libpthread/sysdeps/generic/bits/mutex-attr.h ++++ b/libpthread/sysdeps/generic/bits/mutex-attr.h +@@ -35,6 +35,7 @@ struct __pthread_mutexattr }; /* Attributes for a recursive mutex. */ diff --git a/debian/patches/libpthread_setcancel.patch b/debian/patches/libpthread_setcancel.patch index a0351e82..601a698f 100644 --- a/debian/patches/libpthread_setcancel.patch +++ b/debian/patches/libpthread_setcancel.patch @@ -1,10 +1,10 @@ -Index: libpthread/pthread/pt-setcancelstate.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-setcancelstate.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-setcancelstate.c ---- libpthread/pthread/pt-setcancelstate.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/pthread/pt-setcancelstate.c 28 Apr 2009 17:51:08 -0000 +--- + libpthread/pthread/pt-setcancelstate.c | 3 ++- + libpthread/pthread/pt-setcanceltype.c | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +--- a/libpthread/pthread/pt-setcancelstate.c ++++ b/libpthread/pthread/pt-setcancelstate.c @@ -35,7 +35,8 @@ pthread_setcancelstate (int state, int * break; } @@ -15,13 +15,8 @@ diff -u -p -r1.1 pt-setcancelstate.c p->cancel_state = state; return 0; -Index: libpthread/pthread/pt-setcanceltype.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-setcanceltype.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-setcanceltype.c ---- libpthread/pthread/pt-setcanceltype.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/pthread/pt-setcanceltype.c 28 Apr 2009 17:51:08 -0000 +--- a/libpthread/pthread/pt-setcanceltype.c ++++ b/libpthread/pthread/pt-setcanceltype.c @@ -35,7 +35,8 @@ pthread_setcanceltype (int type, int *ol break; } diff --git a/debian/patches/libpthread_stubs.patch b/debian/patches/libpthread_stubs.patch index 68b20762..f1937df0 100644 --- a/debian/patches/libpthread_stubs.patch +++ b/debian/patches/libpthread_stubs.patch @@ -1,10 +1,22 @@ -Index: config.make.in -=================================================================== -RCS file: /cvsroot/hurd/hurd/config.make.in,v -retrieving revision 1.19 -diff -u -p -r1.19 config.make.in ---- config.make.in 7 Nov 2007 13:07:52 -0000 1.19 -+++ config.make.in 1 Jan 2008 04:07:44 -0000 +--- + config.make.in | 1 + + libpthread/Makefile | 14 +++++++++++++- + libpthread/include/libc-symbols.h | 1 + + libpthread/sysdeps/generic/pt-atfork.c | 2 ++ + libpthread/sysdeps/generic/pt-getcpuclockid.c | 1 + + libpthread/sysdeps/generic/pt-getschedparam.c | 2 ++ + libpthread/sysdeps/generic/pt-key-create.c | 2 ++ + libpthread/sysdeps/generic/pt-key-delete.c | 2 ++ + libpthread/sysdeps/generic/pt-mutex-getprioceiling.c | 2 ++ + libpthread/sysdeps/generic/pt-mutex-setprioceiling.c | 2 ++ + libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c | 2 ++ + libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c | 2 ++ + libpthread/sysdeps/generic/pt-setschedparam.c | 2 ++ + libpthread/sysdeps/generic/pt-setschedprio.c | 2 ++ + 14 files changed, 36 insertions(+), 1 deletion(-) + +--- a/config.make.in ++++ b/config.make.in @@ -44,6 +44,7 @@ RANLIB = @RANLIB@ MIG = @MIG@ MIGCOM = $(MIG) -cc cat - /dev/null @@ -13,14 +25,9 @@ diff -u -p -r1.19 config.make.in # Compilation flags. Append these to the definitions already made by # the specific Makefile. -Index: Makefile -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/Makefile,v -retrieving revision 1.7 -diff -u -p -r1.7 Makefile ---- libpthread/Makefile 19 Nov 2007 17:37:02 -0000 1.7 -+++ libpthread/Makefile 31 Dec 2007 21:22:21 -0000 -@@ -180,7 +180,7 @@ CPPFLAGS += \ +--- a/libpthread/Makefile ++++ b/libpthread/Makefile +@@ -186,7 +186,7 @@ CPPFLAGS += \ -imacros $(srcdir)/not-in-libc.h @@ -29,7 +36,7 @@ diff -u -p -r1.7 Makefile install-headers: $(addprefix $(includedir)/, $(sysdeps_headers)) # XXX: If $(libdir)/libpthread2.a is installed and -@@ -199,6 +199,18 @@ $(libdir)/libpthread2_pic.a: $(libdir)/l +@@ -205,6 +205,18 @@ $(libdir)/libpthread2_pic.a: $(libdir)/l mv $< $@ $(INSTALL_DATA) $(srcdir)/libpthread_pic.a $< @@ -48,14 +55,9 @@ diff -u -p -r1.7 Makefile .PHONY: $(addprefix $(includedir)/, $(sysdeps_headers)) $(addprefix $(includedir)/, $(sysdeps_headers)): -Index: include/libc-symbols.h -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/include/libc-symbols.h,v -retrieving revision 1.1 -diff -u -p -r1.1 libc-symbols.h ---- libpthread/include/libc-symbols.h 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/include/libc-symbols.h 1 Jan 2008 15:21:50 -0000 -@@ -250,6 +251,7 @@ +--- a/libpthread/include/libc-symbols.h ++++ b/libpthread/include/libc-symbols.h +@@ -252,6 +252,7 @@ /* A canned warning for sysdeps/stub functions. */ #define stub_warning(name) \ @@ -63,26 +65,16 @@ diff -u -p -r1.1 libc-symbols.h link_warning (name, \ "warning: " #name " is not implemented and will always fail") -Index: sysdeps/generic/pt-atfork.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-atfork.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-atfork.c ---- libpthread/sysdeps/generic/pt-atfork.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/sysdeps/generic/pt-atfork.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-atfork.c ++++ b/libpthread/sysdeps/generic/pt-atfork.c @@ -27,3 +27,5 @@ pthread_atfork (void (*prepare) (void), { return ENOSYS; } + +stub_warning (pthread_atfork) -Index: sysdeps/generic/pt-getcpuclockid.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-getcpuclockid.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-getcpuclockid.c ---- libpthread/sysdeps/generic/pt-getcpuclockid.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/sysdeps/generic/pt-getcpuclockid.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-getcpuclockid.c ++++ b/libpthread/sysdeps/generic/pt-getcpuclockid.c @@ -30,5 +30,6 @@ pthread_getcpuclockid (pthread_t thread, return 0; #else @@ -90,117 +82,72 @@ diff -u -p -r1.1 pt-getcpuclockid.c +stub_warning (pthread_getcpuclockid) #endif } -Index: sysdeps/generic/pt-getschedparam.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-getschedparam.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-getschedparam.c ---- libpthread/sysdeps/generic/pt-getschedparam.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/sysdeps/generic/pt-getschedparam.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-getschedparam.c ++++ b/libpthread/sysdeps/generic/pt-getschedparam.c @@ -26,3 +26,5 @@ pthread_getschedparam (pthread_t thread, { return ENOSYS; } + +stub_warning (pthread_getschedparam) -Index: sysdeps/generic/pt-key-create.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-key-create.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-key-create.c ---- libpthread/sysdeps/generic/pt-key-create.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/sysdeps/generic/pt-key-create.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-key-create.c ++++ b/libpthread/sysdeps/generic/pt-key-create.c @@ -25,3 +25,5 @@ pthread_key_create (pthread_key_t *key, { return ENOSYS; } + +stub_warning (pthread_key_create) -Index: sysdeps/generic/pt-key-delete.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-key-delete.c,v -retrieving revision 1.2 -diff -u -p -r1.2 pt-key-delete.c ---- libpthread/sysdeps/generic/pt-key-delete.c 2 Nov 2002 23:41:51 -0000 1.2 -+++ libpthread/sysdeps/generic/pt-key-delete.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-key-delete.c ++++ b/libpthread/sysdeps/generic/pt-key-delete.c @@ -25,3 +25,5 @@ pthread_key_delete (pthread_key_t key) { return ENOSYS; } + +stub_warning (pthread_key_delete) -Index: sysdeps/generic/pt-mutex-getprioceiling.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-mutex-getprioceiling.c ---- libpthread/sysdeps/generic/pt-mutex-getprioceiling.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/sysdeps/generic/pt-mutex-getprioceiling.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c ++++ b/libpthread/sysdeps/generic/pt-mutex-getprioceiling.c @@ -26,3 +26,5 @@ pthread_mutex_getprioceiling (const pthr { return ENOSYS; } + +stub_warning (pthread_mutex_getprioceiling) -Index: sysdeps/generic/pt-mutex-setprioceiling.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-mutex-setprioceiling.c ---- libpthread/sysdeps/generic/pt-mutex-setprioceiling.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/sysdeps/generic/pt-mutex-setprioceiling.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c ++++ b/libpthread/sysdeps/generic/pt-mutex-setprioceiling.c @@ -26,3 +26,5 @@ pthread_mutex_setprioceiling (pthread_mu { return ENOSYS; } + +stub_warning (pthread_mutex_setprioceiling) -Index: sysdeps/generic/pt-mutexattr-getprioceiling.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-mutexattr-getprioceiling.c ---- libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c ++++ b/libpthread/sysdeps/generic/pt-mutexattr-getprioceiling.c @@ -26,3 +26,5 @@ pthread_mutexattr_getprioceiling (const { return ENOSYS; } + +stub_warning (pthread_mutexattr_getprioceiling) -Index: sysdeps/generic/pt-mutexattr-setprioceiling.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-mutexattr-setprioceiling.c ---- libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c ++++ b/libpthread/sysdeps/generic/pt-mutexattr-setprioceiling.c @@ -26,3 +26,5 @@ pthread_mutexattr_setprioceiling (pthrea { return ENOSYS; } + +stub_warning (pthread_mutexattr_setprioceiling) -Index: sysdeps/generic/pt-setschedparam.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-setschedparam.c,v -retrieving revision 1.2 -diff -u -p -r1.2 pt-setschedparam.c ---- libpthread/sysdeps/generic/pt-setschedparam.c 20 Apr 2005 15:26:52 -0000 1.2 -+++ libpthread/sysdeps/generic/pt-setschedparam.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-setschedparam.c ++++ b/libpthread/sysdeps/generic/pt-setschedparam.c @@ -26,3 +26,5 @@ pthread_setschedparam (pthread_t thread, { return ENOSYS; } + +stub_warning (pthread_setschedparam) -Index: sysdeps/generic/pt-setschedprio.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/generic/pt-setschedprio.c,v -retrieving revision 1.1 -diff -u -p -r1.1 pt-setschedprio.c ---- libpthread/sysdeps/generic/pt-setschedprio.c 10 Oct 2002 23:05:06 -0000 1.1 -+++ libpthread/sysdeps/generic/pt-setschedprio.c 31 Dec 2007 21:22:22 -0000 +--- a/libpthread/sysdeps/generic/pt-setschedprio.c ++++ b/libpthread/sysdeps/generic/pt-setschedprio.c @@ -25,3 +25,5 @@ pthread_setschedprio (pthread_t thread, { return ENOSYS; diff --git a/debian/patches/libpthread_tls.patch b/debian/patches/libpthread_tls.patch index 0ead8663..f02f3978 100644 --- a/debian/patches/libpthread_tls.patch +++ b/debian/patches/libpthread_tls.patch @@ -1,11 +1,20 @@ -Index: libpthread/pthread/pt-create.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-create.c,v -retrieving revision 1.4 -diff -u -p -r1.4 pt-create.c ---- libpthread/pthread/pt-create.c 4 May 2005 16:04:06 -0000 1.4 -+++ libpthread/pthread/pt-create.c 12 Aug 2007 11:34:11 -0000 -@@ -127,6 +127,11 @@ +--- + libpthread/pthread/pt-create.c | 7 ++++ + libpthread/pthread/pt-exit.c | 3 ++ + libpthread/pthread/pt-internal.h | 19 ++++++++++++ + libpthread/sysdeps/mach/hurd/i386/pt-machdep.c | 37 ++++++++++++++++++++++--- + libpthread/sysdeps/mach/hurd/i386/pt-setup.c | 7 +++- + libpthread/sysdeps/mach/hurd/pt-docancel.c | 4 +- + libpthread/sysdeps/mach/hurd/pt-sysdep.h | 10 ++++-- + libthreads/alpha/thread.c | 1 + libthreads/cprocs.c | 3 +- + libthreads/cthread_internals.h | 16 ++++++++++ + libthreads/i386/thread.c | 32 +++++++++++++++++++-- + 11 files changed, 122 insertions(+), 17 deletions(-) + +--- a/libpthread/pthread/pt-create.c ++++ b/libpthread/pthread/pt-create.c +@@ -129,6 +129,11 @@ __pthread_create_internal (struct __pthr if (err) goto failed_thread_alloc; @@ -17,22 +26,18 @@ diff -u -p -r1.4 pt-create.c /* And initialize the rest of the machine context. This may include additional machine- and system-specific initializations that prove convenient. */ -@@ -192,6 +197,8 @@ +@@ -194,6 +199,8 @@ __pthread_create_internal (struct __pthr failed_sigstate: __pthread_sigstate_destroy (pthread); failed_setup: + _dl_deallocate_tls (pthread->tcb, 1); + failed_thread_tls_alloc: __pthread_thread_dealloc (pthread); - __pthread_thread_halt (pthread, 0); + __pthread_thread_halt (pthread); failed_thread_alloc: -Index: libpthread/pthread/pt-exit.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-exit.c,v -retrieving revision 1.2 ---- libpthread/pthread/pt-exit.c 4 May 2005 16:04:06 -0000 1.2 -+++ libpthread/pthread/pt-exit.c 12 Aug 2007 11:34:11 -0000 -@@ -70,6 +70,9 @@ +--- a/libpthread/pthread/pt-exit.c ++++ b/libpthread/pthread/pt-exit.c +@@ -70,6 +70,9 @@ pthread_exit (void *status) if (self->cancel_state == PTHREAD_CANCEL_ENABLE && self->cancel_pending) status = PTHREAD_CANCELED; @@ -42,14 +47,9 @@ retrieving revision 1.2 switch (self->state) { default: -Index: libpthread/pthread/pt-internal.h -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/pthread/pt-internal.h,v -retrieving revision 1.4 -diff -u -p -r1.4 pt-internal.h ---- libpthread/pthread/pt-internal.h 4 Mar 2007 00:05:21 -0000 1.4 -+++ libpthread/pthread/pt-internal.h 12 Aug 2007 11:34:11 -0000 -@@ -50,6 +50,14 @@ +--- a/libpthread/pthread/pt-internal.h ++++ b/libpthread/pthread/pt-internal.h +@@ -54,6 +54,14 @@ enum pthread_state # define PTHREAD_SYSDEP_MEMBERS #endif @@ -64,7 +64,7 @@ diff -u -p -r1.4 pt-internal.h /* This structure describes a POSIX thread. */ struct __pthread { -@@ -85,6 +93,8 @@ +@@ -89,6 +97,8 @@ struct __pthread PTHREAD_SYSDEP_MEMBERS @@ -73,7 +73,7 @@ diff -u -p -r1.4 pt-internal.h struct __pthread *next, **prevp; }; -@@ -272,4 +282,13 @@ +@@ -287,4 +297,13 @@ const struct __pthread_rwlockattr __pthr /* Default condition attributes. */ const struct __pthread_condattr __pthread_default_condattr; @@ -87,13 +87,9 @@ diff -u -p -r1.4 pt-internal.h +extern void _dl_deallocate_tls(void *, int); + #endif /* pt-internal.h */ -Index: libpthread/sysdeps/mach/hurd/pt-docancel.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/pt-docancel.c,v -retrieving revision 1.2 ---- libpthread/sysdeps/mach/hurd/pt-docancel.c 18 Nov 2002 22:20:58 -0000 1.2 -+++ libpthread/sysdeps/mach/hurd/pt-docancel.c 12 Aug 2007 11:34:11 -0000 -@@ -52,8 +52,8 @@ +--- a/libpthread/sysdeps/mach/hurd/pt-docancel.c ++++ b/libpthread/sysdeps/mach/hurd/pt-docancel.c +@@ -52,8 +52,8 @@ __pthread_do_cancel (struct __pthread *p err = __thread_abort (p->kernel_thread); assert_perror (err); @@ -104,13 +100,9 @@ retrieving revision 1.2 assert_perror (err); err = __thread_resume (p->kernel_thread); -Index: libpthread/sysdeps/mach/hurd/pt-sysdep.h -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/pt-sysdep.h,v -retrieving revision 1.3 ---- libpthread/sysdeps/mach/hurd/pt-sysdep.h 18 Jan 2005 10:08:52 -0000 1.3 -+++ libpthread/sysdeps/mach/hurd/pt-sysdep.h 12 Aug 2007 11:34:11 -0000 -@@ -59,11 +59,13 @@ +--- a/libpthread/sysdeps/mach/hurd/pt-sysdep.h ++++ b/libpthread/sysdeps/mach/hurd/pt-sysdep.h +@@ -60,11 +60,13 @@ __pthread_stack_dealloc (void *stackaddr __vm_deallocate (__mach_task_self (), (vm_offset_t) stackaddr, stacksize); } @@ -128,12 +120,8 @@ retrieving revision 1.3 #endif /* pt-sysdep.h */ -Index: libpthread/sysdeps/mach/hurd/i386/pt-machdep.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/i386/pt-machdep.c,v -retrieving revision 1.1 ---- libpthread/sysdeps/mach/hurd/i386/pt-machdep.c 10 Oct 2002 23:05:05 -0000 1.1 -+++ libpthread/sysdeps/mach/hurd/i386/pt-machdep.c 12 Aug 2007 11:34:11 -0000 +--- a/libpthread/sysdeps/mach/hurd/i386/pt-machdep.c ++++ b/libpthread/sysdeps/mach/hurd/i386/pt-machdep.c @@ -21,12 +21,28 @@ #include <mach.h> @@ -165,7 +153,7 @@ retrieving revision 1.1 { error_t err; struct i386_thread_state state; -@@ -34,7 +50,7 @@ +@@ -34,7 +50,7 @@ __thread_set_pcsp (thread_t thread, state_count = i386_THREAD_STATE_COUNT; @@ -174,7 +162,7 @@ retrieving revision 1.1 (thread_state_t) &state, &state_count); if (err) return err; -@@ -43,8 +59,21 @@ +@@ -43,8 +59,21 @@ __thread_set_pcsp (thread_t thread, state.uesp = (unsigned int) sp; if (set_ip) state.eip = (unsigned int) ip; @@ -197,13 +185,9 @@ retrieving revision 1.1 (thread_state_t) &state, i386_THREAD_STATE_COUNT); if (err) -Index: libpthread/sysdeps/mach/hurd/i386/pt-setup.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libpthread/sysdeps/mach/hurd/i386/pt-setup.c,v -retrieving revision 1.4 ---- libpthread/sysdeps/mach/hurd/i386/pt-setup.c 12 May 2005 20:55:37 -0000 1.4 -+++ libpthread/sysdeps/mach/hurd/i386/pt-setup.c 12 Aug 2007 11:34:11 -0000 -@@ -89,12 +89,15 @@ +--- a/libpthread/sysdeps/mach/hurd/i386/pt-setup.c ++++ b/libpthread/sysdeps/mach/hurd/i386/pt-setup.c +@@ -91,12 +91,15 @@ __pthread_setup (struct __pthread *threa thread->mcontext.pc = entry_point; thread->mcontext.sp = stack_setup (thread, start_routine, arg); @@ -221,13 +205,9 @@ retrieving revision 1.4 assert_perror (err); } __mach_port_deallocate (__mach_task_self (), ktid); -Index: libthreads/cprocs.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libthreads/cprocs.c,v -retrieving revision 1.17 ---- libthreads/cprocs.c 29 May 2002 00:01:24 -0000 1.17 -+++ libthreads/cprocs.c 12 Aug 2007 11:34:10 -0000 -@@ -730,10 +730,11 @@ +--- a/libthreads/cprocs.c ++++ b/libthreads/cprocs.c +@@ -730,10 +730,11 @@ cproc_create(void) spin_lock(&n_kern_lock); if (cthread_max_kernel_threads == 0 || cthread_kernel_threads < cthread_max_kernel_threads) { @@ -240,12 +220,8 @@ retrieving revision 1.17 MACH_CALL(thread_resume(n), r); #ifdef STATISTICS spin_lock(&ready_lock); -Index: libthreads/cthread_internals.h -=================================================================== -RCS file: /cvsroot/hurd/hurd/libthreads/cthread_internals.h,v -retrieving revision 1.7 ---- libthreads/cthread_internals.h 14 Jun 2007 17:24:13 -0000 1.7 -+++ libthreads/cthread_internals.h 12 Aug 2007 11:34:10 -0000 +--- a/libthreads/cthread_internals.h ++++ b/libthreads/cthread_internals.h @@ -166,6 +166,14 @@ # endif #endif @@ -261,7 +237,7 @@ retrieving revision 1.7 /* * Low-level thread implementation. * This structure must agree with struct ur_cthread in cthreads.h -@@ -312,4 +320,10 @@ +@@ -312,4 +320,10 @@ extern void cproc_prepare(cproc_t _chil void (*cthread_body_pc)()); extern void cproc_setup(cproc_t _child, thread_t _mach_thread, @@ -273,13 +249,9 @@ retrieving revision 1.7 + +/* Dynamic linker TLS allocation. */ +extern void *_dl_allocate_tls(void *); -Index: libthreads/alpha/thread.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libthreads/alpha/thread.c,v -retrieving revision 1.2 ---- libthreads/alpha/thread.c 27 May 2002 02:50:13 -0000 1.2 -+++ libthreads/alpha/thread.c 12 Aug 2007 11:34:10 -0000 -@@ -74,6 +74,7 @@ +--- a/libthreads/alpha/thread.c ++++ b/libthreads/alpha/thread.c +@@ -74,6 +74,7 @@ void cproc_setup( register cproc_t child, thread_t thread, @@ -287,13 +259,9 @@ retrieving revision 1.2 void (*routine)(cproc_t)) { register integer_t *top; -Index: libthreads/i386/thread.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libthreads/i386/thread.c,v -retrieving revision 1.7 ---- libthreads/i386/thread.c 27 May 2002 02:50:10 -0000 1.7 -+++ libthreads/i386/thread.c 12 Aug 2007 11:34:10 -0000 -@@ -75,6 +75,21 @@ +--- a/libthreads/i386/thread.c ++++ b/libthreads/i386/thread.c +@@ -75,6 +75,21 @@ char rcs_id[] = "$Header: /cvsroot/hurd/ #include <cthreads.h> #include "cthread_internals.h" #include <mach.h> @@ -315,7 +283,7 @@ retrieving revision 1.7 /* * Set up the initial state of a MACH thread -@@ -82,7 +97,7 @@ +@@ -82,7 +97,7 @@ char rcs_id[] = "$Header: /cvsroot/hurd/ * when it is resumed. */ void @@ -324,7 +292,7 @@ retrieving revision 1.7 { extern unsigned int __hurd_threadvar_max; /* GNU */ register int *top = (int *) -@@ -95,13 +110,15 @@ +@@ -95,13 +110,15 @@ cproc_setup(register cproc_t child, thre register struct i386_thread_state *ts = &state; kern_return_t r; unsigned int count; @@ -341,7 +309,7 @@ retrieving revision 1.7 ts->eip = (int) routine; *--top = (int) child; /* argument to function */ -@@ -109,7 +126,16 @@ +@@ -109,7 +126,16 @@ cproc_setup(register cproc_t child, thre ts->uesp = (int) top; /* set stack pointer */ ts->ebp = 0; /* clear frame pointer */ diff --git a/debian/patches/makedev.diff b/debian/patches/makedev.diff index 1dfefe74..5a02214d 100644 --- a/debian/patches/makedev.diff +++ b/debian/patches/makedev.diff @@ -1,6 +1,10 @@ ---- sutils/MAKEDEV.sh.orig 2006-04-12 15:05:12.000000000 +0000 -+++ sutils/MAKEDEV.sh 2006-04-12 15:05:23.000000000 +0000 -@@ -86,7 +86,7 @@ +--- + sutils/MAKEDEV.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sutils/MAKEDEV.sh ++++ b/sutils/MAKEDEV.sh +@@ -86,7 +86,7 @@ function mkdev { ;; std) diff --git a/debian/patches/pfinet-gcc-4.3-fix.patch b/debian/patches/pfinet-gcc-4.3-fix.patch index c58878ae..fbc31da9 100644 --- a/debian/patches/pfinet-gcc-4.3-fix.patch +++ b/debian/patches/pfinet-gcc-4.3-fix.patch @@ -8,11 +8,13 @@ Date: Sat Sep 26 21:29:00 2009 +0200 Add memory clobber to assembly snippet. (csum_ipv6_magic): Likewise. -diff --git a/pfinet/linux-src/include/asm-i386/checksum.h b/pfinet/linux-src/include/asm-i386/checksum.h -index ed02317..add8959 100644 +--- + pfinet/linux-src/include/asm-i386/checksum.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + --- a/pfinet/linux-src/include/asm-i386/checksum.h +++ b/pfinet/linux-src/include/asm-i386/checksum.h -@@ -109,7 +109,8 @@ static inline unsigned short ip_fast_csum(unsigned char * iph, +@@ -109,7 +109,8 @@ static inline unsigned short ip_fast_csu are modified, we must also specify them as outputs, or gcc will assume they contain their original values. */ : "=r" (sum), "=r" (iph), "=r" (ihl) @@ -22,7 +24,7 @@ index ed02317..add8959 100644 return(sum); } -@@ -185,7 +186,8 @@ static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr, +@@ -185,7 +186,8 @@ static __inline__ unsigned short int csu "adcl $0, %0\n" : "=&r" (sum) : "r" (saddr), "r" (daddr), diff --git a/debian/patches/pfinet_dhcp.patch b/debian/patches/pfinet_dhcp.patch index bf0a23a9..30c0902a 100644 --- a/debian/patches/pfinet_dhcp.patch +++ b/debian/patches/pfinet_dhcp.patch @@ -25,9 +25,14 @@ * linux-src/net/ipv4/devinet.c (inet_insert_ifa) [_HURD_]: Don't fail when the address is `0.0.0.0'. ---- pfinet/options.c 14 Oct 2007 02:26:10 -0000 1.14 -+++ pfinet/options.c 20 Nov 2007 20:27:14 -0000 -@@ -60,23 +60,26 @@ +--- + pfinet/linux-src/net/ipv4/devinet.c | 2 + pfinet/options.c | 381 ++++++++++++++++++++++++++---------- + 2 files changed, 278 insertions(+), 105 deletions(-) + +--- a/pfinet/options.c ++++ b/pfinet/options.c +@@ -60,23 +60,26 @@ extern struct inet6_dev *ipv6_find_idev extern int inet6_addr_add (int ifindex, struct in6_addr *pfx, int plen); extern int inet6_addr_del (int ifindex, struct in6_addr *pfx, int plen); @@ -64,7 +69,7 @@ {0} }; -@@ -112,6 +115,50 @@ +@@ -112,6 +115,50 @@ struct parse_hook struct parse_interface *curint; }; @@ -115,7 +120,7 @@ /* Adds an empty interface slot to H, and sets H's current interface to it, or returns an error. */ static error_t -@@ -122,6 +169,7 @@ +@@ -122,6 +169,7 @@ parse_hook_add_interface (struct parse_h (h->num_interfaces + 1) * sizeof (struct parse_interface)); if (! new) return ENOMEM; @@ -123,7 +128,7 @@ h->interfaces = new; h->num_interfaces++; h->curint = new + h->num_interfaces - 1; -@@ -183,10 +231,16 @@ +@@ -183,10 +231,16 @@ parse_opt (int opt, char *arg, struct ar if (addr == INADDR_NONE) PERR (EINVAL, "Malformed %s", type); \ addr; }) @@ -142,11 +147,10 @@ #ifdef CONFIG_IPV6 struct parse_interface *gw6_in; char *ptr; -@@ -216,30 +270,60 @@ - err = find_device (arg, &in->device); +@@ -217,29 +271,59 @@ parse_opt (int opt, char *arg, struct ar if (err) FAIL (err, 10, err, "%s", arg); - + + /* Set old interface values */ + parse_interface_copy_device (in->device, in); break; @@ -219,7 +223,7 @@ case '4': pfinet_bind (PORTCLASS_INET, arg); -@@ -254,36 +338,46 @@ +@@ -254,36 +338,46 @@ parse_opt (int opt, char *arg, struct ar break; case 'A': @@ -288,7 +292,7 @@ break; #endif /* CONFIG_IPV6 */ -@@ -323,20 +417,19 @@ +@@ -323,20 +417,19 @@ parse_opt (int opt, char *arg, struct ar /* Specifying a netmask for an address-less interface is a no-no. */ FAIL (EDESTADDRREQ, 14, 0, "Cannot set netmask"); #endif @@ -316,7 +320,7 @@ #ifdef CONFIG_IPV6 if (!IN6_IS_ADDR_UNSPECIFIED (&in->gateway6)) -@@ -361,15 +454,20 @@ +@@ -361,15 +454,20 @@ parse_opt (int opt, char *arg, struct ar idev = ipv6_find_idev(in->device); #endif @@ -345,7 +349,7 @@ } #ifdef CONFIG_IPV6 -@@ -377,24 +475,25 @@ +@@ -377,24 +475,25 @@ parse_opt (int opt, char *arg, struct ar continue; /* First let's remove all non-local addresses. */ @@ -389,7 +393,7 @@ /* Now assign the new address */ inet6_addr_add (in->device->ifindex, &in->address6.addr, in->address6.prefix_len); -@@ -418,33 +517,40 @@ +@@ -418,33 +517,40 @@ parse_opt (int opt, char *arg, struct ar req.nlh.nlmsg_seq = 0; req.nlh.nlmsg_len = NLMSG_LENGTH (sizeof req.rtm); @@ -448,7 +452,7 @@ req.nlh.nlmsg_type = RTM_NEWROUTE; req.nlh.nlmsg_flags = NLM_F_REQUEST | NLM_F_CREATE | NLM_F_REPLACE; tb = fib_new_table (req.rtm.rtm_table); -@@ -467,13 +574,77 @@ +@@ -467,13 +573,77 @@ parse_opt (int opt, char *arg, struct ar if (!gw6_in || rt6i->rt6i_dev != gw6_in->device || !IN6_ARE_ADDR_EQUAL (&rt6i->rt6i_gateway, &gw6_in->gateway6)) { @@ -527,7 +531,7 @@ __mutex_unlock (&global_lock); /* Fall through to free hook. */ -@@ -526,8 +697,9 @@ +@@ -526,8 +696,9 @@ trivfs_append_args (struct trivfs_contro ADD_ADDR_OPT ("netmask", mask); if (peer != addr) ADD_ADDR_OPT ("peer", peer); @@ -539,10 +543,9 @@ ADD_ADDR_OPT ("gateway", FIB_RES_GW (res)); #undef ADD_ADDR_OPT -diff -u -r1.8 devinet.c ---- pfinet/linux-src/net/ipv4/devinet.c 18 Jul 2001 17:37:13 -0000 1.8 -+++ pfinet/linux-src/net/ipv4/devinet.c 20 Nov 2007 20:30:21 -0000 -@@ -214,10 +214,12 @@ +--- a/pfinet/linux-src/net/ipv4/devinet.c ++++ b/pfinet/linux-src/net/ipv4/devinet.c +@@ -214,10 +214,12 @@ inet_insert_ifa(struct in_device *in_dev { struct in_ifaddr *ifa1, **ifap, **last_primary; diff --git a/debian/patches/pflocal.patch b/debian/patches/pflocal.patch index 9d3a8db7..3d9b3ac2 100644 --- a/debian/patches/pflocal.patch +++ b/debian/patches/pflocal.patch @@ -34,13 +34,15 @@ * socket.c (S_socket_connect): Create the server socket here... (S_socket_accept): ... not here. -Index: connq.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/pflocal/connq.c,v -retrieving revision 1.15 -diff -u -p -r1.15 connq.c ---- pflocal/connq.c 22 Dec 2001 21:00:37 -0000 1.15 -+++ pflocal/connq.c 17 May 2005 09:25:47 -0000 +--- + pflocal/connq.c | 341 +++++++++++++++++++++++++++++-------------------------- + pflocal/connq.h | 39 +++--- + pflocal/io.c | 8 - + pflocal/socket.c | 72 +++++------ + 4 files changed, 245 insertions(+), 215 deletions(-) + +--- a/pflocal/connq.c ++++ b/pflocal/connq.c @@ -26,31 +26,22 @@ /* A queue for queueing incoming connections. */ struct connq @@ -482,13 +484,8 @@ diff -u -p -r1.15 connq.c mutex_unlock (&cq->lock); -Index: connq.h -=================================================================== -RCS file: /cvsroot/hurd/hurd/pflocal/connq.h,v -retrieving revision 1.6 -diff -u -p -r1.6 connq.h ---- pflocal/connq.h 12 Feb 2001 17:24:36 -0000 1.6 -+++ pflocal/connq.h 17 May 2005 09:25:47 -0000 +--- a/pflocal/connq.h ++++ b/pflocal/connq.h @@ -23,9 +23,8 @@ #include <errno.h> @@ -545,14 +542,9 @@ diff -u -p -r1.6 connq.h -error_t connq_connect (struct connq *cq, int noblock, struct sock *sock); - #endif /* __CONNQ_H__ */ -Index: io.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/pflocal/io.c,v -retrieving revision 1.39 -diff -u -p -r1.39 io.c ---- pflocal/io.c 11 Jun 2002 21:40:34 -0000 1.39 -+++ pflocal/io.c 17 May 2005 09:25:48 -0000 -@@ -197,16 +197,16 @@ S_io_select (struct sock_user *user, +--- a/pflocal/io.c ++++ b/pflocal/io.c +@@ -199,16 +199,16 @@ S_io_select (struct sock_user *user, if (*select_type & SELECT_READ) { @@ -573,13 +565,8 @@ diff -u -p -r1.39 io.c } } } -Index: socket.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/pflocal/socket.c,v -retrieving revision 1.22 -diff -u -p -r1.22 socket.c ---- pflocal/socket.c 27 Jan 1996 17:37:55 -0000 1.22 -+++ pflocal/socket.c 17 May 2005 09:25:48 -0000 +--- a/pflocal/socket.c ++++ b/pflocal/socket.c @@ -110,7 +110,7 @@ S_socket_connect (struct sock_user *user else if (sock->flags & SOCK_CONNECTED) /* SOCK_CONNECTED is only set for connection-oriented sockets, diff --git a/debian/patches/procfs.patch b/debian/patches/procfs.patch index 8f34257f..76a70469 100644 --- a/debian/patches/procfs.patch +++ b/debian/patches/procfs.patch @@ -1,6 +1,20 @@ -diff --exclude=CVS -Naur foo/ChangeLog procfs/ChangeLog ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/ChangeLog 2008-09-01 23:47:03.000000000 +0200 +--- + Makefile | 2 + procfs/ChangeLog | 161 ++++++++++ + procfs/Makefile | 30 + + procfs/bootstrap.c | 95 ++++++ + procfs/netfs.c | 466 ++++++++++++++++++++++++++++++ + procfs/node.c | 195 ++++++++++++ + procfs/procfs.c | 149 +++++++++ + procfs/procfs.h | 220 ++++++++++++++ + procfs/procfs_dir.c | 664 +++++++++++++++++++++++++++++++++++++++++++ + procfs/procfs_nonpid_files.c | 514 +++++++++++++++++++++++++++++++++ + procfs/procfs_pid.h | 88 +++++ + procfs/procfs_pid_files.c | 576 +++++++++++++++++++++++++++++++++++++ + 12 files changed, 3159 insertions(+), 1 deletion(-) + +--- /dev/null ++++ b/procfs/ChangeLog @@ -0,0 +1,161 @@ +2008-08-30 Madhusudan.C.S <madhusudancs@gmail.com> + @@ -163,9 +177,8 @@ diff --exclude=CVS -Naur foo/ChangeLog procfs/ChangeLog +2008-05-13 Madhusudan.C.S <madhusudancs@gmail.com> + + * /sources/hurd/procfs: New directory added to the repository. -diff --exclude=CVS -Naur foo/Makefile procfs/Makefile ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/Makefile 2008-08-29 19:28:42.000000000 +0200 +--- /dev/null ++++ b/procfs/Makefile @@ -0,0 +1,30 @@ +# Makefile - for procfs +# @@ -197,9 +210,8 @@ diff --exclude=CVS -Naur foo/Makefile procfs/Makefile +HURDLIBS = netfs fshelp iohelp threads ports ihash ps shouldbeinlibc + +include ../Makeconf -diff --exclude=CVS -Naur foo/bootstrap.c procfs/bootstrap.c ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/bootstrap.c 2008-08-14 15:24:49.000000000 +0200 +--- /dev/null ++++ b/procfs/bootstrap.c @@ -0,0 +1,95 @@ +/* procfs -- a translator for providing GNU/Linux compatible + proc pseudo-filesystem @@ -296,9 +308,8 @@ diff --exclude=CVS -Naur foo/bootstrap.c procfs/bootstrap.c + return err; +} + -diff --exclude=CVS -Naur foo/netfs.c procfs/netfs.c ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/netfs.c 2008-09-02 00:16:23.000000000 +0200 +--- /dev/null ++++ b/procfs/netfs.c @@ -0,0 +1,466 @@ +/* procfs -- a translator for providing GNU/Linux compatible + proc pseudo-filesystem @@ -766,9 +777,8 @@ diff --exclude=CVS -Naur foo/netfs.c procfs/netfs.c + procfs_remove_node (np); +} + -diff --exclude=CVS -Naur foo/node.c procfs/node.c ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/node.c 2008-08-14 15:24:49.000000000 +0200 +--- /dev/null ++++ b/procfs/node.c @@ -0,0 +1,195 @@ +/* procfs -- a translator for providing GNU/Linux compatible + proc pseudo-filesystem @@ -965,9 +975,8 @@ diff --exclude=CVS -Naur foo/node.c procfs/node.c + + return 0; +} -diff --exclude=CVS -Naur foo/procfs.c procfs/procfs.c ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/procfs.c 2008-08-14 15:24:50.000000000 +0200 +--- /dev/null ++++ b/procfs/procfs.c @@ -0,0 +1,149 @@ +/* procfs -- a translator for providing GNU/Linux compatible + proc pseudo-filesystem @@ -1118,9 +1127,8 @@ diff --exclude=CVS -Naur foo/procfs.c procfs/procfs.c + netfs_server_loop (); + return 1; +} -diff --exclude=CVS -Naur foo/procfs.h procfs/procfs.h ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/procfs.h 2008-08-18 17:15:33.000000000 +0200 +--- /dev/null ++++ b/procfs/procfs.h @@ -0,0 +1,220 @@ +/* procfs -- a translator for providing GNU/Linux compatible + proc pseudo-filesystem @@ -1342,9 +1350,8 @@ diff --exclude=CVS -Naur foo/procfs.h procfs/procfs.h + struct node **node); + +#endif /* __PROCFS_H__ */ -diff --exclude=CVS -Naur foo/procfs_dir.c procfs/procfs_dir.c ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/procfs_dir.c 2008-09-01 23:47:03.000000000 +0200 +--- /dev/null ++++ b/procfs/procfs_dir.c @@ -0,0 +1,664 @@ +/* procfs -- a translator for providing GNU/Linux compatible + proc pseudo-filesystem @@ -2010,9 +2017,8 @@ diff --exclude=CVS -Naur foo/procfs_dir.c procfs/procfs_dir.c + /* STUB */ + return 0; +} -diff --exclude=CVS -Naur foo/procfs_nonpid_files.c procfs/procfs_nonpid_files.c ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/procfs_nonpid_files.c 2008-08-18 20:26:23.000000000 +0200 +--- /dev/null ++++ b/procfs/procfs_nonpid_files.c @@ -0,0 +1,514 @@ +/* procfs -- a translator for providing GNU/Linux compatible + proc pseudo-filesystem @@ -2528,9 +2534,8 @@ diff --exclude=CVS -Naur foo/procfs_nonpid_files.c procfs/procfs_nonpid_files.c + free (version_data); + return err; +} -diff --exclude=CVS -Naur foo/procfs_pid.h procfs/procfs_pid.h ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/procfs_pid.h 2008-08-18 17:15:33.000000000 +0200 +--- /dev/null ++++ b/procfs/procfs_pid.h @@ -0,0 +1,88 @@ +/* procfs -- a translator for providing GNU/Linux compatible + proc pseudo-filesystem @@ -2620,9 +2625,8 @@ diff --exclude=CVS -Naur foo/procfs_pid.h procfs/procfs_pid.h +}; + +#endif -diff --exclude=CVS -Naur foo/procfs_pid_files.c procfs/procfs_pid_files.c ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ procfs/procfs_pid_files.c 2008-09-01 23:47:03.000000000 +0200 +--- /dev/null ++++ b/procfs/procfs_pid_files.c @@ -0,0 +1,576 @@ +/* procfs -- a translator for providing GNU/Linux compatible + proc pseudo-filesystem @@ -3200,9 +3204,9 @@ diff --exclude=CVS -Naur foo/procfs_pid_files.c procfs/procfs_pid_files.c + + return err; +} ---- Makefile.orig 2008-09-02 02:14:58.000000000 +0200 -+++ Makefile 2008-08-29 15:23:04.000000000 +0200 -@@ -41,7 +41,7 @@ +--- a/Makefile ++++ b/Makefile +@@ -41,7 +41,7 @@ prog-subdirs = auth proc exec init term login daemons nfsd boot console \ hostmux usermux ftpfs trans \ console-client utils sutils ufs-fsck ufs-utils \ diff --git a/debian/patches/rc.patch b/debian/patches/rc.patch index 4b5937f6..e33dbaa0 100644 --- a/debian/patches/rc.patch +++ b/debian/patches/rc.patch @@ -1,6 +1,10 @@ ---- hurd/daemons/rc.sh.orig 2004-09-27 11:54:22.000000000 +0200 -+++ hurd/daemons/rc.sh 2004-09-27 11:54:27.000000000 +0200 -@@ -19,14 +19,17 @@ +--- + daemons/rc.sh | 43 ++++++++++++++++++++++++++++++++----------- + 1 file changed, 32 insertions(+), 11 deletions(-) + +--- a/daemons/rc.sh ++++ b/daemons/rc.sh +@@ -19,14 +19,17 @@ then echo Automatic boot in progress... date @@ -19,7 +23,7 @@ ;; # Fsck couldn't fix it. 4 | 8) -@@ -85,7 +88,15 @@ +@@ -85,7 +88,15 @@ if test -d /tmp; then fi if test -d /var/run; then @@ -36,7 +40,7 @@ fi echo done -@@ -104,15 +115,25 @@ +@@ -104,15 +115,25 @@ touch /var/run/mtab chmod 664 /etc/motd diff --git a/debian/patches/runsystem_setup_pflocal.patch b/debian/patches/runsystem_setup_pflocal.patch index e7526e6d..24ce5ac4 100644 --- a/debian/patches/runsystem_setup_pflocal.patch +++ b/debian/patches/runsystem_setup_pflocal.patch @@ -1,6 +1,10 @@ ---- daemons/runsystem.sh 2007-11-15 19:41:12.000000000 +0100 -+++ deamons/runsystem.sh 2007-11-15 19:43:39.000000000 +0100 -@@ -53,6 +53,12 @@ +--- + daemons/runsystem.sh | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/daemons/runsystem.sh ++++ b/daemons/runsystem.sh +@@ -53,6 +53,12 @@ function singleuser () } diff --git a/debian/patches/series b/debian/patches/series index 9276739a..b1ddf87a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,34 +1,34 @@ -console_utf-8.patch -p1 -diskfs_no_inherit_dir_group.patch -p1 -ext2fs_large_stores.patch -p1 -hurd_console_startup.patch -p0 -init_try_runsystem.gnu.patch -p0 -install-msgids.diff -p2 -libpager_update_seqno.patch -p0 -libpthread_mutex_owner.patch -p0 -libpthread_stubs.patch -p0 -libpthread_tls.patch -p0 -makedev.diff -p0 -pfinet_dhcp.patch -p0 -pflocal.patch -p0 -procfs.patch -p0 -rc.patch -p1 -runsystem_setup_pflocal.patch -p0 -startup-usr-support.patch -p0 -tmp_exec_startup.patch -p0 -ttys.patch -p1 -uptime_w_path_fix.patch -p1 -stat_round.patch -p0 -dir_acces_fix.patch -p0 -libports_stability.patch -p0 -libpthread_fix.patch -p0 -libpthread_setcancel.patch -p0 -extern_inline_fix.patch -p1 -exec_fix.patch -p0 -libpthread_recursive_mutex_initializer.patch -p0 -pfinet-gcc-4.3-fix.patch -p1 -MAKEDEV.patch -p1 -libdiskfs-rename.patch -p1 -libpthread_cancel_init.patch -p1 -libpthread_kill_0.patch -p1 -console_current_vcs.patch -p1 +console_utf-8.patch +diskfs_no_inherit_dir_group.patch +ext2fs_large_stores.patch +hurd_console_startup.patch +init_try_runsystem.gnu.patch +install-msgids.diff +libpager_update_seqno.patch +libpthread_mutex_owner.patch +libpthread_stubs.patch +libpthread_tls.patch +makedev.diff +pfinet_dhcp.patch +pflocal.patch +procfs.patch +rc.patch +runsystem_setup_pflocal.patch +startup-usr-support.patch +tmp_exec_startup.patch +ttys.patch +uptime_w_path_fix.patch +stat_round.patch +dir_acces_fix.patch +libports_stability.patch +libpthread_fix.patch +libpthread_setcancel.patch +extern_inline_fix.patch +exec_fix.patch +libpthread_recursive_mutex_initializer.patch +pfinet-gcc-4.3-fix.patch +MAKEDEV.patch +libdiskfs-rename.patch +libpthread_cancel_init.patch +libpthread_kill_0.patch +console_current_vcs.patch diff --git a/debian/patches/startup-usr-support.patch b/debian/patches/startup-usr-support.patch index f5255f40..5acfd638 100644 --- a/debian/patches/startup-usr-support.patch +++ b/debian/patches/startup-usr-support.patch @@ -1,5 +1,10 @@ ---- daemons/rc.sh.old 2004-06-11 13:31:03.030701904 -0400 -+++ daemons/rc.sh 2004-06-11 13:31:14.870307857 -0400 +--- + daemons/rc.sh | 2 +- + daemons/runsystem.sh | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/daemons/rc.sh ++++ b/daemons/rc.sh @@ -1,6 +1,6 @@ #!/bin/bash @@ -8,8 +13,8 @@ # Start the default pager. It will bail if there is already one running. /hurd/mach-defpager ---- daemons/runsystem.sh.old 2004-06-11 13:31:07.771817617 -0400 -+++ daemons/runsystem.sh 2004-06-11 13:31:25.036119303 -0400 +--- a/daemons/runsystem.sh ++++ b/daemons/runsystem.sh @@ -11,7 +11,7 @@ ### Where to find programs, etc. ### diff --git a/debian/patches/stat_round.patch b/debian/patches/stat_round.patch index 083f317f..38454ba6 100644 --- a/debian/patches/stat_round.patch +++ b/debian/patches/stat_round.patch @@ -1,11 +1,11 @@ -Index: libdiskfs/file-utimes.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libdiskfs/file-utimes.c,v -retrieving revision 1.9 -diff -u -r1.9 file-utimes.c ---- libdiskfs/file-utimes.c 2 Feb 2009 03:04:46 -0000 1.9 -+++ libdiskfs/file-utimes.c 4 Apr 2009 22:47:50 -0000 -@@ -33,7 +33,7 @@ +--- + libdiskfs/file-utimes.c | 4 ++-- + libdiskfs/node-times.c | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) + +--- a/libdiskfs/file-utimes.c ++++ b/libdiskfs/file-utimes.c +@@ -33,7 +33,7 @@ diskfs_S_file_utimes (struct protid *cre else { np->dn_stat.st_atim.tv_sec = atime.seconds; @@ -14,7 +14,7 @@ diff -u -r1.9 file-utimes.c np->dn_set_atime = 0; } -@@ -42,7 +42,7 @@ +@@ -42,7 +42,7 @@ diskfs_S_file_utimes (struct protid *cre else { np->dn_stat.st_mtim.tv_sec = mtime.seconds; @@ -23,14 +23,9 @@ diff -u -r1.9 file-utimes.c np->dn_set_mtime = 0; } -Index: libdiskfs/node-times.c -=================================================================== -RCS file: /cvsroot/hurd/hurd/libdiskfs/node-times.c,v -retrieving revision 1.15 -diff -u -r1.15 node-times.c ---- libdiskfs/node-times.c 16 Feb 2009 16:06:00 -0000 1.15 -+++ libdiskfs/node-times.c 4 Apr 2009 22:47:51 -0000 -@@ -53,21 +53,21 @@ +--- a/libdiskfs/node-times.c ++++ b/libdiskfs/node-times.c +@@ -53,21 +53,21 @@ diskfs_set_node_times (struct node *np) if (np->dn_set_mtime) { np->dn_stat.st_mtim.tv_sec = t.tv_sec; diff --git a/debian/patches/tmp_exec_startup.patch b/debian/patches/tmp_exec_startup.patch index 6b8416d4..00b238ad 100644 --- a/debian/patches/tmp_exec_startup.patch +++ b/debian/patches/tmp_exec_startup.patch @@ -1,6 +1,10 @@ ---- libdiskfs/boot-start.c 26 Mar 2002 14:59:52 -0000 1.60 -+++ libdiskfs/boot-start.c 19 Nov 2007 21:22:57 -0000 -@@ -126,8 +126,13 @@ +--- + libdiskfs/boot-start.c | 24 ++++++++++++++++++++---- + 1 file changed, 20 insertions(+), 4 deletions(-) + +--- a/libdiskfs/boot-start.c ++++ b/libdiskfs/boot-start.c +@@ -126,8 +126,13 @@ diskfs_start_bootstrap () assert (_hurd_ports); assert (_hurd_ports[INIT_PORT_CRDIR].port != MACH_PORT_NULL); diskfs_exec = file_name_lookup (_SERVERS_EXEC, 0, 0); @@ -16,7 +20,7 @@ else { #ifndef NDEBUG -@@ -177,8 +182,15 @@ +@@ -177,8 +182,15 @@ diskfs_start_bootstrap () &retry, pathbuf, &execnode); if (err) { @@ -34,7 +38,7 @@ } else { -@@ -393,6 +405,10 @@ +@@ -393,6 +405,10 @@ diskfs_execboot_fsys_startup (mach_port_ err = dir_lookup (rootport, _SERVERS_EXEC, flags|O_NOTRANS, 0, &retry, pathbuf, real); diff --git a/debian/patches/ttys.patch b/debian/patches/ttys.patch index 87e29519..ba9b4937 100644 --- a/debian/patches/ttys.patch +++ b/debian/patches/ttys.patch @@ -1,5 +1,9 @@ ---- hurd-20040301.orig/config/ttys -+++ hurd-20040301/config/ttys +--- + config/ttys | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/config/ttys ++++ b/config/ttys @@ -5,4 +5,10 @@ # name program type status comments diff --git a/debian/patches/uptime_w_path_fix.patch b/debian/patches/uptime_w_path_fix.patch index 89afa14c..349e8470 100644 --- a/debian/patches/uptime_w_path_fix.patch +++ b/debian/patches/uptime_w_path_fix.patch @@ -1,5 +1,9 @@ ---- hurd-20080921/utils/uptime.sh.orig 2008-09-26 19:20:53.000000000 +0200 -+++ hurd-20080921/utils/uptime.sh 2008-09-26 19:21:01.000000000 +0200 +--- + utils/uptime.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/utils/uptime.sh ++++ b/utils/uptime.sh @@ -25,7 +25,7 @@ USAGE="Usage: $0 [OPTION...]" DOC="Show system uptime, number of users, and load" |