[hurd] 03/05: patches/{console-wire.patch, time-fix.patch}: Drop, merged upstream

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository hurd.

commit 7ea5ea16653fc45bb038aaf998813b61537eebf1
Author: Samuel Thibault <address@hidden>
Date:   Tue Nov 15 20:15:14 2016 +0000

    patches/{console-wire.patch,time-fix.patch}: Drop, merged upstream
---
 debian/changelog                  |  1 +
 debian/patches/console-wire.patch | 36 ------------------------------------
 debian/patches/external.patch     |  8 +++-----
 debian/patches/series             |  2 --
 debian/patches/time-fix.patch     | 24 ------------------------
 5 files changed, 4 insertions(+), 67 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6be3e4d..25cd9b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 hurd (1:0.8.git20161115-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot.
+    - patches/{console-wire.patch,time-fix.patch}: Drop, merged upstream.
   * control: Make hurd-prof Priority: extra instead of required.
   * local/setup-translators: Default crash server to dumping core.
 
diff --git a/debian/patches/console-wire.patch 
b/debian/patches/console-wire.patch
deleted file mode 100644
index 109476a..0000000
--- a/debian/patches/console-wire.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-commit 81fb68fee81769d81c373e3af5a508d706b7e3d6
-Author: Samuel Thibault <address@hidden>
-Date:   Sun Oct 30 20:58:55 2016 +0100
-
-    wire console display pages
-    
-    to work around improper handling of getting paged out.
-    
-    * console/display.c (user_create): Call vm_wire() on the created user data.
-
-diff --git a/console/display.c b/console/display.c
-index 98c70f5..ed5571e 100644
---- a/console/display.c
-+++ b/console/display.c
-@@ -814,6 +814,21 @@ user_create (display_t display, uint32_t width, uint32_t 
height,
-   user->cursor.status = CONS_CURSOR_NORMAL;
-   conchar_memset (user->_matrix, chr, attr,
-                 user->screen.width * user->screen.lines);
-+
-+  /* FIXME: it seems we don't properly handle getting paged out.
-+   * For now, just wire the pages to work around the issue.  */
-+  {
-+    mach_port_t host;
-+
-+    error_t err = get_privileged_ports (&host, NULL);
-+    if (err)
-+      host = mach_host_self ();
-+
-+    vm_wire (host, mach_task_self (), (vm_offset_t) user,
-+           (vm_size_t) npages * vm_page_size, VM_PROT_READ);
-+    if (host != mach_host_self ())
-+      mach_port_deallocate (mach_task_self (), host);
-+  }
-   return 0;
- }
- 
diff --git a/debian/patches/external.patch b/debian/patches/external.patch
index bb7f395..db9de94 100644
--- a/debian/patches/external.patch
+++ b/debian/patches/external.patch
@@ -2,12 +2,10 @@ Include DDE in the build
 
 --- a/Makefile
 +++ b/Makefile
-@@ -28,7 +28,15 @@ include ./Makeconf
- lib-subdirs = libshouldbeinlibc libihash libiohelp libports libthreads \
-             libpager libfshelp libdiskfs libtrivfs libps \
+@@ -28,6 +28,14 @@ include ./Makeconf
              libnetfs libpipe libstore libhurdbugaddr libftpconn libcons \
--            libhurd-slab
-+            libhurd-slab libbpf eth-multiplexer
+             libhurd-slab \
+             libbpf \
 +
 +ifneq ($(LIBPCIACCESS),no)
 +lib-subdirs += libmachdev libddekit
diff --git a/debian/patches/series b/debian/patches/series
index b1806af..6380222 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,5 +29,3 @@ using_std.patch
 netdde_log.patch
 libports-iterate-refcount.patch
 exec_filename_rpctrace.patch
-time-fix.patch
-console-wire.patch
diff --git a/debian/patches/time-fix.patch b/debian/patches/time-fix.patch
deleted file mode 100644
index 38bef3f..0000000
--- a/debian/patches/time-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 902f0a78b43c75bdb125a8f1c11a3fbf2595ce35
-Author: Samuel Thibault <address@hidden>
-Date:   Thu Oct 27 17:53:41 2016 +0200
-
-    libdiskfs: Fix timestamp update on file close
-    
-    * libdiskfs/node-nrele.c (diskfs_nrele): Call diskfs_set_node_times when
-    there are no hard refs any more, like diskfs_nput does.
-
-diff --git a/libdiskfs/node-nrele.c b/libdiskfs/node-nrele.c
-index a96d134..ed418a1 100644
---- a/libdiskfs/node-nrele.c
-+++ b/libdiskfs/node-nrele.c
-@@ -40,6 +40,10 @@ diskfs_nrele (struct node *np)
-     {
-       locked = TRUE;
-       pthread_mutex_lock (&np->lock);
-+      /* This is our cue that something akin to "last process closes file"
-+       in the POSIX.1 sense happened, so make sure any pending node time
-+       updates now happen in a timely fashion.  */
-+      diskfs_set_node_times (np);
-       diskfs_lost_hardrefs (np);
-       if (!np->dn_stat.st_nlink)
-       {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/hurd.git