commit-hurd
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[SCM] Debian GNU Hurd packaging branch, master, updated. upstream/201205


From: Samuel Thibault
Subject: [SCM] Debian GNU Hurd packaging branch, master, updated. upstream/20120520-604-g2f5a076
Date: Mon, 21 May 2012 01:48:07 +0000

The following commit has been merged in the master branch:
commit 2f5a076b4df272d4903ef85bd8faa5d4b2cb430e
Author: Samuel Thibault <address@hidden>
Date:   Mon May 21 03:08:41 2012 +0000

    Workaround some port references issues

diff --git a/debian/patches/libmachdev.patch b/debian/patches/libmachdev.patch
index 864de7e..7cf1b4f 100644
--- a/debian/patches/libmachdev.patch
+++ b/debian/patches/libmachdev.patch
@@ -1,5 +1,5 @@
 diff --git a/libmachdev/net.c b/libmachdev/net.c
-index 606765f..a892d1f 100644
+index 606765f..766d9b4 100644
 --- a/libmachdev/net.c
 +++ b/libmachdev/net.c
 @@ -212,7 +212,7 @@ deliver_msg(struct net_rcv_msg *msg, if_filter_list_t *ifp)
@@ -11,6 +11,28 @@ index 606765f..a892d1f 100644
            {
              mach_port_deallocate(mach_task_self (),
                                   ((mach_msg_header_t 
*)msg)->msgh_remote_port);
+@@ -377,7 +377,7 @@ device_open (mach_port_t reply_port, mach_msg_type_name_t 
reply_port_type,
+     }
+ 
+   *devp = ports_get_right (nd);
+-  *devicePoly = MACH_MSG_TYPE_COPY_SEND;
++  *devicePoly = MACH_MSG_TYPE_MAKE_SEND;
+   return D_SUCCESS;
+ }
+ 
+diff --git a/libmachdev/ds_routines.c b/libmachdev/ds_routines.c
+index 6b8d1d4..f0c034f 100644
+--- a/libmachdev/ds_routines.c
++++ b/libmachdev/ds_routines.c
+@@ -206,7 +206,7 @@ ds_device_close (device_t dev)
+   ret = (device->emul_ops->close
+        ? (*device->emul_ops->close) (device->emul_data)
+        : D_SUCCESS);
+-  mach_device_deallocate (device_to_pi (device));
++  //mach_device_deallocate (device_to_pi (device));
+ 
+   ports_port_deref (device_to_pi (device));
+   return ret;
 diff --git a/libbpf/bpf_impl.c b/libbpf/bpf_impl.c
 index b2dafd1..c8a250b 100644
 --- a/libbpf/bpf_impl.c

-- 
Debian GNU Hurd packaging



reply via email to

[Prev in Thread] Current Thread [Next in Thread]