This is an automated email from the git hooks/post-receive script. sthibault pushed a commit to branch master in repository gnumach.
commit 9bf0ea14deb7c3466390b0b6119dcec2a803d972 Author: Samuel Thibault <[email protected]> Date: Wed Mar 26 10:00:58 2014 +0000 git-memory_object_translatable.patch: New patch to make memory object types translation functions mutable. --- debian/changelog | 7 ++ .../patches/git-memory_object_translatable.patch | 120 +++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 128 insertions(+) diff --git a/debian/changelog b/debian/changelog index 24de22d..da5f8ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnumach (2:1.4-9) unstable; urgency=medium + + * patches/git-memory_object_translatable.patch: New patch to make memory + object types translation functions mutable. + + -- Samuel Thibault <[email protected]> Wed, 26 Mar 2014 09:59:55 +0000 + gnumach (2:1.4-8) unstable; urgency=medium * patches/git-physical-access.patch: Fix overflow brought by patch. diff --git a/debian/patches/git-memory_object_translatable.patch b/debian/patches/git-memory_object_translatable.patch new file mode 100644 index 0000000..37df93c --- /dev/null +++ b/debian/patches/git-memory_object_translatable.patch @@ -0,0 +1,120 @@ +commit 50cc5152ebb4872b57a764d7b5ad62636f674e01 +Author: Justus Winter <[email protected]> +Date: Mon Mar 3 19:12:52 2014 +0100 + + include: make the memory_object_t types translation functions mutable + + Make the intran, outtran and destructor functions mutable using + preprocessor macros. Make it possible to inject imports using the + MEMORY_OBJECT_IMPORTS macro. This way, userspace servers can provide + their own translation functions. + + * include/mach/mach_types.defs (memory_object_t): Make the translation + mutable using preprocessor macros. + * include/mach/memory_object.defs: Likewise for the inlined type declarations. + Honor MEMORY_OBJECT_IMPORTS. + * include/mach/memory_object_default.defs: Likewise. + +diff --git a/include/mach/mach_types.defs b/include/mach/mach_types.defs +index 607d5d9..bfce6cb 100644 +--- a/include/mach/mach_types.defs ++++ b/include/mach/mach_types.defs +@@ -135,6 +135,16 @@ type memory_object_t = mach_port_t + ctype: mach_port_t + #if KERNEL_SERVER + intran: ipc_port_t null_conversion(mach_port_t) ++#else /* KERNEL_SERVER */ ++#ifdef MEMORY_OBJECT_INTRAN ++ intran: MEMORY_OBJECT_INTRAN ++#endif ++#ifdef MEMORY_OBJECT_OUTTRAN ++ outtran: MEMORY_OBJECT_OUTTRAN ++#endif ++#ifdef MEMORY_OBJECT_DESTRUCTOR ++ destructor: MEMORY_OBJECT_DESTRUCTOR ++#endif + #endif /* KERNEL_SERVER */ + ; + +diff --git a/include/mach/memory_object.defs b/include/mach/memory_object.defs +index ea7989a..0ed8dbc 100644 +--- a/include/mach/memory_object.defs ++++ b/include/mach/memory_object.defs +@@ -42,6 +42,10 @@ subsystem + #include <mach/std_types.defs> + #include <mach/mach_types.defs> + ++#ifdef MEMORY_OBJECT_IMPORTS ++MEMORY_OBJECT_IMPORTS ++#endif ++ + #if SEQNOS + serverprefix seqnos_; + serverdemux seqnos_memory_object_server; +@@ -85,7 +89,11 @@ simpleroutine memory_object_init( + simpleroutine memory_object_terminate( + memory_object : memory_object_t = + MACH_MSG_TYPE_MOVE_SEND +- ctype: mach_port_t; ++ ctype: mach_port_t ++#ifdef MEMORY_OBJECT_INTRAN ++ intran: MEMORY_OBJECT_INTRAN ++#endif ++ ; + #if SEQNOS + msgseqno seqno : mach_port_seqno_t; + #endif /* SEQNOS */ +@@ -221,7 +229,11 @@ simpleroutine memory_object_data_write( + simpleroutine memory_object_lock_completed( + memory_object : memory_object_t = + polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE +- ctype: mach_port_t; ++ ctype: mach_port_t ++#ifdef MEMORY_OBJECT_INTRAN ++ intran: MEMORY_OBJECT_INTRAN ++#endif ++ ; + #if SEQNOS + msgseqno seqno : mach_port_seqno_t; + #endif /* SEQNOS */ +@@ -252,7 +264,11 @@ simpleroutine memory_object_lock_completed( + simpleroutine memory_object_supply_completed( + memory_object : memory_object_t = + polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE +- ctype: mach_port_t; ++ ctype: mach_port_t ++#ifdef MEMORY_OBJECT_INTRAN ++ intran: MEMORY_OBJECT_INTRAN ++#endif ++ ; + #if SEQNOS + msgseqno seqno : mach_port_seqno_t; + #endif /* SEQNOS */ +@@ -298,7 +314,11 @@ simpleroutine memory_object_data_return( + simpleroutine memory_object_change_completed( + memory_object : memory_object_t = + polymorphic|MACH_MSG_TYPE_PORT_SEND_ONCE +- ctype: mach_port_t; ++ ctype: mach_port_t ++#ifdef MEMORY_OBJECT_INTRAN ++ intran: MEMORY_OBJECT_INTRAN ++#endif ++ ; + #if SEQNOS + msgseqno seqno : mach_port_seqno_t; + #endif /* SEQNOS */ +diff --git a/include/mach/memory_object_default.defs b/include/mach/memory_object_default.defs +index 0eac271..cfd54a4 100644 +--- a/include/mach/memory_object_default.defs ++++ b/include/mach/memory_object_default.defs +@@ -40,6 +40,10 @@ subsystem + #include <mach/std_types.defs> + #include <mach/mach_types.defs> + ++#ifdef MEMORY_OBJECT_IMPORTS ++MEMORY_OBJECT_IMPORTS ++#endif ++ + #if SEQNOS + serverprefix seqnos_; + serverdemux seqnos_memory_object_default_server; diff --git a/debian/patches/series b/debian/patches/series index 2176a9b..81ff71b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -13,4 +13,5 @@ git-mig-inlines.patch git-quiet-cd-floppy.patch git-task_set_name.patch git-physical-access.patch +git-memory_object_translatable.patch 90-fix_headers.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hurd/gnumach.git
