diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/patches/doc-fix.patch | 56 | ||||
| -rw-r--r-- | debian/patches/exec_filename_fs.patch | 108 | ||||
| -rw-r--r-- | debian/patches/io_select_timeout | 104 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 2 |
6 files changed, 57 insertions, 219 deletions
diff --git a/debian/changelog b/debian/changelog index 66a31c91..8ea0ae9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ -hurd (20130501-1) unreleased; urgency=low +hurd (20130620-1) unstable; urgency=low * New upstream release. * patches/exec_filename_fs.patch,exec_filename_use.patch,external.patch: Refresh. + * io_select_timeout, doc-fix.patch: Remove merged patches. - -- Samuel Thibault <sthibault@debian.org> Sun, 24 Mar 2013 22:47:50 +0100 + -- Samuel Thibault <sthibault@debian.org> Wed, 19 Jun 2013 23:32:07 +0000 hurd (20130226-3) unstable; urgency=low diff --git a/debian/patches/doc-fix.patch b/debian/patches/doc-fix.patch deleted file mode 100644 index 0b59812a..00000000 --- a/debian/patches/doc-fix.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit 45193362a810024ab4810470fcd00e16123d5aaf -Author: Richard Braun <rbraun@sceen.net> -Date: Wed May 22 21:00:08 2013 +0200 - - Fix some errors in the texinfo documentation - - * doc/gpl.texinfo: Replace @unnumbered with @node and @section commands. - * doc/hurd.texi: Fix call to @setchapternewpage, remove the @node and - @section commands that are now in gpl.texinfo, and remove an erroneous - occurrence of 'attributes' before a command. - -diff --git a/doc/gpl.texinfo b/doc/gpl.texinfo -index a2f8db9..d29870c 100644 ---- a/doc/gpl.texinfo -+++ b/doc/gpl.texinfo -@@ -1,6 +1,5 @@ --@setfilename gpl.info -- --@unnumbered GNU GENERAL PUBLIC LICENSE -+@node Copying -+@section GNU GENERAL PUBLIC LICENSE - @center Version 2, June 1991 - - @display -diff --git a/doc/hurd.texi b/doc/hurd.texi -index ea73a4c..070daed 100644 ---- a/doc/hurd.texi -+++ b/doc/hurd.texi -@@ -127,7 +127,7 @@ into another language, under the above conditions for modified versions. - @end quotation - @end copying - --@setchapternewpage none -+@setchapternewpage off - @settitle Hurd Reference Manual - - @titlepage -@@ -513,9 +513,6 @@ mentions that the FSF started developing the Hurd in 1990. As of - kernel. - - --@node Copying --@section GNU General Public License -- - @include gpl.texinfo - - -@@ -1461,7 +1458,7 @@ dropped by the kernel. If the page is currently in core, the kernel - might ignore this call. - @end deftypefun - --attributes@deftypefun void pager_change_attributes (@w{struct pager *@var{pager}}, @w{boolean_t @var{may_cache}}, @w{memory_object_copy_strategy_t @var{copy_strategy}}, @w{int @var{wait}}) -+@deftypefun void pager_change_attributes (@w{struct pager *@var{pager}}, @w{boolean_t @var{may_cache}}, @w{memory_object_copy_strategy_t @var{copy_strategy}}, @w{int @var{wait}}) - Change the attributes of the memory object underlying pager @var{pager}. - The @var{may_cache} and @var{copy_strategy} arguments are as for - @code{memory_object_change_}. Wait for the kernel to report diff --git a/debian/patches/exec_filename_fs.patch b/debian/patches/exec_filename_fs.patch index 0599ab21..a4b5589a 100644 --- a/debian/patches/exec_filename_fs.patch +++ b/debian/patches/exec_filename_fs.patch @@ -26,8 +26,8 @@ Change comments and documentation. Index: hurd-debian/TODO =================================================================== ---- hurd-debian.orig/TODO 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/TODO 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/TODO 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/TODO 2013-06-19 23:32:37.000000000 +0000 @@ -136,7 +136,7 @@ ** libtrivfs @@ -39,9 +39,9 @@ Index: hurd-debian/TODO Index: hurd-debian/doc/hurd.texi =================================================================== ---- hurd-debian.orig/doc/hurd.texi 2012-06-05 05:02:02.000000000 +0000 -+++ hurd-debian/doc/hurd.texi 2012-06-05 05:02:02.000000000 +0000 -@@ -2741,10 +2741,10 @@ +--- hurd-debian.orig/doc/hurd.texi 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/doc/hurd.texi 2013-06-19 23:32:37.000000000 +0000 +@@ -2738,10 +2738,10 @@ @node Program Execution @subsection Program Execution @@ -55,7 +55,7 @@ Index: hurd-debian/doc/hurd.texi ports are necessary for setuid execution, and then invoke the standard execserver found on @file{/servers/exec}. -@@ -2756,13 +2756,13 @@ +@@ -2753,13 +2753,13 @@ be returned. In addition, at least one of the execute bits must be on. A failure of this check should result in @code{EACCES}---not @code{ENOEXEC}. It is not proper for the fileserver ever to respond to @@ -73,7 +73,7 @@ Index: hurd-debian/doc/hurd.texi it is not acceptable to return an error; in such a case the server should simply silently fail to implement the setuid/setgid semantics. -@@ -2777,7 +2777,7 @@ +@@ -2774,7 +2774,7 @@ opened with @code{O_READ}. Finally, all the information (mutated appropriately for setuid/setgid) should be sent to the execserver with @code{exec_exec_file_name}. Whatever error code @code{exec_exec_file_name} @@ -84,8 +84,8 @@ Index: hurd-debian/doc/hurd.texi @subsection File Locking Index: hurd-debian/exec/hashexec.c =================================================================== ---- hurd-debian.orig/exec/hashexec.c 2012-06-05 05:02:02.000000000 +0000 -+++ hurd-debian/exec/hashexec.c 2012-06-05 05:06:23.000000000 +0000 +--- hurd-debian.orig/exec/hashexec.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/exec/hashexec.c 2013-06-19 23:32:37.000000000 +0000 @@ -24,6 +24,9 @@ #include <unistd.h> #include <envz.h> @@ -140,8 +140,8 @@ Index: hurd-debian/exec/hashexec.c if (! e->error) Index: hurd-debian/hurd/fs.defs =================================================================== ---- hurd-debian.orig/hurd/fs.defs 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/hurd/fs.defs 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/hurd/fs.defs 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/hurd/fs.defs 2013-06-19 23:32:37.000000000 +0000 @@ -1,5 +1,6 @@ /* Definitions for the filesystem interface. - Copyright (C) 1994,95,96,97,98,99,2002 Free Software Foundation, Inc. @@ -173,8 +173,8 @@ Index: hurd-debian/hurd/fs.defs file: file_t; Index: hurd-debian/hurd/hurd_types.h =================================================================== ---- hurd-debian.orig/hurd/hurd_types.h 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/hurd/hurd_types.h 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/hurd/hurd_types.h 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/hurd/hurd_types.h 2013-06-19 23:32:37.000000000 +0000 @@ -1,5 +1,6 @@ /* C declarations for Hurd server interfaces - Copyright (C) 1993,94,95,96,98,99,2001,02 Free Software Foundation, Inc. @@ -183,7 +183,7 @@ Index: hurd-debian/hurd/hurd_types.h This file is part of the GNU Hurd. -@@ -76,7 +77,7 @@ +@@ -78,7 +79,7 @@ /* Many such parameters and flags are also defined in various libc headers. */ @@ -192,7 +192,7 @@ Index: hurd-debian/hurd/hurd_types.h #define EXEC_NEWTASK 0x00000001 /* Create new task; kill old one. */ #define EXEC_SECURE 0x00000002 /* Use secure values of portarray, etc. */ #define EXEC_DEFAULTS 0x00000004 /* Use defaults for unspecified ports. */ -@@ -342,7 +343,7 @@ +@@ -344,7 +345,7 @@ #define FSTYPE_MEMFS 0x00000019 /* In-core filesystem */ #define FSTYPE_ISO9660 0x0000001a /* ISO9660 */ @@ -201,7 +201,7 @@ Index: hurd-debian/hurd/hurd_types.h enum { INIT_PORT_CWDIR, -@@ -356,7 +357,7 @@ +@@ -358,7 +359,7 @@ INIT_PORT_MAX }; @@ -212,8 +212,8 @@ Index: hurd-debian/hurd/hurd_types.h INIT_UMASK, Index: hurd-debian/init/init.c =================================================================== ---- hurd-debian.orig/init/init.c 2012-06-05 05:02:02.000000000 +0000 -+++ hurd-debian/init/init.c 2012-06-05 05:06:35.000000000 +0000 +--- hurd-debian.orig/init/init.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/init/init.c 2013-06-19 23:32:37.000000000 +0000 @@ -1,7 +1,7 @@ /* Start and maintain hurd core servers and system run state @@ -338,11 +338,11 @@ Index: hurd-debian/init/init.c + mach_port_deallocate (mach_task_self (), default_ports[INIT_PORT_PROC]); mach_port_deallocate (mach_task_self (), file); - free (args); + if (err) Index: hurd-debian/libdiskfs/boot-start.c =================================================================== ---- hurd-debian.orig/libdiskfs/boot-start.c 2012-06-05 05:02:02.000000000 +0000 -+++ hurd-debian/libdiskfs/boot-start.c 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/libdiskfs/boot-start.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libdiskfs/boot-start.c 2013-06-19 23:32:37.000000000 +0000 @@ -207,7 +207,7 @@ diskfs_exec_ctl = MACH_PORT_NULL; /* Not used after this. */ } @@ -354,8 +354,8 @@ Index: hurd-debian/libdiskfs/boot-start.c if (_diskfs_boot_command) Index: hurd-debian/libdiskfs/file-exec.c =================================================================== ---- hurd-debian.orig/libdiskfs/file-exec.c 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libdiskfs/file-exec.c 2012-06-05 05:07:14.000000000 +0000 +--- hurd-debian.orig/libdiskfs/file-exec.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libdiskfs/file-exec.c 2013-06-19 23:32:37.000000000 +0000 @@ -1,5 +1,6 @@ -/* File execution (file_exec RPC) for diskfs servers, using exec server. - Copyright (C) 1993,94,95,96,97,98,2000,02 Free Software Foundation, Inc. @@ -475,8 +475,8 @@ Index: hurd-debian/libdiskfs/file-exec.c { Index: hurd-debian/libfshelp/start-translator-long.c =================================================================== ---- hurd-debian.orig/libfshelp/start-translator-long.c 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libfshelp/start-translator-long.c 2012-06-05 05:07:36.000000000 +0000 +--- hurd-debian.orig/libfshelp/start-translator-long.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libfshelp/start-translator-long.c 2013-06-19 23:32:37.000000000 +0000 @@ -1,5 +1,6 @@ /* - Copyright (C) 1995,96,99,2000,02, 04 Free Software Foundation, Inc. @@ -495,7 +495,7 @@ Index: hurd-debian/libfshelp/start-translator-long.c /* The data passed in the various messages we're interested in. */ -@@ -264,12 +268,22 @@ +@@ -272,12 +276,22 @@ saveport = ports[INIT_PORT_BOOTSTRAP]; ports[INIT_PORT_BOOTSTRAP] = bootstrap; @@ -525,8 +525,8 @@ Index: hurd-debian/libfshelp/start-translator-long.c if (ports_type == MACH_MSG_TYPE_COPY_SEND) Index: hurd-debian/libnetfs/file-exec.c =================================================================== ---- hurd-debian.orig/libnetfs/file-exec.c 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libnetfs/file-exec.c 2012-06-05 05:07:49.000000000 +0000 +--- hurd-debian.orig/libnetfs/file-exec.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libnetfs/file-exec.c 2013-06-19 23:32:37.000000000 +0000 @@ -1,5 +1,6 @@ /* - Copyright (C) 1996,97,2000,01,02 Free Software Foundation, Inc. @@ -632,8 +632,8 @@ Index: hurd-debian/libnetfs/file-exec.c } Index: hurd-debian/libtrivfs/file-exec.c =================================================================== ---- hurd-debian.orig/libtrivfs/file-exec.c 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libtrivfs/file-exec.c 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/libtrivfs/file-exec.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libtrivfs/file-exec.c 2013-06-19 23:32:37.000000000 +0000 @@ -1,5 +1,5 @@ /* - Copyright (C) 1994,2002 Free Software Foundation, Inc. @@ -672,8 +672,8 @@ Index: hurd-debian/libtrivfs/file-exec.c +} Index: hurd-debian/trans/fakeroot.c =================================================================== ---- hurd-debian.orig/trans/fakeroot.c 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/trans/fakeroot.c 2012-06-05 05:08:00.000000000 +0000 +--- hurd-debian.orig/trans/fakeroot.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/trans/fakeroot.c 2013-06-19 23:32:37.000000000 +0000 @@ -1,5 +1,5 @@ /* fakeroot -- a translator for faking actions that aren't really permitted - Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc. @@ -783,8 +783,8 @@ Index: hurd-debian/trans/fakeroot.c /* XXX we should intercept interrupt_operation and do Index: hurd-debian/utils/login.c =================================================================== ---- hurd-debian.orig/utils/login.c 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/utils/login.c 2012-06-05 05:08:09.000000000 +0000 +--- hurd-debian.orig/utils/login.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/utils/login.c 2013-06-19 23:32:37.000000000 +0000 @@ -1,6 +1,7 @@ /* Hurdish login @@ -836,7 +836,7 @@ Index: hurd-debian/utils/login.c Index: hurd-debian/hurd/fs_experimental.defs =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ hurd-debian/hurd/fs_experimental.defs 2012-06-05 05:02:02.000000000 +0000 ++++ hurd-debian/hurd/fs_experimental.defs 2013-06-19 23:32:37.000000000 +0000 @@ -0,0 +1,51 @@ +/* Definitions for the filesystem interface. + Copyright (C) 1994,95,96,97,98,99,2002 Free Software Foundation, Inc. @@ -891,8 +891,8 @@ Index: hurd-debian/hurd/fs_experimental.defs + destroynames: mach_port_name_array_t SCP); Index: hurd-debian/libdiskfs/Makefile =================================================================== ---- hurd-debian.orig/libdiskfs/Makefile 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libdiskfs/Makefile 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/libdiskfs/Makefile 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libdiskfs/Makefile 2013-06-19 23:32:37.000000000 +0000 @@ -55,7 +55,7 @@ SRCS = $(OTHERSRCS) $(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(IFSOCKSRCS) installhdrs = diskfs.h diskfs-pager.h @@ -902,7 +902,7 @@ Index: hurd-debian/libdiskfs/Makefile fsys_replyUser.o fs_notifyUser.o ifsockServer.o \ startup_notifyServer.o OBJS = $(sort $(SRCS:.c=.o) $(MIGSTUBS)) -@@ -64,6 +64,7 @@ +@@ -65,6 +65,7 @@ fsys-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h -DREPLY_PORTS fs-MIGSFLAGS = -imacros $(srcdir)/fsmutations.h @@ -912,8 +912,8 @@ Index: hurd-debian/libdiskfs/Makefile MIGCOMSFLAGS = -prefix diskfs_ Index: hurd-debian/libdiskfs/demuxer.c =================================================================== ---- hurd-debian.orig/libdiskfs/demuxer.c 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libdiskfs/demuxer.c 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/libdiskfs/demuxer.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libdiskfs/demuxer.c 2013-06-19 23:32:37.000000000 +0000 @@ -22,6 +22,7 @@ mach_msg_header_t *outp) { @@ -932,9 +932,9 @@ Index: hurd-debian/libdiskfs/demuxer.c || diskfs_exec_startup_server (inp, outp) Index: hurd-debian/libnetfs/Makefile =================================================================== ---- hurd-debian.orig/libnetfs/Makefile 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libnetfs/Makefile 2012-06-05 05:02:02.000000000 +0000 -@@ -57,12 +57,13 @@ +--- hurd-debian.orig/libnetfs/Makefile 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libnetfs/Makefile 2013-06-19 23:32:37.000000000 +0000 +@@ -58,12 +58,13 @@ installhdrs=netfs.h @@ -951,8 +951,8 @@ Index: hurd-debian/libnetfs/Makefile MIGCOMSFLAGS = -prefix netfs_ Index: hurd-debian/libnetfs/demuxer.c =================================================================== ---- hurd-debian.orig/libnetfs/demuxer.c 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libnetfs/demuxer.c 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/libnetfs/demuxer.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libnetfs/demuxer.c 2013-06-19 23:32:37.000000000 +0000 @@ -25,12 +25,14 @@ mach_msg_header_t *outp) { @@ -970,8 +970,8 @@ Index: hurd-debian/libnetfs/demuxer.c || ports_interrupt_server (inp, outp) Index: hurd-debian/libtrivfs/Makefile =================================================================== ---- hurd-debian.orig/libtrivfs/Makefile 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libtrivfs/Makefile 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/libtrivfs/Makefile 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libtrivfs/Makefile 2013-06-19 23:32:37.000000000 +0000 @@ -43,7 +43,7 @@ SRCS=$(FSSRCS) $(IOSRCS) $(FSYSSRCS) $(OTHERSRCS) @@ -992,8 +992,8 @@ Index: hurd-debian/libtrivfs/Makefile include ../Makeconf Index: hurd-debian/libtrivfs/demuxer.c =================================================================== ---- hurd-debian.orig/libtrivfs/demuxer.c 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libtrivfs/demuxer.c 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/libtrivfs/demuxer.c 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libtrivfs/demuxer.c 2013-06-19 23:32:37.000000000 +0000 @@ -26,11 +26,13 @@ mach_msg_header_t *outp) { @@ -1010,9 +1010,9 @@ Index: hurd-debian/libtrivfs/demuxer.c || ports_interrupt_server (inp, outp)); Index: hurd-debian/configure.ac =================================================================== ---- hurd-debian.orig/configure.ac 2012-06-05 05:02:02.000000000 +0000 -+++ hurd-debian/configure.ac 2012-06-05 05:06:02.000000000 +0000 -@@ -161,7 +161,7 @@ +--- hurd-debian.orig/configure.ac 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/configure.ac 2013-06-19 23:32:37.000000000 +0000 +@@ -162,7 +162,7 @@ AC_SUBST(VERSIONING) # Check if libc contains getgrouplist and/or uselocale. @@ -1023,8 +1023,8 @@ Index: hurd-debian/configure.ac # From glibc HEAD, 2007-11-07. Index: hurd-debian/libtrivfs/trivfs.h =================================================================== ---- hurd-debian.orig/libtrivfs/trivfs.h 2012-06-05 05:01:41.000000000 +0000 -+++ hurd-debian/libtrivfs/trivfs.h 2012-06-05 05:02:02.000000000 +0000 +--- hurd-debian.orig/libtrivfs/trivfs.h 2013-06-19 23:32:37.000000000 +0000 ++++ hurd-debian/libtrivfs/trivfs.h 2013-06-19 23:32:37.000000000 +0000 @@ -293,6 +293,7 @@ /* These are the MiG-generated headers that declare prototypes for the server functions. */ diff --git a/debian/patches/io_select_timeout b/debian/patches/io_select_timeout deleted file mode 100644 index 6ff81e68..00000000 --- a/debian/patches/io_select_timeout +++ /dev/null @@ -1,104 +0,0 @@ -commit cc36b5a5e2e8df6e633bb767df84ac1e61c56bc3 -Author: Richard Braun <rbraun@sceen.net> -Date: Tue Feb 26 22:24:42 2013 +0100 - - Add the timespec_t Hurd type - - This type matches the standard struct timespec, and allows passing time - values with nanosecond precision in RPCs. - - * hurd/hurd_types.defs (timespec_t): New MIG type. - * hurd/hurd_types.h: Include <time.h>. - (timespec_t): New C type, aliasing struct timespec. - -diff --git a/hurd/hurd_types.defs b/hurd/hurd_types.defs -index 5ad5e93..4b32504 100644 ---- a/hurd/hurd_types.defs -+++ b/hurd/hurd_types.defs -@@ -230,6 +230,8 @@ type rusage_t = struct[18] of int; /* XXX */ - - type flock_t = struct[5] of int; - -+type timespec_t = struct[2] of int; -+ - #define _SYS_UTSNAME_H /* Inhibit warning from <bits/utsname.h>. */ - #include <bits/utsname.h> - type utsname_t = struct[5 * _UTSNAME_LENGTH] of char; -diff --git a/hurd/hurd_types.h b/hurd/hurd_types.h -index e1a644f..7d1bb73 100644 ---- a/hurd/hurd_types.h -+++ b/hurd/hurd_types.h -@@ -20,6 +20,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - #ifndef _HURD_TYPES_H - #define _HURD_TYPES_H - -+#include <time.h> /* For struct timespec. */ - #include <mach/std_types.h> /* For mach_port_t et al. */ - #include <mach/message.h> /* For mach_msg_id_t et al. */ - #include <sys/types.h> /* For pid_t and uid_t. */ -@@ -69,6 +70,7 @@ typedef struct statfs fsys_statfsbuf_t; - typedef struct stat64 io_statbuf_t; - typedef struct statfs64 fsys_statfsbuf_t; - #endif -+typedef struct timespec timespec_t; - - - /* Parameters and flags in RPC calls */ - - -commit 8cd75c4d6b229bb4e3de9264466731e3a32e0133 -Author: Richard Braun <rbraun@sceen.net> -Date: Tue Feb 26 22:24:47 2013 +0100 - - Add io_select_timeout to the io interface - - * hurd/io.defs (io_select_timeout): New MIG routine. - * hurd/io_reply.defs (io_select_timeout_reply): New MIG simpleroutine. - * hurd/io_request.defs (io_select_timeout_request): Likewise. - -diff --git a/hurd/io.defs b/hurd/io.defs -index 9119b05..ba0b807 100644 ---- a/hurd/io.defs -+++ b/hurd/io.defs -@@ -320,3 +320,14 @@ routine io_identity ( - on the specified object. */ - routine io_revoke ( - io_object: io_t RPTLAST); -+ -+/* INTR */ -+routine io_select_timeout ( -+ io_object: io_t; -+#if defined (REPLY_PORTS) || defined (IO_SELECT_REPLY_PORT) -+ replyport reply: sreply_port_t; -+#else -+ ureplyport reply: mach_port_make_send_t; -+#endif -+ timeout: timespec_t; -+ inout select_type: int); -diff --git a/hurd/io_reply.defs b/hurd/io_reply.defs -index ffc4e75..eee6824 100644 ---- a/hurd/io_reply.defs -+++ b/hurd/io_reply.defs -@@ -175,3 +175,8 @@ simpleroutine io_identity_reply ( - simpleroutine io_revoke_reply ( - reply: reply_port_t; - RETURN_CODE_ARG); -+ -+simpleroutine io_select_timeout_reply ( -+ reply: reply_port_t; -+ RETURN_CODE_ARG; -+ select_result: int); -diff --git a/hurd/io_request.defs b/hurd/io_request.defs -index a3e775a..0d5e36d 100644 ---- a/hurd/io_request.defs -+++ b/hurd/io_request.defs -@@ -172,3 +172,9 @@ simpleroutine io_identity_request ( - simpleroutine io_revoke_request ( - io_object: io_t; - reply: reply_port_t); -+ -+simpleroutine io_select_timeout_request ( -+ io_object: io_t; -+ ureplyport reply: mach_port_make_send_t; -+ timeout: timespec_t; -+ select_type: int); diff --git a/debian/patches/series b/debian/patches/series index 2e094756..299b9452 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,4 +41,3 @@ libmachdev.patch exec_filename_exec.patch exec_filename_fs.patch exec_filename_use.patch -doc-fix.patch diff --git a/debian/rules b/debian/rules index 9bc24a43..342ea4d1 100755 --- a/debian/rules +++ b/debian/rules @@ -72,8 +72,6 @@ override_dh_auto_install: # remove PIC static libraries rm -f debian/tmp/lib/$(DEB_HOST_MULTIARCH)/*_pic.a - patch -p1 -d debian/tmp/include < debian/patches/io_select_timeout - override_dh_install: $(INSTALL_generated) dh_install --list-missing |